fix issue with non fabric wireless controller and add support for SDA transit

Author: kuba-mazurkiewicz

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.0
+
+- Fix issue with provision non fabric wireless controller
+- Add support for SDA Transit
+
 ## 0.0.3-beta1
 
 - BREAKING CHANGE: add support for multple interfaces under l3_handoffs
@@ -14,4 +19,5 @@
 - BREAKING CHANGE: replace `catalystcenter_fabric_virtual_network` and `catalystcenter_virtual_network_to_fabric_site` resources with `catalystcenter_fabric_l3_virtual_network` resource
 
 ## 0.0.1-beta1
+
 - Initial release

cc_device_provision.tf

@@ -1,7 +1,10 @@
 locals {
   device_ip_to_id = try({
-    for device in data.catalystcenter_network_devices.all_devices.devices :
-    device.management_ip_address => device.id
+    for device in data.catalystcenter_network_devices.all_devices.devices : device.management_ip_address => device.id
+  }, {})
+
+  device_name_to_id = try({
+    for device in data.catalystcenter_network_devices.all_devices.devices : device.hostname => device.id
   }, {})
 
   border_devices = { for device in try(local.catalyst_center.fabric.border_devices, []) : device.name => device }
@@ -84,7 +87,7 @@ resource "catalystcenter_device_role" "role" {
 }
 
 resource "catalystcenter_fabric_provision_device" "non_fabric_device" {
-  for_each = { for device in try(local.catalyst_center.inventory.devices, []) : device.name => device if strcontains(device.state, "PROVISION") && try(device.fabric_roles, null) == null }
+  for_each = { for device in try(local.catalyst_center.inventory.devices, []) : device.name => device if strcontains(device.state, "PROVISION") && try(device.fabric_roles, null) == null && try(device.managed_ap_locations, null) == null }
 
   site_id           = try(local.site_id_list[each.value.site], null)
   network_device_id = try(local.device_ip_to_id[each.value.device_ip], "")
@@ -151,7 +154,7 @@ resource "catalystcenter_fabric_l2_handoff" "l2_handoff" {
 }
 
 resource "catalystcenter_wireless_device_provision" "wireless_controller" {
-  for_each = { for device in try(local.catalyst_center.inventory.devices, []) : device.name => device if strcontains(device.state, "PROVISION") && contains(try(device.fabric_roles, []), "WIRELESS_CONTROLLER_NODE") }
+  for_each = { for device in try(local.catalyst_center.inventory.devices, []) : device.name => device if strcontains(device.state, "PROVISION") && (contains(try(device.fabric_roles, []), "WIRELESS_CONTROLLER_NODE") || try(device.managed_ap_locations, null) != null) }
 
   device_name          = each.key
   site                 = try(each.value.site, null)

cc_fabric.tf

@@ -38,10 +38,10 @@ resource "catalystcenter_transit_network" "transit" {
 
   name                              = each.key
   type                              = try(each.value.type, local.defaults.catalyst_center.fabric.transits.type, null)
-  routing_protocol_name             = try(each.value.routing_protocol_name, local.defaults.catalyst_center.fabric.transits.routing_protocol_name, null)
-  autonomous_system_number          = try(each.value.autonomous_system_number, local.defaults.catalyst_center.fabric.transits.autonomous_system_number, null)
-  is_multicast_over_transit_enabled = try(each.value.is_multicast_over_transit_enabled, local.defaults.catalyst_center.fabric.transits.is_multicast_over_transit_enabled, null)
-  control_plane_network_device_ids  = try(each.value.control_plane_network_device_ids, local.defaults.catalyst_center.fabric.transits.control_plane_network_device_ids, null)
+  routing_protocol_name             = try(each.value.type, "") == "IP_BASED_TRANSIT" ? try(each.value.routing_protocol_name, local.defaults.catalyst_center.fabric.transits.routing_protocol_name, null) : null
+  autonomous_system_number          = try(each.value.type, "") == "IP_BASED_TRANSIT" ? try(each.value.autonomous_system_number, local.defaults.catalyst_center.fabric.transits.autonomous_system_number, null) : null
+  is_multicast_over_transit_enabled = try(each.value.type, "") != "IP_BASED_TRANSIT" ? try(each.value.multicast_over_sda_transit, local.defaults.catalyst_center.fabric.transits.multicast_over_sda_transit, null) : null
+  control_plane_network_device_ids  = try(each.value.type, "") != "IP_BASED_TRANSIT" ? [for device in try(each.value.control_plane_devices, []) : lookup(local.device_name_to_id, device)] : null
 }
 
 resource "catalystcenter_fabric_site" "fabric_site" {