Merge pull request #249 from fabric-testbed/248.renew_ns_failure

check for dependency only for modify in ExtendTicket

Author: kthare10

README.md

@@ -1,5 +1,3 @@
-[![Requirements Status](https://requires.io/github/fabric-testbed/ControlFramework/requirements.svg?branch=master)](https://requires.io/github/fabric-testbed/ControlFramework/requirements/?branch=master)
-
 [![PyPI](https://img.shields.io/pypi/v/fabric-cf?style=plastic)](https://pypi.org/project/fabric-cf/)
 
 # Control Framework

fabric_cf/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.4.0"
+__VERSION__ = "1.4.1"

fabric_cf/actor/core/common/constants.py

@@ -79,9 +79,6 @@ class Constants:
     """
     Constants
     """
-    RESERVATION_HAS_PENDING_OPERATION = -200001
-    EXTEND_SAME_UNITS = -1
-    ALL_RESERVATION_STATES = -1
     MANAGEMENT_API_TIMEOUT_IN_SECONDS = 120.0
 
     CONTAINER_MANAGMENT_OBJECT_ID = "manager"

fabric_cf/actor/core/kernel/kernel.py

@@ -358,7 +358,7 @@ def extend_reservation(self, *, rid: ID, resources: ResourceSet, term: Term, dep
             real.lock()
             # check for a pending operation: we cannot service the extend if there is another operation in progress.
             if real.get_pending_state() != ReservationPendingStates.None_:
-                return Constants.RESERVATION_HAS_PENDING_OPERATION
+                raise KernelException(f"Reservation has a pending operation")
 
             if isinstance(real, ReservationClient) and dependencies is not None:
                 real.redeem_predecessors.clear()

fabric_cf/actor/core/kernel/reservation_client.py

@@ -682,12 +682,12 @@ def extend_ticket(self, *, actor: ABCActorMixin):
         else:
             self.error(err="Wrong state to initiate extend ticket: {}".format(ReservationStates(self.state).name))
 
-        # Extend Ticket is invoked by Probe
-        if not self.can_ticket(extend=True):
+        # Extend Ticket is invoked by Probe; Check dependencies only in case of modify
+        # No new sliver is passed for renew and does not require dependency check
+        if self.requested_resources.sliver is not None and not self.can_ticket(extend=True):
             self.transition_with_join(prefix="Extend ticket blocked", state=self.state,
                                       pending=self.pending_state, join_state=JoinState.BlockedExtendTicket)
             self.logger.info("Reservation has to wait for the dependencies to be extended!")
-            print("Reservation has to wait for the dependencies to be extended!")
             return
 
         self.sequence_ticket_out += 1

fabric_cf/orchestrator/core/orchestrator_handler.py

@@ -676,6 +676,7 @@ def renew_slice(self, *, token: str, slice_id: str, new_lease_end_time: str):
                                                        new_end_time=new_end_time,
                                                        sliver=None)
                 if not result:
+                    self.logger.error(f"Error: {controller.get_last_error()}")
                     failed_to_extend_rid_list.append(r.get_reservation_id())
 
             if len(failed_to_extend_rid_list) == 0: