Merge pull request #351 from fabric-testbed/350-changes-needed-for-new-al2s-am

Changes needed for AL2S-AM updates

Author: kthare10

fabric_cf/actor/core/policy/network_service_inventory.py

@@ -24,6 +24,7 @@
 #
 # Author: Komal Thareja ([email protected])
 import ipaddress
+import random
 import traceback
 from ipaddress import IPv6Network, IPv4Network
 from typing import List, Tuple
@@ -53,7 +54,8 @@ def __extract_vlan_range(*, labels: Labels) -> List[int] or None:
                 for v_r in labels.vlan_range:
                     vlans = v_r.split("-")
                     for x in list(range(int(vlans[0]), int(vlans[1]) + 1)):
-                        vlan_range.append(x)
+                        if x not in vlan_range:
+                            vlan_range.append(x)
             else:
                 vlans = labels.vlan_range.split("-")
                 vlan_range = list(range(int(vlans[0]), int(vlans[1]) + 1))
@@ -103,6 +105,9 @@ def __exclude_allocated_vlans(self, *, available_vlan_range: List[int], bqm_ifs:
                     if allocated_vlan in available_vlan_range:
                         available_vlan_range.remove(allocated_vlan)
 
+        if available_vlan_range is None or len(available_vlan_range) == 0:
+            raise BrokerException(error_code=ExceptionErrorCode.INSUFFICIENT_RESOURCES,
+                                  msg=f"No VLANs available!")
         return available_vlan_range
 
     def allocate_ifs(self, *, requested_ns: NetworkServiceSliver, requested_ifs: InterfaceSliver,
@@ -158,6 +163,7 @@ def allocate_ifs(self, *, requested_ns: NetworkServiceSliver, requested_ifs: Int
                                                             existing_reservations=existing_reservations)
 
                 if requested_vlan is None:
+                    #requested_ifs.labels.vlan = str(random.choice(vlan_range))
                     requested_ifs.labels.vlan = str(vlan_range[0])
                     return requested_ifs
 
@@ -182,13 +188,15 @@ def allocate_ifs(self, *, requested_ns: NetworkServiceSliver, requested_ifs: Int
                                                             existing_reservations=existing_reservations)
                 if bqm_ifs.get_type() != InterfaceType.FacilityPort:
                     # Allocate the first available VLAN
+                    #requested_ifs.labels.vlan = str(random.choice(vlan_range))
                     requested_ifs.labels.vlan = str(vlan_range[0])
-                    requested_ifs.label_allocations = Labels(vlan=str(vlan_range[0]))
+                    requested_ifs.label_allocations = Labels(vlan=requested_ifs.labels.vlan)
                 else:
                     if requested_ifs.labels is None:
                         return requested_ifs
 
                     if requested_ifs.labels.vlan is None:
+                        #requested_ifs.labels.vlan = str(random.choice(vlan_range))
                         requested_ifs.labels.vlan = str(vlan_range[0])
 
                     if int(requested_ifs.labels.vlan) not in vlan_range:
@@ -272,6 +280,7 @@ def allocate_vnic(self, *, rid: ID, requested_ns: NetworkServiceSliver, owner_ns
 
             if requested_ns.label_allocations is None:
                 requested_ns.label_allocations = Labels()
+            #requested_ns.label_allocations.vlan = str(random.choice(vlans_range))
             requested_ns.label_allocations.vlan = str(vlans_range[0])
         except Exception as e:
             self.logger.error(f"Error in allocate_vNIC: {e}")
@@ -442,6 +451,7 @@ def allocate_peered_ifs(self, *, owner_switch: NodeSliver,
             vlan_range = self.__extract_vlan_range(labels=bqm_interface.labels)
             available_vlans = self.__exclude_allocated_vlans(available_vlan_range=vlan_range, bqm_ifs=bqm_interface,
                                                              existing_reservations=existing_reservations)
+            #vlan = str(random.choice(available_vlans))
             vlan = str(available_vlans[0])
             ifs_labels = Labels.update(ifs_labels, vlan=vlan)
 

fabric_cf/orchestrator/core/orchestrator_slice_wrapper.py

@@ -276,7 +276,8 @@ def __build_ns_sliver_reservation(self, *, slice_graph: ABCASMPropertyGraph, nod
 
                         ifs.set_node_map(node_map=node_map)
                         peer_ifs_labels = ifs_mapping.get_peer_ifs().get_labels()
-                        ifs.set_peer_labels(lab=peer_ifs_labels)
+                        if peer_ifs_labels is not None:
+                            ifs.set_peer_labels(lab=peer_ifs_labels)
                         # Peer_ifs is AL2S in ASM
                         if peer_ifs_labels is not None and peer_ifs_labels.ipv4_subnet is not None:
                             interface = ipaddress.IPv4Interface(peer_ifs_labels.ipv4_subnet)