add wireless_device_provision, add additional params in enterprise_ssid, increase timeout in fabric_device

Author: kuba-mazurkiewicz

docs/data-sources/wireless_enterprise_ssid.md

@@ -28,6 +28,7 @@ data "catalystcenter_wireless_enterprise_ssid" "example" {
 ### Read-Only
 
 - `aaa_override` (Boolean) AAA Override
+- `auth_key_mgmt` (Set of String) Takes string inputs for the AKMs that should be set true. Possible AKM values : dot1x,dot1x_ft, dot1x_sha, psk, psk_ft, psk_sha, owe, sae, sae_ft
 - `basic_service_set_client_idle_timeout` (Number) Basic Service Set Client Idle Timeout
 - `client_exclusion_timeout` (Number) Client Exclusion Timeout
 - `client_rate_limit` (Number) Client Rate Limit (in bits per second)
@@ -41,6 +42,8 @@ data "catalystcenter_wireless_enterprise_ssid" "example" {
 - `enable_neighbor_list` (Boolean) Enable Neighbor List
 - `enable_session_time_out` (Boolean) Enable Session Timeout
 - `fast_transition` (String) Fast Transition
+- `ghz24_policy` (String) Ghz24 Policy
+- `ghz6_policy_client_steering` (Boolean) Ghz6 Policy Client Steering
 - `mfp_client_protection` (String) Mfp Client Protection
 - `multi_psk_settings` (Attributes List) Multi PSK Settings (Only applicable for SSID with PERSONAL auth type and PSK) (see [below for nested schema](#nestedatt--multi_psk_settings))
 - `name` (String) SSID Name
@@ -50,6 +53,9 @@ data "catalystcenter_wireless_enterprise_ssid" "example" {
 - `profile_name` (String) Profile Name
 - `protected_management_frame` (String) Protected Management Frame
 - `radio_policy` (String) Radio Policy
+- `rsn_cipher_suite_ccmp256` (Boolean) Rsn Cipher Suite Ccmp256
+- `rsn_cipher_suite_gcmp128` (Boolean) Rsn Cipher Suite Gcmp 128
+- `rsn_cipher_suite_gcmp256` (Boolean) Rsn Cipher Suite Gcmp256
 - `security_level` (String) Security Level
 - `session_time_out` (Number) Session Time Out
 - `traffic_type` (String) Traffic Type

docs/resources/fabric_device.md

@@ -39,7 +39,6 @@ resource "catalystcenter_fabric_device" "example" {
 
 - `border_priority` (Number) Border priority of the fabric border device. A lower value indicates higher priority
   - Range: `1`-`9`
-  - Default value: `10`
 - `border_types` (List of String) List of the border types of the fabric device. Allowed values are [LAYER_2, LAYER_3]
 - `default_exit` (Boolean) Set this to make the fabric border device the gateway of last resort for this site. Any unknown traffic will be sent to this fabric border device from edge nodes
 - `import_external_routes` (Boolean) Set this to import external routes from other routing protocols (such as BGP) to the fabric control plane

docs/resources/wireless_device_provision.md

@@ -0,0 +1,50 @@
+---
+# generated by https://github.com/hashicorp/terraform-plugin-docs
+page_title: "catalystcenter_wireless_device_provision Resource - terraform-provider-catalystcenter"
+subcategory: "Wireless"
+description: |-
+  This resource provision wireless device. Every time this resource is created or re-created, the Catalyst Center considers provisioning new wireless device. When this resource is destroyed or updated or refreshed, no actions are done either on CatalystCenter or on devices
+---
+
+# catalystcenter_wireless_device_provision (Resource)
+
+This resource provision wireless device. Every time this resource is created or re-created, the Catalyst Center considers provisioning new wireless device. When this resource is destroyed or updated or refreshed, no actions are done either on CatalystCenter or on devices
+
+## Example Usage
+
+```terraform
+resource "catalystcenter_wireless_device_provision" "example" {
+  device_name          = "WLC_01"
+  site                 = "Global/Area1"
+  managed_ap_locations = ["Global/Area1"]
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- `device_name` (String) Controller Name
+- `managed_ap_locations` (Set of String) List of managed AP locations
+- `site` (String) Full Site Hierarchy where device has to be assigned
+
+### Optional
+
+- `dynamic_interfaces` (Attributes List) Dynamic Interface Details. The required attributes depend on the device type (see [below for nested schema](#nestedatt--dynamic_interfaces))
+
+### Read-Only
+
+- `id` (String) The id of the object
+
+<a id="nestedatt--dynamic_interfaces"></a>
+### Nested Schema for `dynamic_interfaces`
+
+Optional:
+
+- `interface_gateway` (String) Interface Gateway. Required for AireOS
+- `interface_ip_address` (String) Interface IP Address. Required for AireOS
+- `interface_name` (String) Interface Name. Required for both AireOS and EWLC.
+- `interface_netmask` (Number) Interface Netmask In CIDR. Required for AireOS
+- `lag_or_port_number` (String) LAG or Port Number. Required for AireOS
+- `vlan_id` (Number) VLAN ID. Required for both AireOS and EWLC

docs/resources/wireless_enterprise_ssid.md

@@ -48,6 +48,7 @@ resource "catalystcenter_wireless_enterprise_ssid" "example" {
 ### Optional
 
 - `aaa_override` (Boolean) AAA Override
+- `auth_key_mgmt` (Set of String) Takes string inputs for the AKMs that should be set true. Possible AKM values : dot1x,dot1x_ft, dot1x_sha, psk, psk_ft, psk_sha, owe, sae, sae_ft
 - `basic_service_set_client_idle_timeout` (Number) Basic Service Set Client Idle Timeout
 - `client_exclusion_timeout` (Number) Client Exclusion Timeout
 - `client_rate_limit` (Number) Client Rate Limit (in bits per second)
@@ -62,6 +63,9 @@ resource "catalystcenter_wireless_enterprise_ssid" "example" {
 - `enable_session_time_out` (Boolean) Enable Session Timeout
 - `fast_transition` (String) Fast Transition
   - Choices: `Adaptive`, `Enable`, `Disable`
+- `ghz24_policy` (String) Ghz24 Policy
+  - Choices: `dot11-g-only`, `dot11-bg-only`
+- `ghz6_policy_client_steering` (Boolean) Ghz6 Policy Client Steering
 - `mfp_client_protection` (String) Mfp Client Protection
   - Choices: `Optional`, `Disabled`, `Required`
 - `multi_psk_settings` (Attributes List) Multi PSK Settings (Only applicable for SSID with PERSONAL auth type and PSK) (see [below for nested schema](#nestedatt--multi_psk_settings))
@@ -73,6 +77,9 @@ resource "catalystcenter_wireless_enterprise_ssid" "example" {
   - Choices: `Optional`, `Disabled`, `Required`
 - `radio_policy` (String) Radio Policy
   - Choices: `Triple band operation(2.4GHz, 5GHz and 6GHz)`, `Triple band operation with band select`, `5GHz only`, `2.4GHz only`, `6GHz only`
+- `rsn_cipher_suite_ccmp256` (Boolean) Rsn Cipher Suite Ccmp256
+- `rsn_cipher_suite_gcmp128` (Boolean) Rsn Cipher Suite Gcmp 128
+- `rsn_cipher_suite_gcmp256` (Boolean) Rsn Cipher Suite Gcmp256
 - `session_time_out` (Number) Session Time Out
 - `traffic_type` (String) Traffic Type
   - Choices: `voicedata`, `data`

examples/resources/catalystcenter_wireless_device_provision/resource.tf

@@ -0,0 +1,5 @@
+resource "catalystcenter_wireless_device_provision" "example" {
+  device_name          = "WLC_01"
+  site                 = "Global/Area1"
+  managed_ap_locations = ["Global/Area1"]
+}

gen/definitions/fabric_device.yaml

@@ -74,7 +74,6 @@ attributes:
     max_int: 9
     description: Border priority of the fabric border device. A lower value indicates higher priority
     example: 5
-    default_value: 10
   - model_name: prependAutonomousSystemCount
     data_path: '0.borderDeviceSettings.layer3Settings'
     response_data_path: response.0.borderDeviceSettings.layer3Settings.prependAutonomousSystemCount

gen/definitions/wireless_device_provision.yaml

@@ -0,0 +1,67 @@
+---
+name: Wireless Device Provision
+rest_endpoint: /dna/intent/api/v1/wireless/provision
+res_description: 'This resource provision wireless device. Every time this resource is created or re-created, the Catalyst Center considers provisioning new wireless device.
+  When this resource is destroyed or updated or refreshed, no actions are done either on CatalystCenter or on devices'
+no_data_source: true
+no_read: true
+no_delete: true
+no_import: true
+put_no_id: true
+id_from_attribute: true
+doc_category: Wireless
+max_async_wait_time: 300
+test_tags: [WIRELESS]
+attributes:
+  - model_name: deviceName
+    requires_replace: true
+    data_path: '0'
+    id: true
+    mandatory: true
+    description: Controller Name
+    type: String
+    example: WLC_01
+  - model_name: site
+    requires_replace: true
+    data_path: '0'
+    mandatory: true
+    description: Full Site Hierarchy where device has to be assigned
+    type: String
+    example: Global/Area1
+  - model_name: managedAPLocations
+    tf_name: managed_ap_locations
+    requires_replace: true
+    data_path: '0'
+    mandatory: true
+    description: List of managed AP locations
+    type: Set
+    element_type: String
+    example: Global/Area1
+  - model_name: dynamicInterfaces
+    type: List
+    description: Dynamic Interface Details. The required attributes depend on the device type
+    requires_replace: true
+    data_path: '0'
+    exclude_test: true
+    attributes:
+      - model_name: interfaceIPAddress
+        tf_name: interface_ip_address
+        type: String
+        description: Interface IP Address. Required for AireOS
+      - model_name: interfaceNetmaskInCIDR
+        tf_name: interface_netmask
+        type: Int64
+        description: Interface Netmask In CIDR. Required for AireOS
+      - model_name: interfaceGateway
+        type: String
+        description: Interface Gateway. Required for AireOS
+      - model_name: lagOrPortNumber
+        type: String
+        description: LAG or Port Number. Required for AireOS
+      - model_name: vlanId
+        type: Int64
+        description: VLAN ID. Required for both AireOS and EWLC
+      - model_name: interfaceName
+        type: String
+        description: Interface Name. Required for both AireOS and EWLC.
+       

gen/definitions/wireless_enterprise_ssid.yaml

@@ -185,3 +185,37 @@ attributes:
     response_data_path: 0.ssidDetails.0.clientRateLimit
     description: Client Rate Limit (in bits per second)
     exclude_test: true
+  - model_name: authKeyMgmt
+    type: Set
+    element_type: String
+    response_data_path: 0.ssidDetails.0.authKeyMgmt
+    description: 'Takes string inputs for the AKMs that should be set true. Possible AKM values : dot1x,dot1x_ft, dot1x_sha, psk, psk_ft, psk_sha, owe, sae, sae_ft'
+    exclude_test: true
+  - model_name: rsnCipherSuiteGcmp256
+    type: Bool
+    response_data_path: 0.ssidDetails.0.rsnCipherSuiteGcmp256
+    description: Rsn Cipher Suite Gcmp256
+    exclude_test: true
+  - model_name: rsnCipherSuiteCcmp256
+    type: Bool
+    response_data_path: 0.ssidDetails.0.rsnCipherSuiteCcmp256
+    description: Rsn Cipher Suite Ccmp256
+    exclude_test: true
+  - model_name: rsnCipherSuiteGcmp128
+    type: Bool
+    response_data_path: 0.ssidDetails.0.rsnCipherSuiteGcmp128
+    description: Rsn Cipher Suite Gcmp 128
+    exclude_test: true
+  - model_name: ghz6PolicyClientSteering
+    type: Bool
+    response_data_path: 0.ssidDetails.0.ghz6PolicyClientSteering
+    description: Ghz6 Policy Client Steering
+    exclude_test: true
+  - model_name: ghz24Policy
+    type: String
+    enum_values:
+      - dot11-g-only
+      - dot11-bg-only
+    response_data_path: 0.ssidDetails.0.ghz24Policy
+    description: Ghz24 Policy
+    exclude_test: true

internal/provider/data_source_catalystcenter_wireless_enterprise_ssid.go

@@ -183,6 +183,31 @@ func (d *WirelessEnterpriseSSIDDataSource) Schema(ctx context.Context, req datas
 				MarkdownDescription: "Client Rate Limit (in bits per second)",
 				Computed:            true,
 			},
+			"auth_key_mgmt": schema.SetAttribute{
+				MarkdownDescription: "Takes string inputs for the AKMs that should be set true. Possible AKM values : dot1x,dot1x_ft, dot1x_sha, psk, psk_ft, psk_sha, owe, sae, sae_ft",
+				ElementType:         types.StringType,
+				Computed:            true,
+			},
+			"rsn_cipher_suite_gcmp256": schema.BoolAttribute{
+				MarkdownDescription: "Rsn Cipher Suite Gcmp256",
+				Computed:            true,
+			},
+			"rsn_cipher_suite_ccmp256": schema.BoolAttribute{
+				MarkdownDescription: "Rsn Cipher Suite Ccmp256",
+				Computed:            true,
+			},
+			"rsn_cipher_suite_gcmp128": schema.BoolAttribute{
+				MarkdownDescription: "Rsn Cipher Suite Gcmp 128",
+				Computed:            true,
+			},
+			"ghz6_policy_client_steering": schema.BoolAttribute{
+				MarkdownDescription: "Ghz6 Policy Client Steering",
+				Computed:            true,
+			},
+			"ghz24_policy": schema.StringAttribute{
+				MarkdownDescription: "Ghz24 Policy",
+				Computed:            true,
+			},
 		},
 	}
 }

internal/provider/model_catalystcenter_fabric_device.go

@@ -147,7 +147,7 @@ func (data *FabricDevice) fromBody(ctx context.Context, res gjson.Result) {
 	if value := res.Get("response.0.borderDeviceSettings.layer3Settings.borderPriority"); value.Exists() {
 		data.BorderPriority = types.Int64Value(value.Int())
 	} else {
-		data.BorderPriority = types.Int64Value(10)
+		data.BorderPriority = types.Int64Null()
 	}
 	if value := res.Get("response.0.borderDeviceSettings.layer3Settings.prependAutonomousSystemCount"); value.Exists() {
 		data.PrependAutonomousSystemCount = types.Int64Value(value.Int())
@@ -197,7 +197,7 @@ func (data *FabricDevice) updateFromBody(ctx context.Context, res gjson.Result)
 	}
 	if value := res.Get("response.0.borderDeviceSettings.layer3Settings.borderPriority"); value.Exists() && !data.BorderPriority.IsNull() {
 		data.BorderPriority = types.Int64Value(value.Int())
-	} else if data.BorderPriority.ValueInt64() != 10 {
+	} else {
 		data.BorderPriority = types.Int64Null()
 	}
 	if value := res.Get("response.0.borderDeviceSettings.layer3Settings.prependAutonomousSystemCount"); value.Exists() && !data.PrependAutonomousSystemCount.IsNull() {