aboutsummaryrefslogtreecommitdiffstats
path: root/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
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/ubuntu16_nomulticloud_settings.py
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/ubuntu16_nomulticloud_settings.py')
-rw-r--r--src/onaptests/configuration/ubuntu16_nomulticloud_settings.py11
1 files changed, 6 insertions, 5 deletions
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"