4 files changed, 4 insertions, 3 deletions
diff --git a/src/onaptests/steps/cloud/customer_service_subscription_create.py b/src/onaptests/steps/cloud/customer_service_subscription_create.py
index c797d56..ebe478f 100644
--- a/src/onaptests/steps/cloud/customer_service_subscription_create.py
+++ b/src/onaptests/steps/cloud/customer_service_subscription_create.py
@@ -25,6 +25,7 @@ class CustomerServiceSubscriptionCreateStep(BaseStep):
          - GLOBAL_CUSTOMER_ID,
          - SERVICE_NAME.
         """
+        super().execute()
         service = Service(name=settings.SERVICE_NAME)
         customer = Customer.get_by_global_customer_id(settings.GLOBAL_CUSTOMER_ID)
         customer.subscribe_service(service)
diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py
index 0143908..42a1db4 100644
--- a/src/onaptests/steps/onboard/service.py
+++ b/src/onaptests/steps/onboard/service.py
@@ -84,5 +84,5 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep):
         super().execute()
         service: Service = Service(name=self.service_name,
                                    resources=[Vf(name=vnf["vnf_name"]) \
-                                                for vnf in self.yaml_template[self.name]["vnfs"]])
+                                                for vnf in self.yaml_template[self.service_name]["vnfs"]])
         service.onboard()
diff --git a/src/onaptests/steps/onboard/vf.py b/src/onaptests/steps/onboard/vf.py
index 6d19b9a..2cda931 100644
--- a/src/onaptests/steps/onboard/vf.py
+++ b/src/onaptests/steps/onboard/vf.py
@@ -54,7 +54,7 @@ class YamlTemplateVfOnboardStep(YamlTemplateBaseStep):
             dict: YAML template
 
         """
-        return self.parent.yaml_template[self.parent.name]
+        return self.parent.yaml_template[self.parent.service_name]
 
     def execute(self):
         """Onboard Vfs from YAML template."""
diff --git a/src/onaptests/steps/onboard/vsp.py b/src/onaptests/steps/onboard/vsp.py
index f1eec1f..75055de 100644
--- a/src/onaptests/steps/onboard/vsp.py
+++ b/src/onaptests/steps/onboard/vsp.py
@@ -33,7 +33,7 @@ class VspOnboardStep(BaseStep):
         vsp.onboard()
 
 
-class YamlTemplateVspOnboardStep(VspOnboardStep, YamlTemplateBaseStep):
+class YamlTemplateVspOnboardStep(YamlTemplateBaseStep):
     """Vsp onboard using YAML template step."""
 
     @property