Fix bgp ospf controls (#244)

CiscoDevNet · Jun 23, 2024 · dca17a3 · dca17a3
1 parent b053e52
commit dca17a3
Show file tree

Hide file tree

Showing 16 changed files with 115 additions and 70 deletions.
diff --git a/docs/data-sources/bgp_peer.md b/docs/data-sources/bgp_peer.md
@@ -45,7 +45,9 @@ data "nxos_bgp_peer" "example" {
 - `keepalive` (Number) BGP Keepalive Timer in seconds
 - `password` (String) Password.
 - `password_type` (String) Password Encryption Type.
-- `peer_control` (String) Peer Controls.
+- `peer_control` (String) Peer Controls. Choices: `bfd`, `dis-conn-check`, `cap-neg-off`, `no-dyn-cap`. Can be an empty string. Allowed formats:
+  - Single value. Example: `bfd`
+  - Multiple values (comma-separated). Example: `bfd,dis-conn-check`. In this case values must be in alphabetical order.
 - `peer_template` (String) Peer template name.
 - `peer_type` (String) Neighbor Fabric Type.
 - `remote_asn` (String) Peer autonomous system number.

diff --git a/docs/data-sources/ospf_vrf.md b/docs/data-sources/ospf_vrf.md
@@ -39,7 +39,9 @@ data "nxos_ospf_vrf" "example" {
 - `admin_state` (String) Administrative state.
 - `bandwidth_reference` (Number) Bandwidth reference value.
 - `bandwidth_reference_unit` (String) Bandwidth reference unit.
-- `control` (String) Controls.
+- `control` (String) Controls. Choices: `unspecified`, `bfd`, `name-lookup`, `default-passive`, `segrt`. Can be an empty string. Allowed formats:
+  - Single value. Example: `bfd`
+  - Multiple values (comma-separated). Example: `bfd,default-passive`. In this case values must be in alphabetical order.
 - `distance` (Number) Administrative distance preference.
 - `id` (String) The distinguished name of the object.
 - `router_id` (String) Router ID.
diff --git a/docs/resources/bgp_peer.md b/docs/resources/bgp_peer.md
@@ -47,7 +47,7 @@ resource "nxos_bgp_peer" "example" {
   hold_time         = 45
   keepalive         = 15
   ebgp_multihop_ttl = 5
-  peer_control      = "bfd"
+  peer_control      = "bfd,dis-conn-check"
   password_type     = "LINE"
   password          = "secret_password"
 }
@@ -77,8 +77,9 @@ resource "nxos_bgp_peer" "example" {
 - `password` (String) Password.
 - `password_type` (String) Password Encryption Type.
   - Choices: `0`, `3`, `LINE`, `7`
-- `peer_control` (String) Peer Controls.
-  - Choices: `bfd`, `dis-conn-check`, `cap-neg-off`, `no-dyn-cap`
+- `peer_control` (String) Peer Controls. Choices: `bfd`, `dis-conn-check`, `cap-neg-off`, `no-dyn-cap`. Can be an empty string. Allowed formats:
+  - Single value. Example: `bfd`
+  - Multiple values (comma-separated). Example: `bfd,dis-conn-check`. In this case values must be in alphabetical order.
 - `peer_template` (String) Peer template name.
 - `peer_type` (String) Neighbor Fabric Type.
   - Choices: `fabric-internal`, `fabric-external`, `fabric-border-leaf`

diff --git a/docs/resources/ospf_vrf.md b/docs/resources/ospf_vrf.md
@@ -43,7 +43,7 @@ resource "nxos_ospf_vrf" "example" {
   bandwidth_reference_unit = "mbps"
   distance                 = 110
   router_id                = "34.56.78.90"
-  control                  = "bfd"
+  control                  = "bfd,default-passive"
 }
 ```
 
@@ -66,8 +66,10 @@ resource "nxos_ospf_vrf" "example" {
 - `bandwidth_reference_unit` (String) Bandwidth reference unit.
   - Choices: `mbps`, `gbps`
   - Default value: `mbps`
-- `control` (String) Controls.
-  - Choices: `unspecified`, `bfd`, `name-lookup`, `default-passive`, `segrt`
+- `control` (String) Controls. Choices: `unspecified`, `bfd`, `name-lookup`, `default-passive`, `segrt`. Can be an empty string. Allowed formats:
+  - Single value. Example: `bfd`
+  - Multiple values (comma-separated). Example: `bfd,default-passive`. In this case values must be in alphabetical order.
+  - Default value: `unspecified`
 - `device` (String) A device name from the provider configuration.
 - `distance` (Number) Administrative distance preference.
   - Range: `1`-`255`

diff --git a/examples/resources/nxos_bgp_peer/resource.tf b/examples/resources/nxos_bgp_peer/resource.tf
@@ -10,7 +10,7 @@ resource "nxos_bgp_peer" "example" {
   hold_time         = 45
   keepalive         = 15
   ebgp_multihop_ttl = 5
-  peer_control      = "bfd"
+  peer_control      = "bfd,dis-conn-check"
   password_type     = "LINE"
   password          = "secret_password"
 }
diff --git a/examples/resources/nxos_ospf_vrf/resource.tf b/examples/resources/nxos_ospf_vrf/resource.tf
@@ -6,5 +6,5 @@ resource "nxos_ospf_vrf" "example" {
   bandwidth_reference_unit = "mbps"
   distance                 = 110
   router_id                = "34.56.78.90"
-  control                  = "bfd"
+  control                  = "bfd,default-passive"
 }
diff --git a/gen/definitions/bgp_peer.yaml b/gen/definitions/bgp_peer.yaml
@@ -91,13 +91,8 @@ attributes:
   - nxos_name: ctrl
     tf_name: peer_control
     type: String
-    description: "Peer Controls."
-    enum_values:
-      - bfd
-      - dis-conn-check
-      - cap-neg-off
-      - no-dyn-cap
-    example: bfd
+    description: 'Peer Controls. Choices: `bfd`, `dis-conn-check`, `cap-neg-off`, `no-dyn-cap`. Can be an empty string. Allowed formats:\n  - Single value. Example: `bfd`\n  - Multiple values (comma-separated). Example: `bfd,dis-conn-check`. In this case values must be in alphabetical order.'
+    example: 'bfd,dis-conn-check'
   - nxos_name: passwdType
     tf_name: password_type
     type: String
@@ -123,20 +118,27 @@ test_prerequisites:
     attributes:
       - name: adminSt
         value: enabled
+  - dn: sys/fm/bfd
+    class_name: fmBfd
+    dependencies: [0]
+    no_delete: true
+    attributes:
+      - name: adminSt
+        value: enabled
   - dn: sys/bgp
     class_name: bgpEntity
-    dependencies: [0]
+    dependencies: [1]
   - dn: sys/bgp/inst
     class_name: bgpInst
     attributes:
       - name: adminSt
         value: enabled
       - name: asn
         value: "65001"
-    dependencies: [1]
+    dependencies: [2]
   - dn: sys/bgp/inst/dom-[default]
     class_name: bgpDom
     attributes:
       - name: name
         value: default
-    dependencies: [2]
+    dependencies: [3]
diff --git a/gen/definitions/ospf_vrf.yaml b/gen/definitions/ospf_vrf.yaml
@@ -70,27 +70,28 @@ attributes:
   - nxos_name: ctrl
     tf_name: control
     type: String
-    description: "Controls."
-    enum_values:
-      - unspecified
-      - bfd
-      - name-lookup
-      - default-passive
-      - segrt
-    example: bfd
+    description: 'Controls. Choices: `unspecified`, `bfd`, `name-lookup`, `default-passive`, `segrt`. Can be an empty string. Allowed formats:\n  - Single value. Example: `bfd`\n  - Multiple values (comma-separated). Example: `bfd,default-passive`. In this case values must be in alphabetical order.'
+    example: 'bfd,default-passive'
 test_prerequisites:
   - dn: sys/fm/ospf
     class_name: fmOspf
     no_delete: true
     attributes:
       - name: adminSt
         value: enabled
+  - dn: sys/fm/bfd
+    class_name: fmBfd
+    dependencies: [0]
+    no_delete: true
+    attributes:
+      - name: adminSt
+        value: enabled
   - dn: sys/ospf
     class_name: ospfEntity
-    dependencies: [0]
+    dependencies: [1]
   - dn: sys/ospf/inst-[OSPF1]
     class_name: ospfInst
     attributes:
       - name: name
         value: OSPF1
-    dependencies: [1]
+    dependencies: [2]
diff --git a/internal/provider/data_source_nxos_bgp_peer.go b/internal/provider/data_source_nxos_bgp_peer.go
diff --git a/internal/provider/data_source_nxos_bgp_peer_test.go b/internal/provider/data_source_nxos_bgp_peer_test.go
diff --git a/internal/provider/data_source_nxos_ospf_vrf.go b/internal/provider/data_source_nxos_ospf_vrf.go
diff --git a/internal/provider/data_source_nxos_ospf_vrf_test.go b/internal/provider/data_source_nxos_ospf_vrf_test.go
diff --git a/internal/provider/resource_nxos_bgp_peer.go b/internal/provider/resource_nxos_bgp_peer.go
diff --git a/internal/provider/resource_nxos_bgp_peer_test.go b/internal/provider/resource_nxos_bgp_peer_test.go