aboutsummaryrefslogtreecommitdiffstats
path: root/src/onaptests/configuration
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2020-09-14 18:16:26 +0200
committermrichomme <morgan.richomme@orange.com>2020-09-16 17:54:32 +0200
commitb6f965609e956d9d26f3359b75ef2aaf1d596a5f (patch)
tree2204eb1557e22b2a46645ffa7566da3efe7d8ea8 /src/onaptests/configuration
parenta85a306fb5ee8259b09c392c03ac499c828b5597 (diff)
Add cleanup function
Issue-ID: TEST-240 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: I784e958f869a0cbee702c915509fe80d37d44b65 Signed-off-by: mrichomme <morgan.richomme@orange.com>
Diffstat (limited to 'src/onaptests/configuration')
-rw-r--r--src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py74
-rw-r--r--src/onaptests/configuration/ubuntu16_nomulticloud_settings.py11
2 files changed, 80 insertions, 5 deletions
diff --git a/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py b/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py
new file mode 100644
index 0000000..d640894
--- /dev/null
+++ b/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py
@@ -0,0 +1,74 @@
+import os
+import openstack
+from yaml import load
+
+from .settings import * # pylint: disable=W0614
+
+""" Specific clearwater IMS without multicloud."""
+
+# pylint: disable=bad-whitespace
+# The ONAP part
+USE_MULTICLOUD = False
+SERVICE_YAML_TEMPLATE = "templates/vnf-services/clearwater-ims-service.yaml"
+CLEANUP_FLAG = True
+CLEANUP_ACTIVITY_TIMER = 60 # nb of seconds before cleanup in case cleanup option is set
+VENDOR_NAME = "clearwater-ims_vendor"
+
+VF_NAME = "clearwater-ims_ubuntu_vf"
+VSP_NAME = "clearwater-ims_ubuntu_vsp"
+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 ValueError:
+ SERVICE_NAME = "" # Fill me
+
+CLOUD_REGION_CLOUD_OWNER = "clearwater-ims-cloud-owner"
+CLOUD_REGION_TYPE = "openstack"
+CLOUD_REGION_VERSION = "openstack"
+
+AVAILABILITY_ZONE_NAME = "clearwater-ims-availability-zone"
+AVAILABILITY_ZONE_TYPE = "nova"
+COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
+COMPLEX_DATA_CENTER_CODE = "1234-5"
+
+GLOBAL_CUSTOMER_ID = "clearwater-ims-customer"
+
+OWNING_ENTITY = "clearwater-ims-oe"
+PROJECT = "clearwater-ims-project"
+LINE_OF_BUSINESS = "clearwater-ims-lob"
+PLATFORM = "clearwater-ims-platform"
+
+SERVICE_INSTANCE_NAME = "clearwater-ims_service_instance_7"
+
+VSP_FILE_PATH = "templates/heat_files/clearwater_ims/clearwater_ims.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
diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
index ae716e7..84f994a 100644
--- a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
+++ b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
@@ -4,14 +4,17 @@ from yaml import load
from .settings import * # pylint: disable=W0614
-""" Specific ubuntu16 without multicloud and without yaml config scenario."""
+""" Specific ubuntu16 without multicloud."""
# pylint: disable=bad-whitespace
# The ONAP part
USE_MULTICLOUD = False
SERVICE_YAML_TEMPLATE = "templates/vnf-services/ubuntu16test-service.yaml"
-
+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"
try:
# Try to retrieve the SERVICE NAME from the yaml file
@@ -21,8 +24,6 @@ try:
except ValueError:
SERVICE_NAME = "" # Fill me
-VF_NAME = "basicvm_ubuntu_vf"
-
CLOUD_REGION_CLOUD_OWNER = "basicvm-cloud-owner"
CLOUD_REGION_TYPE = "openstack"
CLOUD_REGION_VERSION = "openstack"
@@ -39,7 +40,7 @@ PROJECT = "basicvm-project"
LINE_OF_BUSINESS = "basicvm-lob"
PLATFORM = "basicvm-platform"
-SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance_3"
+SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance"
VSP_FILE_PATH = "templates/heat_files/ubuntu16/ubuntu16.zip"