diff options
Diffstat (limited to 'src/onaptests/configuration/basic_vm_macro_settings.py')
| -rw-r--r-- | src/onaptests/configuration/basic_vm_macro_settings.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/onaptests/configuration/basic_vm_macro_settings.py b/src/onaptests/configuration/basic_vm_macro_settings.py index ce1a607..8c1b927 100644 --- a/src/onaptests/configuration/basic_vm_macro_settings.py +++ b/src/onaptests/configuration/basic_vm_macro_settings.py @@ -1,15 +1,12 @@ -import os from pathlib import Path from uuid import uuid4 -import openstack from yaml import SafeLoader, load import onaptests.utils.exceptions as onap_test_exceptions from onaptests.utils.resources import get_resource_location from .settings import * # noqa -from .settings import IF_VALIDATION SERVICE_DETAILS = "Onboarding, distribution and instanitation of an Ubuntu VM using macro" @@ -36,16 +33,16 @@ COMPLEX_DATA_CENTER_CODE = "1234-5" GLOBAL_CUSTOMER_ID = "basicvm-customer" -if not IF_VALIDATION: - TEST_CLOUD = os.getenv('OS_TEST_CLOUD') - cloud = openstack.connect(cloud=TEST_CLOUD) - VIM_USERNAME = cloud.config.auth.get('username', 'Fill me') - VIM_PASSWORD = cloud.config.auth.get('password', 'Fill me') - VIM_SERVICE_URL = cloud.config.auth.get('auth_url', 'Fill me') - TENANT_ID = cloud.config.auth.get('project_id', 'Fill me') - TENANT_NAME = cloud.config.auth.get('project_name', 'Fill me') - CLOUD_REGION_ID = cloud.config.auth.get('region_name', 'RegionOne') - CLOUD_DOMAIN = cloud.config.auth.get('project_domain_name', 'Default') +# if not IF_VALIDATION: +# TEST_CLOUD = os.getenv('OS_TEST_CLOUD') +# cloud = openstack.connect(cloud=TEST_CLOUD) +# VIM_USERNAME = cloud.config.auth.get('username', 'Fill me') +# VIM_PASSWORD = cloud.config.auth.get('password', 'Fill me') +# VIM_SERVICE_URL = cloud.config.auth.get('auth_url', 'Fill me') +# TENANT_ID = cloud.config.auth.get('project_id', 'Fill me') +# TENANT_NAME = cloud.config.auth.get('project_name', 'Fill me') +# CLOUD_REGION_ID = cloud.config.auth.get('region_name', 'RegionOne') +# CLOUD_DOMAIN = cloud.config.auth.get('project_domain_name', 'Default') OWNING_ENTITY = "basicvm-oe" PROJECT = "basicvm-project" @@ -54,6 +51,9 @@ PLATFORM = "basicvm-platform" CLOUD_DOMAIN = "Default" SERVICE_YAML_TEMPLATE = Path(get_resource_location( "templates/vnf-services/basic_vm_macro-service.yaml")) +generate_service_config_yaml_file(service_name="basic_vm_macro", # noqa + service_template="basic_vm_macro-service.yaml.j2", + service_config=SERVICE_YAML_TEMPLATE) try: # Try to retrieve the SERVICE NAME from the yaml file |