Merge pull request #182 from fabric-testbed/hasattr

Hasattr and Slice id

Author: kthare10

fabric_cf/actor/core/proxies/kafka/translate.py

@@ -104,7 +104,7 @@ def translate_slice_to_avro(*, slice_obj: ABCSlice) -> SliceAvro:
         avro_slice.config_properties = slice_obj.get_config_properties()
         avro_slice.set_lease_end(lease_end=slice_obj.get_lease_end())
         avro_slice.set_lease_start(lease_start=slice_obj.get_lease_start())
-        if hasattr(slice_obj, 'project_id') is not None:
+        if hasattr(slice_obj, 'project_id'):
             avro_slice.set_project_id(project_id=slice_obj.get_project_id())
 
         if slice_obj.get_resource_type() is not None:
@@ -124,7 +124,7 @@ def translate_auth_to_avro(*, auth: AuthToken) -> AuthAvro:
         result.guid = str(auth.get_guid())
         result.oidc_sub_claim = auth.get_oidc_sub_claim()
         result.email = auth.get_email()
-        if hasattr(auth, 'token') is not None:
+        if hasattr(auth, 'token'):
             result.token = auth.get_token()
         return result
 
@@ -137,7 +137,8 @@ def translate_auth_from_avro(*, auth_avro: AuthAvro) -> AuthToken:
         result.guid = auth_avro.guid
         result.oidc_sub_claim = auth_avro.oidc_sub_claim
         result.email = auth_avro.email
-        result.token = auth_avro.token
+        if hasattr(auth_avro, 'token'):
+            result.token = auth_avro.token
         return result
 
     @staticmethod

fabric_cf/orchestrator/swagger_server/response/slices_controller.py

@@ -53,7 +53,7 @@ def slices_create_post(body, slice_name, ssh_key, lease_end_time):  # noqa: E501
         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]
+        slice_id = value[ResponseBuilder.RESPONSE_RESERVATIONS][0][ResponseBuilder.PROP_SLICE_ID]
         logger.info(f"Slice {slice_id} created for user: {email}")
         return response
     except OrchestratorException as e: