Merge pull request #391 from fabric-testbed/390-sub-interface-support

390 sub interface support

Author: kthare10

fabric_cf/actor/core/policy/broker_simpler_units_policy.py

@@ -1031,8 +1031,6 @@ def extend_private(self, *, reservation: ABCBrokerReservation, inv: InventoryFor
             sliver = current_resources.get_sliver()
             diff = sliver.diff(other_sliver=requested_resources.get_sliver())
 
-            #if diff is not None and (diff.added is None or
-            #                         (len(diff.added.components) == 0 and len(diff.added.interfaces) == 0)):
             if diff is not None:
                 sliver = requested_resources.get_sliver()
 

fabric_cf/actor/core/policy/network_node_control.py

@@ -234,7 +234,7 @@ def assign(self, *, reservation: ABCAuthorityReservation, delegation_name: str,
                                 actor_id=self.authority.get_guid(), sliver=requested, rtype=resource_type,
                                 properties=reservation.get_slice().get_config_properties())
                     modified = UnitSet(plugin=self.authority.get_plugin(), units={unit.reservation_id: unit})
-                elif len(diff.removed.components) > 0:
+                elif len(diff.removed.components) > 0 or len(diff.modified.components):
                     unit = Unit(rid=reservation.get_reservation_id(), slice_id=reservation.get_slice_id(),
                                 actor_id=self.authority.get_guid(), sliver=requested, rtype=resource_type,
                                 properties=reservation.get_slice().get_config_properties())

fabric_cf/actor/core/util/utils.py

@@ -68,6 +68,9 @@ def node_sliver_to_str(*, sliver: NodeSliver):
                     if ns.interface_info is not None and ns.interface_info.interfaces is not None:
                         for i in ns.interface_info.interfaces.values():
                             result += f"\nIFS: {i}"
+                            if i.interface_info and i.interface_info.interfaces:
+                                for ch_ifc in i.interface_info.interfaces.values():
+                                    result += f"\nSub IFS: {ch_ifc}"
     return result
 
 

fabric_cf/actor/db/psql_database.py

@@ -855,11 +855,21 @@ def get_reservations(self, *, slice_id: str = None, graph_node_id: str = None, p
             if category is not None:
                 rows = rows.filter(Reservations.rsv_category.in_(category))
 
+            # Ensure start and end are datetime objects
+            if start and isinstance(start, str):
+                start = datetime.fromisoformat(start)
+            if end and isinstance(end, str):
+                end = datetime.fromisoformat(end)
+
             # Construct filter condition for lease_end within the given time range
             if start is not None or end is not None:
                 lease_end_filter = True  # Initialize with True to avoid NoneType comparison
                 if start is not None and end is not None:
-                    lease_end_filter = and_(start <= Reservations.lease_end, Reservations.lease_end <= end)
+                    lease_end_filter = or_(
+                        and_(start <= Reservations.lease_end, Reservations.lease_end <= end),
+                        and_(start <= Reservations.lease_start, Reservations.lease_start <= end),
+                        and_(Reservations.lease_start <= start, Reservations.lease_end >= end)
+                    )
                 elif start is not None:
                     lease_end_filter = start <= Reservations.lease_end
                 elif end is not None:
@@ -897,7 +907,11 @@ def get_components(self, *, node_id: str, states: list[int], rsv_type: list[str]
             # Construct filter condition for lease_end within the given time range
             if start is not None or end is not None:
                 if start is not None and end is not None:
-                    lease_end_filter = and_(start <= Reservations.lease_end, Reservations.lease_end <= end)
+                    lease_end_filter = or_(
+                        and_(start <= Reservations.lease_end, Reservations.lease_end <= end),
+                        and_(start <= Reservations.lease_start, Reservations.lease_start <= end),
+                        and_(Reservations.lease_start <= start, Reservations.lease_end >= end)
+                    )
                 elif start is not None:
                     lease_end_filter = start <= Reservations.lease_end
                 elif end is not None:

fabric_cf/actor/fim/fim_helper.py

@@ -436,15 +436,23 @@ def get_interface_sliver_mapping(ifs_node_id: str, slice_graph: ABCASMPropertyGr
             raise Exception(f"More than one Peer Interface Sliver found for IFS: {ifs_node_id}!")
         peer_ifs = next(iter(peer_interfaces))
 
-        peer_ns_node_name, peer_ns_id = slice_graph.get_parent(node_id=peer_ifs.node_id,
-                                                               rel=ABCPropertyGraph.REL_CONNECTS,
-                                                               parent=ABCPropertyGraph.CLASS_NetworkService)
+        if peer_ifs.get_type() == InterfaceType.SubInterface:
+            parent_cp_node_name, parent_cp_node_id = slice_graph.get_parent(node_id=peer_ifs.node_id,
+                                                                            rel=ABCPropertyGraph.REL_CONNECTS,
+                                                                            parent=ABCPropertyGraph.CLASS_ConnectionPoint)
+            peer_ns_node_name, peer_ns_id = slice_graph.get_parent(node_id=parent_cp_node_id,
+                                                                   rel=ABCPropertyGraph.REL_CONNECTS,
+                                                                   parent=ABCPropertyGraph.CLASS_NetworkService)
+        else:
+            peer_ns_node_name, peer_ns_id = slice_graph.get_parent(node_id=peer_ifs.node_id,
+                                                                   rel=ABCPropertyGraph.REL_CONNECTS,
+                                                                   parent=ABCPropertyGraph.CLASS_NetworkService)
 
         component_name = None
         facility = False
         peer_site = None
 
-        if peer_ifs.get_type() in [InterfaceType.DedicatedPort, InterfaceType.SharedPort]:
+        if peer_ifs.get_type() in [InterfaceType.DedicatedPort, InterfaceType.SharedPort, InterfaceType.SubInterface]:
             component_name, component_id = slice_graph.get_parent(node_id=peer_ns_id, rel=ABCPropertyGraph.REL_HAS,
                                                                   parent=ABCPropertyGraph.CLASS_Component)
             # Possibly P4 switch; parent will be a switch
@@ -467,6 +475,7 @@ def get_interface_sliver_mapping(ifs_node_id: str, slice_graph: ABCASMPropertyGr
 
             # Peer Network Service is FABRIC L3VPN connected to a FABRIC Site
             # Determine the site to which AL2S Peered Interface is connected to
+
             for ifs in peer_ns.interface_info.interfaces.values():
                 # Skip the peered interface
                 if ifs.node_id == peer_ifs.node_id:
@@ -600,23 +609,85 @@ def get_owners(*, bqm: ABCCBMPropertyGraph, node_id: str,
         return switch, mpls_ns, requested_ns
 
     @staticmethod
-    def get_parent_node(*, graph_model: ABCPropertyGraph, component: Component = None, interface: Interface = None,
+    def get_parent_node(*, graph_model: ABCPropertyGraph, node: Union[Component, Interface],
                         sliver: bool = True) -> Tuple[Union[NodeSliver, NetworkServiceSliver, None], str]:
-        node = None
-        if component is not None:
-            node_name, node_id = graph_model.get_parent(node_id=component.node_id, rel=ABCPropertyGraph.REL_HAS,
-                                                        parent=ABCPropertyGraph.CLASS_NetworkNode)
-            if sliver:
-                node = graph_model.build_deep_node_sliver(node_id=node_id)
-        elif interface is not None:
-            node_name, node_id = graph_model.get_parent(node_id=interface.node_id, rel=ABCPropertyGraph.REL_CONNECTS,
-                                                        parent=ABCPropertyGraph.CLASS_NetworkService)
-            if sliver:
-                node = graph_model.build_deep_ns_sliver(node_id=node_id)
-        else:
+        """
+        Retrieve the parent node of a given component or interface in the graph model.
+
+        This method determines the parent node of a specified component or interface within the provided
+        property graph model. It can return either a node sliver or a network service sliver based on the
+        type of the input node and the `sliver` flag.
+
+        :param graph_model: The property graph model used to find parent nodes.
+        :type graph_model: ABCPropertyGraph
+
+        :param node: The component or interface for which to find the parent node.
+        :type node: Union[Component, Interface]
+
+        :param sliver: Flag indicating whether to build and return a sliver object for the parent node.
+                       Defaults to True.
+        :type sliver: bool
+
+        :return: A tuple containing the parent node sliver (or network service sliver) and the parent node ID.
+                 If no parent node is found, returns (None, None).
+        :rtype: Tuple[Union[NodeSliver, NetworkServiceSliver, None], str]
+
+        :raises Exception: If the `node` argument is None or is neither a Component nor an Interface.
+
+        Example:
+            >>> parent_node, parent_node_id = get_parent_node(graph_model=my_graph_model, node=my_component)
+            >>> print(parent_node, parent_node_id)
+        """
+        if node is None:
             raise Exception("Invalid Arguments - component/interface both are None")
 
-        return node, node_id
+        parent_node = None
+        parent_node_id = None
+
+        if isinstance(node, Component):
+            node_name, parent_node_id = graph_model.get_parent(
+                node_id=node.node_id,
+                rel=ABCPropertyGraph.REL_HAS,
+                parent=ABCPropertyGraph.CLASS_NetworkNode
+            )
+            if sliver:
+                parent_node = graph_model.build_deep_node_sliver(node_id=parent_node_id)
+        elif isinstance(node, Interface):
+            if node.type == InterfaceType.SubInterface:
+                # Get the OVS Network Service attached to Sub Interface
+                sub_cp_nbs = graph_model.get_first_and_second_neighbor(
+                    node_id=node.node_id,
+                    rel1=ABCPropertyGraph.REL_CONNECTS,
+                    node1_label=ABCPropertyGraph.CLASS_ConnectionPoint,
+                    rel2=ABCPropertyGraph.REL_CONNECTS,
+                    node2_label=ABCPropertyGraph.CLASS_NetworkService
+                )
+                if len(sub_cp_nbs) == 0:
+                    raise Exception(f"Parent (NS-OVS) for Sub Interface: {node.name} cannot be found!")
+
+                # Get the component and node associated with Sub Interface
+                sub_node = graph_model.get_first_and_second_neighbor(
+                    node_id=sub_cp_nbs[0][1],
+                    rel1=ABCPropertyGraph.REL_HAS,
+                    node1_label=ABCPropertyGraph.CLASS_Component,
+                    rel2=ABCPropertyGraph.REL_HAS,
+                    node2_label=ABCPropertyGraph.CLASS_NetworkNode
+                )
+                if len(sub_node) == 0:
+                    raise Exception(f"Parent for Sub Interface: {node.name} cannot be found!")
+                parent_node_id = sub_node[0][1]
+                if sliver:
+                    parent_node = graph_model.build_deep_node_sliver(node_id=parent_node_id)
+            else:
+                node_name, parent_node_id = graph_model.get_parent(
+                    node_id=node.node_id,
+                    rel=ABCPropertyGraph.REL_CONNECTS,
+                    parent=ABCPropertyGraph.CLASS_NetworkService
+                )
+                if sliver:
+                    parent_node = graph_model.build_deep_ns_sliver(node_id=parent_node_id)
+
+        return parent_node, parent_node_id
 
     @staticmethod
     def prune_graph(*, graph_id: str) -> ExperimentTopology:

fabric_cf/broker/test/test.yaml

@@ -135,7 +135,13 @@ actor:
       module: fabric_cf.actor.core.policy.broker_simpler_units_policy
       class: BrokerSimplerUnitsPolicy
       properties:
-        algorithm: FirstFit
+        algorithm:
+          FirstFit: # Default policy for all sites
+            enabled: true
+          Random: # Random policy for specific sites
+            enabled: true
+            sites: # Specify the sites where Random policy should be used
+              - EDUKY
   controls:
       - control:
           type: VM, Container, Baremetal, Switch

fabric_cf/orchestrator/core/orchestrator_slice_wrapper.py

@@ -42,7 +42,7 @@
 from fim.slivers.network_node import NodeSliver, NodeType
 from fim.slivers.network_service import NetworkServiceSliver
 from fim.slivers.topology_diff import WhatsModifiedFlag
-from fim.user import ServiceType, ExperimentTopology
+from fim.user import ServiceType, ExperimentTopology, InterfaceType
 
 from fabric_cf.actor.core.common.constants import ErrorCodes, Constants
 from fabric_cf.actor.core.kernel.reservation_states import ReservationPendingStates, ReservationStates
@@ -519,7 +519,7 @@ def modify(self, *, new_slice_graph: ABCASMPropertyGraph) -> List[LeaseReservati
 
         # Add components
         for x in topology_diff.added.components:
-            sliver, parent_node_id = FimHelper.get_parent_node(graph_model=new_slice_graph, component=x)
+            sliver, parent_node_id = FimHelper.get_parent_node(graph_model=new_slice_graph, node=x)
             rid = sliver.reservation_info.reservation_id
             # If corresponding sliver also has add operations; it's already in the map
             # No need to rebuild it
@@ -529,7 +529,7 @@ def modify(self, *, new_slice_graph: ABCASMPropertyGraph) -> List[LeaseReservati
         # Remove components
         for x in topology_diff.removed.components:
             # Grab the old sliver
-            sliver, parent_node_id = FimHelper.get_parent_node(graph_model=existing_topology.graph_model, component=x)
+            sliver, parent_node_id = FimHelper.get_parent_node(graph_model=existing_topology.graph_model, node=x)
             rid = sliver.reservation_info.reservation_id
             # If corresponding sliver also has add operations; it's already in the map
             # No need to rebuild it
@@ -539,37 +539,44 @@ def modify(self, *, new_slice_graph: ABCASMPropertyGraph) -> List[LeaseReservati
 
         # Added Interfaces
         for x in topology_diff.added.interfaces:
-            new_sliver, parent_node_id = FimHelper.get_parent_node(graph_model=new_slice_graph, interface=x)
+            new_sliver, parent_node_id = FimHelper.get_parent_node(graph_model=new_slice_graph, node=x)
             rid = new_sliver.reservation_info.reservation_id
             # If corresponding sliver also has add operations; it's already in the map
             # No need to rebuild it
             if rid not in self.computed_modify_reservations:
-                new_reservation, dep_update_needed = self.__build_ns_sliver_reservation(slice_graph=new_slice_graph,
-                                                                                        node_id=parent_node_id,
-                                                                                        node_res_mapping=node_res_mapping)
-                self.computed_modify_reservations[rid] = ModifiedReservation(sliver=new_reservation.get_sliver(),
-                                                                             dependencies=new_reservation.redeem_processors)
+                if x.type == InterfaceType.SubInterface:
+                    self.computed_modify_reservations[rid] = ModifiedReservation(sliver=new_sliver)
+                else:
+                    new_reservation, dep_update_needed = self.__build_ns_sliver_reservation(slice_graph=new_slice_graph,
+                                                                                            node_id=parent_node_id,
+                                                                                            node_res_mapping=node_res_mapping)
+                    self.computed_modify_reservations[rid] = ModifiedReservation(sliver=new_reservation.get_sliver(),
+                                                                                 dependencies=new_reservation.redeem_processors)
 
-                if dep_update_needed:
-                    ns_peered_reservations.append(new_reservation)
-                ns_mapping[new_reservation.sliver.node_id] = rid
+                    if dep_update_needed:
+                        ns_peered_reservations.append(new_reservation)
+                    ns_mapping[new_reservation.sliver.node_id] = rid
 
         # Removed Interfaces
         for x in topology_diff.removed.interfaces:
-            sliver, parent_node_id = FimHelper.get_parent_node(graph_model=existing_topology.graph_model, interface=x)
+            sliver, parent_node_id = FimHelper.get_parent_node(graph_model=existing_topology.graph_model, node=x)
             rid = sliver.reservation_info.reservation_id
             # If corresponding sliver also has add operations; it's already in the map
             # No need to rebuild it
             if rid not in self.computed_modify_reservations:
-                new_reservation, dep_update_needed = self.__build_ns_sliver_reservation(slice_graph=new_slice_graph,
-                                                                                        node_id=parent_node_id,
-                                                                                        node_res_mapping=node_res_mapping)
-                self.computed_modify_reservations[rid] = ModifiedReservation(sliver=new_reservation.get_sliver(),
-                                                                             dependencies=new_reservation.redeem_processors)
-
-                if dep_update_needed:
-                    ns_peered_reservations.append(new_reservation)
-                ns_mapping[new_reservation.sliver.node_id] = rid
+                if x.type == InterfaceType.SubInterface:
+                    new_sliver = new_slice_graph.build_deep_node_sliver(node_id=parent_node_id)
+                    self.computed_modify_reservations[rid] = ModifiedReservation(sliver=new_sliver)
+                else:
+                    new_reservation, dep_update_needed = self.__build_ns_sliver_reservation(slice_graph=new_slice_graph,
+                                                                                            node_id=parent_node_id,
+                                                                                            node_res_mapping=node_res_mapping)
+                    self.computed_modify_reservations[rid] = ModifiedReservation(sliver=new_reservation.get_sliver(),
+                                                                                 dependencies=new_reservation.redeem_processors)
+
+                    if dep_update_needed:
+                        ns_peered_reservations.append(new_reservation)
+                    ns_mapping[new_reservation.sliver.node_id] = rid
 
         # Remove nodes
         for x in topology_diff.removed.nodes:

pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "PyYAML",
     "fabric_fss_utils==1.5.0",
     "fabric-message-bus==1.7.0b1",
-    "fabric-fim==1.7.0b6",
+    "fabric-fim==1.7.0b13",
     "fabric-credmgr-client==1.6.0",
     "ansible"
     ]