Merge pull request #929 from rackerlabs/router_trunk

feat: "router trunks"

Author: mfencik

python/neutron-understack/neutron_understack/config.py

@@ -50,13 +50,28 @@
             "prefixes that need to be routable outside of a tenant environment."
         ),
     ),
+    # TODO:: this can very likely be deprecated now
     cfg.StrOpt(
         "network_node_switchport_uuid",
         help=(
             "Nautobot UUID of the network node's switchport interface, that "
             "is used to trunk all vlans used by a neutron router."
         ),
     ),
+    cfg.StrOpt(
+        "network_node_trunk_uuid",
+        help=(
+            "UUID of the trunk that is used to trunk all vlans used by a Neutron"
+            " router."
+        ),
+    ),
+    cfg.StrOpt(
+        "network_node_switchport_physnet",
+        help=(
+            "Name of the physnet configured on a network node's"
+            "baremetal port that provides connectivity to OVN."
+        ),
+    ),
     cfg.BoolOpt(
         "enforce_unique_vlans_in_fabric",
         default=True,

python/neutron-understack/neutron_understack/ml2_type_annotations.py

@@ -145,6 +145,7 @@ class PortContext:
     network: NetworkContext
     status: str
     original_status: str
+    plugin_context: Any
     _plugin_context: Any
     _plugin: Any
     vif_type: str

python/neutron-understack/neutron_understack/neutron_understack_mech.py

@@ -1,8 +1,8 @@
 import logging
 from uuid import UUID
 
-import neutron_lib.api.definitions.portbindings as portbindings
 from neutron_lib import constants as p_const
+from neutron_lib.api.definitions import portbindings
 from neutron_lib.api.definitions import segment as segment_def
 from neutron_lib.callbacks import events
 from neutron_lib.callbacks import registry
@@ -12,6 +12,7 @@
 from oslo_config import cfg
 
 from neutron_understack import config
+from neutron_understack import routers
 from neutron_understack import utils
 from neutron_understack.ironic import IronicClient
 from neutron_understack.nautobot import Nautobot
@@ -20,7 +21,6 @@
 from neutron_understack.undersync import Undersync
 
 from .ml2_type_annotations import NetworkContext
-from .ml2_type_annotations import NetworkSegmentDict
 from .ml2_type_annotations import PortContext
 
 LOG = logging.getLogger(__name__)
@@ -29,6 +29,9 @@
 config.register_ml2_understack_opts(cfg.CONF)
 
 
+SUPPORTED_VNIC_TYPES = [portbindings.VNIC_BAREMETAL, portbindings.VNIC_NORMAL]
+
+
 class UnderstackDriver(MechanismDriver):
     # See MechanismDriver docs for resource_provider_uuid5_namespace
     resource_provider_uuid5_namespace = UUID("6eae3046-4072-11ef-9bcf-d6be6370a162")
@@ -58,6 +61,12 @@ def subscribe(self):
             events.BEFORE_DELETE,
             cancellable=True,
         )
+        registry.subscribe(
+            routers.handle_router_interface_removal,
+            resources.PORT,
+            events.BEFORE_DELETE,
+            cancellable=True,
+        )
 
     def create_network_precommit(self, context):
         pass
@@ -221,11 +230,14 @@ def delete_subnet_postcommit(self, context):
             {"prefix": prefix, "uuid": subnet_uuid},
         )
 
-    def create_port_precommit(self, context):
+    def create_port_precommit(self, context: PortContext):
         pass
 
-    def create_port_postcommit(self, context):
-        pass
+    def create_port_postcommit(self, context: PortContext) -> None:
+        # Provide network node(s) with connectivity to the networks where this
+        # router port is attached to.
+        if utils.is_router_interface(context):
+            routers.create_port_postcommit(context)
 
     def update_port_precommit(self, context):
         pass
@@ -263,7 +275,7 @@ def _tenant_network_port_cleanup(self, context: PortContext):
         """
         trunk_details = context.current.get("trunk_details", {})
         segment_id = context.original_top_bound_segment["id"]
-        original_binding = context.original["binding:profile"]
+        original_binding = context.original[portbindings.PROFILE]
         connected_interface_uuid = utils.fetch_connected_interface_uuid(
             original_binding, self.nb
         )
@@ -338,7 +350,18 @@ def bind_port(self, context: PortContext) -> None:
         which means that changes made here will get pushed to the switch at that
         time.
         """
-        if is_provisioning_network(context.current["network_id"]):
+        port = context.current
+        LOG.debug(
+            "Attempting to bind port %(port)s on network %(net)s",
+            {"port": port["id"], "net": port["network_id"]},
+        )
+
+        vnic_type = port.get(portbindings.VNIC_TYPE, portbindings.VNIC_NORMAL)
+        if vnic_type not in SUPPORTED_VNIC_TYPES:
+            LOG.debug("Refusing to bind due to unsupported vnic_type: %s", vnic_type)
+            return
+
+        if is_provisioning_network(port["network_id"]):
             self._set_nautobot_port_status(context, "Provisioning-Interface")
 
         for segment in context.network.network_segments:
@@ -349,7 +372,7 @@ def bind_port(self, context: PortContext) -> None:
     def _bind_port_segment(self, context: PortContext, segment):
         network_id = context.current["network_id"]
         connected_interface_uuid = utils.fetch_connected_interface_uuid(
-            context.current["binding:profile"], self.nb
+            context.current[portbindings.PROFILE], self.nb
         )
         mac_address = context.current["mac_address"]
 
@@ -372,13 +395,20 @@ def _bind_port_segment(self, context: PortContext, segment):
             vlan_group_name,
         )
 
-        current_vlan_segment = self._vlan_segment_for_physnet(context, vlan_group_name)
-        dynamic_segment = current_vlan_segment or context.allocate_dynamic_segment(
-            segment={
-                "network_type": p_const.TYPE_VLAN,
-                "physical_network": vlan_group_name,
-            },
-        )
+        current_vlan_segment = utils.vlan_segment_for_physnet(context, vlan_group_name)
+        if current_vlan_segment:
+            LOG.info(
+                "vlan segment: %(segment)s already preset for physnet: " "%(physnet)s",
+                {"segment": current_vlan_segment, "physnet": vlan_group_name},
+            )
+            dynamic_segment = current_vlan_segment
+        else:
+            dynamic_segment = context.allocate_dynamic_segment(
+                segment={
+                    "network_type": p_const.TYPE_VLAN,
+                    "physical_network": vlan_group_name,
+                },
+            )
 
         LOG.debug("bind_port_segment: Native VLAN segment %s", dynamic_segment)
         dynamic_segment_vlan_id = dynamic_segment["segmentation_id"]
@@ -403,21 +433,6 @@ def _bind_port_segment(self, context: PortContext, segment):
             status=p_const.PORT_STATUS_ACTIVE,
         )
 
-    def _vlan_segment_for_physnet(
-        self, context: PortContext, physnet: str
-    ) -> NetworkSegmentDict | None:
-        for segment in context.network.network_segments:
-            if (
-                segment[api.NETWORK_TYPE] == p_const.TYPE_VLAN
-                and segment[api.PHYSICAL_NETWORK] == physnet
-            ):
-                LOG.info(
-                    "vlan segment: %(segment)s already preset for physnet: "
-                    "%(physnet)s",
-                    {"segment": segment, "physnet": physnet},
-                )
-                return segment
-
     def invoke_undersync(self, vlan_group_name: str):
         self.undersync.sync_devices(
             vlan_group=vlan_group_name,
@@ -496,7 +511,7 @@ def _delete_vlan(self, segment):
         )
 
     def _set_nautobot_port_status(self, context: PortContext, status: str):
-        profile = context.current["binding:profile"]
+        profile = context.current[portbindings.PROFILE]
         interface_uuid = utils.fetch_connected_interface_uuid(profile, self.nb)
         LOG.debug("Set interface %s to %s status", interface_uuid, status)
         self.nb.configure_port_status(interface_uuid, status=status)