1 files changed, 3 insertions, 24 deletions
diff --git a/src/onaptests/steps/cloud/connect_service_subscription_to_cloud_region.py b/src/onaptests/steps/cloud/connect_service_subscription_to_cloud_region.py
index 8b11bc1..cc0f7b7 100644
--- a/src/onaptests/steps/cloud/connect_service_subscription_to_cloud_region.py
+++ b/src/onaptests/steps/cloud/connect_service_subscription_to_cloud_region.py
@@ -5,7 +5,7 @@ from onapsdk.configuration import settings
 from ..base import BaseStep
 from .customer_service_subscription_create import CustomerServiceSubscriptionCreateStep
 from .link_cloud_to_complex import LinkCloudRegionToComplexStep
-from .register_cloud_to_multicloud import RegisterCloudRegionToMulticloudStep
+from .register_cloud import RegisterCloudRegionStep
 
 
 class ConnectServiceSubToCloudRegionStep(BaseStep):
@@ -16,13 +16,13 @@ class ConnectServiceSubToCloudRegionStep(BaseStep):
 
         Substeps:
             - LinkCloudRegionToComplexStep,
-            - RegisterCloudRegionToMulticloudStep,
+            - RegisterCloudRegionStep,
             - CustomerServiceSubscriptionCreateStep.
 
         """
         super().__init__(cleanup=cleanup)
+        self.add_step(RegisterCloudRegionStep(cleanup=cleanup))
         self.add_step(LinkCloudRegionToComplexStep(cleanup=cleanup))
-        self.add_step(RegisterCloudRegionToMulticloudStep(cleanup=cleanup))
         self.add_step(CustomerServiceSubscriptionCreateStep(cleanup=cleanup))
 
     def execute(self):
@@ -45,27 +45,6 @@ class ConnectServiceSubToCloudRegionStep(BaseStep):
             cloud_region_id=settings.CLOUD_REGION_ID,
         )
 
-        # Retrieve the tenant
-        # if it does not exist, create it
-        try:
-            tenant: Tenant = cloud_region.get_tenant(settings.TENANT_ID)
-        except ValueError:
-            self._logger.warning("Impossible to retrieve the Specificed Tenant")
-            self._logger.debug("If no multicloud selected, add the tenant")
-            cloud_region.add_tenant(
-                tenant_id=settings.TENANT_ID,
-                tenant_name=settings.TENANT_NAME)
-
-        # be sure that an availability zone has been created
-        # if not, create it
-        try:
-            cloud_region.get_availability_zone_by_name(
-                settings.AVAILABILITY_ZONE_NAME)
-        except ValueError:
-            cloud_region.add_availability_zone(
-                settings.AVAILABILITY_ZONE_NAME,
-                settings.AVAILABILITY_ZONE_TYPE)
-
         # retrieve tenant
         # for which we are sure that an availability zone has been created
         tenant: Tenant = cloud_region.get_tenant(settings.TENANT_ID)