Use unique complex names per test

- AAI only allows deletion of objects when there is no other object
  referencing it
- multiple tests use the same complex name `lannion`
- tests fail in cleanup step because the complex cannot be removed
  since it is still in use by other tests
- use unique complex names to isolate the tests and resolve the
  cleanup issue

Issue-ID: INT-2357
Change-Id: Icabad09ce1965147201253503bbbf9081402c692
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/src/onaptests/configuration/basic_cnf_macro_settings.py b/src/onaptests/configuration/basic_cnf_macro_settings.py
index a725b17..16c9555 100644 (file)
--- a/src/onaptests/configuration/basic_cnf_macro_settings.py
+++ b/src/onaptests/configuration/basic_cnf_macro_settings.py
@@ -39,7 +39,7 @@ CLOUD_REGION_VERSION = "1.0"
 CLOUD_DOMAIN = "Default"
 CLOUD_OWNER_DEFINED_TYPE = "t1"
 
-COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
+COMPLEX_PHYSICAL_LOCATION_ID = "basiccnf-macro-lannion"
 COMPLEX_DATA_CENTER_CODE = "1234-5"
 AVAILABILITY_ZONE_NAME = "basiccnf-availability-zone"
 AVAILABILITY_ZONE_TYPE = "nova"

diff --git a/src/onaptests/configuration/basic_cnf_yaml_settings.py b/src/onaptests/configuration/basic_cnf_yaml_settings.py
index ec451a1..2e17bd8 100644 (file)
--- a/src/onaptests/configuration/basic_cnf_yaml_settings.py
+++ b/src/onaptests/configuration/basic_cnf_yaml_settings.py
@@ -1,3 +1,4 @@
+"""Basic CNF (yaml-based) test configuration settings."""
 import os
 
 from yaml import SafeLoader, load
@@ -49,7 +50,7 @@ CLOUD_REGION_VERSION = "1.0"
 CLOUD_DOMAIN = "Default"
 CLOUD_OWNER_DEFINED_TYPE = "t1"
 
-COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
+COMPLEX_PHYSICAL_LOCATION_ID = "basiccnf-lannion"
 COMPLEX_DATA_CENTER_CODE = "1234-5"
 AVAILABILITY_ZONE_NAME = "basicnf-availability-zone"
 AVAILABILITY_ZONE_TYPE = "nova"

diff --git a/src/onaptests/configuration/basic_network_nomulticloud_settings.py b/src/onaptests/configuration/basic_network_nomulticloud_settings.py
index 9c8c210..2e2aa18 100644 (file)
--- a/src/onaptests/configuration/basic_network_nomulticloud_settings.py
+++ b/src/onaptests/configuration/basic_network_nomulticloud_settings.py
@@ -1,3 +1,4 @@
+"""Basic network (no multicloud) test configuration settings."""
 import os
 
 import openstack
@@ -39,7 +40,7 @@ CLOUD_OWNER_DEFINED_TYPE = "N/A"
 
 AVAILABILITY_ZONE_NAME = "basicvm-availability-zone"
 AVAILABILITY_ZONE_TYPE = "nova"
-COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
+COMPLEX_PHYSICAL_LOCATION_ID = "basicnw-lannion"
 COMPLEX_DATA_CENTER_CODE = "1234-5"
 
 GLOBAL_CUSTOMER_ID = "basicnw-customer"

diff --git a/src/onaptests/configuration/basic_vm_macro_settings.py b/src/onaptests/configuration/basic_vm_macro_settings.py
index 3781511..f0bc01d 100644 (file)
--- a/src/onaptests/configuration/basic_vm_macro_settings.py
+++ b/src/onaptests/configuration/basic_vm_macro_settings.py
@@ -1,3 +1,4 @@
+"""Basic VM macro instantiation test configuration settings."""
 import os
 from pathlib import Path
 from uuid import uuid4
@@ -31,7 +32,7 @@ CLOUD_OWNER_DEFINED_TYPE = "N/A"
 
 AVAILABILITY_ZONE_NAME = "basicvm-macro-availability-zone"
 AVAILABILITY_ZONE_TYPE = "nova"
-COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
+COMPLEX_PHYSICAL_LOCATION_ID = "basicvm-macro-lannion"
 COMPLEX_DATA_CENTER_CODE = "1234-5"
 
 GLOBAL_CUSTOMER_ID = "basicvm-customer"

diff --git a/src/onaptests/configuration/basic_vm_settings.py b/src/onaptests/configuration/basic_vm_settings.py
index 00c03af..1579d78 100644 (file)
--- a/src/onaptests/configuration/basic_vm_settings.py
+++ b/src/onaptests/configuration/basic_vm_settings.py
@@ -1,3 +1,4 @@
+"""Basic VM test configuration settings."""
 import os
 
 import openstack
@@ -46,7 +47,7 @@ CLOUD_OWNER_DEFINED_TYPE = "N/A"
 
 AVAILABILITY_ZONE_NAME = "basicvm-availability-zone"
 AVAILABILITY_ZONE_TYPE = "nova"
-COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
+COMPLEX_PHYSICAL_LOCATION_ID = "basicvm-lannion"
 COMPLEX_DATA_CENTER_CODE = "1234-5"
 
 GLOBAL_CUSTOMER_ID = "basicvm-customer"

diff --git a/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py b/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py
index 2543351..c60e7cc 100644 (file)
--- a/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py
+++ b/src/onaptests/configuration/clearwater_ims_nomulticloud_settings.py
@@ -1,3 +1,4 @@
+"""Clearwater IMS (no multicloud) test configuration settings."""
 import os
 
 import openstack
@@ -38,7 +39,7 @@ CLOUD_REGION_VERSION = "openstack"
 
 AVAILABILITY_ZONE_NAME = "clearwater-ims-availability-zone"
 AVAILABILITY_ZONE_TYPE = "nova"
-COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
+COMPLEX_PHYSICAL_LOCATION_ID = "clearwater-ims-lannion"
 COMPLEX_DATA_CENTER_CODE = "1234-5"
 
 GLOBAL_CUSTOMER_ID = "clearwater-ims-customer"

diff --git a/src/onaptests/configuration/generic_network_settings.py b/src/onaptests/configuration/generic_network_settings.py
index 2c0e4c9..121eb06 100644 (file)
--- a/src/onaptests/configuration/generic_network_settings.py
+++ b/src/onaptests/configuration/generic_network_settings.py
@@ -1,3 +1,4 @@
+"""Generic network test configuration settings."""
 import os
 from pathlib import Path
 from uuid import uuid4
@@ -37,7 +38,7 @@ CLOUD_REGION_VERSION = "1.0"
 CLOUD_DOMAIN = "Default"
 CLOUD_OWNER_DEFINED_TYPE = "t1"
 
-COMPLEX_PHYSICAL_LOCATION_ID = "lannion"
+COMPLEX_PHYSICAL_LOCATION_ID = "g-network-lannion"
 COMPLEX_DATA_CENTER_CODE = "1234-5"
 AVAILABILITY_ZONE_NAME = "g-network-availability-zone"
 AVAILABILITY_ZONE_TYPE = "nova"