aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2020-09-14 17:29:57 +0200
committermrichomme <morgan.richomme@orange.com>2020-09-14 17:29:57 +0200
commita85a306fb5ee8259b09c392c03ac499c828b5597 (patch)
tree946f8d85ae0bfc62c114f2eb1168a513e1557226 /src
parenta5c39a3409a795fb0709b952e15ac2746364358b (diff)
Consider SERVICE_NAME from the yaml file
avoid duplication in yaml and settings if not defined in Yaml, possibility to set it up manually Issue-ID: TEST-240 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: Ib005eaea78e109b6917f2a09ae04ce0c2c511660
Diffstat (limited to 'src')
-rw-r--r--src/onaptests/configuration/ubuntu16_nomulticloud_settings.py (renamed from src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py)14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
index b3076f6..ae716e7 100644
--- a/src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py
+++ b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
@@ -1,5 +1,6 @@
import os
import openstack
+from yaml import load
from .settings import * # pylint: disable=W0614
@@ -8,10 +9,18 @@ from .settings import * # pylint: disable=W0614
# pylint: disable=bad-whitespace
# The ONAP part
USE_MULTICLOUD = False
+SERVICE_YAML_TEMPLATE = "templates/vnf-services/ubuntu16test-service.yaml"
VENDOR_NAME = "basicvm_vendor"
VSP_NAME = "basicvm_ubuntu_vsp"
-SERVICE_NAME = "basicvm-ubuntu-service"
+try:
+ # Try to retrieve the SERVICE NAME from the yaml file
+ with open(SERVICE_YAML_TEMPLATE, "r") as yaml_template:
+ yaml_config_file = load(yaml_template)
+ SERVICE_NAME = next(iter(yaml_config_file.keys()))
+except ValueError:
+ SERVICE_NAME = "" # Fill me
+
VF_NAME = "basicvm_ubuntu_vf"
CLOUD_REGION_CLOUD_OWNER = "basicvm-cloud-owner"
@@ -30,10 +39,11 @@ PROJECT = "basicvm-project"
LINE_OF_BUSINESS = "basicvm-lob"
PLATFORM = "basicvm-platform"
-SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance"
+SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance_3"
VSP_FILE_PATH = "templates/heat_files/ubuntu16/ubuntu16.zip"
+
# The cloud Part
# Assuming a cloud.yaml is available, use the openstack client
# to retrieve cloud info and avoid data duplication