added tests for get_slice_by_state

Author: kthare10

fabric_cf/actor/core/manage/actor_management_object.py

@@ -143,6 +143,9 @@ def get_slices(self, *, slice_id: ID, caller: AuthToken, id_token: str = None,
                                                           resource_type=ResourceType.slice,
                                                           resource_id=str(slice_id))
 
+                if user_email is None:
+                    user_email = email
+
                 try:
                     slice_list = None
                     if slice_id is not None:
@@ -157,8 +160,10 @@ def get_slices(self, *, slice_id: ID, caller: AuthToken, id_token: str = None,
                         slice_list = self.db.get_slice_by_oidc_claim_sub(oidc_claim_sub=user_dn)
                     elif user_email is not None:
                         if state is None:
+                            print("I am here - no state")
                             slice_list = self.db.get_slice_by_email(email=user_email)
                         else:
+                            print("I am here - yes state")
                             slice_list = self.db.get_slice_by_email_state(email=user_email, state=state)
                     else:
                         slice_list = self.db.get_slices()
@@ -314,8 +319,7 @@ def get_slice_by_guid(self, *, guid: str, id_token: str = None) -> ABCSlice:
 
     def get_reservations(self, *, caller: AuthToken, id_token: str = None, state: List[int] = None,
                          slice_id: ID = None, rid: ID = None, oidc_claim_sub: str = None,
-                         email: str = None, rid_list: List[str] = None,
-                         notices_as_dict: bool = False) -> ResultReservationAvro:
+                         email: str = None, rid_list: List[str] = None) -> ResultReservationAvro:
         result = ResultReservationAvro()
         result.status = ResultAvro()
 
@@ -329,6 +333,12 @@ def get_reservations(self, *, caller: AuthToken, id_token: str = None, state: Li
                                                       resource_type=ResourceType.sliver,
                                                       resource_id=str(rid))
 
+            if user_email is None:
+                user_email = email
+
+            if user_dn is None:
+                user_dn = oidc_claim_sub
+
             res_list = None
             try:
                 if rid is not None:
@@ -367,7 +377,7 @@ def get_reservations(self, *, caller: AuthToken, id_token: str = None, state: Li
                     slice_id = r.get_slice_id()
                     slice_obj = self.get_slice_by_guid(guid=slice_id)
                     r.restore(actor=self.actor, slice_obj=slice_obj)
-                    rr = Converter.fill_reservation(reservation=r, full=True, notices_as_dict=notices_as_dict)
+                    rr = Converter.fill_reservation(reservation=r, full=True)
                     result.reservations.append(rr)
         except ReservationNotFoundException as e:
             self.logger.error("getReservations: {}".format(e))

fabric_cf/actor/core/manage/converter.py

@@ -73,8 +73,7 @@ def fill_reservation_predecessor(*, pred: PredecessorState) -> ReservationPredec
         return pred_avro
 
     @staticmethod
-    def fill_reservation(*, reservation: ABCReservationMixin, full: bool,
-                         notices_as_dict:bool = False) -> ReservationMng:
+    def fill_reservation(*, reservation: ABCReservationMixin, full: bool) -> ReservationMng:
         rsv_mng = None
         if isinstance(reservation, ABCControllerReservation):
             rsv_mng = LeaseReservationAvro()
@@ -113,8 +112,6 @@ def fill_reservation(*, reservation: ABCReservationMixin, full: bool,
                 rsv_mng.set_broker(str(broker.get_guid()))
             rsv_mng.set_renewable(reservation.is_renewable())
             rsv_mng.set_renew_time(reservation.get_renew_time())
-            if notices_as_dict:
-                rsv_mng.set_notices(reservation.get_notices_dict())
 
         if reservation.get_term() is not None:
             rsv_mng.set_start(ActorClock.to_milliseconds(when=reservation.get_term().get_start_time()))
@@ -127,8 +124,7 @@ def fill_reservation(*, reservation: ABCReservationMixin, full: bool,
         if reservation.get_requested_term() is not None:
             rsv_mng.set_requested_end(ActorClock.to_milliseconds(when=reservation.get_requested_term().get_end_time()))
 
-        if rsv_mng.get_notices() is None:
-            rsv_mng.set_notices(reservation.get_notices())
+        rsv_mng.set_notices(reservation.get_notices())
 
         if full:
             rsv_mng = Converter.attach_res_properties(mng=rsv_mng, reservation=reservation)

fabric_cf/actor/core/manage/local/local_actor.py

@@ -55,6 +55,7 @@ def get_slices(self, *, id_token: str = None, slice_id: ID = None, slice_name: s
                    email: str = None, state: List[int] = None) -> List[SliceAvro]:
         self.clear_last()
         try:
+            print("I am here")
             result = self.manager.get_slices(slice_id=slice_id, caller=self.auth, id_token=id_token,
                                              slice_name=slice_name, email=email, state=state)
             self.last_status = result.status
@@ -85,7 +86,7 @@ def get_reservations(self, *, id_token: str = None, state: List[int] = None, sli
         try:
             result = self.manager.get_reservations(caller=self.auth, state=state, slice_id=slice_id, rid=rid,
                                                    id_token=id_token, oidc_claim_sub=oidc_claim_sub, email=email,
-                                                   rid_list=rid_list, notices_as_dict=True)
+                                                   rid_list=rid_list)
             self.last_status = result.status
 
             if result.status.get_code() == 0:

fabric_cf/actor/db/psql_database.py

@@ -470,7 +470,7 @@ def generate_slice_dict_from_row(row) -> dict:
 
         slice_obj = {'slc_id': row.slc_id, 'slc_guid': row.slc_guid, 'slc_name': row.slc_name,
                      'slc_type': row.slc_type, 'slc_resource_type': row.slc_resource_type,
-                     'properties': row.properties}
+                     'properties': row.properties, 'slc_state': row.slc_state}
         if row.slc_graph_id is not None:
             slice_obj['slc_graph_id'] = row.slc_graph_id
 
@@ -1798,7 +1798,54 @@ def test2():
         print(r['rsv_state'])
     print("Get all actors after reset {}".format(db.get_actors()))
 
+def test3():
+    logger = logging.getLogger('PsqlDatabase')
+    db = PsqlDatabase(user='fabric', password='fabric', database='am', db_host='127.0.0.1:5432', logger=logger)
+    db.create_db()
+    db.reset_db()
+
+    # Actor Operations
+    prop = {'abc': 'def'}
+
+    # Slice operations
+    from fabric_cf.actor.core.kernel.slice_state_machine import SliceState
+    db.add_slice(slc_guid="1234", slc_name="test-slice", slc_type=1, slc_resource_type="def",
+                 properties=pickle.dumps(prop), lease_start=datetime.utcnow(), lease_end=datetime.utcnow(),
+                 slc_state=SliceState.Closing.value, email="[email protected]")
+
+    db.add_slice(slc_guid="1234", slc_name="test-slice2", slc_type=1, slc_resource_type="def",
+                 properties=pickle.dumps(prop), lease_start=datetime.utcnow(), lease_end=datetime.utcnow(),
+                 slc_state=SliceState.Dead.value, email="[email protected]")
+
+    db.add_slice(slc_guid="1234", slc_name="test-slice3", slc_type=1, slc_resource_type="def",
+                 properties=pickle.dumps(prop), lease_start=datetime.utcnow(), lease_end=datetime.utcnow(),
+                 slc_state=SliceState.StableOK.value, email="[email protected]")
+
+    db.add_slice(slc_guid="1234", slc_name="test-slice4", slc_type=1, slc_resource_type="def",
+                 properties=pickle.dumps(prop), lease_start=datetime.utcnow(), lease_end=datetime.utcnow(),
+                 slc_state=SliceState.StableError.value, email="[email protected]")
+
+    db.add_slice(slc_guid="1234", slc_name="test-slice3", slc_type=1, slc_resource_type="def",
+                 properties=pickle.dumps(prop), lease_start=datetime.utcnow(), lease_end=datetime.utcnow(),
+                 slc_state=SliceState.Configuring.value, email="[email protected]")
+
+    ss = db.get_slice_by_email_state(slc_state=[SliceState.Dead.value, SliceState.Closing.value],
+                                     email="[email protected]")
+
+    assert len(ss) == 2
+
+    ss = db.get_slice_by_email_state(slc_state=[SliceState.StableOK.value, SliceState.StableError.value],
+                                     email="[email protected]")
+
+    assert len(ss) == 2
+
+    ss = db.get_slice_by_email_state(slc_state=[SliceState.Configuring.value],
+                                     email="[email protected]")
+
+    assert len(ss) == 1
+
 
 if __name__ == '__main__':
     test2()
     test()
+    test3()

fabric_cf/orchestrator/core/orchestrator_handler.py

@@ -343,6 +343,7 @@ def get_slices(self, *, token: str, slice_id: str = None, states: List[str] = No
                 slice_guid = ID(uid=slice_id)
 
             slice_states = SliceState.str_list_to_state_list(states=states)
+            print(slice_states)
 
             slice_list = controller.get_slices(id_token=token, slice_id=slice_guid, state=slice_states)
             return ResponseBuilder.get_slice_summary(slice_list=slice_list)