From 5e864a22bf81db15cb5c8c5c6ad794bea64169b1 Mon Sep 17 00:00:00 2001
From: Andrew Byrne <andbyrne@cisco.com>
Date: Wed, 17 Jan 2024 14:34:45 +1100
Subject: [PATCH] Implement BD subnet primary attribute

---
 defaults/defaults.yaml |  7 +++++++
 ndo_schemas.tf         | 20 +++++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/defaults/defaults.yaml b/defaults/defaults.yaml
index dec477a..fd85013 100644
--- a/defaults/defaults.yaml
+++ b/defaults/defaults.yaml
@@ -125,11 +125,18 @@ defaults:
           subnets:
             scope: private
             shared: false
+            no_default_gateway: false
             querier: false
             primary: false
           sites:
             advertise_host_routes: false
             mac: 00:22:BD:F8:19:FF
+            subnets:
+              scope: private
+              shared: false
+              no_default_gateway: false
+              querier: false
+              primary: false
         filters:
           name_suffix: ""
           entries:
diff --git a/ndo_schemas.tf b/ndo_schemas.tf
index efdb7f0..7e218da 100644
--- a/ndo_schemas.tf
+++ b/ndo_schemas.tf
@@ -695,11 +695,11 @@ locals {
             template_name      = template.name
             bd_name            = "${bd.name}${local.defaults.ndo.schemas.templates.bridge_domains.name_suffix}"
             ip                 = subnet.ip
-            scope              = try(subnet.scope, local.defaults.ndo.schemas.templates.bridge_domains.subnets.scope, "private")
+            scope              = try(subnet.scope, local.defaults.ndo.schemas.templates.bridge_domains.subnets.scope)
             shared             = try(subnet.shared, local.defaults.ndo.schemas.templates.bridge_domains.subnets.shared)
-            no_default_gateway = try(subnet.no_default_gateway, local.defaults.ndo.schemas.templates.bridge_domains.subnets.no_default_gateway, false)
-            querier            = try(subnet.querier, local.defaults.ndo.schemas.templates.bridge_domains.subnets.querier, "disabled")
-            primary            = try(subnet.primary, local.defaults.ndo.schemas.templates.bridge_domains.subnets.primary, false) # Not yet implemented in provider
+            no_default_gateway = try(subnet.no_default_gateway, local.defaults.ndo.schemas.templates.bridge_domains.subnets.no_default_gateway)
+            querier            = try(subnet.querier, local.defaults.ndo.schemas.templates.bridge_domains.subnets.querier)
+            primary            = try(subnet.primary, local.defaults.ndo.schemas.templates.bridge_domains.subnets.primary)
           }
         ]
       ]
@@ -717,6 +717,7 @@ resource "mso_schema_template_bd_subnet" "schema_template_bd_subnet" {
   shared             = each.value.shared
   no_default_gateway = each.value.no_default_gateway
   querier            = each.value.querier
+  primary            = each.value.primary
 
   depends_on = [mso_schema_template_bd.schema_template_bd]
 }
@@ -734,11 +735,11 @@ locals {
               bd_name            = "${bd.name}${local.defaults.ndo.schemas.templates.bridge_domains.name_suffix}"
               site_id            = var.manage_sites ? mso_site.site[site.name].id : data.mso_site.template_site[site.name].id
               ip                 = subnet.ip
-              scope              = try(subnet.scope, local.defaults.ndo.schemas.templates.bridge_domains.subnets.scope, "private")
-              shared             = try(subnet.shared, local.defaults.ndo.schemas.templates.bridge_domains.subnets.shared)
-              no_default_gateway = try(subnet.no_default_gateway, local.defaults.ndo.schemas.templates.bridge_domains.subnets.no_default_gateway, false) # Not yet implemented in schema
-              querier            = try(subnet.querier, local.defaults.ndo.schemas.templates.bridge_domains.subnets.querier)
-              primary            = try(subnet.primary, local.defaults.ndo.schemas.templates.bridge_domains.subnets.primary, false) # Not yet implemented in provider
+              scope              = try(subnet.scope, local.defaults.ndo.schemas.templates.bridge_domains.sites.subnets.scope)
+              shared             = try(subnet.shared, local.defaults.ndo.schemas.templates.bridge_domains.sites.subnets.shared)
+              no_default_gateway = try(subnet.no_default_gateway, local.defaults.ndo.schemas.templates.bridge_domains.sites.subnets.no_default_gateway)
+              querier            = try(subnet.querier, local.defaults.ndo.schemas.templates.bridge_domains.sites.subnets.querier)
+              primary            = try(subnet.primary, local.defaults.ndo.schemas.templates.bridge_domains.sites.subnets.primary)
             }
           ]
         ]
@@ -758,6 +759,7 @@ resource "mso_schema_site_bd_subnet" "schema_site_bd_subnet" {
   shared             = each.value.shared
   no_default_gateway = each.value.no_default_gateway
   querier            = each.value.querier
+  primary            = each.value.primary
 
   depends_on = [mso_schema_site_bd.schema_site_bd]
 }