Merge pull request #336 from fabric-testbed/335-modify-issue-with-network-services

ns modify fix and better error messages

Author: kthare10

Dockerfile-auth

@@ -1,7 +1,7 @@
 FROM python:3.9.0
 MAINTAINER Komal Thareja<[email protected]>
 
-ARG HANDLERS_VER=1.5.1
+ARG HANDLERS_VER=1.5.2
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

fabric_cf/actor/core/kernel/reservation_client.py

@@ -483,6 +483,9 @@ def prepare_ticket(self, extend: bool = False):
             if value1 == str(NodeType.Facility) or ifs.label_allocations is not None:
                 continue
 
+            if value1 is None:
+                self.fail(message=f"Node Map for the interface {ifs} not set {ifs.get_node_map()}")
+
             result = value1.split(",")
             if Constants.PEERED in value1:
                 if sliver.get_technology() == Constants.AL2S:

fabric_cf/actor/core/policy/network_service_control.py

@@ -49,6 +49,10 @@ def __has_sliver_changed(current: NetworkServiceSliver, requested: NetworkServic
         if diff is None:
             return False
 
+        if diff.added.interfaces is not None or diff.removed.interfaces is not None or \
+                diff.modified.interfaces is not None:
+            return True
+
         if diff.modified is not None and diff.modified.services is not None:
             for new_ns, flag in diff.modified.services:
                 if not (flag & WhatsModifiedFlag.LABELS or flag & WhatsModifiedFlag.CAPACITIES):

fabric_cf/actor/fim/fim_helper.py

@@ -526,6 +526,7 @@ def get_site_interface_sliver(*, component: ComponentSliver or NodeSliver, local
         @param device_name device name
         @return Interface sliver
         """
+        result = None
         for ns in component.network_service_info.network_services.values():
             # Filter on region
             if region is not None:
@@ -540,21 +541,14 @@ def get_site_interface_sliver(*, component: ComponentSliver or NodeSliver, local
             if local_name is not None:
                 result = list(filter(lambda x: (local_name in x.labels.local_name), result))
 
-            return random.choice(result)
-            '''
-            # Return specific interface where local name matches
-            if local_name is not None:
-                return next(x for x in ns.interface_info.interfaces.values() if local_name in x.get_name())
-            else:
-                # Return an interface chosen randomly
-                if region is None:
-                    return random.choice(list(ns.interface_info.interfaces.values()))
-                # Return an interface chosen randomly for a specific region
-                else:
-                    result = list(filter(lambda x: (region in x.labels.region), ns.interface_info.interfaces.values()))
-                    return random.choice(result)
-            '''
-        return None
+            if result is not None:
+                break
+
+        if result is None or len(result) == 0:
+            raise Exception(f"No interface found to service region {region}, device: {device_name} "
+                            f"local_name: {local_name} in component: {component}")
+
+        return random.choice(result)
 
     @staticmethod
     def get_owners(*, bqm: ABCCBMPropertyGraph, node_id: str,