Merge pull request #362 from fabric-testbed/infrastructure-slices

allow infrastructure slices

Author: kthare10

fabric_cf/actor/core/common/constants.py

@@ -197,6 +197,7 @@ class Constants:
     CONFIGURATION_FILE = "/etc/fabric/actor/config/config.yaml"
     STATE_FILE_LOCATION = '/tmp/fabric_actor.tmp'
     MAINT_PROJECT_ID = 'maint.project.id'
+    INFRASTRUCTURE_PROJECT_ID = "infrastructure.project.id"
 
     ELASTIC_TIME = "request.elasticTime"
     ELASTIC_SIZE = "request.elasticSize"

fabric_cf/actor/core/policy/authority_calendar_policy.py

@@ -596,6 +596,9 @@ def get_network_service_from_graph(self, *, node_id: str) -> NetworkServiceSlive
             if self.aggregate_resource_model is None:
                 return None
             return self.aggregate_resource_model.build_deep_ns_sliver(node_id=node_id)
+        except Exception as e:
+            self.logger.error(f"Unable to get network service: {e}")
+            self.logger.error(traceback.format_exc())
         finally:
             self.lock.release()
 

fabric_cf/actor/core/policy/network_service_inventory.py

@@ -153,7 +153,7 @@ def allocate_ifs(self, *, requested_ns: NetworkServiceSliver, requested_ifs: Int
 
                 if vlan_range is not None and requested_vlan not in vlan_range:
                     raise BrokerException(error_code=ExceptionErrorCode.FAILURE,
-                                          msg=f"Vlan for L2 service {requested_vlan} is outside the available vlans "
+                                          msg=f"Vlan for L2 service {requested_vlan} is outside the available range "
                                               f"{vlan_range}")
 
             # Validate the VLANs

fabric_cf/authority/docker-compose.yml

@@ -52,7 +52,7 @@ services:
       network: host
       context: ../../../
       dockerfile: Dockerfile-auth
-    image: authority:1.6.0
+    image: authority:1.6.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.6.0
+    image: broker:1.6.1
     container_name: broker
     restart: always
     networks:

fabric_cf/orchestrator/config.orchestrator.yaml

@@ -48,6 +48,7 @@ runtime:
   kafka.request.timeout.ms: 120000
   rpc.request.timeout.seconds: 1200
   maint.project.id: 990d8a8b-7e50-4d13-a3be-0f133ffa8653
+  infrastructure.project.id: 4604cab7-41ff-4c1a-a935-0ca6f20cceeb
   message.max.bytes: 1048588
   rpc.retries: 5
   commit.batch.size: 1

fabric_cf/orchestrator/core/orchestrator_handler.py

@@ -64,6 +64,7 @@ def __init__(self):
         self.logger = self.globals.get_logger()
         self.jwks_url = self.globals.get_config().get_oauth_config().get(Constants.PROPERTY_CONF_O_AUTH_JWKS_URL, None)
         self.pdp_config = self.globals.get_config().get_global_config().get_pdp_config()
+        self.infrastructure_project_id = self.globals.get_config().get_runtime_config().get(Constants.INFRASTRUCTURE_PROJECT_ID, None)
 
     def get_logger(self):
         """
@@ -218,7 +219,8 @@ def create_slice(self, *, token: str, slice_name: str, slice_graph: str, ssh_key
             fabric_token = AccessChecker.validate_and_decode_token(token=token)
             project, tags, project_name = fabric_token.first_project
             allow_long_lived = True if Constants.SLICE_NO_LIMIT_LIFETIME in tags else False
-            end_time = self.__validate_lease_end_time(lease_end_time=lease_end_time, allow_long_lived=allow_long_lived)
+            end_time = self.__validate_lease_end_time(lease_end_time=lease_end_time, allow_long_lived=allow_long_lived,
+                                                      project_id=project)
 
             controller = self.controller_state.get_management_actor()
             self.logger.debug(f"create_slice invoked for Controller: {controller}")
@@ -701,7 +703,8 @@ def renew_slice(self, *, token: str, slice_id: str, new_lease_end_time: str):
             project, tags, project_name = fabric_token.first_project
             allow_long_lived = True if Constants.SLICE_NO_LIMIT_LIFETIME in tags else False
             new_end_time = self.__validate_lease_end_time(lease_end_time=new_lease_end_time,
-                                                          allow_long_lived=allow_long_lived)
+                                                          allow_long_lived=allow_long_lived,
+                                                          project_id=project)
 
             reservations = controller.get_reservations(slice_id=slice_id)
             if reservations is None or len(reservations) < 1:
@@ -748,11 +751,13 @@ def renew_slice(self, *, token: str, slice_id: str, new_lease_end_time: str):
             self.logger.error(f"Exception occurred processing renew e: {e}")
             raise e
 
-    def __validate_lease_end_time(self, lease_end_time: str, allow_long_lived: bool = False) -> datetime:
+    def __validate_lease_end_time(self, lease_end_time: str, allow_long_lived: bool = False,
+                                  project_id: str = None) -> datetime:
         """
         Validate Lease End Time
         :param lease_end_time: New End Time
         :param allow_long_lived: Allow long lived tokens
+        :param project_id: Project Id
         :return End Time
         :raises Exception if new end time is in past
         """
@@ -774,7 +779,7 @@ def __validate_lease_end_time(self, lease_end_time: str, allow_long_lived: bool
             default_long_lived_duration = Constants.LONG_LIVED_SLICE_TIME_WEEKS
         else:
             default_long_lived_duration = Constants.DEFAULT_MAX_DURATION
-        if (new_end_time - now) > default_long_lived_duration:
+        if project_id not in self.infrastructure_project_id and (new_end_time - now) > default_long_lived_duration:
             self.logger.info(f"New term end time {new_end_time} exceeds system default "
                              f"{default_long_lived_duration}, setting to system default: ")
 

fabric_cf/orchestrator/docker-compose.yml

@@ -68,7 +68,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-orchestrator
-    image: orchestrator:1.6.0
+    image: orchestrator:1.6.1
     container_name: orchestrator
     restart: always
     depends_on: