Merge pull request #261 from fabric-testbed/260.extend_model_update

260.extend model update

Author: kthare10

Dockerfile-auth

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

fabric_cf/actor/core/core/actor.py

@@ -429,7 +429,7 @@ def recover_broker_slice(self, *, slice_obj: ABCSlice):
             return False
 
         self.logger.info(f"Closing old delegations and adding new delegations to the slice: {slice_obj}!")
-        delegation_names = []
+        delegation_guids = {}
 
         try:
             delegations = self.plugin.get_database().get_delegations(slice_id=str(slice_obj.get_slice_id()))
@@ -438,25 +438,27 @@ def recover_broker_slice(self, *, slice_obj: ABCSlice):
             raise ActorException(f"Could not fetch delegations records for slice {slice_obj} from database")
 
         for d in delegations:
-            self.logger.info(f"Closing delegation: {d}!")
-            d.set_graph(graph=None)
-            d.transition(prefix="closed as part of recovers", state=DelegationState.Closed)
-            delegation_names.append(d.get_delegation_name())
-            self.plugin.get_database().update_delegation(delegation=d)
+            # Skip closed delegation
+            if d.is_closed():
+                self.logger.info(f"Skipping closed delegation: {d}!")
+                continue
+            # Grab Delegation Name and Delegation Id
+            delegation_guids[d.get_delegation_name()] = d.get_delegation_id()
 
-        adms = self.policy.aggregate_resource_model.generate_adms()
-
-        # Create new delegations and add to the broker slice;
-        # they will be re-registered with the policy in the recovery
-        for name in delegation_names:
-            new_delegation_graph = adms.get(name)
-            dlg_obj = DelegationFactory.create(did=new_delegation_graph.get_graph_id(),
-                                               slice_id=slice_obj.get_slice_id(),
-                                               delegation_name=name)
-            dlg_obj.set_slice_object(slice_object=slice_obj)
-            dlg_obj.set_graph(graph=new_delegation_graph)
-            dlg_obj.transition(prefix="Reload Model", state=DelegationState.Delegated)
-            self.plugin.get_database().add_delegation(delegation=dlg_obj)
+        # Generate ADMs and use existing delegation Id
+        adms = self.policy.aggregate_resource_model.generate_adms(delegation_guids=delegation_guids)
+
+        # Update the delegations with the new graph
+        for d in delegations:
+            # Skip closed delegation
+            if d.is_closed():
+                continue
+
+            new_delegation_graph = adms.get(d.get_delegation_name())
+            if new_delegation_graph.get_graph_id() == d.get_delegation_id():
+                self.logger.info(f"Updating graph for delegation: {d}")
+                d.set_graph(graph=new_delegation_graph)
+            self.plugin.get_database().update_delegation(delegation=d)
 
     def recover_inventory_slice(self, *, slice_obj: ABCSlice) -> bool:
         """

requirements.txt

@@ -9,4 +9,4 @@ swagger-ui-bundle
 fabric_fss_utils==1.4.0
 PyYAML
 fabric-message-bus==1.4.0
-fabric-fim==1.4.4
+fabric-fim==1.4.5