diff options
Diffstat (limited to 'src/onaptests/configuration/basic_vm_settings.py')
-rw-r--r-- | src/onaptests/configuration/basic_vm_settings.py | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/onaptests/configuration/basic_vm_settings.py b/src/onaptests/configuration/basic_vm_settings.py index 8066625..f26bbd8 100644 --- a/src/onaptests/configuration/basic_vm_settings.py +++ b/src/onaptests/configuration/basic_vm_settings.py @@ -3,14 +3,12 @@ import openstack from yaml import load, SafeLoader from onaptests.utils.resources import get_resource_location import onaptests.utils.exceptions as onap_test_exceptions +from .settings import IF_VALIDATION from .settings import * # noqa -""" Specific basic_vm without multicloud.""" -# pylint: disable=bad-whitespace # The ONAP part SERVICE_DETAILS = "Onboarding, distribution and instanitation of an Ubuntu VM using à la carte" -SERVICE_COMPONENTS = "SDC, DMAAP, AAI, SO, SDNC" USE_MULTICLOUD = False # Set ONLY_INSTANTIATE to true to run an instantiation without repeating @@ -23,11 +21,11 @@ SERVICE_YAML_TEMPLATE = get_resource_location("templates/vnf-services/basic_vm-s try: # Try to retrieve the SERVICE NAME from the yaml file - with open(SERVICE_YAML_TEMPLATE, "r") as yaml_template: + with open(SERVICE_YAML_TEMPLATE, "r", encoding="utf-8") as yaml_template: yaml_config_file = load(yaml_template, SafeLoader) SERVICE_NAME = next(iter(yaml_config_file.keys())) -except (FileNotFoundError, ValueError): - raise onap_test_exceptions.TestConfigurationException +except (FileNotFoundError, ValueError) as exc: + raise onap_test_exceptions.TestConfigurationException from exc CLEANUP_FLAG = True CLEANUP_ACTIVITY_TIMER = 10 # nb of seconds before cleanup in case cleanup option is set @@ -58,15 +56,15 @@ SERVICE_INSTANCE_NAME = "basic_vm_service_instance" # 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') -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') MODEL_YAML_TEMPLATE = None |