patch for choosing vlans for shared nics

Author: kthare10

fabric_cf/actor/core/policy/network_node_inventory.py

@@ -120,9 +120,6 @@ def __update_shared_nic_labels_and_capacities(self, *, available_component: Comp
             raise BrokerException(error_code=ExceptionErrorCode.INSUFFICIENT_RESOURCES,
                                   msg=f"{message}")
 
-        # Assign the first PCI Id from the list of available PCI slots
-        requested_component.label_allocations = Labels(bdf=delegated_label.bdf[0], numa=delegated_label.numa[0])
-
         # Find the VLAN from the BQM Component
         if available_component.network_service_info is None or \
                 len(available_component.network_service_info.network_services) != 1:
@@ -145,14 +142,25 @@ def __update_shared_nic_labels_and_capacities(self, *, available_component: Comp
 
         delegation_id, ifs_delegated_labels = self.get_delegations(lab_cap_delegations=ifs.get_label_delegations())
 
-        # Determine the index which points to the same PCI id as assigned above
-        # This index points to the other relevant information such as MAC Address,
-        # VLAN tag for that PCI device
-        i = 0
-        for pci_id in ifs_delegated_labels.bdf:
-            if pci_id == delegated_label.bdf[0]:
-                break
-            i += 1
+        assigned_bdf = delegated_label.bdf[0]
+        assigned_numa = delegated_label.numa[0]
+
+        # Check if the requested component's VLAN exists in the delegated labels
+        if requested_component.labels and requested_component.labels.vlan and \
+                requested_component.labels.vlan in ifs_delegated_labels.vlan:
+            vlan_index = ifs_delegated_labels.vlan.index(requested_component.labels.vlan)
+            bdf_for_requested_vlan = ifs_delegated_labels.bdf[vlan_index]
+            
+            if bdf_for_requested_vlan in delegated_label.bdf:
+                bdf_index = delegated_label.bdf.index(bdf_for_requested_vlan)
+                assigned_bdf = bdf_for_requested_vlan
+                assigned_numa = delegated_label.numa[bdf_index]
+
+        # Assign the first PCI Id from the list of available PCI slots
+        requested_component.label_allocations = Labels(bdf=assigned_bdf, numa=assigned_numa)
+
+        # Find index of assigned BDF in the interface delegated labels
+        assigned_index = ifs_delegated_labels.bdf.index(assigned_bdf)
 
         # Updated the Requested component with VLAN, BDF, MAC
         req_ns_name = next(iter(requested_component.network_service_info.network_services))
@@ -162,11 +170,12 @@ def __update_shared_nic_labels_and_capacities(self, *, available_component: Comp
 
         # Do not copy VLAN for OpenStack-vNIC
         if requested_component.get_model() == Constants.OPENSTACK_VNIC_MODEL:
-            lab = Labels(bdf=ifs_delegated_labels.bdf[i], mac=ifs_delegated_labels.mac[i],
-                         local_name=ifs_delegated_labels.local_name[i])
+            lab = Labels(bdf=ifs_delegated_labels.bdf[assigned_index], mac=ifs_delegated_labels.mac[assigned_index],
+                         local_name=ifs_delegated_labels.local_name[assigned_index])
         else:
-            lab = Labels(bdf=ifs_delegated_labels.bdf[i], mac=ifs_delegated_labels.mac[i],
-                         vlan=ifs_delegated_labels.vlan[i], local_name=ifs_delegated_labels.local_name[i])
+            lab = Labels(bdf=ifs_delegated_labels.bdf[assigned_index], mac=ifs_delegated_labels.mac[assigned_index],
+                         vlan=ifs_delegated_labels.vlan[assigned_index],
+                         local_name=ifs_delegated_labels.local_name[assigned_index])
 
         # For the Layer 2 copying the IP address to the label allocations
         # This is to be used by AM Handler to configure Network Interface

tools/db_cli.py

@@ -46,15 +46,15 @@ class MainClass:
     GlobalsSingleton.get().load_config()
     GlobalsSingleton.get().initialized = True
 
-    def __init__(self, user: str, password: str, db: str, host: str = '127.0.0.1:5432'):
+    def __init__(self, user: str, password: str, db: str, host: str = 'orchestrator-db:5432'):
         self.logger = logging.getLogger("db-cli")
         file_handler = RotatingFileHandler('./db_cli.log', backupCount=5, maxBytes=50000)
         logging.basicConfig(level=logging.DEBUG,
                             format="%(asctime)s [%(filename)s:%(lineno)d] [%(levelname)s] %(message)s",
                             handlers=[logging.StreamHandler(), file_handler])
 
         self.db = ActorDatabase(user=user, password=password, database=db, db_host=host, logger=self.logger)
-        self.neo4j_config = {"url": "neo4j://0.0.0.0:9687",
+        self.neo4j_config = {"url": "neo4j://orchestrator-neo4j:9687",
                              "user": "neo4j",
                              "pass": "password",
                              "import_host_dir": "/Users/kthare10/renci/code/fabric/ControlFramework/neo4j1/imports/",
@@ -63,10 +63,10 @@ def __init__(self, user: str, password: str, db: str, host: str = '127.0.0.1:543
     def get_slices(self, email: str = None, slice_id: str = None, slice_name: str = None):
         try:
             if slice_id is not None:
-                slice_obj = self.db.get_slice(slice_id=ID(uid=slice_id))
+                slice_obj = self.db.get_slices(slice_id=ID(uid=slice_id))
                 slice_list = [slice_obj]
             elif email is not None:
-                slice_list = self.db.get_slice_by_email(email=email)
+                slice_list = self.db.get_slices(email=email)
             else:
                 slice_list = self.db.get_slices()