[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 <morgan.richomme@orange.com>
Change-Id: I69f573354c87c44c10581861450d48244db0c7df

1 files changed, 0 insertions, 72 deletions

diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
deleted file mode 100644
index 24686af..0000000
--- a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import os
-import openstack
-import sys
-from yaml import load
-
-import onaptests.utils.exceptions as onap_test_exceptions
-from .settings import * # pylint: disable=W0614
-
-""" Specific ubuntu16 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
-# onboarding and related AAI configuration (Cloud config)
-ONLY_INSTANTIATE= False
-
-# if a yaml file is define, retrieve info from this yaml files
-# if not declare the parameters in the settings
-SERVICE_YAML_TEMPLATE = (sys.path[-1] + "/onaptests/templates/vnf-services/" +
-                         "ubuntu16test-service.yaml")
-
-try:
-    # Try to retrieve the SERVICE NAME from the yaml file
-    with open(SERVICE_YAML_TEMPLATE, "r") as yaml_template:
-        yaml_config_file = load(yaml_template)
-        SERVICE_NAME = next(iter(yaml_config_file.keys()))
-except (FileNotFoundError, ValueError):
-    raise onap_test_exceptions.TestConfigurationException
-
-CLEANUP_FLAG = True
-CLEANUP_ACTIVITY_TIMER = 10  # nb of seconds before cleanup in case cleanup option is set
-VENDOR_NAME = "basicvm_vendor"
-
-VF_NAME = "basicvm_ubuntu_vf"
-VSP_NAME = "basicvm_ubuntu_vsp"
-
-CLOUD_REGION_CLOUD_OWNER = "basicvm-cloud-owner"
-CLOUD_REGION_TYPE = "openstack"
-CLOUD_REGION_VERSION = "openstack"
-CLOUD_OWNER_DEFINED_TYPE = "N/A"
-
-AVAILABILITY_ZONE_NAME = "basicvm-availability-zone"
-AVAILABILITY_ZONE_TYPE = "nova"
-COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
-COMPLEX_DATA_CENTER_CODE = "1234-5"
-
-GLOBAL_CUSTOMER_ID = "basicvm-customer"
-
-OWNING_ENTITY = "basicvm-oe"
-PROJECT = "basicvm-project"
-LINE_OF_BUSINESS = "basicvm-lob"
-PLATFORM = "basicvm-platform"
-
-SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_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')