Add flow monitor map attributes

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.4 (unreleased)
+
+- Add `record_ipv4`, `record_ipv6`, `record_mpls` and `sflow_options` attributes to `iosxr_flow_monitor_map` resource and data source
+
 ## 0.2.3
 
 - Add `timers_bgp_minimum_acceptable_holdtime` attribute to `iosxr_router_bgp` resource and data source

docs/data-sources/flow_monitor_map.md

@@ -48,6 +48,7 @@ data "iosxr_flow_monitor_map" "example" {
 - `record_datalink_record` (Boolean) Layer2 traffic based flow
 - `record_default_mdi` (Boolean) Default MDI record format
 - `record_default_rtp` (Boolean) Default RTP record format
+- `record_ipv4` (Boolean) IPv4 raw record format
 - `record_ipv4_as` (Boolean) Autonomous System based aggregation
 - `record_ipv4_as_tos` (Boolean) AS-TOS based aggregation
 - `record_ipv4_bgp_nexthop_tos` (Boolean) BGP, nexthop and tos based aggregation
@@ -64,15 +65,18 @@ data "iosxr_flow_monitor_map" "example" {
 - `record_ipv4_protocol_port_tos` (Boolean) Protocol, port and tos based aggregation
 - `record_ipv4_source_prefix` (Boolean) source prefix based aggregation
 - `record_ipv4_source_prefix_tos` (Boolean) Source, Prefix and TOS based aggregation
+- `record_ipv6` (Boolean) IPv6 raw record format
 - `record_ipv6_destination` (Boolean) IPv6 Destination Based NetFlow Accounting
 - `record_ipv6_gtp` (Boolean) IPV6 gtp record format
 - `record_ipv6_peer_as` (Boolean) Record peer AS
 - `record_map_t` (Boolean) map-t translation based Netflow
+- `record_mpls` (Boolean) MPLS record format
 - `record_mpls_ipv4_fields` (Boolean) MPLS with IPv4 fields format
 - `record_mpls_ipv4_ipv6_fields` (Boolean) MPLS with IPv4 and IPv6 fields format
 - `record_mpls_ipv6_fields` (Boolean) MPLS with IPv6 fields format
 - `record_mpls_labels` (Number) Labels to be used for Hashing
 - `record_sflow` (Boolean) sFlow based flow
+- `sflow_options` (Boolean) submode to configure sFlow related options
 - `sflow_options_extended_gateway` (Boolean) Enable extended-gateway flow data type
 - `sflow_options_extended_ipv4_tunnel_egress` (Boolean) Enable extended-ipv4-tunnel-egress flow data type
 - `sflow_options_extended_ipv6_tunnel_egress` (Boolean) Enable extended-ipv6-tunnel-egress flow data type

docs/guides/changelog.md

@@ -7,6 +7,10 @@ description: |-
 
 # Changelog
 
+## 0.2.4 (unreleased)
+
+- Add `record_ipv4`, `record_ipv6`, `record_mpls` and `sflow_options` attributes to `iosxr_flow_monitor_map` resource and data source
+
 ## 0.2.3
 
 - Add `timers_bgp_minimum_acceptable_holdtime` attribute to `iosxr_router_bgp` resource and data source

docs/resources/flow_monitor_map.md

@@ -24,6 +24,7 @@ resource "iosxr_flow_monitor_map" "example" {
   option_filtered                            = true
   option_bgpattr                             = true
   option_outbundlemember                     = true
+  record_ipv4                                = true
   record_ipv4_destination                    = true
   record_ipv4_destination_tos                = true
   record_ipv4_as                             = true
@@ -40,9 +41,11 @@ resource "iosxr_flow_monitor_map" "example" {
   record_ipv4_bgp_nexthop_tos                = true
   record_ipv4_peer_as                        = true
   record_ipv4_gtp                            = true
+  record_ipv6                                = true
   record_ipv6_destination                    = true
   record_ipv6_peer_as                        = true
   record_ipv6_gtp                            = true
+  record_mpls                                = true
   record_mpls_ipv4_fields                    = true
   record_mpls_ipv6_fields                    = true
   record_mpls_ipv4_ipv6_fields               = true
@@ -60,6 +63,7 @@ resource "iosxr_flow_monitor_map" "example" {
   cache_permanent                            = true
   cache_immediate                            = true
   hw_cache_timeout_inactive                  = 50
+  sflow_options                              = true
   sflow_options_extended_router              = true
   sflow_options_extended_gateway             = true
   sflow_options_extended_ipv4_tunnel_egress  = true
@@ -103,6 +107,7 @@ resource "iosxr_flow_monitor_map" "example" {
 - `record_datalink_record` (Boolean) Layer2 traffic based flow
 - `record_default_mdi` (Boolean) Default MDI record format
 - `record_default_rtp` (Boolean) Default RTP record format
+- `record_ipv4` (Boolean) IPv4 raw record format
 - `record_ipv4_as` (Boolean) Autonomous System based aggregation
 - `record_ipv4_as_tos` (Boolean) AS-TOS based aggregation
 - `record_ipv4_bgp_nexthop_tos` (Boolean) BGP, nexthop and tos based aggregation
@@ -119,16 +124,19 @@ resource "iosxr_flow_monitor_map" "example" {
 - `record_ipv4_protocol_port_tos` (Boolean) Protocol, port and tos based aggregation
 - `record_ipv4_source_prefix` (Boolean) source prefix based aggregation
 - `record_ipv4_source_prefix_tos` (Boolean) Source, Prefix and TOS based aggregation
+- `record_ipv6` (Boolean) IPv6 raw record format
 - `record_ipv6_destination` (Boolean) IPv6 Destination Based NetFlow Accounting
 - `record_ipv6_gtp` (Boolean) IPV6 gtp record format
 - `record_ipv6_peer_as` (Boolean) Record peer AS
 - `record_map_t` (Boolean) map-t translation based Netflow
+- `record_mpls` (Boolean) MPLS record format
 - `record_mpls_ipv4_fields` (Boolean) MPLS with IPv4 fields format
 - `record_mpls_ipv4_ipv6_fields` (Boolean) MPLS with IPv4 and IPv6 fields format
 - `record_mpls_ipv6_fields` (Boolean) MPLS with IPv6 fields format
 - `record_mpls_labels` (Number) Labels to be used for Hashing
   - Range: `1`-`6`
 - `record_sflow` (Boolean) sFlow based flow
+- `sflow_options` (Boolean) submode to configure sFlow related options
 - `sflow_options_extended_gateway` (Boolean) Enable extended-gateway flow data type
 - `sflow_options_extended_ipv4_tunnel_egress` (Boolean) Enable extended-ipv4-tunnel-egress flow data type
 - `sflow_options_extended_ipv6_tunnel_egress` (Boolean) Enable extended-ipv6-tunnel-egress flow data type

examples/resources/iosxr_flow_monitor_map/resource.tf

@@ -9,6 +9,7 @@ resource "iosxr_flow_monitor_map" "example" {
   option_filtered                            = true
   option_bgpattr                             = true
   option_outbundlemember                     = true
+  record_ipv4                                = true
   record_ipv4_destination                    = true
   record_ipv4_destination_tos                = true
   record_ipv4_as                             = true
@@ -25,9 +26,11 @@ resource "iosxr_flow_monitor_map" "example" {
   record_ipv4_bgp_nexthop_tos                = true
   record_ipv4_peer_as                        = true
   record_ipv4_gtp                            = true
+  record_ipv6                                = true
   record_ipv6_destination                    = true
   record_ipv6_peer_as                        = true
   record_ipv6_gtp                            = true
+  record_mpls                                = true
   record_mpls_ipv4_fields                    = true
   record_mpls_ipv6_fields                    = true
   record_mpls_ipv4_ipv6_fields               = true
@@ -45,6 +48,7 @@ resource "iosxr_flow_monitor_map" "example" {
   cache_permanent                            = true
   cache_immediate                            = true
   hw_cache_timeout_inactive                  = 50
+  sflow_options                              = true
   sflow_options_extended_router              = true
   sflow_options_extended_gateway             = true
   sflow_options_extended_ipv4_tunnel_egress  = true

gen/definitions/flow_monitor_map.yaml

@@ -23,6 +23,8 @@ attributes:
     example: true
   - yang_name: option/outbundlemember
     example: true
+  - yang_name: record/ipv4
+    example: true
   - yang_name: record/ipv4/destination
     example: true
   - yang_name: record/ipv4/destination-tos
@@ -55,12 +57,16 @@ attributes:
     example: true
   - yang_name: record/ipv4/gtp
     example: true
+  - yang_name: record/ipv6
+    example: true
   - yang_name: record/ipv6/destination
     example: true
   - yang_name: record/ipv6/peer-as
     example: true
   - yang_name: record/ipv6/gtp
     example: true
+  - yang_name: record/mpls
+    example: true
   - yang_name: record/mpls/ipv4-fields
     example: true
   - yang_name: record/mpls/ipv6-fields
@@ -95,6 +101,8 @@ attributes:
     example: true
   - yang_name: hw-cache/timeout/inactive
     example: 50
+  - yang_name: sflow/options
+    example: true
   - yang_name: sflow/options/extended-router
     example: true
   - yang_name: sflow/options/extended-gateway