[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>

13 files changed, 27 insertions, 592 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
diff --git a/src/onaptests/scenario/cds_resource_resolution.py b/src/onaptests/scenario/cds_resource_resolution.py
deleted file mode 100644
index 11df77f..0000000
--- a/src/onaptests/scenario/cds_resource_resolution.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env python
-"""CDS resource resolution test scenario."""
-
-import logging
-import time
-
-from onapsdk.configuration import settings
-from onapsdk.exceptions import SDKException
-from xtesting.core import testcase
-
-from onaptests.steps.base import BaseStep
-from onaptests.steps.onboard.cds import CbaProcessStep
-from onaptests.steps.simulator.cds_mockserver import CdsMockserverCnfConfigureStep
-from onaptests.utils.exceptions import OnapTestException
-
-
-class CDSResourceResolutionStep(BaseStep):
-    """Step created to run scenario and generate report."""
-
-    def __init__(self, cleanup=False):
-        """Initialize step.
-
-        Substeps:
-            - CdsMockserverCnfConfigureStep,
-            - CbaProcessStep.
-        """
-        super().__init__(cleanup=cleanup)
-        self.add_step(CdsMockserverCnfConfigureStep(
-            cleanup=settings.CLEANUP_FLAG
-        ))
-        self.add_step(CbaProcessStep(
-            cleanup=settings.CLEANUP_FLAG
-        ))
-
-    @property
-    def description(self) -> str:
-        """Step description.
-
-        Used for reports
-
-        Returns:
-            str: Step description
-
-        """
-        return "CDS resource-resoulution base step"
-
-    @property
-    def component(self) -> str:
-        """Component name.
-
-       Name of the component this step relates to.
-            Usually the name of ONAP component.
-
-        Returns:
-            str: Component name
-
-        """
-        return "PythonSDK-tests"
-
-
-class CDSResourceResolution(testcase.TestCase):
-    """Enrich simple blueprint using CDS blueprintprocessor."""
-
-    __logger = logging.getLogger(__name__)
-
-    def __init__(self, **kwargs):
-        """Init CDS resource resolution use case."""
-        if "case_name" not in kwargs:
-            kwargs["case_name"] = 'basic_cds'
-        super().__init__(**kwargs)
-        self.__logger.debug("CDS resource resolution initialization")
-        self.test = CDSResourceResolutionStep(
-                cleanup=settings.CLEANUP_FLAG)
-        self.start_time = None
-        self.stop_time = None
-        self.result = 0
-
-    def run(self):
-        self.__logger.debug("CDS resource resolution run")
-        self.start_time = time.time()
-        try:
-            self.test.execute()
-            self.result = 100
-        except OnapTestException as exc:
-            self.result = 0
-            self.__logger.error(exc.error_message)
-        except SDKException:
-            self.result = 0
-            self.__logger.error("SDK Exception")
-        finally:
-            self.stop_time = time.time()
-
-    def clean(self):
-        """Clean Additional resources if needed."""
-        self.__logger.info("Generate Test report")
-        self.test.reports_collection.generate_report()
diff --git a/src/onaptests/steps/base.py b/src/onaptests/steps/base.py
index 744fc7b..6d43fbc 100644
--- a/src/onaptests/steps/base.py
+++ b/src/onaptests/steps/base.py
@@ -126,8 +126,8 @@ class BaseStep(ABC):
         if self._cleanup:
             if self._cleanup_report:
                 yield self._cleanup_report
-            for step in self._steps:
-                yield from step.cleanup_reports
+                for step in self._steps:
+                    yield from step.cleanup_reports
 
     @property
     def name(self) -> str:
diff --git a/src/onaptests/steps/instantiate/msb_k8s.py b/src/onaptests/steps/instantiate/msb_k8s.py
index ba1b732..e6186f5 100644
--- a/src/onaptests/steps/instantiate/msb_k8s.py
+++ b/src/onaptests/steps/instantiate/msb_k8s.py
@@ -1,6 +1,4 @@
 """MSB k8s instantiation module."""
-import time
-
 from onapsdk.configuration import settings
 from onapsdk.msb.k8s import Instance
 
@@ -8,35 +6,6 @@ from onaptests.steps.base import BaseStep
 from onaptests.steps.onboard.msb_k8s import CreateProfileStep
 
 
-class InstancesCleanup(BaseStep):
-    """Delete old instances which were not cleaned up properly."""
-
-    @property
-    def description(self) -> str:
-        """Step description."""
-        return ("Delete old instances which were created using same MSB_K8S_RESOURCE_NAME_PREFIX"
-                " and were not cleaned up.")
-
-    @property
-    def component(self) -> str:
-        """Component name."""
-        return "K8S plugin"
-
-    @BaseStep.store_state
-    def execute(self) -> None:
-        """Create instance using MSB K8S plugin."""
-        super().execute()
-        self._logger.debug("Delete all instances which are created using definition with same prefix ")
-        any_deleted: bool = False
-        for instance in Instance.get_all():
-            if instance.request.profile_name.startswith(settings.MSB_K8S_RESOURCE_NAME_PREFIX):
-                self._logger.debug("Delete %s instance", instance.instance_id)
-                instance.delete()
-                any_deleted = True
-        if any_deleted:
-            time.sleep(settings.MSB_K8S_CLEANUP_WAIT_TIME)  # Give it some time to delete k8s resources (pods, services, deployments...)
-
-
 class CreateInstanceStep(BaseStep):
     """Create MSB k8s instance step."""
 
@@ -47,7 +16,6 @@ class CreateInstanceStep(BaseStep):
             - CreateProfileStep.
         """
         super().__init__(cleanup=cleanup)
-        self.add_step(InstancesCleanup())
         self.add_step(CreateProfileStep(cleanup=cleanup))
         self.instance: Instance = None
 
@@ -66,9 +34,9 @@ class CreateInstanceStep(BaseStep):
         """Create instance using MSB K8S plugin."""
         super().execute()
         self.instance = Instance.create(cloud_region_id=settings.CLOUD_REGION_ID,
-                                        profile_name=settings.MSB_K8S_PROFILE_NAME,
-                                        rb_name=settings.MSB_K8S_RB_NAME,
-                                        rb_version=settings.MSB_K8S_RB_VERSION)
+                                        profile_name=settings.PNF_PROFILE_NAME,
+                                        rb_name=settings.PNF_RB_NAME,
+                                        rb_version=settings.PNF_RB_VERSION)
 
     @BaseStep.store_state(cleanup=True)
     def cleanup(self) -> None:
diff --git a/src/onaptests/steps/onboard/cds.py b/src/onaptests/steps/onboard/cds.py
index 7f91d56..cbd69ce 100644
--- a/src/onaptests/steps/onboard/cds.py
+++ b/src/onaptests/steps/onboard/cds.py
@@ -8,7 +8,6 @@ from typing import Any, Dict
 from kubernetes import client, config
 from kubernetes.client.exceptions import ApiException
 from onapsdk.cds import Blueprint, DataDictionarySet
-from onapsdk.cds.blueprint import Workflow
 from onapsdk.cds.blueprint_processor import Blueprintprocessor
 from onapsdk.configuration import settings
 import urllib3
@@ -54,7 +53,7 @@ class ExposeCDSBlueprintprocessorNodePortStep(CDSBaseStep):
         try:
             service_data: Dict[str, Any] = self.k8s_client.read_namespaced_service(
                 self.service_name,
-                settings.K8S_ONAP_NAMESPACE
+                settings.K8S_NAMESPACE
             )
             return service_data.spec.type == "NodePort"
         except ApiException:
@@ -67,7 +66,7 @@ class ExposeCDSBlueprintprocessorNodePortStep(CDSBaseStep):
 
         Use settings values:
          - K8S_CONFIG,
-         - K8S_ONAP_NAMESPACE.
+         - K8S_NAMESPACE.
 
         """
         super().execute()
@@ -75,7 +74,7 @@ class ExposeCDSBlueprintprocessorNodePortStep(CDSBaseStep):
             try:
                 self.k8s_client.patch_namespaced_service(
                     self.service_name,
-                    settings.K8S_ONAP_NAMESPACE,
+                    settings.K8S_NAMESPACE,
                     {"spec": {"ports": [{"port": 8080, "nodePort": 30449}], "type": "NodePort"}}
                 )
             except ApiException:
@@ -97,7 +96,7 @@ class ExposeCDSBlueprintprocessorNodePortStep(CDSBaseStep):
             try:
                 self.k8s_client.patch_namespaced_service(
                     self.service_name,
-                    settings.K8S_ONAP_NAMESPACE,
+                    settings.K8S_NAMESPACE,
                     [
                         {
                             "op": "remove",
@@ -223,45 +222,12 @@ class CbaPublishStep(CDSBaseStep):
 
     @BaseStep.store_state
     def execute(self) -> None:
-        """Publish CBA file.
+        """Enrich CBA file.
 
         Use settings values:
-         - CDS_CBA_ENRICHED.
+         - CDS_DD_FILE.
 
         """
         super().execute()
         blueprint: Blueprint = Blueprint.load_from_file(settings.CDS_CBA_ENRICHED)
         blueprint.publish()
-
-
-class CbaProcessStep(CDSBaseStep):
-    """Process CBA step."""
-
-    def __init__(self, cleanup=False) -> None:
-        """Initialize CBA process step."""
-        super().__init__(cleanup=cleanup)
-        self.add_step(CbaPublishStep(cleanup=cleanup))
-
-    @property
-    def description(self) -> str:
-        """Step description."""
-        return "Process CBA file."
-
-    @BaseStep.store_state
-    def execute(self) -> None:
-        """Process CBA file.
-
-        Check if output is equal to expected
-
-        Use settings values:
-         - CDS_CBA_ENRICHED,
-         - CDS_WORKFLOW_NAME,
-         - CDS_WORKFLOW_INPUT
-
-        """
-        super().execute()
-        blueprint: Blueprint = Blueprint.load_from_file(settings.CDS_CBA_ENRICHED)
-        workflow: Workflow = blueprint.get_workflow_by_name(settings.CDS_WORKFLOW_NAME)
-        output: Dict[str, Any] = workflow.execute(settings.CDS_WORKFLOW_INPUT)
-        if not output == settings.CDS_WORKFLOW_EXPECTED_OUTPUT:
-            raise OnapTestException("Response is not equal to the expected one")
diff --git a/src/onaptests/steps/onboard/msb_k8s.py b/src/onaptests/steps/onboard/msb_k8s.py
index 503a886..cad471b 100644
--- a/src/onaptests/steps/onboard/msb_k8s.py
+++ b/src/onaptests/steps/onboard/msb_k8s.py
@@ -36,9 +36,9 @@ class CreateDefinitionStep(BaseStep):
     def execute(self) -> None:
         """Create definition."""
         super().execute()
-        with open(settings.MSB_K8S_DEFINITION_ATRIFACT_FILE_PATH, "rb") as definition_file:
-            self.definition = Definition.create(rb_name=settings.MSB_K8S_RB_NAME,
-                                                rb_version=settings.MSB_K8S_RB_VERSION)
+        with open(settings.PNF_DEFINITION_ATRIFACT_FILE_PATH, "rb") as definition_file:
+            self.definition = Definition.create(rb_name=settings.PNF_RB_NAME,
+                                                rb_version=settings.PNF_RB_VERSION)
             self.definition.upload_artifact(definition_file.read())
 
 
@@ -70,10 +70,10 @@ class CreateProfileStep(BaseStep):
         """Create profile."""
         super().execute()
         definition: Definition = Definition.get_definition_by_name_version(\
-            rb_name=settings.MSB_K8S_RB_NAME,
-            rb_version=settings.MSB_K8S_RB_VERSION)
-        with open(settings.MSB_K8S_PROFILE_ARTIFACT_FILE_PATH, "rb") as profile_file:
-            self.profile = definition.create_profile(profile_name=settings.MSB_K8S_PROFILE_NAME,
-                                                     namespace=settings.K8S_ADDITIONAL_RESOURCES_NAMESPACE,
+            rb_name=settings.PNF_RB_NAME,
+            rb_version=settings.PNF_RB_VERSION)
+        with open(settings.PNF_PROFILE_ARTIFACT_FILE_PATH, "rb") as profile_file:
+            self.profile = definition.create_profile(profile_name=settings.PNF_PROFILE_NAME,
+                                                     namespace=settings.K8S_NAMESPACE,
                                                      kubernetes_version=settings.K8S_VERSION)
             self.profile.upload_artifact(profile_file.read())
diff --git a/src/onaptests/steps/simulator/cds_mockserver.py b/src/onaptests/steps/simulator/cds_mockserver.py
deleted file mode 100644
index 6933fa0..0000000
--- a/src/onaptests/steps/simulator/cds_mockserver.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# http://www.apache.org/licenses/LICENSE-2.0
-"""CDS mockserver registration module."""
-
-import time
-
-import requests
-from onapsdk.configuration import settings
-
-from onaptests.steps.base import BaseStep
-from onaptests.steps.instantiate.msb_k8s import CreateInstanceStep
-from onaptests.utils.exceptions import OnapTestException
-
-
-class CdsMockserverCnfConfigureStep(BaseStep):
-    """Configure cds mockserver expectations."""
-
-    def __init__(self, cleanup: bool = False) -> None:
-        """Initialize step.
-
-        Substeps:
-            - CreateInstanceStep.
-        """
-        super().__init__(cleanup=cleanup)
-        self.add_step(CreateInstanceStep(cleanup=cleanup))
-
-    @property
-    def description(self) -> str:
-        """Step description."""
-        return "Configure cds-mockserver."
-
-    @property
-    def component(self) -> str:
-        """Component name."""
-        return "Environment"
-
-    @BaseStep.store_state
-    def execute(self) -> None:
-        """Create mockserver expectations.
-
-        Use settings values:
-         - CDS_MOCKSERVER_EXPECTATIONS.
-        """
-        super().execute()
-        time.sleep(60)  # Wait for mockserver
-        for expectation in settings.CDS_MOCKSERVER_EXPECTATIONS:
-            try:
-                response = requests.put(
-                    "http://portal.api.simpledemo.onap.org:30726/mockserver/expectation",
-                    json={
-                        "httpRequest" : {
-                            "method": expectation["method"],
-                            "path": expectation["path"]
-                        },
-                        "httpResponse" : {
-                            "body": expectation["response"]
-                        }
-                    }
-                )
-                response.raise_for_status()
-            except (requests.ConnectionError, requests.HTTPError) as http_error:
-                self._logger.debug(f"Can't register cds-mockserver expectation: {str(http_error)}")
-                raise OnapTestException("CDS mockserver not configured")
diff --git a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
index 1960659..caeb20b 100644
--- a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
+++ b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
@@ -51,7 +51,7 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
         k8s_watch: "Watch" =  watch.Watch()
         try:
             for event in k8s_watch.stream(k8s_client.list_namespaced_pod,
-                                        namespace=settings.K8S_ADDITIONAL_RESOURCES_NAMESPACE,
+                                        namespace=settings.K8S_NAMESPACE,
                                         timeout_seconds=timeout_seconds):
                 if event["object"].metadata.name == "pnf-macro-test-simulator":
                     if not event["object"].status.phase in ["Pending", "Running"]:
@@ -76,7 +76,7 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
         config.load_kube_config(settings.K8S_CONFIG)
         k8s_client: "CoreV1API" = client.CoreV1Api()
         try:
-            for service in k8s_client.list_namespaced_service(namespace=settings.K8S_ONAP_NAMESPACE).items:
+            for service in k8s_client.list_namespaced_service(namespace=settings.K8S_NAMESPACE).items:
                 if service.metadata.name == settings.DCAE_VES_COLLECTOR_POD_NAME:
                     return service.spec.cluster_ip, service.spec.ports[0].port
             raise EnvironmentPreparationException("Couldn't get VES ip and port")
diff --git a/src/onaptests/templates/artifacts/cds-resource-resolution/cds-mock-server.tar.gz b/src/onaptests/templates/artifacts/cds-resource-resolution/cds-mock-server.tar.gz
deleted file mode 100644
index ad428fb..0000000
--- a/src/onaptests/templates/artifacts/cds-resource-resolution/cds-mock-server.tar.gz
+++ /dev/null
diff --git a/src/onaptests/templates/artifacts/cds-resource-resolution/dd.json b/src/onaptests/templates/artifacts/cds-resource-resolution/dd.json
deleted file mode 100644
index ead7f86..0000000
--- a/src/onaptests/templates/artifacts/cds-resource-resolution/dd.json
+++ /dev/null
@@ -1,260 +0,0 @@
-[
-  {
-    "name": "RT-db",
-    "data_type": "string",
-    "entry_schema": "string",
-    "description": "DB request for regression test",
-    "tags": "datetime",
-    "updatedBy": "Selfish",
-    "definition": {
-      "name": "RT-db",
-      "tags": "RT-db",
-      "updated-by": "Selffish",
-      "property": {
-        "description": "DB request for regression test",
-        "type": "string"
-      },
-      "sources": {
-        "processor-db": {
-          "type": "source-db",
-          "properties": {
-            "endpoint-selector": "db-endpoint",
-            "type": "SQL",
-            "query": "select sdnctl.RESOURCE_RESOLUTION.value from sdnctl.RESOURCE_RESOLUTION where value='ok'",
-            "input-key-mapping": {},
-            "output-key-mapping": {
-              "value": "value"
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "name": "kotlin-script",
-    "data_type": "string",
-    "entry_schema": "string",
-    "description": "Kotlin script used to read properties.",
-    "tags": "kotlin-script",
-    "updatedBy": "Self-fish",
-    "definition": {
-      "name": "kotlin-script",
-      "updated-by": "Selffish",
-      "tags": "properties-capability-source",
-      "property": {
-        "description": "Kotlin script used to read properties.",
-        "type": "string"
-      },
-      "sources": {
-        "capability": {
-          "type": "source-capability",
-          "properties": {
-            "script-type": "kotlin",
-            "script-class-reference": "cba.cds.RT.ResolvPropertiesKt",
-            "instance-dependencies": []
-          }
-        }
-      }
-    }
-  },
-  {
-    "name": "RT-rest-delete",
-    "data_type": "string",
-    "entry_schema": "string",
-    "description": "Rest DELETE request for regression test",
-    "tags": "RT-rest-delete",
-    "updatedBy": "Selfish",
-    "definition": {
-      "name": "RT-rest-delete",
-      "tags": "RT-rest-delete",
-      "updated-by": "Selffish",
-      "property": {
-        "description": "Rest DELETE request for regression test",
-        "type": "string"
-      },
-      "sources": {
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "string",
-            "verb": "DELETE",
-            "url-path": "/delete",
-            "endpoint-selector": "rest-endpoint",
-            "path": "",
-            "input-key-mapping": {},
-            "output-key-mapping": {
-              "value": "value"
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "name": "RT-rest-get-id",
-    "data_type": "string",
-    "entry_schema": "string",
-    "description": "Rest GET request using input key mapping",
-    "tags": "RT-rest-get-id",
-    "updatedBy": "Selfish",
-    "definition": {
-      "name": "RT-rest-get-id",
-      "tags": "RT-rest-get-id",
-      "updated-by": "Selffish",
-      "property": {
-        "description": "Rest GET request using input key mapping",
-        "type": "string"
-      },
-      "sources": {
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "string",
-            "verb": "GET",
-            "url-path": "/get/$id/id",
-            "endpoint-selector": "rest-endpoint",
-            "path": "",
-            "input-key-mapping": {
-              "id": "j_get"
-            },
-            "output-key-mapping": {
-              "value": "value"
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "name": "RT-rest-get",
-    "data_type": "string",
-    "entry_schema": "string",
-    "description": "Rest GET request for regression test",
-    "tags": "RT-rest-get",
-    "updatedBy": "Selfish",
-    "definition": {
-      "name": "RT-rest-get",
-      "tags": "RT-rest-get",
-      "updated-by": "Selffish",
-      "property": {
-        "description": "Rest GET request for regression test",
-        "type": "string"
-      },
-      "sources": {
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "string",
-            "verb": "GET",
-            "url-path": "/get",
-            "endpoint-selector": "rest-endpoint",
-            "path": "",
-            "input-key-mapping": {},
-            "output-key-mapping": {
-              "value": "value"
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "name": "RT-rest-patch",
-    "data_type": "string",
-    "entry_schema": "string",
-    "description": "Rest PATCH request for regression test",
-    "tags": "RT-rest-patch",
-    "updatedBy": "Selfish",
-    "definition": {
-      "name": "RT-rest-patch",
-      "tags": "RT-rest-patch",
-      "updated-by": "Selffish",
-      "property": {
-        "description": "Rest PATCH request for regression test",
-        "type": "string"
-      },
-      "sources": {
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "string",
-            "verb": "PATCH",
-            "url-path": "/patch",
-            "endpoint-selector": "rest-endpoint",
-            "path": "",
-            "input-key-mapping": {},
-            "output-key-mapping": {
-              "value": "value"
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "name": "RT-rest-post",
-    "data_type": "string",
-    "entry_schema": "string",
-    "description": "Rest POST request for regression test",
-    "tags": "RT-rest-post",
-    "updatedBy": "Selfish",
-    "definition": {
-      "name": "RT-rest-post",
-      "tags": "RT-rest-post",
-      "updated-by": "Selffish",
-      "property": {
-        "description": "Rest POST request for regression test",
-        "type": "string"
-      },
-      "sources": {
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "string",
-            "verb": "POST",
-            "url-path": "/post",
-            "endpoint-selector": "rest-endpoint",
-            "path": "",
-            "input-key-mapping": {},
-            "output-key-mapping": {
-              "value": "value"
-            }
-          }
-        }
-      }
-    }
-  },
-  {
-    "name": "RT-rest-put",
-    "data_type": "string",
-    "entry_schema": "string",
-    "description": "Rest PUT request for regression test",
-    "tags": "RT-rest-put",
-    "updatedBy": "Selfish",
-    "definition": {
-      "name": "RT-rest-put",
-      "tags": "RT-rest-put",
-      "updated-by": "Selffish",
-      "property": {
-        "description": "Rest PUT request for regression test",
-        "type": "string"
-      },
-      "sources": {
-        "sdnc": {
-          "type": "source-rest",
-          "properties": {
-            "type": "string",
-            "verb": "PUT",
-            "url-path": "/put",
-            "endpoint-selector": "rest-endpoint",
-            "path": "",
-            "input-key-mapping": {},
-            "output-key-mapping": {
-              "value": "value"
-            }
-          }
-        }
-      }
-    }
-  }
-]
diff --git a/src/onaptests/templates/artifacts/cds-resource-resolution/resource-resolution.zip b/src/onaptests/templates/artifacts/cds-resource-resolution/resource-resolution.zip
deleted file mode 100644
index 80156ee..0000000
--- a/src/onaptests/templates/artifacts/cds-resource-resolution/resource-resolution.zip
+++ /dev/null