Merge pull request #225 from fabric-testbed/fim_importer

singleton importer

Author: kthare10

Dockerfile-auth

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

fabric_cf/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.3.1"
+__VERSION__ = "1.3.2"

fabric_cf/actor/core/kernel/slice_state_machine.py

@@ -202,7 +202,6 @@ def all_failed(*, reservations: ReservationSet) -> bool:
         """
         We don't introduce a special state to flag when a slice is ALL FAILED, however this helper function helps decide
         when to GC a slice
-
         @return true or false
         """
         bins = StateBins()
@@ -252,7 +251,7 @@ def transition_slice(self, *, operation: SliceOperation, reservations: Reservati
                 bins.add(s=r.get_state())
 
             if self.state == SliceState.Nascent or self.state == SliceState.Configuring:
-                if not bins.has_state_other_than(ReservationStates.Active):
+                if not bins.has_state_other_than(ReservationStates.Active, ReservationStates.Closed):
                     self.state = SliceState.StableOK
 
                 if (not bins.has_state_other_than(ReservationStates.Active, ReservationStates.Failed,
@@ -265,7 +264,7 @@ def transition_slice(self, *, operation: SliceOperation, reservations: Reservati
                     self.state = SliceState.Closing
 
             elif self.state == SliceState.Modifying:
-                if not bins.has_state_other_than(ReservationStates.Active):
+                if not bins.has_state_other_than(ReservationStates.Active, ReservationStates.Closed):
                     self.state = SliceState.ModifyOK
 
                 if (not bins.has_state_other_than(ReservationStates.Active, ReservationStates.Failed,
@@ -300,4 +299,4 @@ def get_state(self) -> SliceState:
         return self.state
 
     def clear(self):
-        self.state = SliceState.Nascent
+        self.state = SliceState.Nascent

fabric_cf/actor/fim/fim_helper.py

@@ -111,6 +111,8 @@ class FimHelper:
     """
     Provides methods to load Graph Models and perform various operations on them
     """
+    __neo4j_graph_importer = None
+
     @staticmethod
     def get_neo4j_importer(neo4j_config: dict = None) -> ABCGraphImporter:
         """
@@ -123,11 +125,12 @@ def get_neo4j_importer(neo4j_config: dict = None) -> ABCGraphImporter:
             neo4j_config = GlobalsSingleton.get().get_config().get_global_config().get_neo4j_config()
             logger = GlobalsSingleton.get().get_logger()
 
-        neo4j_graph_importer = Neo4jGraphImporter(url=neo4j_config["url"], user=neo4j_config["user"],
-                                                  pswd=neo4j_config["pass"],
-                                                  import_host_dir=neo4j_config["import_host_dir"],
-                                                  import_dir=neo4j_config["import_dir"], logger=logger)
-        return neo4j_graph_importer
+        if FimHelper.__neo4j_graph_importer is None:
+            FimHelper.__neo4j_graph_importer = Neo4jGraphImporter(url=neo4j_config["url"], user=neo4j_config["user"],
+                                                                  pswd=neo4j_config["pass"],
+                                                                  import_host_dir=neo4j_config["import_host_dir"],
+                                                                  import_dir=neo4j_config["import_dir"], logger=logger)
+        return FimHelper.__neo4j_graph_importer
 
     @staticmethod
     def get_networkx_importer(logger: logging.Logger = None) -> ABCGraphImporter:

fabric_cf/orchestrator/core/response_builder.py

@@ -28,7 +28,7 @@
 from fabric_mb.message_bus.messages.lease_reservation_avro import LeaseReservationAvro
 from fabric_mb.message_bus.messages.reservation_mng import ReservationMng
 from fabric_mb.message_bus.messages.slice_avro import SliceAvro
-from fim.graph.abc_property_graph import ABCPropertyGraph
+from fim.slivers.json import JSONSliver
 
 from fabric_cf.actor.core.common.constants import Constants
 from fabric_cf.actor.core.kernel.reservation_states import ReservationStates, ReservationPendingStates, JoinState
@@ -80,7 +80,7 @@ def get_reservation_summary(*, res_list: List[ReservationMng]) -> List[dict]:
                 if sliver is not None:
                     res_dict[ResponseBuilder.PROP_GRAPH_NODE_ID] = sliver.node_id
                     res_dict[ResponseBuilder.PROP_SLIVER_TYPE] = type(sliver).__name__
-                    res_dict[ResponseBuilder.PROP_SLIVER] = ABCPropertyGraph.sliver_to_dict(sliver)
+                    res_dict[ResponseBuilder.PROP_SLIVER] = JSONSliver.sliver_to_json(sliver)
 
                 if reservation.get_start() is not None:
                     start_time = ActorClock.from_milliseconds(milli_seconds=reservation.get_start())

requirements.txt

@@ -13,4 +13,4 @@ typing-extensions==3.7.4.3
 six==1.15.0
 wrapt==1.12.1
 fabric-message-bus==1.3.0
-fabric-fim==1.3.3
+fabric-fim==1.3.4