Consider SERVICE_NAME from the yaml file

avoid duplication in yaml and settings
if not defined in Yaml, possibility to set it up manually

Issue-ID: TEST-240

Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: Ib005eaea78e109b6917f2a09ae04ce0c2c511660

1 files changed, 0 insertions, 63 deletions

diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py
deleted file mode 100644
index b3076f6..0000000
--- a/src/onaptests/configuration/ubuntu16_nomulticloud_noyaml_settings.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import os
-import openstack
-
-from .settings import * # pylint: disable=W0614
-
-""" Specific ubuntu16 without multicloud and without yaml config scenario."""
-
-# pylint: disable=bad-whitespace
-# The ONAP part
-USE_MULTICLOUD = False
-
-VENDOR_NAME = "basicvm_vendor"
-VSP_NAME = "basicvm_ubuntu_vsp"
-SERVICE_NAME = "basicvm-ubuntu-service"
-VF_NAME = "basicvm_ubuntu_vf"
-
-CLOUD_REGION_CLOUD_OWNER = "basicvm-cloud-owner"
-CLOUD_REGION_TYPE = "openstack"
-CLOUD_REGION_VERSION = "openstack"
-
-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"
-
-VSP_FILE_PATH = "templates/heat_files/ubuntu16/ubuntu16.zip"
-
-# 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')
-try:
-    if TEST_CLOUD is not None:
-        cloud = openstack.connect(cloud=TEST_CLOUD)
-        VIM_USERNAME = cloud.config.auth['username']
-        VIM_PASSWORD = cloud.config.auth['password']
-        VIM_SERVICE_URL = cloud.config.auth['auth_url']
-        TENANT_ID = cloud.config.auth['project_id']
-        TENANT_NAME = cloud.config.auth['project_name']
-        CLOUD_REGION_ID = cloud.config.region_name
-        CLOUD_DOMAIN = cloud.config.auth['project_domain_name']
-    else:
-        raise KeyError
-except KeyError:
-    # If you do not use the cloud.yaml as imput for your openstack
-    # put the input data here
-    # Note if 1 parameter is missing in the clouds.yaml, we fallback here
-    TENANT_ID = "" # Fill me
-    TENANT_NAME = "" # Fill me
-    VIM_USERNAME = ""  # Fill me
-    VIM_PASSWORD = ""  # Fill me
-    VIM_SERVICE_URL = ""  # Fill me
-    CLOUD_REGION_ID = "RegionOne" # Update me if needed
-    CLOUD_DOMAIN = "Default" # Update me if needed