Merge pull request #181 from fabric-testbed/delete_slice

Disabled Project Id check for delete for portal and add logs for MF

Author: kthare10

Dockerfile-auth

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

fabric_cf/__init__.py

@@ -1 +1 @@
-__VERSION__ = "1.2.1"
+__VERSION__ = "1.2.2"

fabric_cf/authority/vm_handler_config.yml

@@ -26,16 +26,28 @@ runtime:
   # Attach Floating IP should be disabled for Sites which only allow IPV6 Address as (Global Unicast Address)
   # Refer https://docs.openstack.org/liberty/networking-guide/adv-config-ipv6.html  for more details
   disable_fip: False
+  ssh_retries: 10
+  images:
+    default_centos8_stream: centos
+    default_centos9_stream: centos
+    default_centos_7: centos
+    default_centos_8: centos
+    default_debian_10: debian
+    default_fedora_35: fedora
+    default_rocky_8: rocky
+    default_ubuntu_18: ubuntu
+    default_ubuntu_20: ubuntu
+    default_ubuntu_21: ubuntu
+    default_ubuntu_22: ubuntu
 playbooks:
   location: /etc/fabric/actor/playbooks
   inventory_location: /etc/fabric/actor/playbooks/inventory
-  admin_ssh_key: ~/.ssh/id_rsa_nova
+  admin_ssh_key: /root/.ssh/id_rsa_nova
   VM: head_vm_provisioning.yml
   GPU: worker_pci_provisioning.yml
   SmartNIC: worker_pci_provisioning.yml
   SharedNIC: worker_pci_provisioning.yml
   FPGA: worker_pci_provisioning.yml
   NVME: worker_pci_provisioning.yml
-  config:
-    SmartNIC: nmcli_config_nw_interface.yml
-    SharedNIC: nmcli_config_nw_interface.yml
+  post_boot_config: head_vm_post_boot_config.yml
+  nw_config: nmcli_config_nw_interface.yml

fabric_cf/orchestrator/core/orchestrator_handler.py

@@ -67,6 +67,15 @@ def get_logger(self):
         """
         return self.logger
 
+    def decode_token(self, *, token: str) -> FabricToken:
+        from fabric_cf.actor.core.container.globals import GlobalsSingleton
+        oauth_config = GlobalsSingleton.get().get_config().get_global_config().get_oauth()
+        jwt_validator = GlobalsSingleton.get().get_jwt_validator()
+        fabric_token = FabricToken(oauth_config=oauth_config, jwt_validator=jwt_validator,
+                                   logger=self.logger, token=token)
+        fabric_token.validate()
+        return fabric_token
+
     def __authorize_request(self, *, id_token: str, action_id: ActionId,
                             resource: BaseSliver or ExperimentTopology = None,
                             lease_end_time: datetime = None) -> FabricToken:
@@ -400,8 +409,7 @@ def delete_slice(self, *, token: str, slice_id: str = None):
             fabric_token = self.__authorize_request(id_token=token, action_id=ActionId.delete)
 
             project, tags = fabric_token.get_project_and_tags()
-            slice_list = controller.get_slices(slice_id=slice_guid, email=fabric_token.get_email(),
-                                               project=project)
+            slice_list = controller.get_slices(slice_id=slice_guid, email=fabric_token.get_email())
 
             if slice_list is None or len(slice_list) == 0:
                 raise OrchestratorException(f"Slice# {slice_id} not found",

fabric_cf/orchestrator/swagger_server/response/slices_controller.py

@@ -40,24 +40,32 @@ def slices_create_post(body, slice_name, ssh_key, lease_end_time):  # noqa: E501
     handler = OrchestratorHandler()
     logger = handler.get_logger()
     received_counter.labels(POST_METHOD, SLICES_CREATE_PATH).inc()
+    email = None
 
     try:
         token = get_token()
+        decoded_token = handler.decode_token(token=token)
+        email = decoded_token.get_email()
         slice_graph = body.decode("utf-8")
         value = handler.create_slice(token=token, slice_name=slice_name, slice_graph=slice_graph,
                                      ssh_key=ssh_key, lease_end_time=lease_end_time)
         response = Success()
         response.value = value
         success_counter.labels(POST_METHOD, SLICES_CREATE_PATH).inc()
+        from fabric_cf.orchestrator.core.response_builder import ResponseBuilder
+        slice_id = value[0][ResponseBuilder.PROP_SLICE_ID]
+        logger.info(f"Slice {slice_id} created for user: {email}")
         return response
     except OrchestratorException as e:
         logger.exception(e)
         failure_counter.labels(POST_METHOD, SLICES_CREATE_PATH).inc()
+        logger.info(f"Slice {slice_name} failed to create for user: {email}")
         msg = str(e).replace("\n", "")
         return cors_response(status=e.get_http_error_code(), xerror=str(e), body=msg)
     except Exception as e:
         logger.exception(e)
         failure_counter.labels(POST_METHOD, SLICES_CREATE_PATH).inc()
+        logger.info(f"Slice {slice_name} failed to create for user: {email}")
         msg = str(e).replace("\n", "")
         return cors_response(status=INTERNAL_SERVER_ERROR, xerror=str(e), body=msg)
 
@@ -76,20 +84,26 @@ def slices_delete_slice_iddelete(slice_id):  # noqa: E501
     handler = OrchestratorHandler()
     logger = handler.get_logger()
     received_counter.labels(DELETE_METHOD, SLICES_DELETE_PATH).inc()
+    email = None
     try:
         token = get_token()
+        decoded_token = handler.decode_token(token=token)
+        email = decoded_token.get_email()
         handler.delete_slice(token=token, slice_id=slice_id)
         response = Success()
         success_counter.labels(DELETE_METHOD, SLICES_DELETE_PATH).inc()
+        logger.info(f"Slice {slice_id} deleted for user: {email}")
         return response
     except OrchestratorException as e:
         logger.exception(e)
         failure_counter.labels(DELETE_METHOD, SLICES_DELETE_PATH).inc()
+        logger.info(f"Slice {slice_id} failed to delete for user: {email}")
         msg = str(e).replace("\n", "")
         return cors_response(status=e.get_http_error_code(), xerror=str(e), body=msg)
     except Exception as e:
         logger.exception(e)
         failure_counter.labels(DELETE_METHOD, SLICES_DELETE_PATH).inc()
+        logger.info(f"Slice {slice_id} failed to delete for user: {email}")
         msg = str(e).replace("\n", "")
         return cors_response(status=INTERNAL_SERVER_ERROR, xerror=str(e), body=msg)