[TEST] Unwind master back to 27.07.2020

Unwind master due to regression in few tests.

Issue-ID: OOM-1
Change-Id: I3b759a5928aeb47fc7fddeaa5998aa090d085c5c
Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>

3 files changed, 6 insertions, 87 deletions

diff --git a/src/onaptests/configuration/cds_resource_resolution_settings.py b/src/onaptests/configuration/cds_resource_resolution_settings.py
deleted file mode 100644
index c7687b5..0000000
--- a/src/onaptests/configuration/cds_resource_resolution_settings.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from pathlib import Path
-from uuid import uuid4
-
-from .settings import *  # pylint: disable=W0614
-
-CLOUD_REGION_CLOUD_OWNER = "basicnf-owner" # must not contain _
-CLOUD_REGION_ID = "k8sregion"
-CLOUD_REGION_TYPE = "k8s"
-CLOUD_REGION_VERSION = "1.0"
-CLOUD_OWNER_DEFINED_TYPE = "N/A"
-COMPLEX_PHYSICAL_LOCATION_ID = "sdktests"
-
-PNF_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent,
-                                         "templates/artifacts/cds-resource-resolution/cds-mock-server.tar.gz")
-PNF_RB_NAME = f"cds-ms-rb-{str(uuid4())}"
-PNF_RB_VERSION = "v1"
-PNF_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent,
-                                      "templates/artifacts/profile.tar.gz")
-PNF_PROFILE_NAME = f"cds-ms-prof-{str(uuid4())}"
-K8S_VERSION = "1.0"
-K8S_CONFIG = str(Path(Path(__file__).parent.parent, "templates/artifacts/config"))
-CDS_MOCKSERVER_EXPECTATIONS = [
-    {
-        "method": "GET",
-        "path": "/resource-resolution/get",
-        "response": '{"value": "A046E51D-44DC-43AE-BBA2-86FCA86C5265"}'
-    },
-    {
-        "method": "GET",
-        "path": "/resource-resolution/get/A046E51D-44DC-43AE-BBA2-86FCA86C5265/id",
-        "response": '{"value": "74FE67C6-50F5-4557-B717-030D79903908"}'
-    },
-    {
-        "method": "POST",
-        "path": "/resource-resolution/post",
-        "response": '{"value": "post:ok"}'
-    },
-    {
-        "method": "PUT",
-        "path": "/resource-resolution/put",
-        "response": '{"value": "put:ok"}'
-    },
-    {
-        "method": "PATCH",
-        "path": "/resource-resolution/patch",
-        "response": '{"value": "patch:ok"}'
-    },
-    {
-        "method": "DELETE",
-        "path": "/resource-resolution/delete",
-        "response": '{"value": "delete:ok"}'
-    }
-]
-
-CDS_DD_FILE = Path(Path(__file__).parent.parent, "templates/artifacts/cds-resource-resolution/dd.json")
-CDS_CBA_UNENRICHED = Path(Path(__file__).parent.parent, "templates/artifacts/cds-resource-resolution/resource-resolution.zip")
-CDS_CBA_ENRICHED = "/tmp/resource-resolution-enriched.zip"
-CDS_WORKFLOW_NAME = "resource-resolution"
-CDS_WORKFLOW_INPUT = {
-    "template-prefix": [
-        "helloworld-velocity",
-        "helloworld-jinja"
-    ],
-    "resolution-key": "regression-test",
-    "resource-resolution-properties": {
-        "v_input": "ok",
-        "j_input": "ok"
-    }
-}
-CDS_WORKFLOW_EXPECTED_OUTPUT  = {
-    "resource-resolution-response": {
-        "meshed-template": {
-            "helloworld-velocity": "{\n  \"default\": \"ok\",\n  \"input\": \"ok\",\n  \"script\": {\n    \"python\": \"ok\",\n    \"kotlin\": \"ok\"\n  },\n  \"db\": \"ok\",\n  \"rest\": {\n    \"GET\": \"A046E51D-44DC-43AE-BBA2-86FCA86C5265\",\n    \"POST\": \"post:ok\",\n    \"PUT\": \"put:ok\",\n    \"PATCH\": \"patch:ok\",\n    \"DELETE\": \"delete:ok\"\n  }\n}\n",
-            "helloworld-jinja": "{\n  \"default\": \"ok\",\n  \"input\": \"ok\",\n  \"script\": {\n    \"python\": \"ok\",\n    \"kotlin\": {\n      \"base\": \"ok\"\n      \"from suspend function\": \"ok\"\n    }\n  },\n  \"db\": \"ok\",\n  \"rest\": {\n    \"GET\": \"A046E51D-44DC-43AE-BBA2-86FCA86C5265\",\n    \"GET_ID\": \"74FE67C6-50F5-4557-B717-030D79903908\",\n    \"POST\": \"post:ok\",\n    \"PUT\": \"put:ok\",\n    \"PATCH\": \"patch:ok\",\n    \"DELETE\": \"delete:ok\"\n  }\n}\n"
-        }
-    }
-}
diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py
index 6f59893..d9ccb1b 100644
--- a/src/onaptests/configuration/pnf_macro_settings.py
+++ b/src/onaptests/configuration/pnf_macro_settings.py
@@ -33,18 +33,15 @@ PLATFORM = "pnf_macro_platform"
 
 INSTANTIATION_TIMEOUT = 600
 
-MSB_K8S_CLEANUP_WAIT_TIME = 60
-MSB_K8S_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent,
+PNF_DEFINITION_ATRIFACT_FILE_PATH = Path(Path(__file__).parent.parent,
                                          "templates/artifacts/pnf-simulator.tar.gz")
-MSB_K8S_RESOURCE_NAME_PREFIX = "pnf-cnf"
-MSB_K8S_RB_NAME = f"{MSB_K8S_RESOURCE_NAME_PREFIX}-rb-{str(uuid4())}"
-MSB_K8S_RB_VERSION = "v1"
-MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent,
+PNF_RB_NAME = f"pnf-cnf-rb-{str(uuid4())}"
+PNF_RB_VERSION = "v1"
+PNF_PROFILE_ARTIFACT_FILE_PATH = Path(Path(__file__).parent.parent,
                                       "templates/artifacts/profile.tar.gz")
-MSB_K8S_PROFILE_NAME = f"{MSB_K8S_RESOURCE_NAME_PREFIX}-profile-{str(uuid4())}"
+PNF_PROFILE_NAME = f"pnf-cnf-profile-{str(uuid4())}"
 K8S_VERSION = "1.0"
 K8S_CONFIG = str(Path(Path(__file__).parent.parent, "templates/artifacts/config"))
-K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests"
 
 SERVICE_INSTANCE_NAME = "TestPNFMacroInstantiation"
 
diff --git a/src/onaptests/configuration/settings.py b/src/onaptests/configuration/settings.py
index e6f894d..491e5e0 100644
--- a/src/onaptests/configuration/settings.py
+++ b/src/onaptests/configuration/settings.py
@@ -43,8 +43,7 @@ REPORTING_FILE_PATH = "/tmp/reporting.html"
 K8S_REGION_TYPE = "k8s"
 TILLER_HOST = "localhost"
 K8S_CONFIG = None  # None means it will use default config (~/.kube/config)
-K8S_ONAP_NAMESPACE = "onap"  # ONAP Kubernetes namespace
-K8S_ADDITIONAL_RESOURCES_NAMESPACE = K8S_ONAP_NAMESPACE  # Resources created on tests namespace
+K8S_NAMESPACE = "onap"  # Kubernetes namespace
 #SOCK_HTTP = "socks5h://127.0.0.1:8091"
 
 ORCHESTRATION_REQUEST_TIMEOUT = 60.0 * 15  # 15 minutes in seconds