Merge pull request #456 from rackerlabs/delete_tenant_network

feat: delete tenant network
rackerlabs · Nov 8, 2024 · a08ee15 · a08ee15
2 parents 2e1fe24 + eef1088
commit a08ee15
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/python/neutron-understack/neutron_understack/nautobot.py b/python/neutron-understack/neutron_understack/nautobot.py
@@ -43,3 +43,13 @@ def ucvni_create(
         resp = self.s.post(url, json=payload, timeout=10)
         LOG.debug("ucvni_create resp: %(resp)s", {"resp": resp.json()})
         resp.raise_for_status()
+
+    def ucvni_delete(self, network_id):
+        payload = {"id": network_id}
+
+        ucvni_url = f"/api/plugins/undercloud-vni/ucvnis/{network_id}/"
+        url = urljoin(self.base_url, ucvni_url)
+        LOG.debug("ucvni_delete payload: %(payload)s", {"payload": payload})
+        resp = self.s.delete(url, json=payload, timeout=10)
+        LOG.debug("ucvni_delete resp: %(resp)s", {"resp": resp.status_code})
+        resp.raise_for_status()
diff --git a/python/neutron-understack/neutron_understack/neutron_understack_mech.py b/python/neutron-understack/neutron_understack/neutron_understack_mech.py
@@ -140,8 +140,8 @@ def create_network_postcommit(self, context):
                 raise exc.NetworkNotFound(net_id=network_id) from e
 
             LOG.info(
-                "network %(net_id)s has been added on ucvni_group %(ucvni_group), "
-                "physnet %(physnet)",
+                "network %(net_id)s has been added on ucvni_group %(ucvni_group)s, "
+                "physnet %(physnet)s",
                 {"net_id": network_id, "ucvni_group": ucvni_group, "physnet": physnet},
             )
 
@@ -157,6 +157,28 @@ def delete_network_precommit(self, context):
     def delete_network_postcommit(self, context):
         log_call("delete_network_postcommit", context)
 
+        network = context.current
+        network_id = network["id"]
+        provider_type = network.get("provider:network_type")
+        physnet = network.get("provider:physical_network")
+
+        if provider_type == p_const.TYPE_VXLAN:
+            conf = cfg.CONF.ml2_understack
+            ucvni_group = conf.ucvni_group
+            try:
+                self.nb.ucvni_delete(network_id)
+            except Exception as e:
+                LOG.exception(
+                    "unable to delete network %(net_id)s", {"net_id": network_id}
+                )
+                raise exc.NetworkNotFound(net_id=network_id) from e
+
+            LOG.info(
+                "network %(net_id)s has been deleted from ucvni_group %(ucvni_group)s, "
+                "physnet %(physnet)s",
+                {"net_id": network_id, "ucvni_group": ucvni_group, "physnet": physnet},
+            )
+
     def create_subnet_precommit(self, context):
         log_call("create_subnet_precommit", context)