refactor

Author: Milan Fencik

python/neutron-understack/neutron_understack/nautobot.py

@@ -281,17 +281,16 @@ def remove_port_network_associations(
         url = f"/api/dcim/interfaces/{interface_uuid}/"
         payload = {}
 
-        current_untagged_network = current["untagged_vlan"]["network"]["id"]
-        if current_untagged_network in network_ids_to_remove:
+        if (
+            current["untagged_vlan"] and current["untagged_vlan"]["id"]
+            in network_ids_to_remove
+        ):
             payload["untagged_vlan"] = None
 
         payload["tagged_vlans"] = [
             tagged_vlan["id"]
             for tagged_vlan in current["tagged_vlans"]
-            if (
-                tagged_vlan.get("network")
-                and tagged_vlan.get("network")["id"] not in network_ids_to_remove
-            )
+            if tagged_vlan["id"] not in network_ids_to_remove
         ]
 
         return self.make_api_request("PATCH", url, payload)

python/neutron-understack/neutron_understack/neutron_understack_mech.py

@@ -265,16 +265,17 @@ def update_port_postcommit(self, context):
             self.invoke_undersync(vlan_group_name)
 
     def _tenant_network_port_cleanup(self, context: PortContext):
-        network_id = context.current["network_id"]
         trunk_details = context.current.get("trunk_details", {})
+        segment_id = context.original_top_bound_segment["id"]
+        original_binding = context.original["binding:profile"]
         connected_interface_uuid = utils.fetch_connected_interface_uuid(
-            context.original["binding:profile"], LOG
-        )
+            original_binding, LOG)
 
-        networks_to_remove = set(self._fetch_subports_network_ids(trunk_details))
-        networks_to_remove.add(network_id)
+        if not utils.ports_bound_to_segment(segment_id):
+            context.release_dynamic_segment(segment_id)
+            self.nb.delete_vlan(segment_id)
 
-        # TODO: does this needs to clean up subports too?
+        networks_to_remove = {segment_id}
 
         LOG.debug(
             "update_port_postcommit removing vlans %s from interface %s ",
@@ -286,6 +287,13 @@ def _tenant_network_port_cleanup(self, context: PortContext):
             connected_interface_uuid, networks_to_remove
         )
 
+        if trunk_details:
+            self.trunk_driver.clean_trunk(
+                trunk_details=trunk_details,
+                binding_profile=original_binding,
+                host=context.original_host,
+            )
+
     def delete_port_precommit(self, context):
         pass
 

python/neutron-understack/neutron_understack/trunk.py

@@ -209,7 +209,6 @@ def _add_subports_networks_to_parent_port_switchport(
 
         self.nb.add_port_vlan_associations(
             interface_uuid=connected_interface_id,
-            native_vlan_id=None,
             vlan_group_name=vlan_group_name,
             allowed_vlans_ids=allowed_vlan_ids,
         )
@@ -220,11 +219,11 @@ def _add_subports_networks_to_parent_port_switchport(
                 dry_run=cfg.CONF.ml2_understack.undersync_dry_run,
             )
 
-    def clean_trunk(self, trunk_details: dict, port_id: str) -> None:
+    def clean_trunk(self, trunk_details: dict, binding_profile: dict, host: str) -> None:
         subports = trunk_details.get("sub_ports", [])
-        parent_port_obj = utils.fetch_port_object(port_id)
         self._handle_subports_removal(
-            parent_port=parent_port_obj,
+            binding_profile=binding_profile,
+            binding_host=host,
             subports=subports,
             invoke_undersync=False,
         )
@@ -233,11 +232,15 @@ def _clean_parent_port_switchport_config(
         self, trunk: Trunk, subports: [SubPort]
     ) -> None:
         parent_port_obj = utils.fetch_port_object(trunk.port_id)
-        if utils.parent_port_is_bound(parent_port_obj):
-            self._handle_subports_removal(
-                parent_port=parent_port_obj,
-                subports=subports,
-            )
+        if not utils.parent_port_is_bound(parent_port_obj):
+            return
+        binding_profile = parent_port_obj.bindings[0].profile
+        binding_host = parent_port_obj.bindings[0].host
+        self._handle_subports_removal(
+            binding_profile=binding_profile,
+            binding_host=binding_host,
+            subports=subports,
+        )
 
     def _delete_binding_level(self, port_id: str, host: str) -> PortBindingLevel:
         binding_level = utils.port_binding_level_by_port_id(port_id, host)
@@ -267,10 +270,12 @@ def _trigger_undersync(self, vlan_group_name: str) -> None:
         )
 
     def _handle_subports_removal(
-        self, parent_port: Port, subports: list[SubPort], invoke_undersync: bool = True
+        self,
+        binding_profile: dict,
+        binding_host: str,
+        subports: list[SubPort],
+        invoke_undersync: bool = True
     ) -> None:
-        binding_profile = parent_port.bindings[0].profile
-        binding_host = parent_port.bindings[0].host
         vlan_group_name = utils.vlan_group_name_from_binding_profile(binding_profile)
         connected_interface_id = utils.fetch_connected_interface_uuid(
             binding_profile, LOG