Merge pull request #406 from fabric-testbed/renew-fix

Fix for the renew - where lifetime was not getting extended

Author: kthare10

Dockerfile-auth

@@ -1,7 +1,7 @@
 FROM python:3.11.0
 MAINTAINER Komal Thareja<komal.thareja@gmail.com>
 
-ARG HANDLERS_VER=1.8.0
+ARG HANDLERS_VER=1.8.1
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

fabric_cf/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.8.0"
+__version__ = "1.8.1"
 __VERSION__ = __version__

fabric_cf/authority/docker-compose.yml

@@ -52,7 +52,7 @@ services:
       network: host
       context: ../../../
       dockerfile: Dockerfile-auth
-    image: authority:1.8.0
+    image: authority:1.8.1
     container_name: site1-am
     restart: always
     depends_on:

fabric_cf/broker/docker-compose.yml

@@ -54,7 +54,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-broker
-    image: broker:1.8.0
+    image: broker:1.8.1
     container_name: broker
     restart: always
     networks:

fabric_cf/orchestrator/core/orchestrator_handler.py

@@ -797,7 +797,8 @@ def renew_slice(self, *, token: str, slice_id: str, new_lease_end_time: datetime
                 if new_end_time == current_end_time:
                     continue
 
-                self.logger.debug(f"Extending reservation with reservation# {r.get_reservation_id()}")
+                self.logger.debug(f"Extending reservation with reservation# {r.get_reservation_id()} "
+                                  f"new_end_time: {new_end_time}")
                 result = controller.extend_reservation(reservation=ID(uid=r.get_reservation_id()),
                                                        new_end_time=new_end_time,
                                                        sliver=None)
@@ -852,9 +853,6 @@ def validate_lease_time(lease_time: str) -> Union[datetime, None]:
 
         return new_time
 
-    from datetime import datetime, timedelta, timezone
-    from typing import Tuple
-
     def __compute_lease_end_time(self, lease_end_time: datetime = None, allow_long_lived: bool = False,
                                  project_id: str = None,
                                  lifetime: int = Constants.DEFAULT_LEASE_IN_HOURS) -> Tuple[datetime, datetime]:
@@ -880,10 +878,10 @@ def __compute_lease_end_time(self, lease_end_time: datetime = None, allow_long_l
         default_max_duration /= 3600
 
         # Calculate lifetime if not directly provided
-        if lifetime is None:
-            if lease_end_time:
-                lifetime = (lease_end_time - base_time).total_seconds() / 3600
-            else:
+        if lease_end_time:
+            lifetime = (lease_end_time - base_time).total_seconds() / 3600
+        else:
+            if not lifetime:
                 lifetime = Constants.DEFAULT_LEASE_IN_HOURS
 
         # Ensure the requested lifetime does not exceed allowed max duration for the project

fabric_cf/orchestrator/docker-compose.yml

@@ -69,7 +69,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-orchestrator
-    image: orchestrator:1.8.0
+    image: orchestrator:1.8.1
     container_name: orchestrator
     restart: always
     depends_on:

fabric_cf/orchestrator/slice_expiration_template.txt

@@ -1,4 +1,4 @@
-Subject: FABRIC Reminders | Urgent: Your Slice <slice_name> Will Expire Soon
+Subject: FABRIC Reminders | Urgent: Your Slice <slice_name> Will Expire in <hours_left> hours
 
 Dear <User>,