From 2b8d4d3dfda94890f3badda9928374fad9b659c3 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Mon, 26 Feb 2024 09:21:36 +0100 Subject: Fix the issue of basic_vm_macro configuration - Fix the issue of basic_vm_macro introduced after refactoring - new SDK version used - tox updated with helper commands Issue-ID: TEST-402 Signed-off-by: Lukasz Rajewski Change-Id: I46aedcd08279142b2da48a431ab4f21ae1c9d3d1 --- .../configuration/basic_vm_macro_settings.py | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'src/onaptests') diff --git a/src/onaptests/configuration/basic_vm_macro_settings.py b/src/onaptests/configuration/basic_vm_macro_settings.py index 8c1b927..6276964 100644 --- a/src/onaptests/configuration/basic_vm_macro_settings.py +++ b/src/onaptests/configuration/basic_vm_macro_settings.py @@ -1,3 +1,6 @@ +import os + +import openstack from pathlib import Path from uuid import uuid4 @@ -33,16 +36,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" -- cgit 1.2.3-korg