Update bgp address family resources

CiscoDevNet · Sep 15, 2023 · b68cfe3 · b68cfe3
1 parent 0c4140b
commit b68cfe3
Show file tree

Hide file tree

Showing 39 changed files with 395 additions and 181 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@
 - Add `spanning_tree_link_type` and `ip_dhcp_snooping_trust` attributes to `iosxe_interface_port_channel` resource and data source
 - Add `compress_config`, `sequence_numbers` and `call_home` attributes to `iosxe_service` resource and data source
 - Add `hosts`, `system_shutdown` and `enable_traps_*` attributes to `iosxe_snmp_server` resource and data source
+- BREAKING CHANGE: Rename `advertise_l2vpn_evpn` attribute to `ipv4_unicast_advertise_l2vpn_evpn` of `iosxe_bgp_address_family_ipv4_vrf` resource and data source
+- BREAKING CHANGE: Rename `redistribute_connected` attribute to `ipv4_unicast_redistribute_connected` of `iosxe_bgp_address_family_ipv4_vrf` resource and data source
+- BREAKING CHANGE: Rename `redistribute_static` attribute to `ipv4_unicast_redistribute_static` of `iosxe_bgp_address_family_ipv4_vrf` resource and data source
+- Add `ipv4_unicast_redistribute_connected` attribute to `iosxe_bgp_address_family_ipv4` resource and data source
+- Add `ipv4_unicast_redistribute_static` attribute to `iosxe_bgp_address_family_ipv4` resource and data source
+- BREAKING CHANGE: Rename `advertise_l2vpn_evpn` attribute to `ipv6_unicast_advertise_l2vpn_evpn` of `iosxe_bgp_address_family_ipv6_vrf` resource and data source
+- BREAKING CHANGE: Rename `redistribute_connected` attribute to `ipv6_unicast_redistribute_connected` of `iosxe_bgp_address_family_ipv6_vrf` resource and data source
+- BREAKING CHANGE: Rename `redistribute_static` attribute to `ipv6_unicast_redistribute_static` of `iosxe_bgp_address_family_ipv6_vrf` resource and data source
+- Add `ipv6_unicast_redistribute_connected` attribute to `iosxe_bgp_address_family_ipv6` resource and data source
+- Add `ipv6_unicast_redistribute_static` attribute to `iosxe_bgp_address_family_ipv6` resource and data source
 
 ## 0.4.0
 

diff --git a/docs/data-sources/bgp_address_family_ipv4.md b/docs/data-sources/bgp_address_family_ipv4.md
@@ -36,6 +36,8 @@ data "iosxe_bgp_address_family_ipv4" "example" {
 - `id` (String) The path of the retrieved object.
 - `ipv4_unicast_networks` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--ipv4_unicast_networks))
 - `ipv4_unicast_networks_mask` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--ipv4_unicast_networks_mask))
+- `ipv4_unicast_redistribute_connected` (Boolean) Connected
+- `ipv4_unicast_redistribute_static` (Boolean) Static routes
 
 <a id="nestedatt--ipv4_unicast_networks"></a>
 ### Nested Schema for `ipv4_unicast_networks`

diff --git a/docs/data-sources/bgp_address_family_ipv4_vrf.md b/docs/data-sources/bgp_address_family_ipv4_vrf.md
@@ -41,12 +41,12 @@ data "iosxe_bgp_address_family_ipv4_vrf" "example" {
 
 Read-Only:
 
-- `advertise_l2vpn_evpn` (Boolean) Advertise/export prefixes to l2vpn evpn table
+- `ipv4_unicast_advertise_l2vpn_evpn` (Boolean) Advertise/export prefixes to l2vpn evpn table
 - `ipv4_unicast_networks` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--vrfs--ipv4_unicast_networks))
 - `ipv4_unicast_networks_mask` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--vrfs--ipv4_unicast_networks_mask))
+- `ipv4_unicast_redistribute_connected` (Boolean) Connected
+- `ipv4_unicast_redistribute_static` (Boolean) Static routes
 - `name` (String)
-- `redistribute_connected` (Boolean) Connected
-- `redistribute_static` (Boolean) Static routes
 
 <a id="nestedatt--vrfs--ipv4_unicast_networks"></a>
 ### Nested Schema for `vrfs.ipv4_unicast_networks`

diff --git a/docs/data-sources/bgp_address_family_ipv6.md b/docs/data-sources/bgp_address_family_ipv6.md
@@ -35,6 +35,8 @@ data "iosxe_bgp_address_family_ipv6" "example" {
 
 - `id` (String) The path of the retrieved object.
 - `ipv6_unicast_networks` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--ipv6_unicast_networks))
+- `ipv6_unicast_redistribute_connected` (Boolean) Connected
+- `ipv6_unicast_redistribute_static` (Boolean) Static routes
 
 <a id="nestedatt--ipv6_unicast_networks"></a>
 ### Nested Schema for `ipv6_unicast_networks`

diff --git a/docs/data-sources/bgp_address_family_ipv6_vrf.md b/docs/data-sources/bgp_address_family_ipv6_vrf.md
@@ -41,11 +41,11 @@ data "iosxe_bgp_address_family_ipv6_vrf" "example" {
 
 Read-Only:
 
-- `advertise_l2vpn_evpn` (Boolean) Advertise/export prefixes to l2vpn evpn table
+- `ipv6_unicast_advertise_l2vpn_evpn` (Boolean) Advertise/export prefixes to l2vpn evpn table
 - `ipv6_unicast_networks` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--vrfs--ipv6_unicast_networks))
+- `ipv6_unicast_redistribute_connected` (Boolean) Connected
+- `ipv6_unicast_redistribute_static` (Boolean) Static routes
 - `name` (String)
-- `redistribute_connected` (Boolean) Connected
-- `redistribute_static` (Boolean) Static routes
 
 <a id="nestedatt--vrfs--ipv6_unicast_networks"></a>
 ### Nested Schema for `vrfs.ipv6_unicast_networks`

diff --git a/docs/guides/changelog.md b/docs/guides/changelog.md
@@ -14,6 +14,16 @@ description: |-
 - Add `spanning_tree_link_type` and `ip_dhcp_snooping_trust` attributes to `iosxe_interface_port_channel` resource and data source
 - Add `compress_config`, `sequence_numbers` and `call_home` attributes to `iosxe_service` resource and data source
 - Add `hosts`, `system_shutdown` and `enable_traps_*` attributes to `iosxe_snmp_server` resource and data source
+- BREAKING CHANGE: Rename `advertise_l2vpn_evpn` attribute to `ipv4_unicast_advertise_l2vpn_evpn` of `iosxe_bgp_address_family_ipv4_vrf` resource and data source
+- BREAKING CHANGE: Rename `redistribute_connected` attribute to `ipv4_unicast_redistribute_connected` of `iosxe_bgp_address_family_ipv4_vrf` resource and data source
+- BREAKING CHANGE: Rename `redistribute_static` attribute to `ipv4_unicast_redistribute_static` of `iosxe_bgp_address_family_ipv4_vrf` resource and data source
+- Add `ipv4_unicast_redistribute_connected` attribute to `iosxe_bgp_address_family_ipv4` resource and data source
+- Add `ipv4_unicast_redistribute_static` attribute to `iosxe_bgp_address_family_ipv4` resource and data source
+- BREAKING CHANGE: Rename `advertise_l2vpn_evpn` attribute to `ipv6_unicast_advertise_l2vpn_evpn` of `iosxe_bgp_address_family_ipv6_vrf` resource and data source
+- BREAKING CHANGE: Rename `redistribute_connected` attribute to `ipv6_unicast_redistribute_connected` of `iosxe_bgp_address_family_ipv6_vrf` resource and data source
+- BREAKING CHANGE: Rename `redistribute_static` attribute to `ipv6_unicast_redistribute_static` of `iosxe_bgp_address_family_ipv6_vrf` resource and data source
+- Add `ipv6_unicast_redistribute_connected` attribute to `iosxe_bgp_address_family_ipv6` resource and data source
+- Add `ipv6_unicast_redistribute_static` attribute to `iosxe_bgp_address_family_ipv6` resource and data source
 
 ## 0.4.0
 

diff --git a/docs/resources/bgp_address_family_ipv4.md b/docs/resources/bgp_address_family_ipv4.md
@@ -14,8 +14,10 @@ This resource can manage the BGP Address Family IPv4 configuration.
 
 ```terraform
 resource "iosxe_bgp_address_family_ipv4" "example" {
-  asn     = "65000"
-  af_name = "unicast"
+  asn                                 = "65000"
+  af_name                             = "unicast"
+  ipv4_unicast_redistribute_connected = true
+  ipv4_unicast_redistribute_static    = true
   ipv4_unicast_networks_mask = [
     {
       network   = "12.0.0.0"
@@ -49,6 +51,8 @@ resource "iosxe_bgp_address_family_ipv4" "example" {
 - `device` (String) A device name from the provider configuration.
 - `ipv4_unicast_networks` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--ipv4_unicast_networks))
 - `ipv4_unicast_networks_mask` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--ipv4_unicast_networks_mask))
+- `ipv4_unicast_redistribute_connected` (Boolean) Connected
+- `ipv4_unicast_redistribute_static` (Boolean) Static routes
 
 ### Read-Only
 

diff --git a/docs/resources/bgp_address_family_ipv4_vrf.md b/docs/resources/bgp_address_family_ipv4_vrf.md
@@ -18,10 +18,10 @@ resource "iosxe_bgp_address_family_ipv4_vrf" "example" {
   af_name = "unicast"
   vrfs = [
     {
-      name                   = "VRF1"
-      advertise_l2vpn_evpn   = true
-      redistribute_connected = true
-      redistribute_static    = true
+      name                                = "VRF1"
+      ipv4_unicast_advertise_l2vpn_evpn   = true
+      ipv4_unicast_redistribute_connected = true
+      ipv4_unicast_redistribute_static    = true
       ipv4_unicast_networks_mask = [
         {
           network   = "12.0.0.0"
@@ -70,11 +70,11 @@ Required:
 
 Optional:
 
-- `advertise_l2vpn_evpn` (Boolean) Advertise/export prefixes to l2vpn evpn table
+- `ipv4_unicast_advertise_l2vpn_evpn` (Boolean) Advertise/export prefixes to l2vpn evpn table
 - `ipv4_unicast_networks` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--vrfs--ipv4_unicast_networks))
 - `ipv4_unicast_networks_mask` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--vrfs--ipv4_unicast_networks_mask))
-- `redistribute_connected` (Boolean) Connected
-- `redistribute_static` (Boolean) Static routes
+- `ipv4_unicast_redistribute_connected` (Boolean) Connected
+- `ipv4_unicast_redistribute_static` (Boolean) Static routes
 
 <a id="nestedatt--vrfs--ipv4_unicast_networks"></a>
 ### Nested Schema for `vrfs.ipv4_unicast_networks`

diff --git a/docs/resources/bgp_address_family_ipv6.md b/docs/resources/bgp_address_family_ipv6.md
@@ -14,11 +14,13 @@ This resource can manage the BGP Address Family IPv6 configuration.
 
 ```terraform
 resource "iosxe_bgp_address_family_ipv6" "example" {
-  asn     = "65000"
-  af_name = "unicast"
+  asn                                 = "65000"
+  af_name                             = "unicast"
+  ipv6_unicast_redistribute_connected = true
+  ipv6_unicast_redistribute_static    = true
   ipv6_unicast_networks = [
     {
-      network   = "2001:1234::0/64"
+      network   = "2001:1234::/64"
       route_map = "RM1"
       backdoor  = true
     }
@@ -40,6 +42,8 @@ resource "iosxe_bgp_address_family_ipv6" "example" {
   - Choices: `all`, `attributes`
 - `device` (String) A device name from the provider configuration.
 - `ipv6_unicast_networks` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--ipv6_unicast_networks))
+- `ipv6_unicast_redistribute_connected` (Boolean) Connected
+- `ipv6_unicast_redistribute_static` (Boolean) Static routes
 
 ### Read-Only
 

diff --git a/docs/resources/bgp_address_family_ipv6_vrf.md b/docs/resources/bgp_address_family_ipv6_vrf.md
@@ -18,13 +18,13 @@ resource "iosxe_bgp_address_family_ipv6_vrf" "example" {
   af_name = "unicast"
   vrfs = [
     {
-      name                   = "VRF1"
-      advertise_l2vpn_evpn   = true
-      redistribute_connected = true
-      redistribute_static    = true
+      name                                = "VRF1"
+      ipv6_unicast_advertise_l2vpn_evpn   = true
+      ipv6_unicast_redistribute_connected = true
+      ipv6_unicast_redistribute_static    = true
       ipv6_unicast_networks = [
         {
-          network   = "2001:1234::0/64"
+          network   = "2001:1234::/64"
           route_map = "RM1"
           backdoor  = true
           evpn      = false
@@ -63,10 +63,10 @@ Required:
 
 Optional:
 
-- `advertise_l2vpn_evpn` (Boolean) Advertise/export prefixes to l2vpn evpn table
+- `ipv6_unicast_advertise_l2vpn_evpn` (Boolean) Advertise/export prefixes to l2vpn evpn table
 - `ipv6_unicast_networks` (Attributes List) Specify a network to announce via BGP (see [below for nested schema](#nestedatt--vrfs--ipv6_unicast_networks))
-- `redistribute_connected` (Boolean) Connected
-- `redistribute_static` (Boolean) Static routes
+- `ipv6_unicast_redistribute_connected` (Boolean) Connected
+- `ipv6_unicast_redistribute_static` (Boolean) Static routes
 
 <a id="nestedatt--vrfs--ipv6_unicast_networks"></a>
 ### Nested Schema for `vrfs.ipv6_unicast_networks`

diff --git a/examples/resources/iosxe_bgp_address_family_ipv4/resource.tf b/examples/resources/iosxe_bgp_address_family_ipv4/resource.tf
@@ -1,6 +1,8 @@
 resource "iosxe_bgp_address_family_ipv4" "example" {
-  asn     = "65000"
-  af_name = "unicast"
+  asn                                 = "65000"
+  af_name                             = "unicast"
+  ipv4_unicast_redistribute_connected = true
+  ipv4_unicast_redistribute_static    = true
   ipv4_unicast_networks_mask = [
     {
       network   = "12.0.0.0"

diff --git a/examples/resources/iosxe_bgp_address_family_ipv4_vrf/resource.tf b/examples/resources/iosxe_bgp_address_family_ipv4_vrf/resource.tf
@@ -3,10 +3,10 @@ resource "iosxe_bgp_address_family_ipv4_vrf" "example" {
   af_name = "unicast"
   vrfs = [
     {
-      name                   = "VRF1"
-      advertise_l2vpn_evpn   = true
-      redistribute_connected = true
-      redistribute_static    = true
+      name                                = "VRF1"
+      ipv4_unicast_advertise_l2vpn_evpn   = true
+      ipv4_unicast_redistribute_connected = true
+      ipv4_unicast_redistribute_static    = true
       ipv4_unicast_networks_mask = [
         {
           network   = "12.0.0.0"

diff --git a/examples/resources/iosxe_bgp_address_family_ipv6/resource.tf b/examples/resources/iosxe_bgp_address_family_ipv6/resource.tf
@@ -1,9 +1,11 @@
 resource "iosxe_bgp_address_family_ipv6" "example" {
-  asn     = "65000"
-  af_name = "unicast"
+  asn                                 = "65000"
+  af_name                             = "unicast"
+  ipv6_unicast_redistribute_connected = true
+  ipv6_unicast_redistribute_static    = true
   ipv6_unicast_networks = [
     {
-      network   = "2001:1234::0/64"
+      network   = "2001:1234::/64"
       route_map = "RM1"
       backdoor  = true
     }

diff --git a/examples/resources/iosxe_bgp_address_family_ipv6_vrf/resource.tf b/examples/resources/iosxe_bgp_address_family_ipv6_vrf/resource.tf
@@ -3,13 +3,13 @@ resource "iosxe_bgp_address_family_ipv6_vrf" "example" {
   af_name = "unicast"
   vrfs = [
     {
-      name                   = "VRF1"
-      advertise_l2vpn_evpn   = true
-      redistribute_connected = true
-      redistribute_static    = true
+      name                                = "VRF1"
+      ipv6_unicast_advertise_l2vpn_evpn   = true
+      ipv6_unicast_redistribute_connected = true
+      ipv6_unicast_redistribute_static    = true
       ipv6_unicast_networks = [
         {
-          network   = "2001:1234::0/64"
+          network   = "2001:1234::/64"
           route_map = "RM1"
           backdoor  = true
           evpn      = false

diff --git a/gen/definitions/bgp_address_family_ipv4.yaml b/gen/definitions/bgp_address_family_ipv4.yaml
@@ -8,6 +8,12 @@ attributes:
     example: 65000
   - yang_name: af-name
     example: unicast
+  - yang_name: ipv4-unicast/redistribute/connected
+    tf_name: ipv4_unicast_redistribute_connected
+    example: true
+  - yang_name: ipv4-unicast/redistribute/static
+    tf_name: ipv4_unicast_redistribute_static
+    example: true
   - yang_name: ipv4-unicast/network/with-mask
     tf_name: ipv4_unicast_networks_mask
     type: List

diff --git a/gen/definitions/bgp_address_family_ipv4_vrf.yaml b/gen/definitions/bgp_address_family_ipv4_vrf.yaml
@@ -17,13 +17,13 @@ attributes:
         example: VRF1
         id: true
       - yang_name: ipv4-unicast/advertise/l2vpn/evpn
-        tf_name: advertise_l2vpn_evpn
+        tf_name: ipv4_unicast_advertise_l2vpn_evpn
         example: true
       - yang_name: ipv4-unicast/redistribute-vrf/connected
-        tf_name: redistribute_connected
+        tf_name: ipv4_unicast_redistribute_connected
         example: true
       - yang_name: ipv4-unicast/redistribute-vrf/static
-        tf_name: redistribute_static
+        tf_name: ipv4_unicast_redistribute_static
         example: true
       - yang_name: ipv4-unicast/network/with-mask
         tf_name: ipv4_unicast_networks_mask

diff --git a/gen/definitions/bgp_address_family_ipv6.yaml b/gen/definitions/bgp_address_family_ipv6.yaml
@@ -8,14 +8,20 @@ attributes:
     example: 65000
   - yang_name: af-name
     example: unicast
+  - yang_name: ipv6-unicast/redistribute-v6/connected
+    tf_name: ipv6_unicast_redistribute_connected
+    example: true
+  - yang_name: ipv6-unicast/redistribute-v6/static
+    tf_name: ipv6_unicast_redistribute_static
+    example: true
   - yang_name: ipv6-unicast/network
     tf_name: ipv6_unicast_networks
     type: List
     attributes:
       - yang_name: number
         tf_name: network
         id: true
-        example: 2001:1234::0/64
+        example: 2001:1234::/64
       - yang_name: route-map
         example: RM1
       - yang_name: backdoor

diff --git a/gen/definitions/bgp_address_family_ipv6_vrf.yaml b/gen/definitions/bgp_address_family_ipv6_vrf.yaml
@@ -17,13 +17,13 @@ attributes:
         example: VRF1
         id: true
       - yang_name: ipv6-unicast/advertise/l2vpn/evpn
-        tf_name: advertise_l2vpn_evpn
+        tf_name: ipv6_unicast_advertise_l2vpn_evpn
         example: true
       - yang_name: ipv6-unicast/redistribute-v6/connected
-        tf_name: redistribute_connected
+        tf_name: ipv6_unicast_redistribute_connected
         example: true
       - yang_name: ipv6-unicast/redistribute-v6/static
-        tf_name: redistribute_static
+        tf_name: ipv6_unicast_redistribute_static
         example: true
       - yang_name: ipv6-unicast/network
         tf_name: ipv6_unicast_networks
@@ -32,7 +32,7 @@ attributes:
           - yang_name: number
             tf_name: network
             id: true
-            example: 2001:1234::0/64
+            example: 2001:1234::/64
           - yang_name: route-map
             example: RM1
           - yang_name: backdoor

diff --git a/internal/provider/data_source_iosxe_bgp_address_family_ipv4.go b/internal/provider/data_source_iosxe_bgp_address_family_ipv4.go
diff --git a/internal/provider/data_source_iosxe_bgp_address_family_ipv4_test.go b/internal/provider/data_source_iosxe_bgp_address_family_ipv4_test.go
diff --git a/internal/provider/data_source_iosxe_bgp_address_family_ipv4_vrf.go b/internal/provider/data_source_iosxe_bgp_address_family_ipv4_vrf.go