From a5c39a3409a795fb0709b952e15ac2746364358b Mon Sep 17 00:00:00 2001 From: andreasgeissler Date: Wed, 9 Sep 2020 18:01:12 +0200 Subject: Updated yaml-based instantiation and MultiCloud registry Correction for linter and updated run script Issue-ID: TEST-256 Signed-off-by: andreasgeissler Change-Id: Ia1f6f41f8fc6ed74c836ea7aa987f10487f377a6 --- .../configuration/ubuntu16_multicloud_yaml_settings.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/onaptests/configuration') diff --git a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py index 33d0886..71b8810 100644 --- a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py +++ b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py @@ -5,13 +5,10 @@ from .settings import * # pylint: disable=W0614 USE_MULTICLOUD = True VENDOR_NAME = "sdktests_vendor" -VSP_NAME = "sdktests_vsp" -VSP_FILE_PATH = "vfw.zip" -SERVICE_NAME = "sdktests-service" -VF_NAME = "sdktests_vf" +SERVICE_NAME = "ubuntu16test" # must be the same as in YAML -CLOUD_REGION_CLOUD_OWNER = "sdktests_cloud_region_owner" -CLOUD_REGION_ID = "sdktests_cloud_region_id" +CLOUD_REGION_CLOUD_OWNER = "sdktestsOwner" # must not contain _ +CLOUD_REGION_ID = "RegionOne" # should be valid, as otherwise MultiCloud fails CLOUD_REGION_TYPE = "openstack" CLOUD_REGION_VERSION = "titanium_cloud" CLOUD_DOMAIN = "Default" @@ -21,6 +18,9 @@ COMPLEX_DATA_CENTER_CODE = "sdktests_complex_data_center_code" GLOBAL_CUSTOMER_ID = "sdktests_global_customer_id" TENANT_ID = "" # Fill me in your custom settings +TENANT_NAME= "" # Fill me in your custom settings +AVAILABILITY_ZONE_NAME = "" # Fill me in your custom settings +AVAILABILITY_ZONE_TYPE = "nova" VIM_USERNAME = "" # Fill me in your custom settings VIM_PASSWORD = "" # Fill me in your custom settings -- cgit 1.2.3-korg