From ba1faac52b28f752516ab075a5bda56058548e49 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Mon, 1 Feb 2021 17:26:42 +0100 Subject: [TESTS] cleanup tests and remove reference to ubuntu16 the basic_vm test was historically called ubuntu16... as we are now delaing more with ubuntu18 or ubuntu20, the reference to the version16 is a bit old - Replace ubuntu16 by basic_vm - Use ubuntu20 instead of Ubuntu16 - Replace onap.small by m1.small to be natively compatible with any Openstack (default flavor) Issue-ID: TEST-299 Signed-off-by: mrichomme Change-Id: I69f573354c87c44c10581861450d48244db0c7df --- .../ubuntu16_multicloud_yaml_settings.py | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py (limited to 'src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py') diff --git a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py deleted file mode 100644 index 5036ed8..0000000 --- a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py +++ /dev/null @@ -1,43 +0,0 @@ -import sys -from .settings import * # pylint: disable=W0614 - -""" Specific ubuntu16 with multicloud and yaml config scenario.""" -SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a VM" + - "using à la carte and Multicloud module") -SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC, Multicloud" - -USE_MULTICLOUD = True -# Set ONLY_INSTANTIATE to true to run an instantiation without repeating -# onboarding and related AAI configuration (Cloud config) -ONLY_INSTANTIATE= False -VENDOR_NAME = "sdktests_vendor" -SERVICE_NAME = "ubuntu16test" # must be the same as in YAML - -CLOUD_REGION_CLOUD_OWNER = "sdktestsOwner" # must not contain _ -CLOUD_REGION_ID = "RegionOne" # should be valid, as otherwise MultiCloud fails -CLOUD_REGION_TYPE = "openstack" -CLOUD_OWNER_DEFINED_TYPE = "N/A" -CLOUD_REGION_VERSION = "titanium_cloud" -CLOUD_DOMAIN = "Default" - -COMPLEX_PHYSICAL_LOCATION_ID = "sdktests_complex_physical_location_id" -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 -VIM_SERVICE_URL = "" # Fill me in your custom settings - -OWNING_ENTITY = "sdktests_owning_entity" -PROJECT = "sdktests_project" -LINE_OF_BUSINESS = "sdktests_line_of_business" -PLATFORM = "sdktests_platform" - -SERVICE_INSTANCE_NAME = "sdktests_service_instance_name" - -SERVICE_YAML_TEMPLATE = sys.path[-1] + "/onaptests/templates/vnf-services/ubuntu16test-service.yaml" -- cgit 1.2.3-korg