Merge pull request #721 from rackerlabs/selective-svis

feat: Only create SVIs for Prefixes of service_type "network:understack_svi"

Author: cardoe

python/neutron-understack/neutron_understack/neutron_understack_mech.py

@@ -138,10 +138,11 @@ def create_subnet_postcommit(self, context):
            Don't have an SVI, which means we don't associate them with a VNI in
            nautobot.
         """
-        subnet_uuid = context.current["id"]
-        network_uuid = context.current["network_id"]
-        prefix = context.current["cidr"]
-        external = context.current["router:external"]
+        subnet_uuid: str = context.current["id"]
+        network_uuid: str = context.current["network_id"]
+        prefix: str = context.current["cidr"]
+        external: bool = context.current["router:external"]
+        service_types: list[str] = context.current["service_types"]
 
         if external:
             namespace = cfg.CONF.ml2_understack.shared_nautobot_namespace_name
@@ -154,7 +155,7 @@ def create_subnet_postcommit(self, context):
             namespace_name=namespace,
         )
 
-        if external:
+        if external and "network:understack_svi" in service_types:
             self.nb.associate_subnet_with_network(
                 role="svi_vxlan_anycast_gateway",
                 network_uuid=network_uuid,

python/neutron-understack/neutron_understack/tests/test_neutron_understack_mech.py

@@ -170,6 +170,7 @@ def test_create_subnet_postcommit_private(nautobot_client):
             "network_id": "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
             "cidr": "1.0.0.0/24",
             "router:external": False,
+            "service_types": [],
         }
     )
 
@@ -183,13 +184,14 @@ def test_create_subnet_postcommit_private(nautobot_client):
     )
 
 
-def test_create_subnet_postcommit_public(nautobot_client, undersync_client):
+def test_create_subnet_postcommit_public_svi(nautobot_client, undersync_client):
     context = MagicMock(
         current={
             "id": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
             "network_id": "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
             "cidr": "1.0.0.0/24",
             "router:external": True,
+            "service_types": ["network:understack_svi"],
         }
     )
 
@@ -203,6 +205,27 @@ def test_create_subnet_postcommit_public(nautobot_client, undersync_client):
         prefix="1.0.0.0/24",
         namespace_name="Global",
     )
+    nautobot_client.associate_subnet_with_network.assert_called_once()
+
+
+def test_create_subnet_postcommit_public_non_svi(nautobot_client, undersync_client):
+    context = MagicMock(
+        current={
+            "id": "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa",
+            "network_id": "bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb",
+            "cidr": "1.0.0.0/24",
+            "router:external": True,
+            "service_types": ["not_an_svi_type"],
+        }
+    )
+
+    driver.nb = nautobot_client
+    driver.undersync = undersync_client
+
+    driver.create_subnet_postcommit(context)
+
+    nautobot_client.subnet_create.assert_called_once()
+    nautobot_client.associate_subnet_with_network.assert_not_called()
 
 
 def test_delete_subnet_postcommit_public(nautobot_client, undersync_client):