From a85a306fb5ee8259b09c392c03ac499c828b5597 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Mon, 14 Sep 2020 17:29:57 +0200 Subject: 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 Change-Id: Ib005eaea78e109b6917f2a09ae04ce0c2c511660 --- run_basicvm_nomulticloud.py | 27 +++----- .../ubuntu16_nomulticloud_noyaml_settings.py | 63 ------------------- .../ubuntu16_nomulticloud_settings.py | 73 ++++++++++++++++++++++ 3 files changed, 81 insertions(+), 82 deletions(-) delete mode 100644 src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py create mode 100644 src/onaptests/configuration/ubuntu16_nomulticloud_settings.py diff --git a/run_basicvm_nomulticloud.py b/run_basicvm_nomulticloud.py index e7f63c0..03246cc 100644 --- a/run_basicvm_nomulticloud.py +++ b/run_basicvm_nomulticloud.py @@ -1,24 +1,13 @@ -# import logging +import logging.config +from onapsdk.configuration import settings +from onaptests.steps.instantiate.vf_module_ala_carte import YamlTemplateVfModuleAlaCarteInstantiateStep -from onaptests.steps.instantiate.module import ModuleInstantiateStep - -# from onapsdk.sdc.vendor import Vendor - - -# Configure logging -# logger = logging.getLogger("") -# logger.setLevel(logging.INFO) -# fh = logging.StreamHandler() -# fh_formatter = logging.Formatter( -# "%(asctime)s %(levelname)s %(name)s %(lineno)d:%(filename)s(%(process)d) - %(message)s" -# ) -# fh.setFormatter(fh_formatter) -# logger.addHandler(fh) -# Vendor.set_proxy({ 'http': 'socks5h://127.0.0.1:8083', 'https': 'socks5h://127.0.0.1:8083'}) if __name__ == "__main__": - basic_vm_instantiate = ModuleInstantiateStep() + # logging configuration for onapsdk, it is not requested for onaptests + # Correction requested in onapsdk to avoid having this duplicate code + logging.config.dictConfig(settings.LOG_CONFIG) + + basic_vm_instantiate = YamlTemplateVfModuleAlaCarteInstantiateStep() basic_vm_instantiate.execute() - # service_onboard = YamlTemplateServiceOnboardStep() - # service_onboard.execute() diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py deleted file mode 100644 index b3076f6..0000000 --- a/src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py +++ /dev/null @@ -1,63 +0,0 @@ -import os -import openstack - -from .settings import * # pylint: disable=W0614 - -""" Specific ubuntu16 without multicloud and without yaml config scenario.""" - -# pylint: disable=bad-whitespace -# The ONAP part -USE_MULTICLOUD = False - -VENDOR_NAME = "basicvm_vendor" -VSP_NAME = "basicvm_ubuntu_vsp" -SERVICE_NAME = "basicvm-ubuntu-service" -VF_NAME = "basicvm_ubuntu_vf" - -CLOUD_REGION_CLOUD_OWNER = "basicvm-cloud-owner" -CLOUD_REGION_TYPE = "openstack" -CLOUD_REGION_VERSION = "openstack" - -AVAILABILITY_ZONE_NAME = "basicvm-availability-zone" -AVAILABILITY_ZONE_TYPE = "nova" -COMPLEX_PHYSICAL_LOCATION_ID = "lannion" -COMPLEX_DATA_CENTER_CODE = "1234-5" - -GLOBAL_CUSTOMER_ID = "basicvm-customer" - -OWNING_ENTITY = "basicvm-oe" -PROJECT = "basicvm-project" -LINE_OF_BUSINESS = "basicvm-lob" -PLATFORM = "basicvm-platform" - -SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance" - -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 -TEST_CLOUD = os.getenv('OS_TEST_CLOUD') -try: - if TEST_CLOUD is not None: - cloud = openstack.connect(cloud=TEST_CLOUD) - VIM_USERNAME = cloud.config.auth['username'] - VIM_PASSWORD = cloud.config.auth['password'] - VIM_SERVICE_URL = cloud.config.auth['auth_url'] - TENANT_ID = cloud.config.auth['project_id'] - TENANT_NAME = cloud.config.auth['project_name'] - CLOUD_REGION_ID = cloud.config.region_name - CLOUD_DOMAIN = cloud.config.auth['project_domain_name'] - else: - raise KeyError -except KeyError: - # If you do not use the cloud.yaml as imput for your openstack - # put the input data here - # Note if 1 parameter is missing in the clouds.yaml, we fallback here - TENANT_ID = "" # Fill me - TENANT_NAME = "" # Fill me - VIM_USERNAME = "" # Fill me - VIM_PASSWORD = "" # Fill me - VIM_SERVICE_URL = "" # Fill me - CLOUD_REGION_ID = "RegionOne" # Update me if needed - CLOUD_DOMAIN = "Default" # Update me if needed diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py new file mode 100644 index 0000000..ae716e7 --- /dev/null +++ b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py @@ -0,0 +1,73 @@ +import os +import openstack +from yaml import load + +from .settings import * # pylint: disable=W0614 + +""" Specific ubuntu16 without multicloud and without yaml config scenario.""" + +# 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" +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" +CLOUD_REGION_TYPE = "openstack" +CLOUD_REGION_VERSION = "openstack" + +AVAILABILITY_ZONE_NAME = "basicvm-availability-zone" +AVAILABILITY_ZONE_TYPE = "nova" +COMPLEX_PHYSICAL_LOCATION_ID = "lannion" +COMPLEX_DATA_CENTER_CODE = "1234-5" + +GLOBAL_CUSTOMER_ID = "basicvm-customer" + +OWNING_ENTITY = "basicvm-oe" +PROJECT = "basicvm-project" +LINE_OF_BUSINESS = "basicvm-lob" +PLATFORM = "basicvm-platform" + +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 +TEST_CLOUD = os.getenv('OS_TEST_CLOUD') +try: + if TEST_CLOUD is not None: + cloud = openstack.connect(cloud=TEST_CLOUD) + VIM_USERNAME = cloud.config.auth['username'] + VIM_PASSWORD = cloud.config.auth['password'] + VIM_SERVICE_URL = cloud.config.auth['auth_url'] + TENANT_ID = cloud.config.auth['project_id'] + TENANT_NAME = cloud.config.auth['project_name'] + CLOUD_REGION_ID = cloud.config.region_name + CLOUD_DOMAIN = cloud.config.auth['project_domain_name'] + else: + raise KeyError +except KeyError: + # If you do not use the cloud.yaml as imput for your openstack + # put the input data here + # Note if 1 parameter is missing in the clouds.yaml, we fallback here + TENANT_ID = "" # Fill me + TENANT_NAME = "" # Fill me + VIM_USERNAME = "" # Fill me + VIM_PASSWORD = "" # Fill me + VIM_SERVICE_URL = "" # Fill me + CLOUD_REGION_ID = "RegionOne" # Update me if needed + CLOUD_DOMAIN = "Default" # Update me if needed -- cgit 1.2.3-korg