updates from testing on 11/5

Author: scotttyso

interfaces-leaf.tf

@@ -190,8 +190,8 @@ resource "aci_leaf_access_bundle_policy_group" "leaf_interfaces_policy_groups_bu
   relation_infra_rs_l2_port_security_pol = length(compact([each.value.port_security_policy])
   ) > 0 ? "uni/infra/portsecurityP-${each.value.port_security_policy}" : ""
   # class: lacpLagPol
-  relation_infra_rs_lacp_pol = length(compact([each.value.link_aggregation_policy])
-  ) > 0 ? "uni/infra/lacplagp-${each.value.link_aggregation_policy}" : ""
+  relation_infra_rs_lacp_pol = length(compact([each.value.port_channel_policy])
+  ) > 0 ? "uni/infra/lacplagp-${each.value.port_channel_policy}" : ""
   # class: lldpIfPol
   relation_infra_rs_lldp_if_pol = length(compact([each.value.lldp_interface_policy])
   ) > 0 ? "uni/infra/lldpIfP-${each.value.lldp_interface_policy}" : ""

locals.tf

@@ -399,10 +399,9 @@ locals {
           fibre_channel_interface_policy = lookup(
             v, "fibre_channel_interface_policy", local.lbundle.fibre_channel_interface_policy
           )
-          l2_interface_policy     = lookup(v, "l2_interface_policy", local.lbundle.l2_interface_policy)
-          link_aggregation_policy = lookup(v, "link_aggregation_policy", local.lbundle.link_aggregation_policy)
-          link_aggregation_type   = lookup(v, "link_aggregation_type", local.lbundle.link_aggregation_type)
-          link_flap_policy        = lookup(v, "link_flap_policy", local.lbundle.link_flap_policy)
+          l2_interface_policy   = lookup(v, "l2_interface_policy", local.lbundle.l2_interface_policy)
+          link_aggregation_type = lookup(v, "link_aggregation_type", local.lbundle.link_aggregation_type)
+          link_flap_policy      = lookup(v, "link_flap_policy", local.lbundle.link_flap_policy)
           link_level_flow_control_policy = lookup(
             v, "link_level_flow_control_policy", local.lbundle.link_level_flow_control_policy
           )
@@ -418,6 +417,7 @@ locals {
               netflow_monitor_policy = s.netflow_monitor_policy
             }
           ]
+          port_channel_policy  = lookup(v, "port_channel_policy", local.lbundle.port_channel_policy)
           port_security_policy = lookup(v, "port_security_policy", local.lbundle.port_security_policy)
           priority_flow_control_policy = lookup(
             v, "priority_flow_control_policy", local.lbundle.priority_flow_control_policy
@@ -687,7 +687,7 @@ locals {
         access_mode     = v.access_mode
         dvs             = k
         switch_provider = v.switch_provider
-        uplinkId        = s
+        uplinkId        = s + 1
         uplinkName      = element(v.uplink_names, s)
       }
     ]

switches-leaf-policy-groups.tf

@@ -63,6 +63,17 @@ Spanning Tree Policy (MSTP)
 _______________________________________________________________________________________________________________________
 */
 resource "aci_access_switch_policy_group" "switches_leaf_policy_groups" {
+  depends_on = [
+    aci_cdp_interface_policy.cdp_interface,
+    aci_interface_fc_policy.fibre_channel_interface,
+    aci_l2_interface_policy.l2_interface,
+    aci_fabric_if_pol.link_level,
+    aci_lldp_interface_policy.lldp_interface,
+    aci_miscabling_protocol_interface_policy.mcp_interface,
+    aci_lacp_policy.port_channel,
+    aci_port_security_policy.port_security,
+    aci_spanning_tree_interface_policy.spanning_tree_interface
+  ]
   for_each    = local.switches_leaf_policy_groups
   annotation  = each.value.annotation
   description = each.value.description

switches-spine-policy-groups.tf

@@ -27,6 +27,17 @@ LLDP Policy
 _______________________________________________________________________________________________________________________
 */
 resource "aci_spine_switch_policy_group" "switches_spine_policy_groups" {
+  depends_on = [
+    aci_cdp_interface_policy.cdp_interface,
+    aci_interface_fc_policy.fibre_channel_interface,
+    aci_l2_interface_policy.l2_interface,
+    aci_fabric_if_pol.link_level,
+    aci_lldp_interface_policy.lldp_interface,
+    aci_miscabling_protocol_interface_policy.mcp_interface,
+    aci_lacp_policy.port_channel,
+    aci_port_security_policy.port_security,
+    aci_spanning_tree_interface_policy.spanning_tree_interface
+  ]
   for_each    = local.switches_spine_policy_groups
   annotation  = each.value.annotation
   description = each.value.description

virtual-networking.tf

@@ -8,9 +8,9 @@ GUI Location:
 _______________________________________________________________________________________________________________________
 */
 resource "aci_vmm_domain" "vmm_domains" {
-  # depends_on = [
-  #   aci_vlan_pool.pools_vlan
-  # ]
+  depends_on = [
+    aci_vlan_pool.vlan_pools
+  ]
   for_each            = local.vmm_domains
   access_mode         = each.value.access_mode
   annotation          = each.value.annotation
@@ -25,8 +25,8 @@ resource "aci_vmm_domain" "vmm_domains" {
   name                = each.key
   pref_encap_mode     = each.value.preferred_encapsulation
   provider_profile_dn = "uni/vmmp-${each.value.switch_provider}"
-  # relation_infra_rs_vlan_ns = length(compact([each.value.vlan_pool])
-  # ) > 0 ? aci_vlan_pool.pools_vlan[each.value.vlan_pool].id : ""
+  relation_infra_rs_vlan_ns = length(compact([each.value.vlan_pool])
+  ) > 0 ? aci_vlan_pool.vlan_pools[each.value.vlan_pool].id : ""
 }
 
 resource "aci_rest_managed" "vmm_domain_uplinks" {