Merge pull request #899 from rackerlabs/PUC-904

feat: refactor mechanism driver part 1

Author: cardoe

python/neutron-understack/neutron_understack/ml2_type_annotations.py

@@ -163,9 +163,13 @@ class PortContext:
     segments_to_bind: Any
 
     def set_binding(
-        self, new_segment: str, vif_type: str, _: dict, status: str
+        self, segment_id: str, vif_type: str, vif_details: dict, status: str
     ) -> None: ...
 
+    def allocate_dynamic_segment(self, segment: dict) -> dict: ...
+
+    def release_dynamic_segment(self, segment_id: str) -> dict: ...
+
 
 class BindingLevelsDict(TypedDict):
     bound_driver: Literal["understack"]

python/neutron-understack/neutron_understack/neutron_understack_mech.py

@@ -229,25 +229,15 @@ def create_port_postcommit(self, context):
     def update_port_precommit(self, context):
         pass
 
-    def update_port_postcommit(self, context):
-        """Tenant network port cleanup in the UnderCloud infrastructure.
-
-        This is triggered in the update_port_postcommit call as in the
-        delete_port_postcommit call there is no binding profile information
-        anymore, hence there is no way for us to identify which baremetal port
-        needs cleanup.
+    def update_port_postcommit(self, context: PortContext) -> None:
+        if utils.is_baremetal_port(context):
+            self._update_port_baremetal(context)
 
-        Only in the update_port_postcommit do we have access to the original
-        context, from which we can access the binding information.
-        """
-        baremetal_vnic = context.current["binding:vnic_type"] == "baremetal"
+    def _update_port_baremetal(self, context: PortContext) -> None:
         current_vif_unbound = context.vif_type == portbindings.VIF_TYPE_UNBOUND
         original_vif_other = context.original_vif_type == portbindings.VIF_TYPE_OTHER
         current_vif_other = context.vif_type == portbindings.VIF_TYPE_OTHER
 
-        if not baremetal_vnic:
-            return
-
         vlan_group_name = self.ironic_client.baremetal_port_physical_network(
             context.current["mac_address"]
         )
@@ -260,6 +250,16 @@ def update_port_postcommit(self, context):
             self.invoke_undersync(vlan_group_name)
 
     def _tenant_network_port_cleanup(self, context: PortContext):
+        """Tenant network port cleanup in the UnderCloud infrastructure.
+
+        This is triggered in the update_port_postcommit call as in the
+        delete_port_postcommit call there is no binding profile information
+        anymore, hence there is no way for us to identify which baremetal port
+        needs cleanup.
+
+        Only in the update_port_postcommit do we have access to the original
+        context, from which we can access the binding information.
+        """
         trunk_details = context.current.get("trunk_details", {})
         segment_id = context.original_top_bound_segment["id"]
         original_binding = context.original["binding:profile"]
@@ -293,13 +293,13 @@ def _tenant_network_port_cleanup(self, context: PortContext):
     def delete_port_precommit(self, context):
         pass
 
-    def delete_port_postcommit(self, context):
-        # Only clean up provisioning ports.  Everything else is left to get
-        # cleaned up upon the next change in that cabinet.
+    def delete_port_postcommit(self, context: PortContext) -> None:
+        if utils.is_baremetal_port(context):
+            self._delete_port_baremetal(context)
 
-        baremetal_vnic = context.current["binding:vnic_type"] == "baremetal"
-        if not baremetal_vnic:
-            return
+    def _delete_port_baremetal(self, context: PortContext) -> None:
+        # Only clean up provisioning ports. Ports with tenant networks are cleaned
+        # up in _tenant_network_port_cleanup
 
         vlan_group_name = self.ironic_client.baremetal_port_physical_network(
             context.current["mac_address"]

python/neutron-understack/neutron_understack/utils.py

@@ -8,6 +8,7 @@
 from neutron_lib.api.definitions import segment as segment_def
 from neutron_lib.plugins import directory
 
+from neutron_understack.ml2_type_annotations import PortContext
 from neutron_understack.nautobot import Nautobot
 
 
@@ -112,7 +113,7 @@ def parent_port_is_bound(port: port_obj.Port) -> bool:
     return bool(
         port_binding
         and port_binding.vif_type == portbindings.VIF_TYPE_OTHER
-        and port_binding.vnic_type == "baremetal"
+        and port_binding.vnic_type == portbindings.VNIC_BAREMETAL
         and port_binding.profile
     )
 
@@ -127,3 +128,7 @@ def is_valid_vlan_network_segment(network_segment: dict):
         network_segment.get(segment_def.NETWORK_TYPE) == constants.TYPE_VLAN
         and network_segment.get(segment_def.PHYSICAL_NETWORK) is not None
     )
+
+
+def is_baremetal_port(context: PortContext) -> bool:
+    return context.current[portbindings.VNIC_TYPE] == portbindings.VNIC_BAREMETAL