aboutsummaryrefslogtreecommitdiffstats
path: root/src/onaptests
diff options
context:
space:
mode:
authorandreasgeissler <andreas-geissler@telekom.de>2020-09-02 16:09:17 +0200
committerandreasgeissler <andreas-geissler@telekom.de>2020-09-03 14:42:39 +0200
commit27db04b176e4f9657603528c06e1febb04b5dd4d (patch)
treeec43572a2796f399e38a51cef34b6aa0a9e8f365 /src/onaptests
parent7664059073dd0691428864deb37c3861521e2cd8 (diff)
Updated onboarding steps and customer creation and added HEAT files
Updated README to comply styleguide - hopefully now Issue-ID: TEST-260 Signed-off-by: andreasgeissler <andreas-geissler@telekom.de> Change-Id: I29b9709452ab7cccc1bca54e8e3f8a187c560d14
Diffstat (limited to 'src/onaptests')
-rw-r--r--src/onaptests/steps/cloud/customer_service_subscription_create.py1
-rw-r--r--src/onaptests/steps/onboard/service.py2
-rw-r--r--src/onaptests/steps/onboard/vf.py2
-rw-r--r--src/onaptests/steps/onboard/vsp.py2
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