From 3e390f1d45785bca5beb1f5c2fa57ef59f6736e9 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Tue, 29 Sep 2020 16:08:46 +0200 Subject: Update path management In case a yaml file is defined the zip was referenced in 2 places consider only the yaml param if the yaml file is defined Add the python path to simplify the integration in CI a,d avoid overwritting any configuration only the 2 ENV parameters + the openstack cloud + the hosts are needed to run any pythonsdk-test Issue-ID: TEST-240 Signed-off-by: mrichomme Change-Id: I57bf303b497e4d2b1dd740286f07beb3783222b1 Signed-off-by: mrichomme --- .../clearwater_ims_nomulticloud_settings.py | 13 ++++++++----- .../ubuntu16_multicloud_yaml_settings.py | 3 ++- .../ubuntu16_nomulticloud_settings.py | 22 +++++++++++++--------- 3 files changed, 23 insertions(+), 15 deletions(-) (limited to 'src/onaptests/configuration') diff --git a/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py b/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py index d640894..6130474 100644 --- a/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py +++ b/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py @@ -1,4 +1,5 @@ import os +import sys import openstack from yaml import load @@ -9,13 +10,17 @@ from .settings import * # pylint: disable=W0614 # pylint: disable=bad-whitespace # The ONAP part USE_MULTICLOUD = False -SERVICE_YAML_TEMPLATE = "templates/vnf-services/clearwater-ims-service.yaml" CLEANUP_FLAG = True CLEANUP_ACTIVITY_TIMER = 60 # nb of seconds before cleanup in case cleanup option is set VENDOR_NAME = "clearwater-ims_vendor" VF_NAME = "clearwater-ims_ubuntu_vf" VSP_NAME = "clearwater-ims_ubuntu_vsp" +# if a yaml file is define, retrieve info from this yaml files +# if not declare the parameters in the settings +SERVICE_YAML_TEMPLATE = (sys.path[-1] + "/onaptests/templates/vnf-services/" + + "clearwater-ims-service.yaml") + try: # Try to retrieve the SERVICE NAME from the yaml file with open(SERVICE_YAML_TEMPLATE, "r") as yaml_template: @@ -23,6 +28,7 @@ try: SERVICE_NAME = next(iter(yaml_config_file.keys())) except ValueError: SERVICE_NAME = "" # Fill me + VSP_FILE_PATH = "" # Fill me CLOUD_REGION_CLOUD_OWNER = "clearwater-ims-cloud-owner" CLOUD_REGION_TYPE = "openstack" @@ -40,10 +46,7 @@ PROJECT = "clearwater-ims-project" LINE_OF_BUSINESS = "clearwater-ims-lob" PLATFORM = "clearwater-ims-platform" -SERVICE_INSTANCE_NAME = "clearwater-ims_service_instance_7" - -VSP_FILE_PATH = "templates/heat_files/clearwater_ims/clearwater_ims.zip" - +SERVICE_INSTANCE_NAME = "clearwater-ims_service_instance" # The cloud Part # Assuming a cloud.yaml is available, use the openstack client diff --git a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py index 6f19fc1..341dc16 100644 --- a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py +++ b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py @@ -1,3 +1,4 @@ +import sys from .settings import * # pylint: disable=W0614 """ Specific ubuntu16 with multicloud and yaml config scenario.""" @@ -35,4 +36,4 @@ PLATFORM = "sdktests_platform" SERVICE_INSTANCE_NAME = "sdktests_service_instance_name" -SERVICE_YAML_TEMPLATE = "templates/vnf-services/ubuntu16test-service.yaml" +SERVICE_YAML_TEMPLATE = sys.path[-1] + "/onaptests/templates/vnf-services/ubuntu16test-service.yaml" diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py index e9f1bf6..c6c9e66 100644 --- a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py +++ b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py @@ -1,5 +1,6 @@ import os import openstack +import sys from yaml import load from .settings import * # pylint: disable=W0614 @@ -12,13 +13,12 @@ USE_MULTICLOUD = False # Set ONLY_INSTANTIATE to true to run an instantiation without repeating # onboarding and related AAI configuration (Cloud config) ONLY_INSTANTIATE= False -SERVICE_YAML_TEMPLATE = "src/onaptests/templates/vnf-services/ubuntu16test-service.yaml" -CLEANUP_FLAG = True -CLEANUP_ACTIVITY_TIMER = 10 # nb of seconds before cleanup in case cleanup option is set -VENDOR_NAME = "basicvm_vendor" -VF_NAME = "basicvm_ubuntu_vf" -VSP_NAME = "basicvm_ubuntu_vsp" +# if a yaml file is define, retrieve info from this yaml files +# if not declare the parameters in the settings +SERVICE_YAML_TEMPLATE = (sys.path[-1] + "/onaptests/templates/vnf-services/" + + "ubuntu16test-service.yaml") + try: # Try to retrieve the SERVICE NAME from the yaml file with open(SERVICE_YAML_TEMPLATE, "r") as yaml_template: @@ -27,6 +27,13 @@ try: except ValueError: SERVICE_NAME = "" # Fill me +CLEANUP_FLAG = True +CLEANUP_ACTIVITY_TIMER = 10 # nb of seconds before cleanup in case cleanup option is set +VENDOR_NAME = "basicvm_vendor" + +VF_NAME = "basicvm_ubuntu_vf" +VSP_NAME = "basicvm_ubuntu_vsp" + CLOUD_REGION_CLOUD_OWNER = "basicvm-cloud-owner" CLOUD_REGION_TYPE = "openstack" CLOUD_REGION_VERSION = "openstack" @@ -45,9 +52,6 @@ PLATFORM = "basicvm-platform" SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance" -VSP_FILE_PATH = "src/onaptests/templates/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 -- cgit 1.2.3-korg