Addressing all requests

CiscoDevNet · Jan 9, 2025 · fe8e672 · fe8e672
1 parent 084348f
commit fe8e672
Show file tree

Hide file tree

Showing 9 changed files with 216 additions and 216 deletions.
diff --git a/docs/data-sources/bgp_address_family.md b/docs/data-sources/bgp_address_family.md
@@ -38,21 +38,21 @@ data "nxos_bgp_address_family" "example" {
 
 ### Read-Only
 
-- `adv_l2vpn_evpn` (String) Enable or disable the advertisement of L2VPN EVPN routes.
-- `adv_only_act_routes` (String) Advertise only active routes to peers
-- `adv_phyip_for_type5_routes` (String) Advertise physical IP for type-5 routes
+- `advertise_l2vpn_evpn` (String) Enable or disable the advertisement of L2VPN EVPN routes.
+- `advertise_only_active_routes` (String) Advertise only active routes to peers
+- `advertise_physical_ip_for_type5_routes` (String) Advertise physical IP for type-5 routes
 - `critical_nexthop_timeout` (String) The next-hop address tracking delay timer for critical next-hop reachability routes.
-- `def_inf_originate` (String) Enable or disable the default-information originate.
+- `default_information_originate` (String) Enable or disable the default-information originate.
 - `id` (String) The distinguished name of the object.
 - `max_ecmp_paths` (Number) Maximum number of ECMP paths.
-- `max_eqcost_ecmp_paths` (Number) Maximum number of equal-cost multipath for local paths ECMP paths.
-- `max_ext_ecmp_paths` (Number) Maximum number of external ECMP paths.
-- `max_ext_int_ecmp_paths` (Number) Maximum number of external/internal ECMP paths.
-- `max_mixcost_ecmp_paths` (Number) Maximum mixed equal-cost multipath for local and remote ECMP paths.
+- `max_external_ecmp_paths` (Number) Maximum number of external ECMP paths.
+- `max_external_internal_ecmp_paths` (Number) Maximum number of external/internal ECMP paths.
+- `max_local_ecmp_paths` (Number) Maximum number of equal-cost multipath for local paths ECMP paths.
+- `max_mixed_ecmp_paths` (Number) Maximum mixed equal-cost multipath for local and remote ECMP paths.
 - `next_hop_route_map_name` (String) Next hope route map name
 - `non_critical_nexthop_timeout` (String) The next-hop address tracking delay timer for non-critical next-hop reachability routes.
 - `prefix_priority` (String) Enable prefix priority for AF
 - `retain_rt_all` (String) Retain Route Target All
-- `route_map_name` (String) Route Map name
-- `vni_ethtag` (String) Allow VNI in Ethernet Tag field in EVPN route
-- `wait_igp_conv` (String) Delay initial bestpath until redistributed IGPs have converged
+- `table_map_route_map_name` (String) Route Map name
+- `vni_ethernet_tag` (String) Allow VNI in Ethernet Tag field in EVPN route
+- `wait_igp_converged` (String) Delay initial bestpath until redistributed IGPs have converged
diff --git a/docs/resources/bgp_address_family.md b/docs/resources/bgp_address_family.md
@@ -30,26 +30,26 @@ This resource can manage the BGP (VRF) address family configuration.
 
 ```terraform
 resource "nxos_bgp_address_family" "example" {
-  asn                          = "65001"
-  vrf                          = "default"
-  address_family               = "ipv4-ucast"
-  critical_nexthop_timeout     = "2500"
-  non_critical_nexthop_timeout = "8000"
-  adv_l2vpn_evpn               = "disabled"
-  adv_phyip_for_type5_routes   = "disabled"
-  max_ecmp_paths               = 2
-  max_ext_ecmp_paths           = 1
-  max_ext_int_ecmp_paths       = 1
-  max_eqcost_ecmp_paths        = 1
-  max_mixcost_ecmp_paths       = 1
-  def_inf_originate            = "disabled"
-  next_hop_route_map_name      = "ROUTEMAP1"
-  prefix_priority              = "none"
-  retain_rt_all                = "disabled"
-  adv_only_act_routes          = "disabled"
-  route_map_name               = "ROUTE_MAP1"
-  vni_ethtag                   = "disabled"
-  wait_igp_conv                = "disabled"
+  asn                                    = "65001"
+  vrf                                    = "default"
+  address_family                         = "ipv4-ucast"
+  critical_nexthop_timeout               = "2500"
+  non_critical_nexthop_timeout           = "8000"
+  advertise_l2vpn_evpn                   = "disabled"
+  advertise_physical_ip_for_type5_routes = "disabled"
+  max_ecmp_paths                         = 2
+  max_external_ecmp_paths                = 1
+  max_external_internal_ecmp_paths       = 1
+  max_local_ecmp_paths                   = 1
+  max_mixed_ecmp_paths                   = 1
+  default_information_originate          = "disabled"
+  next_hop_route_map_name                = "ROUTEMAP1"
+  prefix_priority                        = "none"
+  retain_rt_all                          = "disabled"
+  advertise_only_active_routes           = "disabled"
+  table_map_route_map_name               = "ROUTE_MAP1"
+  vni_ethernet_tag                       = "disabled"
+  wait_igp_converged                     = "disabled"
 }
 ```
 
@@ -66,34 +66,34 @@ resource "nxos_bgp_address_family" "example" {
 
 ### Optional
 
-- `adv_l2vpn_evpn` (String) Enable or disable the advertisement of L2VPN EVPN routes.
+- `advertise_l2vpn_evpn` (String) Enable or disable the advertisement of L2VPN EVPN routes.
   - Choices: `enabled`, `disabled`
   - Default value: `disabled`
-- `adv_only_act_routes` (String) Advertise only active routes to peers
+- `advertise_only_active_routes` (String) Advertise only active routes to peers
   - Choices: `enabled`, `disabled`
   - Default value: `disabled`
-- `adv_phyip_for_type5_routes` (String) Advertise physical IP for type-5 routes
+- `advertise_physical_ip_for_type5_routes` (String) Advertise physical IP for type-5 routes
   - Choices: `enabled`, `disabled`
   - Default value: `disabled`
 - `critical_nexthop_timeout` (String) The next-hop address tracking delay timer for critical next-hop reachability routes.
   - Default value: `crit`
-- `def_inf_originate` (String) Enable or disable the default-information originate.
+- `default_information_originate` (String) Enable or disable the default-information originate.
   - Choices: `enabled`, `disabled`
   - Default value: `disabled`
 - `device` (String) A device name from the provider configuration.
 - `max_ecmp_paths` (Number) Maximum number of ECMP paths.
   - Range: `1`-`128`
   - Default value: `1`
-- `max_eqcost_ecmp_paths` (Number) Maximum number of equal-cost multipath for local paths ECMP paths.
+- `max_external_ecmp_paths` (Number) Maximum number of external ECMP paths.
   - Range: `1`-`128`
   - Default value: `1`
-- `max_ext_ecmp_paths` (Number) Maximum number of external ECMP paths.
+- `max_external_internal_ecmp_paths` (Number) Maximum number of external/internal ECMP paths.
   - Range: `1`-`128`
   - Default value: `1`
-- `max_ext_int_ecmp_paths` (Number) Maximum number of external/internal ECMP paths.
+- `max_local_ecmp_paths` (Number) Maximum number of equal-cost multipath for local paths ECMP paths.
   - Range: `1`-`128`
   - Default value: `1`
-- `max_mixcost_ecmp_paths` (Number) Maximum mixed equal-cost multipath for local and remote ECMP paths.
+- `max_mixed_ecmp_paths` (Number) Maximum mixed equal-cost multipath for local and remote ECMP paths.
   - Range: `1`-`128`
   - Default value: `1`
 - `next_hop_route_map_name` (String) Next hope route map name
@@ -105,11 +105,11 @@ resource "nxos_bgp_address_family" "example" {
 - `retain_rt_all` (String) Retain Route Target All
   - Choices: `enabled`, `disabled`
   - Default value: `disabled`
-- `route_map_name` (String) Route Map name
-- `vni_ethtag` (String) Allow VNI in Ethernet Tag field in EVPN route
+- `table_map_route_map_name` (String) Route Map name
+- `vni_ethernet_tag` (String) Allow VNI in Ethernet Tag field in EVPN route
   - Choices: `enabled`, `disabled`
   - Default value: `disabled`
-- `wait_igp_conv` (String) Delay initial bestpath until redistributed IGPs have converged
+- `wait_igp_converged` (String) Delay initial bestpath until redistributed IGPs have converged
   - Choices: `enabled`, `disabled`
   - Default value: `disabled`
 

diff --git a/examples/resources/nxos_bgp_address_family/resource.tf b/examples/resources/nxos_bgp_address_family/resource.tf
@@ -1,22 +1,22 @@
 resource "nxos_bgp_address_family" "example" {
-  asn                          = "65001"
-  vrf                          = "default"
-  address_family               = "ipv4-ucast"
-  critical_nexthop_timeout     = "2500"
-  non_critical_nexthop_timeout = "8000"
-  adv_l2vpn_evpn               = "disabled"
-  adv_phyip_for_type5_routes   = "disabled"
-  max_ecmp_paths               = 2
-  max_ext_ecmp_paths           = 1
-  max_ext_int_ecmp_paths       = 1
-  max_eqcost_ecmp_paths        = 1
-  max_mixcost_ecmp_paths       = 1
-  def_inf_originate            = "disabled"
-  next_hop_route_map_name      = "ROUTEMAP1"
-  prefix_priority              = "none"
-  retain_rt_all                = "disabled"
-  adv_only_act_routes          = "disabled"
-  route_map_name               = "ROUTE_MAP1"
-  vni_ethtag                   = "disabled"
-  wait_igp_conv                = "disabled"
+  asn                                    = "65001"
+  vrf                                    = "default"
+  address_family                         = "ipv4-ucast"
+  critical_nexthop_timeout               = "2500"
+  non_critical_nexthop_timeout           = "8000"
+  advertise_l2vpn_evpn                   = "disabled"
+  advertise_physical_ip_for_type5_routes = "disabled"
+  max_ecmp_paths                         = 2
+  max_external_ecmp_paths                = 1
+  max_external_internal_ecmp_paths       = 1
+  max_local_ecmp_paths                   = 1
+  max_mixed_ecmp_paths                   = 1
+  default_information_originate          = "disabled"
+  next_hop_route_map_name                = "ROUTEMAP1"
+  prefix_priority                        = "none"
+  retain_rt_all                          = "disabled"
+  advertise_only_active_routes           = "disabled"
+  table_map_route_map_name               = "ROUTE_MAP1"
+  vni_ethernet_tag                       = "disabled"
+  wait_igp_converged                     = "disabled"
 }
diff --git a/gen/definitions/bgp_address_family.yaml b/gen/definitions/bgp_address_family.yaml
@@ -61,7 +61,7 @@ attributes:
     default_value: "noncrit"
     example: 8000
   - nxos_name: advertL2vpnEvpn
-    tf_name: adv_l2vpn_evpn
+    tf_name: advertise_l2vpn_evpn
     type: String
     description: "Enable or disable the advertisement of L2VPN EVPN routes."
     enum_values:
@@ -70,7 +70,7 @@ attributes:
     default_value: disabled
     example: disabled
   - nxos_name: advPip
-    tf_name: adv_phyip_for_type5_routes
+    tf_name: advertise_physical_ip_for_type5_routes
     type: String
     description: "Advertise physical IP for type-5 routes"
     enum_values:
@@ -87,39 +87,39 @@ attributes:
     default_value: 1
     example: 2
   - nxos_name: maxExtEcmp
-    tf_name: max_ext_ecmp_paths
+    tf_name: max_external_ecmp_paths
     type: Int64
     description: "Maximum number of external ECMP paths."
     min_int: 1
     max_int: 128
     default_value: 1
     example: 1
   - nxos_name: maxExtIntEcmp
-    tf_name: max_ext_int_ecmp_paths
+    tf_name: max_external_internal_ecmp_paths
     type: Int64
     description: "Maximum number of external/internal ECMP paths."
     min_int: 1
     max_int: 128
     default_value: 1
     example: 1
   - nxos_name: maxLclEcmp
-    tf_name: max_eqcost_ecmp_paths
+    tf_name: max_local_ecmp_paths
     type: Int64
     description: "Maximum number of equal-cost multipath for local paths ECMP paths."
     min_int: 1
     max_int: 128
     default_value: 1
     example: 1
   - nxos_name: maxMxdEcmp
-    tf_name: max_mixcost_ecmp_paths
+    tf_name: max_mixed_ecmp_paths
     type: Int64
     description: "Maximum mixed equal-cost multipath for local and remote ECMP paths."
     min_int: 1
     max_int: 128
     default_value: 1
     example: 1
   - nxos_name: defInfOriginate
-    tf_name: def_inf_originate
+    tf_name: default_information_originate
     type: String
     description: "Enable or disable the default-information originate."
     enum_values:
@@ -152,7 +152,7 @@ attributes:
     default_value: disabled
     example: disabled
   - nxos_name: supprInactive
-    tf_name: adv_only_act_routes
+    tf_name: advertise_only_active_routes
     type: String
     description: "Advertise only active routes to peers"
     enum_values:
@@ -161,13 +161,13 @@ attributes:
     default_value: disabled
     example: disabled
   - nxos_name: tblMap
-    tf_name: route_map_name
+    tf_name: table_map_route_map_name
     type: String
     description: "Route Map name"
     example: ROUTE_MAP1
     default_value: ""
   - nxos_name: vniEthTag
-    tf_name: vni_ethtag
+    tf_name: vni_ethernet_tag
     type: String
     description: "Allow VNI in Ethernet Tag field in EVPN route"
     enum_values:
@@ -176,7 +176,7 @@ attributes:
     default_value: disabled
     example: disabled
   - nxos_name: waitIgpConv
-    tf_name: wait_igp_conv
+    tf_name: wait_igp_converged
     type: String
     description: "Delay initial bestpath until redistributed IGPs have converged"
     enum_values:

diff --git a/internal/provider/data_source_nxos_bgp_address_family.go b/internal/provider/data_source_nxos_bgp_address_family.go