Merge branch 'main' into main

Author: mhamroz

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 0.2.1 (unreleased)
 
 - Add Fabric Embedded_Wireless_Controller_Node support
+- Fix issue with sites hierarchy while using multi state
 - Fix issue with ip_v4_reservations while using multi state
 - Fix issue with assigning cli credentials to site while using multi state
 - Add support for PNP access points

cc_fabric.tf

@@ -340,6 +340,22 @@ resource "catalystcenter_fabric_ewlc" "ewlc_device" {
   depends_on = [catalystcenter_device_role.role, catalystcenter_provision_devices.provision_devices, catalystcenter_provision_device.provision_device, catalystcenter_fabric_device.border_device]
 }
 
+resource "catalystcenter_fabric_ewlc" "ewlc_device" {
+  for_each = { for device in try(local.catalyst_center.inventory.devices, []) : device.name => device if strcontains(device.state, "PROVISION") && contains(try(device.fabric_roles, []), "EMBEDDED_WIRELESS_CONTROLLER_NODE") && contains(local.sites, try(device.fabric_site, "NONE")) }
+
+  network_device_id = coalesce(
+    try(lookup(local.device_name_to_id, each.value.name, null), null),
+    try(lookup(local.device_name_to_id, each.value.fqdn_name, null), null),
+    try(lookup(local.device_ip_to_id, each.value.device_ip, null), null)
+  )
+  fabric_id                 = try(catalystcenter_fabric_zone.fabric_zone[each.value.fabric_zone].id, catalystcenter_fabric_site.fabric_site[each.value.fabric_site].id, null)
+  enable_wireless           = try(each.value.enable_wireless, local.defaults.catalyst_center.inventory.devices.enable_wireless, true)
+  enable_rolling_ap_upgrade = try(each.value.enable_rolling_ap_upgrade, local.defaults.catalyst_center.inventory.devices.enable_rolling_ap_upgrade, false)
+  ap_reboot_percentage      = try(each.value.ap_reboot_percentage, local.defaults.catalyst_center.inventory.devices.ap_reboot_percentage, 25)
+
+  depends_on = [catalystcenter_device_role.role, catalystcenter_provision_devices.provision_devices, catalystcenter_provision_device.provision_device, catalystcenter_fabric_device.border_device]
+}
+
 resource "catalystcenter_fabric_vlan_to_ssid" "vlan_to_ssid" {
   for_each = local.wireless_controllers ? { for site in try(local.catalyst_center.fabric.fabric_sites, []) : site.name => site if length(keys(catalystcenter_fabric_device.wireless_controller)) > 0 && length(try(site.wireless_ssids, [])) != 0 } : {}
 

cc_sites.tf

@@ -20,7 +20,7 @@ resource "catalystcenter_area" "area_1" {
   for_each = { for area in try(local.catalyst_center.sites.areas, []) : "${area.parent_name}/${area.name}" => area if length(regexall("\\/", try(area.parent_name, ""))) == 1 && contains(local.sites, try("${area.parent_name}/${area.name}", "")) }
 
   name      = each.value.name
-  parent_id = try(catalystcenter_area.area_0[each.value.parent_name].id, data.catalystcenter_site.global.id, null)
+  parent_id = try(catalystcenter_area.area_0[each.value.parent_name].id, local.data_source_site_list[each.value.parent_name], data.catalystcenter_site.global.id, null)
 
   depends_on = [catalystcenter_area.area_0, catalystcenter_credentials_cli.cli_credentials, catalystcenter_credentials_https_read.https_read_credentials, catalystcenter_credentials_https_write.https_write_credentials, catalystcenter_credentials_snmpv3.snmpv3_credentials, catalystcenter_credentials_snmpv2_read.snmpv2_read_credentials, catalystcenter_credentials_snmpv2_write.snmpv2_write_credentials]
 }
@@ -30,7 +30,7 @@ resource "catalystcenter_area" "area_2" {
   for_each = { for area in try(local.catalyst_center.sites.areas, []) : "${area.parent_name}/${area.name}" => area if length(regexall("\\/", try(area.parent_name, ""))) == 2 && contains(local.sites, try("${area.parent_name}/${area.name}", "")) }
 
   name      = each.value.name
-  parent_id = try(catalystcenter_area.area_1[each.value.parent_name].id, data.catalystcenter_site.global.id, null)
+  parent_id = try(catalystcenter_area.area_1[each.value.parent_name].id, local.data_source_site_list[each.value.parent_name], data.catalystcenter_site.global.id, null)
 
   depends_on = [catalystcenter_area.area_1, catalystcenter_credentials_cli.cli_credentials, catalystcenter_credentials_https_read.https_read_credentials, catalystcenter_credentials_https_write.https_write_credentials, catalystcenter_credentials_snmpv3.snmpv3_credentials, catalystcenter_credentials_snmpv2_read.snmpv2_read_credentials, catalystcenter_credentials_snmpv2_write.snmpv2_write_credentials]
 }
@@ -40,7 +40,7 @@ resource "catalystcenter_area" "area_3" {
   for_each = { for area in try(local.catalyst_center.sites.areas, []) : "${area.parent_name}/${area.name}" => area if length(regexall("\\/", try(area.parent_name, ""))) == 3 && contains(local.sites, try("${area.parent_name}/${area.name}", "")) }
 
   name      = each.value.name
-  parent_id = try(catalystcenter_area.area_2[each.value.parent_name].id, data.catalystcenter_site.global.id, null)
+  parent_id = try(catalystcenter_area.area_2[each.value.parent_name].id, local.data_source_site_list[each.value.parent_name], data.catalystcenter_site.global.id, null)
 
   depends_on = [catalystcenter_area.area_2, catalystcenter_credentials_cli.cli_credentials, catalystcenter_credentials_https_read.https_read_credentials, catalystcenter_credentials_https_write.https_write_credentials, catalystcenter_credentials_snmpv3.snmpv3_credentials, catalystcenter_credentials_snmpv2_read.snmpv2_read_credentials, catalystcenter_credentials_snmpv2_write.snmpv2_write_credentials]
 }
@@ -49,7 +49,7 @@ resource "catalystcenter_building" "building" {
   for_each = { for building in try(local.catalyst_center.sites.buildings, []) : "${building.parent_name}/${building.name}" => building if contains(local.sites, try("${building.parent_name}/${building.name}", "")) }
 
   name      = each.value.name
-  parent_id = try(catalystcenter_area.area_3[each.value.parent_name].id, catalystcenter_area.area_2[each.value.parent_name].id, catalystcenter_area.area_1[each.value.parent_name].id, catalystcenter_area.area_0[each.value.parent_name].id, data.catalystcenter_site.global.id, null)
+  parent_id = try(catalystcenter_area.area_3[each.value.parent_name].id, catalystcenter_area.area_2[each.value.parent_name].id, catalystcenter_area.area_1[each.value.parent_name].id, catalystcenter_area.area_0[each.value.parent_name].id, local.data_source_site_list[each.value.parent_name], data.catalystcenter_site.global.id, null)
   country   = try(each.value.country, local.defaults.catalyst_center.sites.buildings.country, null)
   address   = try(each.value.address, local.defaults.catalyst_center.sites.buildings.address, null)
   latitude  = try(floor(each.value.latitude * 100000 + 0.5) / 100000, local.defaults.catalyst_center.sites.buildings.latitude, null)
@@ -63,7 +63,7 @@ resource "catalystcenter_floor" "floor" {
   for_each = { for floor in try(local.catalyst_center.sites.floors, []) : "${floor.parent_name}/${floor.name}" => floor if contains(local.sites, try("${floor.parent_name}/${floor.name}", "")) }
 
   name             = each.value.name
-  parent_id        = try(catalystcenter_building.building[each.value.parent_name].id, data.catalystcenter_site.global.id, null)
+  parent_id        = try(catalystcenter_building.building[each.value.parent_name].id, local.data_source_site_list[each.value.parent_name], data.catalystcenter_site.global.id, null)
   floor_number     = try(each.value.floor_number, local.defaults.catalyst_center.sites.floors.floor_number, null)
   rf_model         = try(each.value.rf_model, local.defaults.catalyst_center.sites.floors.rf_model, null)
   width            = try(each.value.width, local.defaults.catalyst_center.sites.floors.width, null)

outputs.tf

@@ -12,4 +12,4 @@ output "model" {
 output "sites" {
   description = "List of sites to be managed"
   value       = local.sites
-}
+}