fix multicast DS; fix empty rma (#101)

rafal-slominskii · web-flow · commit 775653431c3b · 2026-04-20T14:24:06.000+02:00
diff --git a/cc_fabric.tf b/cc_fabric.tf
@@ -905,7 +905,7 @@ resource "catalystcenter_fabric_multicast_virtual_networks" "multicast" {
     if contains(local.sites, fabric_site) && length(config.virtual_networks) > 0
   }
 
-  fabric_id = try(local.combined_fabric_id_list[each.key].id, null)
+  fabric_id = try(local.combined_fabric_id_list[each.key], null)
 
   virtual_networks = each.value.virtual_networks
 
diff --git a/cc_rma.tf b/cc_rma.tf
@@ -50,7 +50,7 @@ resource "catalystcenter_device_replacement_workflow" "rma" {
     && try(device.serial_number, null) != null
     && contains(local.sites, try(device.site, "NONE"))
     && try(data.catalystcenter_device_detail.rma_device[device.name].serial_number, null) != null
-    && device.serial_number != data.catalystcenter_device_detail.rma_device[device.name].serial_number
+    && try(device.serial_number, "") != try(data.catalystcenter_device_detail.rma_device[device.name].serial_number, "")
   }
 
   faulty_device_serial_number      = data.catalystcenter_device_detail.rma_device[each.key].serial_number

Original file line number	Diff line number	Diff line change
`@@ -905,7 +905,7 @@ resource "catalystcenter_fabric_multicast_virtual_networks" "multicast" {`
`905`	`905`	`if contains(local.sites, fabric_site) && length(config.virtual_networks) > 0`
`906`	`906`	`}`
`907`	`907`
`908`		`- fabric_id = try(local.combined_fabric_id_list[each.key].id, null)`
	`908`	`+ fabric_id = try(local.combined_fabric_id_list[each.key], null)`
`909`	`909`
`910`	`910`	`virtual_networks = each.value.virtual_networks`
`911`	`911`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ resource "catalystcenter_device_replacement_workflow" "rma" {`
`50`	`50`	`&& try(device.serial_number, null) != null`
`51`	`51`	`&& contains(local.sites, try(device.site, "NONE"))`
`52`	`52`	`&& try(data.catalystcenter_device_detail.rma_device[device.name].serial_number, null) != null`
`53`		`- && device.serial_number != data.catalystcenter_device_detail.rma_device[device.name].serial_number`
	`53`	`+ && try(device.serial_number, "") != try(data.catalystcenter_device_detail.rma_device[device.name].serial_number, "")`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`faulty_device_serial_number = data.catalystcenter_device_detail.rma_device[each.key].serial_number`