[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

3 files changed, 8 insertions, 8 deletions

diff --git a/src/onaptests/configuration/basic_network_nomulticloud_settings.py b/src/onaptests/configuration/basic_network_nomulticloud_settings.py
index fd7c561..cc22601 100644
--- a/src/onaptests/configuration/basic_network_nomulticloud_settings.py
+++ b/src/onaptests/configuration/basic_network_nomulticloud_settings.py
@@ -6,11 +6,11 @@ from yaml import load
 import onaptests.utils.exceptions as onap_test_exceptions
 from .settings import * # pylint: disable=W0614
 
-""" Specific ubuntu16 without multicloud."""
+""" Specific Basic Network without multicloud."""
 
 # pylint: disable=bad-whitespace
 # The ONAP part
-SERVICE_DETAILS="Onboarding, distribution and instanitation of asic Network using à la carte"
+SERVICE_DETAILS="Onboarding, distribution and instantiation of Basic Network using à la carte"
 SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC"
 USE_MULTICLOUD = False
 # Set ONLY_INSTANTIATE to true to run an instantiation without repeating
diff --git a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py b/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py
index 5036ed8..437bd13 100644
--- a/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py
+++ b/src/onaptests/configuration/basic_vm_multicloud_yaml_settings.py
@@ -1,7 +1,7 @@
 import sys
 from .settings import * # pylint: disable=W0614
 
-""" Specific ubuntu16 with multicloud and yaml config scenario."""
+""" Specific Basic VM 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"
@@ -11,7 +11,7 @@ USE_MULTICLOUD = True
 # onboarding and related AAI configuration (Cloud config)
 ONLY_INSTANTIATE= False
 VENDOR_NAME = "sdktests_vendor"
-SERVICE_NAME = "ubuntu16test" # must be the same as in YAML
+SERVICE_NAME = "basicvmtest" # 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
@@ -40,4 +40,4 @@ PLATFORM = "sdktests_platform"
 
 SERVICE_INSTANCE_NAME = "sdktests_service_instance_name"
 
-SERVICE_YAML_TEMPLATE = sys.path[-1] + "/onaptests/templates/vnf-services/ubuntu16test-service.yaml"
+SERVICE_YAML_TEMPLATE = sys.path[-1] + "/onaptests/templates/vnf-services/basic_vm-service.yaml"
diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/basic_vm_settings.py
index 24686af..a62e0b1 100644
--- a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
+++ b/src/onaptests/configuration/basic_vm_settings.py
@@ -6,7 +6,7 @@ from yaml import load
 import onaptests.utils.exceptions as onap_test_exceptions
 from .settings import * # pylint: disable=W0614
 
-""" Specific ubuntu16 without multicloud."""
+""" Specific basic_vm without multicloud."""
 
 # pylint: disable=bad-whitespace
 # The ONAP part
@@ -21,7 +21,7 @@ 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")
+                         "basic_vm-service.yaml")
 
 try:
     # Try to retrieve the SERVICE NAME from the yaml file
@@ -55,7 +55,7 @@ PROJECT = "basicvm-project"
 LINE_OF_BUSINESS = "basicvm-lob"
 PLATFORM = "basicvm-platform"
 
-SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance"
+SERVICE_INSTANCE_NAME = "basic_vm_service_instance"
 
 # The cloud Part
 # Assuming a cloud.yaml is available, use the openstack client