Modular structure of clamp including controlloop

This commit is the first commit that puts in multi module structure while
changing the existing CLAMP code as little as possible.
It adds a structure where common, models, participant and runtime are direct children under clamp,
and current clamp code is moved under runtime. This runtime directory will host controlloop
runtime code in later commits.

Issue-ID: POLICY-3215
Signed-off-by: Sirisha_Manchikanti <sirisha.manchikanti@est.tech>
Change-Id: I15bc8be92ed020343bff4024c4718fec462c40d7
Signed-off-by: liamfallon <liam.fallon@est.tech>

168 files changed, 0 insertions, 20905 deletions

diff --git a/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java b/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java
deleted file mode 100644
index 6e5300e23..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/client/CdsServicesTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 Huawei Technologies Co., Ltd.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- * ================================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.client;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-public class CdsServicesTest {
-
-    @Test
-    public void testParseCdsListTypeProperties() throws IOException {
-        String cdsResponse = ResourceFileUtils
-                .getResourceAsString("example/cds-response/vFW-CDS-resource-assignment-workflow.json");
-        CdsServices services = new CdsServices();
-        JsonObject output = services.parseCdsResponse(cdsResponse);
-        JSONAssert.assertEquals(ResourceFileUtils
-                .getResourceAsString("example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json"),
-                        JsonUtils.GSON.toJson(output), true);
-    }
-
-    @Test
-    public void testParseCdsResponse() throws IOException {
-        String cdsResponse = ResourceFileUtils
-                .getResourceAsString("example/cds-response/vFW-CDS-modify-config-workflow.json");
-        CdsServices services = new CdsServices();
-        JsonObject output = services.parseCdsResponse(cdsResponse);
-        JSONAssert.assertEquals(ResourceFileUtils
-                .getResourceAsString("example/cds-response/vFW-CDS-modify-config-wf-expected-result.json"),
-                        JsonUtils.GSON.toJson(output), true);
-    }
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java b/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java
deleted file mode 100644
index 605ab99ae..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/config/CldsUserJsonDecoderTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * Modifications copyright (c) 2018 Nokia
- * ===================================================================
- * 
- */
-
-package org.onap.policy.clamp.clds.config;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-import org.onap.policy.clamp.authorization.CldsUser;
-import org.onap.policy.clamp.clds.exception.CldsUsersException;
-
-public class CldsUserJsonDecoderTest {
-
-    private String user1 = "admin1";
-    private String user2 = "admin2";
-    private String password = "5f4dcc3b5aa765d61d8327deb882cf99";
-    private String[] normalPermissionsArray = { "permission-type-cl|dev|read", "permission-type-cl|dev|update",
-        "permission-type-cl-manage|dev|*", "permission-type-filter-vf|dev|*", "permission-type-template|dev|read",
-        "permission-type-template|dev|update" };
-    private String[] incompletePermissionsArray = { "permission-type-cl|dev|*", "permission-type-cl|dev|*",
-        "permission-type-cl-manage|dev|*", "permission-type-filter-vf|dev|*", "permission-type-template|dev|read",
-        "permission-type-template|dev|update" };
-
-    @Test
-    public void testDecodingDoubleUsers() {
-
-        // when
-        CldsUser[] usersArray = CldsUserJsonDecoder
-                .decodeJson(CldsUserJsonDecoderTest.class.getResourceAsStream("/clds/clds-users-two-users.json"));
-
-        // then
-        assertThat(usersArray).hasSize(2);
-        assertThat(usersArray[0]).extracting(CldsUser::getUser, CldsUser::getPassword, CldsUser::getPermissionsString)
-                .containsExactly(user1, password, normalPermissionsArray);
-
-        assertThat(usersArray[1]).extracting(CldsUser::getUser, CldsUser::getPassword, CldsUser::getPermissionsString)
-                .containsExactly(user2, password, normalPermissionsArray);
-
-    }
-
-    @Test
-    public void testDecodingNoPermission() {
-        // when
-        CldsUser[] usersArray = CldsUserJsonDecoder
-                .decodeJson(this.getClass().getResourceAsStream("/clds/clds-users-no-permission.json"));
-
-        // then
-        assertThat(usersArray).hasSize(1);
-        CldsUser user = usersArray[0];
-        assertThat(user.getUser()).isEqualTo(user1);
-        assertThat(user.getPassword()).isEqualTo(null);
-        assertThat(user.getPermissionsString()).isEmpty();
-    }
-
-    @Test
-    public void testDecodingIncompletePermissions() {
-
-        // when
-        CldsUser[] usersArray = CldsUserJsonDecoder
-                .decodeJson(this.getClass().getResourceAsStream("/clds/clds-users-incomplete-permissions.json"));
-
-        // then
-        assertThat(usersArray).hasSize(1);
-        CldsUser user = usersArray[0];
-        assertThat(user.getUser()).isEqualTo(user1);
-        assertThat(user.getPassword()).isEqualTo(password);
-        assertThat(user.getPermissionsString()).isEqualTo(incompletePermissionsArray);
-    }
-
-    @Test(expected = CldsUsersException.class)
-    public void shouldThrowCldsUsersException() {
-        // when
-        CldsUserJsonDecoder.decodeJson(this.getClass().getResourceAsStream("/clds/clds-parse-exception.json"));
-    }
-
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java b/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
deleted file mode 100644
index 7390b65ba..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/config/sdc/SdcSingleControllerConfigurationTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2017, 2021 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- * Modifications copyright (c) 2018 Nokia
- * ================================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.config.sdc;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.exception.sdc.controller.SdcParametersException;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-
-/**
- * This class tests the SDC Controller config.
- */
-public class SdcSingleControllerConfigurationTest {
-
-    /**
-     * This method loads the SDC controller configuration from a file located in the resource folder.
-     *
-     * @param fileName          file for sdc controller configuration.
-     * @param sdcControllerName sdc controller name.
-     * @return instance of SdcSingleControllerConfiguration.
-     */
-    public static SdcSingleControllerConfiguration loadControllerConfiguration(String fileName,
-                                                                               String sdcControllerName) {
-
-        InputStreamReader streamReader = new InputStreamReader(ResourceFileUtils.getResourceAsStream(fileName),
-                StandardCharsets.UTF_8);
-        JsonObject jsonNode = JsonUtils.GSON.fromJson(streamReader, JsonObject.class);
-
-        return new SdcSingleControllerConfiguration(jsonNode, sdcControllerName,
-                "classpath:clds/aaf/org.onap.clamp.keyfile");
-    }
-
-    @Test
-    public final void testTheInit() throws SdcParametersException, IOException {
-        SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-TLS.json",
-                "sdc-controller1");
-        assertEquals("User", sdcConfig.getUser());
-        assertEquals("ThePassword", sdcConfig.getPassword());
-        assertEquals("consumerGroup", sdcConfig.getConsumerGroup());
-        assertEquals("consumerId", sdcConfig.getConsumerID());
-        assertEquals("environmentName", sdcConfig.getEnvironmentName());
-        assertEquals("hostname:8080", sdcConfig.getAsdcAddress());
-        assertEquals(10, sdcConfig.getPollingInterval());
-        assertEquals(30, sdcConfig.getPollingTimeout());
-
-        assertThat(SdcSingleControllerConfiguration.SUPPORTED_ARTIFACT_TYPES_LIST)
-                .hasSameSizeAs(sdcConfig.getRelevantArtifactTypes());
-        assertEquals("ThePassword", sdcConfig.getKeyStorePassword());
-        assertTrue(sdcConfig.activateServerTLSAuth());
-        assertThat(sdcConfig.getMsgBusAddress()).contains("localhost");
-    }
-
-    @Test(expected = SdcParametersException.class)
-    public final void testAllRequiredParameters() throws IOException {
-        SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-TLS.json",
-                "sdc-controller1");
-        // No exception should be raised
-        sdcConfig.testAllRequiredParameters();
-        sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-bad.json", "sdc-controller1");
-        fail("Should have raised an exception");
-    }
-
-    @Test
-    public final void testAllRequiredParametersEmptyEncrypted() throws IOException {
-        SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration(
-                "clds/sdc-controller-config-empty-encrypted.json", "sdc-controller1");
-        sdcConfig.testAllRequiredParameters();
-        assertNull(sdcConfig.getKeyStorePassword());
-    }
-
-    @Test
-    public final void testConsumerGroupWithNull() throws IOException {
-        SdcSingleControllerConfiguration sdcConfig = loadControllerConfiguration("clds/sdc-controller-config-NULL.json",
-                "sdc-controller1");
-        assertTrue(sdcConfig.getConsumerGroup() == null);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java
deleted file mode 100644
index 557a2e96c..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/it/AuthorizationControllerItCase.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * Modifications Copyright (C) 2020 Nordix Foundation.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Arrays;
-import java.util.Collection;
-import org.apache.camel.Exchange;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.onap.policy.clamp.authorization.AuthorizationController;
-import org.onap.policy.clamp.authorization.SecureServicePermission;
-import org.onap.policy.clamp.clds.exception.NotAuthorizedException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * Test CldsDAO calls through CldsModel and CldsEvent. This really test the DB
- * and stored procedures.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class AuthorizationControllerItCase {
-
-    @Autowired
-    private AuthorizationController auth;
-
-    private static SecurityContext sc = SecurityContextHolder.getContext();
-
-    /**
-     * Setup the variable before the tests execution.
-     */
-    @BeforeClass
-    public static void setupBefore() {
-
-        sc.setAuthentication(new Authentication() {
-            @Override
-            public Collection<? extends GrantedAuthority> getAuthorities() {
-                return Arrays.asList(new SimpleGrantedAuthority(
-                                new SecureServicePermission("permission-type-cl", "dev", "read").getKey()),
-                        new SimpleGrantedAuthority(new SecureServicePermission("permission-type-cl-manage", "dev",
-                                "DEPLOY").getKey()),
-                        new SimpleGrantedAuthority(new SecureServicePermission("permission-type-filter-vf", "dev",
-                                "12345-55555-55555-5555").getKey()));
-            }
-
-            @Override
-            public Object getCredentials() {
-                return null;
-            }
-
-            @Override
-            public Object getDetails() {
-                return null;
-            }
-
-            @Override
-            public Object getPrincipal() {
-                return "admin";
-            }
-
-            @Override
-            public boolean isAuthenticated() {
-                return true;
-            }
-
-            @Override
-            public void setAuthenticated(boolean authenticatedFlag) throws IllegalArgumentException {
-
-            }
-
-            @Override
-            public String getName() {
-                return "admin";
-            }
-        });
-
-    }
-
-    @AfterClass
-
-    public static void afterCleanup() {
-        sc.setAuthentication(null);
-    }
-
-    @Test
-    public void testIsUserPermitted() {
-        assertEquals(AuthorizationController.getPrincipalName(sc), "admin");
-        assertTrue(auth.isUserPermitted(new SecureServicePermission("permission-type-cl", "dev", "read")));
-        assertTrue(auth.isUserPermitted(new SecureServicePermission("permission-type-cl-manage", "dev", "DEPLOY")));
-        assertTrue(auth.isUserPermitted(
-                new SecureServicePermission("permission-type-filter-vf", "dev", "12345-55555-55555-5555")));
-        assertFalse(auth.isUserPermitted(new SecureServicePermission("permission-type-cl", "test", "read")));
-    }
-
-    @Test(expected = NotAuthorizedException.class)
-    public void testIfAuthorizeThrowException() {
-        Exchange ex = Mockito.mock(Exchange.class);
-        auth.authorize(ex, "cl", "test", "read");
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java
deleted file mode 100644
index 52da63952..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/it/CldsHealthcheckServiceItCase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- */
-
-package org.onap.policy.clamp.clds.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.model.CldsHealthCheck;
-import org.onap.policy.clamp.clds.service.CldsHealthcheckService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * Tests HealthCheck Service.
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-public class CldsHealthcheckServiceItCase {
-
-    @Autowired
-    private CldsHealthcheckService cldsHealthcheckService;
-
-    @Test
-    public void testGetHealthCheck() {
-        CldsHealthCheck cldsHealthCheck = cldsHealthcheckService.gethealthcheck();
-        assertNotNull(cldsHealthCheck);
-        assertEquals("UP", cldsHealthCheck.getHealthCheckStatus());
-        assertEquals("CLDS-APP", cldsHealthCheck.getHealthCheckComponent());
-        assertEquals("OK", cldsHealthCheck.getDescription());
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java
deleted file mode 100644
index 1a4a2ec5f..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/it/HttpsItCase.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.it;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import javax.net.ssl.SSLContext;
-import org.apache.commons.io.FileUtils;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.TrustStrategy;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * Test HTTP and HTTPS settings + redirection of HTTP to HTTPS.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT)
-@TestPropertySource(locations = "classpath:https/https-test.properties")
-@DirtiesContext
-public class HttpsItCase {
-
-    @Value("${server.port}")
-    private String httpsPort;
-    @Value("${server.http-to-https-redirection.port}")
-    private String httpPort;
-
-    @Test
-    public void testDesignerIndex() throws Exception {
-        ResponseEntity<String> entity =
-                new RestTemplate().getForEntity("http://localhost:" + this.httpPort + "/swagger.html",
-                        String.class);
-        assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
-        ResponseEntity<String> httpsEntity = getRestTemplate()
-                .getForEntity("https://localhost:" + this.httpsPort + "/swagger.html", String.class);
-        assertThat(httpsEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
-        assertThat(httpsEntity.getBody()).contains("Clamp Rest API");
-    }
-
-    @Test
-    public void testSwaggerJson() throws Exception {
-        ResponseEntity<String> httpsEntity = getRestTemplate()
-                .getForEntity("https://localhost:" + this.httpsPort + "/restservices/clds/api-doc", String.class);
-        assertThat(httpsEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
-        assertThat(httpsEntity.getBody()).contains("swagger");
-        FileUtils.writeStringToFile(new File("docs/swagger/swagger.json"), httpsEntity.getBody(),
-                Charset.defaultCharset());
-    }
-
-    private RestTemplate getRestTemplate() throws KeyStoreException, NoSuchAlgorithmException, KeyManagementException {
-        SSLContext sslContext = org.apache.http.ssl.SSLContexts.custom()
-                .loadTrustMaterial(null, new TrustStrategy() {
-                    @Override
-                    public boolean isTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
-                        return true;
-                    }
-                }).build();
-        SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext, new NoopHostnameVerifier());
-        CloseableHttpClient httpClient = HttpClients.custom().setSSLSocketFactory(csf).build();
-        HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
-        requestFactory.setHttpClient(httpClient);
-        RestTemplate restTemplate = new RestTemplate(requestFactory);
-        return restTemplate;
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java
deleted file mode 100644
index 017881ba7..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/it/RobotItCase.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.it;
-
-import static org.apache.commons.io.FileUtils.copyInputStreamToFile;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.command.BuildImageResultCallback;
-import com.github.dockerjava.api.command.CreateContainerResponse;
-import com.github.dockerjava.api.command.InspectContainerResponse;
-import com.github.dockerjava.api.command.LogContainerCmd;
-import com.github.dockerjava.api.model.AccessMode;
-import com.github.dockerjava.api.model.Bind;
-import com.github.dockerjava.api.model.BuildResponseItem;
-import com.github.dockerjava.api.model.Frame;
-import com.github.dockerjava.api.model.Volume;
-import com.github.dockerjava.core.DockerClientBuilder;
-import com.github.dockerjava.core.command.LogContainerResultCallback;
-import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
-import java.io.File;
-import java.util.Objects;
-import org.codehaus.plexus.util.FileUtils;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-@TestPropertySource(locations = "classpath:robotframework/robotframework-test.properties")
-@DirtiesContext
-public class RobotItCase {
-
-    @Value("${server.port}")
-    private String httpPort;
-    private static final int TIMEOUT_S = 150;
-    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(RobotItCase.class);
-
-    @Test
-    public void robotTests() throws Exception {
-        File robotFolder = new File(getClass().getClassLoader().getResource("robotframework").getFile());
-        Volume testsVolume = new Volume("/opt/robotframework/tests");
-        DockerClient client = DockerClientBuilder
-                .getInstance()
-                .withDockerCmdExecFactory(new NettyDockerCmdExecFactory())
-                .build();
-
-
-        BuildImageResultCallback callback = new BuildImageResultCallback() {
-            @Override
-            public void onNext(BuildResponseItem item) {
-                System.out.println("XXX ITEM " + item);
-                super.onNext(item);
-            }
-        };
-
-        String imageId = client.buildImageCmd(robotFolder).exec(callback).awaitImageId();
-        CreateContainerResponse createContainerResponse = client.createContainerCmd(imageId)
-                .withVolumes(testsVolume)
-                .withBinds(
-                        new Bind(robotFolder.getAbsolutePath() + "/tests/", testsVolume, AccessMode.rw))
-                .withEnv("CLAMP_PORT=" + httpPort)
-                .withStopTimeout(TIMEOUT_S)
-                .withNetworkMode("host")
-                .exec();
-        String id = createContainerResponse.getId();
-        client.startContainerCmd(id).exec();
-        InspectContainerResponse exec;
-
-        int tries = 0;
-        do {
-            Thread.sleep(1000);
-            exec = client.inspectContainerCmd(id).exec();
-            tries++;
-        } while (exec.getState().getRunning() && tries < TIMEOUT_S);
-        logger.info("RobotFramework result:" + exec.getState());
-
-        LogContainerCmd logContainerCmd = client.logContainerCmd(id);
-        logContainerCmd.withStdOut(true).withStdErr(true);
-        try {
-            logContainerCmd.exec(new LogContainerResultCallback() {
-                @Override
-                public void onNext(Frame item) {
-                    logger.info(item.toString());
-                }
-            }).awaitCompletion();
-        } catch (InterruptedException e) {
-            throw new Exception("Failed to retrieve logs of container " + id, e);
-        }
-
-        copyInputStreamToFile(client.copyArchiveFromContainerCmd(id, "/opt/robotframework/reports/output.xml").exec(),
-                new File("target/robotframework/output.xml"));
-        copyInputStreamToFile(client.copyArchiveFromContainerCmd(id, "/opt/robotframework/reports/log.html").exec(),
-                new File("target/robotframework/log.html"));
-        copyInputStreamToFile(client.copyArchiveFromContainerCmd(id, "/opt/robotframework/reports/report.html").exec(),
-                new File("target/robotframework/report.html"));
-        client.stopContainerCmd(id);
-
-        logger.info("RobotFramework output.xml file: " + FileUtils.fileRead("target/robotframework/output.xml"));
-
-        Assert.assertEquals(exec.getState().getError(), 0L,
-                Objects.requireNonNull(exec.getState().getExitCodeLong()).longValue());
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java
deleted file mode 100644
index c8b9932cc..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.it.config;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.config.ClampProperties;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class CldsReferencePropertiesItCase {
-
-    @Autowired
-    private ClampProperties refProp;
-
-    /**
-     * Test getting a value the properties in string.
-     */
-    @Test
-    public void testGetStringValue() {
-        assertEquals("healthcheck", refProp.getStringValue("policy.api.userName"));
-    }
-
-    /**
-     * Test getting prop value as a JSON Node / template.
-     *
-     * @throws IOException when JSON parsing fails
-     */
-    @Test
-    public void testGetFileContent() throws IOException {
-        String users = ResourceFileUtils.getResourceAsString("clds/clds-users.json");
-        assertEquals(users, refProp.getFileContent("files.cldsUsers"));
-        // Test composite key
-        assertEquals(users, refProp.getFileContent("files", "cldsUsers"));
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java
deleted file mode 100644
index 70aeccf59..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/it/config/SdcControllersConfigurationItCase.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2017, 2021 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.clds.it.config;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.google.gson.JsonSyntaxException;
-import java.io.IOException;
-import java.util.Map;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.config.sdc.SdcControllersConfiguration;
-import org.onap.policy.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
-import org.onap.policy.clamp.clds.exception.sdc.controller.SdcParametersException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.util.ReflectionTestUtils;
-
-/**
- * This class tests the SDC Controller config.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller"})
-public class SdcControllersConfigurationItCase {
-
-    @Autowired
-    private SdcControllersConfiguration sdcControllersConfiguration;
-
-    public final void loadFile(String fileName) throws IOException {
-        ReflectionTestUtils.setField(sdcControllersConfiguration, "sdcControllerFile", fileName);
-        sdcControllersConfiguration.loadConfiguration();
-    }
-
-    @Test
-    public void testGetAllDefinedControllers() throws IOException {
-        loadFile("classpath:clds/sdc-controllers-config.json");
-        Map<String, SdcSingleControllerConfiguration> mapResult = sdcControllersConfiguration
-                .getAllDefinedControllers();
-        assertTrue(mapResult.size() == 2);
-        assertEquals("sdc-controller1", mapResult.get("sdc-controller1").getSdcControllerName());
-        assertEquals("sdc-controller2", mapResult.get("sdc-controller2").getSdcControllerName());
-    }
-
-    @Test
-    public void testGetSdcSingleControllerConfiguration() throws IOException {
-        loadFile("classpath:clds/sdc-controllers-config.json");
-        assertEquals("sdc-controller1", sdcControllersConfiguration
-                .getSdcSingleControllerConfiguration("sdc-controller1").getSdcControllerName());
-        assertEquals("sdc-controller2", sdcControllersConfiguration
-                .getSdcSingleControllerConfiguration("sdc-controller2").getSdcControllerName());
-    }
-
-    @Test(expected = JsonSyntaxException.class)
-    public void testBadJsonLoading() throws IOException {
-        loadFile("classpath:clds/sdc-controllers-config-bad.json");
-        fail("Should have raised an exception");
-    }
-
-    @Test(expected = SdcParametersException.class)
-    public void testMissingParamInJsonLoading() throws IOException {
-        loadFile("classpath:clds/sdc-controllers-config-missing-param.json");
-        sdcControllersConfiguration.getAllDefinedControllers();
-        fail("Should have raised an exception");
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java b/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
deleted file mode 100644
index 787118902..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/it/sdc/controller/SdcSingleControllerItCase.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.it.sdc.controller;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.onap.policy.clamp.clds.config.ClampProperties;
-import org.onap.policy.clamp.clds.config.sdc.SdcSingleControllerConfigurationTest;
-import org.onap.policy.clamp.clds.exception.sdc.controller.SdcControllerException;
-import org.onap.policy.clamp.clds.sdc.controller.SdcSingleController;
-import org.onap.policy.clamp.clds.sdc.controller.SdcSingleControllerStatus;
-import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.policy.clamp.loop.CsarInstaller;
-import org.onap.sdc.api.notification.IArtifactInfo;
-import org.onap.sdc.api.notification.INotificationData;
-import org.onap.sdc.api.notification.IResourceInstance;
-import org.slf4j.MDC;
-import org.slf4j.spi.MDCAdapter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller"})
-public class SdcSingleControllerItCase {
-
-    private static final String CSAR_ARTIFACT_NAME = "testArtifact.csar";
-    private static final String SERVICE_UUID = "serviceUUID";
-    private static final String RESOURCE1_UUID = "resource1UUID";
-    private static final String RESOURCE1_INSTANCE_NAME = "sim-1802 0";
-
-    @Autowired
-    private ClampProperties clampProp;
-
-    private SdcSingleController sdcSingleController;
-
-    private CsarInstaller csarInstaller = mock(CsarInstaller.class);
-
-    private INotificationData buildFakeSdcNotification() {
-        // BUild what is needed for CSAR
-        IArtifactInfo serviceArtifact = mock(IArtifactInfo.class);
-        Mockito.when(serviceArtifact.getArtifactType()).thenReturn(CsarHandler.CSAR_TYPE);
-        Mockito.when(serviceArtifact.getArtifactName()).thenReturn(CSAR_ARTIFACT_NAME);
-        List<IArtifactInfo> servicesList = new ArrayList<>();
-        servicesList.add(serviceArtifact);
-        INotificationData notifData = mock(INotificationData.class);
-        Mockito.when(notifData.getServiceArtifacts()).thenReturn(servicesList);
-        // Build what is needed for UUID
-        Mockito.when(notifData.getServiceInvariantUUID()).thenReturn(SERVICE_UUID);
-        // Build fake resource with one artifact BLUEPRINT
-        IResourceInstance resource1 = mock(IResourceInstance.class);
-        Mockito.when(resource1.getResourceType()).thenReturn("VF");
-        Mockito.when(resource1.getResourceInvariantUUID()).thenReturn(RESOURCE1_UUID);
-        Mockito.when(resource1.getResourceInstanceName()).thenReturn(RESOURCE1_INSTANCE_NAME);
-        // Create a fake artifact for resource
-        IArtifactInfo blueprintArtifact = mock(IArtifactInfo.class);
-        Mockito.when(blueprintArtifact.getArtifactType()).thenReturn(CsarHandler.BLUEPRINT_TYPE);
-        List<IArtifactInfo> artifactsListForResource = new ArrayList<>();
-        artifactsListForResource.add(blueprintArtifact);
-        Mockito.when(resource1.getArtifacts()).thenReturn(artifactsListForResource);
-        List<IResourceInstance> resourcesList = new ArrayList<>();
-        resourcesList.add(resource1);
-        Mockito.when(notifData.getResources()).thenReturn(resourcesList);
-        return notifData;
-    }
-
-    /**
-     * Initialization method.
-     */
-    @Before
-    public void init() {
-        sdcSingleController = new SdcSingleController(clampProp, csarInstaller, SdcSingleControllerConfigurationTest
-                .loadControllerConfiguration("clds/sdc-controller-config-TLS.json", "sdc-controller1"), null) {
-        };
-    }
-
-    @Test
-    public void testTreatNotification() {
-        // when
-        sdcSingleController.treatNotification(buildFakeSdcNotification());
-        // then
-        Assertions.assertThat(sdcSingleController.getNbOfNotificationsOngoing()).isEqualTo(0);
-    }
-
-    @Test
-    public void testCloseSdc() throws SdcControllerException {
-        // when
-        sdcSingleController.closeSdc();
-        // then
-        assertThat(sdcSingleController.getControllerStatus()).isEqualTo(SdcSingleControllerStatus.STOPPED);
-    }
-
-    @Test
-    public void testActivateCallback() throws InvocationTargetException, IllegalAccessException, NoSuchMethodException,
-            InstantiationException, ClassNotFoundException {
-        // given
-
-        Class<?> innerClass = Class
-                .forName("org.onap.policy.clamp.clds.sdc.controller.SdcSingleController$SdcNotificationCallBack");
-        Constructor<?> constructor = innerClass.getDeclaredConstructor(SdcSingleController.class,
-                SdcSingleController.class);
-        constructor.setAccessible(true);
-        Object child = constructor.newInstance(sdcSingleController, sdcSingleController);
-        Method method = child.getClass().getDeclaredMethod("activateCallback", INotificationData.class);
-        method.setAccessible(true);
-        MDCAdapter mdcAdapter = MDC.getMDCAdapter();
-        // when
-        method.invoke(child, buildFakeSdcNotification());
-        // then
-        assertThat(mdcAdapter.get("ResponseCode")).isEqualTo("0");
-        assertThat(mdcAdapter.get("StatusCode")).isEqualTo("COMPLETE");
-        assertThat(mdcAdapter.get("ResponseDescription"))
-                .isEqualTo("SDC Notification received and processed successfully");
-        assertThat(mdcAdapter.get("ClassName")).isEqualTo(child.getClass().getName());
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java b/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
deleted file mode 100644
index f406e5ed2..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseCacheTestItCase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.model.dcae;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.ExchangeBuilder;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.HttpStatus;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class DcaeInventoryResponseCacheTestItCase {
-
-    public static DcaeInventoryCache inventoryCache = new DcaeInventoryCache();
-
-    @Autowired
-    CamelContext camelContext;
-
-    /**
-     * Initialize the responses.
-     */
-    @BeforeClass
-    public static void createExample() {
-        DcaeInventoryResponse response1 = new DcaeInventoryResponse();
-        response1.setAsdcServiceId("id1");
-        response1.setAsdcResourceId("0");
-        DcaeInventoryResponse response2 = new DcaeInventoryResponse();
-        response2.setAsdcServiceId("id1");
-        response2.setAsdcResourceId("1");
-        DcaeInventoryResponse response3 = new DcaeInventoryResponse();
-        response3.setAsdcServiceId("id1");
-        response3.setAsdcResourceId("2");
-        DcaeInventoryResponse response4 = new DcaeInventoryResponse();
-        response4.setAsdcServiceId("id2");
-        response4.setAsdcResourceId("0");
-        DcaeInventoryResponse response5 = new DcaeInventoryResponse();
-        response5.setAsdcServiceId("id2");
-        response5.setAsdcResourceId("1");
-
-        inventoryCache.addDcaeInventoryResponse(response1);
-        inventoryCache.addDcaeInventoryResponse(response3);
-        inventoryCache.addDcaeInventoryResponse(response2);
-        inventoryCache.addDcaeInventoryResponse(response4);
-        inventoryCache.addDcaeInventoryResponse(response5);
-    }
-
-    @Test
-    public void testGetAllLoopIds() {
-        assertThat(inventoryCache.getAllLoopIds().size()).isEqualTo(2);
-    }
-
-    @Test
-    public void testGetAllBlueprintsPerLoopId() {
-        int value = 0;
-        for (DcaeInventoryResponse inventoryResponse : inventoryCache.getAllBlueprintsPerLoopId("id1")) {
-            assertThat(Integer.valueOf(inventoryResponse.getAsdcResourceId())).isEqualTo(value++);
-        }
-
-        value = 0;
-        for (DcaeInventoryResponse inventoryResponse : inventoryCache.getAllBlueprintsPerLoopId("id2")) {
-            assertThat(Integer.valueOf(inventoryResponse.getAsdcResourceId())).isEqualTo(value++);
-        }
-    }
-
-    @Test
-    public void testDcaeInventoryResponse() {
-        Exchange exchange = ExchangeBuilder.anExchange(camelContext).build();
-        Exchange exchangeResponse = camelContext.createProducerTemplate()
-                .send("direct:get-all-dcae-blueprint-inventory", exchange);
-        assertThat(HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE))
-                .is2xxSuccessful()).isTrue();
-        Set<DcaeInventoryResponse> blueprint = inventoryCache.getAllBlueprintsPerLoopId("testAsdcServiceId");
-        assertThat(blueprint.size()).isEqualTo(2);
-
-        DcaeInventoryResponse response1 = new DcaeInventoryResponse();
-        response1.setAsdcResourceId("0");
-        response1.setTypeName("testTypeName");
-        response1.setAsdcServiceId("testAsdcServiceId");
-        response1.setBlueprintTemplate("testBlueprintTemplate");
-        response1.setTypeId("testtypeId");
-        DcaeInventoryResponse response2 = new DcaeInventoryResponse();
-        response2.setAsdcResourceId("1");
-        response2.setTypeName("testTypeName2");
-        response2.setAsdcServiceId("testAsdcServiceId");
-        response2.setBlueprintTemplate("testBlueprintTemplate2");
-        response2.setTypeId("testtypeId2");
-
-        Set<DcaeInventoryResponse> expectedBlueprint = new HashSet<>();
-        expectedBlueprint.add(response1);
-        expectedBlueprint.add(response2);
-
-        assertEquals(blueprint, expectedBlueprint);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java b/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
deleted file mode 100644
index a246e0efa..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/model/dcae/DcaeInventoryResponseTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.model.dcae;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.TreeSet;
-import org.junit.Test;
-
-public class DcaeInventoryResponseTest {
-
-    @Test
-    public void testComparator() {
-        DcaeInventoryResponse response1 = new DcaeInventoryResponse();
-        response1.setAsdcServiceId("id1");
-        response1.setAsdcResourceId("0");
-        DcaeInventoryResponse response2 = new DcaeInventoryResponse();
-        response2.setAsdcServiceId("id2");
-        response2.setAsdcResourceId("1");
-        DcaeInventoryResponse response3 = new DcaeInventoryResponse();
-        response3.setAsdcServiceId("id3");
-        response3.setAsdcResourceId("2");
-        DcaeInventoryResponse response4 = new DcaeInventoryResponse();
-        response4.setAsdcServiceId("id4");
-        response4.setAsdcResourceId("3");
-
-        TreeSet<DcaeInventoryResponse> responseSet = new TreeSet<>();
-        responseSet.add(response4);
-        responseSet.add(response3);
-        responseSet.add(response1);
-        responseSet.add(response2);
-
-        int value = 0;
-        for (DcaeInventoryResponse inventoryResponse : responseSet) {
-            assertThat(Integer.valueOf(inventoryResponse.getAsdcResourceId()) == value++).isTrue();
-        }
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java b/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
deleted file mode 100644
index 7999709c2..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/model/jsontype/JsonTypeDescriptorTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Samsung. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.model.jsontype;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonObject;
-import org.hibernate.HibernateException;
-import org.junit.Test;
-import org.onap.policy.clamp.dao.model.jsontype.JsonTypeDescriptor;
-
-public class JsonTypeDescriptorTest {
-
-    private JsonTypeDescriptor descriptor = new JsonTypeDescriptor();
-
-    @Test
-    public void testFromString() {
-        JsonObject object = new JsonObject();
-        object.addProperty("one", "oneValue");
-        JsonObject child = new JsonObject();
-        child.addProperty("two", "twoValue");
-        object.add("child", child);
-
-        JsonObject jsonResult = descriptor.fromString("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
-
-        assertThat(jsonResult).isEqualTo(object);
-    }
-
-    @Test
-    public void testUnwrap() {
-        JsonObject res1 = descriptor.unwrap(null, null, null);
-        assertThat(res1).isNull();
-
-        JsonObject object = new JsonObject();
-        object.addProperty("one", "oneValue");
-        JsonObject child = new JsonObject();
-        child.addProperty("two", "twoValue");
-        object.add("child", child);
-        String res2 = descriptor.unwrap(object, String.class, null);
-        assertThat(res2.replace("\n", "").replace(" ", ""))
-                .isEqualTo("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
-
-        Object res3 = descriptor.unwrap(object, JsonObject.class, null);
-        String res3Str = ((String) res3).replace(" ", "").replace("\\n", "").replace("\\", "")
-                .replace("\"{", "{").replace("}\"", "}");
-        assertThat(res3Str).isEqualTo("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}");
-    }
-
-    @Test(expected = HibernateException.class)
-    public void testUnwrapExpectationThrown() {
-        JsonObject object = new JsonObject();
-        object.addProperty("one", "oneValue");
-
-        descriptor.unwrap(object, Integer.class, null);
-    }
-
-    @Test
-    public void testWrap() {
-        JsonObject res1 = descriptor.wrap(null, null);
-        assertThat(res1).isNull();
-
-        JsonObject object = new JsonObject();
-        object.addProperty("one", "oneValue");
-        JsonObject child = new JsonObject();
-        child.addProperty("two", "twoValue");
-        object.add("child", child);
-        JsonObject res2 = descriptor.wrap("{\"one\":\"oneValue\",\"child\":{\"two\":\"twoValue\"}}", null);
-        assertThat(res2).isEqualTo(object);
-    }
-
-    @Test(expected = HibernateException.class)
-    public void testWrapExpectationThrown() {
-        descriptor.wrap(1, null);
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
deleted file mode 100644
index 085b3d187..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/BlueprintParserTest.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.sdc.controller.installer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import org.json.JSONObject;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.yaml.snakeyaml.Yaml;
-
-public class BlueprintParserTest {
-    private static final Gson GSON = new Gson();
-    private static final String FIRST_APPP = "first_app";
-    private static final String SECOND_APPP = "second_app";
-    private static final String THIRD_APPP = "third_app";
-    private static final String MODEL_TYPE1 = "type1";
-    private static final String MODEL_TYPE_TCA = "onap.policies.monitoring.cdap.tca.hi.lo.app";
-    private static final String VERSION = "1.0.0";
-
-    private static String microServiceTheWholeBlueprintValid;
-    private static String newMicroServiceBlueprint;
-    private static JsonObject jsonObjectBlueprintInvalid;
-    private static JsonObject jsonObjectBlueprintWithoutName;
-    private static JsonObject jsonObjectBlueprintWithoutProperties;
-    private static JsonObject jsonObjectBlueprintWithoutRelationships;
-    private static JsonObject jsonObjectBlueprintValidWithVersion;
-
-    /**
-     * Method to load Blueprints before all test.
-     *
-     * @throws IOException In case of issues when opening the files
-     */
-    @BeforeClass
-    public static void loadBlueprints() throws IOException {
-        microServiceTheWholeBlueprintValid = ResourceFileUtils
-                .getResourceAsString("clds/blueprint-with-microservice-chain.yaml");
-
-        newMicroServiceBlueprint = ResourceFileUtils.getResourceAsString("clds/new-microservice.yaml");
-
-        String microServiceBlueprintInvalid = ResourceFileUtils
-                .getResourceAsString("clds/single-microservice-fragment-invalid.yaml");
-        jsonObjectBlueprintInvalid = yamlToJson(microServiceBlueprintInvalid);
-        String microServiceBlueprintWithoutName = ResourceFileUtils
-                .getResourceAsString("clds/single-microservice-fragment-without-name.yaml");
-        jsonObjectBlueprintWithoutName = yamlToJson(microServiceBlueprintWithoutName);
-        String microServiceBlueprintWithoutProperties = ResourceFileUtils
-                .getResourceAsString("clds/single-microservice-fragment-without-properties.yaml");
-        jsonObjectBlueprintWithoutProperties = yamlToJson(microServiceBlueprintWithoutProperties);
-        String microServiceBlueprintValidWithVersion = ResourceFileUtils
-                .getResourceAsString("clds/single-microservice-fragment-valid-with-version.yaml");
-        jsonObjectBlueprintValidWithVersion = yamlToJson(microServiceBlueprintValidWithVersion);
-
-        String microServiceBlueprintWithoutRelationships = ResourceFileUtils
-                .getResourceAsString("clds/single-microservice-fragment-without-relationships.yaml");
-        jsonObjectBlueprintWithoutRelationships = yamlToJson(microServiceBlueprintWithoutRelationships);
-
-    }
-
-    @Test
-    public void getNameShouldReturnDefinedName() {
-        final JsonObject jsonObject = jsonObjectBlueprintInvalid;
-        String expectedName = jsonObject.get(jsonObject.keySet().iterator().next()).getAsJsonObject().get("properties")
-                .getAsJsonObject().get("name").getAsString();
-        Entry<String, JsonElement> entry = jsonObject.entrySet().iterator().next();
-        String actualName = BlueprintParser.getName(entry);
-
-        Assert.assertEquals(expectedName, actualName);
-    }
-
-    @Test
-    public void getNameShouldReturnServiceNameWhenNoNameDefined() {
-        final JsonObject jsonObject = jsonObjectBlueprintWithoutName;
-
-        String expectedName = jsonObject.keySet().iterator().next();
-        Entry<String, JsonElement> entry = jsonObject.entrySet().iterator().next();
-        String actualName = BlueprintParser.getName(entry);
-
-        Assert.assertEquals(expectedName, actualName);
-    }
-
-    @Test
-    public void getNameShouldReturnServiceNameWhenNoPropertiesDefined() {
-        final JsonObject jsonObject = jsonObjectBlueprintWithoutProperties;
-
-        String expectedName = jsonObject.keySet().iterator().next();
-        Entry<String, JsonElement> entry = jsonObject.entrySet().iterator().next();
-        String actualName = BlueprintParser.getName(entry);
-
-        Assert.assertEquals(expectedName, actualName);
-    }
-
-    @Test
-    public void getInputShouldReturnInputWhenPresent() {
-        final JsonObject jsonObject = jsonObjectBlueprintInvalid;
-
-        String expected = FIRST_APPP;
-        Entry<String, JsonElement> entry = jsonObject.entrySet().iterator().next();
-        String actual = BlueprintParser.getInput(entry);
-
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void getInputShouldReturnEmptyStringWhenAbsent() {
-        final JsonObject jsonObject = jsonObjectBlueprintWithoutRelationships;
-
-        String expected = "";
-        Entry<String, JsonElement> entry = jsonObject.entrySet().iterator().next();
-        String actual = BlueprintParser.getInput(entry);
-
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test(expected = BlueprintParserException.class)
-    public void getNodeRepresentationFromIncompleteYaml() throws BlueprintParserException {
-        BlueprintParser.getNodeRepresentation(jsonObjectBlueprintInvalid.entrySet().iterator().next(),
-                jsonObjectBlueprintInvalid, null);
-    }
-
-    @Test
-    public void getNodeRepresentationFromCompleteYamlWithModelVersion() throws BlueprintParserException {
-        final JsonObject jsonObject = jsonObjectBlueprintValidWithVersion;
-
-        BlueprintMicroService expected = new BlueprintMicroService(SECOND_APPP, MODEL_TYPE1, "", "10.0.0");
-        Entry<String, JsonElement> entry = jsonObject.entrySet().iterator().next();
-        BlueprintMicroService actual = BlueprintParser.getNodeRepresentation(entry, jsonObject, null);
-
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void getMicroServicesFromBlueprintTest() throws BlueprintParserException {
-        BlueprintMicroService thirdApp = new BlueprintMicroService(THIRD_APPP, MODEL_TYPE_TCA, SECOND_APPP, VERSION);
-        BlueprintMicroService firstApp = new BlueprintMicroService(FIRST_APPP, MODEL_TYPE_TCA, "", VERSION);
-        BlueprintMicroService secondApp = new BlueprintMicroService(SECOND_APPP, MODEL_TYPE_TCA, FIRST_APPP, VERSION);
-
-        Set<BlueprintMicroService> expected = new HashSet<>(Arrays.asList(firstApp, secondApp, thirdApp));
-        Set<BlueprintMicroService> actual = BlueprintParser.getMicroServices(microServiceTheWholeBlueprintValid);
-
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void fallBackToOneMicroServiceTcaTest() {
-        BlueprintMicroService tcaMs = new BlueprintMicroService(BlueprintParser.TCA,
-                "onap.policies.monitoring.cdap.tca.hi.lo.app", "", VERSION);
-        List<BlueprintMicroService> expected = Collections.singletonList(tcaMs);
-        List<BlueprintMicroService> actual = BlueprintParser.fallbackToOneMicroService();
-
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void newMicroServiceTest() throws BlueprintParserException {
-        List<BlueprintMicroService> microServicesChain = new ChainGenerator()
-                .getChainOfMicroServices(BlueprintParser.getMicroServices(newMicroServiceBlueprint));
-        if (microServicesChain.isEmpty()) {
-            microServicesChain = BlueprintParser.fallbackToOneMicroService();
-        }
-        assertThat(microServicesChain.size()).isEqualTo(1);
-        assertThat(microServicesChain.get(0).getName()).isEqualTo("pmsh");
-    }
-
-    private static JsonObject yamlToJson(String yamlString) {
-        Yaml yaml = new Yaml();
-        Map<String, Object> map = yaml.load(yamlString);
-        JSONObject jsonObject = new JSONObject(map);
-        return GSON.fromJson(jsonObject.toString(), JsonObject.class);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
deleted file mode 100644
index d7a3b3823..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/ChainGeneratorTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.sdc.controller.installer;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class ChainGeneratorTest {
-    private static final String FIRST_APPP = "first_app";
-    private static final String SECOND_APPP = "second_app";
-    private static final String THIRD_APPP = "third_app";
-    private static final String FOURTH_APPP = "fourth_app";
-    private static final String DEFAULT_VERSION = "1.0.0";
-
-    @Test
-    public void getChainOfMicroServicesTest() {
-        BlueprintMicroService ms1 = new BlueprintMicroService(FIRST_APPP, "", "", DEFAULT_VERSION);
-        BlueprintMicroService ms2 = new BlueprintMicroService(SECOND_APPP, "", FIRST_APPP, DEFAULT_VERSION);
-        BlueprintMicroService ms3 = new BlueprintMicroService(THIRD_APPP, "", SECOND_APPP, DEFAULT_VERSION);
-        BlueprintMicroService ms4 = new BlueprintMicroService(FOURTH_APPP, "", THIRD_APPP, DEFAULT_VERSION);
-
-        List<BlueprintMicroService> expectedList = Arrays.asList(ms1, ms2, ms3, ms4);
-        Set<BlueprintMicroService> inputSet = new HashSet<>(expectedList);
-
-        List<BlueprintMicroService> actualList = new ChainGenerator().getChainOfMicroServices(inputSet);
-        Assert.assertEquals(expectedList, actualList);
-    }
-
-    @Test
-    public void getChainOfMicroServicesTwiceNoInputTest() {
-        BlueprintMicroService ms1 = new BlueprintMicroService(FIRST_APPP, "", "", DEFAULT_VERSION);
-        BlueprintMicroService ms2 = new BlueprintMicroService(SECOND_APPP, "", "", DEFAULT_VERSION);
-        BlueprintMicroService ms3 = new BlueprintMicroService(THIRD_APPP, "", SECOND_APPP, DEFAULT_VERSION);
-        BlueprintMicroService ms4 = new BlueprintMicroService(FOURTH_APPP, "", FIRST_APPP, DEFAULT_VERSION);
-
-        Set<BlueprintMicroService> inputSet = new HashSet<>(Arrays.asList(ms1, ms2, ms3, ms4));
-        List<BlueprintMicroService> actualList = new ChainGenerator().getChainOfMicroServices(inputSet);
-        Assert.assertTrue(actualList.isEmpty());
-    }
-
-    @Test
-    public void getChainOfMicroServicesBranchingTest() {
-        BlueprintMicroService ms1 = new BlueprintMicroService(FIRST_APPP, "", "", DEFAULT_VERSION);
-        BlueprintMicroService ms2 = new BlueprintMicroService(SECOND_APPP, "", FIRST_APPP, DEFAULT_VERSION);
-        BlueprintMicroService ms3 = new BlueprintMicroService(THIRD_APPP, "", FIRST_APPP, DEFAULT_VERSION);
-        BlueprintMicroService ms4 = new BlueprintMicroService(FOURTH_APPP, "", FIRST_APPP, DEFAULT_VERSION);
-
-        Set<BlueprintMicroService> inputSet = new HashSet<>(Arrays.asList(ms1, ms2, ms3, ms4));
-        List<BlueprintMicroService> actualList = new ChainGenerator().getChainOfMicroServices(inputSet);
-        Assert.assertTrue(actualList.isEmpty());
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java b/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
deleted file mode 100644
index 08e425abf..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/sdc/controller/installer/CsarHandlerTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.sdc.controller.installer;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.policy.clamp.clds.exception.sdc.controller.CsarHandlerException;
-import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.sdc.api.notification.IArtifactInfo;
-import org.onap.sdc.api.notification.INotificationData;
-import org.onap.sdc.api.notification.IResourceInstance;
-import org.onap.sdc.api.results.IDistributionClientDownloadResult;
-import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
-
-public class CsarHandlerTest {
-
-    private static final String SDC_FOLDER = "/tmp/csar-handler-tests";
-    private static final String CSAR_ARTIFACT_NAME = "testArtifact.csar";
-    private static final String SERVICE_UUID = "serviceUUID";
-    private static final String RESOURCE1_UUID = "resource1UUID";
-    private static final String RESOURCE1_INSTANCE_NAME = "sim-1802 0";
-    private static final String RESOURCE1_INSTANCE_NAME_IN_CSAR = "sim18020";
-    private static final String BLUEPRINT1_NAME = "FOI.Simfoimap223S0112.event_proc_bp.yaml";
-    private static final String BLUEPRINT2_NAME = "FOI.Simfoimap223S0112.event_proc_bp2.yaml";
-
-    @Test
-    public void testConstructor() throws CsarHandlerException {
-        IArtifactInfo serviceArtifact = Mockito.mock(IArtifactInfo.class);
-        Mockito.when(serviceArtifact.getArtifactType()).thenReturn(CsarHandler.CSAR_TYPE);
-        Mockito.when(serviceArtifact.getArtifactName()).thenReturn(CSAR_ARTIFACT_NAME);
-        List<IArtifactInfo> servicesList = new ArrayList<>();
-        servicesList.add(serviceArtifact);
-        INotificationData notifData = Mockito.mock(INotificationData.class);
-        Mockito.when(notifData.getServiceArtifacts()).thenReturn(servicesList);
-        CsarHandler csar = new CsarHandler(notifData, "test-controller", SDC_FOLDER);
-        assertEquals(SDC_FOLDER + "/test-controller" + "/" + CSAR_ARTIFACT_NAME, csar.getFilePath());
-    }
-
-    @Test(expected = CsarHandlerException.class)
-    public void testFailingConstructor() throws CsarHandlerException {
-        INotificationData notifData = Mockito.mock(INotificationData.class);
-        Mockito.when(notifData.getServiceArtifacts()).thenReturn(new ArrayList<>());
-        new CsarHandler(notifData, "test-controller", "/tmp/csar-handler-tests");
-        fail("Exception should have been raised");
-    }
-
-    private INotificationData buildFakeSdcNotification() {
-        // BUild what is needed for CSAR
-        IArtifactInfo serviceArtifact = Mockito.mock(IArtifactInfo.class);
-        Mockito.when(serviceArtifact.getArtifactType()).thenReturn(CsarHandler.CSAR_TYPE);
-        Mockito.when(serviceArtifact.getArtifactName()).thenReturn(CSAR_ARTIFACT_NAME);
-        List<IArtifactInfo> servicesList = new ArrayList<>();
-        servicesList.add(serviceArtifact);
-        INotificationData notifData = Mockito.mock(INotificationData.class);
-        Mockito.when(notifData.getServiceArtifacts()).thenReturn(servicesList);
-        // Build what is needed for UUID
-        Mockito.when(notifData.getServiceInvariantUUID()).thenReturn(SERVICE_UUID);
-        // Build fake resource with one artifact BLUEPRINT
-        IResourceInstance resource1 = Mockito.mock(IResourceInstance.class);
-        Mockito.when(resource1.getResourceType()).thenReturn("VF");
-        Mockito.when(resource1.getResourceInvariantUUID()).thenReturn(RESOURCE1_UUID);
-        Mockito.when(resource1.getResourceInstanceName()).thenReturn(RESOURCE1_INSTANCE_NAME);
-        // Create a fake artifact for resource
-        IArtifactInfo blueprintArtifact = Mockito.mock(IArtifactInfo.class);
-        Mockito.when(blueprintArtifact.getArtifactType()).thenReturn(CsarHandler.BLUEPRINT_TYPE);
-        List<IArtifactInfo> artifactsListForResource = new ArrayList<>();
-        artifactsListForResource.add(blueprintArtifact);
-        Mockito.when(resource1.getArtifacts()).thenReturn(artifactsListForResource);
-        List<IResourceInstance> resourcesList = new ArrayList<>();
-        resourcesList.add(resource1);
-        Mockito.when(notifData.getResources()).thenReturn(resourcesList);
-        return notifData;
-    }
-
-    private IDistributionClientDownloadResult buildFakeSdcResut() throws IOException {
-        IDistributionClientDownloadResult resultArtifact = Mockito.mock(IDistributionClientDownloadResult.class);
-        Mockito.when(resultArtifact.getArtifactPayload()).thenReturn(
-            IOUtils.toByteArray(ResourceFileUtils.getResourceAsStream("example/sdc/service-Simsfoimap0112.csar")));
-        return resultArtifact;
-    }
-
-    private IDistributionClientDownloadResult buildFakeSdcResultWithoutPolicyModel() throws IOException {
-        IDistributionClientDownloadResult resultArtifact = Mockito.mock(IDistributionClientDownloadResult.class);
-        Mockito.when(resultArtifact.getArtifactPayload()).thenReturn(
-            IOUtils.toByteArray(ResourceFileUtils.getResourceAsStream("example/sdc/service-without-policy.csar")));
-        return resultArtifact;
-    }
-
-    @Test
-    public void testSave()
-        throws SdcArtifactInstallerException, SdcToscaParserException, CsarHandlerException, IOException {
-        CsarHandler csar = new CsarHandler(buildFakeSdcNotification(), "test-controller", "/tmp/csar-handler-tests");
-        // Test the save
-        csar.save(buildFakeSdcResut());
-        assertTrue((new File(SDC_FOLDER + "/test-controller/" + CSAR_ARTIFACT_NAME)).exists());
-        assertEquals(CSAR_ARTIFACT_NAME, csar.getArtifactElement().getArtifactName());
-        assertNotNull(csar.getSdcCsarHelper());
-        // Test dcaeBlueprint
-        String blueprint = csar.getMapOfBlueprints().get(BLUEPRINT1_NAME).getDcaeBlueprint();
-        assertNotNull(blueprint);
-        assertTrue(!blueprint.isEmpty());
-        assertTrue(blueprint.contains("DCAE-VES-PM-EVENT-v1"));
-        // Test additional properties from Sdc notif
-        assertEquals(BLUEPRINT1_NAME, csar.getMapOfBlueprints().get(BLUEPRINT1_NAME).getBlueprintArtifactName());
-        assertEquals(RESOURCE1_UUID,
-            csar.getMapOfBlueprints().get(BLUEPRINT1_NAME).getResourceAttached().getResourceInvariantUUID());
-        assertEquals(SERVICE_UUID, csar.getMapOfBlueprints().get(BLUEPRINT1_NAME).getBlueprintInvariantServiceUuid());
-
-        // Just check the second one is there as well
-        assertEquals(BLUEPRINT2_NAME, csar.getMapOfBlueprints().get(BLUEPRINT2_NAME).getBlueprintArtifactName());
-        blueprint = csar.getMapOfBlueprints().get(BLUEPRINT2_NAME).getDcaeBlueprint();
-        assertNotNull(blueprint);
-        assertTrue(!blueprint.isEmpty());
-        assertTrue(blueprint.contains("DCAE-VES-PM-EVENT-v1"));
-        // Do some cleanup
-        Path path = Paths.get(SDC_FOLDER + "/test-controller/" + CSAR_ARTIFACT_NAME);
-        Files.deleteIfExists(path);
-
-    }
-
-    @Test
-    public void testLoadingOfPolicyModelFromCsar()
-        throws CsarHandlerException, IOException, SdcArtifactInstallerException, SdcToscaParserException {
-        CsarHandler csar = new CsarHandler(buildFakeSdcNotification(), "test-controller", "/tmp/csar-handler-tests");
-        csar.save(buildFakeSdcResut());
-        String policyModelYaml = csar.getPolicyModelYaml().get();
-        assertTrue(policyModelYaml.contains("tosca_simple_yaml_1_0_0"));
-    }
-
-    @Test
-    public void testLoadingOfNonexistentPolicyModelFromCsar()
-        throws CsarHandlerException, IOException, SdcArtifactInstallerException, SdcToscaParserException {
-        CsarHandler csar = new CsarHandler(buildFakeSdcNotification(), "test-controller", "/tmp/csar-handler-tests");
-        csar.save(buildFakeSdcResultWithoutPolicyModel());
-        assertFalse(csar.getPolicyModelYaml().isPresent());
-    }
-
-    @Test
-    public void testDoubleSave()
-        throws SdcArtifactInstallerException, SdcToscaParserException, CsarHandlerException, IOException {
-        CsarHandler csar = new CsarHandler(buildFakeSdcNotification(), "test-controller", "/tmp/csar-handler-tests");
-        // Test the save
-        csar.save(buildFakeSdcResut());
-        assertTrue((new File(SDC_FOLDER + "/test-controller/" + CSAR_ARTIFACT_NAME)).exists());
-        assertEquals(CSAR_ARTIFACT_NAME, csar.getArtifactElement().getArtifactName());
-        assertNotNull(csar.getSdcCsarHelper());
-        // Test dcaeBlueprint
-        String blueprint = csar.getMapOfBlueprints().get(BLUEPRINT1_NAME).getDcaeBlueprint();
-        assertNotNull(blueprint);
-        assertTrue(!blueprint.isEmpty());
-        assertTrue(blueprint.contains("DCAE-VES-PM-EVENT-v1"));
-        // Test additional properties from Sdc notif
-        assertEquals(BLUEPRINT1_NAME, csar.getMapOfBlueprints().get(BLUEPRINT1_NAME).getBlueprintArtifactName());
-        assertEquals(RESOURCE1_UUID,
-            csar.getMapOfBlueprints().get(BLUEPRINT1_NAME).getResourceAttached().getResourceInvariantUUID());
-        assertEquals(SERVICE_UUID, csar.getMapOfBlueprints().get(BLUEPRINT1_NAME).getBlueprintInvariantServiceUuid());
-        Path path = Paths.get(SDC_FOLDER + "/test-controller/" + CSAR_ARTIFACT_NAME);
-        // A double save should simply overwrite the existing
-        csar.save(buildFakeSdcResut());
-        // Do some cleanup
-        Files.deleteIfExists(path);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java b/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
deleted file mode 100644
index f70e74cd6..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/DictionaryRepositoriesTestItCase.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.tosca;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.tosca.Dictionary;
-import org.onap.policy.clamp.tosca.DictionaryElement;
-import org.onap.policy.clamp.tosca.DictionaryRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-public class DictionaryRepositoriesTestItCase {
-    @Autowired
-    private DictionaryRepository dictionaryRepository;
-
-    @Test
-    @Transactional
-    public void crudTest() {
-        // Setup
-        Dictionary dictionaryTest1 = new Dictionary();
-        dictionaryTest1.setName("testDictionary1");
-        dictionaryTest1.setSecondLevelDictionary(1);
-        dictionaryTest1.setSubDictionaryType("testType");
-
-        DictionaryElement element1 = new DictionaryElement();
-        element1.setName("element1");
-        element1.setShortName("shortName1");
-        element1.setType("type1");
-        element1.setDescription("description1");
-
-        dictionaryTest1.addDictionaryElements(element1);
-
-        Dictionary dictionaryTest2 = new Dictionary();
-        dictionaryTest2.setName("testDictionary2");
-        dictionaryTest2.setSecondLevelDictionary(1);
-        dictionaryTest2.setSubDictionaryType("testType");
-
-        DictionaryElement element2 = new DictionaryElement();
-        element2.setName("element2");
-        element2.setShortName("shortName2");
-        element2.setSubDictionary("testDictionary1");
-        element2.setType("type2");
-        element2.setDescription("description2");
-
-        dictionaryTest2.addDictionaryElements(element2);
-
-        dictionaryRepository.save(dictionaryTest1);
-        List<String> res1 = dictionaryRepository.getAllDictionaryNames();
-        assertThat(res1.size()).isGreaterThanOrEqualTo(1);
-        assertThat(res1).contains("testDictionary1");
-
-        dictionaryRepository.save(dictionaryTest2);
-        List<String> res2 = dictionaryRepository.getAllDictionaryNames();
-        assertThat(res2.size()).isGreaterThanOrEqualTo(2);
-        assertThat(res2).contains("testDictionary1");
-        assertThat(res2).contains("testDictionary2");
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java
deleted file mode 100644
index 6f6f5c104..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ArrayFieldTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.tosca.update;
-
-import com.google.gson.JsonArray;
-import java.io.IOException;
-import java.util.ArrayList;
-import junit.framework.TestCase;
-import org.onap.policy.clamp.clds.tosca.update.elements.ArrayField;
-import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-
-public class ArrayFieldTest extends TestCase {
-
-    /**
-     * Test the deploy method.
-     *
-     * @throws IOException in case of failure
-     */
-    public void testDeploy() throws IOException {
-        JsonTemplateManager jsonTemplateManager = new JsonTemplateManager(ResourceFileUtils.getResourceAsString(
-                "tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml"), ResourceFileUtils.getResourceAsString(
-                "clds/tosca-converter/default-tosca-types.yaml"),
-                ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Actor");
-        ToscaElementProperty toscaElementProperty = toscaElement.getProperties().get("actor");
-        ArrayField arrayParser = new ArrayField((ArrayList<Object>) toscaElementProperty.getItems().get("default"));
-        JsonArray toTest = arrayParser.deploy();
-        String reference = "[1,\"String\",5.5,true]";
-        assertEquals(reference, String.valueOf(toTest));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java
deleted file mode 100644
index 493ee992c..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ConstraintTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.tosca.update;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.ArrayList;
-import junit.framework.TestCase;
-import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-
-public class ConstraintTest extends TestCase {
-
-    JsonTemplateManager jsonTemplateManager = new JsonTemplateManager(
-            ResourceFileUtils.getResourceAsString("tosca/new-converter/constraints.yaml"),
-            ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-            ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-
-    ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Operation");
-
-    public ConstraintTest() throws IOException {
-    }
-
-    /**
-     * Test get value array.
-     */
-    public void testGetValuesArray() {
-        ToscaElementProperty toscaElementProperty = toscaElement.getProperties().get("timeout");
-        JsonTemplate jsonTemplate = jsonTemplateManager.getJsonSchemaTemplates().get("integer");
-        JsonObject resultProcess = new JsonObject();
-        toscaElementProperty.addConstraintsAsJson(resultProcess,
-                (ArrayList<Object>) toscaElementProperty.getItems().get("constraints"),
-                jsonTemplate);
-        String reference = "{\"enum\":[3,4,5.5,6,10]}";
-        assertEquals(reference, String.valueOf(resultProcess));
-        toscaElementProperty = toscaElement.getProperties().get("success");
-        jsonTemplate = jsonTemplateManager.getJsonSchemaTemplates().get("string");
-        resultProcess = new JsonObject();
-        toscaElementProperty.addConstraintsAsJson(resultProcess,
-                (ArrayList<Object>) toscaElementProperty.getItems().get("constraints"),
-                jsonTemplate);
-        reference = "{\"enum\":[\"VALID\",\"TERMINATED\"]}";
-        assertEquals(reference, String.valueOf(resultProcess));
-    }
-
-    /**
-     * Test get Specific length.
-     */
-    public void testGetSpecificLength() {
-        //Test for string type, same process for array
-        ToscaElementProperty toscaElementProperty = toscaElement.getProperties().get("id");
-        JsonTemplate jsonTemplate = jsonTemplateManager.getJsonSchemaTemplates().get("string");
-        JsonObject resultProcess = new JsonObject();
-        toscaElementProperty.addConstraintsAsJson(resultProcess,
-                (ArrayList<Object>) toscaElementProperty.getItems().get("constraints"),
-                jsonTemplate);
-        int specificLength = 8;
-        int toTest = resultProcess.get("minLength").getAsInt();
-        assertEquals(specificLength, toTest);
-        toTest = resultProcess.get("maxLength").getAsInt();
-        assertEquals(specificLength, toTest);
-    }
-
-    /**
-     * Test get limit value.
-     */
-    public void testGetLimitValue() {
-        //Test for array type, same process for string
-        ToscaElementProperty toscaElementProperty = toscaElement.getProperties().get("description");
-        JsonTemplate jsonTemplate = jsonTemplateManager.getJsonSchemaTemplates().get("array");
-        JsonObject resultProcess = new JsonObject();
-        toscaElementProperty.addConstraintsAsJson(resultProcess,
-                (ArrayList<Object>) toscaElementProperty.getItems().get("constraints"),
-                jsonTemplate);
-
-        int toTest = resultProcess.get("minItems").getAsInt();
-        assertEquals(5, toTest);
-        toTest = resultProcess.get("maxItems").getAsInt();
-        assertEquals(7, toTest);
-    }
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java
deleted file mode 100644
index 3eaa0ce51..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateFieldTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.tosca.update;
-
-import junit.framework.TestCase;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateField;
-
-public class JsonTemplateFieldTest extends TestCase {
-
-    JsonTemplateField field1 = new JsonTemplateField("type", "testType", true, true);
-    JsonTemplateField field2 = new JsonTemplateField("type");
-    JsonTemplateField field3 = new JsonTemplateField("type", "testType1", true, true);
-    JsonTemplateField field4 = new JsonTemplateField("type", "testType", false, true);
-    JsonTemplateField field5 = new JsonTemplateField("type", "testType", true, false);
-    JsonTemplateField field6 = new JsonTemplateField("type", "testType", true, true);
-
-    /**
-     * Test fieldsEqual method.
-     */
-    public void testFieldsEqualsMethod() {
-        assertFalse(JsonTemplateField.fieldsEquals(field1, field3));
-        assertFalse(JsonTemplateField.fieldsEquals(field1, field4));
-        assertFalse(JsonTemplateField.fieldsEquals(field1, field5));
-        assertTrue(JsonTemplateField.fieldsEquals(field1, field6));
-    }
-
-    /**
-     * Test equals method.
-     */
-    public void testEqualsMethod() {
-        assertTrue(field1.equals(field2));
-        assertTrue(field1.equals(field3));
-        assertTrue(field1.equals(field4));
-        assertTrue(field1.equals(field5));
-        assertTrue(field1.equals(field6));
-    }
-
-    /**
-     * Test compareWithField method.
-     */
-    public void testCompareWithFieldMethod() {
-        assertFalse(field1.compareWithField(field2));
-        assertFalse(field1.compareWithField(field3));
-        assertFalse(field1.compareWithField(field4));
-        assertFalse(field1.compareWithField(field5));
-        assertTrue(field1.equals(field6));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java
deleted file mode 100644
index 2c8744f33..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateManagerTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.tosca.update;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import junit.framework.TestCase;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateField;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-
-public class JsonTemplateManagerTest extends TestCase {
-
-    /**
-     * Test the launch translation wit operational policies.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslationTca() throws IOException, UnknownComponentException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file"),
-                        ResourceFileUtils.getResourceAsString(
-                                "clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        String componentName = "onap.policies.monitoring.cdap.tca.hi.lo.app";
-        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
-    }
-
-    /**
-     * Test the launch translation wit operational policies.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslationFrequencyLimiter() throws IOException, UnknownComponentException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file"),
-                        ResourceFileUtils.getResourceAsString(
-                                "clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        String componentName = "onap.policies.controlloop.guard.common.FrequencyLimiter";
-        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
-    }
-
-    /**
-     * Test the launch translation wit operational policies.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslationApex() throws IOException, UnknownComponentException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.operational.common.Apex/versions/1.0.0/.file"),
-                        ResourceFileUtils.getResourceAsString(
-                                "clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        String componentName = "onap.policies.controlloop.operational.common.Apex";
-        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
-    }
-
-    /**
-     * Test the launch translation wit operational policies.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslationDrools() throws IOException, UnknownComponentException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.operational.common.Drools/versions/1.0.0/.file"),
-                        ResourceFileUtils.getResourceAsString(
-                                "clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        String componentName = "onap.policies.controlloop.operational.common.Drools";
-        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
-    }
-
-
-    /**
-     * Test the launch translation.
-     *
-     * @throws IOException               In case of failure
-     * @throws UnknownComponentException In case of failure
-     */
-    public void testLaunchTranslation() throws IOException, UnknownComponentException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        String componentName = "onap.policies.controlloop.operational.common.Drools";
-        jsonTemplateManager.getJsonSchemaForPolicyType(componentName, null, null);
-    }
-
-    /**
-     * Test addTemplate.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testAddTemplate() throws IOException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        int count = jsonTemplateManager.getJsonSchemaTemplates().size();
-        List<JsonTemplateField>
-                jsonTemplateFields =
-                new ArrayList<>(Arrays.asList(new JsonTemplateField("type"), new JsonTemplateField("description"),
-                        new JsonTemplateField(
-                                "required"),
-                        new JsonTemplateField("metadata"), new JsonTemplateField("constraints")));
-        jsonTemplateManager.addTemplate("test", jsonTemplateFields);
-        assertNotSame(count, jsonTemplateManager.getJsonSchemaTemplates().size());
-    }
-
-    /**
-     * test Remove template.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testRemoveTemplate() throws IOException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        int count = jsonTemplateManager.getJsonSchemaTemplates().size();
-        jsonTemplateManager.removeTemplate("string");
-        assertNotSame(count, jsonTemplateManager.getJsonSchemaTemplates().size());
-    }
-
-    /**
-     * Test update template.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testUpdateTemplate() throws IOException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        int count = jsonTemplateManager.getJsonSchemaTemplates().get("integer").getJsonTemplateFields().size();
-        jsonTemplateManager.updateTemplate("integer", new JsonTemplateField("type"), false);
-        assertNotSame(count,
-                jsonTemplateManager.getJsonSchemaTemplates().get("integer").getJsonTemplateFields().size());
-    }
-
-    /**
-     * Test has template.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testHasTemplate() throws IOException {
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        boolean has = true;
-        List<JsonTemplateField> jsonTemplateFieldsString =
-                new ArrayList<>(Arrays.asList(new JsonTemplateField("type"), new JsonTemplateField("description"),
-                        new JsonTemplateField("required"),
-                        new JsonTemplateField("metadata"), new JsonTemplateField("constraints")));
-        JsonTemplate jsonTemplateTest = new JsonTemplate("String", jsonTemplateFieldsString);
-        has = jsonTemplateManager.hasTemplate(jsonTemplateTest);
-        assertEquals(false, has);
-    }
-
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java
deleted file mode 100644
index dc27d8aaa..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/JsonTemplateTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.tosca.update;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import junit.framework.TestCase;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateField;
-
-public class JsonTemplateTest extends TestCase {
-
-    JsonTemplate toTest = new JsonTemplate("toTest");
-    List<JsonTemplateField>
-            jsonTemplateFields = new ArrayList<>(
-            Arrays.asList(new JsonTemplateField("type"), new JsonTemplateField("description"),
-                    new JsonTemplateField(
-                            "enum")));
-
-    /**
-     * Test check failed.
-     */
-    public void testCheckFields() {
-        toTest.setJsonTemplateFields(jsonTemplateFields);
-        JsonTemplate reference = new JsonTemplate("toTest");
-        reference.setJsonTemplateFields(jsonTemplateFields);
-        assertTrue(toTest.checkFields(reference));
-    }
-
-    /**
-     * Test other methods.
-     */
-    public void testOtherFields() {
-        toTest.setJsonTemplateFields(jsonTemplateFields);
-        toTest.addField(new JsonTemplateField("moreField"));
-        toTest.setVisibility("moreField", true);
-        toTest.setStatic("moreField", true);
-        toTest.updateValueField("moreField", "testValue");
-        
-        assertTrue(toTest.isVisible("moreField"));
-        assertTrue(toTest.getSpecificField("moreField").getValue().equals("testValue"));
-        assertTrue(toTest.fieldStaticStatus("moreField"));
-        assertTrue(toTest.toString()
-            .equals(" templateFields : [type null null null, description null null null, "
-            + "enum null null null, moreField testValue true true]"));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
deleted file mode 100644
index 658419d4c..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaConverterWithDictionarySupportItCase.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.tosca.update;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import javax.transaction.Transactional;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.clds.tosca.update.execution.ToscaMetadataExecutor;
-import org.onap.policy.clamp.clds.tosca.update.parser.metadata.ToscaMetadataParserWithDictionarySupport;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.service.Service;
-import org.onap.policy.clamp.tosca.Dictionary;
-import org.onap.policy.clamp.tosca.DictionaryElement;
-import org.onap.policy.clamp.tosca.DictionaryService;
-import org.skyscreamer.jsonassert.JSONAssert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-@ActiveProfiles({"clamp-default", "clamp-default-user", "default-dictionary-elements"})
-public class ToscaConverterWithDictionarySupportItCase {
-
-    @Autowired
-    private DictionaryService dictionaryService;
-
-    @Autowired
-    private ToscaMetadataParserWithDictionarySupport toscaMetadataParserWithDictionarySupport;
-
-    @Autowired
-    private ToscaMetadataExecutor toscaMetadataExecutor;
-
-    /**
-     * This Test validates Tosca yaml with metadata tag that contains policy_model_type and acronym
-     * parameters which defines the Tosca Policy name and its short name.
-     *
-     * @throws IOException In case of issue when opening the tosca yaml file and
-     *                     converted json file
-     */
-    @Test
-    @Transactional
-    public final void testMetadataClampPossibleValues() throws IOException, UnknownComponentException {
-
-        // Set up dictionary elements
-        Dictionary dictionaryTest = new Dictionary();
-        dictionaryTest.setName("Context");
-        dictionaryTest.setSecondLevelDictionary(0);
-
-        DictionaryElement element = new DictionaryElement();
-        element.setName("PROD");
-        element.setShortName("PROD");
-        element.setType("string");
-        element.setDescription("Production");
-        dictionaryTest.addDictionaryElements(element);
-
-        dictionaryService.saveOrUpdateDictionary(dictionaryTest);
-
-        Dictionary dictionaryTest1 = new Dictionary();
-        dictionaryTest1.setName("EventDictionary");
-        dictionaryTest1.setSecondLevelDictionary(0);
-
-        DictionaryElement element1 = new DictionaryElement();
-        element1.setName("alarmCondition");
-        element1.setShortName("alarmCondition");
-        element1.setType("string");
-        element1.setDescription("Alarm Condition");
-        dictionaryTest1.addDictionaryElements(element1);
-
-        dictionaryService.saveOrUpdateDictionary(dictionaryTest1);
-
-        Dictionary dictionaryTest2 = new Dictionary();
-        dictionaryTest2.setName("Operators");
-        dictionaryTest2.setSecondLevelDictionary(0);
-
-        DictionaryElement element2 = new DictionaryElement();
-        element2.setName("equals");
-        element2.setShortName("equals");
-        element2.setType("string");
-        element2.setDescription("equals");
-        dictionaryTest2.addDictionaryElements(element2);
-        dictionaryService.saveOrUpdateDictionary(dictionaryTest2);
-
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils
-                                .getResourceAsString("tosca/new-converter/tosca_metadata_clamp_possible_values.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-
-        JsonObject jsonSchema = jsonTemplateManager.getJsonSchemaForPolicyType(
-                "onap.policies.monitoring.cdap.tca.hi.lo.app", toscaMetadataParserWithDictionarySupport, null);
-
-        JSONAssert.assertEquals(
-                ResourceFileUtils
-                        .getResourceAsString("tosca/new-converter/tca-with-metadata.json"),
-                JsonUtils.GSON.toJson(jsonSchema), true);
-    }
-
-    @Test
-    @Transactional
-    public final void testMetadataClampPossibleValueWithExecutor() throws IOException, UnknownComponentException {
-        Service service = new Service(ResourceFileUtils.getResourceAsString("tosca/service-details.json"),
-                ResourceFileUtils.getResourceAsString("tosca/resource-details-cds.json"));
-        JsonTemplateManager jsonTemplateManager =
-                new JsonTemplateManager(
-                        ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policytypes/onap"
-                                + ".policies.controlloop.operational.common.Apex/versions/1.0.0/.file"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-
-        JsonObject jsonSchema = jsonTemplateManager.getJsonSchemaForPolicyType(
-                "onap.policies.controlloop.operational.common.Apex", toscaMetadataParserWithDictionarySupport, service);
-
-        JSONAssert.assertEquals(
-                ResourceFileUtils
-                        .getResourceAsString("tosca/new-converter/tosca_apex_with_metadata.json"),
-                JsonUtils.GSON.toJson(jsonSchema), true);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java
deleted file mode 100644
index 5652fa9cd..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementPropertyTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.tosca.update;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.ArrayList;
-import junit.framework.TestCase;
-import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;
-import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElementProperty;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplate;
-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-
-public class ToscaElementPropertyTest extends TestCase {
-    public ToscaElementPropertyTest() throws IOException {
-    }
-
-    /**
-     * Test Parse array.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testParseArray() throws IOException {
-        JsonTemplateManager jsonTemplateManager = new JsonTemplateManager(
-                ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml"),
-                ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Actor");
-        ToscaElementProperty toscaElementProperty = toscaElement.getProperties().get("actor");
-        JsonArray toTest =
-                toscaElementProperty.parseArray((ArrayList<Object>) toscaElementProperty.getItems().get("default"));
-        assertNotNull(toTest);
-    }
-
-    /**
-     * Test add constraint as json.
-     *
-     * @throws IOException In case of failure
-     */
-    public void testAddConstraintsAsJson() throws IOException {
-        JsonTemplateManager jsonTemplateManager = new JsonTemplateManager(
-                ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),
-                ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),
-                ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));
-        ToscaElement toscaElement =
-                jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.operation.Failure");
-        ToscaElementProperty toscaElementProperty = toscaElement.getProperties().get("category");
-        JsonTemplate jsonTemplate = jsonTemplateManager.getJsonSchemaTemplates().get("string");
-        JsonObject toTest = new JsonObject();
-        toscaElementProperty
-                .addConstraintsAsJson(toTest, (ArrayList<Object>) toscaElementProperty.getItems().get("constraints"),
-                        jsonTemplate);
-        String test = "{\"enum\":[\"error\",\"timeout\",\"retries\",\"guard\",\"exception\"]}";
-        assertEquals(test, String.valueOf(toTest));
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java b/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java
deleted file mode 100644
index 7b17adeec..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/tosca/update/ToscaElementTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP CLAMP

- * ================================================================================

- * Copyright (C) 2020 AT&T Intellectual Property. All rights

- *                             reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- * http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END============================================

- * ===================================================================

- *

- */

-

-package org.onap.policy.clamp.clds.tosca.update;

-

-import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Arrays;

-import junit.framework.TestCase;

-import org.onap.policy.clamp.clds.tosca.update.elements.ToscaElement;

-import org.onap.policy.clamp.clds.tosca.update.templates.JsonTemplateManager;

-import org.onap.policy.clamp.clds.util.ResourceFileUtils;

-

-public class ToscaElementTest extends TestCase {

-

-    /**

-     * Test propertiesName.

-     *

-     * @throws IOException In case of failure

-     */

-    public void testPropertiesNames() throws IOException {

-        ArrayList<String> reference = new ArrayList<>(Arrays.asList("actor", "operation", "target", "payload"));

-        JsonTemplateManager jsonTemplateManager =

-                new JsonTemplateManager(

-                        ResourceFileUtils.getResourceAsString("tosca/new-converter/sampleOperationalPolicies.yaml"),

-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/default-tosca-types.yaml"),

-                        ResourceFileUtils.getResourceAsString("clds/tosca-converter/templates.json"));

-        ToscaElement toscaElement = jsonTemplateManager.getToscaElements().get("onap.datatype.controlloop.Actor");

-        assertEquals(reference, toscaElement.propertiesNames());

-    }

-

-}

diff --git a/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java b/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java
deleted file mode 100644
index b2c6d282a..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/util/JsonUtilsTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * Modifications copyright (c) 2019 Nokia
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.clds.util;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import java.io.IOException;
-import org.junit.Test;
-
-public class JsonUtilsTest {
-
-    public static class TestClass extends TestObject {
-
-        String test2;
-        TestObject2 object2;
-
-        TestClass(String value1, String value2) {
-            super(value1);
-            test2 = value2;
-        }
-
-        void setObject2(TestObject2 object2) {
-            this.object2 = object2;
-        }
-    }
-
-    @Test
-    public void testGetObjectMapperInstance() {
-        assertNotNull(JsonUtils.GSON);
-    }
-
-    /**
-     * This method test that the security hole in GSON is not enabled in the default
-     * ObjectMapper.
-     */
-    @Test
-    public void testCreateBeanDeserializer() {
-        TestClass test = new TestClass("value1", "value2");
-        test.setObject2(new TestObject2("test3"));
-        Object testObject = JsonUtils.GSON.fromJson("[\"org.onap.policy.clamp.clds.util.JsonUtilsTest$TestClass\""
-                + ",{\"test\":\"value1\",\"test2\":\"value2\","
-                + "\"object2\":[\"org.onap.policy.clamp.clds.util.TestObject2\","
-                + "{\"test3\":\"test3\"}]}]", Object.class);
-        assertNotNull(testObject);
-        assertFalse(testObject instanceof TestObject);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void shouldThrowExceptionFileNotExists() throws IOException {
-        ResourceFileUtils.getResourceAsString("example/notExist.json");
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java b/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java
deleted file mode 100644
index ab6a41bca..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/util/LoggingUtilsTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
-* ============LICENSE_START=======================================================
-* ONAP CLAMP
-* Copyright (C) 2019 Samsung. All rights reserved.
-* ================================================================================
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-* ============LICENSE_END============================================
-* ===================================================================
-*
-*/
-
-package org.onap.policy.clamp.clds.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.Map;
-import javax.net.ssl.HttpsURLConnection;
-import javax.servlet.http.HttpServletRequest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
-import org.slf4j.event.Level;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-
-/**
- * Test Logging Utils.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class LoggingUtilsTest {
-
-    protected static final Logger logger = LoggerFactory.getLogger(LoggingUtilsTest.class);
-
-    private static final String SERVICE_NAME = "LogginUtilsTest: Test Entering method";
-
-    private LoggingUtils util;
-
-    @Before
-    public void setup() {
-        this.util = new LoggingUtils(logger);
-    }
-
-    @Test
-    public void testEnteringLoggingUtils() {
-        // given
-        final String userName = "test";
-
-        UserDetails userDetails = Mockito.mock(UserDetails.class);
-        Mockito.when(userDetails.getUsername()).thenReturn(userName);
-
-        Authentication localAuth = Mockito.mock(Authentication.class);
-        Mockito.when(localAuth.getPrincipal()).thenReturn(userDetails);
-
-        SecurityContext securityContext = Mockito.mock(SecurityContext.class);
-        Mockito.when(securityContext.getAuthentication()).thenReturn(localAuth);
-        SecurityContextHolder.setContext(securityContext);
-
-        HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-        // when
-        util.entering(request, SERVICE_NAME);
-
-        // then
-        String[] keys = {OnapLogConstants.Mdcs.PARTNER_NAME, OnapLogConstants.Mdcs.ENTRY_TIMESTAMP,
-            OnapLogConstants.Mdcs.REQUEST_ID, OnapLogConstants.Mdcs.INVOCATION_ID,
-            OnapLogConstants.Mdcs.CLIENT_IP_ADDRESS, OnapLogConstants.Mdcs.SERVER_FQDN,
-            OnapLogConstants.Mdcs.INSTANCE_UUID, OnapLogConstants.Mdcs.SERVICE_NAME};
-        Map<String, String> mdc = MDC.getMDCAdapter().getCopyOfContextMap();
-
-        assertTrue(checkMapKeys(mdc, keys));
-        assertEquals(userName, mdc.get(OnapLogConstants.Mdcs.PARTNER_NAME));
-    }
-
-    @Test
-    public void testExistingLoggingUtils() {
-        // given
-        MDC.put(OnapLogConstants.Mdcs.ENTRY_TIMESTAMP,
-            ZonedDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ISO_INSTANT));
-
-        // when
-        util.exiting(HttpStatus.OK.value(), SERVICE_NAME, Level.INFO,
-            OnapLogConstants.ResponseStatus.COMPLETE);
-
-        // then
-        Map<String, String> mdc = MDC.getMDCAdapter().getCopyOfContextMap();
-        assertNull(mdc);
-    }
-
-    @Test
-    public void testInvokeTestUtils() {
-        // given
-        final String targetEntity = "LoggingUtilsTest";
-        final String targetServiceName = "testInvokeTestUtils";
-        HttpsURLConnection secureConnection = Mockito.mock(HttpsURLConnection.class);
-
-        // when
-        secureConnection = util.invokeHttps(secureConnection, targetEntity, targetServiceName);
-
-        // then
-        assertNotNull(secureConnection);
-        String[] keys =
-            {OnapLogConstants.Mdcs.TARGET_ENTITY, OnapLogConstants.Mdcs.TARGET_SERVICE_NAME,
-                OnapLogConstants.Mdcs.INVOCATIONID_OUT, OnapLogConstants.Mdcs.INVOKE_TIMESTAMP};
-        Map<String, String> mdc = MDC.getMDCAdapter().getCopyOfContextMap();
-
-        assertTrue(checkMapKeys(mdc, keys));
-        assertEquals(targetEntity, mdc.get(OnapLogConstants.Mdcs.TARGET_ENTITY));
-        assertEquals(targetServiceName, mdc.get(OnapLogConstants.Mdcs.TARGET_SERVICE_NAME));
-    }
-
-    private boolean checkMapKeys(Map map, String[] keys) {
-        return Arrays.stream(keys).allMatch(key -> map.get(key) != null);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java b/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java
deleted file mode 100644
index 02cabd270..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/util/TestObject.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- * 
- */
-
-package org.onap.policy.clamp.clds.util;
-
-public class TestObject {
-
-    private String test;
-
-    public String getTest() {
-        return test;
-    }
-
-    public void setTest(String test) {
-        this.test = test;
-    }
-
-    // @JsonProperty("test"), @JsonCreator
-    public TestObject(String theString) {
-        this.setTest(theString);
-    }
-
-    public TestObject() {
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java b/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java
deleted file mode 100644
index d5abf41d0..000000000
--- a/src/test/java/org/onap/policy/clamp/clds/util/TestObject2.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); 
- * you may not use this file except in compliance with the License. 
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software 
- * distributed under the License is distributed on an "AS IS" BASIS, 
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
- * See the License for the specific language governing permissions and 
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- * 
- */
-
-package org.onap.policy.clamp.clds.util;
-
-public class TestObject2 {
-
-    private String test3;
-
-    public String getTest3() {
-        return test3;
-    }
-
-    public void setTest3(String test) {
-        this.test3 = test;
-    }
-
-    public TestObject2(String theString) {
-        this.setTest3(theString);
-    }
-
-    public TestObject2() {
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java b/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
deleted file mode 100644
index 622fd5999..000000000
--- a/src/test/java/org/onap/policy/clamp/flow/FlowLogOperationTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2019 Samsung. All rights reserved.
- * ================================================================================
- * Modifications Copyright (c) 2021 AT&T
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.flow;
-
-import static junit.framework.Assert.assertEquals;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.support.DefaultExchange;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.policy.clamp.clds.util.LoggingUtils;
-import org.onap.policy.clamp.clds.util.OnapLogConstants;
-import org.onap.policy.clamp.flow.log.FlowLogOperation;
-import org.slf4j.MDC;
-import org.slf4j.spi.MDCAdapter;
-import org.springframework.test.util.ReflectionTestUtils;
-
-public class FlowLogOperationTest {
-
-    private FlowLogOperation flowLogOperation = new FlowLogOperation();
-
-    @Test
-    public void testStartLog() {
-        // given
-        LoggingUtils loggingUtils = mock(LoggingUtils.class);
-        ReflectionTestUtils.setField(flowLogOperation, "util", loggingUtils);
-
-        // when
-        Mockito.when(loggingUtils.getProperties(OnapLogConstants.Mdcs.REQUEST_ID)).thenReturn("MockRequestId");
-        Mockito.when(loggingUtils.getProperties(OnapLogConstants.Mdcs.INVOCATION_ID)).thenReturn("MockInvocationId");
-        Mockito.when(loggingUtils.getProperties(OnapLogConstants.Mdcs.PARTNER_NAME)).thenReturn("MockPartnerName");
-        Exchange exchange = new DefaultExchange(mock(CamelContext.class));
-        flowLogOperation.startLog(exchange, "serviceName");
-
-        // then
-        assertThat(exchange.getProperty(OnapLogConstants.Headers.REQUEST_ID)).isEqualTo("MockRequestId");
-        assertThat(exchange.getProperty(OnapLogConstants.Headers.INVOCATION_ID)).isEqualTo("MockInvocationId");
-        assertThat(exchange.getProperty(OnapLogConstants.Headers.PARTNER_NAME)).isEqualTo("MockPartnerName");
-    }
-
-    @Test
-    public void testInvokeLog() {
-        // given
-        final String mockEntity = "mockEntity";
-        final String mockServiceName = "mockServiceName";
-        MDCAdapter mdcAdapter = MDC.getMDCAdapter();
-        // when
-        flowLogOperation.invokeLog(mockEntity, mockServiceName);
-        // then
-        String entity = mdcAdapter.get(OnapLogConstants.Mdcs.TARGET_ENTITY);
-        String serviceName = mdcAdapter.get(OnapLogConstants.Mdcs.TARGET_SERVICE_NAME);
-        assertEquals(entity, mockEntity);
-        assertEquals(serviceName, mockServiceName);
-    }
-
-    @Test
-    public void testEndLog() {
-        // given
-        MDC.put(OnapLogConstants.Mdcs.ENTRY_TIMESTAMP, "2019-05-19T00:00:00.007Z");
-        MDCAdapter mdcAdapter = MDC.getMDCAdapter();
-        /// when
-        flowLogOperation.endLog();
-        // then
-        assertThat(mdcAdapter.get(OnapLogConstants.Mdcs.ENTRY_TIMESTAMP)).isNull();
-    }
-
-    @Test
-    public void testErrorLog() {
-        // given
-        MDC.put(OnapLogConstants.Mdcs.ENTRY_TIMESTAMP, "2019-05-19T00:00:00.007Z");
-        MDCAdapter mdcAdapter = MDC.getMDCAdapter();
-        // when
-        flowLogOperation.errorLog();
-        // then
-        assertThat(mdcAdapter.get(OnapLogConstants.Mdcs.ENTRY_TIMESTAMP)).isNull();
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java b/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
deleted file mode 100644
index b0abf832b..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/CsarInstallerItCase.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications copyright (c) 2019 Nokia
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import javax.transaction.Transactional;
-import org.apache.commons.lang3.RandomStringUtils;
-import org.assertj.core.api.Assertions;
-import org.json.JSONException;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.clds.exception.sdc.controller.BlueprintParserException;
-import org.onap.policy.clamp.clds.exception.sdc.controller.CsarHandlerException;
-import org.onap.policy.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
-import org.onap.policy.clamp.clds.sdc.controller.installer.BlueprintArtifact;
-import org.onap.policy.clamp.clds.sdc.controller.installer.CsarHandler;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.cds.CdsDataInstaller;
-import org.onap.policy.clamp.loop.service.ServicesRepository;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel;
-import org.onap.policy.clamp.loop.template.LoopTemplatesRepository;
-import org.onap.policy.clamp.loop.template.PolicyModelId;
-import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
-import org.onap.sdc.api.notification.IArtifactInfo;
-import org.onap.sdc.api.notification.INotificationData;
-import org.onap.sdc.api.notification.IResourceInstance;
-import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.onap.sdc.toscaparser.api.elements.Metadata;
-import org.skyscreamer.jsonassert.JSONAssert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.Commit;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-@ActiveProfiles({"clamp-default", "clamp-default-user", "clamp-sdc-controller"})
-public class CsarInstallerItCase {
-
-    private static final String CSAR_ARTIFACT_NAME_CDS = "example/sdc/service_Vloadbalancerms_cds.csar";
-    private static final String CSAR_ARTIFACT_NAME_NO_CDS = "example/sdc/service_Vloadbalancerms_no_cds.csar";
-    private static final String INVARIANT_SERVICE_UUID = "4cc5b45a-1f63-4194-8100-cd8e14248c92";
-    private static final String INVARIANT_RESOURCE1_UUID = "07e266fc-49ab-4cd7-8378-ca4676f1b9ec";
-    private static final String INVARIANT_RESOURCE2_UUID = "023a3f0d-1161-45ff-b4cf-8918a8ccf3ad";
-    private static final String RESOURCE_INSTANCE_NAME_RESOURCE1 = "ResourceInstanceName1";
-    private static final String RESOURCE_INSTANCE_NAME_RESOURCE2 = "ResourceInstanceName2";
-
-    @Autowired
-    private LoopTemplatesRepository loopTemplatesRepo;
-
-    @Autowired
-    ServicesRepository serviceRepository;
-
-    @Autowired
-    PolicyModelsRepository policyModelsRepository;
-
-    @Autowired
-    @Qualifier("csarInstaller")
-    private CsarInstaller csarInstaller;
-
-    private BlueprintArtifact buildFakeBlueprintArtifact(String instanceName, String invariantResourceUuid,
-                                                         String blueprintFilePath, String artifactName,
-                                                         String invariantServiceUuid) throws IOException {
-        IResourceInstance resource = Mockito.mock(IResourceInstance.class);
-        Mockito.when(resource.getResourceInstanceName()).thenReturn(instanceName);
-        Mockito.when(resource.getResourceInvariantUUID()).thenReturn(invariantResourceUuid);
-        BlueprintArtifact blueprintArtifact = Mockito.mock(BlueprintArtifact.class);
-        Mockito.when(blueprintArtifact.getDcaeBlueprint())
-                .thenReturn(ResourceFileUtils.getResourceAsString(blueprintFilePath));
-        Mockito.when(blueprintArtifact.getBlueprintArtifactName()).thenReturn(artifactName);
-        Mockito.when(blueprintArtifact.getBlueprintInvariantServiceUuid()).thenReturn(invariantServiceUuid);
-        Mockito.when(blueprintArtifact.getResourceAttached()).thenReturn(resource);
-        return blueprintArtifact;
-    }
-
-    private CsarHandler buildBadFakeCsarHandler(String generatedName, String csarFileName) throws IOException,
-            SdcToscaParserException {
-
-        // Build a Bad csar because the blueprint contains a link to a microservice that does not exist in the emulator
-        // Create fake notification
-        INotificationData notificationData = Mockito.mock(INotificationData.class);
-        Mockito.when(notificationData.getServiceVersion()).thenReturn("1.0");
-        // Create fake resource in notification
-        CsarHandler csarHandler = Mockito.mock(CsarHandler.class);
-        List<IResourceInstance> listResources = new ArrayList<>();
-        Mockito.when(notificationData.getResources()).thenReturn(listResources);
-        Map<String, BlueprintArtifact> blueprintMap = new HashMap<>();
-        Mockito.when(csarHandler.getMapOfBlueprints()).thenReturn(blueprintMap);
-        // Create fake blueprint artifact 1 on resource1
-        BlueprintArtifact blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
-                INVARIANT_RESOURCE1_UUID, "example/sdc/blueprint-dcae/tca-bad-policy.yaml", "tca-bad-policy.yaml",
-                INVARIANT_SERVICE_UUID);
-        listResources.add(blueprintArtifact.getResourceAttached());
-        blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
-
-        // Build fake csarhandler
-        Mockito.when(csarHandler.getSdcNotification()).thenReturn(notificationData);
-        // Build fake csar Helper
-        ISdcCsarHelper csarHelper = Mockito.mock(ISdcCsarHelper.class);
-        Metadata data = Mockito.mock(Metadata.class);
-        Mockito.when(data.getValue("name")).thenReturn(generatedName);
-        Mockito.when(notificationData.getServiceName()).thenReturn(generatedName);
-        Mockito.when(csarHelper.getServiceMetadata()).thenReturn(data);
-
-        // Create helper based on real csar to test policy yaml and global properties
-        // set
-        SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
-        String path = Thread.currentThread().getContextClassLoader().getResource(csarFileName).getFile();
-        ISdcCsarHelper sdcHelper = factory.getSdcCsarHelper(path);
-        Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(sdcHelper);
-
-        // Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(csarHelper);
-        Mockito.when(csarHandler.getPolicyModelYaml())
-                .thenReturn(Optional.ofNullable(ResourceFileUtils.getResourceAsString("tosca/tosca_example.yaml")));
-        return csarHandler;
-    }
-
-    private CsarHandler buildFakeCsarHandler(String generatedName, String csarFileName) throws IOException,
-            SdcToscaParserException {
-        // Create fake notification
-        INotificationData notificationData = Mockito.mock(INotificationData.class);
-        Mockito.when(notificationData.getServiceVersion()).thenReturn("1.0");
-        // Create fake resource in notification
-        CsarHandler csarHandler = Mockito.mock(CsarHandler.class);
-        List<IResourceInstance> listResources = new ArrayList<>();
-        Mockito.when(notificationData.getResources()).thenReturn(listResources);
-        Map<String, BlueprintArtifact> blueprintMap = new HashMap<>();
-        Mockito.when(csarHandler.getMapOfBlueprints()).thenReturn(blueprintMap);
-        // Create fake blueprint artifact 1 on resource1
-        BlueprintArtifact blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1,
-                INVARIANT_RESOURCE1_UUID, "example/sdc/blueprint-dcae/tca.yaml", "tca.yaml", INVARIANT_SERVICE_UUID);
-        listResources.add(blueprintArtifact.getResourceAttached());
-        blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
-        // Create fake blueprint artifact 2 on resource2
-        blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE2, INVARIANT_RESOURCE2_UUID,
-                "example/sdc/blueprint-dcae/tca_2.yaml", "tca_2.yaml", INVARIANT_SERVICE_UUID);
-        listResources.add(blueprintArtifact.getResourceAttached());
-        blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
-
-        // Create fake blueprint artifact 3 on resource 1 so that it's possible to
-        // test multiple CL deployment per Service/vnf
-        blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
-                "example/sdc/blueprint-dcae/tca_3.yaml", "tca_3.yaml", INVARIANT_SERVICE_UUID);
-        blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
-
-        // Create fake blueprint artifact 3 on resource 1 so that it's possible to
-        // test multiple CL deployment per Service/vnf
-        blueprintArtifact = buildFakeBlueprintArtifact(RESOURCE_INSTANCE_NAME_RESOURCE1, INVARIANT_RESOURCE1_UUID,
-                "example/sdc/blueprint-dcae/tca-guilin.yaml", "tca-guilin.yaml", INVARIANT_SERVICE_UUID);
-        blueprintMap.put(blueprintArtifact.getBlueprintArtifactName(), blueprintArtifact);
-
-
-        // Build fake csarhandler
-        Mockito.when(csarHandler.getSdcNotification()).thenReturn(notificationData);
-        // Build fake csar Helper
-        ISdcCsarHelper csarHelper = Mockito.mock(ISdcCsarHelper.class);
-        Metadata data = Mockito.mock(Metadata.class);
-        Mockito.when(data.getValue("name")).thenReturn(generatedName);
-        Mockito.when(notificationData.getServiceName()).thenReturn(generatedName);
-        Mockito.when(csarHelper.getServiceMetadata()).thenReturn(data);
-
-        // Create helper based on real csar to test policy yaml and global properties
-        // set
-        SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();
-        String path = Thread.currentThread().getContextClassLoader().getResource(csarFileName).getFile();
-        ISdcCsarHelper sdcHelper = factory.getSdcCsarHelper(path);
-        Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(sdcHelper);
-
-        // Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(csarHelper);
-        Mockito.when(csarHandler.getPolicyModelYaml())
-                .thenReturn(Optional.ofNullable(ResourceFileUtils.getResourceAsString("tosca/tosca_example.yaml")));
-        return csarHandler;
-    }
-
-    @Test
-    @Transactional
-    public void testGetPolicyModelYaml() throws IOException, SdcToscaParserException, CsarHandlerException {
-        INotificationData notificationData = Mockito.mock(INotificationData.class);
-        IArtifactInfo serviceArtifacts = Mockito.mock(IArtifactInfo.class);
-        Mockito.when(serviceArtifacts.getArtifactType()).thenReturn("TOSCA_CSAR");
-        List<IArtifactInfo> serviceArtifactsList = new ArrayList<>();
-        serviceArtifactsList.add(serviceArtifacts);
-        Mockito.when(notificationData.getServiceArtifacts()).thenReturn(serviceArtifactsList);
-
-        CsarHandler csarHandler = new CsarHandler(notificationData, "", "");
-        csarHandler.setFilePath(Thread.currentThread().getContextClassLoader().getResource(CSAR_ARTIFACT_NAME_CDS)
-                .getFile());
-        Assert.assertEquals(csarHandler.getPolicyModelYaml(), Optional
-                .ofNullable(ResourceFileUtils.getResourceAsString("example/sdc/expected-result/policy-data.yaml")));
-    }
-
-    @Test
-    @Transactional
-    public void testIsCsarAlreadyDeployedTca() throws SdcArtifactInstallerException, SdcToscaParserException,
-            CsarHandlerException, IOException, InterruptedException, BlueprintParserException {
-        String generatedName = RandomStringUtils.randomAlphanumeric(5);
-        CsarHandler csarHandler = buildFakeCsarHandler(generatedName, CSAR_ARTIFACT_NAME_CDS);
-        assertThat(csarInstaller.isCsarAlreadyDeployed(csarHandler)).isFalse();
-        csarInstaller.installTheCsar(csarHandler);
-        assertThat(csarInstaller.isCsarAlreadyDeployed(csarHandler)).isTrue();
-    }
-
-    @Test
-    @Transactional
-    public void testWithoutCdsTca() throws SdcArtifactInstallerException, SdcToscaParserException,
-            CsarHandlerException, IOException, InterruptedException, BlueprintParserException {
-        String generatedName = RandomStringUtils.randomAlphanumeric(5);
-        CsarHandler csarHandler = buildFakeCsarHandler(generatedName, CSAR_ARTIFACT_NAME_NO_CDS);
-
-        assertThat(csarInstaller.isCsarAlreadyDeployed(csarHandler)).isFalse();
-        csarInstaller.installTheCsar(csarHandler);
-        assertThat(csarInstaller.isCsarAlreadyDeployed(csarHandler)).isTrue();
-    }
-
-    @Test(expected = SdcArtifactInstallerException.class)
-    @Transactional
-    public void testInstallTheBadCsarTca()
-            throws IOException, SdcToscaParserException, InterruptedException, BlueprintParserException,
-            SdcArtifactInstallerException {
-        // This test validates that the blueprint is well rejected because the blueprint contains a link
-        // to a policy that does not exist on the policy engine emulator.
-        String generatedName = RandomStringUtils.randomAlphanumeric(5);
-        csarInstaller.installTheCsar(buildBadFakeCsarHandler(generatedName, CSAR_ARTIFACT_NAME_NO_CDS));
-    }
-
-    @Test
-    @Transactional
-    @Commit
-    public void testInstallTheCsarTca() throws SdcArtifactInstallerException, SdcToscaParserException,
-            CsarHandlerException, IOException, JSONException, InterruptedException, BlueprintParserException {
-        String generatedName = RandomStringUtils.randomAlphanumeric(5);
-        csarInstaller.installTheCsar(buildFakeCsarHandler(generatedName, CSAR_ARTIFACT_NAME_CDS));
-
-        assertThat(serviceRepository.existsById("63cac700-ab9a-4115-a74f-7eac85e3fce0")).isTrue();
-        // We should have CDS info
-        assertThat(serviceRepository.findById("63cac700-ab9a-4115-a74f-7eac85e3fce0").get().getResourceByType("VF")
-                .getAsJsonObject("vLoadBalancerMS 0").getAsJsonObject(
-                        CdsDataInstaller.CONTROLLER_PROPERTIES)).isNotNull();
-        assertThat(loopTemplatesRepo.existsById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0",
-                RESOURCE_INSTANCE_NAME_RESOURCE1, "tca.yaml"))).isTrue();
-        assertThat(loopTemplatesRepo.existsById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0",
-                RESOURCE_INSTANCE_NAME_RESOURCE1, "tca_3.yaml"))).isTrue();
-        assertThat(loopTemplatesRepo.existsById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0",
-                RESOURCE_INSTANCE_NAME_RESOURCE2, "tca_2.yaml"))).isTrue();
-        assertThat(loopTemplatesRepo.existsById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0",
-                RESOURCE_INSTANCE_NAME_RESOURCE1, "tca-guilin.yaml"))).isTrue();
-        // Verify now that policy and json representation, global properties are well
-        // set
-        LoopTemplate loopTemplate = loopTemplatesRepo.findById(LoopTemplate.generateLoopTemplateName(generatedName,
-                "1.0", RESOURCE_INSTANCE_NAME_RESOURCE1, "tca.yaml")).get();
-        assertThat(loopTemplate.getLoopElementModelsUsed()).hasSize(1);
-        Assertions.assertThat(loopTemplate.getModelService().getServiceUuid())
-                .isEqualTo("63cac700-ab9a-4115-a74f-7eac85e3fce0");
-        JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/model-properties.json"),
-                JsonUtils.GSON_JPA_MODEL.toJson(loopTemplate.getModelService()), true);
-        JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/service-details.json"),
-                JsonUtils.GSON_JPA_MODEL.toJson(loopTemplate.getModelService().getServiceDetails()), true);
-        JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/resource-details.json"),
-                JsonUtils.GSON_JPA_MODEL.toJson(loopTemplate.getModelService().getResourceDetails()), true);
-        Assertions.assertThat(((LoopTemplateLoopElementModel) (loopTemplate.getLoopElementModelsUsed().toArray()[0]))
-                .getLoopElementModel().getName()).isNotEmpty();
-
-        loopTemplate = loopTemplatesRepo.findById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0",
-                RESOURCE_INSTANCE_NAME_RESOURCE1, "tca_3.yaml")).get();
-        assertThat(((LoopTemplateLoopElementModel) (loopTemplate.getLoopElementModelsUsed().toArray()[0]))
-                .getLoopElementModel().getName()).isNotEmpty();
-        assertThat(((LoopTemplateLoopElementModel) (loopTemplate.getLoopElementModelsUsed().toArray()[0]))
-                .getLoopElementModel().getName()).isNotEmpty();
-        assertThat(loopTemplate.getMaximumInstancesAllowed()).isEqualByComparingTo(Integer.valueOf(0));
-        loopTemplate = loopTemplatesRepo.findById(LoopTemplate.generateLoopTemplateName(generatedName, "1.0",
-                RESOURCE_INSTANCE_NAME_RESOURCE2, "tca_2.yaml")).get();
-        assertThat(((LoopTemplateLoopElementModel) (loopTemplate.getLoopElementModelsUsed().toArray()[0]))
-                .getLoopElementModel().getName()).isNotEmpty();
-
-        assertThat(policyModelsRepository.findAll().size()).isGreaterThanOrEqualTo(1);
-        assertThat(policyModelsRepository
-                .existsById(new PolicyModelId("onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0"))).isTrue();
-        assertThat(policyModelsRepository
-                .getOne((new PolicyModelId("onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0")))
-                .getPolicyModelTosca()).isNotBlank();
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java b/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
deleted file mode 100644
index c95725457..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/DcaeComponentTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.List;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.json.simple.parser.ParseException;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.policy.clamp.clds.model.dcae.DcaeInventoryResponse;
-import org.onap.policy.clamp.clds.model.dcae.DcaeOperationStatusResponse;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.components.external.DcaeComponent;
-import org.onap.policy.clamp.loop.components.external.ExternalComponentState;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
-
-public class DcaeComponentTest {
-
-    private Loop createTestLoop() {
-        Loop loopTest = new Loop("ControlLoopTest");
-        loopTest.setGlobalPropertiesJson(
-                new Gson().fromJson(
-                        "{\"dcaeDeployParameters\":{\"uniqueBlueprintParameters\": {\"policy_id\": \"name\"}}}",
-                        JsonObject.class));
-        loopTest.setLastComputedState(LoopState.DESIGN);
-        loopTest.setDcaeDeploymentId("123456789");
-        loopTest.setDcaeDeploymentStatusUrl("http://localhost:8085");
-
-        MicroServicePolicy microServicePolicy = new MicroServicePolicy("configPolicyTest", new PolicyModel("policy1",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0"), true,
-                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null, null, null);
-        microServicePolicy.setConfigurationsJson(new Gson().fromJson("{\"param1\":\"value1\"}", JsonObject.class));
-
-        loopTest.addMicroServicePolicy(microServicePolicy);
-        LoopTemplate loopTemplate = new LoopTemplate("test", "yaml", 1, null);
-        loopTemplate.setDcaeBlueprintId("UUID-blueprint");
-        loopTest.setLoopTemplate(loopTemplate);
-
-        return loopTest;
-    }
-
-    /**
-     * Test the DcaeReponse roughly.
-     *
-     * @throws IOException In case of issues
-     */
-    @Test
-    public void convertDcaeResponseTest() throws IOException {
-        String dcaeFakeResponse = "{'requestId':'testId','operationType':'install','status':'state',"
-                + "'error':'errorMessage', 'links':{'self':'selfUrl','uninstall':'uninstallUrl'}}";
-        DcaeOperationStatusResponse responseObject = DcaeComponent.convertDcaeResponse(dcaeFakeResponse);
-        assertThat(responseObject.getRequestId()).isEqualTo("testId");
-        assertThat(responseObject.getOperationType()).isEqualTo("install");
-        assertThat(responseObject.getStatus()).isEqualTo("state");
-        assertThat(responseObject.getError()).isEqualTo("errorMessage");
-        assertThat(responseObject.getLinks()).isNotNull();
-        assertThat(responseObject.getLinks().getSelf()).isEqualTo("selfUrl");
-        assertThat(responseObject.getLinks().getUninstall()).isEqualTo("uninstallUrl");
-
-        assertThat(responseObject.getLinks().getStatus()).isNull();
-    }
-
-    @Test
-    public void testGetDeployPayload() throws IOException {
-        Loop loop = this.createTestLoop();
-        String deploymentPayload = DcaeComponent.getDeployPayload(loop);
-        String expectedPayload = "{\"serviceTypeId\":\"UUID-blueprint\",\"inputs\":{\"policy_id\":\"name\"}}";
-        assertThat(deploymentPayload).isEqualTo(expectedPayload);
-    }
-
-    @Test
-    public void testGetUndeployPayload() throws IOException {
-        Loop loop = this.createTestLoop();
-        String unDeploymentPayload = DcaeComponent.getUndeployPayload(loop);
-        String expectedPayload = "{\"serviceTypeId\":\"UUID-blueprint\"}";
-        assertThat(unDeploymentPayload).isEqualTo(expectedPayload);
-    }
-
-    /**
-     * Test the computeState method of the DcaeComponent roughly.
-     *
-     * @throws IOException In case of issues
-     */
-    @Test
-    public void computeStateTest() throws IOException {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-        Mockito.when(exchange2.getProperty("dcaeResponse")).thenReturn(null);
-
-        DcaeComponent dcae = new DcaeComponent();
-
-        // initial state
-        ExternalComponentState state = dcae.computeState(exchange);
-        assertThat(state.getStateName()).isEqualTo("BLUEPRINT_DEPLOYED");
-
-        // OperationalType = install
-        DcaeOperationStatusResponse dcaeResponse = Mockito.mock(DcaeOperationStatusResponse.class);
-        Mockito.when(dcaeResponse.getOperationType()).thenReturn("install");
-
-        Mockito.when(dcaeResponse.getStatus()).thenReturn("succeeded");
-        Mockito.when(exchange2.getProperty("dcaeResponse")).thenReturn(dcaeResponse);
-        ExternalComponentState state2 = dcae.computeState(exchange);
-        assertThat(state2.getStateName()).isEqualTo("MICROSERVICE_INSTALLED_SUCCESSFULLY");
-        Mockito.when(dcaeResponse.getStatus()).thenReturn("processing");
-        ExternalComponentState state3 = dcae.computeState(exchange);
-        assertThat(state3.getStateName()).isEqualTo("PROCESSING_MICROSERVICE_INSTALLATION");
-
-        Mockito.when(dcaeResponse.getStatus()).thenReturn("failed");
-        ExternalComponentState state4 = dcae.computeState(exchange);
-        assertThat(state4.getStateName()).isEqualTo("MICROSERVICE_INSTALLATION_FAILED");
-
-        // OperationalType = uninstall
-        Mockito.when(dcaeResponse.getOperationType()).thenReturn("uninstall");
-
-        Mockito.when(dcaeResponse.getStatus()).thenReturn("succeeded");
-        Mockito.when(exchange2.getProperty("dcaeResponse")).thenReturn(dcaeResponse);
-        ExternalComponentState state5 = dcae.computeState(exchange);
-        assertThat(state5.getStateName()).isEqualTo("MICROSERVICE_UNINSTALLED_SUCCESSFULLY");
-
-        Mockito.when(dcaeResponse.getStatus()).thenReturn("processing");
-        ExternalComponentState state6 = dcae.computeState(exchange);
-        assertThat(state6.getStateName()).isEqualTo("PROCESSING_MICROSERVICE_UNINSTALLATION");
-
-        Mockito.when(dcaeResponse.getStatus()).thenReturn("failed");
-        ExternalComponentState state7 = dcae.computeState(exchange);
-        assertThat(state7.getStateName()).isEqualTo("MICROSERVICE_UNINSTALLATION_FAILED");
-
-        // error cases
-        Mockito.when(dcaeResponse.getOperationType()).thenReturn("whatever");
-        ExternalComponentState state8 = dcae.computeState(exchange);
-        assertThat(state8.getStateName()).isEqualTo("IN_ERROR");
-
-        Mockito.when(dcaeResponse.getOperationType()).thenReturn("install");
-        Mockito.when(dcaeResponse.getStatus()).thenReturn("anythingelse");
-        ExternalComponentState state9 = dcae.computeState(exchange);
-        assertThat(state9.getStateName()).isEqualTo("IN_ERROR");
-    }
-
-    /**
-     * Test the Converter to DcaeInventoryResponse method.
-     *
-     * @throws IOException    In case of failure
-     * @throws ParseException In case of failure
-     */
-    @Test
-    public void convertToDcaeInventoryResponseTest() throws IOException, ParseException {
-
-        List<DcaeInventoryResponse> responseObject = DcaeComponent
-                .convertToDcaeInventoryResponse(
-                        ResourceFileUtils.getResourceAsString("example/dcae/inventory-response.json"));
-        assertThat(responseObject.get(0).getAsdcResourceId()).isEqualTo("testAsdcResourceId");
-        assertThat(responseObject.get(0).getAsdcServiceId()).isEqualTo("testAsdcServiceId");
-        assertThat(responseObject.get(0).getTypeName()).isEqualTo("testTypeName");
-        assertThat(responseObject.get(0).getTypeId()).isEqualTo("testTypeId");
-        assertThat(responseObject.get(0).getBlueprintTemplate()).isEqualTo("testBlueprintTemplate");
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java
deleted file mode 100644
index 4d02b10dc..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/DeployFlowTestItCase.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import java.io.IOException;
-import java.util.Set;
-import javax.transaction.Transactional;
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.ExchangeBuilder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.loop.template.PolicyModelsService;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class DeployFlowTestItCase {
-    private Gson gson = new Gson();
-
-    @Autowired
-    CamelContext camelContext;
-
-    @Autowired
-    PolicyModelsService policyModelsService;
-
-    @Autowired
-    LoopService loopService;
-
-    @Autowired
-    LoopsRepository loopsRepository;
-
-    /**
-     * This method tests a deployment a single blueprint.
-     *
-     * @throws JsonSyntaxException In case of issues
-     * @throws IOException         In case of issues
-     */
-    @Test
-    @Transactional
-    public void deployWithSingleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "yamlcontent",
-                "{\"dcaeDeployParameters\":{\"uniqueBlueprintParameters\": {\"policy_id\": \"name\"}}}",
-                "UUID-blueprint");
-        LoopTemplate template = new LoopTemplate();
-        template.setName("templateName");
-        template.setBlueprint("yamlcontent");
-        loopTest.setLoopTemplate(template);
-        MicroServicePolicy microServicePolicy = getMicroServicePolicy("configPolicyTest", "",
-                "{\"configtype\":\"json\"}", "tosca_definitions_version: tosca_simple_yaml_1_0_0",
-                "{\"param1\":\"value1\"}", true);
-        loopTest.addMicroServicePolicy(microServicePolicy);
-        loopService.saveOrUpdateLoop(loopTest);
-        Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext).withProperty("loopObject", loopTest)
-                .build();
-
-        camelContext.createProducerTemplate().send("direct:deploy-loop", myCamelExchange);
-
-        Loop loopAfterTest = loopService.getLoop("ControlLoopTest");
-        assertThat(loopAfterTest.getDcaeDeploymentStatusUrl()).isNotNull();
-        assertThat(loopAfterTest.getDcaeDeploymentId()).isNotNull();
-    }
-
-    /**
-     * This method tests the deployment of multiple separated  blueprints.
-     *
-     * @throws JsonSyntaxException In case of issues
-     * @throws IOException         In case of issues
-     */
-    @Test
-    @Transactional
-    public void deployWithMultipleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest2 = createLoop("ControlLoopTest2", "yamlcontent", "{\"dcaeDeployParameters\": {"
-                + "\"microService1\": {\"location_id\": \"\", \"policy_id\": \"TCA_ResourceInstanceName1_tca\"},"
-                + "\"microService2\": {\"location_id\": \"\", \"policy_id\": \"TCA_ResourceInstanceName2_tca\"}"
-                + "}}", "UUID-blueprint");
-        LoopTemplate template = new LoopTemplate();
-        template.setName("templateName");
-        loopTest2.setLoopTemplate(template);
-        MicroServicePolicy microServicePolicy1 = getMicroServicePolicy("microService1", "", "{\"configtype\":\"json\"}",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "{\"param1\":\"value1\"}", true);
-        MicroServicePolicy microServicePolicy2 = getMicroServicePolicy("microService2", "", "{\"configtype\":\"json\"}",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "{\"param1\":\"value1\"}", true);
-        loopTest2.addMicroServicePolicy(microServicePolicy1);
-        loopTest2.addMicroServicePolicy(microServicePolicy2);
-        loopsRepository.saveAndFlush(loopTest2);
-        Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext).withProperty("loopObject", loopTest2)
-                .build();
-
-        camelContext.createProducerTemplate().send("direct:deploy-loop", myCamelExchange);
-
-        Loop loopAfterTest = loopService.getLoop("ControlLoopTest2");
-        Set<MicroServicePolicy> policyList = loopAfterTest.getMicroServicePolicies();
-        for (MicroServicePolicy policy : policyList) {
-            assertThat(policy.getDcaeDeploymentStatusUrl()).isNotNull();
-            assertThat(policy.getDcaeDeploymentId()).isNotNull();
-        }
-        assertThat(loopAfterTest.getDcaeDeploymentStatusUrl()).isNull();
-        assertThat(loopAfterTest.getDcaeDeploymentId()).isNull();
-    }
-
-    /**
-     * This method tests the undeployment of a single blueprint.
-     *
-     * @throws JsonSyntaxException In case of issues
-     * @throws IOException         In case of issues
-     */
-    @Test
-    @Transactional
-    public void undeployWithSingleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
-                "UUID-blueprint");
-        LoopTemplate template = new LoopTemplate();
-        template.setName("templateName");
-        template.setBlueprint("yamlcontent");
-        loopTest.setLoopTemplate(template);
-        loopTest.setDcaeDeploymentId("testDeploymentId");
-        loopTest.setDcaeDeploymentStatusUrl("testUrl");
-        MicroServicePolicy microServicePolicy = getMicroServicePolicy("configPolicyTest", "",
-                "{\"configtype\":\"json\"}", "tosca_definitions_version: tosca_simple_yaml_1_0_0",
-                "{\"param1\":\"value1\"}", true);
-        loopTest.addMicroServicePolicy(microServicePolicy);
-        loopService.saveOrUpdateLoop(loopTest);
-        Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext).withProperty("loopObject", loopTest)
-                .build();
-
-        camelContext.createProducerTemplate().send("direct:undeploy-loop", myCamelExchange);
-
-        Loop loopAfterTest = loopService.getLoop("ControlLoopTest");
-        assertThat(loopAfterTest.getDcaeDeploymentStatusUrl().contains("/uninstall")).isTrue();
-        assertThat(loopAfterTest.getDcaeDeploymentId()).isNull();
-    }
-
-    /**
-     * This method tests the undeployment of multiple separated blueprints.
-     *
-     * @throws JsonSyntaxException In case of issues
-     * @throws IOException         In case of issues
-     */
-    @Test
-    @Transactional
-    public void undeployWithMultipleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest2 = createLoop("ControlLoopTest2", "yamlcontent", "{\"dcaeDeployParameters\": {"
-                + "\"microService1\": {\"location_id\": \"\", \"policy_id\": \"TCA_ResourceInstanceName1_tca\"},"
-                + "\"microService2\": {\"location_id\": \"\", \"policy_id\": \"TCA_ResourceInstanceName2_tca\"}"
-                + "}}", "UUID-blueprint");
-        LoopTemplate template = new LoopTemplate();
-        template.setName("templateName");
-        loopTest2.setLoopTemplate(template);
-        MicroServicePolicy microServicePolicy1 = getMicroServicePolicy("microService1", "", "{\"configtype\":\"json\"}",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "{\"param1\":\"value1\"}", true,
-                "testDeploymentId1", "testDeploymentStatusUrl1");
-        MicroServicePolicy microServicePolicy2 = getMicroServicePolicy("microService2", "", "{\"configtype\":\"json\"}",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "{\"param1\":\"value1\"}", true,
-                "testDeploymentId2", "testDeploymentStatusUrl2");
-        loopTest2.addMicroServicePolicy(microServicePolicy1);
-        loopTest2.addMicroServicePolicy(microServicePolicy2);
-        loopsRepository.saveAndFlush(loopTest2);
-        Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext).withProperty("loopObject", loopTest2)
-                .build();
-
-        camelContext.createProducerTemplate().send("direct:undeploy-loop", myCamelExchange);
-
-        Loop loopAfterTest = loopService.getLoop("ControlLoopTest2");
-        Set<MicroServicePolicy> policyList = loopAfterTest.getMicroServicePolicies();
-        for (MicroServicePolicy policy : policyList) {
-            assertThat(policy.getDcaeDeploymentStatusUrl().contains("/uninstall")).isTrue();
-            assertThat(policy.getDcaeDeploymentId()).isNull();
-            
-        }
-        assertThat(loopAfterTest.getDcaeDeploymentStatusUrl()).isNull();
-        assertThat(loopAfterTest.getDcaeDeploymentId()).isNull();
-    }
-
-    /**
-     * This method tests the DCAE get status for a single blueprint.
-     *
-     * @throws JsonSyntaxException In case of issues
-     * @throws IOException         In case of issues
-     */
-    @Test
-    @Transactional
-    public void getStatusWithSingleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
-                "UUID-blueprint");
-        LoopTemplate template = new LoopTemplate();
-        template.setName("templateName");
-        template.setBlueprint("yamlcontent");
-        loopTest.setLoopTemplate(template);
-        MicroServicePolicy microServicePolicy = getMicroServicePolicy("configPolicyTest", "",
-                "{\"configtype\":\"json\"}", "tosca_definitions_version: tosca_simple_yaml_1_0_0",
-                "{\"param1\":\"value1\"}", true);
-        loopTest.addMicroServicePolicy(microServicePolicy);
-        loopService.saveOrUpdateLoop(loopTest);
-        assertThat(loopTest.getComponents().size()).isEqualTo(2);
-        assertThat(loopTest.getComponent("DCAE")).isNotNull();
-        assertThat(loopTest.getComponent("POLICY")).isNotNull();
-        Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext).withProperty("loopObject", loopTest)
-                .build();
-
-        camelContext.createProducerTemplate().send("direct:update-dcae-status-for-loop", myCamelExchange);
-
-        assertThat(loopTest.getComponent("DCAE").getState().getStateName()).isEqualTo("BLUEPRINT_DEPLOYED");
-
-        Loop loopAfterTest = loopService.getLoop("ControlLoopTest");
-        assertThat(loopAfterTest.getComponents().size()).isEqualTo(2);
-        assertThat(loopAfterTest.getComponent("DCAE")).isNotNull();
-        assertThat(loopAfterTest.getComponent("POLICY")).isNotNull();
-    }
-
-    /**
-     * This method tests the dcae get status for multiple blueprints.
-     *
-     * @throws JsonSyntaxException In case of issues
-     * @throws IOException         In case of issues
-     */
-    @Test
-    @Transactional
-    public void getStatusWithMultipleBlueprintTest() throws JsonSyntaxException, IOException {
-        Loop loopTest = createLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
-                "UUID-blueprint");
-        LoopTemplate template = new LoopTemplate();
-        template.setName("templateName");
-        loopTest.setLoopTemplate(template);
-        MicroServicePolicy microServicePolicy = getMicroServicePolicy("configPolicyTest", "",
-                "{\"configtype\":\"json\"}", "tosca_definitions_version: tosca_simple_yaml_1_0_0",
-                "{\"param1\":\"value1\"}", true);
-        MicroServicePolicy microServicePolicy2 = getMicroServicePolicy("configPolicyTest2", "",
-                "{\"configtype\":\"json\"}", "tosca_definitions_version: tosca_simple_yaml_1_0_0",
-                "{\"param1\":\"value1\"}", true);
-        loopTest.addMicroServicePolicy(microServicePolicy);
-        loopTest.addMicroServicePolicy(microServicePolicy2);
-        loopService.saveOrUpdateLoop(loopTest);
-        assertThat(loopTest.getComponents().size()).isEqualTo(3);
-        assertThat(loopTest.getComponent("DCAE")).isNull();
-        assertThat(loopTest.getComponent("DCAE_configPolicyTest")).isNotNull();
-        assertThat(loopTest.getComponent("DCAE_configPolicyTest2")).isNotNull();
-        assertThat(loopTest.getComponent("POLICY")).isNotNull();
-        Exchange myCamelExchange = ExchangeBuilder.anExchange(camelContext).withProperty("loopObject", loopTest)
-                .build();
-
-        camelContext.createProducerTemplate().send("direct:update-dcae-status-for-loop", myCamelExchange);
-
-        assertThat(loopTest.getComponent("DCAE_configPolicyTest").getState().getStateName())
-                .isEqualTo("BLUEPRINT_DEPLOYED");
-        assertThat(loopTest.getComponent("DCAE_configPolicyTest2").getState().getStateName())
-                .isEqualTo("BLUEPRINT_DEPLOYED");
-
-        Loop loopAfterTest = loopService.getLoop("ControlLoopTest");
-        assertThat(loopAfterTest.getComponents().size()).isEqualTo(3);
-        assertThat(loopAfterTest.getComponent("DCAE")).isNull();
-        assertThat(loopAfterTest.getComponent("POLICY")).isNotNull();
-        assertThat(loopTest.getComponent("DCAE_configPolicyTest")).isNotNull();
-        assertThat(loopTest.getComponent("DCAE_configPolicyTest2")).isNotNull();
-    }
-
-    private Loop createLoop(String name, String blueprint, String globalPropertiesJson,
-                            String dcaeBlueprintId) throws JsonSyntaxException, IOException {
-        Loop loop = new Loop(name);
-        loop.setGlobalPropertiesJson(new Gson().fromJson(globalPropertiesJson, JsonObject.class));
-        loop.setLastComputedState(LoopState.DESIGN);
-        return loop;
-    }
-
-    private MicroServicePolicy getMicroServicePolicy(String name, String modelType, String jsonRepresentation,
-                                                     String policyTosca, String jsonProperties, boolean shared) {
-
-        PolicyModel policyModel = new PolicyModel(modelType, policyTosca, "1.0.0");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel);
-        MicroServicePolicy microService = new MicroServicePolicy(name, policyModel,
-                shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), null, null, null);
-
-        microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
-        return microService;
-    }
-
-    private MicroServicePolicy getMicroServicePolicy(String name, String modelType, String jsonRepresentation,
-                                                     String policyTosca, String jsonProperties, boolean shared,
-                                                     String deploymengId,
-                                                     String deploymentStatusUrl) {
-        MicroServicePolicy microService = getMicroServicePolicy(name, modelType, jsonRepresentation, policyTosca,
-                jsonProperties, shared);
-
-        microService.setDcaeDeploymentId(deploymengId);
-        microService.setDcaeDeploymentStatusUrl(deploymentStatusUrl);
-        return microService;
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java b/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java
deleted file mode 100644
index a73b2784b..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/ExternalComponentStateTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-import org.onap.policy.clamp.loop.components.external.ExternalComponentState;
-
-public class ExternalComponentStateTest {
-    private ExternalComponentState state =  new ExternalComponentState("NOT_SENT",
-            "The policies defined have NOT yet been created on the policy engine", 90);
-
-    @Test
-    public void generalTest() {
-        assertThat(state.toString()).isEqualTo("NOT_SENT");
-        state.setLevel(70);
-        assertThat(state.getLevel()).isEqualTo(70);
-    }
-
-    @Test
-    public void equalsTest() {
-        assertThat(state.equals(null)).isEqualTo(false);
-
-        ExternalComponentState state2 =  new ExternalComponentState("NOT_SENT",
-               "The policies defined have NOT yet been created on the policy engine", 90);
-        assertThat(state.equals(state2)).isEqualTo(true);
-
-        assertThat(state.equals(12)).isEqualTo(false);
-
-        state2.setLevel(70);
-        assertThat(state.equals(state2)).isEqualTo(true);
-
-        ExternalComponentState state3 =  new ExternalComponentState("SENT",
-                "The policies defined have NOT yet been created on the policy engine", 90);
-        assertThat(state.equals(state3)).isEqualTo(false);
-
-        ExternalComponentState state4 =  new ExternalComponentState(null,
-                "The policies defined have NOT yet been created on the policy engine", 90);
-        ExternalComponentState state5 =  new ExternalComponentState(null,
-                "The policies defined have NOT yet been", 50);
-        assertThat(state4.equals(state3)).isEqualTo(false);
-        assertThat(state4.equals(state5)).isEqualTo(true);
-    }
-
-    @Test
-    public void compareToTest() {
-        ExternalComponentState state2 =  new ExternalComponentState("NOT_SENT",
-               "The policies defined have NOT yet been created on the policy engine", 90);
-        assertThat(state.compareTo(state2)).isEqualTo(0);
-
-        ExternalComponentState state3 =  new ExternalComponentState("SENT",
-                "The policies defined have NOT yet been created on the policy engine", 50);
-        assertThat(state.compareTo(state3)).isEqualTo(1);
-
-        ExternalComponentState state4 =  new ExternalComponentState(null,
-                "The policies defined have NOT yet been created on the policy engine", 100);
-        assertThat(state.compareTo(state4)).isEqualTo(-1);
-
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java
deleted file mode 100644
index 6728d292c..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/LoopControllerTestItCase.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia Intellectual Property. All rights
- *                             reserved.
- * Modifications Copyright (C) 2019 Huawei Technologies Co., Ltd.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import java.io.IOException;
-import java.util.Set;
-import javax.transaction.Transactional;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.loop.service.Service;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.loop.template.PolicyModelsService;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.policy.clamp.policy.operational.OperationalPolicy;
-import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class LoopControllerTestItCase {
-
-    private static final String EXAMPLE_LOOP_NAME = "ClosedLoopTest";
-    private static final String EXAMPLE_JSON = "{\"testName\":\"testValue\"}";
-
-    @Autowired
-    LoopService loopService;
-
-    @Autowired
-    LoopsRepository loopsRepository;
-
-    @Autowired
-    MicroServicePolicyService microServicePolicyService;
-
-    @Autowired
-    OperationalPolicyService operationalPolicyService;
-
-    @Autowired
-    PolicyModelsService policyModelsService;
-
-    @Autowired
-    LoopController loopController;
-
-    private void saveTestLoopToDb() {
-        Loop testLoop = createTestLoop(EXAMPLE_LOOP_NAME, "blueprint", "representation");
-        testLoop.setGlobalPropertiesJson(JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class));
-        LoopTemplate template = new LoopTemplate();
-        template.setName("testTemplate");
-        testLoop.setLoopTemplate(template);
-        Service modelService = new Service("{\"name\":\"serviceName\",\"UUID\":\"uuid\"}", "{}");
-        testLoop.setModelService(modelService);
-        loopService.saveOrUpdateLoop(testLoop);
-    }
-
-    private Loop createTestLoop(String loopName, String loopBlueprint, String loopSvg) {
-        return new Loop(loopName);
-    }
-
-    @Test
-    @Transactional
-    public void testUpdateOperationalPolicies() {
-        saveTestLoopToDb();
-        String policy = "[{\"name\":\"OPERATIONAL_CLholmes31_v1_0_vFW_PG_T10_k8s-holmes-rules\","
-                + "\"configurationsJson\":{"
-                + "\"operational_policy\":{\"controlLoop\":{\"trigger_policy\":\"unique-policy-id-1-modifyConfig\","
-                + "\"timeout\":\"3600\",\"abatement\":\"false\","
-                + "\"controlLoopName\":\"LOOP_CLholmes31_v1_0_vFW_PG_T10_k8s-holmes-rules\"},"
-                + "\"policies\":[{\"id\":\"unique-policy-id-1-modifyConfig\",\"recipe\":\"ModifyConfig\","
-                + "\"retry\":\"2\",\"timeout\":\"1200\",\"actor\":\"APPC\",\"payload\":\"{\\\"active-streams\\\":5}\","
-                + "\"success\":\"\",\"failure\":\"\",\"failure_timeout\":\"\",\"failure_retries\":\"\","
-                + "\"failure_exception\":\"\",\"failure_guard\":\"\",\"target\":{\"type\":\"VNF\","
-                + "\"resourceID\":\"vFW_PG_T1\"}}]}}}]";
-        JsonParser parser = new JsonParser();
-        JsonElement ele = parser.parse(policy);
-        JsonArray arr = ele.getAsJsonArray();
-        Loop loop = loopController.updateOperationalPolicies(EXAMPLE_LOOP_NAME, arr);
-        assertThat(loop.getOperationalPolicies()).hasSize(1);
-        Set<OperationalPolicy> opSet = loop.getOperationalPolicies();
-        OperationalPolicy op = opSet.iterator().next();
-        assertThat(op.getName()).isEqualTo("OPERATIONAL_CLholmes31_v1_0_vFW_PG_T10_k8s-holmes-rules");
-    }
-
-    @Test
-    @Transactional
-    public void testUpdateGlobalProperties() {
-        saveTestLoopToDb();
-        String policy = "{\"dcaeDeployParameters\":{\"aaiEnrichmentHost\":\"aai.onap.svc.cluster.local\","
-                + "\"aaiEnrichmentPort\":\"8443\",\"enableAAIEnrichment\":\"false\",\"dmaap_host\":\"message-router"
-                + ".onap\",\"dmaap_port\":\"3904\",\"enableRedisCaching\":\"false\",\"redisHosts\":\"dcae-redis.onap"
-                + ".svc.cluster.local:6379\",\"tag_version\":\"nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments"
-                + ".tca-cdap-container:1.1.1\",\"consul_host\":\"consul-server.onap\",\"consul_port\":\"8500\","
-                + "\"cbs_host\":\"config-binding-service\",\"cbs_port\":\"10000\",\"external_port\":\"32012\","
-                + "\"policy_model_id\":\"onap.policies.monitoring.cdap.tca.hi.lo.app\","
-                + "\"policy_id\":\"tca_k8s_CLTCA_v1_0_vFW_PG_T10_k8s-tca-clamp-policy-05162019\"}}";
-        JsonParser parser = new JsonParser();
-        JsonElement ele = parser.parse(policy);
-        JsonObject obj = ele.getAsJsonObject();
-        loopController.updateGlobalPropertiesJson(EXAMPLE_LOOP_NAME, obj);
-        Loop loop = loopController.getLoop(EXAMPLE_LOOP_NAME);
-        JsonObject globalPropertiesJson = loop.getGlobalPropertiesJson();
-        JsonObject prop = globalPropertiesJson.getAsJsonObject("dcaeDeployParameters");
-        assertThat(prop.get("aaiEnrichmentHost").getAsString()).isEqualTo("aai.onap.svc.cluster.local");
-    }
-
-    @Test
-    @Transactional
-    public void testUpdateMicroservicePolicy() {
-        saveTestLoopToDb();
-        PolicyModel policyModel = new PolicyModel("testPolicyModel",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel);
-        MicroServicePolicy policy = new MicroServicePolicy("policyName", policyModel, false,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
-        loopController.updateMicroservicePolicy(EXAMPLE_LOOP_NAME, policy);
-        assertThat(microServicePolicyService.isExisting("policyName")).isTrue();
-    }
-
-    @Test
-    @Transactional
-    public void testAddAndRemoveOperationalPolicies() throws IOException {
-        saveTestLoopToDb();
-        PolicyModel policyModel = new PolicyModel("testPolicyModel",
-                null, "1.0.0");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel);
-
-        loopController.addOperationalPolicy(EXAMPLE_LOOP_NAME, "testPolicyModel", "1.0.0");
-
-        Loop newLoop = loopController.getLoop(EXAMPLE_LOOP_NAME);
-        Set<OperationalPolicy> opPolicyList = newLoop.getOperationalPolicies();
-        assertThat(opPolicyList.size()).isEqualTo(1);
-        for (OperationalPolicy policy : opPolicyList) {
-            assertThat(policy.getName().contains("OPERATIONAL_serviceName")).isTrue();
-            Assertions.assertThat(policy.getPolicyModel().getPolicyModelType()).isEqualTo("testPolicyModel");
-            Assertions.assertThat(policy.getPolicyModel().getVersion()).isEqualTo("1.0.0");
-        }
-
-        loopController.removeOperationalPolicy(EXAMPLE_LOOP_NAME, "testPolicyModel", "1.0.0");
-        Loop newLoop2 = loopController.getLoop(EXAMPLE_LOOP_NAME);
-        assertThat(newLoop2.getOperationalPolicies().size()).isEqualTo(0);
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java
deleted file mode 100644
index 7b0ab8614..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/LoopLogServiceTestItCase.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Huawei Technologies Co., Ltd.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonObject;
-import java.util.Set;
-import javax.transaction.Transactional;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.loop.log.LogType;
-import org.onap.policy.clamp.loop.log.LoopLog;
-import org.onap.policy.clamp.loop.log.LoopLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class LoopLogServiceTestItCase {
-
-    private static final String EXAMPLE_LOOP_NAME = "ClosedLoopTest";
-    private static final String EXAMPLE_JSON = "{\"testName\":\"testValue\"}";
-    private static final String CLAMP_COMPONENT = "CLAMP";
-    private static final String SAMPLE_LOG_MESSAGE = "Sample log";
-    private static final String BLUEPRINT = "blueprint";
-
-    @Autowired
-    LoopService loopService;
-
-    @Autowired
-    LoopsRepository loopsRepository;
-
-    @Autowired
-    LoopLogService loopLogService;
-
-    private void saveTestLoopToDb() {
-        Loop testLoop = new Loop(EXAMPLE_LOOP_NAME);
-        testLoop.setGlobalPropertiesJson(JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class));
-        loopService.saveOrUpdateLoop(testLoop);
-    }
-
-    @Test
-    @Transactional
-    public void testAddLog() {
-        saveTestLoopToDb();
-        Loop loop = loopService.getLoop(EXAMPLE_LOOP_NAME);
-        loopLogService.addLog(SAMPLE_LOG_MESSAGE, "INFO", loop);
-        Set<LoopLog> loopLogs = loop.getLoopLogs();
-        assertThat(loopLogs).hasSize(1);
-        LoopLog loopLog = loopLogs.iterator().next();
-        assertThat(loopLog.getMessage()).isEqualTo(SAMPLE_LOG_MESSAGE);
-    }
-
-    @Test
-    @Transactional
-    public void testLoopLog() {
-        LoopLog log = new LoopLog();
-        Long id = Long.valueOf(100);
-        log.setId(id);
-        log.setLogComponent(CLAMP_COMPONENT);
-        log.setLogType(LogType.INFO);
-        log.setMessage(SAMPLE_LOG_MESSAGE);
-        Loop testLoop = new Loop(EXAMPLE_LOOP_NAME);
-        log.setLoop(testLoop);
-        assertThat(log.getMessage()).isEqualTo(SAMPLE_LOG_MESSAGE);
-        assertThat(log.getLogType()).isEqualTo(LogType.INFO);
-        assertThat(log.getLogComponent()).isEqualTo(CLAMP_COMPONENT);
-        assertThat(log.getId()).isEqualTo(id);
-        Assertions.assertThat(log.getLoop()).isEqualTo(testLoop);
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java
deleted file mode 100644
index e18dd2475..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/LoopRepositoriesItCase.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import java.time.Instant;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.loop.log.LogType;
-import org.onap.policy.clamp.loop.log.LoopLog;
-import org.onap.policy.clamp.loop.log.LoopLogRepository;
-import org.onap.policy.clamp.loop.service.Service;
-import org.onap.policy.clamp.loop.service.ServicesRepository;
-import org.onap.policy.clamp.loop.template.LoopElementModel;
-import org.onap.policy.clamp.loop.template.LoopElementModelsRepository;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.LoopTemplatesRepository;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.loop.template.PolicyModelId;
-import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.policy.clamp.policy.operational.OperationalPolicy;
-import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.transaction.annotation.Transactional;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
-public class LoopRepositoriesItCase {
-
-    private Gson gson = new GsonBuilder().setPrettyPrinting().excludeFieldsWithoutExposeAnnotation().create();
-
-    @Autowired
-    private LoopsRepository loopRepository;
-
-    @Autowired
-    private MicroServicePolicyService microServicePolicyService;
-
-    @Autowired
-    private OperationalPolicyService operationalPolicyService;
-
-    @Autowired
-    private LoopLogRepository loopLogRepository;
-
-    @Autowired
-    private LoopTemplatesRepository loopTemplateRepository;
-
-    @Autowired
-    private LoopElementModelsRepository microServiceModelsRepository;
-
-    @Autowired
-    private PolicyModelsRepository policyModelsRepository;
-
-    @Autowired
-    private ServicesRepository servicesRepository;
-
-    private Service getService(String serviceDetails, String resourceDetails) {
-        return new Service(serviceDetails, resourceDetails);
-    }
-
-    private OperationalPolicy getOperationalPolicy(String configJson, String name, PolicyModel policyModel) {
-        return new OperationalPolicy(name, null, new Gson().fromJson(configJson, JsonObject.class), policyModel,
-                null, null, null);
-    }
-
-    private LoopElementModel getLoopElementModel(String yaml, String name, String policyType, String createdBy,
-                                                 PolicyModel policyModel) {
-        LoopElementModel model = new LoopElementModel(name, policyType, yaml);
-        model.addPolicyModel(policyModel);
-        return model;
-    }
-
-    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,
-                                       String policyAcronym) {
-        return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
-    }
-
-    private LoopTemplate getLoopTemplates(String name, String blueprint, String createdBy,
-                                          Integer maxInstancesAllowed) {
-        LoopTemplate template = new LoopTemplate(name, blueprint, maxInstancesAllowed, null);
-        template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "org.onap.policy.drools", createdBy,
-                getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools")));
-        template.addLoopElementModel(getLoopElementModel("yaml", "oppolicy1", "org.onap.policy.drools.legacy",
-                createdBy, getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "DroolsLegacy")));
-        loopTemplateRepository.save(template);
-        return template;
-    }
-
-    private Loop getLoop(String name, String blueprint, String globalPropertiesJson,
-                         String dcaeId, String dcaeUrl, String dcaeBlueprintId) {
-        Loop loop = new Loop();
-        loop.setName(name);
-        loop.setGlobalPropertiesJson(new Gson().fromJson(globalPropertiesJson, JsonObject.class));
-        loop.setLastComputedState(LoopState.DESIGN);
-        loop.setDcaeDeploymentId(dcaeId);
-        loop.setDcaeDeploymentStatusUrl(dcaeUrl);
-        loop.setLoopTemplate(getLoopTemplates("templateName", "yaml", "toto", 1));
-        return loop;
-    }
-
-    private MicroServicePolicy getMicroServicePolicy(String name, String jsonRepresentation, String jsonProperties,
-                                                     boolean shared, PolicyModel policyModel) {
-        MicroServicePolicy microService = new MicroServicePolicy(name, policyModel, shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), null, null, null);
-        microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
-        return microService;
-    }
-
-    private LoopLog getLoopLog(LogType type, String message, Loop loop) {
-        return new LoopLog(message, type, "CLAMP", loop);
-    }
-
-    /**
-     * This method does a crud test and save a loop template and a loop object in db.
-     */
-    @Test
-    @Transactional
-    public void crudTest() {
-        // Setup
-        Loop loopTest = getLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
-                "123456789", "https://dcaetest.org", "UUID-blueprint");
-        OperationalPolicy opPolicy = this.getOperationalPolicy("{\"type\":\"GUARD\"}", "GuardOpPolicyTest",
-                getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "DroolsLegacy"));
-        loopTest.addOperationalPolicy(opPolicy);
-        MicroServicePolicy microServicePolicy = getMicroServicePolicy("configPolicyTest", "{\"configtype\":\"json\"}",
-                "{\"param1\":\"value1\"}", true, getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools"));
-        loopTest.addMicroServicePolicy(microServicePolicy);
-        LoopLog loopLog = getLoopLog(LogType.INFO, "test message", loopTest);
-        loopTest.addLog(loopLog);
-        Service service = getService(
-                "{\"name\": \"vLoadBalancerMS\", \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\"}", "{\"CP\": {}}");
-        loopTest.setModelService(service);
-
-        // Attempt to save into the database the entire loop
-        Loop loopInDb = loopRepository.save(loopTest);
-        assertThat(loopInDb).isNotNull();
-        assertThat(loopRepository.findById(loopInDb.getName()).get()).isNotNull();
-        assertThat(loopInDb.getCreatedDate()).isNotNull();
-        assertThat(loopInDb.getUpdatedDate()).isNotNull();
-        assertThat(loopInDb.getUpdatedDate()).isEqualTo(loopInDb.getCreatedDate());
-        assertThat(loopInDb.getName()).isEqualTo("ControlLoopTest");
-        // Autogen id so now set the ID in the previous model so that we can compare the
-        // objects
-        loopLog.setId(((LoopLog) loopInDb.getLoopLogs().toArray()[0]).getId());
-
-        assertThat(loopInDb).isEqualToIgnoringGivenFields(loopTest, "components", "createdDate", "updatedDate",
-                "createdBy", "updatedBy");
-        assertThat(loopRepository.existsById(loopTest.getName())).isEqualTo(true);
-        assertThat(operationalPolicyService.isExisting(opPolicy.getName())).isEqualTo(true);
-        assertThat(microServicePolicyService.isExisting(microServicePolicy.getName())).isEqualTo(true);
-        assertThat(loopLogRepository.existsById(loopLog.getId())).isEqualTo(true);
-        assertThat(loopTemplateRepository.existsById(loopInDb.getLoopTemplate().getName())).isEqualTo(true);
-        assertThat(loopTemplateRepository.existsById(loopInDb.getLoopTemplate().getName())).isEqualTo(true);
-        assertThat(servicesRepository.existsById(loopInDb.getModelService().getServiceUuid())).isEqualTo(true);
-        assertThat(microServiceModelsRepository.existsById(
-                loopInDb.getLoopTemplate().getLoopElementModelsUsed().first().getLoopElementModel().getName()))
-                .isEqualTo(true);
-        assertThat(policyModelsRepository.existsById(new PolicyModelId(
-                loopInDb.getLoopTemplate().getLoopElementModelsUsed().first().getLoopElementModel().getPolicyModels()
-                        .first().getPolicyModelType(),
-                loopInDb.getLoopTemplate().getLoopElementModelsUsed().first().getLoopElementModel().getPolicyModels()
-                        .first().getVersion()))).isEqualTo(true);
-
-        // Now attempt to read from database
-        Loop loopInDbRetrieved = loopRepository.findById(loopTest.getName()).get();
-        assertThat(loopInDbRetrieved).isEqualToIgnoringGivenFields(loopTest, "components", "createdDate", "updatedDate",
-                "createdBy", "updatedBy");
-        assertThat(loopInDbRetrieved).isEqualToComparingOnlyGivenFields(loopInDb, "createdDate", "updatedDate",
-                "createdBy", "updatedBy");
-        assertThat((LoopLog) loopInDbRetrieved.getLoopLogs().toArray()[0]).isEqualToComparingFieldByField(loopLog);
-        assertThat((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0])
-                .isEqualToIgnoringGivenFields(opPolicy, "createdDate", "updatedDate", "createdBy", "updatedBy");
-        Assertions.assertThat(
-                ((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getCreatedDate())
-                .isNotNull();
-        Assertions.assertThat(
-                ((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getUpdatedDate())
-                .isNotNull();
-        Assertions.assertThat(
-                ((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getCreatedBy())
-                .isNotNull();
-        Assertions.assertThat(
-                ((OperationalPolicy) loopInDbRetrieved.getOperationalPolicies().toArray()[0]).getUpdatedBy())
-                .isNotNull();
-
-        assertThat((MicroServicePolicy) loopInDbRetrieved.getMicroServicePolicies().toArray()[0])
-                .isEqualToIgnoringGivenFields(microServicePolicy, "createdDate", "updatedDate", "createdBy",
-                        "updatedBy");
-
-        // Attempt an update
-        ((LoopLog) loopInDbRetrieved.getLoopLogs().toArray()[0]).setLogInstant(Instant.now());
-        loopInDbRetrieved.setLastComputedState(LoopState.RUNNING);
-        Loop loopInDbRetrievedUpdated = loopRepository.saveAndFlush(loopInDbRetrieved);
-        // Loop loopInDbRetrievedUpdated =
-        // loopRepository.findById(loopTest.getName()).get();
-        assertThat((LoopLog) loopInDbRetrievedUpdated.getLoopLogs().toArray()[0])
-                .isEqualToComparingFieldByField(loopInDbRetrieved.getLoopLogs().toArray()[0]);
-        // UpdatedDate should have been changed
-        assertThat(loopInDbRetrievedUpdated.getUpdatedDate()).isNotEqualTo(loopInDbRetrievedUpdated.getCreatedDate());
-        // createdDate should have NOT been changed
-        assertThat(loopInDbRetrievedUpdated.getCreatedDate()).isEqualTo(loopInDb.getCreatedDate());
-        // other audit are the same
-        assertThat(loopInDbRetrievedUpdated.getCreatedBy()).isEqualTo("Not found");
-        assertThat(loopInDbRetrievedUpdated.getUpdatedBy()).isEqualTo("Not found");
-
-        // Attempt to delete the object and check it has well been cascaded
-
-        loopRepository.delete(loopInDbRetrieved);
-        assertThat(loopRepository.existsById(loopTest.getName())).isEqualTo(false);
-        assertThat(operationalPolicyService.isExisting(opPolicy.getName())).isEqualTo(false);
-        assertThat(microServicePolicyService.isExisting(microServicePolicy.getName())).isEqualTo(true);
-        assertThat(loopLogRepository.existsById(loopLog.getId())).isEqualTo(false);
-        assertThat(loopTemplateRepository.existsById(loopInDb.getLoopTemplate().getName())).isEqualTo(true);
-        assertThat(servicesRepository.existsById(loopInDb.getModelService().getServiceUuid())).isEqualTo(true);
-        assertThat(microServiceModelsRepository.existsById(
-                loopInDb.getLoopTemplate().getLoopElementModelsUsed().first().getLoopElementModel().getName()))
-                .isEqualTo(true);
-
-        assertThat(policyModelsRepository.existsById(new PolicyModelId(
-                loopInDb.getLoopTemplate().getLoopElementModelsUsed().first().getLoopElementModel().getPolicyModels()
-                        .first().getPolicyModelType(),
-                loopInDb.getLoopTemplate().getLoopElementModelsUsed().first().getLoopElementModel().getPolicyModels()
-                        .first().getVersion()))).isEqualTo(true);
-
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
deleted file mode 100644
index 74092727c..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/LoopServiceTestItCase.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 Nokia Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonObject;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.transaction.Transactional;
-import org.assertj.core.api.Assertions;
-import org.assertj.core.util.Lists;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.loop.log.LogType;
-import org.onap.policy.clamp.loop.log.LoopLog;
-import org.onap.policy.clamp.loop.log.LoopLogService;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.loop.template.PolicyModelsService;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicyService;
-import org.onap.policy.clamp.policy.operational.OperationalPolicy;
-import org.onap.policy.clamp.policy.operational.OperationalPolicyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class LoopServiceTestItCase {
-
-    private static final String EXAMPLE_LOOP_NAME = "ClosedLoopTest";
-    private static final String EXAMPLE_JSON = "{\"testName\":\"testValue\"}";
-
-    @Autowired
-    LoopService loopService;
-
-    @Autowired
-    LoopsRepository loopsRepository;
-
-    @Autowired
-    MicroServicePolicyService microServicePolicyService;
-
-    @Autowired
-    OperationalPolicyService operationalPolicyService;
-
-    @Autowired
-    LoopLogService loopLogService;
-
-    @Autowired
-    PolicyModelsService policyModelsService;
-
-    @Test
-    @Transactional
-    public void shouldCreateEmptyLoop() {
-        // given
-        String loopBlueprint = "blueprint";
-        Loop testLoop = createTestLoop(EXAMPLE_LOOP_NAME, loopBlueprint);
-        testLoop.setGlobalPropertiesJson(JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class));
-        testLoop.setLastComputedState(LoopState.DESIGN);
-
-        // when
-        Loop actualLoop = loopService.saveOrUpdateLoop(testLoop);
-
-        // then
-        assertThat(actualLoop).isNotNull();
-        assertThat(actualLoop).isEqualTo(loopsRepository.findById(actualLoop.getName()).get());
-        assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        assertThat(actualLoop.getGlobalPropertiesJson().getAsJsonPrimitive("testName").getAsString())
-                .isEqualTo("testValue");
-    }
-
-    @Test
-    @Transactional
-    public void shouldAddOperationalPolicyToLoop() {
-        // given
-        saveTestLoopToDb();
-        OperationalPolicy operationalPolicy = new OperationalPolicy("policyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null, null);
-
-        // when
-        Loop actualLoop = loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME,
-                Lists.newArrayList(operationalPolicy));
-
-        // then
-        assertThat(actualLoop).isNotNull();
-        assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        Set<OperationalPolicy> savedPolicies = actualLoop.getOperationalPolicies();
-        assertThat(savedPolicies).hasSize(1);
-        assertThat(savedPolicies)
-                .usingElementComparatorIgnoringFields("loop", "createdBy", "createdDate", "updatedBy", "updatedDate")
-                .contains(operationalPolicy);
-        OperationalPolicy savedPolicy = savedPolicies.iterator().next();
-        Assertions.assertThat(savedPolicy.getLoop().getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-
-    }
-
-    @Test
-    @Transactional
-    public void shouldAddMicroservicePolicyToLoop() {
-        // given
-        saveTestLoopToDb();
-        PolicyModel policyModel = new PolicyModel("org.policies.policyModel1",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "policyModel1");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel);
-        MicroServicePolicy microServicePolicy = new MicroServicePolicy("policyName", policyModel,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
-
-        // when
-        Loop actualLoop = loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME,
-                Lists.newArrayList(microServicePolicy));
-
-        // then
-        assertThat(actualLoop).isNotNull();
-        assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        Set<MicroServicePolicy> savedPolicies = actualLoop.getMicroServicePolicies();
-        assertThat(savedPolicies).hasSize(1);
-        assertThat(savedPolicies).usingElementComparatorIgnoringFields("usedByLoops", "createdDate", "updatedDate",
-                "createdBy", "updatedBy").containsExactly(microServicePolicy);
-        assertThat(savedPolicies).extracting("usedByLoops").hasSize(1);
-
-    }
-
-    @Test
-    @Transactional
-    //@Commit
-    public void shouldCreateNewMicroservicePolicyAndUpdateJsonRepresentationOfOldOne() {
-        // given
-        saveTestLoopToDb();
-        PolicyModel policyModel1 = new PolicyModel("org.policies.firstPolicyName",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "firstPolicyName");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = new PolicyModel("org.policies.secondPolicyName",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "secondPolicyName");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel2);
-        MicroServicePolicy firstMicroServicePolicy = new MicroServicePolicy("firstPolicyName", policyModel1, false,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
-
-        loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstMicroServicePolicy));
-        MicroServicePolicy secondMicroServicePolicy = new MicroServicePolicy("secondPolicyName", policyModel2, false,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
-
-        // when
-        firstMicroServicePolicy
-                .setConfigurationsJson(JsonUtils.GSON.fromJson("{\"name1\":\"value1\"}", JsonObject.class));
-        Loop actualLoop = loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME,
-                Lists.newArrayList(firstMicroServicePolicy, secondMicroServicePolicy));
-
-        // then
-        assertThat(actualLoop).isNotNull();
-        assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        Set<MicroServicePolicy> savedPolicies = actualLoop.getMicroServicePolicies();
-        assertThat(savedPolicies).hasSize(2);
-        assertThat(savedPolicies).contains(firstMicroServicePolicy);
-        assertThat(savedPolicies).contains(secondMicroServicePolicy);
-        assertThat(savedPolicies).usingElementComparatorIgnoringFields("usedByLoops", "createdDate", "updatedDate",
-                "createdBy", "updatedBy").containsExactlyInAnyOrder(firstMicroServicePolicy, secondMicroServicePolicy);
-    }
-
-    private void saveTestLoopToDb() {
-        Loop testLoop = createTestLoop(EXAMPLE_LOOP_NAME, "blueprint");
-        testLoop.setGlobalPropertiesJson(JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class));
-        LoopTemplate template = new LoopTemplate();
-        template.setName("testTemplate");
-        testLoop.setLoopTemplate(template);
-        loopService.saveOrUpdateLoop(testLoop);
-    }
-
-    @Test
-    @Transactional
-    public void shouldRemoveOldMicroservicePolicyIfNotInUpdatedList() {
-        // given
-        saveTestLoopToDb();
-        PolicyModel policyModel1 = new PolicyModel("org.policies.firstPolicyName",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "firstPolicyName");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = new PolicyModel("org.policies.secondPolicyName",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "secondPolicyName");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel2);
-        MicroServicePolicy firstMicroServicePolicy = new MicroServicePolicy("firstPolicyName", policyModel1,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
-        loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstMicroServicePolicy));
-
-        MicroServicePolicy secondMicroServicePolicy = new MicroServicePolicy("secondPolicyName", policyModel2,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
-
-        // when
-        Loop actualLoop = loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME,
-                Lists.newArrayList(secondMicroServicePolicy));
-
-        // then
-        assertThat(actualLoop).isNotNull();
-        assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        Set<MicroServicePolicy> savedPolicies = actualLoop.getMicroServicePolicies();
-        assertThat(savedPolicies).hasSize(1);
-        assertThat(savedPolicies).usingElementComparatorIgnoringFields("usedByLoops", "createdDate", "updatedDate",
-                "createdBy", "updatedBy").containsExactly(secondMicroServicePolicy);
-
-    }
-
-    @Test
-    @Transactional
-    public void shouldCreateNewOperationalPolicyAndUpdateJsonRepresentationOfOldOne() {
-        // given
-        saveTestLoopToDb();
-
-        JsonObject newJsonConfiguration = JsonUtils.GSON.fromJson("{}", JsonObject.class);
-
-        OperationalPolicy firstOperationalPolicy = new OperationalPolicy("firstPolicyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null, null);
-        loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstOperationalPolicy));
-
-        OperationalPolicy secondOperationalPolicy = new OperationalPolicy("secondPolicyName", null,
-                newJsonConfiguration, null, null, null, null);
-
-        // when
-        firstOperationalPolicy.setConfigurationsJson(newJsonConfiguration);
-        Loop actualLoop = loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME,
-                Lists.newArrayList(firstOperationalPolicy, secondOperationalPolicy));
-
-        // then
-        assertThat(actualLoop).isNotNull();
-        assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        Set<OperationalPolicy> savedPolicies = actualLoop.getOperationalPolicies();
-        assertThat(savedPolicies).hasSize(2);
-        assertThat(savedPolicies)
-                .usingElementComparatorIgnoringFields("loop", "createdDate", "updatedDate", "createdBy", "updatedBy")
-                .containsExactlyInAnyOrder(firstOperationalPolicy, secondOperationalPolicy);
-        Set<String> policiesLoops = Lists.newArrayList(savedPolicies).stream().map(OperationalPolicy::getLoop)
-                .map(Loop::getName).collect(Collectors.toSet());
-        assertThat(policiesLoops).containsExactly(EXAMPLE_LOOP_NAME);
-    }
-
-    @Test
-    @Transactional
-    public void shouldRemoveOldOperationalPolicyIfNotInUpdatedList() {
-        // given
-        saveTestLoopToDb();
-
-        OperationalPolicy firstOperationalPolicy = new OperationalPolicy("firstPolicyName", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null, null);
-        loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(firstOperationalPolicy));
-
-        OperationalPolicy secondOperationalPolicy = new OperationalPolicy("policyName", null,
-                JsonUtils.GSON.fromJson("{}", JsonObject.class), null, null, "pdpGroup1", "pdpSubgroup1");
-
-        // when
-        Loop actualLoop = loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME,
-                Lists.newArrayList(secondOperationalPolicy));
-
-        // then
-        assertThat(actualLoop).isNotNull();
-        assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        Set<OperationalPolicy> savedPolicies = actualLoop.getOperationalPolicies();
-        assertThat(savedPolicies).hasSize(1);
-        assertThat(savedPolicies)
-                .usingElementComparatorIgnoringFields("loop", "createdDate", "updatedDate", "createdBy", "updatedBy")
-                .containsExactly(secondOperationalPolicy);
-        OperationalPolicy savedPolicy = savedPolicies.iterator().next();
-        Assertions.assertThat(savedPolicy.getLoop().getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-
-    }
-
-    @Test
-    @Transactional
-    public void shouldCreateModelPropertiesAndUpdateJsonRepresentationOfOldOne() {
-        // given
-        saveTestLoopToDb();
-        String expectedJson = "{\"test\":\"test\"}";
-        JsonObject baseGlobalProperites = JsonUtils.GSON.fromJson("{}", JsonObject.class);
-        JsonObject updatedGlobalProperites = JsonUtils.GSON.fromJson(expectedJson, JsonObject.class);
-        loopService.updateAndSaveGlobalPropertiesJson(EXAMPLE_LOOP_NAME, baseGlobalProperites);
-
-        // when
-        Loop actualLoop = loopService.updateAndSaveGlobalPropertiesJson(EXAMPLE_LOOP_NAME, updatedGlobalProperites);
-
-        // then
-        assertThat(actualLoop).isNotNull();
-        assertThat(actualLoop.getName()).isEqualTo(EXAMPLE_LOOP_NAME);
-        JsonObject returnedGlobalProperties = actualLoop.getGlobalPropertiesJson();
-        assertThat(returnedGlobalProperties.getAsJsonObject()).isEqualTo(updatedGlobalProperites);
-    }
-
-    @Test
-    @Transactional
-    public void deleteAttempt() {
-        saveTestLoopToDb();
-        // Add log
-        Loop loop = loopsRepository.findById(EXAMPLE_LOOP_NAME).orElse(null);
-        loop.addLog(new LoopLog("test", LogType.INFO, "CLAMP", loop));
-        LoopTemplate template = new LoopTemplate();
-        template.setName("testTemplate");
-        loop.setLoopTemplate(template);
-        loop = loopService.saveOrUpdateLoop(loop);
-        // Add op policy
-        OperationalPolicy operationalPolicy = new OperationalPolicy("opPolicy", null,
-                JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null, null);
-        loopService.updateAndSaveOperationalPolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(operationalPolicy));
-
-        PolicyModel policyModel = new PolicyModel("org.policies.microPolicy",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "microPolicy");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel);
-        // Add Micro service policy
-        MicroServicePolicy microServicePolicy = new MicroServicePolicy("microPolicy", policyModel,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
-        loopService.updateAndSaveMicroservicePolicies(EXAMPLE_LOOP_NAME, Lists.newArrayList(microServicePolicy));
-
-        // Verify it's there
-        assertThat(loopsRepository.findById(EXAMPLE_LOOP_NAME).orElse(null)).isNotNull();
-        loopService.deleteLoop(EXAMPLE_LOOP_NAME);
-        // Verify it's well deleted and has been cascaded, except for Microservice
-        assertThat(loopsRepository.findById(EXAMPLE_LOOP_NAME).orElse(null)).isNull();
-        assertThat(microServicePolicyService.isExisting("microPolicy")).isTrue();
-        assertThat(operationalPolicyService.isExisting("opPolicy")).isFalse();
-        assertThat(loopLogService.isExisting(((LoopLog) loop.getLoopLogs().toArray()[0]).getId())).isFalse();
-    }
-
-    @Test
-    @Transactional
-    public void testUpdateLoopState() {
-        saveTestLoopToDb();
-        Loop loop = loopService.getLoop(EXAMPLE_LOOP_NAME);
-        loopService.updateLoopState(loop, "SUBMITTED");
-        Loop updatedLoop = loopService.getLoop(EXAMPLE_LOOP_NAME);
-        assertThat(updatedLoop.getLastComputedState()).isEqualTo(LoopState.SUBMITTED);
-    }
-
-    @Test
-    @Transactional
-    public void testUpdateDcaeDeploymentFields() {
-        saveTestLoopToDb();
-        Loop loop = loopService.getLoop(EXAMPLE_LOOP_NAME);
-        loopService.updateDcaeDeploymentFields(loop, "CLAMP_c5ce429a-f570-48c5-a7ea-53bed8f86f85",
-                "https://deployment-handler.onap:8443");
-        loop = loopService.getLoop(EXAMPLE_LOOP_NAME);
-        assertThat(loop.getDcaeDeploymentId()).isEqualTo("CLAMP_c5ce429a-f570-48c5-a7ea-53bed8f86f85");
-        assertThat(loop.getDcaeDeploymentStatusUrl()).isEqualTo("https://deployment-handler.onap:8443");
-    }
-
-    @Test
-    @Transactional
-    public void testUpdateMicroservicePolicy() {
-        saveTestLoopToDb();
-        assertThat(microServicePolicyService.isExisting("policyName")).isFalse();
-        PolicyModel policyModel = new PolicyModel("org.policies.policyName",
-                "tosca_definitions_version: tosca_simple_yaml_1_0_0", "1.0.0", "policyName");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel);
-        MicroServicePolicy microServicePolicy = new MicroServicePolicy("policyName", policyModel,
-                false, JsonUtils.GSON.fromJson(EXAMPLE_JSON, JsonObject.class), null, null, null);
-        loopService.updateMicroservicePolicy(EXAMPLE_LOOP_NAME, microServicePolicy);
-        assertThat(microServicePolicyService.isExisting("policyName")).isTrue();
-    }
-
-    private Loop createTestLoop(String loopName, String loopBlueprint) {
-        return new Loop(loopName);
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java b/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java
deleted file mode 100644
index 9dcd71ef1..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/LoopTemplateLoopElementModelTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-import org.onap.policy.clamp.loop.template.LoopElementModel;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-
-
-public class LoopTemplateLoopElementModelTest {
-
-    private LoopElementModel loopElementModel = getLoopElementModel("yaml", "microService1",
-            getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1"));
-    private LoopTemplate loopTemplate = getLoopTemplate("templateName", "yaml", 1);
-
-    private LoopElementModel getLoopElementModel(String yaml, String name, PolicyModel policyModel) {
-        LoopElementModel model = new LoopElementModel();
-        model.setBlueprint(yaml);
-        model.setName(name);
-        model.addPolicyModel(policyModel);
-        model.setLoopElementType("OPERATIONAL_POLICY");
-        return model;
-    }
-
-    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version, String policyAcronym,
-                                       String policyVariant) {
-        return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
-    }
-
-    private LoopTemplate getLoopTemplate(String name, String blueprint, Integer maxInstancesAllowed) {
-        LoopTemplate template = new LoopTemplate(name, blueprint, maxInstancesAllowed, null);
-        template.addLoopElementModel(loopElementModel);
-        return template;
-    }
-
-    /**
-     * This tests compareTo method.
-     */
-    @Test
-    public void compareToTest() {
-        LoopTemplateLoopElementModel model1 = new LoopTemplateLoopElementModel();
-        LoopTemplateLoopElementModel model2 = new LoopTemplateLoopElementModel();
-        assertThat(model1.compareTo(model2)).isEqualTo(1);
-
-        model1.setFlowOrder(2);
-        assertThat(model1.compareTo(model2)).isEqualTo(-1);
-
-        model2.setFlowOrder(3);
-        assertThat(model1.compareTo(model2)).isEqualTo(1);
-    }
-
-    /**
-     * This tests equals method.
-     */
-    @Test
-    public void equalsTest() {
-        LoopTemplateLoopElementModel model1 = new LoopTemplateLoopElementModel();
-        LoopTemplateLoopElementModel model2 = new LoopTemplateLoopElementModel();
-
-        assertThat(model1.equals(model2)).isTrue();
-
-        model1.setLoopTemplate(loopTemplate);
-        assertThat(model1.equals(model2)).isFalse();
-        model2.setLoopTemplate(loopTemplate);
-        assertThat(model1.equals(model2)).isTrue();
-
-        model1.setLoopElementModel(loopElementModel);
-        assertThat(model1.equals(model2)).isFalse();
-        model2.setLoopElementModel(loopElementModel);
-        assertThat(model1.equals(model2)).isTrue();
-
-        model1.setFlowOrder(1);
-        assertThat(model1.equals(model2)).isTrue();
-        model2.setFlowOrder(2);
-        assertThat(model1.equals(model2)).isTrue();
-    }
-
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java b/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java
deleted file mode 100644
index d608075fc..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/LoopTemplatesServiceItCase.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP CLAMP

- * ================================================================================

- * Copyright (C) 2020 AT&T Intellectual Property. All rights

- *                             reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- * http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END============================================

- * ===================================================================

- *

- */

-

-package org.onap.policy.clamp.loop;

-

-import static org.assertj.core.api.Assertions.assertThat;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-import static org.junit.jupiter.api.Assertions.assertEquals;

-

-import java.util.List;

-import java.util.SortedSet;

-import javax.transaction.Transactional;

-import org.junit.Test;

-import org.junit.runner.RunWith;

-import org.onap.policy.clamp.clds.Application;

-import org.onap.policy.clamp.loop.template.LoopElementModel;

-import org.onap.policy.clamp.loop.template.LoopTemplate;

-import org.onap.policy.clamp.loop.template.LoopTemplateLoopElementModel;

-import org.onap.policy.clamp.loop.template.LoopTemplatesService;

-import org.onap.policy.clamp.loop.template.LoopType;

-import org.onap.policy.clamp.loop.template.PolicyModel;

-import org.springframework.beans.factory.annotation.Autowired;

-import org.springframework.boot.test.context.SpringBootTest;

-import org.springframework.test.context.junit4.SpringRunner;

-

-@RunWith(SpringRunner.class)

-@SpringBootTest(classes = Application.class)

-public class LoopTemplatesServiceItCase {

-

-    @Autowired

-    LoopTemplatesService loopTemplatesService;

-

-    private static final String POLICY_MODEL_TYPE_1 = "org.onap.test";

-    private static final String VERSION = "1.0.0";

-

-    private LoopElementModel getLoopElementModel(String yaml, String name, String loopElementType,

-                                                 String createdBy, PolicyModel policyModel) {

-        LoopElementModel model = new LoopElementModel(name, loopElementType, yaml);

-        model.setBlueprint("");

-        model.setDcaeBlueprintId("");

-        model.addPolicyModel(policyModel);

-        return model;

-    }

-

-    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,

-                                       String policyAcronym, String createdBy) {

-        return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);

-    }

-

-    private LoopTemplate getLoopTemplate(String name, String blueprint, String createdBy, Integer maxInstancesAllowed) {

-        LoopTemplate template =

-                new LoopTemplate(name, blueprint, maxInstancesAllowed, null);

-        template.addLoopElementModel(getLoopElementModel("yaml", "microService1", "MicroService",

-                createdBy, getPolicyModel(POLICY_MODEL_TYPE_1, "yaml", VERSION, "MS1", createdBy)));

-        template.setAllowedLoopType(LoopType.OPEN);

-        return template;

-    }

-

-    @Test

-    @Transactional

-    public void shouldSaveOrUpdateLoopTemplate() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

-        LoopTemplate actualLoopTemplate =

-                loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

-

-        assertNotNull(actualLoopTemplate);

-        assertThat(loopTemplate.getName()).isEqualTo("TemplateName");

-        assertThat(loopTemplate.getAllowedLoopType()).isEqualTo(LoopType.OPEN);

-    }

-

-    @Test

-    @Transactional

-    public void shouldReturnAllLoopTemplates() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

-        List<LoopTemplate> loopTemplateList = loopTemplatesService.getAllLoopTemplates();

-

-        assertNotNull(loopTemplateList);

-    }

-

-    @Test

-    @Transactional

-    public void shouldReturnLoopTemplateNames() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

-        List<String> loopTemplateNames = loopTemplatesService.getLoopTemplateNames();

-

-        assertNotNull(loopTemplateNames);

-        assertEquals("TemplateName", loopTemplateNames.get(0));

-    }

-

-    @Test

-    @Transactional

-    public void shouldReturnLoopTemplate() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

-        LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");

-

-        assertNotNull(actualLoopTemplate);

-        assertThat(loopTemplate).isEqualTo(actualLoopTemplate);

-        assertThat(loopTemplate.getName()).isEqualTo(actualLoopTemplate.getName());

-        assertThat(loopTemplate.getMaximumInstancesAllowed())

-                .isEqualTo(actualLoopTemplate.getMaximumInstancesAllowed());

-        SortedSet<LoopTemplateLoopElementModel> loopElementModelsUsed =

-                loopTemplate.getLoopElementModelsUsed();

-        LoopTemplateLoopElementModel loopTemplateLoopElementModel = loopElementModelsUsed.first();

-        assertThat(loopTemplateLoopElementModel.getLoopElementModel().getName())

-                .isEqualTo("microService1");

-        assertThat(loopTemplateLoopElementModel.getLoopTemplate().getName())

-                .isEqualTo("TemplateName");

-        assertNull(actualLoopTemplate.getBlueprint());

-        assertNull(actualLoopTemplate.getModelService());

-    }

-

-    @Test

-    @Transactional

-    public void shouldDeleteLoopTemplate() {

-        LoopTemplate loopTemplate = getLoopTemplate("TemplateName", null, "xyz", -1);

-        loopTemplatesService.saveOrUpdateLoopTemplate(loopTemplate);

-        loopTemplatesService.deleteLoopTemplate("TemplateName");

-        LoopTemplate actualLoopTemplate = loopTemplatesService.getLoopTemplate("TemplateName");

-        assertNull(actualLoopTemplate);

-    }

-

-}

diff --git a/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java b/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java
deleted file mode 100644
index 0fc4b0b5c..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/LoopToJsonTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import java.io.IOException;
-import java.util.Random;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.log.LogType;
-import org.onap.policy.clamp.loop.log.LoopLog;
-import org.onap.policy.clamp.loop.service.Service;
-import org.onap.policy.clamp.loop.template.LoopElementModel;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.policy.clamp.policy.operational.OperationalPolicy;
-
-public class LoopToJsonTest {
-
-    private Gson gson = new Gson();
-
-    private OperationalPolicy getOperationalPolicy(String configJson, String name) {
-        return new OperationalPolicy(name, null, gson.fromJson(configJson, JsonObject.class),
-                getPolicyModel("org.onap.policy.drools.legacy", "yaml", "1.0.0", "Drools", "type1"), null, null, null);
-    }
-
-    private Loop getLoop(String name, String blueprint, String globalPropertiesJson,
-                         String dcaeId, String dcaeUrl, String dcaeBlueprintId)
-            throws JsonSyntaxException, IOException {
-        Loop loop = new Loop(name);
-        loop.setGlobalPropertiesJson(new Gson().fromJson(globalPropertiesJson, JsonObject.class));
-        loop.setLastComputedState(LoopState.DESIGN);
-        loop.setDcaeDeploymentId(dcaeId);
-        loop.setDcaeDeploymentStatusUrl(dcaeUrl);
-        return loop;
-    }
-
-    private MicroServicePolicy getMicroServicePolicy(String name, String modelType, String jsonRepresentation,
-                                                     String policyTosca, String jsonProperties, boolean shared) {
-        MicroServicePolicy microService = new MicroServicePolicy(name, new PolicyModel(modelType, policyTosca, "1.0.0"),
-                shared,
-                gson.fromJson(jsonRepresentation, JsonObject.class), null, null, null);
-        microService.setConfigurationsJson(new Gson().fromJson(jsonProperties, JsonObject.class));
-        return microService;
-    }
-
-    private LoopElementModel getLoopElementModel(String yaml, String name, PolicyModel policyModel) {
-        LoopElementModel model = new LoopElementModel();
-        model.setBlueprint(yaml);
-        model.setName(name);
-        model.addPolicyModel(policyModel);
-        model.setLoopElementType("OPERATIONAL_POLICY");
-        return model;
-    }
-
-    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version, String policyAcronym,
-                                       String policyVariant) {
-        return new PolicyModel(policyType, policyModelTosca, version, policyAcronym);
-    }
-
-    private LoopTemplate getLoopTemplate(String name, String blueprint, Integer maxInstancesAllowed) {
-        LoopTemplate template = new LoopTemplate(name, blueprint, maxInstancesAllowed, null);
-        template.addLoopElementModel(getLoopElementModel("yaml", "microService1",
-                getPolicyModel("org.onap.policy.drools", "yaml", "1.0.0", "Drools", "type1")));
-        return template;
-    }
-
-    private LoopLog getLoopLog(LogType type, String message, Loop loop) {
-        LoopLog log = new LoopLog(message, type, "CLAMP", loop);
-        log.setId(Long.valueOf(new Random().nextInt()));
-        return log;
-    }
-
-    /**
-     * This tests a GSON encode/decode.
-     *
-     * @throws IOException In case of failure
-     */
-    @Test
-    public void loopGsonTest() throws IOException {
-        Loop loopTest = getLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
-                "123456789", "https://dcaetest.org", "UUID-blueprint");
-        OperationalPolicy opPolicy = this.getOperationalPolicy(
-                ResourceFileUtils.getResourceAsString("tosca/operational-policy-properties.json"), "GuardOpPolicyTest");
-        loopTest.addOperationalPolicy(opPolicy);
-        MicroServicePolicy microServicePolicy = getMicroServicePolicy("configPolicyTest", "",
-                "{\"configtype\":\"json\"}", "tosca_definitions_version: tosca_simple_yaml_1_0_0",
-                "{\"param1\":\"value1\"}", true);
-        loopTest.addMicroServicePolicy(microServicePolicy);
-        LoopLog loopLog = getLoopLog(LogType.INFO, "test message", loopTest);
-        loopTest.addLog(loopLog);
-        LoopTemplate loopTemplate = getLoopTemplate("templateName", "yaml", 1);
-        loopTest.setLoopTemplate(loopTemplate);
-
-        String jsonSerialized = JsonUtils.GSON_JPA_MODEL.toJson(loopTest);
-        assertThat(jsonSerialized).isNotNull().isNotEmpty();
-        System.out.println(jsonSerialized);
-        Loop loopTestDeserialized = JsonUtils.GSON_JPA_MODEL.fromJson(jsonSerialized, Loop.class);
-        assertNotNull(loopTestDeserialized);
-        assertThat(loopTestDeserialized).isEqualToIgnoringGivenFields(loopTest, "svgRepresentation", "blueprint",
-                "components");
-        assertThat(loopTestDeserialized.getComponent("DCAE").getState())
-                .isEqualToComparingFieldByField(loopTest.getComponent("DCAE").getState());
-        assertThat(loopTestDeserialized.getComponent("POLICY").getState()).isEqualToComparingOnlyGivenFields(
-                loopTest.getComponent("POLICY").getState(), "stateName", "description");
-        // blueprint not exposed so wont be deserialized
-
-        assertThat(loopTestDeserialized.getOperationalPolicies()).containsExactly(opPolicy);
-        assertThat(loopTestDeserialized.getMicroServicePolicies()).containsExactly(microServicePolicy);
-        assertThat(loopTestDeserialized.getLoopLogs()).containsExactly(loopLog);
-        assertThat((LoopLog) loopTestDeserialized.getLoopLogs().toArray()[0]).isEqualToIgnoringGivenFields(loopLog,
-                "loop");
-
-        // Verify the loop template
-        assertThat(loopTestDeserialized.getLoopTemplate()).isEqualTo(loopTemplate);
-    }
-
-    /**
-     * This tests the service object GSON encode/decode.
-     *
-     * @throws IOException In case of issues
-     */
-    @Test
-    public void loopServiceTest() throws IOException {
-        Loop loopTest2 = getLoop("ControlLoopTest", "yamlcontent", "{\"testname\":\"testvalue\"}",
-                "123456789", "https://dcaetest.org", "UUID-blueprint");
-
-        JsonObject jsonModel = new GsonBuilder().create()
-                .fromJson(ResourceFileUtils.getResourceAsString("tosca/model-properties.json"), JsonObject.class);
-        Service service = new Service(jsonModel.get("serviceDetails").getAsJsonObject(),
-                jsonModel.get("resourceDetails").getAsJsonObject(), "1.0");
-        loopTest2.setModelService(service);
-        String jsonSerialized = JsonUtils.GSON_JPA_MODEL.toJson(loopTest2);
-        assertThat(jsonSerialized).isNotNull().isNotEmpty();
-        System.out.println(jsonSerialized);
-
-        Loop loopTestDeserialized = JsonUtils.GSON_JPA_MODEL.fromJson(jsonSerialized, Loop.class);
-        assertNotNull(loopTestDeserialized);
-        assertThat(loopTestDeserialized).isEqualToIgnoringGivenFields(loopTest2, "modelService", "svgRepresentation",
-                "blueprint", "components");
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java
deleted file mode 100644
index 5b4e405bb..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/PolicyComponentTest.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.components.external.ExternalComponentState;
-import org.onap.policy.clamp.loop.components.external.PolicyComponent;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.policy.clamp.policy.operational.OperationalPolicy;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-public class PolicyComponentTest {
-
-    /**
-     * Test the computeState method.
-     * oldState           newState        expectedFinalState
-     * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
-     * NOT_SENT             SENT                NOT_SENT
-     * NOT_SENT           NOT_SENT              NOT_SENT
-     * NOT_SENT           IN_ERROR              IN_ERROR
-     */
-    @Test
-    public void computeStateTestOriginalStateUnknown() {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-        // policy found + deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        PolicyComponent policy = new PolicyComponent();
-
-        ExternalComponentState state = policy.computeState(exchange);
-        assertThat(state.getStateName()).isEqualTo("SENT_AND_DEPLOYED");
-        // policy found + not deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state2 = policy.computeState(exchange);
-        assertThat(state2.getStateName()).isEqualTo("SENT");
-        // policy not found + not deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
-        // policy not found + deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-    }
-
-    /**
-     * Test the computeState method.
-     * oldState           newState        expectedFinalState
-     * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
-     * NOT_SENT             SENT                NOT_SENT
-     * NOT_SENT           NOT_SENT              NOT_SENT
-     * NOT_SENT           IN_ERROR              IN_ERROR
-     */
-    @Test
-    public void computeStateTestOriginalStateNotSent() {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-        // policy found + deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        PolicyComponent policy = new PolicyComponent();
-        ExternalComponentState notSent = new ExternalComponentState("NOT_SENT",
-                "The policies defined have NOT yet been created on the policy engine", 90);
-        policy.setState(notSent);
-        ExternalComponentState state = policy.computeState(exchange);
-        assertThat(state.getStateName()).isEqualTo("NOT_SENT");
-        // policy found + not deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state2 = policy.computeState(exchange);
-        assertThat(state2.getStateName()).isEqualTo("NOT_SENT");
-        // policy not found + not deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
-        // policy not found + deployed
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-    }
-
-
-    /**
-     * Test the computeState method.
-     * oldState           newState        expectedFinalState
-     * SENT                 SENT                SENT
-     * SENT          SENT_AND_DEPLOYED          SENT
-     * SENT              IN_ERROR              IN_ERROR
-     * SENT              NOT_SENT              NOT_SENT
-     */
-    @Test
-    public void computeStateTestOriginalStateSent() throws IOException {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-        PolicyComponent policy = new PolicyComponent();
-        ExternalComponentState sent = new ExternalComponentState("SENT",
-                "The policies defined have been created but NOT deployed on the policy engine", 50);
-        policy.setState(sent);
-        // new policy state SENT
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state = policy.computeState(exchange);
-        assertThat(state.getStateName()).isEqualTo("SENT");
-        // new policy state SENT_AND_DEPLOYED
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state2 = policy.computeState(exchange);
-        assertThat(state2.getStateName()).isEqualTo("SENT");
-        // new policy state IN_ERROR
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-        // new policy state NOT_SENT
-        policy.setState(sent);
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
-    }
-
-    /**
-     * Test the computeState method.
-     * oldState                   newState        expectedFinalState
-     * SENT_AND_DEPLOYED     SENT_AND_DEPLOYED    SENT_AND_DEPLOYED
-     * SENT_AND_DEPLOYED            SENT                SENT
-     * SENT_AND_DEPLOYED          IN_ERROR            IN_ERROR
-     * SENT_AND_DEPLOYED          NOT_SENT            NOT_SENT
-     */
-    @Test
-    public void computeStateTestOriginalStateSentAndDeployed() throws IOException {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-        PolicyComponent policy = new PolicyComponent();
-        ExternalComponentState sendDeployed = new ExternalComponentState("SENT_AND_DEPLOYED",
-                "The policies defined have been created and deployed on the policy engine", 10);
-        policy.setState(sendDeployed);
-        // new policy state SENT_AND_DEPLOYED
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state = policy.computeState(exchange);
-        assertThat(state.getStateName()).isEqualTo("SENT_AND_DEPLOYED");
-        // new policy state SENT
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state2 = policy.computeState(exchange);
-        assertThat(state2.getStateName()).isEqualTo("SENT");
-        // new policy state IN_ERROR
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-        // new policy state NOT_SENT
-        policy.setState(sendDeployed);
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
-    }
-
-
-    /**
-     * Test the computeState method.
-     * oldState           newState        expectedFinalState
-     * IN_ERROR     SENT_AND_DEPLOYED         IN_ERROR
-     * IN_ERROR            SENT               IN_ERROR
-     * IN_ERROR          IN_ERROR             IN_ERROR
-     * IN_ERROR          NOT_SENT             IN_ERROR
-     */
-    @Test
-    public void computeStateTestOriginalStateInError() throws IOException {
-        Exchange exchange = Mockito.mock(Exchange.class);
-        Message message = Mockito.mock(Message.class);
-        Exchange exchange2 = Mockito.mock(Exchange.class);
-        Mockito.when(exchange.getIn()).thenReturn(message);
-        Mockito.when(message.getExchange()).thenReturn(exchange2);
-        PolicyComponent policy = new PolicyComponent();
-        ExternalComponentState inError = new ExternalComponentState("IN_ERROR",
-                "There was an error during the sending to policy, the policy engine may be corrupted or inconsistent",
-                100);
-        policy.setState(inError);
-        // new policy state SENT_AND_DEPLOYED
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state = policy.computeState(exchange);
-        assertThat(state.getStateName()).isEqualTo("IN_ERROR");
-        // new policy state SENT
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state2 = policy.computeState(exchange);
-        assertThat(state2.getStateName()).isEqualTo("IN_ERROR");
-        // new policy state IN_ERROR
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-        ExternalComponentState state3 = policy.computeState(exchange);
-        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
-        // new policy state NOT_SENT
-        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-        ExternalComponentState state4 = policy.computeState(exchange);
-
-        assertThat(state4.getStateName()).isEqualTo("IN_ERROR");
-    }
-
-    /**
-     * Test the create policies payload PdpGroup test.
-     */
-    @Test
-    public void createPoliciesPayloadPdpGroupTest() throws IOException {
-        Loop loopTest = new Loop("ControlLoopTest");
-        PolicyModel policyModel1 = new PolicyModel("onap.policies.monitoring.test", null, "1.0.0");
-
-        MicroServicePolicy microServicePolicy = new MicroServicePolicy("configPolicyTest", policyModel1, true,
-                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null, "pdpGroup1", "pdpSubgroup1");
-        loopTest.addMicroServicePolicy(microServicePolicy);
-
-        MicroServicePolicy microServicePolicy2 = new MicroServicePolicy("configPolicyTest2", policyModel1, true,
-                new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class), null, "pdpGroup2", "pdpSubgroup1");
-        loopTest.addMicroServicePolicy(microServicePolicy2);
-
-        PolicyModel policyModel2 = new PolicyModel("onap.policies.monitoring.test2", null,
-                "1.0.0");
-        OperationalPolicy opPolicy =
-                new OperationalPolicy("opPolicy", new Gson().fromJson("{\"configtype\":\"json\"}", JsonObject.class),
-                        new Gson().fromJson("{\"jsonschema\":\"schema\"}", JsonObject.class), policyModel2, null,
-                        "pdpGroup2",
-                        "pdpSubgroup2");
-
-        loopTest.addOperationalPolicy(opPolicy);
-        OperationalPolicy opLegacyPolicy =
-                new OperationalPolicy("opLegacyPolicy", new Gson().fromJson(
-                        "{\"guard_policies\":[{\"policy-id\":\"guard1\"}]}", JsonObject.class),
-                        new Gson().fromJson("{\"jsonschema\":\"schema\"}", JsonObject.class), policyModel2, null,
-                        "pdpGroup2",
-                        "pdpSubgroup2");
-
-        loopTest.addOperationalPolicy(opLegacyPolicy);
-
-        LoopTemplate loopTemplate = new LoopTemplate("test", "yaml", 1, null);
-        loopTemplate.setDcaeBlueprintId("UUID-blueprint");
-        loopTest.setLoopTemplate(loopTemplate);
-
-        JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("example/policy/pdp-group-policy-payload.json"),
-                PolicyComponent.createPoliciesPayloadPdpGroup(loopTest, "POST"), false);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java b/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java
deleted file mode 100644
index a2563b8d3..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/PolicyModelServiceItCase.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.stream.Collectors;
-import javax.transaction.Transactional;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.loop.template.PolicyModelId;
-import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
-import org.onap.policy.clamp.loop.template.PolicyModelsService;
-import org.onap.policy.models.pdp.concepts.PdpGroup;
-import org.onap.policy.models.pdp.concepts.PdpGroups;
-import org.onap.policy.models.pdp.concepts.PdpSubGroup;
-import org.onap.policy.models.pdp.enums.PdpState;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-import org.skyscreamer.jsonassert.JSONAssert;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class PolicyModelServiceItCase {
-
-    @Autowired
-    PolicyModelsService policyModelsService;
-
-    @Autowired
-    PolicyModelsRepository policyModelsRepository;
-
-    private static final String POLICY_MODEL_TYPE_1 = "org.onap.testos";
-    private static final String POLICY_MODEL_TYPE_1_VERSION_1 = "1.0.0";
-
-    private static final String POLICY_MODEL_TYPE_2 = "org.onap.testos2";
-    private static final String POLICY_MODEL_TYPE_3 = "org.onap.testos3";
-    private static final String POLICY_MODEL_TYPE_2_VERSION_1 = "1.0.0";
-    private static final String POLICY_MODEL_TYPE_3_VERSION_1 = "1.0.0";
-    private static final String POLICY_MODEL_TYPE_2_VERSION_2 = "2.0.0";
-
-    private PolicyModel getPolicyModel(String policyType, String policyModelTosca, String version,
-                                       String policyAcronym, String policyVariant, String createdBy) {
-        PolicyModel policyModel = new PolicyModel();
-        policyModel.setCreatedBy(createdBy);
-        policyModel.setPolicyAcronym(policyAcronym);
-        policyModel.setPolicyModelTosca(policyModelTosca);
-        policyModel.setPolicyModelType(policyType);
-        policyModel.setUpdatedBy(createdBy);
-        policyModel.setVersion(version);
-        return policyModel;
-    }
-
-    /**
-     * This test the create policy Model.
-     */
-    @Test
-    @Transactional
-    public void shouldCreatePolicyModel() {
-        // given
-        PolicyModel policyModel = getPolicyModel(POLICY_MODEL_TYPE_1, "yaml",
-                POLICY_MODEL_TYPE_1_VERSION_1, "TEST", "VARIANT", "user");
-
-        // when
-        PolicyModel actualPolicyModel = policyModelsService.saveOrUpdatePolicyModel(policyModel);
-
-        // then
-        assertThat(actualPolicyModel).isNotNull();
-        assertThat(actualPolicyModel).isEqualTo(policyModelsRepository
-                .findById(new PolicyModelId(actualPolicyModel.getPolicyModelType(),
-                        actualPolicyModel.getVersion()))
-                .get());
-        assertThat(actualPolicyModel.getPolicyModelType())
-                .isEqualTo(policyModel.getPolicyModelType());
-        Assertions.assertThat(actualPolicyModel.getCreatedBy()).isEqualTo("Not found");
-        Assertions.assertThat(actualPolicyModel.getCreatedDate()).isNotNull();
-        assertThat(actualPolicyModel.getPolicyAcronym()).isEqualTo(policyModel.getPolicyAcronym());
-        assertThat(actualPolicyModel.getPolicyModelTosca())
-                .isEqualTo(policyModel.getPolicyModelTosca());
-        Assertions.assertThat(actualPolicyModel.getUpdatedBy()).isEqualTo("Not found");
-        Assertions.assertThat(actualPolicyModel.getUpdatedDate()).isNotNull();
-        assertThat(actualPolicyModel.getVersion()).isEqualTo(policyModel.getVersion());
-
-        assertThat(
-                policyModelsService.getPolicyModel(POLICY_MODEL_TYPE_1, POLICY_MODEL_TYPE_1_VERSION_1))
-                .isEqualToIgnoringGivenFields(policyModel, "createdDate", "updatedDate",
-                        "createdBy", "updatedBy");
-    }
-
-    /**
-     * This tests the getPolicyModelJson. A json is expected.
-     *
-     * @throws IOException In case of failure
-     */
-    @Test
-    @Transactional
-    public void shouldGetPolicyModelInJson() throws IOException {
-        PolicyModel policyModel = getPolicyModel("onap.policies.monitoring.cdap.tca.hi.lo.app",
-                ResourceFileUtils.getResourceAsString(
-                        "http-cache/example/policy/api/v1/policytypes/"
-                                + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file"),
-                "1.0.0", "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel);
-
-        JsonObject policyTypeJson =
-                policyModelsService.getPolicyModelJson("onap.policies.monitoring.cdap.tca.hi.lo.app", "1.0.0");
-        assertThat(policyTypeJson).isNotNull();
-        JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/tca_hi_lo.json"),
-                policyTypeJson.toString(),
-                true);
-    }
-
-    /**
-     * This tests a getAllPolicyModelTypes get.
-     */
-    @Test
-    @Transactional
-    public void shouldReturnAllPolicyModelTypes() {
-        // given
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_1, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel2);
-        List<String> policyModelTypesList = policyModelsService.getAllPolicyModelTypes();
-
-        assertThat(policyModelTypesList).contains(policyModel1.getPolicyModelType(),
-                policyModel2.getPolicyModelType());
-    }
-
-    /**
-     * This tests a getAllPolicyModels get.
-     */
-    @Test
-    @Transactional
-    public void shouldReturnAllPolicyModels() {
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_1, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel2);
-
-        assertThat(policyModelsService.getAllPolicyModels()).contains(policyModel1, policyModel2);
-    }
-
-    /**
-     * This tests a getAllPolicyModelsByType get.
-     */
-    @Test
-    @Transactional
-    public void shouldReturnAllModelsByType() {
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_1, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel2);
-
-        assertThat(policyModelsService.getAllPolicyModelsByType(POLICY_MODEL_TYPE_2))
-                .contains(policyModel1, policyModel2);
-    }
-
-    /**
-     * This tests the sorting of policyModel.
-     */
-    @Test
-    @Transactional
-    public void shouldReturnSortedSet() {
-        PolicyModel policyModel1 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_1, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel1);
-        PolicyModel policyModel2 = getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel2);
-        PolicyModel policyModel3 = getPolicyModel(POLICY_MODEL_TYPE_3, "yaml",
-                POLICY_MODEL_TYPE_3_VERSION_1, "TEST", "VARIANT", "user");
-        policyModelsService.saveOrUpdatePolicyModel(policyModel3);
-
-        SortedSet<PolicyModel> sortedSet = new TreeSet<>();
-        policyModelsService.getAllPolicyModels().forEach(sortedSet::add);
-        List<PolicyModel> listToCheck =
-                sortedSet
-                        .stream().filter(policy -> policy.equals(policyModel3)
-                        || policy.equals(policyModel2) || policy.equals(policyModel1))
-                        .collect(Collectors.toList());
-        assertThat(listToCheck.get(0)).isEqualByComparingTo(policyModel2);
-        assertThat(listToCheck.get(1)).isEqualByComparingTo(policyModel1);
-        assertThat(listToCheck.get(2)).isEqualByComparingTo(policyModel3);
-    }
-
-    /**
-     * This tests the pdpgroup GSON encode/decode and saving.
-     */
-    @Test
-    @Transactional
-    public void shouldAddPdpGroupInfo() {
-        policyModelsService.saveOrUpdatePolicyModel(getPolicyModel(POLICY_MODEL_TYPE_1, "yaml",
-                POLICY_MODEL_TYPE_1_VERSION_1, "TEST", "VARIANT", "user"));
-        policyModelsService.saveOrUpdatePolicyModel(getPolicyModel(POLICY_MODEL_TYPE_2, "yaml",
-                POLICY_MODEL_TYPE_2_VERSION_2, "TEST", "VARIANT", "user"));
-        policyModelsService.saveOrUpdatePolicyModel(getPolicyModel(POLICY_MODEL_TYPE_3, "yaml",
-                POLICY_MODEL_TYPE_3_VERSION_1, "TEST", "VARIANT", "user"));
-
-        ToscaConceptIdentifier type1 = new ToscaConceptIdentifier("org.onap.testos", "1.0.0");
-        ToscaConceptIdentifier type2 = new ToscaConceptIdentifier("org.onap.testos2", "2.0.0");
-
-        PdpSubGroup pdpSubgroup1 = new PdpSubGroup();
-        pdpSubgroup1.setPdpType("subGroup1");
-        List<ToscaConceptIdentifier> pdpTypeList = new LinkedList<>();
-        pdpTypeList.add(type1);
-        pdpTypeList.add(type2);
-        pdpSubgroup1.setSupportedPolicyTypes(pdpTypeList);
-
-        ToscaConceptIdentifier type3 = new ToscaConceptIdentifier("org.onap.testos3", "2.0.0");
-        PdpSubGroup pdpSubgroup2 = new PdpSubGroup();
-        pdpSubgroup2.setPdpType("subGroup2");
-        List<ToscaConceptIdentifier> pdpTypeList2 = new LinkedList<>();
-        pdpTypeList2.add(type2);
-        pdpTypeList2.add(type3);
-        pdpSubgroup2.setSupportedPolicyTypes(pdpTypeList2);
-
-        List<PdpSubGroup> pdpSubgroupList = new LinkedList<>();
-        pdpSubgroupList.add(pdpSubgroup1);
-
-        PdpGroup pdpGroup1 = new PdpGroup();
-        pdpGroup1.setName("pdpGroup1");
-        pdpGroup1.setPdpGroupState(PdpState.ACTIVE);
-        pdpGroup1.setPdpSubgroups(pdpSubgroupList);
-
-        List<PdpSubGroup> pdpSubgroupList2 = new LinkedList<>();
-        pdpSubgroupList2.add(pdpSubgroup1);
-        pdpSubgroupList2.add(pdpSubgroup2);
-        PdpGroup pdpGroup2 = new PdpGroup();
-        pdpGroup2.setName("pdpGroup2");
-        pdpGroup2.setPdpGroupState(PdpState.ACTIVE);
-        pdpGroup2.setPdpSubgroups(pdpSubgroupList2);
-
-        List<PdpGroup> pdpGroupsList = new LinkedList<>();
-        pdpGroupsList.add(pdpGroup1);
-        pdpGroupsList.add(pdpGroup2);
-
-        PdpGroups pdpGroups = new PdpGroups();
-        pdpGroups.setGroups(pdpGroupsList);
-        policyModelsService.updatePdpGroupInfo(pdpGroups);
-
-        JsonObject res1 =
-                policyModelsService.getPolicyModel("org.onap.testos", "1.0.0").getPolicyPdpGroup();
-        String expectedRes1 =
-                "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},{\"pdpGroup2\":[\"subGroup1\"]}]}";
-        JsonObject expectedJson1 = JsonUtils.GSON.fromJson(expectedRes1, JsonObject.class);
-        assertThat(res1).isEqualTo(expectedJson1);
-
-        JsonObject res2 =
-                policyModelsService.getPolicyModel("org.onap.testos2", "2.0.0").getPolicyPdpGroup();
-        String expectedRes2 =
-                "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},"
-                        + "{\"pdpGroup2\":[\"subGroup1\",\"subGroup2\"]}]}";
-        JsonObject expectedJson2 = JsonUtils.GSON.fromJson(expectedRes2, JsonObject.class);
-        assertThat(res2).isEqualTo(expectedJson2);
-
-        JsonObject res3 =
-                policyModelsService.getPolicyModel("org.onap.testos3", "1.0.0").getPolicyPdpGroup();
-        assertThat(res3).isNull();
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java b/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java
deleted file mode 100644
index 8f28299fd..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/ServiceTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonObject;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.loop.service.Service;
-
-public class ServiceTest {
-
-    @Test
-    public void equalMethodTest() {
-        String serviceStr1 = "{\"name\": \"vLoadBalancerMS\", \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\"}";
-        String serviceStr2 = "{\"name\": \"vLoadBalancerMS2\", \"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fce0\"}";
-        String serviceStr3 = "{\"name\": \"vLoadBalancerMS\",\"UUID\": \"63cac700-ab9a-4115-a74f-7eac85e3fc11\"}";
-        String resourceStr = "{\"CP\": {}}";
-
-        Service service1 = new Service(JsonUtils.GSON.fromJson(serviceStr1, JsonObject.class),
-                JsonUtils.GSON.fromJson(resourceStr, JsonObject.class), "1.0");
-
-        Service service2 = new Service(JsonUtils.GSON.fromJson(serviceStr2, JsonObject.class), null, "1.0");
-
-        Service service3 = new Service(JsonUtils.GSON.fromJson(serviceStr3, JsonObject.class), 
-                JsonUtils.GSON.fromJson(resourceStr, JsonObject.class), "1.0");
-
-        assertThat(service1.equals(service2)).isEqualTo(true);
-        assertThat(service1.equals(service3)).isEqualTo(false);
-    }
-
-}
diff --git a/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java b/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java
deleted file mode 100644
index f7f6baa0c..000000000
--- a/src/test/java/org/onap/policy/clamp/loop/deploy/BlueprintInputParametersTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Modifications copyright (c) 2019 Nokia
- * Modifications Copyright (c) 2019 Samsung
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.loop.deploy;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.LinkedHashSet;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.Loop;
-import org.onap.policy.clamp.loop.template.LoopElementModel;
-import org.onap.policy.clamp.loop.template.LoopTemplate;
-import org.onap.policy.clamp.policy.microservice.MicroServicePolicy;
-import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
-
-public class BlueprintInputParametersTest {
-
-    /**
-     * getDeploymentParametersinJsonMultiBlueprintsTest.
-     *
-     * @throws IOException             in case of failure
-     * @throws SdcToscaParserException in case of failure
-     */
-    @Test
-    public void getDeploymentParametersinJsonMultiBlueprintsTest() throws IOException, SdcToscaParserException {
-
-
-        MicroServicePolicy umService1 = Mockito.mock(MicroServicePolicy.class);
-        Mockito.when(umService1.getName()).thenReturn("testName1");
-
-        LoopElementModel loopElement = Mockito.mock(LoopElementModel.class);
-        String blueprint1 = ResourceFileUtils.getResourceAsString("example/sdc/blueprint-dcae/tca.yaml");
-        Mockito.when(loopElement.getBlueprint()).thenReturn(blueprint1);
-        Mockito.when(umService1.getLoopElementModel()).thenReturn(loopElement);
-
-        MicroServicePolicy umService2 = Mockito.mock(MicroServicePolicy.class);
-        Mockito.when(umService2.getName()).thenReturn("testName2");
-
-        LoopElementModel loopElement2 = Mockito.mock(LoopElementModel.class);
-        String blueprint2 = ResourceFileUtils.getResourceAsString("example/sdc/blueprint-dcae/tca_2.yaml");
-        Mockito.when(loopElement2.getBlueprint()).thenReturn(blueprint2);
-        Mockito.when(umService2.getLoopElementModel()).thenReturn(loopElement2);
-
-        MicroServicePolicy umService3 = Mockito.mock(MicroServicePolicy.class);
-        Mockito.when(umService3.getName()).thenReturn("testName3");
-
-        LoopElementModel loopElement3 = Mockito.mock(LoopElementModel.class);
-        String blueprint3 = ResourceFileUtils.getResourceAsString("example/sdc/blueprint-dcae/tca_3.yaml");
-        Mockito.when(loopElement3.getBlueprint()).thenReturn(blueprint3);
-        Mockito.when(umService3.getLoopElementModel()).thenReturn(loopElement3);
-
-        LinkedHashSet<MicroServicePolicy> umServiceSet = new LinkedHashSet<>();
-        umServiceSet.add(umService1);
-        umServiceSet.add(umService2);
-        umServiceSet.add(umService3);
-        Loop loop = Mockito.mock(Loop.class);
-        Mockito.when(loop.getMicroServicePolicies()).thenReturn(umServiceSet);
-
-        LoopTemplate template = Mockito.mock(LoopTemplate.class);
-        Mockito.when(template.getUniqueBlueprint()).thenReturn(false);
-        Mockito.when(loop.getLoopTemplate()).thenReturn(template);
-
-        JsonObject paramJson = DcaeDeployParameters.getDcaeDeploymentParametersInJson(loop);
-
-        Assert.assertEquals(JsonUtils.GSON_JPA_MODEL.toJson(paramJson),
-                ResourceFileUtils.getResourceAsString(
-                        "example/sdc/expected-result/deployment-parameters-multi-blueprints.json"));
-    }
-
-    /**
-     * getDeploymentParametersInJsonSingleBlueprintTest.
-     *
-     * @throws IOException In case of failure
-     * @throws SdcToscaParserException In case of failure
-     */
-    @Test
-    public void getDeploymentParametersInJsonSingleBlueprintTest() throws IOException, SdcToscaParserException {
-        Loop loop = Mockito.mock(Loop.class);
-
-        MicroServicePolicy umService1 = Mockito.mock(MicroServicePolicy.class);
-        Mockito.when(umService1.getName()).thenReturn("testName1");
-        LinkedHashSet<MicroServicePolicy> umServiceSet = new LinkedHashSet<MicroServicePolicy>();
-        umServiceSet.add(umService1);
-        Mockito.when(loop.getMicroServicePolicies()).thenReturn(umServiceSet);
-
-        LoopTemplate template = Mockito.mock(LoopTemplate.class);
-        Mockito.when(template.getUniqueBlueprint()).thenReturn(true);
-        String blueprint = ResourceFileUtils.getResourceAsString("example/sdc/blueprint-dcae/tca.yaml");
-        Mockito.when(template.getBlueprint()).thenReturn(blueprint);
-        Mockito.when(loop.getLoopTemplate()).thenReturn(template);
-
-        JsonObject paramJson = DcaeDeployParameters.getDcaeDeploymentParametersInJson(loop);
-
-        Assert.assertEquals(JsonUtils.GSON_JPA_MODEL.toJson(paramJson),
-                ResourceFileUtils.getResourceAsString(
-                        "example/sdc/expected-result/deployment-parameters-single-blueprint.json"));
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java b/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
deleted file mode 100644
index 657adf1d1..000000000
--- a/src/test/java/org/onap/policy/clamp/policy/downloader/PolicyEngineControllerTestItCase.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.onap.policy.clamp.policy.downloader;
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import java.io.IOException;
-import java.time.Instant;
-import java.util.List;
-import javax.transaction.Transactional;
-import org.json.simple.parser.ParseException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.clamp.loop.template.PolicyModelId;
-import org.onap.policy.clamp.loop.template.PolicyModelsRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-@ActiveProfiles({"clamp-default", "clamp-policy-controller"})
-public class PolicyEngineControllerTestItCase {
-
-    @Autowired
-    PolicyEngineController policyController;
-
-    @Autowired
-    PolicyModelsRepository policyModelsRepository;
-
-    /**
-     * This method tests a fake synchronization with the emulator.
-     *
-     * @throws JsonSyntaxException  In case of issues
-     * @throws IOException          In case of issues
-     * @throws InterruptedException In case of issues
-     */
-    @Test
-    @Transactional
-    public void synchronizeAllPoliciesTest() throws JsonSyntaxException, IOException, InterruptedException {
-        policyController.synchronizeAllPolicies();
-        Instant firstExecution = policyController.getLastInstantExecuted();
-        assertThat(firstExecution).isNotNull();
-        List<PolicyModel> policyModelsList = policyModelsRepository.findAll();
-        assertThat(policyModelsList.size()).isGreaterThanOrEqualTo(5);
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.operational.common.Drools",
-                null, "1.0.0"));
-        assertThat(policyModelsList).contains(new PolicyModel("onap.policies.controlloop.operational.common.Apex",
-                null, "1.0.0"));
-        assertThat(policyModelsList)
-                .contains(new PolicyModel("onap.policies.controlloop.guard.common.FrequencyLimiter", null, "1.0.0"));
-        assertThat(policyModelsList)
-                .contains(new PolicyModel("onap.policies.controlloop.guard.common.Blacklist", null, "1.0.0"));
-        assertThat(policyModelsList)
-                .contains(new PolicyModel("onap.policies.controlloop.guard.common.MinMax", null, "2.0.0"));
-
-        // Re-do it to check that there is no issue with duplicate key
-        policyController.synchronizeAllPolicies();
-        Instant secondExecution = policyController.getLastInstantExecuted();
-        assertThat(secondExecution).isNotNull();
-
-        assertThat(firstExecution).isBefore(secondExecution);
-    }
-
-    @Test
-    @Transactional
-    public void downloadPdpGroupsTest() throws JsonSyntaxException, IOException, InterruptedException, ParseException {
-        PolicyModel policyModel1 = new PolicyModel("onap.policies.monitoring.test", null, "1.0.0");
-        policyModelsRepository.saveAndFlush(policyModel1);
-        PolicyModel policyModel2 = new PolicyModel("onap.policies.controlloop.Operational", null, "1.0.0");
-        policyModelsRepository.saveAndFlush(policyModel2);
-
-        policyController.downloadPdpGroups();
-
-        List<PolicyModel> policyModelsList = policyModelsRepository.findAll();
-        assertThat(policyModelsList.size()).isGreaterThanOrEqualTo(2);
-
-        PolicyModel policy1 = policyModelsRepository
-                .getOne(new PolicyModelId("onap.policies.monitoring.test", "1.0.0"));
-        PolicyModel policy2 = policyModelsRepository
-                .getOne(new PolicyModelId("onap.policies.controlloop.Operational", "1.0.0"));
-
-        String expectedRes1 = "{\"supportedPdpGroups\":[{\"monitoring\":[\"xacml\"]}]}";
-        JsonObject expectedJson1 = JsonUtils.GSON.fromJson(expectedRes1, JsonObject.class);
-        assertThat(policy1.getPolicyPdpGroup()).isEqualTo(expectedJson1);
-        String expectedRes2 = "{\"supportedPdpGroups\":[{\"controlloop\":[\"apex\",\"drools\"]}]}";
-        JsonObject expectedJson2 = JsonUtils.GSON.fromJson(expectedRes2, JsonObject.class);
-        assertThat(policy2.getPolicyPdpGroup()).isEqualTo(expectedJson2);
-
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java b/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java
deleted file mode 100644
index 4bb850c35..000000000
--- a/src/test/java/org/onap/policy/clamp/policy/microservice/MicroServicePayloadTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.policy.microservice;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-public class MicroServicePayloadTest {
-
-    @Test
-    public void testPayloadConstruction() throws IOException {
-        MicroServicePolicy policy = new MicroServicePolicy("testPolicy", new PolicyModel(
-                "onap.policies.monitoring.cdap.tca.hi.lo.app",
-                ResourceFileUtils.getResourceAsString("tosca/tosca_example.yaml"), "1.0.0"), false, null, null, null,
-                null);
-        policy.setConfigurationsJson(JsonUtils.GSON.fromJson(
-                ResourceFileUtils.getResourceAsString("tosca/micro-service-policy-properties.json"), JsonObject.class));
-        JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/micro-service-policy-payload.json"),
-                policy.createPolicyPayload(), false);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java b/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
deleted file mode 100644
index 136430c8f..000000000
--- a/src/test/java/org/onap/policy/clamp/policy/operational/OperationalPolicyRepresentationBuilderTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.policy.operational;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.service.Service;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-public class OperationalPolicyRepresentationBuilderTest {
-
-    @Test
-    public void testOperationalPolicyPayloadConstruction() throws IOException {
-        JsonObject jsonModel = new GsonBuilder().create().fromJson(ResourceFileUtils
-                .getResourceAsString("tosca/model-properties-operational-policy.json"), JsonObject.class);
-        Service service = new Service(jsonModel.get("serviceDetails").getAsJsonObject(),
-                jsonModel.get("resourceDetails").getAsJsonObject(), "1.0");
-
-        JsonObject jsonSchema = OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(service);
-
-        assertThat(jsonSchema).isNotNull();
-
-        JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("tosca/operational-policy-json-schema.json"),
-                new GsonBuilder().create().toJson(jsonSchema), false);
-    }
-
-    @Test
-    public void testOperationalPolicyPayloadConstructionForCds() throws IOException {
-        JsonObject jsonModel = new GsonBuilder().create()
-                .fromJson(ResourceFileUtils.getResourceAsString("tosca/model-properties-cds.json"), JsonObject.class);
-        Service service = new Service(jsonModel.get("serviceDetails").getAsJsonObject(),
-                jsonModel.get("resourceDetails").getAsJsonObject(),
-                "1.0");
-
-        JsonObject jsonSchema = OperationalPolicyRepresentationBuilder.generateOperationalPolicySchema(service);
-        assertThat(jsonSchema).isNotNull();
-        JSONAssert.assertEquals(
-                ResourceFileUtils.getResourceAsString("tosca/operational-policy-cds-payload-with-list.json"),
-                new GsonBuilder().create().toJson(jsonSchema), false);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java b/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java
deleted file mode 100644
index 30d4ebe28..000000000
--- a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupAnalyzerTest.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.policy.pdpgroup;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.clamp.loop.template.PolicyModel;
-import org.onap.policy.models.pdp.concepts.PdpGroup;
-import org.onap.policy.models.pdp.concepts.PdpGroups;
-import org.onap.policy.models.pdp.concepts.PdpSubGroup;
-import org.onap.policy.models.pdp.enums.PdpState;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-
-/**
- * This test class validates the PdpGroupAnalyzer class.
- */
-public class PdpGroupAnalyzerTest {
-
-    private static PdpGroups pdpGroups;
-    private static PdpGroup pdpGroup1;
-    private static PdpGroup pdpGroup2;
-    private static PdpGroup pdpGroup3;
-    private static PdpGroup pdpGroup4;
-
-    private static PdpSubGroup pdpSubgroupBad;
-    private static PdpSubGroup pdpSubgroup1;
-    private static PdpSubGroup pdpSubgroup2;
-    private static PdpSubGroup pdpSubgroup3;
-
-    /**
-     * This method preloads the pdpGroups for the tests.
-     */
-    @BeforeClass
-    public static void setupPdpGroup() {
-        // Create Pdp Groups
-        // Those that do not work first
-        pdpSubgroupBad = new PdpSubGroup();
-        pdpSubgroupBad.setPdpType("subGroupBad");
-        pdpSubgroupBad.setSupportedPolicyTypes(Arrays.asList(new ToscaConceptIdentifier("org.onap.test", "2.0.0"),
-                new ToscaConceptIdentifier("org.onap.test.*", "1.0.0"),
-                new ToscaConceptIdentifier("org.onip.testos", "1.0.0"),
-                new ToscaConceptIdentifier("org.onap.testos3", "2.0.0"),
-                new ToscaConceptIdentifier("org.onap.tes", "1.0.0"),
-                new ToscaConceptIdentifier("org.onap", "1.0.0")
-        ));
-        pdpSubgroupBad.setPolicies(Arrays.asList(new ToscaConceptIdentifier("org.onap", "1.0.0"),
-                new ToscaConceptIdentifier("org.onap.testos", "2.0.0"),
-                new ToscaConceptIdentifier("org.onap.testos", "1.0.1"),
-                new ToscaConceptIdentifier("org.onap.testos.new", "1.0.0"),
-                new ToscaConceptIdentifier("org.onap.", "1.0.0")));
-        pdpSubgroupBad.setPdpInstances(Collections.emptyList());
-
-        pdpSubgroup1 = new PdpSubGroup();
-        pdpSubgroup1.setPdpType("subGroup1");
-        pdpSubgroup1.setSupportedPolicyTypes(
-                Arrays.asList(new ToscaConceptIdentifier("org.onap.*", "1.0.0")));
-        pdpSubgroup1.setPdpInstances(Collections.emptyList());
-
-        pdpSubgroup2 = new PdpSubGroup();
-        pdpSubgroup2.setPdpType("subGroup2");
-        pdpSubgroup2.setSupportedPolicyTypes(Arrays.asList(new ToscaConceptIdentifier("org.onap.test", "1.0.0")));
-        pdpSubgroup2.setPolicies(Arrays.asList(new ToscaConceptIdentifier("org.onap.testos", "1.0.0")));
-        pdpSubgroup2.setPdpInstances(Collections.emptyList());
-
-        pdpSubgroup3 = new PdpSubGroup();
-        pdpSubgroup3.setPdpType("subGroup3");
-        pdpSubgroup3.setSupportedPolicyTypes(Arrays.asList(new ToscaConceptIdentifier("org.onap.test*", "1.0.0")));
-        pdpSubgroup3.setPolicies(Arrays.asList(new ToscaConceptIdentifier("org.onap.testos", "2.0.0")));
-        pdpSubgroup3.setPdpInstances(Collections.emptyList());
-
-        // Should match pdpSubgroup1
-        pdpGroup1 = new PdpGroup();
-        pdpGroup1.setName("pdpGroup1");
-        pdpGroup1.setPdpGroupState(PdpState.ACTIVE);
-        pdpGroup1.setPdpSubgroups(Arrays.asList(pdpSubgroup1, pdpSubgroupBad));
-
-        // Should match pdpSubgroup1, pdpSubgroup2, pdpSubgroup3
-        // Should match also for the policy (pdpSubgroup2)
-        pdpGroup2 = new PdpGroup();
-        pdpGroup2.setName("pdpGroup2");
-        pdpGroup2.setPdpGroupState(PdpState.ACTIVE);
-        pdpGroup2.setPdpSubgroups(Arrays.asList(pdpSubgroup1, pdpSubgroup2, pdpSubgroup3, pdpSubgroupBad));
-
-        /// Should not match
-        pdpGroup3 = new PdpGroup();
-        pdpGroup3.setName("pdpGroup3");
-        pdpGroup3.setPdpGroupState(PdpState.ACTIVE);
-        pdpGroup3.setPdpSubgroups(Arrays.asList(pdpSubgroupBad));
-
-        // Should not match
-        pdpGroup4 = new PdpGroup();
-        pdpGroup4.setName("pdpGroup4");
-        pdpGroup4.setPdpGroupState(PdpState.TERMINATED);
-        pdpGroup4.setPdpSubgroups(Arrays.asList(pdpSubgroup1));
-
-        pdpGroups = new PdpGroups();
-        pdpGroups.setGroups(Arrays.asList(pdpGroup1, pdpGroup2, pdpGroup3, pdpGroup4));
-    }
-
-    @Test
-    public void testStructuresConstruction() {
-        PdpGroupsAnalyzer pdpGroupsAnalyzer = new PdpGroupsAnalyzer(pdpGroups);
-        assertThat(pdpGroupsAnalyzer).isNotNull();
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()).hasSize(6);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "2.0.0"))).hasSize(3);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "2.0.0")).get("pdpGroup1").getPdpSubgroups().size())
-                .isEqualTo(1);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "2.0.0")).get("pdpGroup1").getPdpSubgroups())
-                .contains(pdpSubgroupBad);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "2.0.0")).get("pdpGroup2").getPdpSubgroups().size())
-                .isEqualTo(2);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "2.0.0")).get("pdpGroup2").getPdpSubgroups())
-                .contains(pdpSubgroup3);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "2.0.0")).get("pdpGroup2").getPdpSubgroups())
-                .contains(pdpSubgroupBad);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "2.0.0")).get("pdpGroup3").getPdpSubgroups().size())
-                .isEqualTo(1);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "2.0.0")).get("pdpGroup3").getPdpSubgroups())
-                .contains(pdpSubgroupBad);
-
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.0"))).hasSize(1);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.0")).get("pdpGroup2").getPdpSubgroups())
-                .hasSize(1);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.0")).get("pdpGroup2").getPdpSubgroups())
-                .contains(pdpSubgroup2);
-
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.1"))).hasSize(3);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.1")).get("pdpGroup1").getPdpSubgroups())
-                .hasSize(1);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.1")).get("pdpGroup1").getPdpSubgroups())
-                .contains(pdpSubgroupBad);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.1")).get("pdpGroup2").getPdpSubgroups())
-                .hasSize(1);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.1")).get("pdpGroup2").getPdpSubgroups())
-                .contains(pdpSubgroupBad);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.1")).get("pdpGroup3").getPdpSubgroups())
-                .hasSize(1);
-        assertThat(pdpGroupsAnalyzer.getPdpGroupsDeploymentPerPolicy()
-                .get(new ToscaConceptIdentifier("org.onap.testos", "1.0.1")).get("pdpGroup3").getPdpSubgroups())
-                .contains(pdpSubgroupBad);
-    }
-
-    @Test
-    public void testGetSupportedPdpGroupsForPolicy() throws IOException {
-        PolicyModel policyModel = new PolicyModel();
-        policyModel.setCreatedBy("user");
-        policyModel.setPolicyAcronym("TEST");
-        policyModel.setPolicyModelTosca("yaml");
-        policyModel.setPolicyModelType("org.onap.test");
-        policyModel.setUpdatedBy("user");
-        policyModel.setVersion("1.0.0");
-
-        PdpGroupsAnalyzer pdpGroupsAnalyzer = new PdpGroupsAnalyzer(pdpGroups);
-        assertThat(pdpGroupsAnalyzer).isNotNull();
-
-        assertThat(
-                JsonUtils.GSON.toJson(pdpGroupsAnalyzer.getPdpGroupsForPolicy("org.onap.testos", "2.0.0")))
-                .isEqualTo(ResourceFileUtils.getResourceAsString("example/policy/pdp-deployment-testos-2_0_0.json"));
-
-        assertThat(
-                JsonUtils.GSON.toJson(pdpGroupsAnalyzer.getPdpGroupsForPolicy("org.onap.testos", "1.0.0")))
-                .isEqualTo(ResourceFileUtils.getResourceAsString("example/policy/pdp-deployment-testos-1_0_0.json"));
-
-        assertThat(
-                pdpGroupsAnalyzer.getPdpGroupsForPolicy("org.onap.donotexist", "1.0.0"))
-                .isNull();
-    }
-
-    @Test
-    public void testUpdatePdpGroupOfPolicyModels() {
-        // Create policyModel
-        PolicyModel policyModel = new PolicyModel();
-        policyModel.setCreatedBy("user");
-        policyModel.setPolicyAcronym("TEST");
-        policyModel.setPolicyModelTosca("yaml");
-        policyModel.setPolicyModelType("org.onap.test");
-        policyModel.setUpdatedBy("user");
-        policyModel.setVersion("1.0.0");
-        PdpGroupsAnalyzer.updatePdpGroupOfPolicyModels(Arrays.asList(policyModel), pdpGroups);
-
-        assertThat(policyModel.getPolicyPdpGroup()).hasToString(
-                "{\"supportedPdpGroups\":[{\"pdpGroup1\":[\"subGroup1\"]},"
-                        + "{\"pdpGroup2\":[\"subGroup1\",\"subGroup2\",\"subGroup3\"]}]}");
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java b/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java
deleted file mode 100644
index f3c3fc6cd..000000000
--- a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadExceptionTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.clamp.policy.pdpgroup;
-
-import org.junit.Test;
-import org.onap.policy.clamp.policy.pdpgroup.PdpGroupPayloadException;
-import org.onap.policy.common.utils.test.ExceptionsTester;
-
-public class PdpGroupPayloadExceptionTest extends ExceptionsTester {
-
-    @Test
-    public void testPdpGroupPayloadException() {
-        test(PdpGroupPayloadException.class);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java b/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java
deleted file mode 100644
index 34674e3ec..000000000
--- a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PdpGroupPayloadTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.policy.pdpgroup;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-/**
- * This class tests the PdpGroupPayload features.
- */
-public class PdpGroupPayloadTest {
-
-    @Test
-    public void testGeneratePdpGroupPayload() throws IOException, PdpGroupPayloadException {
-        JsonArray operations = new JsonArray();
-        operations.add("POST/pdpgroup1/pdpsubgroup1/policyname1/1.0.0");
-        operations.add("POST/pdpgroup1/pdpsubgroup1/policyname2/1.0.0");
-        operations.add("POST/pdpgroup1/pdpsubgroup1/policyname1/2.0.0");
-        operations.add("DELETE/pdpgroup2/pdpsubgroup2/policyname1/1.0.0");
-        operations.add("POST/pdpgroup2/pdpsubgroup2/policyname1/2.0.0");
-        operations.add("DELETE/pdpgroup2/pdpsubgroup2/policyname2/1.0.0");
-        JsonObject listOfOperations = new JsonObject();
-        listOfOperations.add(PdpGroupPayload.PDP_ACTIONS, operations);
-
-        PdpGroupPayload pdpGroupPayload = new PdpGroupPayload(listOfOperations);
-        JSONAssert.assertEquals(
-                ResourceFileUtils.getResourceAsString("example/policy/pdp-group-multi-policies-payload.json"),
-                pdpGroupPayload.generatePdpGroupPayload(), false);
-    }
-
-    @Test
-    public void testGeneratePdpGroupPayload_WithEmptyList() throws PdpGroupPayloadException {
-        JsonArray operations = new JsonArray();
-        JsonObject listOfOperations = new JsonObject();
-        listOfOperations.add(PdpGroupPayload.PDP_ACTIONS, operations);
-
-        PdpGroupPayload pdpGroupPayload = new PdpGroupPayload(listOfOperations);
-        JSONAssert.assertEquals("{}", pdpGroupPayload.generatePdpGroupPayload(), false);
-    }
-
-    @Test(expected = PdpGroupPayloadException.class)
-    public void testUpdatePdpGroupMap_WithEmptyEntry() throws PdpGroupPayloadException {
-        JsonArray operations = new JsonArray();
-        operations.add("");
-        JsonObject listOfOperations = new JsonObject();
-        listOfOperations.add(PdpGroupPayload.PDP_ACTIONS, operations);
-
-        PdpGroupPayload pdpGroupPayload = new PdpGroupPayload(listOfOperations);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java b/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java
deleted file mode 100644
index be7a9d674..000000000
--- a/src/test/java/org/onap/policy/clamp/policy/pdpgroup/PoliciesPdpMergerTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.policy.pdpgroup;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import com.google.gson.JsonObject;
-import java.io.IOException;
-import java.util.Arrays;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.onap.policy.clamp.clds.util.JsonUtils;
-import org.onap.policy.clamp.clds.util.ResourceFileUtils;
-import org.onap.policy.models.pdp.concepts.PdpGroup;
-import org.onap.policy.models.pdp.concepts.PdpGroups;
-import org.onap.policy.models.pdp.concepts.PdpSubGroup;
-import org.onap.policy.models.pdp.enums.PdpState;
-import org.onap.policy.models.tosca.authorative.concepts.ToscaConceptIdentifier;
-import org.skyscreamer.jsonassert.JSONAssert;
-
-/**
- * This test class validates the PdpGroupAnalyzer class.
- */
-public class PoliciesPdpMergerTest {
-
-    private static String pdpGroupsJson;
-
-    /**
-     * This method setups the pdpGroups required for the tests.
-     */
-    @BeforeClass
-    public static void setupPdpGroup() {
-        // Create Pdp Groups
-        PdpSubGroup pdpSubgroup1 = new PdpSubGroup();
-        pdpSubgroup1.setPdpType("subGroup1");
-        pdpSubgroup1.setSupportedPolicyTypes(
-                Arrays.asList(new ToscaConceptIdentifier("org.onap.*", "1.0.0")));
-
-        PdpSubGroup pdpSubgroup2 = new PdpSubGroup();
-        pdpSubgroup2.setPdpType("subGroup2");
-        pdpSubgroup2.setSupportedPolicyTypes(
-                Arrays.asList(new ToscaConceptIdentifier("onap.policies.monitoring.tcagen2", "1.0.0"),
-                        new ToscaConceptIdentifier("onap.policies.controlloop.operational.common.Drools", "1.0.0")));
-        pdpSubgroup2.setPolicies(Arrays.asList(
-                new ToscaConceptIdentifier("MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0", "1.0.0")));
-
-        PdpSubGroup pdpSubgroup3 = new PdpSubGroup();
-        pdpSubgroup3.setPdpType("subGroup3");
-        pdpSubgroup3.setSupportedPolicyTypes(
-                Arrays.asList(new ToscaConceptIdentifier("onap.policies.monitoring.tcagen2", "1.0.0"),
-                        new ToscaConceptIdentifier("onap.policies.controlloop.operational.common.Drools", "1.0.0")));
-        pdpSubgroup3.setPolicies(Arrays.asList(new ToscaConceptIdentifier("org.onap.testos", "2.0.0"),
-                new ToscaConceptIdentifier("OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd", "1.0.0")));
-
-        // Should match pdpSubgroup1
-        PdpGroup pdpGroup1 = new PdpGroup();
-        pdpGroup1.setName("pdpGroup1");
-        pdpGroup1.setPdpGroupState(PdpState.ACTIVE);
-        pdpGroup1.setPdpSubgroups(Arrays.asList(pdpSubgroup1));
-
-        // Should match pdpSubgroup1, pdpSubgroup2, pdpSubgroup3
-        // Should match also for the policy (pdpSubgroup2)
-        PdpGroup pdpGroup2 = new PdpGroup();
-        pdpGroup2.setName("pdpGroup2");
-        pdpGroup2.setPdpGroupState(PdpState.ACTIVE);
-        pdpGroup2.setPdpSubgroups(Arrays.asList(pdpSubgroup1, pdpSubgroup2, pdpSubgroup3));
-
-        PdpGroups pdpGroups = new PdpGroups();
-        pdpGroups.setGroups(Arrays.asList(pdpGroup1, pdpGroup2));
-
-        pdpGroupsJson = JsonUtils.GSON.toJson(pdpGroups);
-    }
-
-    @Test
-    public void testMergePoliciesAndPdpGroupStates() throws IOException {
-        JSONAssert.assertEquals(ResourceFileUtils.getResourceAsString("example/policy/policy-merger.json"),
-                PoliciesPdpMerger.mergePoliciesAndPdpGroupStates(
-                        ResourceFileUtils.getResourceAsString("http-cache/example/policy/api/v1/policies/.file"),
-                        pdpGroupsJson).toString(), true);
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java b/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java
deleted file mode 100644
index fdde53a21..000000000
--- a/src/test/java/org/onap/policy/clamp/tosca/DictionaryServiceItCase.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.tosca;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-import javax.persistence.EntityNotFoundException;
-import javax.transaction.Transactional;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.policy.clamp.clds.Application;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class)
-public class DictionaryServiceItCase {
-
-    @Autowired
-    private DictionaryService dictionaryService;
-
-    @Autowired
-    private DictionaryElementsRepository dictionaryElementsRepository;
-
-    private DictionaryElement getDictionaryElement(String shortName, String name,
-        String description, String type, String subDictionaryName) {
-
-        return new DictionaryElement(name, shortName, description, type, subDictionaryName);
-
-    }
-
-    private Dictionary getSimpleDictionaryExample() {
-
-        Dictionary dictionary = new Dictionary("Dictionary1", 0, null);
-
-        dictionary.addDictionaryElements(getDictionaryElement("DE1", "DictionaryElement1",
-            "DictionaryElement1", "string", null));
-
-        dictionary.addDictionaryElements(getDictionaryElement("DE2", "DictionaryElement2",
-            "DictionaryElement2", "number", null));
-
-        return dictionary;
-    }
-
-    private Dictionary getSecondaryDictionaryExample() {
-
-        Dictionary dictionary = new Dictionary("SecondaryDict", 1, "string");
-
-        dictionary.addDictionaryElements(getDictionaryElement("SDE1", "SecondaryDictElement1",
-            "SecondaryDictElement1", "string", null));
-
-        dictionary.addDictionaryElements(getDictionaryElement("SDE2", "SecondaryDictElement2",
-            "SecondaryDictElement2", "string", null));
-
-        return dictionary;
-    }
-
-    /**
-     * Test to validate that Dictionary is created.
-     */
-    @Test
-    @Transactional
-    public void shouldCreateDictionary() {
-        Dictionary dictionary = getSimpleDictionaryExample();
-        Dictionary actualDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
-        assertNotNull(actualDictionary);
-        assertThat(actualDictionary).isEqualTo(dictionary);
-        assertThat(actualDictionary.getName()).isEqualTo(dictionary.getName());
-
-        assertThat(actualDictionary.getDictionaryElements()).contains(
-            dictionaryElementsRepository.findById("DE1").get(),
-            dictionaryElementsRepository.findById("DE2").get());
-    }
-
-    /**
-     * Test to validate a DictionaryElement is created for a Dictionary.
-     */
-    @Test
-    @Transactional
-    public void shouldCreateorUpdateDictionaryElement() {
-        Dictionary dictionary = getSimpleDictionaryExample();
-        Dictionary actualDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
-        DictionaryElement dictionaryElement =
-            getDictionaryElement("DictionaryElement3", "DE3", "DictionaryElement3", "date", null);
-        actualDictionary.addDictionaryElements(dictionaryElement);
-        Dictionary updatedDictionary = dictionaryService
-            .saveOrUpdateDictionaryElement(actualDictionary.getName(), actualDictionary);
-        assertNotNull(updatedDictionary);
-        assertTrue(updatedDictionary.getDictionaryElements().contains(dictionaryElement));
-        assertThat(updatedDictionary.getName()).isEqualTo(actualDictionary.getName());
-        // update the dictionary element.
-        dictionaryElement.setDescription("DictionaryElement3 New Description");
-        Dictionary dictionary3 = new Dictionary("Dictionary1", 0, null);
-        dictionary3.addDictionaryElements(dictionaryElement);
-        Dictionary updatedDictionary2 =
-            dictionaryService.saveOrUpdateDictionaryElement(dictionary3.getName(), dictionary3);
-
-        assertNotNull(updatedDictionary2);
-        assertTrue(updatedDictionary2.getDictionaryElements().contains(dictionaryElement));
-        updatedDictionary2.getDictionaryElements().forEach(element -> {
-            if (element.equals(dictionaryElement)) {
-                assertTrue(element.getDescription().equals(dictionaryElement.getDescription()));
-            }
-        });
-
-    }
-
-    /**
-     * Test to validate that All Dictionaries are retrieved.
-     */
-    @Test
-    @Transactional
-    public void shouldReturnAllDictionaries() {
-        Dictionary dictionary = getSimpleDictionaryExample();
-        Dictionary secondaryDictionary = getSecondaryDictionaryExample();
-        dictionaryService.saveOrUpdateDictionary(dictionary);
-        dictionaryService.saveOrUpdateDictionary(secondaryDictionary);
-
-        List<Dictionary> list = dictionaryService.getAllDictionaries();
-        assertNotNull(list);
-        assertThat(list).contains(dictionary, secondaryDictionary);
-    }
-
-    /**
-     * Test to validate one Dictionary is returned.
-     */
-    @Test
-    @Transactional
-    public void shouldReturnOneDictionary() {
-        Dictionary dictionary = getSimpleDictionaryExample();
-        dictionaryService.saveOrUpdateDictionary(dictionary);
-
-        Dictionary returnedDictionary = dictionaryService.getDictionary("Dictionary1");
-        assertNotNull(returnedDictionary);
-        assertThat(returnedDictionary).isEqualTo(dictionary);
-        assertThat(returnedDictionary.getDictionaryElements())
-            .isEqualTo(dictionary.getDictionaryElements());
-    }
-
-    /**
-     * Test to validate one Dictionary is returned.
-     */
-    @Test
-    @Transactional
-    public void shouldReturnEntityNotFoundException() {
-        try {
-            dictionaryService.getDictionary("Test");
-        } catch (Exception e) {
-            assertThat(e).isInstanceOf(EntityNotFoundException.class);
-            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Test"));
-        }
-    }
-
-    /**
-     * Test to validate Dictionary is deleted.
-     */
-    @Test
-    @Transactional
-    public void shouldDeleteDictionaryByObject() {
-        Dictionary dictionary = getSimpleDictionaryExample();
-        Dictionary returnedDictionary = dictionaryService.saveOrUpdateDictionary(dictionary);
-
-        dictionaryService.deleteDictionary(returnedDictionary);
-        try {
-            dictionaryService.getDictionary("Dictionary1");
-        } catch (EntityNotFoundException e) {
-            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Dictionary1"));
-        }
-    }
-
-    /**
-     * Test to validate Dictionary is deleted by Name.
-     */
-    @Test
-    @Transactional
-    public void shouldDeleteDictionaryByName() {
-        Dictionary dictionary = getSimpleDictionaryExample();
-        dictionaryService.saveOrUpdateDictionary(dictionary);
-        dictionaryService.deleteDictionary(dictionary.getName());
-        try {
-            dictionaryService.getDictionary("Dictionary1");
-        } catch (EntityNotFoundException e) {
-            assertTrue(e.getMessage().equals("Couldn't find Dictionary named: Dictionary1"));
-        }
-    }
-
-    /**
-     * Test to validate DictionaryElements is deleted by Name.
-     */
-    @Test
-    @Transactional
-    public void shouldDeleteDictionaryElementsByName() {
-        Dictionary dictionary = getSimpleDictionaryExample();
-        dictionaryService.saveOrUpdateDictionary(dictionary);
-        DictionaryElement dictionaryElement =
-            dictionaryElementsRepository.findById("DE1").orElse(null);
-        assertNotNull(dictionaryElement);
-        dictionaryService.deleteDictionaryElement("Dictionary1", "DE1");
-        dictionary = dictionaryService.getDictionary("Dictionary1");
-        DictionaryElement deletedDictionaryElement =
-            dictionaryElementsRepository.findById("DE1").orElse(null);
-        assertThat(deletedDictionaryElement).isNotIn(dictionary.getDictionaryElements());
-    }
-
-    /**
-     * Test to validate all secondary level dictionary names are returned.
-     */
-    @Test
-    @Transactional
-    public void shouldReturnAllSecondaryLevelDictionaryNames() {
-        Dictionary dictionary = getSecondaryDictionaryExample();
-        dictionaryService.saveOrUpdateDictionary(dictionary);
-
-        Dictionary dictionary2 = new Dictionary("SecondaryDict2", 1, "string");
-        dictionaryService.saveOrUpdateDictionary(dictionary2);
-        List<String> secondaryDictionaryNames =
-            dictionaryService.getAllSecondaryLevelDictionaryNames();
-
-        assertNotNull(secondaryDictionaryNames);
-        assertThat(secondaryDictionaryNames).contains(dictionary.getName(), dictionary2.getName());
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java b/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java
deleted file mode 100644
index 7fd0cb91d..000000000
--- a/src/test/java/org/onap/policy/clamp/util/PassDecoderTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY-CLAMP
- * ================================================================================
- * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.util;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-import org.junit.Test;
-
-public class PassDecoderTest {
-
-    private final String encrypted = "enc:WWCxchk4WGBNSvuzLq3MLjMs5ObRybJtts5AI0XD1Vc";
-
-    @Test
-    public final void testDecryptionNoKeyfile() throws Exception {
-        String decodedPass = PassDecoder.decode(encrypted, null);
-        assertEquals(decodedPass, encrypted);
-    }
-
-    @Test
-    public final void testDecryptionNoPassword() throws Exception {
-        String decodedPass = PassDecoder.decode(null, "classpath:clds/aaf/org.onap.clamp.keyfile");
-        assertNull(decodedPass);
-    }
-
-    @Test
-    public final void testDecryption() throws Exception {
-        String decodedPass = PassDecoder.decode(encrypted, "classpath:clds/aaf/org.onap.clamp.keyfile");
-        assertEquals(decodedPass, "China in the Spring");
-        assertEquals("Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U", PassDecoder
-                .decode("enc:JPV4p067JlSXt2Fet9bfuI8JpkS4ZGYVcgypcPs98gXjgjCjTze_d3JxqmlKaaakdiOjIcEC_MJh6-5pJTLgdc",
-                        "classpath:clds/aaf/org.onap.clamp.keyfile"));
-    }
-}
diff --git a/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java b/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java
deleted file mode 100644
index 604ce55db..000000000
--- a/src/test/java/org/onap/policy/clamp/util/SemanticVersioningTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-package org.onap.policy.clamp.util;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-
-public class SemanticVersioningTest {
-
-    /**
-     * compare test.
-     */
-    @Test
-    public void compareTest() {
-        assertThat(SemanticVersioning.compare("1.0.0", "2.0.0")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("1.5.0", "2.0.0")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("1.5.0", "2.1.0")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("1.5.3", "2.0.0")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("2.5.3", "2.6.0")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("2.5", "2.5.1")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("2.5.0", "2.5.1")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("2.5.0.0", "2.5.1")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("2.5.1.0", "2.5.1")).isEqualTo(1);
-
-        assertThat(SemanticVersioning.compare("2.0.0", "1.0.0")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("2.0.0", "1.5.0")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("2.1.0", "1.5.0")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("2.0.0", "1.5.3")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("2.6.0", "2.5.3")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("2.5.1", "2.5")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("2.5.1", "2.5.0")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("2.5.1", "2.5.0.0")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("1", "1.2.3.0")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("1.2", "1")).isEqualTo(1);
-    }
-
-    /**
-     * Compare test.
-     */
-    @Test
-    public void compareEqualsTest() {
-        assertThat(SemanticVersioning.compare("1.0.0", "1.0.0")).isEqualTo(0);
-        assertThat(SemanticVersioning.compare("1.0.0.0", "1.0.0")).isEqualTo(1);
-        assertThat(SemanticVersioning.compare("1.2.3", "1.2.3")).isEqualTo(0);
-        assertThat(SemanticVersioning.compare("1.2.3", "1.2.3.0")).isEqualTo(-1);
-
-    }
-
-    /**
-     * Compare with null.
-     */
-    @Test
-    public void compareNullTest() {
-        assertThat(SemanticVersioning.compare(null, null)).isEqualTo(0);
-        assertThat(SemanticVersioning.compare(null, "1.0")).isEqualTo(-1);
-        assertThat(SemanticVersioning.compare("1.0", null)).isEqualTo(1);
-    }
-
-    /**
-     * Increment major version test.
-     */
-    @Test
-    public void incrementVersionTest() {
-        assertThat(SemanticVersioning.incrementMajorVersion("1.0")).isEqualTo("2.0.0");
-        assertThat(SemanticVersioning.incrementMajorVersion("1.0.0")).isEqualTo("2.0.0");
-        assertThat(SemanticVersioning.incrementMajorVersion("1")).isEqualTo("2.0.0");
-        assertThat(SemanticVersioning.incrementMajorVersion("1.2.3")).isEqualTo("2.0.0");
-    }
-}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
deleted file mode 100644
index bc513e9e4..000000000
--- a/src/test/resources/application.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP POLICY-CLAMP
-# ================================================================================
-# Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
-#                             reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END============================================
-# ===================================================================
-#
-###
-
-### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time).
-### (See below for the parameter 'server.http.port' if you want to have both enabled)
-### To have only HTTP, keep the lines server.ssl.* commented
-### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location
-server.port=${clamp.it.tests.http}
-### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port')
-#server.ssl.key-store=file:/tmp/mykey.jks
-#server.ssl.key-store-password=pass
-#server.ssl.key-password=pass
-
-clamp.config.keyFile=classpath:clds/aaf/org.onap.clamp.keyfile
-
-### In order to be user friendly when HTTPS is enabled,
-### you can add another HTTP port that will be automatically redirected to HTTPS
-### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...)
-#server.http-to-https-redirection.port=8090
-
-### HTTP Example:
-###--------------
-### server.port=8080
-
-### HTTPS Example:
-### --------------
-### server.port=8443
-### server.ssl.key-store=file:/tmp/mykey.jks
-### server.ssl.key-store-password=mypass
-### server.ssl.key-password=mypass
-
-### HTTP (Redirected to HTTPS) and HTTPS Example:
-### --------------------------------------------
-### server.port=8443           <-- The HTTPS port
-### server.ssl.key-store=file:/tmp/mykey.jks
-### server.ssl.key-store-password=mypass
-### server.ssl.key-password=mypass
-### server.http-to-https-redirection.port=8090  <-- The HTTP port
-
-server.servlet.context-path=/
-#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-default-user
-spring.http.converters.preferred-json-mapper=gson
-
-#The max number of active threads in this pool
-server.tomcat.max-threads=200
-#The minimum number of threads always kept alive
-server.tomcat.min-Spare-Threads=25
-#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads
-server.tomcat.max-idle-time=60000
-
-#Servlet context parameters
-server.context_parameters.p-name=value #context parameter with p-name as key and value as value.
-
-camel.springboot.consumer-template-cache-size=1000
-camel.springboot.producer-template-cache-size=1000
-# JMX enabled to have Camel Swagger runtime working
-camel.springboot.jmx-enabled=true
-camel.defaultthreadpool.poolsize=10
-camel.defaultthreadpool.maxpoolsize=20
-camel.defaultthreadpool.maxqueuesize=1000
-camel.defaultthreadpool.keepaliveTime=60
-camel.defaultthreadpool.rejectpolicy=CallerRuns
-camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
-camel.springboot.backlog-tracing=true
-camel.springboot.tracing=true
-camel.springboot.message-history=true
-
-#clds datasource connection details
-spring.datasource.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.url=jdbc:mariadb:sequential://localhost:3306,localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3
-spring.datasource.username=clds
-spring.datasource.password=sidnnd83K
-spring.datasource.validationQuery=SELECT 1
-spring.datasource.validationQueryTimeout=20000
-spring.datasource.validationInterval=30000
-spring.datasource.testWhileIdle = true
-spring.datasource.minIdle = 0
-spring.datasource.initialSize=0
-# Automatically test whether a connection provided is good or not
-spring.datasource.testOnBorrow=true
-spring.datasource.ignoreExceptionOnPreLoad=true
-
-spring.jpa.properties.javax.persistence.schema-generation.database.action=none
-#spring.jpa.properties.javax.persistence.schema-generation.create-source=metadata
-#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create
-#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=create.sql
-# disable Hibernate DDL generation because the schema will be generated from a sql script
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-spring.jpa.properties.hibernate.ddl-auto=validate
-spring.jpa.properties.hibernate.hbm2ddl.delimiter=;
-spring.jpa.properties.hibernate.format_sql=true
-spring.jpa.properties.hibernate.use-new-id-generator-mappings=true
-
-# Whether to enable logging of SQL statements.
-#spring.jpa.show-sql=true
-
-#Async Executor default Parameters
-async.core.pool.size=10
-async.max.pool.size=20
-async.queue.capacity=500
-
-#For EELF logback file
-#com.att.eelf.logging.path=
-clamp.config.logback.filename=logback-default.xml
-#The log folder that will be used in logback.xml file
-clamp.config.log.path=log
-clamp.config.files.systemProperties=classpath:/system.properties
-clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
-clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
-clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
-
-clamp.config.httpclient.socketTimeout=20000
-clamp.config.httpclient.connectTimeout=10000
-
-#
-# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.policy.api.userName=healthcheck
-clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.policy.pap.userName=healthcheck
-clamp.config.policy.pap.password=zb!XztG34
-
-# Sdc service properties
-#
-clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests
-
-#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.dcae.intentory.retry.interval=100
-clamp.config.dcae.intentory.retry.limit=1
-
-#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.dcae.deployment.userName=test
-clamp.config.dcae.deployment.password=test
-
-#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !
-clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl
-clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage
-clamp.config.security.permission.type.cl.event=org.onap.clamp.clds.cl.event
-clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf
-clamp.config.security.permission.type.template=org.onap.clamp.clds.template
-clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
-clamp.config.security.permission.type.policies=org.onap.clamp.clds.policies
-#This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
-clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
-
-# Configuration settings for CDS
-clamp.config.cds.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.cds.userName=ccsdkapps
-clamp.config.cds.password=ccsdkapps
-
-## Tosca converter
-clamp.config.tosca.converter.json.schema.templates=classpath:/clds/tosca-converter/templates.json
-clamp.config.tosca.converter.default.datatypes=classpath:/clds/tosca-converter/default-tosca-types.yaml
-clamp.config.tosca.converter.dictionary.support.enabled=true
\ No newline at end of file
diff --git a/src/test/resources/clds/blueprint-with-microservice-chain.yaml b/src/test/resources/clds/blueprint-with-microservice-chain.yaml
deleted file mode 100644
index 0e9e4bc8c..000000000
--- a/src/test/resources/clds/blueprint-with-microservice-chain.yaml
+++ /dev/null
@@ -1,202 +0,0 @@
-tosca_definitions_version: cloudify_dsl_1_3
-
-description: >
-  This blueprint deploys/manages the TCA module as a Docker container
-
-imports:
-  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
-inputs:
-  aaiEnrichmentHost:
-    type: string
-    default: "aai.onap.svc.cluster.local"
-  aaiEnrichmentPort:
-    type: string
-    default: "8443"
-  enableAAIEnrichment:
-    type: string
-    default: true
-  dmaap_host:
-    type: string
-    default: message-router.onap.svc.cluster.local
-  dmaap_port:
-    type: string
-    default: "3904"
-  enableRedisCaching:
-    type: string
-    default: false
-  redisHosts:
-    type: string
-    default: dcae-redis.onap.svc.cluster.local:6379
-  tag_version:
-    type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0-STAGING-latest"
-  consul_host:
-    type: string
-    default: consul-server.onap.svc.cluster.local
-  consul_port:
-    type: string
-    default: "8500"
-  cbs_host:
-    type: string
-    default: "config-binding-service.dcae.svc.cluster.local"
-  cbs_port:
-    type: string
-    default: "10000"
-  policy_id:
-    type: string
-    default: "none"
-  external_port:
-    type: string
-    description: Kubernetes node port on which CDAPgui is exposed
-    default: "32012"
-  policy_model_id:
-    type: string
-    default: "onap.policies.monitoring.cdap.tca.hi.lo.app"
-
-node_templates:
-  first_app:
-    type: dcae.nodes.ContainerizedServiceComponent
-    properties:
-        service_component_type: 'dcaegen2-analytics-tca'
-        application_config: {}
-        docker_config: {}
-        image:
-          get_input: tag_version
-        log_info:
-          log_directory: "/opt/app/TCAnalytics/logs"
-    relationships:
-      - target: tca_policy_1
-        type: cloudify.relationships.depends_on
-  second_app:
-    type: dcae.nodes.ContainerizedServiceComponent
-    relationships:
-      - target: tca_policy_2
-        type: cloudify.relationships.depends_on
-      - type: clamp_node.relationships.gets_input_from
-        target: first_app
-    properties:
-        service_component_type: 'dcaegen2-analytics-tca'
-        application_config: {}
-        docker_config: {}
-        image:
-          get_input: tag_version
-        log_info:
-          log_directory: "/opt/app/TCAnalytics/logs"
-        application_config:
-            app_config:
-                appDescription: DCAE Analytics Threshold Crossing Alert Application
-                appName: dcae-tca
-                tcaAlertsAbatementTableName: TCAAlertsAbatementTable
-                tcaAlertsAbatementTableTTLSeconds: '1728000'
-                tcaSubscriberOutputStreamName: TCASubscriberOutputStream
-                tcaVESAlertsTableName: TCAVESAlertsTable
-                tcaVESAlertsTableTTLSeconds: '1728000'
-                tcaVESMessageStatusTableName: TCAVESMessageStatusTable
-                tcaVESMessageStatusTableTTLSeconds: '86400'
-                thresholdCalculatorFlowletInstances: '2'
-            app_preferences:
-                aaiEnrichmentHost:
-                    get_input: aaiEnrichmentHost
-                aaiEnrichmentIgnoreSSLCertificateErrors: 'true'
-                aaiEnrichmentPortNumber: '8443'
-                aaiEnrichmentProtocol: https
-                aaiEnrichmentUserName: dcae@dcae.onap.org
-                aaiEnrichmentUserPassword: demo123456!
-                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query
-                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf
-                enableAAIEnrichment:
-                    get_input: enableAAIEnrichment
-                enableRedisCaching:
-                    get_input: enableRedisCaching
-                redisHosts:
-                    get_input: redisHosts
-                enableAlertCEFFormat: 'false'
-                publisherContentType: application/json
-                publisherHostName:
-                    get_input: dmaap_host
-                publisherHostPort:
-                    get_input: dmaap_port
-                publisherMaxBatchSize: '1'
-                publisherMaxRecoveryQueueSize: '100000'
-                publisherPollingInterval: '20000'
-                publisherProtocol: http
-                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT
-                subscriberConsumerGroup: OpenDCAE-c12
-                subscriberConsumerId: c12
-                subscriberContentType: application/json
-                subscriberHostName:
-                    get_input: dmaap_host
-                subscriberHostPort:
-                    get_input: dmaap_port
-                subscriberMessageLimit: '-1'
-                subscriberPollingInterval: '30000'
-                subscriberProtocol: http
-                subscriberTimeoutMS: '-1'
-                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
-                tca_policy: ''
-        service_component_type: dcaegen2-analytics_tca
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            envs:
-                DMAAPHOST:
-                    { get_input: dmaap_host }
-                DMAAPPORT:
-                    { get_input: dmaap_port }
-                DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
-                DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
-                AAIHOST:
-                    { get_input: aaiEnrichmentHost }
-                AAIPORT:
-                    { get_input: aaiEnrichmentPort }
-                CONSUL_HOST:
-                    { get_input: consul_host }
-                CONSUL_PORT:
-                    { get_input: consul_port }
-                CBS_HOST:
-                    { get_input: cbs_host }
-                CBS_PORT:
-                    { get_input: cbs_port }
-                CONFIG_BINDING_SERVICE: "config_binding_service"
-            ports:
-              - concat: ["11011:", { get_input: external_port }]
-  third_app:
-    type: dcae.nodes.ContainerizedServiceComponent
-    properties:
-        service_component_type: 'dcaegen2-analytics-tca'
-        application_config: {}
-        docker_config: {}
-        image:
-          get_input: tag_version
-        log_info:
-          log_directory: "/opt/app/TCAnalytics/logs"
-    relationships:
-      - target: tca_policy_3
-        type: cloudify.relationships.depends_on
-      - type: clamp_node.relationships.gets_input_from
-        target: second_app
-  tca_policy_1:
-    type: dcae.nodes.policy
-    properties:
-      policy_id:
-           get_input: policy_id
-      policy_model_id: 
-           get_input: policy_model_id
-  tca_policy_2:
-    type: dcae.nodes.policy
-    properties:
-      policy_id:
-           get_input: policy_id
-      policy_model_id: 
-           get_input: policy_model_id
-           
-  tca_policy_3:
-    type: dcae.nodes.policy
-    properties:
-      policy_id:
-           get_input: policy_id
-      policy_model_id: 
-           get_input: policy_model_id
diff --git a/src/test/resources/clds/clds-parse-exception.json b/src/test/resources/clds/clds-parse-exception.json
deleted file mode 100644
index 1c06a3947..000000000
--- a/src/test/resources/clds/clds-parse-exception.json
+++ /dev/null
@@ -1 +0,0 @@
-This is not json
\ No newline at end of file
diff --git a/src/test/resources/clds/clds-users-incomplete-permissions.json b/src/test/resources/clds/clds-users-incomplete-permissions.json
deleted file mode 100644
index 9e3534ff4..000000000
--- a/src/test/resources/clds/clds-users-incomplete-permissions.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-	{
-		"user": "admin1",
-		"password": "5f4dcc3b5aa765d61d8327deb882cf99",
-		"permissions": [
-			"permission-type-cl|dev|",
-			"permission-type-cl|dev",
-			"permission-type-cl-manage|dev|*",
-			"permission-type-filter-vf|dev|*",
-			"permission-type-template|dev|read",
-			"permission-type-template|dev|update"
-		]
-	}
-]
diff --git a/src/test/resources/clds/clds-users-no-permission.json b/src/test/resources/clds/clds-users-no-permission.json
deleted file mode 100644
index ac91540f2..000000000
--- a/src/test/resources/clds/clds-users-no-permission.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-	{
-		"user": "admin1",
-		"permissions": [
-		]
-	}
-]
diff --git a/src/test/resources/clds/clds-users-two-users.json b/src/test/resources/clds/clds-users-two-users.json
deleted file mode 100644
index b3721946a..000000000
--- a/src/test/resources/clds/clds-users-two-users.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-	{
-		"user": "admin1",
-		"password": "5f4dcc3b5aa765d61d8327deb882cf99",
-		"permissions": [
-			"permission-type-cl|dev|read",
-			"permission-type-cl|dev|update",
-			"permission-type-cl-manage|dev|*",
-			"permission-type-filter-vf|dev|*",
-			"permission-type-template|dev|read",
-			"permission-type-template|dev|update"
-		]
-	},
-	{
-		"user": "admin2",
-		"password": "5f4dcc3b5aa765d61d8327deb882cf99",
-		"permissions": [
-			"permission-type-cl|dev|read",
-			"permission-type-cl|dev|update",
-			"permission-type-cl-manage|dev|*",
-			"permission-type-filter-vf|dev|*",
-			"permission-type-template|dev|read",
-			"permission-type-template|dev|update"
-		]
-	}
-]
diff --git a/src/test/resources/clds/new-microservice.yaml b/src/test/resources/clds/new-microservice.yaml
deleted file mode 100644
index 70c1eda46..000000000
--- a/src/test/resources/clds/new-microservice.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-tosca_definitions_version: cloudify_dsl_1_3
- 
-imports:
-  - "http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml"
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R5/k8splugin/1.4.13/k8splugin_types.yaml"
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R5/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml"
-
-inputs:
-  tag_version:
-    type: string
-    description: docker image
-  policy_model_id:
-    type: 'string'
-    default: 'onap.policies.monitoring.dcae-pm-initiation-handler'
-  policy_id:
-    type: 'string'
-    default: 'onap.policies.monitoring.dcae-pm-initiation-handler'
-
-node_templates:
-  pmsh:
-    relationships:
-      - type: cloudify.relationships.depends_on
-        target: pmsh-policy
-
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            ports:
-              - '8443:0'
-              - '8081:0'
-    properties:
-      image:
-        get_input: tag_version
-      replicas: 1
-      service_component_type: "pmsh"
-      service_component_name_override: "pmsh"
-    type: dcae.nodes.ContainerizedServiceComponent
-
-  pmsh-policy:
-    type: clamp.nodes.policy
-    properties:
-      policy_model_id:
-        get_input: policy_model_id
-      policy_id:
-        get_input: policy_id
diff --git a/src/test/resources/clds/policy-merger.json b/src/test/resources/clds/policy-merger.json
deleted file mode 100644
index 5c6bd5b6b..000000000
--- a/src/test/resources/clds/policy-merger.json
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-  "policies": [
-    {
-      "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0": {
-        "type": "onap.policies.monitoring.tcagen2",
-        "type_version": "1.0.0",
-        "properties": {
-          "tca.policy": {
-            "domain": "measurementsForVfScaling",
-            "metricsPerEventName": [
-              {
-                "policyScope": "DCAE",
-                "thresholds": [
-                  {
-                    "version": "1.0.2",
-                    "severity": "MAJOR",
-                    "thresholdValue": 200,
-                    "closedLoopEventStatus": "ONSET",
-                    "closedLoopControlName": "LOOP_test",
-                    "direction": "LESS_OR_EQUAL",
-                    "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
-                  }
-                ],
-                "eventName": "vLoadBalancer",
-                "policyVersion": "v0.0.1",
-                "controlLoopSchemaType": "VM",
-                "policyName": "DCAE.Config_tca-hi-lo"
-              }
-            ]
-          }
-        },
-        "name": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-        "version": "1.0.0",
-        "metadata": {
-          "policy-id": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-          "policy-version": "1.0.0"
-        },
-        "pdpGroupInfo": {
-          "pdpGroup": "pdpGroup2",
-          "pdpSubGroup": "subGroup2"
-        },
-        "supportedPdpGroups": [
-          {
-            "pdpGroup2": [
-              "subGroup2",
-              "subGroup3"
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd": {
-        "type": "onap.policies.controlloop.operational.common.Drools",
-        "type_version": "1.0.0",
-        "properties": {
-          "abatement": false,
-          "operations": [
-            {
-              "failure_retries": "final_failure_retries",
-              "id": "test1",
-              "failure_timeout": "final_failure_timeout",
-              "failure": "final_failure",
-              "operation": {
-                "payload": {
-                  "artifact_name": "baseconfiguration",
-                  "artifact_version": "1.0.0",
-                  "mode": "async",
-                  "data": "{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}}"
-                },
-                "target": {
-                  "entityIds": {
-                    "resourceID": "Vloadbalancerms..vdns..module-3",
-                    "modelInvariantId": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                    "modelVersionId": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                    "modelName": "Vloadbalancerms..vdns..module-3",
-                    "modelVersion": "1",
-                    "modelCustomizationId": "bafcdab0-801d-4d81-9ead-f464640a38b1"
-                  },
-                  "targetType": "VNF"
-                },
-                "actor": "SDNR",
-                "operation": "BandwidthOnDemand"
-              },
-              "failure_guard": "final_failure_guard",
-              "retries": 0,
-              "timeout": 0,
-              "failure_exception": "final_failure_exception",
-              "description": "test",
-              "success": "final_success"
-            }
-          ],
-          "trigger": "test1",
-          "timeout": 0,
-          "id": "LOOP_test"
-        },
-        "name": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-        "version": "1.0.0",
-        "metadata": {
-          "policy-id": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-          "policy-version": "1.0.0"
-        },
-        "pdpGroupInfo": {
-          "pdpGroup": "pdpGroup2",
-          "pdpSubGroup": "subGroup3"
-        },
-        "supportedPdpGroups": [
-          {
-            "pdpGroup2": [
-              "subGroup2",
-              "subGroup3"
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP": {
-        "type": "onap.policies.Naming",
-        "type_version": "1.0.0",
-        "properties": {
-          "naming-models": [
-            {
-              "naming-type": "VNF",
-              "naming-recipe": "AIC_CLOUD_REGION|DELIMITER|CONSTANT|DELIMITER|TIMESTAMP",
-              "name-operation": "to_lower_case()",
-              "naming-properties": [
-                {
-                  "property-name": "AIC_CLOUD_REGION"
-                },
-                {
-                  "property-name": "CONSTANT",
-                  "property-value": "onap-nf"
-                },
-                {
-                  "property-name": "TIMESTAMP"
-                },
-                {
-                  "property-value": "-",
-                  "property-name": "DELIMITER"
-                }
-              ]
-            },
-            {
-              "naming-type": "VNFC",
-              "naming-recipe": "VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE",
-              "name-operation": "to_lower_case()",
-              "naming-properties": [
-                {
-                  "property-name": "VNF_NAME"
-                },
-                {
-                  "property-name": "SEQUENCE",
-                  "increment-sequence": {
-                    "max": "zzz",
-                    "scope": "ENTIRETY",
-                    "start-value": "1",
-                    "length": "3",
-                    "increment": "1",
-                    "sequence-type": "alpha-numeric"
-                  }
-                },
-                {
-                  "property-name": "NFC_NAMING_CODE"
-                },
-                {
-                  "property-value": "-",
-                  "property-name": "DELIMITER"
-                }
-              ]
-            },
-            {
-              "naming-type": "VF-MODULE",
-              "naming-recipe": "VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE",
-              "name-operation": "to_lower_case()",
-              "naming-properties": [
-                {
-                  "property-name": "VNF_NAME"
-                },
-                {
-                  "property-value": "-",
-                  "property-name": "DELIMITER"
-                },
-                {
-                  "property-name": "VF_MODULE_LABEL"
-                },
-                {
-                  "property-name": "VF_MODULE_TYPE"
-                },
-                {
-                  "property-name": "SEQUENCE",
-                  "increment-sequence": {
-                    "max": "zzz",
-                    "scope": "PRECEEDING",
-                    "start-value": "1",
-                    "length": "3",
-                    "increment": "1",
-                    "sequence-type": "alpha-numeric"
-                  }
-                }
-              ]
-            }
-          ],
-          "policy-instance-name": "ONAP_NF_NAMING_TIMESTAMP"
-        },
-        "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
-        "version": "1.0.0",
-        "metadata": {
-          "policy-id": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
-          "policy-version": "1.0.0"
-        }
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/clds/sdc-controller-config-NULL.json b/src/test/resources/clds/sdc-controller-config-NULL.json
deleted file mode 100644
index bf310c706..000000000
--- a/src/test/resources/clds/sdc-controller-config-NULL.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-        "user": "User",
-        "consumerGroup": "NULL",
-        "consumerId": "consumerId",
-        "environmentName": "environmentName",
-        "sdcAddress": "hostname:8080",
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
-        "pollingInterval":10,
-        "pollingTimeout":30,
-        "messageBusAddresses":["localhost"]
-}
diff --git a/src/test/resources/clds/sdc-controller-config-TLS.json b/src/test/resources/clds/sdc-controller-config-TLS.json
deleted file mode 100644
index 4d5f02945..000000000
--- a/src/test/resources/clds/sdc-controller-config-TLS.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-        "user": "User",
-        "consumerGroup": "consumerGroup",
-        "consumerId": "consumerId",
-        "environmentName": "environmentName",
-        "sdcAddress": "hostname:8080",
-        "password": "QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd",
-        "pollingInterval":10,
-        "pollingTimeout":30,
-        "activateServerTLSAuth": true,
-        "keyStorePassword":"QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd",
-        "keyStorePath": "/test",
-        "messageBusAddresses":["localhost"]
-}
diff --git a/src/test/resources/clds/sdc-controller-config-bad.json b/src/test/resources/clds/sdc-controller-config-bad.json
deleted file mode 100644
index 194ff5f4b..000000000
--- a/src/test/resources/clds/sdc-controller-config-bad.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"sdc-connections": {
-		"sdc-controller1": {
-			"user": "testuser",
-			"consumerGroup": "consumerGroup",
-			"consumerId": "consumerId",
-			"environmentName": "environmentName",
-			"sdcAddress": "hostname1:8080",
-			"pollingInterval": 10,
-			"pollingTimeout": 30
-		}
-	}
-}
diff --git a/src/test/resources/clds/sdc-controller-config-empty-encrypted.json b/src/test/resources/clds/sdc-controller-config-empty-encrypted.json
deleted file mode 100644
index 2a70b9edc..000000000
--- a/src/test/resources/clds/sdc-controller-config-empty-encrypted.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-        "user": "User",
-        "consumerGroup": "consumerGroup",
-        "consumerId": "consumerId",
-        "environmentName": "environmentName",
-        "sdcAddress": "hostname:8080",
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
-        "pollingInterval":10,
-        "pollingTimeout":30,
-        "activateServerTLSAuth": true,
-        "keyStorePassword":"",
-        "keyStorePath": "/test",
-        "messageBusAddresses":["localhost"]
-}
diff --git a/src/test/resources/clds/sdc-controllers-config-bad.json b/src/test/resources/clds/sdc-controllers-config-bad.json
deleted file mode 100644
index 0b417b745..000000000
--- a/src/test/resources/clds/sdc-controllers-config-bad.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "sdc-connections":{,
-    "sdc-controller1":{
-        "user": "User1",
-        "consumerGroup": "consumerGroup1",
-        "consumerId": "consumerId1",
-        "environmentName": "environmentName1",
-        "sdcAddress": "hostname1",
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
-        "pollingInterval":10,
-        "pollingTimeout":30
-        
-    },
-     "sdc-controller2":{
-        "user": "User2",
-        "consumerGroup": "consumerGroup2",
-        "consumerId": "consumerId2",
-        "environmentName": "environmentName2",
-        "sdcAddress": "hostname2",
-        "password": "bb3871669d893c7fb8aaacda31b77b4f537E67A081C2726889548ED7BC4C2DE6",
-        "pollingInterval":10,
-        "pollingTimeout":30
-        
-    }
-  }
-}
diff --git a/src/test/resources/clds/sdc-controllers-config-missing-param.json b/src/test/resources/clds/sdc-controllers-config-missing-param.json
deleted file mode 100644
index d99ed5801..000000000
--- a/src/test/resources/clds/sdc-controllers-config-missing-param.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"sdc-connections": {
-		"sdc-controller1": {
-			"user": "testuser",
-			"consumerGroup": "consumerGroup",
-			"consumerId": "consumerId",
-			"environmentName": "environmentName",
-			"sdcAddress": "hostname1",
-			"pollingInterval": 10,
-			"pollingTimeout": 30
-		}
-	}
-}
diff --git a/src/test/resources/clds/sdc-controllers-config.json b/src/test/resources/clds/sdc-controllers-config.json
deleted file mode 100644
index aafd7d61d..000000000
--- a/src/test/resources/clds/sdc-controllers-config.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "sdc-connections": {
-    "sdc-controller1": {
-      "user": "User1",
-      "consumerGroup": "consumerGroup1",
-      "consumerId": "consumerId1",
-      "environmentName": "environmentName1",
-      "sdcAddress": "localhost:${docker.http-cache.port.host}",
-      "password": "enc:QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd",
-      "pollingInterval": 10,
-      "pollingTimeout": 30,
-      "messageBusAddresses": [
-        "localhost"
-      ]
-    },
-    "sdc-controller2": {
-      "user": "User2",
-      "consumerGroup": "consumerGroup2",
-      "consumerId": "consumerId2",
-      "environmentName": "environmentName2",
-      "sdcAddress": "localhost:${docker.http-cache.port.host}",
-      "password": "enc:QpF2TcrdRSFADqDxH1HwDYdYUIbMxOj-TrGd6Vqvwzd",
-      "pollingInterval": 10,
-      "pollingTimeout": 30,
-      "messageBusAddresses": [
-        "localhost"
-      ]
-    }
-  }
-}
diff --git a/src/test/resources/clds/single-microservice-fragment-invalid.yaml b/src/test/resources/clds/single-microservice-fragment-invalid.yaml
deleted file mode 100644
index 2c1680717..000000000
--- a/src/test/resources/clds/single-microservice-fragment-invalid.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-second_app:
-  type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
-  properties:
-    service_component_type: dcaegen2-analytics-tca
-    service_component_name_override: second_app
-    image: { get_input: second_app_docker_image }
-    name: second_app
-    policy_id:
-    policy_model_id: "type1"
-  interfaces:
-    cloudify.interfaces.lifecycle:
-      start:
-        inputs:
-          envs:
-            grpc_server.host: "first_app.onap"
-            dmaap_ip: {get_input: dmaap_ip}
-            dmapp_topic: {get_input: dmaap_topic}
-            policy_id: {get_input: policy_id}
-          ports:
-            - 8080:8080
-  relationships:
-    - type: cloudify.relationships.connected_to
-      target: first_app
-    - type: clamp_node.relationships.gets_input_from
-      target: first_app
\ No newline at end of file
diff --git a/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml b/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml
deleted file mode 100644
index ae31fb16a..000000000
--- a/src/test/resources/clds/single-microservice-fragment-valid-with-version.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-second_app:
-  type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
-  properties:
-    service_component_type: dcaegen2-analytics-tca
-    service_component_name_override: second_app
-    image: { get_input: second_app_docker_image }
-    name: second_app
-    policy_id:
-    policy_model_id: "type1"
-    policy_model_version: "10.0.0"
-  interfaces:
-    cloudify.interfaces.lifecycle:
-      start:
-        inputs:
-          envs:
-            grpc_server.host: "first_app.onap"
-            dmaap_ip: {get_input: dmaap_ip}
-            dmapp_topic: {get_input: dmaap_topic}
-            policy_id: {get_input: policy_id}
-          ports:
-            - 8080:8080
diff --git a/src/test/resources/clds/single-microservice-fragment-without-name.yaml b/src/test/resources/clds/single-microservice-fragment-without-name.yaml
deleted file mode 100644
index f9ac53cac..000000000
--- a/src/test/resources/clds/single-microservice-fragment-without-name.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-second_app:
-  type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
-  properties:
-    service_component_type: dcaegen2-analytics-tca
-    service_component_name_override: second_app
-    image: { get_input: second_app_docker_image }
-  interfaces:
-    cloudify.interfaces.lifecycle:
-      start:
-        inputs:
-          envs:
-            grpc_server.host: "first_app.onap"
-            dmaap_ip: {get_input: dmaap_ip}
-            dmapp_topic: {get_input: dmaap_topic}
-            policy_id: {get_input: policy_id}
-          ports:
-            - 8080:8080
-  relationships:
-    - type: cloudify.relationships.connected_to
-      target: first_app
-    - type: clamp_node.relationships.gets_input_from
-      target: first_app
\ No newline at end of file
diff --git a/src/test/resources/clds/single-microservice-fragment-without-properties.yaml b/src/test/resources/clds/single-microservice-fragment-without-properties.yaml
deleted file mode 100644
index a34ccc6d4..000000000
--- a/src/test/resources/clds/single-microservice-fragment-without-properties.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-second_app:
-  type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
-  interfaces:
-    cloudify.interfaces.lifecycle:
-      start:
-        inputs:
-          envs:
-            grpc_server.host: "first_app.onap"
-            dmaap_ip: {get_input: dmaap_ip}
-            dmapp_topic: {get_input: dmaap_topic}
-            policy_id: {get_input: policy_id}
-          ports:
-            - 8080:8080
-  relationships:
-    - type: cloudify.relationships.connected_to
-      target: first_app
-    - type: clamp_node.relationships.gets_input_from
-      target: first_app
\ No newline at end of file
diff --git a/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml b/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml
deleted file mode 100644
index 0354acd69..000000000
--- a/src/test/resources/clds/single-microservice-fragment-without-relationships.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-second_app:
-  type: dcae.nodes.ContainerizedServiceComponentUsingDmaap
-  properties:
-    service_component_type: dcaegen2-analytics-tca
-    service_component_name_override: second_app
-    image: { get_input: second_app_docker_image }
-    name: second_app
-  interfaces:
-    cloudify.interfaces.lifecycle:
-      start:
-        inputs:
-          envs:
-            grpc_server.host: "first_app.onap"
-            dmaap_ip: {get_input: dmaap_ip}
-            dmapp_topic: {get_input: dmaap_topic}
-            policy_id: {get_input: policy_id}
-          ports:
-            - 8080:8080
\ No newline at end of file
diff --git a/src/test/resources/clds/templates/dcae-deployment-template.json b/src/test/resources/clds/templates/dcae-deployment-template.json
deleted file mode 100644
index d4891747e..000000000
--- a/src/test/resources/clds/templates/dcae-deployment-template.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"serviceTypeId": "???",
-	"inputs": {
-		"aaiEnrichmentHost": "10.0.1.1",
-		"enableAAIEnrichment": "true",
-		"subscriberHostName": "10.0.11.1",
-		"publisherHostName": "10.0.11.1"
-	}
-}
diff --git a/src/test/resources/clds/templates/dcae-template.json b/src/test/resources/clds/templates/dcae-template.json
deleted file mode 100644
index b76baf2d4..000000000
--- a/src/test/resources/clds/templates/dcae-template.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"properties": {
-		"service_name": "",
-		"service_ids": [
-		],
-		"vnf_ids": [
-		],
-		"location_ids": [
-		]
-	},
-	"template": {
-		"tca": {
-			"dcae": {
-				"inputTopic": "",
-				"outputTopic": "",
-				"closedLoopControlName": "",
-				"closedLoopEventClient": "configuration.dcae.microservice.tca.xml",
-				"policyName": "",
-				"policyScope": "DCAE",
-				"policyVersion": "v0.0.1",
-				"serviceConfigurations": {
-				}
-			}
-		}
-	}
-}
diff --git a/src/test/resources/clds/templates/globalProperties.json b/src/test/resources/clds/templates/globalProperties.json
deleted file mode 100644
index 067063ea2..000000000
--- a/src/test/resources/clds/templates/globalProperties.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-	"tca": {
-		"tname": "New_Set",
-		"tcaInt": "1",
-		"tcaVio": "1",
-		"eventName": {
-			"vLoadBalancer": "vLoadBalancer",
-			"vFirewallBroadcastPackets": "vFirewallBroadcastPackets",
-			"Measurement_vGMUX":"Measurement_vGMUX"
-		},
-		"fieldPathM": {
-			"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value": "packetLossRate",
-			"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta":"receivedTotalPacketsDelta"
-		},
-		"operator": {
-			">": "GREATER",
-			">=": "GREATER_OR_EQUAL",
-			"=": "EQUAL",
-			"<=": "LESS_OR_EQUAL",
-			"<": "LESS"
-		},
-		"opsPolicy": {
-			"POLICY_test_X": "POLICY_test_X",
-			"POLICY_test_Y": "POLICY_test_Y"
-		},
-		"controlLoopSchemaType": {
-			"": "",
-			"VM": "VM",
-			"VNF": "VNF"
-		},
-		"closedLoopEventStatus": {
-			"": "",
-			"ONSET": "ONSET",
-			"ABATED": "ABATED"
-		}
-	},
-	"global": {
-		"actionSet": {
-			"vnfRecipe": "VNF"
-		},
-		"location": {
-			"DC1": "Data Center 1",
-			"DC2": "Data Center 2",
-			"DC3": "Data Center 3"
-		}
-	},
-	"policy": {
-		"pname": "0",
-		"timeout": 345,
-		"vnfRecipe": {
-			"": "",
-			"Restart": "Restart",
-			"Rebuild": "Rebuild",
-			"Migrate": "Migrate",
-			"HealthCheck": "Health Check",
-			"ModifyConfig": "Modify Config",
-			"VF Module Create":"VF Module Create",
-			"VF Module Delete":"VF Module Delete",
-			"Reroute":"Reroute"
-		},
-		"maxRetries": "3",
-		"retryTimeLimit": 180,
-		"resource": {
-			"vCTS": "vCTS",
-			"v3CDB": "v3CDB",
-			"vUDR": "vUDR",
-			"vCOM": "vCOM",
-			"vRAR": "vRAR",
-			"vLCS": "vLCS",
-			"vUDR-BE": "vUDR-BE",
-			"vDBE": "vDBE"
-		},
-		"parentPolicyConditions": {
-			"Failure_Retries": "Failure: Max Retries Exceeded",
-			"Failure_Timeout": "Failure: Time Limit Exceeded",
-			"Failure_Guard": "Failure: Guard",
-			"Failure_Exception": "Failure: Exception",
-			"Failure": "Failure: Other",
-			"Success": "Success"
-		}
-	},
-	"shared": {
-		"byService": {
-			"": {
-				"vf": {
-					"": ""
-				},
-				"location": {
-					"": ""
-				},
-				"alarmCondition": {
-					"": ""
-				}
-			}
-		},
-		"byVf": {
-			"": {
-				"vfc": {
-					"": ""
-				}
-			}
-		}
-	}
-}
diff --git a/src/test/resources/clds/templates/sdc-decode-service_ids.json b/src/test/resources/clds/templates/sdc-decode-service_ids.json
deleted file mode 100644
index 9e26dfeeb..000000000
--- a/src/test/resources/clds/templates/sdc-decode-service_ids.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/test/resources/clds/templates/sdc-template.json b/src/test/resources/clds/templates/sdc-template.json
deleted file mode 100644
index 9e26dfeeb..000000000
--- a/src/test/resources/clds/templates/sdc-template.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/src/test/resources/clds/templates/tca-policy-template.json b/src/test/resources/clds/templates/tca-policy-template.json
deleted file mode 100644
index 559aacb29..000000000
--- a/src/test/resources/clds/templates/tca-policy-template.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"service": "tca_policy",
-	"version": "1.1.0",
-	"location": "SampleServiceLocation",
-	"configName": "SampleConfigName",
-	"uuid": "test",
-	"policyScope": "CLAMP",
-	"templateVersion": "OpenSource.version.1",
-	"policyName": "MicroService",
-	"description": "MicroService Policy",
-	"priority": "1",
-	"riskType": "SampleRiskType",
-	"riskLevel": "1",
-	"guard": "False",
-	"content": {
-		"tca_policy": {
-		}
-	}
-}
diff --git a/src/test/resources/clds/templates/tca-template.json b/src/test/resources/clds/templates/tca-template.json
deleted file mode 100644
index 892fc0d62..000000000
--- a/src/test/resources/clds/templates/tca-template.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"domain": "measurementsForVfScaling",
-	"metricsPerEventName": [
-		{
-			"eventName": "???",
-			"controlLoopSchemaType": "VNF",
-			"policyScope": "DCAE",
-			"policyName": "???",
-			"policyVersion": "v0.0.1",
-			"thresholds": [
-			]
-		}
-	]
-}
diff --git a/src/test/resources/clds/templates/tca-thresholds-template.json b/src/test/resources/clds/templates/tca-thresholds-template.json
deleted file mode 100644
index b67e96321..000000000
--- a/src/test/resources/clds/templates/tca-thresholds-template.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"closedLoopControlName": "???",
-	"version": "1.0.2",
-	"fieldPath": "?????",
-	"thresholdValue": 0,
-	"direction": "???",
-	"severity": "MAJOR",
-	"closedLoopEventStatus": "???"
-}
diff --git a/src/test/resources/clds/templates/ui-location-default.json b/src/test/resources/clds/templates/ui-location-default.json
deleted file mode 100644
index c0043d988..000000000
--- a/src/test/resources/clds/templates/ui-location-default.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"DC1": "Data Center 1",
-	"DC2": "Data Center 2",
-	"DC3": "Data Center 3"
-}
diff --git a/src/test/resources/clds/util/file.xml b/src/test/resources/clds/util/file.xml
deleted file mode 100644
index 81560bab4..000000000
--- a/src/test/resources/clds/util/file.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<note>
-  <to>Tove</to>
-  <from>Jani</from>
-  <heading>Reminder</heading>
-  <body>Message body</body>
-</note>
diff --git a/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json b/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json
deleted file mode 100644
index 2b6493176..000000000
--- a/src/test/resources/example/cds-response/vFW-CDS-modify-config-wf-expected-result.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "inputs": {
-    "modify-config-properties": {
-      "type": "object",
-      "properties": {
-        "service-instance-id": {
-          "type": "string",
-          "input-param": true
-        },
-        "update-active-streams": {
-          "description": "",
-          "required": false,
-          "type": "string",
-          "input-param": true,
-          "status": "",
-          "constraints": [
-            {}
-          ],
-          "entry_schema": {
-            "type": "dt-data"
-          }
-        },
-        "generic-vnf.vnf-id": {
-          "type": "string",
-          "input-param": true
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json b/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json
deleted file mode 100644
index 115d79b1f..000000000
--- a/src/test/resources/example/cds-response/vFW-CDS-modify-config-workflow.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "blueprintName": "vFW-CDS",
-  "version": "1.0.0",
-  "workFlowData": {
-    "workFlowName": "modify-config",
-    "inputs": {
-      "resolution-key": {
-        "required": true,
-        "type": "string"
-      },
-      "modify-config-properties": {
-        "description": "Dynamic PropertyDefinition for workflow(modify-config).",
-        "required": true,
-        "type": "dt-modify-config-properties"
-      }
-    }
-  },
-  "dataTypes": {
-    "dt-modify-config-properties": {
-      "description": "Dynamic DataType definition for workflow(modify-config).",
-      "version": "1.0.0",
-      "properties": {
-        "vpg_onap_private_ip_0": {
-          "description": "",
-          "required": false,
-          "type": "string",
-          "status": "",
-          "constraints": [
-            {}
-          ],
-          "entry_schema": {
-            "type": ""
-          }
-        },
-        "service-instance.service-instance-id": {
-          "type": "string"
-        },
-        "vnf-id": {
-          "type": "string"
-        },
-        "data": {
-          "description": "",
-          "required": false,
-          "type": "string",
-          "status": "",
-          "constraints": [
-            {}
-          ],
-          "entry_schema": {
-            "type": "dt-data"
-          }
-        },
-        "service-instance-id": {
-          "type": "string",
-          "input-param": true
-        },
-        "update-active-streams": {
-          "description": "",
-          "required": false,
-          "type": "string",
-          "input-param": true,
-          "status": "",
-          "constraints": [
-            {}
-          ],
-          "entry_schema": {
-            "type": "dt-data"
-          }
-        },
-        "generic-vnf.vnf-id": {
-          "type": "string",
-          "input-param": true
-        }
-      },
-      "derived_from": "tosca.datatypes.Dynamic"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json b/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json
deleted file mode 100644
index 07d851f38..000000000
--- a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-wf-expected-result.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "inputs": {
-    "template-prefix-with-complex-type": {
-      "type": "list",
-      "properties": {
-        "prefix-id": {
-          "description": "",
-          "required": false,
-          "type": "string",
-          "input-param": true,
-          "status": "",
-          "constraints": [
-            {}
-          ],
-          "entry_schema": {
-            "type": ""
-          }
-        }
-      }
-    },
-    "resource-assignment-properties": {
-      "type": "object",
-      "properties": {
-        "private1-prefix-id": {
-          "description": "",
-          "required": false,
-          "type": "string",
-          "input-param": true,
-          "status": "",
-          "constraints": [
-            {}
-          ],
-          "entry_schema": {
-            "type": ""
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json b/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json
deleted file mode 100644
index 7f76c6cae..000000000
--- a/src/test/resources/example/cds-response/vFW-CDS-resource-assignment-workflow.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "blueprintName": "vFW-CDS",
-  "version": "1.0.0",
-  "workFlowData": {
-    "workFlowName": "resource-assignment",
-    "inputs": {
-      "template-prefix": {
-        "required": true,
-        "type": "list",
-        "entry_schema": {
-          "type": "string"
-        }
-      },
-      "template-prefix-with-complex-type": {
-        "required": true,
-        "type": "list",
-        "entry_schema": {
-          "type": "dt-template-prefix-properties"
-        }
-      },
-      "resource-assignment-properties": {
-        "description": "Dynamic PropertyDefinition for workflow(resource-assignment).",
-        "required": true,
-        "type": "dt-resource-assignment-properties"
-      }
-    },
-    "outputs": {
-      "meshed-template": {
-        "type": "json",
-        "value": {
-          "get_attribute": [
-            "resource-assignment",
-            "assignment-params"
-          ]
-        }
-      }
-    }
-  },
-  "dataTypes": {
-    "dt-resource-assignment-properties": {
-      "description": "Dynamic DataType definition for workflow(resource-assignment).",
-      "version": "1.0.0",
-      "properties": {
-        "private1-prefix-id": {
-          "description": "",
-          "required": false,
-          "type": "string",
-          "input-param": true,
-          "status": "",
-          "constraints": [
-            {}
-          ],
-          "entry_schema": {
-            "type": ""
-          }
-        }
-      },
-      "derived_from": "tosca.datatypes.Dynamic"
-    },
-    "dt-template-prefix-properties": {
-      "description": "Dynamic DataType definition for workflow(template-prefix).",
-      "version": "1.0.0",
-      "properties": {
-        "prefix-id": {
-          "description": "",
-          "required": false,
-          "type": "string",
-          "input-param": true,
-          "status": "",
-          "constraints": [
-            {}
-          ],
-          "entry_schema": {
-            "type": ""
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/example/dcae/inventory-response.json b/src/test/resources/example/dcae/inventory-response.json
deleted file mode 100644
index 1ebf068b8..000000000
--- a/src/test/resources/example/dcae/inventory-response.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "links": {
-    "previousLink": {
-      "title": "string",
-      "rel": "string",
-      "uri": "string",
-      "uriBuilder": {},
-      "rels": [
-        "string"
-      ],
-      "params": {
-        "additionalProp1": "string",
-        "additionalProp2": "string",
-        "additionalProp3": "string"
-      },
-      "type": "string"
-    },
-    "nextLink": {
-      "title": "string",
-      "rel": "string",
-      "uri": "string",
-      "uriBuilder": {},
-      "rels": [
-        "string"
-      ],
-      "params": {
-        "additionalProp1": "string",
-        "additionalProp2": "string",
-        "additionalProp3": "string"
-      },
-      "type": "string"
-    }
-  },
-  "totalCount": 0,
-  "items": [
-    {
-      "owner": "testOwner",
-      "application": "testApplication",
-      "component": "testComponent",
-      "typeName": "testTypeName",
-      "typeVersion": 0,
-      "blueprintTemplate": "testBlueprintTemplate",
-      "serviceIds": [
-        "serviceId1",
-        "serviceId2"
-      ],
-      "vnfTypes": [
-        "vnfType1",
-        "vnfType2"
-      ],
-      "serviceLocations": [
-        "serviceLocation1",
-        "serviceLocation2"
-      ],
-      "asdcServiceId": "testAsdcServiceId",
-      "asdcResourceId": "testAsdcResourceId",
-      "asdcServiceURL": "testAsdcServiceURL",
-      "typeId": "testTypeId",
-      "selfLink": {
-        "title": "selfLinkTitle",
-        "rel": "selfLinkRel",
-        "uri": "selfLinkUri",
-        "uriBuilder": {},
-        "rels": [
-          "string"
-        ],
-        "params": {
-          "additionalProp1": "string",
-          "additionalProp2": "string",
-          "additionalProp3": "string"
-        },
-        "type": "string"
-      },
-      "created": "2020-01-22T09:38:15.436Z",
-      "deactivated": "2020-01-22T09:38:15.437Z"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json b/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json
deleted file mode 100644
index 3b4a0eafc..000000000
--- a/src/test/resources/example/policy/pdp-deployment-testos-1_0_0.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "pdpGroupInfo": [
-    {
-      "pdpGroup2": {
-        "name": "pdpGroup2",
-        "pdpGroupState": "ACTIVE",
-        "pdpSubgroups": [
-          {
-            "pdpType": "subGroup2",
-            "supportedPolicyTypes": [
-              {
-                "name": "org.onap.test",
-                "version": "1.0.0"
-              }
-            ],
-            "policies": [
-              {
-                "name": "org.onap.testos",
-                "version": "1.0.0"
-              }
-            ],
-            "currentInstanceCount": 0,
-            "desiredInstanceCount": 0,
-            "pdpInstances": []
-          }
-        ]
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json b/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json
deleted file mode 100644
index 0040052f2..000000000
--- a/src/test/resources/example/policy/pdp-deployment-testos-2_0_0.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-  "pdpGroupInfo": [
-    {
-      "pdpGroup3": {
-        "name": "pdpGroup3",
-        "pdpGroupState": "ACTIVE",
-        "pdpSubgroups": [
-          {
-            "pdpType": "subGroupBad",
-            "supportedPolicyTypes": [
-              {
-                "name": "org.onap.test",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.test.*",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onip.testos",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.testos3",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.tes",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap",
-                "version": "1.0.0"
-              }
-            ],
-            "policies": [
-              {
-                "name": "org.onap",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.testos",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.testos",
-                "version": "1.0.1"
-              },
-              {
-                "name": "org.onap.testos.new",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.",
-                "version": "1.0.0"
-              }
-            ],
-            "currentInstanceCount": 0,
-            "desiredInstanceCount": 0,
-            "pdpInstances": []
-          }
-        ]
-      },
-      "pdpGroup1": {
-        "name": "pdpGroup1",
-        "pdpGroupState": "ACTIVE",
-        "pdpSubgroups": [
-          {
-            "pdpType": "subGroupBad",
-            "supportedPolicyTypes": [
-              {
-                "name": "org.onap.test",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.test.*",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onip.testos",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.testos3",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.tes",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap",
-                "version": "1.0.0"
-              }
-            ],
-            "policies": [
-              {
-                "name": "org.onap",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.testos",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.testos",
-                "version": "1.0.1"
-              },
-              {
-                "name": "org.onap.testos.new",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.",
-                "version": "1.0.0"
-              }
-            ],
-            "currentInstanceCount": 0,
-            "desiredInstanceCount": 0,
-            "pdpInstances": []
-          }
-        ]
-      },
-      "pdpGroup2": {
-        "name": "pdpGroup2",
-        "pdpGroupState": "ACTIVE",
-        "pdpSubgroups": [
-          {
-            "pdpType": "subGroup3",
-            "supportedPolicyTypes": [
-              {
-                "name": "org.onap.test*",
-                "version": "1.0.0"
-              }
-            ],
-            "policies": [
-              {
-                "name": "org.onap.testos",
-                "version": "2.0.0"
-              }
-            ],
-            "currentInstanceCount": 0,
-            "desiredInstanceCount": 0,
-            "pdpInstances": []
-          },
-          {
-            "pdpType": "subGroupBad",
-            "supportedPolicyTypes": [
-              {
-                "name": "org.onap.test",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.test.*",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onip.testos",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.testos3",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.tes",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap",
-                "version": "1.0.0"
-              }
-            ],
-            "policies": [
-              {
-                "name": "org.onap",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.testos",
-                "version": "2.0.0"
-              },
-              {
-                "name": "org.onap.testos",
-                "version": "1.0.1"
-              },
-              {
-                "name": "org.onap.testos.new",
-                "version": "1.0.0"
-              },
-              {
-                "name": "org.onap.",
-                "version": "1.0.0"
-              }
-            ],
-            "currentInstanceCount": 0,
-            "desiredInstanceCount": 0,
-            "pdpInstances": []
-          }
-        ]
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/example/policy/pdp-group-multi-policies-payload.json b/src/test/resources/example/policy/pdp-group-multi-policies-payload.json
deleted file mode 100644
index 5e9c77f45..000000000
--- a/src/test/resources/example/policy/pdp-group-multi-policies-payload.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "pdpgroup1",
-      "deploymentSubgroups": [
-        {
-          "pdpType": "pdpsubgroup1",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "policyname1",
-              "version": "1.0.0"
-            }
-          ]
-        },
-        {
-          "pdpType": "pdpsubgroup1",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "policyname2",
-              "version": "1.0.0"
-            }
-          ]
-        },
-        {
-          "pdpType": "pdpsubgroup1",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "policyname1",
-              "version": "2.0.0"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "pdpgroup2",
-      "deploymentSubgroups": [
-        {
-          "pdpType": "pdpsubgroup2",
-          "action": "DELETE",
-          "policies": [
-            {
-              "name": "policyname1",
-              "version": "1.0.0"
-            }
-          ]
-        },
-        {
-          "pdpType": "pdpsubgroup2",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "policyname1",
-              "version": "2.0.0"
-            }
-          ]
-        },
-        {
-          "pdpType": "pdpsubgroup2",
-          "action": "DELETE",
-          "policies": [
-            {
-              "name": "policyname2",
-              "version": "1.0.0"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
diff --git a/src/test/resources/example/policy/pdp-group-policy-payload.json b/src/test/resources/example/policy/pdp-group-policy-payload.json
deleted file mode 100644
index 897fb43be..000000000
--- a/src/test/resources/example/policy/pdp-group-policy-payload.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "groups": [
-    {
-      "name": "pdpGroup2",
-      "deploymentSubgroups": [
-        {
-          "pdpType": "pdpSubgroup2",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "opLegacyPolicy",
-              "version": "1.0.0"
-            }
-          ]
-        },
-        {
-          "pdpType": "pdpSubgroup2",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "opPolicy",
-              "version": "1.0.0"
-            }
-          ]
-        },
-        {
-          "pdpType": "pdpSubgroup1",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "configPolicyTest2",
-              "version": "1.0.0"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name": "pdpGroup1",
-      "deploymentSubgroups": [
-        {
-          "pdpType": "pdpSubgroup1",
-          "action": "POST",
-          "policies": [
-            {
-              "name": "configPolicyTest",
-              "version": "1.0.0"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/example/policy/policy-merger.json b/src/test/resources/example/policy/policy-merger.json
deleted file mode 100644
index c3291ef71..000000000
--- a/src/test/resources/example/policy/policy-merger.json
+++ /dev/null
@@ -1,269 +0,0 @@
-{
-  "policies": [
-    {
-      "type": "onap.policies.monitoring.tcagen2",
-      "type_version": "1.0.0",
-      "properties": {
-        "tca.policy": {
-          "domain": "measurementsForVfScaling",
-          "metricsPerEventName": [
-            {
-              "policyScope": "DCAE",
-              "thresholds": [
-                {
-                  "version": "1.0.2",
-                  "severity": "MAJOR",
-                  "thresholdValue": 200,
-                  "closedLoopEventStatus": "ONSET",
-                  "closedLoopControlName": "LOOP_test",
-                  "direction": "LESS_OR_EQUAL",
-                  "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
-                }
-              ],
-              "eventName": "vLoadBalancer",
-              "policyVersion": "v0.0.1",
-              "controlLoopSchemaType": "VM",
-              "policyName": "DCAE.Config_tca-hi-lo"
-            }
-          ]
-        }
-      },
-      "name": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-      "version": "1.0.0",
-      "metadata": {
-        "policy-id": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-        "policy-version": "1.0.0"
-      },
-      "pdpGroupInfo": [
-        {
-          "pdpGroup2": {
-            "name": "pdpGroup2",
-            "pdpGroupState": "ACTIVE",
-            "pdpSubgroups": [
-              {
-                "pdpType": "subGroup2",
-                "supportedPolicyTypes": [
-                  {
-                    "name": "onap.policies.monitoring.tcagen2",
-                    "version": "1.0.0"
-                  },
-                  {
-                    "name": "onap.policies.controlloop.operational.common.Drools",
-                    "version": "1.0.0"
-                  }
-                ],
-                "policies": [
-                  {
-                    "name": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-                    "version": "1.0.0"
-                  }
-                ],
-                "currentInstanceCount": 0,
-                "desiredInstanceCount": 0,
-                "pdpInstances": []
-              }
-            ]
-          }
-        }
-      ],
-      "supportedPdpGroups": [
-        {
-          "pdpGroup2": [
-            "subGroup2",
-            "subGroup3"
-          ]
-        }
-      ]
-    },
-    {
-      "type": "onap.policies.controlloop.operational.common.Drools",
-      "type_version": "1.0.0",
-      "properties": {
-        "abatement": false,
-        "operations": [
-          {
-            "failure_retries": "final_failure_retries",
-            "id": "test1",
-            "failure_timeout": "final_failure_timeout",
-            "failure": "final_failure",
-            "operation": {
-              "payload": {
-                "artifact_name": "baseconfiguration",
-                "artifact_version": "1.0.0",
-                "mode": "async",
-                "data": "{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}}"
-              },
-              "target": {
-                "entityIds": {
-                  "resourceID": "Vloadbalancerms..vdns..module-3",
-                  "modelInvariantId": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                  "modelVersionId": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                  "modelName": "Vloadbalancerms..vdns..module-3",
-                  "modelVersion": "1",
-                  "modelCustomizationId": "bafcdab0-801d-4d81-9ead-f464640a38b1"
-                },
-                "targetType": "VNF"
-              },
-              "actor": "SDNR",
-              "operation": "BandwidthOnDemand"
-            },
-            "failure_guard": "final_failure_guard",
-            "retries": 0,
-            "timeout": 0,
-            "failure_exception": "final_failure_exception",
-            "description": "test",
-            "success": "final_success"
-          }
-        ],
-        "trigger": "test1",
-        "timeout": 0,
-        "id": "LOOP_test"
-      },
-      "name": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-      "version": "1.0.0",
-      "metadata": {
-        "policy-id": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-        "policy-version": "1.0.0"
-      },
-      "pdpGroupInfo": [
-        {
-          "pdpGroup2": {
-            "name": "pdpGroup2",
-            "pdpGroupState": "ACTIVE",
-            "pdpSubgroups": [
-              {
-                "pdpType": "subGroup3",
-                "supportedPolicyTypes": [
-                  {
-                    "name": "onap.policies.monitoring.tcagen2",
-                    "version": "1.0.0"
-                  },
-                  {
-                    "name": "onap.policies.controlloop.operational.common.Drools",
-                    "version": "1.0.0"
-                  }
-                ],
-                "policies": [
-                  {
-                    "name": "org.onap.testos",
-                    "version": "2.0.0"
-                  },
-                  {
-                    "name": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-                    "version": "1.0.0"
-                  }
-                ],
-                "currentInstanceCount": 0,
-                "desiredInstanceCount": 0,
-                "pdpInstances": []
-              }
-            ]
-          }
-        }
-      ],
-      "supportedPdpGroups": [
-        {
-          "pdpGroup2": [
-            "subGroup2",
-            "subGroup3"
-          ]
-        }
-      ]
-    },
-    {
-      "type": "onap.policies.Naming",
-      "type_version": "1.0.0",
-      "properties": {
-        "naming-models": [
-          {
-            "naming-type": "VNF",
-            "naming-recipe": "AIC_CLOUD_REGION|DELIMITER|CONSTANT|DELIMITER|TIMESTAMP",
-            "name-operation": "to_lower_case()",
-            "naming-properties": [
-              {
-                "property-name": "AIC_CLOUD_REGION"
-              },
-              {
-                "property-name": "CONSTANT",
-                "property-value": "onap-nf"
-              },
-              {
-                "property-name": "TIMESTAMP"
-              },
-              {
-                "property-value": "-",
-                "property-name": "DELIMITER"
-              }
-            ]
-          },
-          {
-            "naming-type": "VNFC",
-            "naming-recipe": "VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE",
-            "name-operation": "to_lower_case()",
-            "naming-properties": [
-              {
-                "property-name": "VNF_NAME"
-              },
-              {
-                "property-name": "SEQUENCE",
-                "increment-sequence": {
-                  "max": "zzz",
-                  "scope": "ENTIRETY",
-                  "start-value": "1",
-                  "length": "3",
-                  "increment": "1",
-                  "sequence-type": "alpha-numeric"
-                }
-              },
-              {
-                "property-name": "NFC_NAMING_CODE"
-              },
-              {
-                "property-value": "-",
-                "property-name": "DELIMITER"
-              }
-            ]
-          },
-          {
-            "naming-type": "VF-MODULE",
-            "naming-recipe": "VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE",
-            "name-operation": "to_lower_case()",
-            "naming-properties": [
-              {
-                "property-name": "VNF_NAME"
-              },
-              {
-                "property-value": "-",
-                "property-name": "DELIMITER"
-              },
-              {
-                "property-name": "VF_MODULE_LABEL"
-              },
-              {
-                "property-name": "VF_MODULE_TYPE"
-              },
-              {
-                "property-name": "SEQUENCE",
-                "increment-sequence": {
-                  "max": "zzz",
-                  "scope": "PRECEEDING",
-                  "start-value": "1",
-                  "length": "3",
-                  "increment": "1",
-                  "sequence-type": "alpha-numeric"
-                }
-              }
-            ]
-          }
-        ],
-        "policy-instance-name": "ONAP_NF_NAMING_TIMESTAMP"
-      },
-      "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
-      "version": "1.0.0",
-      "metadata": {
-        "policy-id": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
-        "policy-version": "1.0.0"
-      }
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/example/policy/single-policy-enriched.json b/src/test/resources/example/policy/single-policy-enriched.json
deleted file mode 100644
index 66355e589..000000000
--- a/src/test/resources/example/policy/single-policy-enriched.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "type": "onap.policies.monitoring.tcagen2",
-  "type_version": "1.0.0",
-  "properties": {
-    "tca.policy": {
-      "domain": "measurementsForVfScaling",
-      "metricsPerEventName": [
-        {
-          "policyScope": "DCAE",
-          "thresholds": [
-            {
-              "version": "1.0.2",
-              "severity": "MAJOR",
-              "thresholdValue": 200,
-              "closedLoopEventStatus": "ONSET",
-              "closedLoopControlName": "LOOP_test",
-              "direction": "LESS_OR_EQUAL",
-              "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
-            }
-          ],
-          "eventName": "vLoadBalancer",
-          "policyVersion": "v0.0.1",
-          "controlLoopSchemaType": "VM",
-          "policyName": "DCAE.Config_tca-hi-lo"
-        }
-      ]
-    }
-  },
-  "name": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-  "version": "1.0.0",
-  "metadata": {
-    "policy-id": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-    "policy-version": "1.0.0"
-  },
-  "pdpGroupInfo": {
-    "pdpGroup": "pdpGroup2",
-    "pdpSubGroup": "subGroup2"
-  },
-  "supportedPdpGroups": [
-    {
-      "pdpGroup2": [
-        "subGroup2",
-        "subGroup3"
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml
deleted file mode 100644
index bea4d2710..000000000
--- a/src/test/resources/example/sdc/blueprint-dcae/tca-bad-policy.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
-# ============LICENSE_START====================================================
-# =============================================================================
-# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# =============================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END======================================================
-#k8s-tca-gen2-v3.yaml
-
-tosca_definitions_version: cloudify_dsl_1_3
-imports:
-  - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - plugin:k8splugin?version=3.4.2
-  - plugin:clamppolicyplugin?version=1.1.0
-inputs:
-  service_name:
-    type: string
-    default: 'dcae-tcagen2'
-  log_directory:
-    type: string
-    default: "/opt/logs/dcae-analytics-tca"
-  replicas:
-    type: integer
-    description: number of instances
-    default: 1
-  spring.data.mongodb.uri:
-    type: string
-    default: "mongodb://dcae-mongohost/dcae-tcagen2"
-  tag_version:
-    type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1"
-  tca.aai.password:
-    type: string
-    default: "DCAE"
-  tca.aai.url:
-    type: string
-    default: "http://aai.onap.svc.cluster.local"
-  tca.aai.username:
-    type: string
-    default: "DCAE"
-  tca_handle_in_subscribe_url:
-    type: string
-    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
-  tca_handle_out_publish_url:
-    type: string
-    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT"
-  tca_consumer_group:
-    type: string
-    default: "cg1"
-  policy_model_id:
-    type: string
-    default: "onap.policies.monitoring.tcagen2Bad"
-  policy_id:
-    type: string
-    default: "onap.restart.tca"
-node_templates:
-  docker.tca:
-    type: dcae.nodes.ContainerizedServiceComponent
-    relationships:
-      - target: tcagen2_policy
-        type: cloudify.relationships.depends_on
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            ports:
-              - concat: ["9091:", "0"]
-    properties:
-      application_config:
-        service_calls: []
-        streams_publishes:
-          tca_handle_out:
-            dmaap_info:
-              topic_url:
-                get_input: tca_handle_out_publish_url
-            type: message_router
-        streams_subscribes:
-          tca_handle_in:
-            dmaap_info:
-              topic_url:
-                get_input: tca_handle_in_subscribe_url
-            type: message_router
-        spring.data.mongodb.uri:
-          get_input: spring.data.mongodb.uri
-        streams_subscribes.tca_handle_in.consumer_group:
-          get_input: tca_consumer_group
-        streams_subscribes.tca_handle_in.consumer_ids[0]: c0
-        streams_subscribes.tca_handle_in.consumer_ids[1]: c1
-        streams_subscribes.tca_handle_in.message_limit: 50000
-        streams_subscribes.tca_handle_in.polling.auto_adjusting.max: 60000
-        streams_subscribes.tca_handle_in.polling.auto_adjusting.min: 30000
-        streams_subscribes.tca_handle_in.polling.auto_adjusting.step_down: 30000
-        streams_subscribes.tca_handle_in.polling.auto_adjusting.step_up: 10000
-        streams_subscribes.tca_handle_in.polling.fixed_rate: 0
-        streams_subscribes.tca_handle_in.timeout: -1
-        tca.aai.enable_enrichment: true
-        tca.aai.generic_vnf_path: aai/v11/network/generic-vnfs/generic-vnf
-        tca.aai.node_query_path: aai/v11/search/nodes-query
-        tca.aai.password:
-          get_input: tca.aai.password
-        tca.aai.url:
-          get_input: tca.aai.url
-        tca.aai.username:
-          get_input: tca.aai.username
-        tca.policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"LESS_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":700,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"vLoadBalancer","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"Measurement_vGMUX","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"EQUAL","severity":"MAJOR","closedLoopEventStatus":"ABATED"},{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"GREATER","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]}]}'
-        tca.processing_batch_size: 10000
-        tca.enable_abatement: true
-        tca.enable_ecomp_logging: true
-      docker_config:
-        healthcheck:
-          endpoint: /actuator/health
-          interval: 30s
-          timeout: 10s
-          type: http
-      image:
-        get_input: tag_version
-      log_info:
-        log_directory:
-          get_input: log_directory
-      tls_info:
-        use_tls: true
-        cert_directory: '/etc/tca-gen2/ssl'
-      replicas:
-        get_input: replicas
-      service_component_type: { get_input: service_name }
-  tcagen2_policy:
-    type: clamp.nodes.policy
-    properties:
-      policy_id:
-        get_input: policy_id
-      policy_model_id:
-        get_input: policy_model_id
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml
deleted file mode 100644
index e7d967a26..000000000
--- a/src/test/resources/example/sdc/blueprint-dcae/tca-guilin.yaml
+++ /dev/null
@@ -1,141 +0,0 @@
-# ============LICENSE_START====================================================
-# =============================================================================
-# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
-# =============================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END======================================================
-#k8s-tca-gen2-v3.yaml
-
-tosca_definitions_version: cloudify_dsl_1_3
-imports:
-  - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - plugin:k8splugin?version=3.4.2
-  - plugin:clamppolicyplugin?version=1.1.0
-inputs:
-  service_name:
-    type: string
-    default: 'dcae-tcagen2'
-  log_directory:
-    type: string
-    default: "/opt/logs/dcae-analytics-tca"
-  replicas:
-    type: integer
-    description: number of instances
-    default: 1
-  spring.data.mongodb.uri:
-    type: string
-    default: "mongodb://dcae-mongohost/dcae-tcagen2"
-  tag_version:
-    type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.analytics.tca-gen2.dcae-analytics-tca-web:1.2.1"
-  tca.aai.password:
-    type: string
-    default: "DCAE"
-  tca.aai.url:
-    type: string
-    default: "http://aai.onap.svc.cluster.local"
-  tca.aai.username:
-    type: string
-    default: "DCAE"
-  tca_handle_in_subscribe_url:
-    type: string
-    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
-  tca_handle_out_publish_url:
-    type: string
-    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT"
-  tca_consumer_group:
-    type: string
-    default: "cg1"
-  policy_model_id:
-    type: string
-    default: "onap.policies.monitoring.tcagen2"
-  policy_id:
-    type: string
-    default: "onap.restart.tca"
-node_templates:
-  docker.tca:
-    type: dcae.nodes.ContainerizedServiceComponent
-    relationships:
-      - target: tcagen2_policy
-        type: cloudify.relationships.depends_on
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            ports:
-              - concat: ["9091:", "0"]
-    properties:
-      application_config:
-        service_calls: []
-        streams_publishes:
-          tca_handle_out:
-            dmaap_info:
-              topic_url:
-                get_input: tca_handle_out_publish_url
-            type: message_router
-        streams_subscribes:
-          tca_handle_in:
-            dmaap_info:
-              topic_url:
-                get_input: tca_handle_in_subscribe_url
-            type: message_router
-        spring.data.mongodb.uri:
-          get_input: spring.data.mongodb.uri
-        streams_subscribes.tca_handle_in.consumer_group:
-          get_input: tca_consumer_group
-        streams_subscribes.tca_handle_in.consumer_ids[0]: c0
-        streams_subscribes.tca_handle_in.consumer_ids[1]: c1
-        streams_subscribes.tca_handle_in.message_limit: 50000
-        streams_subscribes.tca_handle_in.polling.auto_adjusting.max: 60000
-        streams_subscribes.tca_handle_in.polling.auto_adjusting.min: 30000
-        streams_subscribes.tca_handle_in.polling.auto_adjusting.step_down: 30000
-        streams_subscribes.tca_handle_in.polling.auto_adjusting.step_up: 10000
-        streams_subscribes.tca_handle_in.polling.fixed_rate: 0
-        streams_subscribes.tca_handle_in.timeout: -1
-        tca.aai.enable_enrichment: true
-        tca.aai.generic_vnf_path: aai/v11/network/generic-vnfs/generic-vnf
-        tca.aai.node_query_path: aai/v11/search/nodes-query
-        tca.aai.password:
-          get_input: tca.aai.password
-        tca.aai.url:
-          get_input: tca.aai.url
-        tca.aai.username:
-          get_input: tca.aai.username
-        tca.policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"LESS_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":700,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"vLoadBalancer","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"Measurement_vGMUX","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"EQUAL","severity":"MAJOR","closedLoopEventStatus":"ABATED"},{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"GREATER","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]}]}'
-        tca.processing_batch_size: 10000
-        tca.enable_abatement: true
-        tca.enable_ecomp_logging: true
-      docker_config:
-        healthcheck:
-          endpoint: /actuator/health
-          interval: 30s
-          timeout: 10s
-          type: http
-      image:
-        get_input: tag_version
-      log_info:
-        log_directory:
-          get_input: log_directory
-      tls_info:
-        use_tls: true
-        cert_directory: '/etc/tca-gen2/ssl'
-      replicas:
-        get_input: replicas
-      service_component_type: { get_input: service_name }
-  tcagen2_policy:
-    type: clamp.nodes.policy
-    properties:
-      policy_id:
-        get_input: policy_id
-      policy_model_id:
-        get_input: policy_model_id
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
deleted file mode 100644
index 0cb9cdb68..000000000
--- a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-tosca_definitions_version: cloudify_dsl_1_3
-imports:
-- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml
-- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
-- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml
-inputs:
-  location_id:
-    type: string
-  service_id:
-    type: string
-  policy_id:
-    type: string
-node_templates:
-  policy_0:
-    type: dcae.nodes.policy
-    properties:
-      policy_id: 
-        get_input: policy_id
-      policy_model_id: "onap.policies.monitoring.cdap.tca.hi.lo.app"
-  cdap_host_host:
-    type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure
-    properties:
-      location_id:
-        get_input: location_id
-      scn_override: cdap_broker.solutioning-central.dcae.onap.org
-    interfaces:
-      cloudify.interfaces.lifecycle: {
-        }
-  tca_tca:
-    type: dcae.nodes.MicroService.cdap
-    properties:
-      app_config:
-        appDescription: DCAE Analytics Threshold Crossing Alert Application
-        appName: dcae-tca
-        tcaSubscriberOutputStreamName: TCASubscriberOutputStream
-        tcaVESAlertsTableName: TCAVESAlertsTable
-        tcaVESAlertsTableTTLSeconds: '1728000'
-        tcaVESMessageStatusTableName: TCAVESMessageStatusTable
-        tcaVESMessageStatusTableTTLSeconds: '86400'
-        thresholdCalculatorFlowletInstances: '2'
-      app_preferences:
-        publisherContentType: application/json
-        publisherHostName: mrlocal-mtnjftle01.onap.org
-        publisherHostPort: '3905'
-        publisherMaxBatchSize: '10'
-        publisherMaxRecoveryQueueSize: '100000'
-        publisherPollingInterval: '20000'
-        publisherProtocol: https
-        publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub
-        publisherUserName: test@tca.af.dcae.onap.org
-        publisherUserPassword: password
-        subscriberConsumerGroup: OpenDCAE-c12
-        subscriberConsumerId: c12
-        subscriberContentType: application/json
-        subscriberHostName: mrlocal-mtnjftle01.onap.org
-        subscriberHostPort: '3905'
-        subscriberMessageLimit: '-1'
-        subscriberPollingInterval: '20000'
-        subscriberProtocol: https
-        subscriberTimeoutMS: '-1'
-        subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub
-        subscriberUserName: test@tca.af.dcae.onap.org
-        subscriberUserPassword: password
-        tca_policy: null
-      artifact_name: dcae-analytics-tca
-      artifact_version: 1.0.0
-      connections:
-        streams_publishes: [
-          ]
-        streams_subscribes: [
-          ]
-      jar_url: http://somejar
-      location_id:
-        get_input: location_id
-      namespace: cdap_tca_hi_lo
-      programs:
-      - program_id: TCAVESCollectorFlow
-        program_type: flows
-      - program_id: TCADMaaPMRSubscriberWorker
-        program_type: workers
-      - program_id: TCADMaaPMRPublisherWorker
-        program_type: workers
-      service_component_type: cdap_app_tca
-      service_id:
-        get_input: service_id
-      streamname: TCASubscriberOutputStream
-    relationships:
-    - target: topic0
-      type: dcae.relationships.subscribe_to_events
-    - target: topic1
-      type: dcae.relationships.publish_events
-    - target: cdap_host_host
-      type: dcae.relationships.component_contained_in
-    - target: policy_0
-      type: dcae.relationships.depends_on
-  topic0:
-    type: dcae.nodes.Topic
-    properties:
-      topic_name: ''
-  topic1:
-    type: dcae.nodes.Topic
-    properties:
-      topic_name: ''
-      
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
deleted file mode 100644
index 00ebfe7fe..000000000
--- a/src/test/resources/example/sdc/blueprint-dcae/tca_2.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# ============LICENSE_START====================================================
-# =============================================================================
-# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
-# =============================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END======================================================
-
-tosca_definitions_version: cloudify_dsl_1_3
-
-description: >
-  This blueprint deploys/manages the TCA module as a Docker container
-
-imports:
-  - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.12/k8splugin_types.yaml
-#  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml
-inputs:
-  aaiEnrichmentHost:
-    type: string
-    default: "aai.onap.svc.cluster.local"
-  aaiEnrichmentPort:
-    type: string
-    default: "8443"
-  enableAAIEnrichment:
-    type: string
-    default: true
-  dmaap_host:
-    type: string
-    default: message-router.onap
-  dmaap_port:
-    type: string
-    default: "3904"
-  enableRedisCaching:
-    type: string
-    default: false
-  redisHosts:
-    type: string
-    default: dcae-redis.onap.svc.cluster.local:6379
-  tag_version:
-    type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1"
-  consul_host:
-    type: string
-    default: consul-server.onap
-  consul_port:
-    type: string
-    default: "8500"
-  cbs_host:
-    type: string
-    default: "config-binding-servicel"
-  cbs_port:
-    type: string
-    default: "10000"
-  policy_id:
-    type: string
-    default: "onap.restart.tca"
-  external_port:
-    type: string
-    description: Kubernetes node port on which CDAPgui is exposed
-    default: "32012"
-  policy_model_id:
-    type: string
-    default: "onap.policies.monitoring.cdap.tca.hi.lo.app"
-node_templates:
-  tca_k8s:
-    type: dcae.nodes.ContainerizedServiceComponent
-    relationships:
-      - target: tca_policy
-        type: cloudify.relationships.depends_on
-    properties:
-        service_component_type: 'dcaegen2-analytics-tca'
-        application_config: {}
-        docker_config: {}
-        image:
-          get_input: tag_version
-        log_info:
-          log_directory: "/opt/app/TCAnalytics/logs"
-        application_config:
-            app_config:
-                appDescription: DCAE Analytics Threshold Crossing Alert Application
-                appName: dcae-tca
-                tcaAlertsAbatementTableName: TCAAlertsAbatementTable
-                tcaAlertsAbatementTableTTLSeconds: '1728000'
-                tcaSubscriberOutputStreamName: TCASubscriberOutputStream
-                tcaVESAlertsTableName: TCAVESAlertsTable
-                tcaVESAlertsTableTTLSeconds: '1728000'
-                tcaVESMessageStatusTableName: TCAVESMessageStatusTable
-                tcaVESMessageStatusTableTTLSeconds: '86400'
-                thresholdCalculatorFlowletInstances: '2'
-            app_preferences:
-                aaiEnrichmentHost:
-                    get_input: aaiEnrichmentHost
-                aaiEnrichmentIgnoreSSLCertificateErrors: 'true'
-                aaiEnrichmentPortNumber: '8443'
-                aaiEnrichmentProtocol: https
-                aaiEnrichmentUserName: dcae@dcae.onap.org
-                aaiEnrichmentUserPassword: demo123456!
-                aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query
-                aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf
-                enableAAIEnrichment:
-                    get_input: enableAAIEnrichment
-                enableRedisCaching:
-                    get_input: enableRedisCaching
-                redisHosts:
-                    get_input: redisHosts
-                enableAlertCEFFormat: 'false'
-                publisherContentType: application/json
-                publisherHostName:
-                    get_input: dmaap_host
-                publisherHostPort:
-                    get_input: dmaap_port
-                publisherMaxBatchSize: '1'
-                publisherMaxRecoveryQueueSize: '100000'
-                publisherPollingInterval: '20000'
-                publisherProtocol: http
-                publisherTopicName: unauthenticated.DCAE_CL_OUTPUT
-                subscriberConsumerGroup: OpenDCAE-clamp
-                subscriberConsumerId: c12
-                subscriberContentType: application/json
-                subscriberHostName:
-                    get_input: dmaap_host
-                subscriberHostPort:
-                    get_input: dmaap_port
-                subscriberMessageLimit: '-1'
-                subscriberPollingInterval: '30000'
-                subscriberProtocol: http
-                subscriberTimeoutMS: '-1'
-                subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
-#                tca_policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"LESS_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":700,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"vLoadBalancer","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"Measurement_vGMUX","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"EQUAL","severity":"MAJOR","closedLoopEventStatus":"ABATED"},{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"GREATER","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]}]}'
-        service_component_type: dcaegen2-analytics_tca
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            envs:
-                DMAAPHOST:
-                    { get_input: dmaap_host }
-                DMAAPPORT:
-                    { get_input: dmaap_port }
-                DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
-                DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
-                AAIHOST:
-                    { get_input: aaiEnrichmentHost }
-                AAIPORT:
-                    { get_input: aaiEnrichmentPort }
-                CONSUL_HOST:
-                    { get_input: consul_host }
-                CONSUL_PORT:
-                    { get_input: consul_port }
-                CBS_HOST:
-                    { get_input: cbs_host }
-                CBS_PORT:
-                    { get_input: cbs_port }
-                CONFIG_BINDING_SERVICE: "config_binding_service"
-            ports:
-              - concat: ["11011:", { get_input: external_port }]
-  tca_policy:
-    type: clamp.nodes.policy
-    properties:
-      policy_id:
-           get_input: policy_id
-      policy_model_id: "onap.policies.monitoring.cdap.tca.hi.lo.app"
diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
deleted file mode 100644
index 929f36367..000000000
--- a/src/test/resources/example/sdc/blueprint-dcae/tca_3.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
-#
-# ============LICENSE_START====================================================
-# =============================================================================
-# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
-# =============================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END======================================================
-
-tosca_definitions_version: cloudify_dsl_1_3
-
-description: >
-  This blueprint deploys/manages the TCA module as a Docker container
-
-imports:
-  - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml"
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml"
-inputs:
-  aaiEnrichmentHost:
-    type: string
-    default: "aai.onap.svc.cluster.local"
-  aaiEnrichmentPort:
-    type: string
-    default: "8443"
-  enableAAIEnrichment:
-    type: string
-    default: "true"
-  dmaap_host:
-    type: string
-    default: "message-router.onap.svc.cluster.local"
-  dmaap_port:
-    type: string
-    default: "3904"
-  enableRedisCaching:
-    type: string
-    default: "false"
-  redisHosts:
-    type: string
-    default: "dcae-redis.onap.svc.cluster.local:6379"
-  tag_version:
-    type: string
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.2.2"
-  consul_host:
-    type: string
-    default: "consul-server.onap"
-  consul_port:
-    type: string
-    default: "8500"
-  cbs_host:
-    type: string
-    default: "config-binding-service"
-  cbs_port:
-    type: string
-    default: "10000"
-  policy_id:
-    type: string
-    default: "onap.restart.tca"
-  external_port:
-    type: string
-    description: Kubernetes node port on which CDAPgui is exposed
-    default: "32012"
-  policy_model_id:
-    type: string
-    default: "onap.policies.monitoring.cdap.tca.hi.lo.app"
-node_templates:
-  tca_k8s:
-    type: dcae.nodes.ContainerizedServiceComponent
-    relationships:
-      - target: tca_policy
-        type: cloudify.relationships.depends_on
-    properties:
-      service_component_type: 'dcaegen2-analytics-tca'
-      application_config: {}
-      docker_config: {}
-      image:
-        get_input: tag_version
-      log_info:
-        log_directory: "/opt/app/TCAnalytics/logs"
-      application_config:
-        app_config:
-          appDescription: DCAE Analytics Threshold Crossing Alert Application
-          appName: dcae-tca
-          tcaAlertsAbatementTableName: TCAAlertsAbatementTable
-          tcaAlertsAbatementTableTTLSeconds: '1728000'
-          tcaSubscriberOutputStreamName: TCASubscriberOutputStream
-          tcaVESAlertsTableName: TCAVESAlertsTable
-          tcaVESAlertsTableTTLSeconds: '1728000'
-          tcaVESMessageStatusTableName: TCAVESMessageStatusTable
-          tcaVESMessageStatusTableTTLSeconds: '86400'
-          thresholdCalculatorFlowletInstances: '2'
-        app_preferences:
-          aaiEnrichmentHost:
-            get_input: aaiEnrichmentHost
-          aaiEnrichmentIgnoreSSLCertificateErrors: 'true'
-          aaiEnrichmentPortNumber: '8443'
-          aaiEnrichmentProtocol: https
-          aaiEnrichmentUserName: dcae@dcae.onap.org
-          aaiEnrichmentUserPassword: demo123456!
-          aaiVMEnrichmentAPIPath: /aai/v11/search/nodes-query
-          aaiVNFEnrichmentAPIPath: /aai/v11/network/generic-vnfs/generic-vnf
-          enableAAIEnrichment:
-            get_input: enableAAIEnrichment
-          enableRedisCaching:
-            get_input: enableRedisCaching
-          redisHosts:
-            get_input: redisHosts
-          enableAlertCEFFormat: 'false'
-          publisherContentType: application/json
-          publisherHostName:
-            get_input: dmaap_host
-          publisherHostPort:
-            get_input: dmaap_port
-          publisherMaxBatchSize: '1'
-          publisherMaxRecoveryQueueSize: '100000'
-          publisherPollingInterval: '20000'
-          publisherProtocol: http
-          publisherTopicName: unauthenticated.DCAE_CL_OUTPUT
-          subscriberConsumerGroup: OpenDCAE-clamp
-          subscriberConsumerId: c12
-          subscriberContentType: application/json
-          subscriberHostName:
-            get_input: dmaap_host
-          subscriberHostPort:
-            get_input: dmaap_port
-          subscriberMessageLimit: '-1'
-          subscriberPollingInterval: '30000'
-          subscriberProtocol: http
-          subscriberTimeoutMS: '-1'
-          subscriberTopicName: unauthenticated.VES_MEASUREMENT_OUTPUT
-          #tca_policy: '{"domain":"measurementsForVfScaling","metricsPerEventName":[{"eventName":"vFirewallBroadcastPackets","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"LESS_OR_EQUAL","severity":"MAJOR","closedLoopEventStatus":"ONSET"},{"closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":700,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"vLoadBalancer","controlLoopSchemaType":"VM","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta","thresholdValue":300,"direction":"GREATER_OR_EQUAL","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]},{"eventName":"Measurement_vGMUX","controlLoopSchemaType":"VNF","policyScope":"DCAE","policyName":"DCAE.Config_tca-hi-lo","policyVersion":"v0.0.1","thresholds":[{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"EQUAL","severity":"MAJOR","closedLoopEventStatus":"ABATED"},{"closedLoopControlName":"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e","version":"1.0.2","fieldPath":"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value","thresholdValue":0,"direction":"GREATER","severity":"CRITICAL","closedLoopEventStatus":"ONSET"}]}]}'
-          tca_policy: ''
-      service_component_type: dcaegen2-analytics_tca
-    interfaces:
-      cloudify.interfaces.lifecycle:
-        start:
-          inputs:
-            envs:
-              DMAAPHOST:
-                { get_input: dmaap_host }
-              DMAAPPORT: "3904"
-              DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
-              DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
-              AAIHOST:
-                { get_input: aaiEnrichmentHost }
-              AAIPORT: "8443"
-              CONSUL_HOST:
-                { get_input: consul_host }
-              CONSUL_PORT: "8500"
-              CBS_HOST:
-                { get_input: cbs_host }
-              CBS_PORT: "10000"
-              CONFIG_BINDING_SERVICE: "config_binding_service"
-            ports:
-              - concat: ["11011:", { get_input: external_port }]
-  tca_policy:
-    type: clamp.nodes.policy
-    properties:
-      policy_id:
-        get_input: policy_id
-      policy_model_id:
-        get_input: policy_model_id
diff --git a/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json b/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json
deleted file mode 100644
index 58f4cf3b2..000000000
--- a/src/test/resources/example/sdc/expected-result/deployment-parameters-multi-blueprints.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "dcaeDeployParameters": {
-    "testName1": {
-      "location_id": "",
-      "service_id": "",
-      "policy_id": "testName1"
-    },
-    "testName2": {
-      "aaiEnrichmentHost": "aai.onap.svc.cluster.local",
-      "aaiEnrichmentPort": "8443",
-      "enableAAIEnrichment": true,
-      "dmaap_host": "message-router.onap",
-      "dmaap_port": "3904",
-      "enableRedisCaching": false,
-      "redisHosts": "dcae-redis.onap.svc.cluster.local:6379",
-      "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.1",
-      "consul_host": "consul-server.onap",
-      "consul_port": "8500",
-      "cbs_host": "config-binding-servicel",
-      "cbs_port": "10000",
-      "external_port": "32012",
-      "policy_model_id": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-      "policy_id": "testName2"
-    },
-    "testName3": {
-      "aaiEnrichmentHost": "aai.onap.svc.cluster.local",
-      "aaiEnrichmentPort": "8443",
-      "enableAAIEnrichment": "true",
-      "dmaap_host": "message-router.onap.svc.cluster.local",
-      "dmaap_port": "3904",
-      "enableRedisCaching": "false",
-      "redisHosts": "dcae-redis.onap.svc.cluster.local:6379",
-      "tag_version": "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.2.2",
-      "consul_host": "consul-server.onap",
-      "consul_port": "8500",
-      "cbs_host": "config-binding-service",
-      "cbs_port": "10000",
-      "external_port": "32012",
-      "policy_model_id": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-      "policy_id": "testName3"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json b/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json
deleted file mode 100644
index 7140a4748..000000000
--- a/src/test/resources/example/sdc/expected-result/deployment-parameters-single-blueprint.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dcaeDeployParameters": {
-    "uniqueBlueprintParameters": {
-      "location_id": "",
-      "service_id": "",
-      "policy_id": "testName1"
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/example/sdc/expected-result/policy-data.yaml b/src/test/resources/example/sdc/expected-result/policy-data.yaml
deleted file mode 100644
index 3cf5e975c..000000000
--- a/src/test/resources/example/sdc/expected-result/policy-data.yaml
+++ /dev/null
@@ -1,2859 +0,0 @@
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-tosca_definitions_version: tosca_simple_yaml_1_1
-imports:
-- data.yml
-policy_types:
-  tosca.policies.Root:
-    description: The TOSCA Policy Type all other TOSCA Policy Types derive from
-  tosca.policies.Placement:
-    derived_from: tosca.policies.Root
-    description: The TOSCA Policy Type definition that is used to govern placement of TOSCA nodes or groups of nodes.
-  tosca.policies.Scaling:
-    derived_from: tosca.policies.Root
-    description: The TOSCA Policy Type definition that is used to govern scaling of TOSCA nodes or groups of nodes.
-  tosca.policies.Update:
-    derived_from: tosca.policies.Root
-    description: The TOSCA Policy Type definition that is used to govern update of TOSCA nodes or groups of nodes.
-  tosca.policies.Performance:
-    derived_from: tosca.policies.Root
-    description: The TOSCA Policy Type definition that is used to declare performance requirements for TOSCA nodes or groups of nodes.
-  org.openecomp.policies.placement.Antilocate:
-    derived_from: tosca.policies.Placement
-    description: My placement policy for separation based upon container type value
-    properties:
-      name:
-        type: string
-        description: The name of the policy
-        required: false
-        status: SUPPORTED
-      container_type:
-        type: string
-        description: container type
-        required: false
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - host
-          - region
-          - compute
-  org.openecomp.policies.placement.Colocate:
-    derived_from: tosca.policies.Placement
-    description: Keep associated nodes (groups of nodes) based upon affinity value
-    properties:
-      name:
-        type: string
-        description: The name of the policy
-        required: false
-        status: SUPPORTED
-      affinity:
-        type: string
-        description: affinity
-        required: true
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - host
-          - region
-          - compute
-  org.openecomp.policies.placement.valet.Diversity:
-    derived_from: tosca.policies.Placement
-    description: Valet Diversity
-    properties:
-      level:
-        type: string
-        description: diversity
-        required: false
-        default: host
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - host
-          - rack
-  org.openecomp.policies.placement.valet.Exclusivity:
-    derived_from: tosca.policies.Placement
-    description: Valet Exclusivity
-    properties:
-      level:
-        type: string
-        description: exclusivity
-        required: false
-        default: host
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - host
-          - rack
-  org.openecomp.policies.placement.valet.Affinity:
-    derived_from: tosca.policies.Placement
-    description: Valet Affinity
-    properties:
-      level:
-        type: string
-        description: affinity
-        required: false
-        default: host
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - host
-          - rack
-  org.openecomp.policies.scaling.Fixed:
-    derived_from: tosca.policies.Scaling
-    properties:
-      quantity:
-        description: the exact number of instances to keep up
-        type: integer
-        required: true
-  org.openecomp.policies.External:
-    derived_from: tosca.policies.Root
-    description: externally managed policy (for example, type="network assignment", source="Policy Manager", name="route target")
-    properties:
-      source:
-        type: string
-        description: The name of the server that exposes the policy with predefined type and name.
-        required: false
-      type:
-        type: string
-        description: The type (category) of the policy same as it is defined in the source.
-        required: false
-      name:
-        type: string
-        description: The name of the policy, that related to specific type, same as it is defined in the source.
-        required: false
-  onap.policies.Monitoring:
-    derived_from: tosca.policies.Root
-    description: A base policy type for all policies that governs monitoring provisioning
-  onap.policies.monitoring.cdap.tca.hi.lo.app:
-    derived_from: onap.policies.Monitoring
-    version: 1.0.0
-    properties:
-      tca_policy:
-        type: map
-        description: TCA Policy JSON
-        entry_schema:
-          type: onap.datatypes.monitoring.tca_policy
-  tosca.policies.nfv.InstantiationLevels:
-    derived_from: tosca.policies.Root
-    description: The InstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour and including default instantiation level in term of the number of VNFC instances to be created as defined in ETSI GS NFV-IFA 011 [1].
-    properties:
-      levels:
-        type: map
-        description: Describes the various levels of resources that can be used to instantiate the VNF using this flavour.
-        required: true
-        entry_schema:
-          type: tosca.datatypes.nfv.InstantiationLevel
-      default_level:
-        type: string
-        description: The default instantiation level for this flavour.
-        required: false
-  tosca.policies.nfv.VduInstantiationLevels:
-    derived_from: tosca.policies.Root
-    description: The VduInstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour in term of the number of VNFC instances to be created from each vdu.Compute. as defined in ETSI GS NFV-IFA 011 [1]
-    properties:
-      levels:
-        type: map
-        description: Describes the Vdu.Compute levels of resources that can be used to instantiate the VNF using this flavour
-        required: true
-        entry_schema:
-          type: tosca.datatypes.nfv.VduLevel
-    targets:
-    - tosca.nodes.nfv.Vdu.Compute
-  tosca.policies.nfv.VirtualLinkInstantiationLevels:
-    derived_from: tosca.policies.Root
-    description: The VirtualLinkInstantiationLevels type is a policy type representing all the instantiation levels of virtual link resources to be instantiated within a deployment flavour as defined in ETSI GS NFV-IFA 011 [1].
-    properties:
-      levels:
-        type: map
-        description: Describes the virtual link levels of resources that can be used to instantiate the VNF using this flavour.
-        required: true
-        entry_schema:
-          type: tosca.datatypes.nfv.VirtualLinkBitrateLevel
-    targets:
-    - tosca.nodes.nfv.VnfVirtualLink
-  tosca.policies.nfv.ScalingAspects:
-    derived_from: tosca.policies.Root
-    description: The ScalingAspects type is a policy type representing the scaling aspects used for horizontal scaling as defined in ETSI GS NFV-IFA 011 [1].
-    properties:
-      aspects:
-        type: map
-        description: Describe maximum scale level for total number of scaling steps that can be applied to a particular aspect
-        required: true
-        entry_schema:
-          type: tosca.datatypes.nfv.ScalingAspect
-  tosca.policies.nfv.VduScalingAspectDeltas:
-    derived_from: tosca.policies.Root
-    description: The VduScalingAspectDeltas type is a policy type representing the Vdu.Compute detail of an aspect deltas used for horizontal scaling, as defined in ETSI GS NFV-IFA 011 [1].
-    properties:
-      aspect:
-        type: string
-        description: Represents the scaling aspect to which this policy applies
-        required: true
-      deltas:
-        type: map
-        description: Describes the Vdu.Compute scaling deltas to be applied for every scaling steps of a particular aspect.
-        required: true
-        entry_schema:
-          type: tosca.datatypes.nfv.VduLevel
-    targets:
-    - tosca.nodes.nfv.Vdu.Compute
-  tosca.policies.nfv.VirtualLinkBitrateScalingAspectDeltas:
-    derived_from: tosca.policies.Root
-    description: The VirtualLinkBitrateScalingAspectDeltas type is a policy type representing the VnfVirtualLink detail of an aspect deltas used for horizontal scaling, as defined in ETSI GS NFV-IFA 011 [1].
-    properties:
-      aspect:
-        type: string
-        description: Represents the scaling aspect to which this policy applies.
-        required: true
-      deltas:
-        type: map
-        description: Describes the VnfVirtualLink scaling deltas to be applied for every scaling steps of a particular aspect.
-        required: true
-        entry_schema:
-          type: tosca.datatypes.nfv.VirtualLinkBitrateLevel
-    targets:
-    - tosca.nodes.nfv.VnfVirtualLink
-  tosca.policies.nfv.VduInitialDelta:
-    derived_from: tosca.policies.Root
-    description: The VduInitialDelta type is a policy type representing the Vdu.Compute detail of an initial delta used for horizontal scaling, as defined in ETSI GS NFV-IFA 011 [1].
-    properties:
-      initial_delta:
-        type: tosca.datatypes.nfv.VduLevel
-        description: Represents the initial minimum size of the VNF.
-        required: true
-    targets:
-    - tosca.nodes.nfv.Vdu.Compute
-  tosca.policies.nfv.VirtualLinkBitrateInitialDelta:
-    derived_from: tosca.policies.Root
-    description: The VirtualLinkBitrateInitialDelta type is a policy type representing the VnfVirtualLink detail of an initial deltas used for horizontal scaling, as defined in ETSI GS NFV-IFA 011 [1].
-    properties:
-      initial_delta:
-        type: tosca.datatypes.nfv.VirtualLinkBitrateLevel
-        description: Represents the initial minimum size of the VNF.
-        required: true
-    targets:
-    - tosca.nodes.nfv.VnfVirtualLink
-  tosca.policies.nfv.SecurityGroupRule:
-    derived_from: tosca.policies.Root
-    description: The SecurityGroupRule type is a policy type specified the matching criteria for the ingress and/or egress traffic to/from visited connection points as defined in ETSI GS NFV-IFA 011 [1].
-    properties:
-      description:
-        type: string
-        description: Human readable description of the security group rule.
-        required: false
-      direction:
-        type: string
-        description: The direction in which the security group rule is applied. The direction of 'ingress' or 'egress' is specified against the associated CP. I.e., 'ingress' means the packets entering a CP, while 'egress' means the packets sent out of a CP.
-        required: false
-        constraints:
-        - valid_values:
-          - ingress
-          - egress
-        default: ingress
-      ether_type:
-        type: string
-        description: Indicates the protocol carried over the Ethernet layer.
-        required: false
-        constraints:
-        - valid_values:
-          - ipv4
-          - ipv6
-        default: ipv4
-      protocol:
-        type: string
-        description: Indicates the protocol carried over the IP layer. Permitted values include any protocol defined in the IANA protocol registry, e.g. TCP, UDP, ICMP, etc.
-        required: false
-        constraints:
-        - valid_values:
-          - hopopt
-          - icmp
-          - igmp
-          - ggp
-          - ipv4
-          - st
-          - tcp
-          - cbt
-          - egp
-          - igp
-          - bbn_rcc_mon
-          - nvp_ii
-          - pup
-          - argus
-          - emcon
-          - xnet
-          - chaos
-          - udp
-          - mux
-          - dcn_meas
-          - hmp
-          - prm
-          - xns_idp
-          - trunk_1
-          - trunk_2
-          - leaf_1
-          - leaf_2
-          - rdp
-          - irtp
-          - iso_tp4
-          - netblt
-          - mfe_nsp
-          - merit_inp
-          - dccp
-          - 3pc
-          - idpr
-          - xtp
-          - ddp
-          - idpr_cmtp
-          - tp++
-          - il
-          - ipv6
-          - sdrp
-          - ipv6_route
-          - ipv6_frag
-          - idrp
-          - rsvp
-          - gre
-          - dsr
-          - bna
-          - esp
-          - ah
-          - i_nlsp
-          - swipe
-          - narp
-          - mobile
-          - tlsp
-          - skip
-          - ipv6_icmp
-          - ipv6_no_nxt
-          - ipv6_opts
-          - cftp
-          - sat_expak
-          - kryptolan
-          - rvd
-          - ippc
-          - sat_mon
-          - visa
-          - ipcv
-          - cpnx
-          - cphb
-          - wsn
-          - pvp
-          - br_sat_mon
-          - sun_nd
-          - wb_mon
-          - wb_expak
-          - iso_ip
-          - vmtp
-          - secure_vmtp
-          - vines
-          - ttp
-          - iptm
-          - nsfnet_igp
-          - dgp
-          - tcf
-          - eigrp
-          - ospfigp
-          - sprite_rpc
-          - larp
-          - mtp
-          - ax.25
-          - ipip
-          - micp
-          - scc_sp
-          - etherip
-          - encap
-          - gmtp
-          - ifmp
-          - pnni
-          - pim
-          - aris
-          - scps
-          - qnx
-          - a/n
-          - ip_comp
-          - snp
-          - compaq_peer
-          - ipx_in_ip
-          - vrrp
-          - pgm
-          - l2tp
-          - ddx
-          - iatp
-          - stp
-          - srp
-          - uti
-          - smp
-          - sm
-          - ptp
-          - isis
-          - fire
-          - crtp
-          - crudp
-          - sscopmce
-          - iplt
-          - sps
-          - pipe
-          - sctp
-          - fc
-          - rsvp_e2e_ignore
-          - mobility
-          - udp_lite
-          - mpls_in_ip
-          - manet
-          - hip
-          - shim6
-          - wesp
-          - rohc
-        default: tcp
-      port_range_min:
-        type: integer
-        description: Indicates minimum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.
-        required: false
-        constraints:
-        - greater_or_equal: 0
-        - less_or_equal: 65535
-        default: 0
-      port_range_max:
-        type: integer
-        description: Indicates maximum port number in the range that is matched by the security group rule. If a value is provided at design-time, this value may be overridden at run-time based on other deployment requirements or constraints.
-        required: false
-        constraints:
-        - greater_or_equal: 0
-        - less_or_equal: 65535
-        default: 65535
-    targets:
-    - tosca.nodes.nfv.VduCp
-    - tosca.nodes.nfv.VnfExtCp
-  tosca.policies.nfv.SupportedVnfInterface:
-    derived_from: tosca.policies.Root
-    description: this policy type represents interfaces produced by a VNF, the details to access them and the applicable connection points to use to access these interfaces
-    properties:
-      interface_name:
-        type: string
-        description: Identifies an interface produced by the VNF.
-        required: true
-        constraints:
-        - valid_values:
-          - vnf_indicator
-          - vnf_configuration
-      details:
-        type: tosca.datatypes.nfv.InterfaceDetails
-        description: Provide additional data to access the interface endpoint
-        required: false
-    targets:
-    - tosca.nodes.nfv.VnfExtCp
-    - tosca.nodes.nfv.VduCp
-data_types:
-  tosca.datatypes.Root:
-    description: The TOSCA root Data Type all other TOSCA base Data Types derive from
-  integer:
-    derived_from: tosca.datatypes.Root
-  string:
-    derived_from: tosca.datatypes.Root
-  boolean:
-    derived_from: tosca.datatypes.Root
-  float:
-    derived_from: tosca.datatypes.Root
-  list:
-    derived_from: tosca.datatypes.Root
-  map:
-    derived_from: tosca.datatypes.Root
-  json:
-    derived_from: tosca.datatypes.Root
-  scalar-unit:
-    derived_from: tosca.datatypes.Root
-  scalar-unit.size:
-    derived_from: scalar-unit
-  scalar-unit.time:
-    derived_from: scalar-unit
-  scalar-unit.frequency:
-    derived_from: scalar-unit
-  tosca.datatypes.Credential:
-    derived_from: tosca.datatypes.Root
-    properties:
-      protocol:
-        type: string
-        required: false
-      token_type:
-        type: string
-        default: password
-      token:
-        type: string
-      keys:
-        type: map
-        required: false
-        entry_schema:
-          type: string
-      user:
-        type: string
-        required: false
-  org.openecomp.datatypes.PortMirroringConnectionPointDescription:
-    derived_from: tosca.datatypes.Root
-    properties:
-      nf_naming_code:
-        type: string
-      nfc_naming_code:
-        type: string
-      network_role:
-        type: string
-      pps_capacity:
-        type: string
-      nf_type:
-        type: string
-        description: deprecated
-      nfc_type:
-        type: string
-        description: deprecated
-  tosca.datatypes.TimeInterval:
-    derived_from: tosca.datatypes.Root
-    properties:
-      start_time:
-        type: timestamp
-        required: true
-      end_time:
-        type: timestamp
-        required: true
-  tosca.datatypes.network.NetworkInfo:
-    derived_from: tosca.datatypes.Root
-    properties:
-      network_name:
-        type: string
-      network_id:
-        type: string
-      addresses:
-        type: list
-        entry_schema:
-          type: string
-  tosca.datatypes.network.PortInfo:
-    derived_from: tosca.datatypes.Root
-    properties:
-      port_name:
-        type: string
-      port_id:
-        type: string
-      network_id:
-        type: string
-      mac_address:
-        type: string
-      addresses:
-        type: list
-        entry_schema:
-          type: string
-  tosca.datatypes.network.PortDef:
-    derived_from: integer
-    constraints:
-    - in_range:
-      - 1
-      - 65535
-  tosca.datatypes.network.PortSpec:
-    derived_from: tosca.datatypes.Root
-    properties:
-      protocol:
-        type: string
-        required: true
-        default: tcp
-        constraints:
-        - valid_values:
-          - udp
-          - tcp
-          - igmp
-      target:
-        type: tosca.datatypes.network.PortDef
-      target_range:
-        type: range
-        constraints:
-        - in_range:
-          - 1
-          - 65535
-      source:
-        type: tosca.datatypes.network.PortDef
-      source_range:
-        type: range
-        constraints:
-        - in_range:
-          - 1
-          - 65535
-  org.openecomp.datatypes.heat.network.AddressPair:
-    derived_from: tosca.datatypes.Root
-    description: MAC/IP address pairs
-    properties:
-      mac_address:
-        type: string
-        description: MAC address
-        required: false
-        status: SUPPORTED
-      ip_address:
-        type: string
-        description: IP address
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.network.subnet.HostRoute:
-    derived_from: tosca.datatypes.Root
-    description: Host route info for the subnet
-    properties:
-      destination:
-        type: string
-        description: The destination for static route
-        required: false
-        status: SUPPORTED
-      nexthop:
-        type: string
-        description: The next hop for the destination
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.network.AllocationPool:
-    derived_from: tosca.datatypes.Root
-    description: The start and end addresses for the allocation pool
-    properties:
-      start:
-        type: string
-        description: Start address for the allocation pool
-        required: false
-        status: SUPPORTED
-      end:
-        type: string
-        description: End address for the allocation pool
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.network.neutron.Subnet:
-    derived_from: tosca.datatypes.Root
-    description: A subnet represents an IP address block that can be used for assigning IP addresses to virtual instances
-    properties:
-      tenant_id:
-        type: string
-        description: The ID of the tenant who owns the network
-        required: false
-        status: SUPPORTED
-      enable_dhcp:
-        type: boolean
-        description: Set to true if DHCP is enabled and false if DHCP is disabled
-        required: false
-        default: true
-        status: SUPPORTED
-      ipv6_address_mode:
-        type: string
-        description: IPv6 address mode
-        required: false
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - dhcpv6-stateful
-          - dhcpv6-stateless
-          - slaac
-      ipv6_ra_mode:
-        type: string
-        description: IPv6 RA (Router Advertisement) mode
-        required: false
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - dhcpv6-stateful
-          - dhcpv6-stateless
-          - slaac
-      value_specs:
-        type: map
-        description: Extra parameters to include in the request
-        required: false
-        default: {}
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      allocation_pools:
-        type: list
-        description: The start and end addresses for the allocation pools
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.AllocationPool
-      subnetpool:
-        type: string
-        description: The name or ID of the subnet pool
-        required: false
-        status: SUPPORTED
-      dns_nameservers:
-        type: list
-        description: A specified set of DNS name servers to be used
-        required: false
-        default: []
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      host_routes:
-        type: list
-        description: The gateway IP address
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.subnet.HostRoute
-      ip_version:
-        type: integer
-        description: The gateway IP address
-        required: false
-        default: 4
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - '4'
-          - '6'
-      name:
-        type: string
-        description: The name of the subnet
-        required: false
-        status: SUPPORTED
-      prefixlen:
-        type: integer
-        description: Prefix length for subnet allocation from subnet pool
-        required: false
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      cidr:
-        type: string
-        description: The CIDR
-        required: false
-        status: SUPPORTED
-      gateway_ip:
-        type: string
-        description: The gateway IP address
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
-    derived_from: tosca.datatypes.Root
-    description: Nova server network expand properties for port
-    properties:
-      port_security_enabled:
-        type: boolean
-        description: Flag to enable/disable port security on the port
-        required: false
-        status: SUPPORTED
-      mac_address:
-        type: string
-        description: MAC address to give to this port
-        required: false
-        status: SUPPORTED
-      admin_state_up:
-        type: boolean
-        description: The administrative state of this port
-        required: false
-        default: true
-        status: SUPPORTED
-      qos_policy:
-        type: string
-        description: The name or ID of QoS policy to attach to this port
-        required: false
-        status: SUPPORTED
-      allowed_address_pairs:
-        type: list
-        description: Additional MAC/IP address pairs allowed to pass through the port
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.AddressPair
-      binding:vnic_type:
-        type: string
-        description: The vnic type to be bound on the neutron port
-        required: false
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - macvtap
-          - direct
-          - normal
-      value_specs:
-        type: map
-        description: Extra parameters to include in the request
-        required: false
-        default: {}
-        status: SUPPORTED
-        entry_schema:
-          type: string
-  org.openecomp.datatypes.heat.novaServer.network.AddressInfo:
-    derived_from: tosca.datatypes.network.NetworkInfo
-    description: Network addresses with corresponding port id
-    properties:
-      port_id:
-        type: string
-        description: Port id
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.neutron.port.FixedIps:
-    derived_from: tosca.datatypes.Root
-    description: subnet/ip_address
-    properties:
-      subnet:
-        type: string
-        description: Subnet in which to allocate the IP address for this port
-        required: false
-        status: SUPPORTED
-      ip_address:
-        type: string
-        description: IP address desired in the subnet for this port
-        required: false
-        status: SUPPORTED
-      subnet_id:
-        type: string
-        description: Subnet in which to allocate the IP address for this port
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.FileInfo:
-    derived_from: tosca.datatypes.Root
-    description: Heat File Info
-    properties:
-      file:
-        type: string
-        description: The required URI string (relative or absolute) which can be used to locate the file
-        required: true
-        status: SUPPORTED
-      file_type:
-        type: string
-        description: The type of the file
-        required: true
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - base
-          - env
-          - volume
-          - network
-  org.openecomp.datatypes.heat.contrail.network.rule.PortPairs:
-    derived_from: tosca.datatypes.Root
-    description: source and destination port pairs
-    properties:
-      start_port:
-        type: string
-        description: Start port
-        required: false
-        status: SUPPORTED
-      end_port:
-        type: string
-        description: End port
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrail.network.rule.Rule:
-    derived_from: tosca.datatypes.Root
-    description: policy rule
-    properties:
-      src_ports:
-        type: list
-        description: Source ports
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
-      protocol:
-        type: string
-        description: Protocol
-        required: false
-        status: SUPPORTED
-      dst_addresses:
-        type: list
-        description: Destination addresses
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
-      apply_service:
-        type: string
-        description: Service to apply
-        required: false
-        status: SUPPORTED
-      dst_ports:
-        type: list
-        description: Destination ports
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrail.network.rule.PortPairs
-      src_addresses:
-        type: list
-        description: Source addresses
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork
-      direction:
-        type: string
-        description: Direction
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrail.network.rule.RuleList:
-    derived_from: tosca.datatypes.Root
-    description: list of policy rules
-    properties:
-      policy_rule:
-        type: list
-        description: Contrail network rule
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrail.network.rule.Rule
-  org.openecomp.datatypes.heat.contrail.network.rule.VirtualNetwork:
-    derived_from: tosca.datatypes.Root
-    description: source and destination addresses
-    properties:
-      virtual_network:
-        type: string
-        description: Virtual network
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
-    derived_from: tosca.datatypes.Root
-    description: Rules Pairs
-    properties:
-      remote_group_id:
-        type: string
-        description: The remote group ID to be associated with this security group rule
-        required: false
-        status: SUPPORTED
-      protocol:
-        type: string
-        description: The protocol that is matched by the security group rule
-        required: false
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - tcp
-          - udp
-          - icmp
-      ethertype:
-        type: string
-        description: Ethertype of the traffic
-        required: false
-        default: IPv4
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - IPv4
-          - IPv6
-      port_range_max:
-        type: integer
-        description: 'The maximum port number in the range that is matched by the
-          security group rule. '
-        required: false
-        status: SUPPORTED
-        constraints:
-        - in_range:
-          - 0
-          - 65535
-      remote_ip_prefix:
-        type: string
-        description: The remote IP prefix (CIDR) to be associated with this security group rule
-        required: false
-        status: SUPPORTED
-      remote_mode:
-        type: string
-        description: Whether to specify a remote group or a remote IP prefix
-        required: false
-        default: remote_ip_prefix
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - remote_ip_prefix
-          - remote_group_id
-      direction:
-        type: string
-        description: The direction in which the security group rule is applied
-        required: false
-        default: ingress
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - egress
-          - ingress
-      port_range_min:
-        type: integer
-        description: The minimum port number in the range that is matched by the security group rule.
-        required: false
-        status: SUPPORTED
-        constraints:
-        - in_range:
-          - 0
-          - 65535
-  org.openecomp.datatypes.heat.substitution.SubstitutionFiltering:
-    derived_from: tosca.datatypes.Root
-    description: Substitution Filter
-    properties:
-      substitute_service_template:
-        type: string
-        description: Substitute Service Template
-        required: true
-        status: SUPPORTED
-      index_value:
-        type: integer
-        description: Index value of the substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      count:
-        type: string
-        description: Count
-        required: false
-        default: 1
-        status: SUPPORTED
-      scaling_enabled:
-        type: boolean
-        description: Indicates whether service scaling is enabled
-        required: false
-        default: true
-        status: SUPPORTED
-      mandatory:
-        type: boolean
-        description: Mandatory
-        required: false
-        default: true
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence:
-    derived_from: tosca.datatypes.Root
-    description: network policy refs data sequence
-    properties:
-      network_policy_refs_data_sequence_major:
-        type: integer
-        description: Network Policy ref data sequence Major
-        required: false
-        status: SUPPORTED
-      network_policy_refs_data_sequence_minor:
-        type: integer
-        description: Network Policy ref data sequence Minor
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefData:
-    derived_from: tosca.datatypes.Root
-    description: network policy refs data
-    properties:
-      network_policy_refs_data_sequence:
-        type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.RefDataSequence
-        description: Network Policy ref data sequence
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet:
-    derived_from: tosca.datatypes.Root
-    description: Network Ipam Ref Data Subnet
-    properties:
-      network_ipam_refs_data_ipam_subnets_subnet_ip_prefix_len:
-        type: string
-        description: Network ipam refs data ipam subnets ip prefix len
-        required: false
-        status: SUPPORTED
-      network_ipam_refs_data_ipam_subnets_subnet_ip_prefix:
-        type: string
-        description: Network ipam refs data ipam subnets ip prefix
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList:
-    derived_from: tosca.datatypes.Root
-    description: Network Ipam Ref Data Subnet List
-    properties:
-      network_ipam_refs_data_ipam_subnets_subnet:
-        type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnet
-        description: Network ipam refs data ipam subnets
-        required: false
-        status: SUPPORTED
-      network_ipam_refs_data_ipam_subnets_addr_from_start:
-        type: string
-        description: Network ipam refs data ipam subnets addr from start
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.IpamRefData:
-    derived_from: tosca.datatypes.Root
-    description: Network Ipam Ref Data
-    properties:
-      network_ipam_refs_data_ipam_subnets:
-        type: list
-        description: Network ipam refs data ipam subnets
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrailV2.virtual.network.rule.ref.data.IpamSubnetList
-  org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork:
-    derived_from: tosca.datatypes.Root
-    description: source addresses
-    properties:
-      network_policy_entries_policy_rule_src_addresses_virtual_network:
-        type: string
-        description: Source addresses Virtual network
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork:
-    derived_from: tosca.datatypes.Root
-    description: destination addresses
-    properties:
-      network_policy_entries_policy_rule_dst_addresses_virtual_network:
-        type: string
-        description: Destination addresses Virtual network
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs:
-    derived_from: tosca.datatypes.Root
-    description: destination port pairs
-    properties:
-      network_policy_entries_policy_rule_dst_ports_start_port:
-        type: string
-        description: Start port
-        required: false
-        status: SUPPORTED
-      network_policy_entries_policy_rule_dst_ports_end_port:
-        type: string
-        description: End port
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs:
-    derived_from: tosca.datatypes.Root
-    description: source port pairs
-    properties:
-      network_policy_entries_policy_rule_src_ports_start_port:
-        type: string
-        description: Start port
-        required: false
-        status: SUPPORTED
-      network_policy_entries_policy_rule_src_ports_end_port:
-        type: string
-        description: End port
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList:
-    derived_from: tosca.datatypes.Root
-    description: Action List
-    properties:
-      network_policy_entries_policy_rule_action_list_simple_action:
-        type: string
-        description: Simple Action
-        required: false
-        status: SUPPORTED
-      network_policy_entries_policy_rule_action_list_apply_service:
-        type: list
-        description: Apply Service
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: string
-  org.openecomp.datatypes.heat.contrailV2.network.rule.Rule:
-    derived_from: tosca.datatypes.Root
-    description: policy rule
-    properties:
-      network_policy_entries_policy_rule_dst_addresses:
-        type: list
-        description: Destination addresses
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstVirtualNetwork
-      network_policy_entries_policy_rule_dst_ports:
-        type: list
-        description: Destination ports
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrailV2.network.rule.DstPortPairs
-      network_policy_entries_policy_rule_protocol:
-        type: string
-        description: Protocol
-        required: false
-        status: SUPPORTED
-      network_policy_entries_policy_rule_src_addresses:
-        type: list
-        description: Source addresses
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcVirtualNetwork
-      network_policy_entries_policy_rule_direction:
-        type: string
-        description: Direction
-        required: false
-        status: SUPPORTED
-      network_policy_entries_policy_rule_src_ports:
-        type: list
-        description: Source ports
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrailV2.network.rule.SrcPortPairs
-      network_policy_entries_policy_rule_action_list:
-        type: org.openecomp.datatypes.heat.contrailV2.network.rule.ActionList
-        description: Action list
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.network.rule.RuleList:
-    derived_from: tosca.datatypes.Root
-    description: list of policy rules
-    properties:
-      network_policy_entries_policy_rule:
-        type: list
-        description: Contrail network rule
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrailV2.network.rule.Rule
-  org.openecomp.datatypes.heat.network.contrail.port.StaticRoute:
-    derived_from: tosca.datatypes.Root
-    description: static route
-    properties:
-      prefix:
-        type: string
-        description: Route prefix
-        required: false
-        status: SUPPORTED
-      next_hop:
-        type: string
-        description: Next hop
-        required: false
-        status: SUPPORTED
-      next_hop_type:
-        type: string
-        description: Next hop type
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.network.contrail.AddressPair:
-    derived_from: tosca.datatypes.Root
-    description: Address Pair
-    properties:
-      address_mode:
-        type: string
-        description: Address mode active-active or active-standy
-        required: false
-        status: SUPPORTED
-        constraints:
-        - valid_values:
-          - active-active
-          - active-standby
-      prefix:
-        type: string
-        description: IP address prefix
-        required: false
-        status: SUPPORTED
-      mac_address:
-        type: string
-        description: Mac address
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.network.contrail.InterfaceData:
-    derived_from: tosca.datatypes.Root
-    description: Interface Data
-    properties:
-      static_routes:
-        type: list
-        description: An ordered list of static routes to be added to this interface
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute
-      virtual_network:
-        type: string
-        description: Virtual Network for this interface
-        required: true
-        status: SUPPORTED
-      allowed_address_pairs:
-        type: list
-        description: List of allowed address pair for this interface
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.network.contrail.AddressPair
-      ip_address:
-        type: string
-        description: IP for this interface
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties:
-    derived_from: tosca.datatypes.Root
-    description: Virtual Machine Interface Properties.
-    properties:
-      virtual_machine_interface_properties_service_interface_type:
-        type: string
-        description: Service Interface Type.
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.Root:
-    derived_from: tosca.datatypes.Root
-    description: |
-      The ECOMP root Data Type all other Data Types derive from
-    properties:
-      supplemental_data:
-        type: map
-        entry_schema:
-          description: |
-            A placeholder for missing properties that would be included in future ecomp model versions. fromat <key>:<value>
-          type: string
-  org.openecomp.datatypes.AssignmentRequirements:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      is_required:
-        description: |
-          "true" indicates that assignment is required
-        type: boolean
-        default: false
-        required: true
-      count:
-        description: number of assignments required
-        type: integer
-        required: false
-  org.openecomp.datatypes.network.SubnetAssignments:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      ip_network_address_plan:
-        type: string
-        required: false
-        description: Reference to EIPAM, VLAN or other address plan ID used to assign subnets to this network
-      dhcp_enabled:
-        type: boolean
-        required: false
-        description: \"true\" indicates the network has 1 or more policies
-      ip_version:
-        type: integer
-        constraints:
-        - valid_values:
-          - 4
-          - 6
-        required: true
-        description: The IP version of the subnet
-      cidr_mask:
-        type: integer
-        required: true
-        description: The default subnet CIDR mask
-      min_subnets_count:
-        type: integer
-        default: 1
-        required: true
-        description: Quantity of subnets that must be initially assigned
-  org.openecomp.datatypes.network.IPv4SubnetAssignments:
-    derived_from: org.openecomp.datatypes.network.SubnetAssignments
-    properties:
-      use_ipv4:
-        type: boolean
-        required: true
-        description: Indicates IPv4 subnet assignments
-  org.openecomp.datatypes.network.IPv6SubnetAssignments:
-    derived_from: org.openecomp.datatypes.network.SubnetAssignments
-    properties:
-      use_ipv6:
-        type: boolean
-        required: true
-        description: Indicates IPv6 subnet assignments
-  org.openecomp.datatypes.network.NetworkAssignments:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      ecomp_generated_network_assignment:
-        type: boolean
-        required: true
-        default: false
-        description: |
-          \"true\" indicates that the network assignments will be auto-generated by ECOMP \"false\" indicates operator-supplied Network assignments file upload is required (e.g. VID will present prompt to operator to upload operator-supplied Network assignments file).
-      is_shared_network:
-        type: boolean
-        required: true
-        description: \"true\" means this network is shared by multiple Openstack tenants
-      is_external_network:
-        type: boolean
-        required: true
-        default: false
-        description: |
-          \"true\" means this Contrail external network
-      ipv4_subnet_default_assignment:
-        type: org.openecomp.datatypes.network.IPv4SubnetAssignments
-        required: true
-        description: IPv4 defualt subnet assignments
-      ipv6_subnet_default_assignment:
-        type: org.openecomp.datatypes.network.IPv6SubnetAssignments
-        required: true
-        description: IPv6 defualt subnet assignments
-      related_networks:
-        type: list
-        required: false
-        description: Related Networks List.
-        entry_schema:
-          type: org.openecomp.datatypes.network.RelatedNetworksAssignments
-      is_trunked:
-        type: boolean
-        required: true
-        description: \"true\" indicates that network is trunked
-        default: false
-  org.openecomp.datatypes.network.ProviderNetwork:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      is_provider_network:
-        type: boolean
-        required: true
-        description: \"true\" indicates that this a Neutron provider type of network
-      physical_network_name:
-        type: string
-        required: false
-        constraints:
-        - valid_values:
-          - Physnet41
-          - Physnet42
-          - Physnet43
-          - Physnet44
-          - Physnet21
-          - Physnet22
-          - sriovnet1
-          - sriovnet2
-          - oam
-        description: |
-          Identifies the NUMA processor cluster to which this physical network interface belongs. NUMA instance correlates to the first digit of the Physical Network Name suffix (e.g. \"01\" = NUMA 0, \"11\" = NUMA 1)
-      numa:
-        type: string
-        required: false
-        constraints:
-        - valid_values:
-          - NUMA 0
-          - NUMA 1
-        description: |
-          PNIC instance within the NUMA processor cluster PNIC Instance correlates to the second digit of the Physical Network Name suffix (e.g. "01" = PNIC 1, "02" = "PNIC 2)
-      pnic_instance:
-        type: integer
-        required: false
-        description: PNIC instance within the NUMA processor cluster
-  org.openecomp.datatypes.network.NetworkFlows:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      is_network_policy:
-        type: boolean
-        required: false
-        default: false
-        description: \"true\" indicates the network has 1 or more policies
-      network_policy:
-        type: string
-        required: false
-        description: 'Identifies the specific Cloud network policy that must be applied
-          to this network (source: from Policy Manager).'
-      is_bound_to_vpn:
-        type: boolean
-        required: false
-        default: false
-        description: \"true\" indicates the network has 1 or more vpn bindings
-      vpn_binding:
-        type: string
-        required: false
-        description: 'Identifies the specific VPN Binding entry in A&AI that must
-          be applied when creating this network (source: A&AI)'
-  org.openecomp.datatypes.network.VlanRequirements:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      vlan_range_plan:
-        type: string
-        required: true
-        description: reference to a vlan range plan
-      vlan_type:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - c-tag
-          - s-tag
-        description: identifies the vlan type (e.g., c-tag)
-      vlan_count:
-        type: integer
-        required: true
-        description: identifies the number of vlan tags to assign to the CP from the plan
-  org.openecomp.datatypes.network.IpRequirements:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      ip_version:
-        type: integer
-        required: true
-        constraints:
-        - valid_values:
-          - 4
-          - 6
-      ip_count:
-        description: identifies the number of ip address to assign to the CP from the plan
-        type: integer
-        required: false
-      floating_ip_count:
-        type: integer
-        required: false
-      subnet_role:
-        type: string
-        required: false
-      assingment_method:
-        type: string
-        required: true
-        constraints:
-        - valid_values:
-          - fixed
-          - dhcp
-      dhcp_enabled:
-        type: boolean
-        required: false
-      ip_count_required:
-        description: identifies the number of ip address to assign to the CP from the plan
-        type: org.openecomp.datatypes.AssignmentRequirements
-        required: false
-      floating_ip_count_required:
-        type: org.openecomp.datatypes.AssignmentRequirements
-        required: false
-      ip_address_plan_name:
-        type: string
-        required: false
-      vrf_name:
-        type: string
-        required: false
-  org.openecomp.datatypes.network.MacAssignments:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      mac_range_plan:
-        type: string
-        required: true
-        description: reference to a MAC address range plan
-      mac_count:
-        type: integer
-        required: true
-        description: identifies the number of MAC addresses to assign to the CP from the plan
-  org.openecomp.datatypes.EcompHoming:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      ecomp_selected_instance_node_target:
-        type: boolean
-        required: true
-        default: false
-        description: |
-          \"true\" indicates that the target deployment node for this instance will be auto-selected by ECOMP \"false\" indicates operator-supplied instance target deployment node required (e.g. VID will present a prompt to operator and collect the operator-selected target node for the deployment of this Network instance).
-      homing_policy:
-        type: string
-        required: false
-        description: Referenc to a service level homing policy that ECOMP will use for instance deployment target node
-      instance_node_target:
-        type: string
-        required: false
-        description: Instance target deployment node
-  org.openecomp.datatypes.EcompNaming:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      ecomp_generated_naming:
-        type: boolean
-        required: true
-        default: true
-        description: |
-          \"true\" indicates that the name for the instance will be auto-generated by ECOMP. \"false\" indicates operator-supplied name required (e.g. VID will present prompt to operator and collect the operator-supplied instance name).
-      naming_policy:
-        type: string
-        required: false
-        description: Referenc to naming policy that ECOMP will use when the name is auto-generated
-  org.openecomp.datatypes.network.MacRequirements:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      mac_range_plan:
-        description: reference to a MAC address range plan
-        type: string
-        required: false
-      mac_count:
-        description: identifies the number of MAC addresses to assign to the CP from the plan
-        type: integer
-        required: false
-      mac_count_required:
-        description: identifies the number of MAC addresses to assign to the CP from the plan
-        type: org.openecomp.datatypes.AssignmentRequirements
-  org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp:
-    derived_from: tosca.datatypes.Root
-    description: Virtual Machine Sub Interface Address Pair IP.
-    properties:
-      ip_prefix:
-        type: string
-        description: IP Prefix.
-        required: false
-        status: SUPPORTED
-      ip_prefix_len:
-        type: integer
-        description: IP Prefix Len.
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress:
-    derived_from: tosca.datatypes.Root
-    description: Virtual Machine Sub Interface Mac Address.
-    properties:
-      mac_address:
-        type: list
-        description: Mac Addresses List.
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: string
-  org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties:
-    derived_from: tosca.datatypes.Root
-    description: Virtual Machine Sub Interface VLAN Properties.
-    properties:
-      sub_interface_vlan_tag:
-        type: string
-        description: Sub Interface VLAN Tag.
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair:
-    derived_from: tosca.datatypes.Root
-    description: Virtual Machine Sub Interface Address Pair.
-    properties:
-      address_mode:
-        type: string
-        description: Address Mode.
-        required: false
-        status: SUPPORTED
-      ip:
-        type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairIp
-        description: IP.
-        required: false
-        status: SUPPORTED
-      mac:
-        type: string
-        description: Mac.
-        required: false
-        status: SUPPORTED
-  org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs:
-    derived_from: tosca.datatypes.Root
-    description: Virtual Machine Sub Interface Address Pairs.
-    properties:
-      allowed_address_pair:
-        type: list
-        description: Addresses pair List.
-        required: false
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPair
-  org.openecomp.datatypes.Naming:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      ecomp_generated_naming:
-        description: |
-          "true" indicates that the name for the instance will be auto-generated by ECOMP. "false" indicates operator-supplied name required (e.g. VID will present prompt to operator and collect the operator-supplied instance name).
-        type: boolean
-        default: true
-        required: true
-      naming_policy:
-        description: Reference to naming policy that ECOMP will use when the name is auto-generated
-        type: string
-        required: false
-      instance_name:
-        description: indicates operator-supplied name required (e.g. VID will present prompt to operator and collect the operator-supplied instance name).
-        type: string
-        required: false
-  org.openecomp.datatypes.flavors.ComputeFlavor:
-    derived_from: tosca.datatypes.Root
-    properties:
-      num_cpus:
-        type: integer
-      disk_size:
-        type: scalar-unit.size
-      mem_size:
-        type: scalar-unit.size
-  org.openecomp.datatypes.flavors.LicenseFlavor:
-    derived_from: tosca.datatypes.Root
-    properties:
-      feature_group_uuid:
-        type: string
-  org.openecomp.datatypes.flavors.VendorInfo:
-    derived_from: tosca.datatypes.Root
-    properties:
-      manufacturer_reference_number:
-        type: string
-      vendor_model:
-        type: string
-  org.openecomp.datatypes.flavors.DeploymentFlavor:
-    derived_from: tosca.datatypes.Root
-    properties:
-      sp_part_number:
-        type: string
-      vendor_info:
-        type: org.openecomp.datatypes.flavors.VendorInfo
-      compute_flavor:
-        type: org.openecomp.datatypes.flavors.ComputeFlavor
-      license_flavor:
-        type: org.openecomp.datatypes.flavors.LicenseFlavor
-        required: false
-  org.openecomp.datatypes.ImageInfo:
-    derived_from: tosca.datatypes.Root
-    properties:
-      software_version:
-        type: string
-      file_name:
-        type: string
-      file_hash:
-        type: string
-        description: checksum/signature
-      file_hash_type:
-        type: string
-        required: false
-        default: md5
-  org.openecomp.datatypes.network.RelatedNetworksAssignments:
-    derived_from: org.openecomp.datatypes.Root
-    properties:
-      related_network_role:
-        type: string
-        description: The network role of the related network, sharing provider network.
-        required: false
-  tosca.datatypes.nfv.VnfcAdditionalConfigurableProperties:
-    derived_from: tosca.datatypes.Root
-    description: VnfcAdditionalConfigurableProperties type is an empty base type for deriving data types for describing additional configurable properties for a given VNFC.
-    properties:
-      description:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VnfcConfigurableProperties:
-    derived_from: tosca.datatypes.Root
-    description: Defines the configurable properties of a VNFC
-    properties:
-      additional_vnfc_configurable_properties:
-        type: tosca.datatypes.nfv.VnfcAdditionalConfigurableProperties
-        description: Describes additional configuration for VNFC that can be modified using the ModifyVnfInfo operation
-        required: false
-  tosca.datatypes.nfv.RequestedAdditionalCapability:
-    derived_from: tosca.datatypes.Root
-    description: describes requested additional capability for a particular VDU
-    properties:
-      requested_additional_capability_name:
-        type: string
-        description: Identifies a requested additional capability for the VDU.
-        required: true
-      support_mandatory:
-        type: boolean
-        description: Indicates whether the requested additional capability is mandatory for successful operation.
-        required: true
-      min_requested_additional_capability_version:
-        type: string
-        description: Identifies the minimum version of the requested additional capability.
-        required: false
-      preferred_requested_additional_capability_version:
-        type: string
-        description: Identifies the preferred version of the requested additional capability.
-        required: false
-      target_performance_parameters:
-        type: map
-        description: Identifies specific attributes, dependent on the requested additional capability type.
-        required: true
-        entry_schema:
-          type: string
-  tosca.datatypes.nfv.VirtualMemory:
-    derived_from: tosca.datatypes.Root
-    description: supports the specification of requirements related to virtual memory of a virtual compute resource
-    properties:
-      virtual_mem_size:
-        type: scalar-unit.size
-        description: Amount of virtual memory.
-        required: true
-      virtual_mem_oversubscription_policy:
-        type: string
-        description: The memory core oversubscription policy in terms of virtual memory to physical memory on the platform.
-        required: false
-      vdu_mem_requirements:
-        type: map
-        description: The hardware platform specific VDU memory requirements. A map of strings that contains a set of key-value pairs that describes hardware platform specific VDU memory requirements.
-        required: false
-        entry_schema:
-          type: string
-      numa_enabled:
-        type: boolean
-        description: It specifies the memory allocation to be cognisant of the relevant process/core allocation.
-        required: false
-        default: false
-  tosca.datatypes.nfv.VirtualCpuPinning:
-    derived_from: tosca.datatypes.Root
-    description: Supports the specification of requirements related to the virtual CPU pinning configuration of a virtual compute resource
-    properties:
-      virtual_cpu_pinning_policy:
-        type: string
-        description: 'Indicates the policy for CPU pinning. The policy can take values
-          of "static" or "dynamic". In case of "dynamic" the allocation of virtual
-          CPU cores to logical CPU cores is decided by the VIM. (e.g.: SMT (Simultaneous
-          Multi-Threading) requirements). In case of "static" the allocation is requested
-          to be according to the virtual_cpu_pinning_rule.'
-        required: false
-        constraints:
-        - valid_values:
-          - static
-          - dynamic
-      virtual_cpu_pinning_rule:
-        type: list
-        description: Provides the list of rules for allocating virtual CPU cores to logical CPU cores/threads
-        required: false
-        entry_schema:
-          type: string
-  tosca.datatypes.nfv.VirtualCpu:
-    derived_from: tosca.datatypes.Root
-    description: Supports the specification of requirements related to virtual CPU(s) of a virtual compute resource
-    properties:
-      cpu_architecture:
-        type: string
-        description: CPU architecture type. Examples are x86, ARM
-        required: false
-      num_virtual_cpu:
-        type: integer
-        description: Number of virtual CPUs
-        required: true
-        constraints:
-        - greater_than: 0
-      virtual_cpu_clock:
-        type: scalar-unit.frequency
-        description: Minimum virtual CPU clock rate
-        required: false
-      virtual_cpu_oversubscription_policy:
-        type: string
-        description: CPU core oversubscription policy e.g. the relation of virtual CPU cores to physical CPU cores/threads.
-        required: false
-      vdu_cpu_requirements:
-        type: map
-        description: The hardware platform specific VDU CPU requirements. A map of strings that contains a set of key-value pairs describing VDU CPU specific hardware platform requirements.
-        required: false
-        entry_schema:
-          type: string
-      virtual_cpu_pinning:
-        type: tosca.datatypes.nfv.VirtualCpuPinning
-        description: The virtual CPU pinning configuration for the virtualised compute resource.
-        required: false
-  tosca.datatypes.nfv.LogicalNodeData:
-    derived_from: tosca.datatypes.Root
-    description: Describes compute, memory and I/O requirements associated with a particular VDU.
-    properties:
-      logical_node_requirements:
-        type: map
-        description: The logical node-level compute, memory and I/O requirements. A map  of strings that contains a set of key-value pairs that describes hardware platform specific deployment requirements, including the number of CPU cores on this logical node, a memory configuration specific to a logical node  or a requirement related to the association of an I/O device with the logical node.
-        required: false
-        entry_schema:
-          type: string
-  tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
-    derived_from: tosca.datatypes.Root
-    description: Describes requirements on a virtual network interface
-    properties:
-      name:
-        type: string
-        description: Provides a human readable name for the requirement.
-        required: false
-      description:
-        type: string
-        description: Provides a human readable description of the requirement.
-        required: false
-      support_mandatory:
-        type: boolean
-        description: Indicates whether fulfilling the constraint is mandatory (TRUE) for successful operation or desirable (FALSE).
-        required: true
-      network_interface_requirements:
-        type: map
-        description: The network interface requirements. A map of strings that contain a set of key-value pairs that describes the hardware platform specific  network interface deployment requirements.
-        required: true
-        entry_schema:
-          type: string
-      nic_io_requirements:
-        type: tosca.datatypes.nfv.LogicalNodeData
-        description: references (couples) the CP with any logical node I/O requirements (for network devices) that may have been created. Linking these attributes is necessary so that so that I/O requirements that need to be articulated at the logical node level can be associated with the network interface requirements associated with the CP.
-        required: false
-  tosca.datatypes.nfv.injectFile:
-    derived_from: tosca.datatypes.Root
-    properties:
-      source_path:
-        type: string
-        required: true
-      dest_path:
-        type: string
-        required: true
-  tosca.datatypes.nfv.L2AddressData:
-    derived_from: tosca.datatypes.Root
-    description: Describes the information on the MAC addresses to be assigned to a connection point.
-    properties:
-      mac_address_assignment:
-        type: boolean
-        description: Specifies if the address assignment is the responsibility of management and orchestration function or not. If it is set to True, it is the management and orchestration function responsibility
-        required: true
-  tosca.datatypes.nfv.L3AddressData:
-    derived_from: tosca.datatypes.Root
-    description: Provides information about Layer 3 level addressing scheme and parameters applicable to a CP
-    properties:
-      ip_address_assignment:
-        type: boolean
-        description: Specifies if the address assignment is the responsibility of management and orchestration function or not. If it is set to True, it is the management and orchestration function responsibility
-        required: true
-      floating_ip_activated:
-        type: boolean
-        description: Specifies if the floating IP scheme is activated on the Connection Point or not
-        required: true
-      ip_address_type:
-        type: string
-        description: Defines address type. The address type should be aligned with the address type supported by the layer_protocols properties of the parent VnfExtCp
-        required: false
-        constraints:
-        - valid_values:
-          - ipv4
-          - ipv6
-      number_of_ip_address:
-        type: integer
-        description: Minimum number of IP addresses to be assigned
-        required: false
-        constraints:
-        - greater_than: 0
-      fixed_ip_address:
-        type: list
-        entry_schema:
-          type: string
-        required: false
-  tosca.datatypes.nfv.AddressData:
-    derived_from: tosca.datatypes.Root
-    description: Describes information about the addressing scheme and parameters applicable to a CP
-    properties:
-      address_type:
-        type: string
-        description: Describes the type of the address to be assigned to a connection point. The content type shall be aligned with the address type supported by the layerProtocol property of the connection point
-        required: true
-        constraints:
-        - valid_values:
-          - mac_address
-          - ip_address
-      l2_address_data:
-        type: tosca.datatypes.nfv.L2AddressData
-        description: Provides the information on the MAC addresses to be assigned to a connection point.
-        required: false
-      l3_address_data:
-        type: tosca.datatypes.nfv.L3AddressData
-        description: Provides the information on the IP addresses to be assigned to a connection point
-        required: false
-  tosca.datatypes.nfv.ConnectivityType:
-    derived_from: tosca.datatypes.Root
-    description: describes additional connectivity information of a virtualLink
-    properties:
-      layer_protocols:
-        type: list
-        description: Identifies the protocol a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire).The top layer protocol of the virtualLink protocol stack shall always be provided. The lower layer protocols may be included when there are specific requirements on these layers.
-        required: true
-        entry_schema:
-          type: string
-          constraints:
-          - valid_values:
-            - ethernet
-            - mpls
-            - odu2
-            - ipv4
-            - ipv6
-            - pseudo-wire
-      flow_pattern:
-        type: string
-        description: Identifies the flow pattern of the connectivity
-        required: false
-        constraints:
-        - valid_values:
-          - line
-          - tree
-          - mesh
-  tosca.datatypes.nfv.VlFlavour:
-    derived_from: tosca.datatypes.Root
-    properties:
-      flavourId:
-        type: string
-  tosca.datatypes.nfv.ext.AddressPairs:
-    properties:
-      ip:
-        type: string
-        required: false
-      mac:
-        type: string
-        required: false
-  tosca.datatypes.nfv.ext.FloatingIP:
-    properties:
-      external_network:
-        type: string
-        required: false
-      ip_address:
-        type: string
-        required: false
-  tosca.datatypes.nfv.ext.LocationInfo:
-    properties:
-      availability_zone:
-        type: string
-        required: false
-      vimid:
-        type: integer
-        required: false
-      tenant:
-        type: string
-        required: false
-  tosca.datatypes.nfv.ext.HostRouteInfo:
-    properties:
-      destination:
-        type: string
-        required: false
-      nexthop:
-        type: string
-        required: false
-  tosca.datatypes.nfv.ext.InjectData:
-    properties:
-      file_name:
-        type: string
-        required: false
-      file_data:
-        type: string
-        required: false
-  tosca.datatypes.nfv.ext.zte.WatchDog:
-    properties:
-      enable_delay:
-        type: integer
-        required: false
-      action:
-        type: string
-        required: false
-  tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule:
-    properties:
-      scope:
-        type: string
-        required: false
-      affinity_antiaffinity:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VduProfile:
-    derived_from: tosca.datatypes.Root
-    description: describes additional instantiation data for a given Vdu.Compute used in a specific deployment flavour.
-    properties:
-      min_number_of_instances:
-        type: integer
-        description: Minimum number of instances of the VNFC based on this Vdu.Compute that is permitted to exist for a particular VNF deployment flavour.
-        required: true
-        constraints:
-        - greater_or_equal: 0
-      max_number_of_instances:
-        type: integer
-        description: Maximum number of instances of the VNFC based on this Vdu.Compute that is permitted to exist for a particular VNF deployment flavour.
-        required: true
-        constraints:
-        - greater_or_equal: 0
-      watchdog:
-        type: string
-        required: true
-      vmBootUpTimeOut:
-        type: integer
-        required: false
-  tosca.datatypes.nfv.LinkBitrateRequirements:
-    derived_from: tosca.datatypes.Root
-    description: describes the requirements in terms of bitrate for a virtual link
-    properties:
-      root:
-        type: integer
-        description: Specifies the throughput requirement in bits per second of the link (e.g. bitrate of E-Line, root bitrate of E-Tree, aggregate capacity of E-LAN).
-        required: true
-        constraints:
-        - greater_or_equal: 0
-      leaf:
-        type: integer
-        description: Specifies the throughput requirement in bits per second of leaf connections to the link when applicable to the connectivity type (e.g. for E-Tree and E LAN branches).
-        required: false
-        constraints:
-        - greater_or_equal: 0
-  tosca.datatypes.nfv.Qos:
-    derived_from: tosca.datatypes.Root
-    description: describes QoS data for a given VL used in a VNF deployment flavour
-    properties:
-      latency:
-        type: scalar-unit.time
-        description: Specifies the maximum latency
-        required: true
-        constraints:
-        - greater_than: 0 s
-      packet_delay_variation:
-        type: scalar-unit.time
-        description: Specifies the maximum jitter
-        required: true
-        constraints:
-        - greater_or_equal: 0 s
-      packet_loss_ratio:
-        type: float
-        description: Specifies the maximum packet loss ratio
-        required: false
-        constraints:
-        - in_range:
-          - 0.0
-          - 1.0
-  tosca.datatypes.nfv.IpAllocationPool:
-    derived_from: tosca.datatypes.Root
-    description: Specifies a range of IP addresses
-    properties:
-      start_ip_address:
-        type: string
-        description: The IP address to be used as the first one in a pool of addresses derived from the cidr block full IP range
-        required: true
-      end_ip_address:
-        type: string
-        description: The IP address to be used as the last one in a pool of addresses derived from the cidr block full IP range
-        required: true
-  tosca.datatypes.nfv.L2ProtocolData:
-    derived_from: tosca.datatypes.Root
-    description: describes L2 protocol data for a given virtual link used in a specific VNF deployment flavour.
-    properties:
-      name:
-        type: string
-        description: Identifies the network name associated with this L2 protocol.
-        required: false
-      network_type:
-        type: string
-        description: Specifies the network type for this L2 protocol.The value may be overridden at run-time.
-        required: false
-        constraints:
-        - valid_values:
-          - flat
-          - vlan
-          - vxlan
-          - gre
-      vlan_transparent:
-        type: boolean
-        description: Specifies whether to support VLAN transparency for this L2 protocol or not.
-        required: false
-        default: false
-      mtu:
-        type: integer
-        description: Specifies the maximum transmission unit (MTU) value for this L2 protocol.
-        required: false
-        constraints:
-        - greater_than: 0
-      segmentation_id:
-        type: integer
-        required: false
-      physical_network:
-        type: string
-        required: false
-  tosca.datatypes.nfv.L3ProtocolData:
-    derived_from: tosca.datatypes.Root
-    description: describes L3 protocol data for a given virtual link used in a specific VNF deployment flavour.
-    properties:
-      name:
-        type: string
-        description: Identifies the network name associated with this L3 protocol.
-        required: false
-      ip_version:
-        type: string
-        description: Specifies IP version of this L3 protocol.The value of the ip_version property shall be consistent with the value of the layer_protocol in the connectivity_type property of the virtual link node.
-        required: true
-        constraints:
-        - valid_values:
-          - ipv4
-          - ipv6
-      cidr:
-        type: string
-        description: Specifies the CIDR (Classless Inter-Domain Routing) of this L3 protocol. The value may be overridden at run-time.
-        required: true
-      ip_allocation_pools:
-        type: list
-        description: Specifies the allocation pools with start and end IP addresses for this L3 protocol. The value may be overridden at run-time.
-        required: false
-        entry_schema:
-          type: tosca.datatypes.nfv.IpAllocationPool
-      gateway_ip:
-        type: string
-        description: Specifies the gateway IP address for this L3 protocol. The value may be overridden at run-time.
-        required: false
-      dhcp_enabled:
-        type: boolean
-        description: Indicates whether DHCP (Dynamic Host Configuration Protocol) is enabled or disabled for this L3 protocol. The value may be overridden at run-time.
-        required: false
-      ipv6_address_mode:
-        type: string
-        description: Specifies IPv6 address mode. May be present when the value of the ipVersion attribute is "ipv6" and shall be absent otherwise. The value may be overridden at run-time.
-        required: false
-        constraints:
-        - valid_values:
-          - slaac
-          - dhcpv6-stateful
-          - dhcpv6-stateless
-  tosca.datatypes.nfv.VirtualLinkProtocolData:
-    derived_from: tosca.datatypes.Root
-    description: describes one protocol layer and associated protocol data for a given virtual link used in a specific VNF deployment flavour
-    properties:
-      associated_layer_protocol:
-        type: string
-        description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property.
-        required: true
-        constraints:
-        - valid_values:
-          - ethernet
-          - mpls
-          - odu2
-          - ipv4
-          - ipv6
-          - pseudo-wire
-      l2_protocol_data:
-        type: tosca.datatypes.nfv.L2ProtocolData
-        description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise.
-        required: false
-      l3_protocol_data:
-        type: tosca.datatypes.nfv.L3ProtocolData
-        description: Specifies the L3 protocol data for this virtual link.  Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise.
-        required: false
-  tosca.datatypes.nfv.VlProfile:
-    derived_from: tosca.datatypes.Root
-    description: Describes additional instantiation data for a given VL used in a specific VNF deployment flavour.
-    properties:
-      max_bitrate_requirements:
-        type: tosca.datatypes.nfv.LinkBitrateRequirements
-        description: Specifies the maximum bitrate requirements for a VL instantiated according to this profile.
-        required: true
-      min_bitrate_requirements:
-        type: tosca.datatypes.nfv.LinkBitrateRequirements
-        description: Specifies the minimum bitrate requirements for a VL instantiated according to this profile.
-        required: true
-      qos:
-        type: tosca.datatypes.nfv.Qos
-        description: Specifies the QoS requirements of a VL instantiated according to this profile.
-        required: false
-      virtual_link_protocol_data:
-        type: list
-        description: Specifies the protocol data for a virtual link.
-        required: false
-        entry_schema:
-          type: tosca.datatypes.nfv.VirtualLinkProtocolData
-  tosca.datatypes.nfv.VduLevel:
-    derived_from: tosca.datatypes.Root
-    description: Indicates for a given Vdu.Compute in a given level the number of instances to deploy
-    properties:
-      number_of_instances:
-        type: integer
-        description: Number of instances of VNFC based on this VDU to deploy for this level.
-        required: true
-        constraints:
-        - greater_or_equal: 0
-  tosca.datatypes.nfv.ScaleInfo:
-    derived_from: tosca.datatypes.Root
-    description: Indicates for a given scaleAspect the corresponding scaleLevel
-    properties:
-      scale_level:
-        type: integer
-        description: The scale level for a particular aspect
-        required: true
-        constraints:
-        - greater_or_equal: 0
-  tosca.datatypes.nfv.ScalingAspect:
-    derived_from: tosca.datatypes.Root
-    properties:
-      name:
-        type: string
-        required: true
-      description:
-        type: string
-        required: true
-      max_scale_level:
-        type: integer
-        required: true
-        constraints:
-        - greater_or_equal: 0
-      step_deltas:
-        type: list
-        required: false
-        entry_schema:
-          type: string
-  tosca.datatypes.nfv.InstantiationLevel:
-    derived_from: tosca.datatypes.Root
-    description: Describes the scale level for each aspect that corresponds to a given level of resources to be instantiated within a deployment flavour in term of the number VNFC instances
-    properties:
-      description:
-        type: string
-        description: Human readable description of the level
-        required: true
-      scale_info:
-        type: map
-        description: Represents for each aspect the scale level that corresponds to this instantiation level. scale_info shall be present if the VNF supports scaling.
-        required: false
-        entry_schema:
-          type: tosca.datatypes.nfv.ScaleInfo
-  tosca.datatypes.nfv.VnfInstantiateOperationConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: represents information that affect the invocation of the InstantiateVnf operation.
-    properties:
-      description:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VnfScaleOperationConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: Represents information that affect the invocation of the ScaleVnf operation
-    properties:
-      scaling_by_more_than_one_step_supported:
-        type: boolean
-        description: Signals whether passing a value larger than one in the numScalingSteps parameter of the ScaleVnf operation is supported by this VNF.
-        required: false
-        default: false
-  tosca.datatypes.nfv.VnfScaleToLevelOperationConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: represents information that affect the invocation of the ScaleVnfToLevel operation
-    properties:
-      arbitrary_target_levels_supported:
-        type: boolean
-        description: Signals whether scaling according to the parameter "scaleInfo" is supported by this VNF
-        required: true
-  tosca.datatypes.nfv.VnfHealOperationConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: represents information that affect the invocation of the HealVnf operation
-    properties:
-      causes:
-        type: list
-        description: Supported "cause" parameter values
-        required: false
-        entry_schema:
-          type: string
-  tosca.datatypes.nfv.VnfTerminateOperationConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: represents information that affect the invocation of the TerminateVnf
-    properties:
-      min_graceful_termination_timeout:
-        type: scalar-unit.time
-        description: Minimum timeout value for graceful termination of a VNF instance
-        required: true
-      max_recommended_graceful_termination_timeout:
-        type: scalar-unit.time
-        description: Maximum recommended timeout value that can be needed to gracefully terminate a VNF instance of a particular type under certain conditions, such as maximum load condition. This is provided by VNF provider as information for the operator facilitating the selection of optimal timeout value. This value is not used as constraint
-        required: false
-  tosca.datatypes.nfv.VnfOperateOperationConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: represents information that affect the invocation of the OperateVnf operation
-    properties:
-      min_graceful_stop_timeout:
-        type: scalar-unit.time
-        description: Minimum timeout value for graceful stop of a VNF instance
-        required: true
-      max_recommended_graceful_stop_timeout:
-        type: scalar-unit.time
-        description: Maximum recommended timeout value that can be needed to gracefully stop a VNF instance of a particular type under certain conditions, such as maximum load condition. This is provided by VNF provider as information for the operator facilitating the selection of optimal timeout value. This value is not used as constraint
-        required: false
-  tosca.datatypes.nfv.VnfChangeFlavourOperationConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: represents information that affect the invocation of the ChangeVnfFlavour operation
-    properties:
-      description:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VnfProfile:
-    derived_from: tosca.datatypes.Root
-    description: describes a profile for instantiating VNFs of a particular NS DF according to a specific VNFD and VNF DF.
-    properties:
-      instantiation_level:
-        type: string
-        description: Identifier of the instantiation level of the VNF DF to be used for instantiation. If not present, the default instantiation level as declared in the VNFD shall be used.
-        required: false
-      min_number_of_instances:
-        type: integer
-        description: Minimum number of instances of the VNF based on this VNFD that is permitted to exist for this VnfProfile.
-        required: true
-        constraints:
-        - greater_or_equal: 0
-      max_number_of_instances:
-        type: integer
-        description: Maximum number of instances of the VNF based on this VNFD that is permitted to exist for this VnfProfile.
-        required: true
-        constraints:
-        - greater_or_equal: 0
-  tosca.datatypes.nfv.UriAuthority:
-    derived_from: tosca.datatypes.Root
-    description: information that corresponds to the authority component of a URI as specified in IETF RFC 3986 [8]
-    properties:
-      user_info:
-        type: string
-        description: user_info field of the authority component of a URI
-        required: false
-      host:
-        type: string
-        description: host field of the authority component of a URI
-        required: false
-      port:
-        type: string
-        description: port field of the authority component of a URI
-        required: false
-  tosca.datatypes.nfv.UriComponents:
-    derived_from: tosca.datatypes.Root
-    description: information used to build a URI that complies with IETF RFC 3986 [8].
-    properties:
-      scheme:
-        type: string
-        description: scheme component of a URI.
-        required: true
-      authority:
-        type: tosca.datatypes.nfv.UriAuthority
-        description: Authority component of a URI
-        required: false
-      path:
-        type: string
-        description: path component of a URI.
-        required: false
-      query:
-        type: string
-        description: query component of a URI.
-        required: false
-      fragment:
-        type: string
-        description: fragment component of a URI.
-        required: false
-  tosca.datatypes.nfv.InterfaceDetails:
-    derived_from: tosca.datatypes.Root
-    description: information used to access an interface exposed by a VNF
-    properties:
-      uri_components:
-        type: tosca.datatypes.nfv.UriComponents
-        description: Provides components to build a Uniform Ressource Identifier (URI) where to access the interface end point.
-        required: false
-      interface_specific_data:
-        type: map
-        description: Provides additional details that are specific to the type of interface considered.
-        required: false
-        entry_schema:
-          type: string
-  tosca.datatypes.nfv.VirtualLinkMonitoringParameter:
-    derived_from: tosca.datatypes.Root
-    description: Represents information on virtualised resource related performance metrics applicable to the VNF.
-    properties:
-      name:
-        type: string
-        description: Human readable name of the monitoring parameter
-        required: true
-      performance_metric:
-        type: string
-        description: Identifies a performance metric derived from those defined in ETSI GS NFV-IFA 027.The packetOutgoingVirtualLink and packetIncomingVirtualLink metrics shall be obtained by aggregation the PacketOutgoing and PacketIncoming measurements defined in clause 7.1 of GS NFV-IFA 027 of all virtual link ports attached to the virtual link to which the metrics apply.
-        required: true
-        constraints:
-        - valid_values:
-          - packet_outgoing_virtual_link
-          - packet_incoming_virtual_link
-      collection_period:
-        type: scalar-unit.time
-        description: Describes the recommended periodicity at which to collect the performance information.
-        required: false
-        constraints:
-        - greater_than: 0 s
-  tosca.datatypes.nfv.VnfcMonitoringParameter:
-    derived_from: tosca.datatypes.Root
-    description: Represents information on virtualised resource related performance metrics applicable to the VNF.
-    properties:
-      name:
-        type: string
-        description: Human readable name of the monitoring parameter
-        required: true
-      performance_metric:
-        type: string
-        description: Identifies the performance metric, according to ETSI GS NFV-IFA 027.
-        required: true
-        constraints:
-        - valid_values:
-          - v_cpu_usage_mean_vnf
-          - v_cpu_usage_peak_vnf
-          - v_memory_usage_mean_vnf
-          - v_memory_usage_peak_vnf
-          - v_disk_usage_mean_vnf
-          - v_disk_usage_peak_vnf
-          - byte_incoming_vnf_int_cp
-          - byte_outgoing_vnf_int_cp
-          - packet_incoming_vnf_int_cp
-          - packet_outgoing_vnf_int_cp
-      collection_period:
-        type: scalar-unit.time
-        description: Describes the recommended periodicity at which to collect the performance information.
-        required: false
-        constraints:
-        - greater_than: 0 s
-  tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: represents information that affect the invocation of the ChangeExtVnfConnectivity operation
-    properties:
-      description:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VnfMonitoringParameter:
-    derived_from: tosca.datatypes.Root
-    description: Represents information on virtualised resource related performance metrics applicable to the VNF.
-    properties:
-      name:
-        type: string
-        description: Human readable name of the monitoring parameter
-        required: true
-      performance_metric:
-        type: string
-        description: Identifies the performance metric, according to ETSI GS NFV-IFA 027.
-        required: true
-        constraints:
-        - valid_values:
-          - v_cpu_usage_mean_vnf
-          - v_cpu_usage_peak_vnf
-          - v_memory_usage_mean_vnf
-          - v_memory_usage_peak_vnf
-          - v_disk_usage_mean_vnf
-          - v_disk_usage_peak_vnf
-          - byte_incoming_vnf_ext_cp
-          - byte_outgoing_vnf_ext_cp
-          - packet_incoming_vnf_ext_cp
-          - packet_outgoing_vnf_ext_cp
-      collection_period:
-        type: scalar-unit.time
-        description: Describes the recommended periodicity at which to collect the performance information.
-        required: false
-        constraints:
-        - greater_than: 0 s
-  tosca.datatypes.nfv.VnfLcmOperationsConfiguration:
-    derived_from: tosca.datatypes.Root
-    description: Represents information to configure lifecycle management operations
-    properties:
-      instantiate:
-        type: tosca.datatypes.nfv.VnfInstantiateOperationConfiguration
-        description: Configuration parameters for the InstantiateVnf operation
-        required: false
-      scale:
-        type: tosca.datatypes.nfv.VnfScaleOperationConfiguration
-        description: Configuration parameters for the ScaleVnf operation
-        required: false
-      scale_to_level:
-        type: tosca.datatypes.nfv.VnfScaleToLevelOperationConfiguration
-        description: Configuration parameters for the ScaleVnfToLevel operation
-        required: false
-      change_flavour:
-        type: tosca.datatypes.nfv.VnfChangeFlavourOperationConfiguration
-        description: Configuration parameters for the changeVnfFlavourOpConfig operation
-        required: false
-      heal:
-        type: tosca.datatypes.nfv.VnfHealOperationConfiguration
-        description: Configuration parameters for the HealVnf operation
-        required: false
-      terminate:
-        type: tosca.datatypes.nfv.VnfTerminateOperationConfiguration
-        description: Configuration parameters for the TerminateVnf operation
-        required: false
-      operate:
-        type: tosca.datatypes.nfv.VnfOperateOperationConfiguration
-        description: Configuration parameters for the OperateVnf operation
-        required: false
-      change_ext_connectivity:
-        type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration
-        description: Configuration parameters for the changeExtVnfConnectivityOpConfig operation
-        required: false
-  tosca.datatypes.nfv.CpProtocolData:
-    derived_from: tosca.datatypes.Root
-    description: Describes and associates the protocol layer that a CP uses together with other protocol and connection point information
-    properties:
-      associated_layer_protocol:
-        type: string
-        required: true
-        description: One of the values of the property layer_protocols of the CP
-        constraints:
-        - valid_values:
-          - ethernet
-          - mpls
-          - odu2
-          - ipv4
-          - ipv6
-          - pseudo-wire
-      address_data:
-        type: list
-        description: Provides information on the addresses to be assigned to the CP
-        entry_schema:
-          type: tosca.datatypes.nfv.AddressData
-        required: false
-  tosca.datatypes.nfv.VnfAdditionalConfigurableProperties:
-    derived_from: tosca.datatypes.Root
-    description: is an empty base type for deriving data types for describing additional configurable properties for a given VNF
-    properties:
-      description:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VnfConfigurableProperties:
-    derived_from: tosca.datatypes.Root
-    description: indicates configuration properties for a given VNF (e.g. related to auto scaling and auto healing).
-    properties:
-      is_autoscale_enabled:
-        type: boolean
-        description: It permits to enable (TRUE)/disable (FALSE) the auto-scaling functionality. If the properties is not present for configuring, then VNF property is not supported
-        required: false
-      is_autoheal_enabled:
-        type: boolean
-        description: It permits to enable (TRUE)/disable (FALSE) the auto-healing functionality. If the properties is not present for configuring, then VNF property is not supported
-        required: false
-      additional_configurable_properties:
-        description: It provides VNF specific configurable properties that can be modified using the ModifyVnfInfo operation
-        required: false
-        type: tosca.datatypes.nfv.VnfAdditionalConfigurableProperties
-  tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions:
-    derived_from: tosca.datatypes.Root
-    description: is an empty base type for deriving data types for describing VNF-specific extension
-    properties:
-      description:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata:
-    derived_from: tosca.datatypes.Root
-    description: is an empty base type for deriving data types for describing VNF-specific metadata
-    properties:
-      description:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VnfInfoModifiableAttributes:
-    derived_from: tosca.datatypes.Root
-    description: Describes VNF-specific extension and metadata for a given VNF
-    properties:
-      extensions:
-        type: tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions
-        description: \"Extension\" properties of VnfInfo that are writeable
-        required: false
-      metadata:
-        type: tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata
-        description: \"Metadata\" properties of VnfInfo that are writeable
-        required: false
-  tosca.datatypes.nfv.VirtualLinkBitrateLevel:
-    derived_from: tosca.datatypes.Root
-    description: Describes bitrate requirements applicable to the virtual link instantiated from a particicular VnfVirtualLink
-    properties:
-      description:
-        type: string
-        required: false
-      bitrate_requirements:
-        type: tosca.datatypes.nfv.LinkBitrateRequirements
-        description: Virtual link bitrate requirements for an instantiation level or bitrate delta for a scaling step
-        required: true
-  tosca.datatypes.nfv.VnfOperationAdditionalParameters:
-    derived_from: tosca.datatypes.Root
-    description: Is an empty base type for deriving data type for describing VNF-specific parameters to be passed when invoking lifecycle management operations
-    properties:
-      description:
-        type: string
-        required: false
-  tosca.datatypes.nfv.VirtualFileStorageData:
-    derived_from: tosca.datatypes.Root
-    description: VirtualFileStorageData describes file storage requirements associated with compute resources in a particular VDU
-    properties:
-      size_of_storage:
-        type: scalar-unit.size
-        description: Size of virtualized storage resource
-        required: true
-      file_system_protocol:
-        type: string
-        description: The shared file system protocol (e.g. NFS, CIFS)
-        required: true
-  tosca.datatypes.nfv.VirtualObjectStorageData:
-    derived_from: tosca.datatypes.Root
-    description: VirtualObjectStorageData describes object storage requirements associated with compute resources in a particular VDU
-    properties:
-      max_size_of_storage:
-        type: scalar-unit.size
-        description: Maximum size of virtualized storage resource
-        required: false
-  tosca.datatypes.nfv.VirtualBlockStorageData:
-    derived_from: tosca.datatypes.Root
-    description: VirtualBlockStorageData describes block storage requirements associated with compute resources in a particular VDU, either as a local disk or as virtual attached storage
-    properties:
-      size_of_storage:
-        type: scalar-unit.size
-        description: Size of virtualised storage resource
-        required: true
-      vdu_storage_requirements:
-        type: map
-        description: The hardware platform specific storage requirements. A map of strings that contains a set of key-value pairs that represents the hardware platform specific storage deployment requirements.
-        required: false
-        entry_schema:
-          type: string
-      rdma_enabled:
-        type: boolean
-        description: Indicates if the storage support RDMA
-        required: false
-        default: false
-  tosca.datatypes.nfv.SwImageData:
-    derived_from: tosca.datatypes.Root
-    description: describes information  related to a software image artifact
-    properties:
-      name:
-        type: string
-        description: Name of this software image
-        required: true
-      version:
-        type: string
-        description: Version of this software image
-        required: true
-      checksum:
-        type: string
-        description: Checksum of the software image file
-        required: true
-      container_format:
-        type: string
-        description: The container format describes the container file format in which software image is provided
-        required: true
-        constraints:
-        - valid_values:
-          - aki
-          - ami
-          - ari
-          - bare
-          - docker
-          - ova
-          - ovf
-      disk_format:
-        type: string
-        description: The disk format of a software image is the format of the underlying disk image
-        required: true
-        constraints:
-        - valid_values:
-          - aki
-          - ami
-          - ari
-          - iso
-          - qcow2
-          - raw
-          - vdi
-          - vhd
-          - vhdx
-          - vmdk
-      min_disk:
-        type: scalar-unit.size
-        description: The minimal disk size requirement for this software image
-        required: true
-      min_ram:
-        type: scalar-unit.size
-        description: The minimal RAM requirement for this software image
-        required: false
-      size:
-        type: scalar-unit.size
-        description: The size of this software image
-        required: true
-      operating_system:
-        type: string
-        description: Identifies the operating system used in the software image
-        required: false
-      supported_virtualisation_environments:
-        type: list
-        description: Identifies the virtualisation environments (e.g. hypervisor) compatible with this software image
-        required: false
-        entry_schema:
-          type: string
-  onap.datatypes.monitoring.metricsPerEventName:
-    derived_from: tosca.datatypes.Root
-    properties:
-      controlLoopSchemaType:
-        constraints:
-        - valid_values:
-          - VM
-          - VNF
-        description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-        required: true
-        type: string
-      eventName:
-        description: Event name to which thresholds need to be applied
-        required: true
-        type: string
-      policyName:
-        description: TCA Policy Scope Name
-        required: true
-        type: string
-      policyScope:
-        description: TCA Policy Scope
-        required: true
-        type: string
-      policyVersion:
-        description: TCA Policy Scope Version
-        required: true
-        type: string
-      thresholds:
-        description: Thresholds associated with eventName
-        entry_schema:
-          type: onap.datatypes.monitoring.thresholds
-        required: true
-        type: list
-  onap.datatypes.monitoring.tca_policy:
-    derived_from: tosca.datatypes.Root
-    properties:
-      domain:
-        constraints:
-        - equal: measurementsForVfScaling
-        default: measurementsForVfScaling
-        description: Domain name to which TCA needs to be applied
-        required: true
-        type: string
-      metricsPerEventName:
-        description: Contains eventName and threshold details that need to be applied to given eventName
-        entry_schema:
-          type: onap.datatypes.monitoring.metricsPerEventName
-        required: true
-        type: list
-  onap.datatypes.monitoring.thresholds:
-    derived_from: tosca.datatypes.Root
-    properties:
-      closedLoopControlName:
-        description: Closed Loop Control Name associated with the threshold
-        required: true
-        type: string
-      closedLoopEventStatus:
-        constraints:
-        - valid_values:
-          - ONSET
-          - ABATED
-        description: Closed Loop Event Status of the threshold
-        required: true
-        type: string
-      direction:
-        constraints:
-        - valid_values:
-          - LESS
-          - LESS_OR_EQUAL
-          - GREATER
-          - GREATER_OR_EQUAL
-          - EQUAL
-        description: Direction of the threshold
-        required: true
-        type: string
-      fieldPath:
-        constraints:
-        - valid_values:
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-          - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-          - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-          - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-          - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-          - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-          - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-          - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-          - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-          - $.event.measurementsForVfScalingFields.meanRequestLatency
-          - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-          - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-          - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-          - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-          - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-          - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-        description: Json field Path as per CEF message which needs to be analyzed for TCA
-        required: true
-        type: string
-      severity:
-        constraints:
-        - valid_values:
-          - CRITICAL
-          - MAJOR
-          - MINOR
-          - WARNING
-          - NORMAL
-        description: Threshold Event Severity
-        required: true
-        type: string
-      thresholdValue:
-        description: Threshold value for the field Path inside CEF message
-        required: true
-        type: integer
-      version:
-        description: Version number associated with the threshold
-        required: true
-        type: string
diff --git a/src/test/resources/example/sdc/service-Simsfoimap0112.csar b/src/test/resources/example/sdc/service-Simsfoimap0112.csar
deleted file mode 100644
index 8c16d31ee..000000000
--- a/src/test/resources/example/sdc/service-Simsfoimap0112.csar
+++ /dev/null
diff --git a/src/test/resources/example/sdc/service-without-policy.csar b/src/test/resources/example/sdc/service-without-policy.csar
deleted file mode 100644
index 20c4eef65..000000000
--- a/src/test/resources/example/sdc/service-without-policy.csar
+++ /dev/null
diff --git a/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar b/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar
deleted file mode 100644
index ff337993a..000000000
--- a/src/test/resources/example/sdc/service_Vloadbalancerms_cds.csar
+++ /dev/null
diff --git a/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar b/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar
deleted file mode 100644
index 3330dd1e8..000000000
--- a/src/test/resources/example/sdc/service_Vloadbalancerms_no_cds.csar
+++ /dev/null
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
deleted file mode 100644
index 9e616dfea..000000000
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "blueprintName": "baseconfiguration",
-    "version": "1.0.0",
-    "workFlowData": {
-        "workFlowName": "resource-assignment",
-        "inputs": {
-            "resource-assignment-properties": {
-                "required": true,
-                "type": "dt-resource-assignment-properties"
-            }
-        },
-        "outputs": {
-            "response-property": {
-                "type": "string",
-                "value": "executed"
-            },
-            "template-properties": {
-                "type": "json",
-                "value": {
-                    "get_attribute": [
-                        "resource-assignment",
-                        "assignment-params"
-                    ]
-                }
-            }
-        }
-    },
-    "dataTypes": {
-        "dt-resource-assignment-properties": {
-            "description": "This is Dynamically generated data type for workflow activate",
-            "version": "1.0.0",
-            "metadata": null,
-            "attributes": null,
-            "properties": {
-                "request-id": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                },
-                "service-instance-id": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                },
-                "vnf-id": {
-                    "required": true,
-                    "type": "string"
-                },
-                "action-name": {
-                    "required": true,
-                    "type": "string"
-                },
-                "scope-type": {
-                    "required": true,
-                    "type": "string"
-                },
-                "hostname": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                },
-                "request-info": {
-                    "required": true,
-                    "type": "dt-request-info-properties",
-                    "input-param": true
-                },
-                "vnf_name": {
-                    "required": true,
-                    "type": "string"
-                }
-            },
-            "constraints": null,
-            "derived_from": "tosca.datatypes.Dynamic"
-        },
-        "dt-request-info-properties": {
-            "description": "This is Dynamically generated data type for workflow activate",
-            "version": "1.0.0",
-            "metadata": null,
-            "attributes": null,
-            "properties": {
-                "prop1": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                },
-                "prop2": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                }
-            },
-            "constraints": null,
-            "derived_from": "tosca.datatypes.Dynamic"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header
deleted file mode 100644
index 5464a754d..000000000
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked",  "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file
deleted file mode 100644
index 58975d86a..000000000
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.file
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "blueprintName": "baseconfiguration",
-    "version": "1.0.0",
-    "workflows": [
-        "resource-assignment",
-        "activate",
-        "activate-restconf",
-        "activate-cli",
-        "assign-activate",
-        "imperative-test-wf"
-    ]
-}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflows/blueprint-name/baseconfiguration/version/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policies/.file b/src/test/resources/http-cache/example/policy/api/v1/policies/.file
deleted file mode 100644
index 91c3c87de..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policies/.file
+++ /dev/null
@@ -1,197 +0,0 @@
-{
-  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
-  "topology_template": {
-    "policies": [
-      {
-        "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0": {
-          "type": "onap.policies.monitoring.tcagen2",
-          "type_version": "1.0.0",
-          "properties": {
-            "tca.policy": {
-              "domain": "measurementsForVfScaling",
-              "metricsPerEventName": [
-                {
-                  "policyScope": "DCAE",
-                  "thresholds": [
-                    {
-                      "version": "1.0.2",
-                      "severity": "MAJOR",
-                      "thresholdValue": 200,
-                      "closedLoopEventStatus": "ONSET",
-                      "closedLoopControlName": "LOOP_test",
-                      "direction": "LESS_OR_EQUAL",
-                      "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta"
-                    }
-                  ],
-                  "eventName": "vLoadBalancer",
-                  "policyVersion": "v0.0.1",
-                  "controlLoopSchemaType": "VM",
-                  "policyName": "DCAE.Config_tca-hi-lo"
-                }
-              ]
-            }
-          },
-          "name": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-          "version": "1.0.0",
-          "metadata": {
-            "policy-id": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-            "policy-version": "1.0.0"
-          }
-        }
-      },
-      {
-        "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd": {
-          "type": "onap.policies.controlloop.operational.common.Drools",
-          "type_version": "1.0.0",
-          "properties": {
-            "abatement": false,
-            "operations": [
-              {
-                "failure_retries": "final_failure_retries",
-                "id": "test1",
-                "failure_timeout": "final_failure_timeout",
-                "failure": "final_failure",
-                "operation": {
-                  "payload": {
-                    "artifact_name": "baseconfiguration",
-                    "artifact_version": "1.0.0",
-                    "mode": "async",
-                    "data": "{\"resource-assignment-properties\":{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}}"
-                  },
-                  "target": {
-                    "entityIds": {
-                      "resourceID": "Vloadbalancerms..vdns..module-3",
-                      "modelInvariantId": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                      "modelVersionId": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                      "modelName": "Vloadbalancerms..vdns..module-3",
-                      "modelVersion": "1",
-                      "modelCustomizationId": "bafcdab0-801d-4d81-9ead-f464640a38b1"
-                    },
-                    "targetType": "VNF"
-                  },
-                  "actor": "SDNR",
-                  "operation": "BandwidthOnDemand"
-                },
-                "failure_guard": "final_failure_guard",
-                "retries": 0,
-                "timeout": 0,
-                "failure_exception": "final_failure_exception",
-                "description": "test",
-                "success": "final_success"
-              }
-            ],
-            "trigger": "test1",
-            "timeout": 0,
-            "id": "LOOP_test"
-          },
-          "name": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-          "version": "1.0.0",
-          "metadata": {
-            "policy-id": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-            "policy-version": "1.0.0"
-          }
-        }
-      },
-      {
-        "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP": {
-          "type": "onap.policies.Naming",
-          "type_version": "1.0.0",
-          "properties": {
-            "naming-models": [
-              {
-                "naming-type": "VNF",
-                "naming-recipe": "AIC_CLOUD_REGION|DELIMITER|CONSTANT|DELIMITER|TIMESTAMP",
-                "name-operation": "to_lower_case()",
-                "naming-properties": [
-                  {
-                    "property-name": "AIC_CLOUD_REGION"
-                  },
-                  {
-                    "property-name": "CONSTANT",
-                    "property-value": "onap-nf"
-                  },
-                  {
-                    "property-name": "TIMESTAMP"
-                  },
-                  {
-                    "property-value": "-",
-                    "property-name": "DELIMITER"
-                  }
-                ]
-              },
-              {
-                "naming-type": "VNFC",
-                "naming-recipe": "VNF_NAME|DELIMITER|NFC_NAMING_CODE|DELIMITER|SEQUENCE",
-                "name-operation": "to_lower_case()",
-                "naming-properties": [
-                  {
-                    "property-name": "VNF_NAME"
-                  },
-                  {
-                    "property-name": "SEQUENCE",
-                    "increment-sequence": {
-                      "max": "zzz",
-                      "scope": "ENTIRETY",
-                      "start-value": "1",
-                      "length": "3",
-                      "increment": "1",
-                      "sequence-type": "alpha-numeric"
-                    }
-                  },
-                  {
-                    "property-name": "NFC_NAMING_CODE"
-                  },
-                  {
-                    "property-value": "-",
-                    "property-name": "DELIMITER"
-                  }
-                ]
-              },
-              {
-                "naming-type": "VF-MODULE",
-                "naming-recipe": "VNF_NAME|DELIMITER|VF_MODULE_LABEL|DELIMITER|VF_MODULE_TYPE|DELIMITER|SEQUENCE",
-                "name-operation": "to_lower_case()",
-                "naming-properties": [
-                  {
-                    "property-name": "VNF_NAME"
-                  },
-                  {
-                    "property-value": "-",
-                    "property-name": "DELIMITER"
-                  },
-                  {
-                    "property-name": "VF_MODULE_LABEL"
-                  },
-                  {
-                    "property-name": "VF_MODULE_TYPE"
-                  },
-                  {
-                    "property-name": "SEQUENCE",
-                    "increment-sequence": {
-                      "max": "zzz",
-                      "scope": "PRECEEDING",
-                      "start-value": "1",
-                      "length": "3",
-                      "increment": "1",
-                      "sequence-type": "alpha-numeric"
-                    }
-                  }
-                ]
-              }
-            ],
-            "policy-instance-name": "ONAP_NF_NAMING_TIMESTAMP"
-          },
-          "name": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
-          "version": "1.0.0",
-          "metadata": {
-            "policy-id": "SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP",
-            "policy-version": "1.0.0"
-          }
-        }
-      }
-    ]
-  },
-  "name": "ToscaServiceTemplateSimple",
-  "version": "1.0.0",
-  "metadata": {}
-}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policies/.header b/src/test/resources/http-cache/example/policy/api/v1/policies/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policies/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file
deleted file mode 100644
index 50fcf9135..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.file
+++ /dev/null
@@ -1,53 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-  onap.policies.controlloop.operational.common.Drools:
-      version: 1.0.0
-      description: Operational Policy for Control Loops using the Drools PDP
-      derived_from: onapy.policies.controlloop.Operational
-      properties:
-        # Omitted for brevity, see Section 1
-
-  onap.policies.controlloop.operational.common.Apex:
-      version: 1.0.0
-      description: Operational Policy for Control Loops using the APEX PDP
-      derived_from: onap.policies.controlloop.Operational
-      properties:
-        # Omitted for brevity, see Section 1
-
-  onap.policies.controlloop.guard.common.FrequencyLimiter:
-      version: 1.0.0
-      description: Supports limiting the frequency of actions being taken by a Actor.
-      derived_from: onap.policies.controlloop.Guard
-      properties:
-        # Omitted for brevity, see Section 1
-
-  onap.policies.controlloop.guard.common.Blacklist:
-      version: 1.0.0
-      description: Supports blacklist of VNF's from performing control loop actions on.
-      derived_from: onap.policies.controlloop.Guard
-      properties:
-        # Omitted for brevity, see Section 1
-
-  onap.policies.Naming:
-      version: 1.0.0
-      description: Supports blacklist of VNF's from performing control loop actions on.
-      derived_from: tosca.policies.Root
-      properties:
-        # Omitted for brevity, see Section 1
-
-  onap.policies.controlloop.guard.common.MinMax:
-      version: 1.0.0
-      description: Supports Min/Max number of VF Modules
-      derived_from: onap.policies.controlloop.Guard
-      properties:
-        # Omitted for brevity, see Section 1
-
-  onap.policies.controlloop.guard.common.MinMax:
-      version: 2.0.0
-      description: Supports Min/Max number of VF Modules
-      derived_from: onap.policies.controlloop.Guard
-      properties:
-        # Omitted for brevity, see Section 1
-
-data_types:
-  # Any bespoke data types referenced by policy type definitions[]
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file
deleted file mode 100644
index a00692971..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.file
+++ /dev/null
@@ -1,101 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-    onap.policies.Naming:
-        derived_from: tosca.policies.Root
-        version: 1.0.0
-        name: onap.policies.Naming
-        description: Virtual policy node for naming
-        properties:
-            policy-instance-name:
-                type: string
-            naming-models:
-                type: list
-                entry_schema:
-                    type: policy.data.naming-model-entity
-data_types:
-    policy.data.naming-model-entity:
-        derived_from: tosca.datatypes.Root
-        properties:
-            nfRole:
-                type: string
-                required: false
-                metadata:
-                    matchable: true
-            naming-type:
-                type: string
-                required: true
-                metadata:
-                    matchable: true
-            naming-recipe:
-                type: string
-                required: true
-            name-operation:
-                type: string
-                required: false
-            naming-properties:
-                type: list
-                required: true
-                entry_schema:
-                    type: policy.data.naming-property
-    policy.data.naming-property:
-        derived_from: tosca.datatypes.Root
-        properties:
-            property-name:
-                type: string
-                required: true
-                metadata:
-                    matchable: true
-            property-value:
-                type: string
-                required: false
-            property-operation:
-                type: string
-                required: false
-            source-system:
-                type: string
-                required: false
-            source-endpoint:
-                type: string
-                required: false
-            increment-sequence:
-                type: policy.data.increment-sequence
-                required: false
-    policy.data.increment-sequence:
-        derived_from: tosca.datatypes.Root
-        properties:
-            scope:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - CLOUD_REGION_ID
-                        - LOCATION_CLLI
-                        - VNF
-                        - VM
-                        - VFMODULE
-                        - PRECEEDING
-                        - TRAILING
-                        - ENTIRETY
-            sequence-type:
-                type: string
-                require: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - numeric
-                        - alpha-numeric
-            start-value:
-                type: string
-                required: true
-            max:
-                type: string
-                required: false
-            increment:
-                type: string
-                required: true
-            length:
-                type: string
-                required: true
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.Naming/versions/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file
deleted file mode 100644
index 79e79f0fe..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.file
+++ /dev/null
@@ -1,38 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-    onap.policies.controlloop.guard.Common:
-        derived_from: tosca.policies.Root
-        version: 1.0.0
-        description: |
-            This is the base Policy Type for Guard policies that guard the execution of Operational
-            Policies.
-        properties:
-            actor:
-                type: string
-                description: Specifies the Actor the guard applies to.
-                required: true
-            operation:
-                type: string
-                description: Specified the operation that the actor is performing the guard applies to.
-                required: true
-            timeRange:
-                type: tosca.datatypes.TimeInterval
-                description: |
-                    An optional range of time during the day the guard policy is valid for.
-                required: false
-            id:
-                type: string
-                description: The Control Loop id this applies to.
-                required: false
-    onap.policies.controlloop.guard.common.Blacklist:
-        derived_from: onap.policies.controlloop.guard.Common
-        type_version: 1.0.0
-        version: 1.0.0
-        description: Supports blacklist of entity id's from performing control loop actions on.
-        properties:
-            blacklist:
-                type: list
-                description: List of entity id's
-                required: true
-                entry_schema:
-                    type: string
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.Blacklist/versions/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file
deleted file mode 100644
index 163027e46..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.file
+++ /dev/null
@@ -1,47 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-    onap.policies.controlloop.guard.Common:
-        derived_from: tosca.policies.Root
-        version: 1.0.0
-        description: |
-            This is the base Policy Type for Guard policies that guard the execution of Operational
-            Policies.
-        properties:
-            actor:
-                type: string
-                description: Specifies the Actor the guard applies to.
-                required: true
-            operation:
-                type: string
-                description: Specified the operation that the actor is performing the guard applies to.
-                required: true
-            timeRange:
-                type: tosca.datatypes.TimeInterval
-                description: |
-                    An optional range of time during the day the guard policy is valid for.
-                required: false
-            id:
-                type: string
-                description: The Control Loop id this applies to.
-                required: false
-    onap.policies.controlloop.guard.common.FrequencyLimiter:
-        derived_from: onap.policies.controlloop.guard.Common
-        type_version: 1.0.0
-        version: 1.0.0
-        description: Supports limiting the frequency of actions being taken by a Actor.
-        properties:
-            timeWindow:
-                type: integer
-                description: The time window to count the actions against.
-                required: true
-            timeUnits:
-                type: string
-                description: The units of time the window is counting.
-                constraints:
-                - valid_values: ["second", "minute", "hour", "day", "week", "month", "year"]
-            limit:
-                type: integer
-                description: The limit
-                required: true
-                constraints:
-                -   greater_than: 0
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter/versions/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file
deleted file mode 100644
index 778efae9e..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.file
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
-  "policy_types": {
-    "onap.policies.controlloop.guard.Common": {
-      "properties": {
-        "id": {
-          "name": "id",
-          "type": "string",
-          "typeVersion": "0.0.0",
-          "description": "The Control Loop id this applies to.",
-          "required": false,
-          "constraints": [],
-          "metadata": {}
-        },
-        "actor": {
-          "name": "actor",
-          "type": "string",
-          "typeVersion": "0.0.0",
-          "description": "Specifies the Actor the guard applies to.",
-          "required": true,
-          "constraints": [],
-          "metadata": {}
-        },
-        "operation": {
-          "name": "operation",
-          "type": "string",
-          "typeVersion": "0.0.0",
-          "description": "Specified the operation that the actor is performing the guard applies to.",
-          "required": true,
-          "constraints": [],
-          "metadata": {}
-        },
-        "timeRange": {
-          "name": "timeRange",
-          "type": "tosca.datatypes.TimeInterval",
-          "typeVersion": "0.0.0",
-          "description": "An optional range of time during the day the guard policy is valid for.\n",
-          "required": false,
-          "constraints": [],
-          "metadata": {}
-        }
-      },
-      "name": "onap.policies.controlloop.guard.Common",
-      "version": "1.0.0",
-      "derived_from": "tosca.policies.Root",
-      "metadata": {},
-      "description": "This is the base Policy Type for Guard policies that guard the execution of Operational\nPolicies.\n"
-    },
-    "onap.policies.controlloop.guard.common.MinMax": {
-      "properties": {
-        "min": {
-          "name": "min",
-          "type": "integer",
-          "typeVersion": "0.0.0",
-          "description": "The minimum instances of this entity",
-          "required": true,
-          "constraints": [],
-          "metadata": {}
-        },
-        "max": {
-          "name": "max",
-          "type": "integer",
-          "typeVersion": "0.0.0",
-          "description": "The maximum instances of this entity",
-          "required": false,
-          "constraints": [],
-          "metadata": {}
-        }
-      },
-      "name": "onap.policies.controlloop.guard.common.MinMax",
-      "version": "1.0.0",
-      "derived_from": "onap.policies.controlloop.guard.Common",
-      "metadata": {},
-      "description": "Supports Min/Max number of entity for scaling operations"
-    }
-  },
-  "name": "ToscaServiceTemplateSimple",
-  "version": "1.0.0",
-  "metadata": {}
-}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file
deleted file mode 100644
index 78bdde746..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.file
+++ /dev/null
@@ -1,40 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-    onap.policies.controlloop.guard.Common:
-        derived_from: tosca.policies.Root
-        version: 1.0.0
-        description: |
-            This is the base Policy Type for Guard policies that guard the execution of Operational
-            Policies.
-        properties:
-            actor:
-                type: string
-                description: Specifies the Actor the guard applies to.
-                required: true
-            operation:
-                type: string
-                description: Specified the operation that the actor is performing the guard applies to.
-                required: true
-            timeRange:
-                type: tosca.datatypes.TimeInterval
-                description: |
-                    An optional range of time during the day the guard policy is valid for.
-                required: false
-            id:
-                type: string
-                description: The Control Loop id this applies to.
-                required: false
-    onap.policies.controlloop.guard.common.MinMax:
-        derived_from: onap.policies.controlloop.guard.Common
-        type_version: 1.0.0
-        version: 1.0.0
-        description: Supports Min/Max number of entity for scaling operations
-        properties:
-            min:
-                type: integer
-                required: true
-                description: The minimum instances of this entity
-            max:
-                type: integer
-                required: false
-                description: The maximum instances of this entity
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header
deleted file mode 100644
index 5464a754d..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.guard.common.MinMax/versions/2.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked",  "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file
deleted file mode 100644
index 14ae7acd8..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.file
+++ /dev/null
@@ -1,360 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-    onap.policies.controlloop.operational.Common:
-        properties:
-            abatement:
-                name: abatement
-                type: boolean
-                typeVersion: 0.0.0
-                description: Whether an abatement event message will be expected for
-                    the control loop from DCAE.
-                default: 'false'
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            operations:
-                name: operations
-                type: list
-                typeVersion: 0.0.0
-                description: List of operations to be performed when Control Loop
-                    is triggered.
-                required: true
-                constraints: [
-                    ]
-                entry_schema:
-                    type: onap.datatype.controlloop.Operation
-                    typeVersion: 0.0.0
-                    constraints: [
-                        ]
-                metadata: {
-                    }
-            trigger:
-                name: trigger
-                type: string
-                typeVersion: 0.0.0
-                description: Initial operation to execute upon receiving an Onset
-                    event message for the Control Loop.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            timeout:
-                name: timeout
-                type: integer
-                typeVersion: 0.0.0
-                description: |
-                    Overall timeout for executing all the operations. This timeout should equal or exceed the total
-                    timeout for each operation listed.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            id:
-                name: id
-                type: string
-                typeVersion: 0.0.0
-                description: The unique control loop id.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-        name: onap.policies.controlloop.operational.Common
-        version: 1.0.0
-        derived_from: tosca.policies.Root
-        metadata: {
-            }
-        description: |
-            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant
-            Policy Types. This does NOT support the legacy Policy YAML policy type.
-    onap.policies.controlloop.operational.common.Apex:
-        properties:
-            engineServiceParameters:
-                name: engineServiceParameters
-                type: string
-                typeVersion: 0.0.0
-                description: The engine parameters like name, instanceCount, policy
-                    implementation, parameters etc.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            eventOutputParameters:
-                name: eventOutputParameters
-                type: string
-                typeVersion: 0.0.0
-                description: The event output parameters.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            javaProperties:
-                name: javaProperties
-                type: string
-                typeVersion: 0.0.0
-                description: Name/value pairs of properties to be set for APEX if
-                    needed.
-                required: false
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            eventInputParameters:
-                name: eventInputParameters
-                type: string
-                typeVersion: 0.0.0
-                description: The event input parameters.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-        name: onap.policies.controlloop.operational.common.Apex
-        version: 1.0.0
-        derived_from: onap.policies.controlloop.operational.Common
-        metadata: {
-            }
-        description: Operational policies for Apex PDP
-data_types:
-    onap.datatype.controlloop.Actor:
-        constraints: [
-            ]
-        properties:
-            payload:
-                name: payload
-                type: map
-                typeVersion: 0.0.0
-                description: Name/value pairs of payload information passed by Policy
-                    to the actor
-                required: false
-                constraints: [
-                    ]
-                entry_schema:
-                    type: string
-                    typeVersion: 0.0.0
-                    constraints: [
-                        ]
-                metadata:
-                    clamp_possible_values: ClampExecution:CDS/payload
-            target:
-                name: target
-                type: onap.datatype.controlloop.Target
-                typeVersion: 0.0.0
-                description: The resource the operation should be performed on.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            actor:
-                name: actor
-                type: string
-                typeVersion: 0.0.0
-                description: The actor performing the operation.
-                required: true
-                constraints: [
-                    ]
-                metadata:
-                    clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor
-            operation:
-                name: operation
-                type: string
-                typeVersion: 0.0.0
-                description: The operation the actor is performing.
-                required: true
-                constraints: [
-                    ]
-                metadata:
-                    clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operation
-        name: onap.datatype.controlloop.Actor
-        version: 0.0.0
-        derived_from: tosca.datatypes.Root
-        metadata: {
-            }
-        description: An actor/operation/target definition
-    onap.datatype.controlloop.Operation:
-        constraints: [
-            ]
-        properties:
-            failure_retries:
-                name: failure_retries
-                type: string
-                typeVersion: 0.0.0
-                description: Points to the operation to invoke when the current operation
-                    has exceeded its max retries.
-                default: final_failure_retries
-                required: false
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            id:
-                name: id
-                type: string
-                typeVersion: 0.0.0
-                description: Unique identifier for the operation
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            failure_timeout:
-                name: failure_timeout
-                type: string
-                typeVersion: 0.0.0
-                description: Points to the operation to invoke when the time out for
-                    the operation occurs.
-                default: final_failure_timeout
-                required: false
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            failure:
-                name: failure
-                type: string
-                typeVersion: 0.0.0
-                description: Points to the operation to invoke on Actor operation
-                    failure.
-                default: final_failure
-                required: false
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            operation:
-                name: operation
-                type: onap.datatype.controlloop.Actor
-                typeVersion: 0.0.0
-                description: The definition of the operation to be performed.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            failure_guard:
-                name: failure_guard
-                type: string
-                typeVersion: 0.0.0
-                description: Points to the operation to invoke when the current operation
-                    is blocked due to guard policy enforcement.
-                default: final_failure_guard
-                required: false
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            retries:
-                name: retries
-                type: integer
-                typeVersion: 0.0.0
-                description: The number of retries the actor should attempt to perform
-                    the operation.
-                default: '0'
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            timeout:
-                name: timeout
-                type: integer
-                typeVersion: 0.0.0
-                description: The amount of time for the actor to perform the operation.
-                required: true
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            failure_exception:
-                name: failure_exception
-                type: string
-                typeVersion: 0.0.0
-                description: Points to the operation to invoke when the current operation
-                    causes an exception.
-                default: final_failure_exception
-                required: false
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            description:
-                name: description
-                type: string
-                typeVersion: 0.0.0
-                description: A user-friendly description of the intent for the operation
-                required: false
-                constraints: [
-                    ]
-                metadata: {
-                    }
-            success:
-                name: success
-                type: string
-                typeVersion: 0.0.0
-                description: Points to the operation to invoke on success. A value
-                    of "final_success" indicates and end to the operation.
-                default: final_success
-                required: false
-                constraints: [
-                    ]
-                metadata: {
-                    }
-        name: onap.datatype.controlloop.Operation
-        version: 0.0.0
-        derived_from: tosca.datatypes.Root
-        metadata: {
-            }
-        description: An operation supported by an actor
-    onap.datatype.controlloop.Target:
-        constraints: [
-            ]
-        properties:
-            entityIds:
-                name: entityIds
-                type: map
-                typeVersion: 0.0.0
-                description: |
-                    Map of values that identify the resource. If none are provided, it is assumed that the
-                    entity that generated the ONSET event will be the target.
-                required: false
-                constraints: [
-                    ]
-                entry_schema:
-                    type: string
-                    typeVersion: 0.0.0
-                    constraints: [
-                        ]
-                metadata:
-                    clamp_possible_values: ClampExecution:CSAR_RESOURCES
-            targetType:
-                name: targetType
-                type: string
-                typeVersion: 0.0.0
-                description: Category for the target type
-                required: true
-                constraints:
-                -   valid_values:
-                    - VNF
-                    - VM
-                    - VFMODULE
-                    - PNF
-                metadata: {
-                    }
-        name: onap.datatype.controlloop.Target
-        version: 0.0.0
-        derived_from: tosca.datatypes.Root
-        metadata: {
-            }
-        description: Definition for a entity in A&AI to perform a control loop operation
-            on
-name: ToscaServiceTemplateSimple
-version: 1.0.0
-metadata: {
-    }
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file
deleted file mode 100644
index af7a61ef7..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.file
+++ /dev/null
@@ -1,150 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-    onap.policies.controlloop.operational.common.Drools:
-        derived_from: onap.policies.controlloop.operational.Common
-        type_version: 1.0.0
-        version: 1.0.0
-        description: Operational policies for Drools PDP
-        properties:
-            controllerName:
-                type: string
-                description: Drools controller properties
-                required: false
-    onap.policies.controlloop.operational.Common:
-        derived_from: tosca.policies.Root
-        version: 1.0.0
-        description: |
-            Operational Policy for Control Loop execution. Originated in Frankfurt to support TOSCA Compliant
-            Policy Types. This does NOT support the legacy Policy YAML policy type.
-        properties:
-            id:
-                type: string
-                description: The unique control loop id.
-                required: true
-            timeout:
-                type: integer
-                description: |
-                    Overall timeout for executing all the operations. This timeout should equal or exceed the total
-                    timeout for each operation listed.
-                required: true
-            abatement:
-                type: boolean
-                description: Whether an abatement event message will be expected for the control loop from DCAE.
-                required: true
-                default: false
-            trigger:
-                type: string
-                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.
-                required: true
-            operations:
-                type: list
-                description: List of operations to be performed when Control Loop is triggered.
-                required: true
-                entry_schema:
-                    type: onap.datatype.controlloop.Operation
-data_types:
-    onap.datatype.controlloop.Target:
-        derived_from: tosca.datatypes.Root
-        description: Definition for a entity in A&AI to perform a control loop operation on
-        properties:
-            targetType:
-                type: string
-                description: Category for the target type
-                required: true
-                constraints:
-                - valid_values: [VNF, VM, VFMODULE, PNF]
-            entityIds:
-                type: map
-                description: |
-                    Map of values that identify the resource. If none are provided, it is assumed that the
-                    entity that generated the ONSET event will be the target.
-                required: false
-                metadata:
-                    clamp_possible_values: ClampExecution:CSAR_RESOURCES
-                entry_schema:
-                    type: string
-
-    onap.datatype.controlloop.Actor:
-        derived_from: tosca.datatypes.Root
-        description: An actor/operation/target definition
-        properties:
-            actor:
-                type: string
-                description: The actor performing the operation.
-                required: true
-                metadata:
-                    clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor
-            operation:
-                type: string
-                description: The operation the actor is performing.
-                required: true
-                metadata:
-                    clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations
-            target:
-                type: onap.datatype.controlloop.Target
-                description: The resource the operation should be performed on.
-                required: true
-            payload:
-                type: map
-                description: Name/value pairs of payload information passed by Policy to the actor
-                required: false
-                metadata:
-                    clamp_possible_values: ClampExecution:CDS/payload
-                entry_schema:
-                    type: string
-
-    onap.datatype.controlloop.Operation:
-        derived_from: tosca.datatypes.Root
-        description: An operation supported by an actor
-        properties:
-            id:
-                type: string
-                description: Unique identifier for the operation
-                required: true
-            description:
-                type: string
-                description: A user-friendly description of the intent for the operation
-                required: false
-            operation:
-                type: onap.datatype.controlloop.Actor
-                description: The definition of the operation to be performed.
-                required: true
-            timeout:
-                type: integer
-                description: The amount of time for the actor to perform the operation.
-                required: true
-            retries:
-                type: integer
-                description: The number of retries the actor should attempt to perform the operation.
-                required: true
-                default: 0
-            success:
-                type: string
-                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
-                required: false
-                default: final_success
-            failure:
-                type: string
-                description: Points to the operation to invoke on Actor operation failure.
-                required: false
-                default: final_failure
-            failure_timeout:
-                type: string
-                description: Points to the operation to invoke when the time out for the operation occurs.
-                required: false
-                default: final_failure_timeout
-            failure_retries:
-                type: string
-                description: Points to the operation to invoke when the current operation has exceeded its max retries.
-                required: false
-                default: final_failure_retries
-            failure_exception:
-                type: string
-                description: Points to the operation to invoke when the current operation causes an exception.
-                required: false
-                default: final_failure_exception
-            failure_guard:
-                type: string
-                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
-                required: false
-                default: final_failure_guard
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file
deleted file mode 100644
index 3c17c9004..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.file
+++ /dev/null
@@ -1,158 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-   onap.policies.Monitoring:
-      derived_from: tosca.policies.Root
-      version: 1.0.0
-      description: a base policy type for all policies that govern monitoring provisioning
-   onap.policies.monitoring.cdap.tca.hi.lo.app:
-      derived_from: onap.policies.Monitoring
-      version: 1.0.0
-      properties:
-         tca_policy:
-            type: onap.datatypes.monitoring.tca_policy
-            description: TCA Policy JSON
-            required: true
-data_types:
-   onap.datatypes.monitoring.metricsPerEventName:
-      derived_from: tosca.datatypes.Root
-      properties:
-         controlLoopSchemaType:
-            type: string
-            required: true
-            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-            constraints:
-            -  valid_values:
-               - VM
-               - VNF
-         eventName:
-            type: string
-            required: true
-            description: Event name to which thresholds need to be applied
-         policyName:
-            type: string
-            required: true
-            description: TCA Policy Scope Name
-         policyScope:
-            type: string
-            required: true
-            description: TCA Policy Scope
-         policyVersion:
-            type: string
-            required: true
-            description: TCA Policy Scope Version
-         thresholds:
-            type: list
-            required: true
-            description: Thresholds associated with eventName
-            entry_schema:
-               type: onap.datatypes.monitoring.thresholds
-   onap.datatypes.monitoring.tca_policy:
-      derived_from: tosca.datatypes.Root
-      properties:
-         domain:
-            type: string
-            required: true
-            description: Domain name to which TCA needs to be applied
-            default: measurementsForVfScaling
-            constraints:
-            -  equal: measurementsForVfScaling
-         metricsPerEventName:
-            type: list
-            required: true
-            description: Contains eventName and threshold details that need to be applied to given eventName
-            entry_schema:
-               type: onap.datatypes.monitoring.metricsPerEventName
-   onap.datatypes.monitoring.thresholds:
-      derived_from: tosca.datatypes.Root
-      properties:
-         closedLoopControlName:
-            type: string
-            required: true
-            description: Closed Loop Control Name associated with the threshold
-         closedLoopEventStatus:
-            type: string
-            required: true
-            description: Closed Loop Event Status of the threshold
-            constraints:
-            -  valid_values:
-               - ONSET
-               - ABATED
-         direction:
-            type: string
-            required: true
-            description: Direction of the threshold
-            constraints:
-            -  valid_values:
-               - LESS
-               - LESS_OR_EQUAL
-               - GREATER
-               - GREATER_OR_EQUAL
-               - EQUAL
-         fieldPath:
-            type: string
-            required: true
-            description: Json field Path as per CEF message which needs to be analyzed for TCA
-            constraints:
-            -  valid_values:
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-               - $.event.measurementsForVfScalingFields.meanRequestLatency
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-         severity:
-            type: string
-            required: true
-            description: Threshold Event Severity
-            constraints:
-            -  valid_values:
-               - CRITICAL
-               - MAJOR
-               - MINOR
-               - WARNING
-               - NORMAL
-         thresholdValue:
-            type: integer
-            required: true
-            description: Threshold value for the field Path inside CEF message
-         version:
-            type: string
-            required: true
-            description: Version number associated with the threshold
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file
deleted file mode 100644
index 367d2b5a4..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.file
+++ /dev/null
@@ -1,160 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_1_0
-policy_types:
-   onap.policies.Monitoring:
-      derived_from: tosca.policies.Root
-      version: 1.0.0
-      name: onap.policies.Monitoring
-      description: a base policy type for all policies that govern monitoring provisioning
-   onap.policies.monitoring.tcagen2:
-      derived_from: onap.policies.Monitoring
-      version: 1.0.0
-      name: onap.policies.monitoring.tcagen2
-      properties:
-         tca.policy:
-            type: onap.datatypes.monitoring.tca_policy
-            description: TCA Policy JSON
-            required: true
-data_types:
-   onap.datatypes.monitoring.metricsPerEventName:
-      derived_from: tosca.datatypes.Root
-      properties:
-         controlLoopSchemaType:
-            type: string
-            required: true
-            description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-            constraints:
-            -  valid_values:
-               - VM
-               - VNF
-         eventName:
-            type: string
-            required: true
-            description: Event name to which thresholds need to be applied
-         policyName:
-            type: string
-            required: true
-            description: TCA Policy Scope Name
-         policyScope:
-            type: string
-            required: true
-            description: TCA Policy Scope
-         policyVersion:
-            type: string
-            required: true
-            description: TCA Policy Scope Version
-         thresholds:
-            type: list
-            required: true
-            description: Thresholds associated with eventName
-            entry_schema:
-               type: onap.datatypes.monitoring.thresholds
-   onap.datatypes.monitoring.tca_policy:
-      derived_from: tosca.datatypes.Root
-      properties:
-         domain:
-            type: string
-            required: true
-            description: Domain name to which TCA needs to be applied
-            default: measurementsForVfScaling
-            constraints:
-            -  equal: measurementsForVfScaling
-         metricsPerEventName:
-            type: list
-            required: true
-            description: Contains eventName and threshold details that need to be applied to given eventName
-            entry_schema:
-               type: onap.datatypes.monitoring.metricsPerEventName
-   onap.datatypes.monitoring.thresholds:
-      derived_from: tosca.datatypes.Root
-      properties:
-         closedLoopControlName:
-            type: string
-            required: true
-            description: Closed Loop Control Name associated with the threshold
-         closedLoopEventStatus:
-            type: string
-            required: true
-            description: Closed Loop Event Status of the threshold
-            constraints:
-            -  valid_values:
-               - ONSET
-               - ABATED
-         direction:
-            type: string
-            required: true
-            description: Direction of the threshold
-            constraints:
-            -  valid_values:
-               - LESS
-               - LESS_OR_EQUAL
-               - GREATER
-               - GREATER_OR_EQUAL
-               - EQUAL
-         fieldPath:
-            type: string
-            required: true
-            description: Json field Path as per CEF message which needs to be analyzed for TCA
-            constraints:
-            -  valid_values:
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-               - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-               - $.event.measurementsForVfScalingFields.meanRequestLatency
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-               - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-               - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-         severity:
-            type: string
-            required: true
-            description: Threshold Event Severity
-            constraints:
-            -  valid_values:
-               - CRITICAL
-               - MAJOR
-               - MINOR
-               - WARNING
-               - NORMAL
-         thresholdValue:
-            type: integer
-            required: true
-            description: Threshold value for the field Path inside CEF message
-         version:
-            type: string
-            required: true
-            description: Version number associated with the threshold
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file
deleted file mode 100644
index 467409f47..000000000
--- a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.file
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "groups": [
-        {
-            "description": "This group should be used for managing all control loop related policies and pdps",
-            "name": "controlloop",
-            "pdpGroupState": "ACTIVE",
-            "pdpSubgroups": [
-                {
-                    "currentInstanceCount": 0,
-                    "desiredInstanceCount": 1,
-                    "pdpInstances": [],
-                    "pdpType": "apex",
-                    "policies": [
-                                {
-                                  "name": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-                                  "version": "1.0.0"
-                                }
-                    ],
-                    "properties": {},
-                    "supportedPolicyTypes": [
-                        {
-                            "name": "onap.policies.controlloop.Operational",
-                            "version": "1.0.0"
-                        },
-                        {
-                          "name": "onap.policies.controlloop.operational.common.*",
-                            "version": "1.0.0"
-                        }
-                    ]
-                },
-                {
-                    "currentInstanceCount": 0,
-                    "desiredInstanceCount": 1,
-                    "pdpInstances": [],
-                    "pdpType": "drools",
-                    "policies": [
-                                {
-                                  "name": "OPERATIONAL_vLoadBalancerMS_v1_0_Drools_1_0_0_7xd",
-                                  "version": "1.0.0"
-                                }
-                    ],
-                    "properties": {},
-                    "supportedPolicyTypes": [
-                        {
-                            "name": "onap.policies.controlloop.operational.common.*",
-                            "version": "1.0.0"
-                        },
-                        {
-                            "name": "onap.policies.controlloop.Operational",
-                            "version": "1.0.0"
-                        }
-                    ]
-                },
-                {
-                    "currentInstanceCount": 0,
-                    "desiredInstanceCount": 1,
-                    "pdpInstances": [],
-                    "pdpType": "xacml",
-                    "policies": [],
-                    "properties": {},
-                    "supportedPolicyTypes": [
-                        {
-                            "name": "onap.policies.controlloop.guard.common.*",
-                            "version": "1.0.0"
-                        }
-                    ]
-                }
-            ],
-            "properties": {}
-        },
-        {
-            "description": "This group should be used for managing all monitoring related policies and pdps",
-            "name": "monitoring",
-            "pdpGroupState": "ACTIVE",
-            "pdpSubgroups": [
-                {
-                    "currentInstanceCount": 0,
-                    "desiredInstanceCount": 1,
-                    "pdpInstances": [],
-                    "pdpType": "xacml",
-                    "policies": [
-                                {
-                                  "name": "MICROSERVICE_vLoadBalancerMS_v1_0_tcagen2_1_0_0_AV0",
-                                  "version": "1.0.0"
-                                }
-                    ],
-                    "properties": {},
-                    "supportedPolicyTypes": [
-                        {
-                            "name": "onap.policies.monitoring.*",
-                            "version": "1.0.0"
-                        },
-                        {
-                            "name": "onap.policies.Naming",
-                            "version": "1.0.0"
-                        }
-
-                    ]
-                }
-            ],
-            "properties": {}
-        }
-    ]
-}
diff --git a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header b/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header
deleted file mode 100644
index b11784a21..000000000
--- a/src/test/resources/http-cache/example/policy/pap/v1/pdps/.header
+++ /dev/null
@@ -1 +0,0 @@
-{"Transfer-Encoding": "chunked", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file
diff --git a/src/test/resources/http-cache/start_http_cache.sh b/src/test/resources/http-cache/start_http_cache.sh
deleted file mode 100755
index 1f84b56f5..000000000
--- a/src/test/resources/http-cache/start_http_cache.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-###
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2018 AT&T Intellectual Property. All rights
-#                             reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END============================================
-# ===================================================================
-#
-###
-
-echo "Starting HTTP CACHE python script"
-for i in "$@"
-do
-case $i in
-     --python_proxyaddress=*)
-      python_proxyaddress="--proxyaddress ${i#*=}"
-      echo "- Using python_proxyaddress and set it to: $python_proxyaddress"
-      shift # past argument=value
-      ;;
-     --http_proxyaddress=*)
-      export http_proxy="${i#*=}"
-      export https_proxy="${i#*=}"
-      echo "- Defining http_proxy/https_proxy env variables to: $http_proxy"
-      shift # past argument=value
-      ;;
-     -?|--help|-help)
-      echo "Usage: $(basename $0) [--http_proxyaddress=<http://proxy_address:port>] [--python_proxyaddress=<python_simulator_address:port>]"
-      echo "--http_proxyaddress Set the http_proxy/https_proxy in the script before running python"
-      echo "--python_proxyaddress <python_simulator_address:port>, like localhost:8080 and will be set as --proxyaddress, this is the adress returned by DCAE simulator response"
-      exit 2
-      ;;
-esac
-done
-
-echo 'Installing requests packages for Python'
-pip install --no-cache-dir requests
-echo 'Executing the Http proxy in Cache mode only'
-python -u third_party_proxy.py --port 8080 --root /usr/src/http-cache-app/data-cache $python_proxyaddress
diff --git a/src/test/resources/http-cache/third_party_proxy.py b/src/test/resources/http-cache/third_party_proxy.py
deleted file mode 100755
index 7fe316852..000000000
--- a/src/test/resources/http-cache/third_party_proxy.py
+++ /dev/null
@@ -1,497 +0,0 @@
-#!/usr/bin/env python2
-###
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2018 AT&T Intellectual Property. All rights
-#                             reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END============================================
-# ===================================================================
-#
-###
-
-import json
-import requests
-import os
-import errno
-import sys
-import SimpleHTTPServer
-import SocketServer
-import argparse
-import tempfile
-import signal
-import uuid
-import shutil
-
-parser = argparse.ArgumentParser(description="3rd party Cache & Replay")
-parser.add_argument("--username", "-u", type=str, help="Set the username for contacting 3rd party - only used for GET")
-parser.add_argument("--password", "-p", type=str, help="Set the password for contacting 3rd party - only used for GET")
-parser.add_argument("--root",     "-r", default=tempfile.mkdtemp(), type=str, help="Root folder for the proxy cache")
-parser.add_argument("--temp",     "-t", default=tempfile.mkdtemp(), type=str, help="Temp folder for the generated content")
-parser.add_argument("--proxy"         , type=str, help="Url of the  Act as a proxy. If not set, this script only uses the cache and will return a 404 if files aren't found")
-parser.add_argument("--port",     "-P", type=int, default="8081", help="Port on which the proxy should listen to")
-parser.add_argument("--verbose",  "-v", type=bool, help="Print more information in case of error")
-parser.add_argument("--proxyaddress","-a", type=str, help="Address of this proxy, generally either third-party-proxy:8085 or localhost:8085 depending if started with docker-compose or not")
-options = parser.parse_args()
-
-
-PORT = options.port
-HOST = options.proxy
-AUTH = (options.username, options.password)
-HEADERS = {'X-ECOMP-InstanceID':'CLAMP'}
-CACHE_ROOT = str(options.root)
-TMP_ROOT = str(options.temp)
-PROXY_ADDRESS=str(options.proxyaddress)
-
-def signal_handler(signal_sent, frame):
-    global httpd
-    if signal_sent == signal.SIGINT:
-        print('Got Ctrl-C (SIGINT)')
-        httpd.socket.close()
-        httpd.shutdown()
-        httpd.server_close()
-
-class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler):
-    def print_headers(self):
-        for header,value in self.headers.items():
-            print("header: %s : %s" % (header, value))
-
-    def check_credentials(self):
-        pass
-
-    def _send_content(self, header_file, content_file):
-        self.send_response(200)
-        with open(header_file, 'rb') as f:
-            headers = json.load(f)
-            for key,value in headers.items():
-                if key in ('Transfer-Encoding',):
-                    continue
-                self.send_header(key, value)
-            self.end_headers()
-        with open(content_file,'rb') as f:
-            fc = f.read()
-            self.wfile.write(fc)
-
-    def _write_cache(self,cached_file_folder, header_file, content_file, response):
-        os.makedirs(cached_file_folder, 0777)
-        with open(content_file, 'w') as f:
-            f.write(response.raw.read())
-        with open(header_file, 'w') as f:
-            json.dump(dict(response.raw.headers), f)
-    # Entry point of the code
-    def _get_cached_file_folder_name(self,folder):
-        cached_file_folder = '%s/%s' % (folder, self.path,)
-        print("Cached file name before escaping : %s" % cached_file_folder)
-        cached_file_folder = cached_file_folder.replace('<','&#60;').replace('>','&#62;').replace('?','&#63;').replace('*','&#42;').replace('\\','&#42;').replace(':','&#58;').replace('|','&#124;')
-        print("Cached file name after escaping (used for cache storage) : %s" % cached_file_folder)
-        return cached_file_folder
-    
-    def _get_cached_content_file_name(self,cached_file_folder):
-        return "%s/.file" % (cached_file_folder,)
-    
-    def _get_cached_header_file_name(self,cached_file_folder):
-        return "%s/.header" % (cached_file_folder,)
-    
-    def _execute_content_generated_cases(self,http_type):
-     print("Testing special cases, cache files will be sent to :" +TMP_ROOT)
-     cached_file_folder = self._get_cached_file_folder_name(TMP_ROOT)
-     cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-     cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-     _file_available = os.path.exists(cached_file_content)
-    
-     if self.path.startswith("/dcae-service-types?asdcResourceId=") and http_type == "GET":
-        if not _file_available:
-            print "self.path start with /dcae-service-types?asdcResourceId=, generating response json..."
-            uuidGenerated = str(uuid.uuid4())
-            typeId = "typeId-" + uuidGenerated
-            typeName = "typeName-" + uuidGenerated
-            print "typeId generated: " + typeName + " and typeName: "+ typeId
-            jsonGenerated = "{\"totalCount\":1, \"items\":[{\"typeId\":\"" + typeId + "\", \"typeName\":\"" + typeName +"\"}]}"
-            print "jsonGenerated: " + jsonGenerated
-    
-            os.makedirs(cached_file_folder, 0777)
-            with open(cached_file_header, 'w') as f:
-                f.write("{\"Content-Length\": \"" + str(len(jsonGenerated)) + "\", \"Content-Type\": \"application/json\"}")
-            with open(cached_file_content, 'w') as f:
-                f.write(jsonGenerated)
-        return True
-     elif self.path.startswith("/dcae-operationstatus/install") and http_type == "GET":
-        if not _file_available:
-            print "self.path start with /dcae-operationstatus/install, generating response json..."
-            jsonGenerated =  "{\"operationType\": \"install\", \"status\": \"succeeded\"}"
-            print "jsonGenerated: " + jsonGenerated
-    
-            try:
-                os.makedirs(cached_file_folder, 0777)
-            except OSError as e:
-                if e.errno != errno.EEXIST:
-                    raise
-                print(cached_file_folder+" already exists")
-    
-            with open(cached_file_header, 'w') as f:
-                f.write("{\"Content-Length\": \"" + str(len(jsonGenerated)) + "\", \"Content-Type\": \"application/json\"}")
-            with open(cached_file_content, 'w') as f:
-                f.write(jsonGenerated)
-        return True
-     elif self.path.startswith("/dcae-operationstatus/uninstall") and http_type == "GET":
-        if not _file_available:
-            print "self.path start with /dcae-operationstatus/uninstall, generating response json..."
-            jsonGenerated =  "{\"operationType\": \"uninstall\", \"status\": \"succeeded\"}"
-            print "jsonGenerated: " + jsonGenerated
-    
-            try:
-                os.makedirs(cached_file_folder, 0777)
-            except OSError as e:
-                if e.errno != errno.EEXIST:
-                    raise
-                print(cached_file_folder+" already exists")
-    
-            with open(cached_file_header, 'w') as f:
-                f.write("{\"Content-Length\": \"" + str(len(jsonGenerated)) + "\", \"Content-Type\": \"application/json\"}")
-            with open(cached_file_content, 'w') as f:
-                f.write(jsonGenerated)
-        return True
-     elif self.path.startswith("/sdc/v1/catalog/services/") and http_type == "POST":
-        if not _file_available:
-            print "self.path start with /sdc/v1/catalog/services/, generating response json..."
-            jsondata = json.loads(self.data_string)
-            jsonGenerated = "{\"artifactName\":\"" + jsondata['artifactName'] + "\",\"artifactType\":\"" + jsondata['artifactType'] + "\",\"artifactURL\":\"" + self.path + "\",\"artifactDescription\":\"" + jsondata['description'] + "\",\"artifactChecksum\":\"ZjJlMjVmMWE2M2M1OTM2MDZlODlmNTVmZmYzNjViYzM=\",\"artifactUUID\":\"" + str(uuid.uuid4()) + "\",\"artifactVersion\":\"1\"}"
-            print "jsonGenerated: " + jsonGenerated
-    
-            os.makedirs(cached_file_folder, 0777)
-            with open(cached_file_header, 'w') as f:
-                f.write("{\"Content-Length\": \"" + str(len(jsonGenerated)) + "\", \"Content-Type\": \"application/json\"}")
-            with open(cached_file_content, 'w') as f:
-                f.write(jsonGenerated)
-        return True
-     elif self.path.startswith("/dcae-deployments/") and http_type == "PUT":
-            print "self.path start with /dcae-deployments/ DEPLOY, generating response json..."
-            #jsondata = json.loads(self.data_string)
-            jsonGenerated = "{\"operationType\":\"install\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/install?test=test\"}}"
-            print "jsonGenerated: " + jsonGenerated
-            if not os.path.exists(cached_file_folder):
-                os.makedirs(cached_file_folder, 0777)
-            with open(cached_file_header, 'w+') as f:
-                f.write("{\"Content-Length\": \"" + str(len(jsonGenerated)) + "\", \"Content-Type\": \"application/json\"}")
-            with open(cached_file_content, 'w+') as f:
-                f.write(jsonGenerated)
-        	return True
-     elif self.path.startswith("/dcae-deployments/") and http_type == "DELETE":
-            print "self.path start with /dcae-deployments/ UNDEPLOY, generating response json..."
-            #jsondata = json.loads(self.data_string)
-            jsonGenerated = "{\"operationType\":\"uninstall\",\"status\":\"processing\",\"links\":{\"status\":\"http:\/\/" + PROXY_ADDRESS + "\/dcae-operationstatus/uninstall?test=test\"}}"
-            print "jsonGenerated: " + jsonGenerated
-            if not os.path.exists(cached_file_folder):
-                os.makedirs(cached_file_folder, 0777)
-            with open(cached_file_header, 'w+') as f:
-                f.write("{\"Content-Length\": \"" + str(len(jsonGenerated)) + "\", \"Content-Type\": \"application/json\"}")
-            with open(cached_file_content, 'w+') as f:
-                f.write(jsonGenerated)
-            return True
-     elif (self.path.startswith("/pdp/api/") and (http_type == "PUT" or http_type == "DELETE")) or (self.path.startswith("/pdp/api/policyEngineImport") and http_type == "POST"):
-        print "self.path start with /pdp/api/, copying body to response ..."
-        if not os.path.exists(cached_file_folder):
-            os.makedirs(cached_file_folder, 0777)
-        with open(cached_file_header, 'w+') as f:
-            f.write("{\"Content-Length\": \"" + str(len(self.data_string)) + "\", \"Content-Type\": \""+str(self.headers['Content-Type'])+"\"}")
-        with open(cached_file_content, 'w+') as f:
-            f.write(self.data_string)
-        return True
-     elif self.path.startswith("/policy/api/v1/policytypes/") and http_type == "POST":
-        print "self.path start with POST new policy API /pdp/api/, copying body to response ..."
-        if not os.path.exists(cached_file_folder):
-            os.makedirs(cached_file_folder, 0777)
-        with open(cached_file_header, 'w+') as f:
-            f.write("{\"Content-Length\": \"" + str(len(self.data_string)) + "\", \"Content-Type\": \""+str(self.headers['Content-Type'])+"\"}")
-        with open(cached_file_content, 'w+') as f:
-            f.write(self.data_string)
-        return True
-     elif self.path.startswith("/policy/api/v1/policytypes/") and http_type == "DELETE":
-        print "self.path start with DELETE new policy API /policy/api/v1/policytypes/ ..."
-        if not os.path.exists(cached_file_folder):
-            os.makedirs(cached_file_folder, 0777)
-    
-        with open(cached_file_header, 'w+') as f:
-                f.write("{\"Content-Length\": \"" + str(len("")) + "\", \"Content-Type\": \""+str("")+"\"}")
-        with open(cached_file_content, 'w+') as f:
-                f.write(self.data_string)
-        return True
-     elif self.path.startswith("/policy/pap/v1/pdps/policies") and http_type == "POST":
-        print "self.path start with POST new policy API /policy/pap/v1/pdps/ ..."
-        if not os.path.exists(cached_file_folder):
-            os.makedirs(cached_file_folder, 0777)
-        with open(cached_file_header, 'w+') as f:
-                f.write("{\"Content-Length\": \"" + str(len("")) + "\", \"Content-Type\": \""+str("")+"\"}")
-        with open(cached_file_content, 'w+') as f:
-                f.write(self.data_string)
-        return True
-     elif (self.path.startswith("/policy/pap/v1/policies/deployed/")) and http_type == "GET":
-        print "self.path start with /policy/api/v1/policytypes/, generating response json..."
-        jsonGenerated =  "{\"policyTypeId\": \"onap.policies.controlloop.operational\",\"policyTypeVersion\": \"1.0.0\",\"policyId\": \"OPERATIONAL_z711F_v1_0_ResourceInstanceName1_tca\"}"
-        print "jsonGenerated: " + jsonGenerated
-        if not os.path.exists(cached_file_folder):
-            os.makedirs(cached_file_folder, 0777)
-
-        with open(cached_file_header, 'w') as f:
-            f.write("{\"Content-Length\": \"" + str(len(jsonGenerated)) + "\", \"Content-Type\": \"application/json\"}")
-        with open(cached_file_content, 'w') as f:
-            f.write(jsonGenerated)
-        return True
-     elif self.path.startswith("/dcae-service-types") and http_type == "GET":
-        if not _file_available:
-            self.path = "/dcae-service-types"
-            cached_file_folder = '%s/%s' % (TMP_ROOT, self.path)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-            print "self.path start with /dcae-service-types, generating response json..."
-            response = "{\"links\": {\"previousLink\": {\"title\": \"string\",\"rel\": \"string\",\"uri\": \"string\",\"uriBuilder\": {},\"rels\": [\"string\"],\"params\": {\"additionalProp1\": \"string\",\"additionalProp2\": \"string\",\"additionalProp3\": \"string\"},\"type\": \"string\"},\"nextLink\": {\"title\": \"string\",\"rel\": \"string\",\"uri\": \"string\",\"uriBuilder\": {},\"rels\": [\"string\"],\"params\": {\"additionalProp1\": \"string\",\"additionalProp2\": \"string\",\"additionalProp3\": \"string\"},\"type\": \"string\"}},\"totalCount\": 1,\"items\": [{\"owner\": \"testOwner\",\"application\": \"testApplication\",\"component\": \"testComponent\",\"typeName\": \"testTypeName\",\"typeVersion\": 0,\"blueprintTemplate\": \"testBlueprintTemplate\",\"serviceIds\": [\"serviceId1\", \"serviceId2\"],\"vnfTypes\": [\"vnfType1\", \"vnfType2\"],\"serviceLocations\": [\"serviceLocation1\", \"serviceLocation2\"],\"asdcServiceId\": \"testAsdcServiceId\",\"asdcResourceId\": \"0\",\"asdcServiceURL\": \"testAsdcServiceURL\",\"typeId\": \"testtypeId\",\"selfLink\": {\"title\": \"selfLinkTitle\",\"rel\": \"selfLinkRel\",\"uri\": \"selfLinkUri\",\"uriBuilder\": {},\"rels\": [\"string\"],\"params\": {\"additionalProp1\": \"string\",\"additionalProp2\": \"string\",\"additionalProp3\": \"string\"},\"type\": \"string\"},\"created\": \"2020-01-22T09:38:15.436Z\",\"deactivated\": \"2020-01-22T09:38:15.437Z\"},{\"owner\": \"testOwner2\",\"application\": \"testApplication1\",\"component\": \"testComponent2\",\"typeName\": \"testTypeName2\",\"typeVersion\": 0,\"blueprintTemplate\": \"testBlueprintTemplate2\",\"serviceIds\": [\"serviceId3\", \"serviceId4\"],\"vnfTypes\": [\"vnfType13\", \"vnfType4\"],\"serviceLocations\": [\"serviceLocation3\", \"serviceLocation4\"],\"asdcServiceId\": \"testAsdcServiceId\",\"asdcResourceId\": \"1\",\"asdcServiceURL\": \"testAsdcServiceURL2\",\"typeId\": \"testtypeId2\",\"selfLink\": {\"title\": \"selfLinkTitle\",\"rel\": \"selfLinkRel\",\"uri\": \"selfLinkUri\",\"uriBuilder\": {},\"rels\": [\"string\"],\"params\": {\"additionalProp1\": \"string\",\"additionalProp2\": \"string\",\"additionalProp3\": \"string\"},\"type\": \"string\"},\"created\": \"2020-01-22T09:38:15.436Z\",\"deactivated\": \"2020-01-22T09:38:15.437Z\"}]}"
-            print "jsonGenerated: " + response
-
-            os.makedirs(cached_file_folder, 0777)
-            with open(cached_file_header, 'w') as f:
-                f.write("{\"Content-Length\": \"" + str(len(response)) + "\", \"Content-Type\": \"application/json\"}")
-            with open(cached_file_content, 'w') as f:
-                f.write(response)
-        return True
-     else:
-        return False
-
-    
-    def do_GET(self):
-        cached_file_folder = ""
-        cached_file_content =""
-        cached_file_header=""
-        print("\n\n\nGot a GET request for %s " % self.path)
-
-        self.print_headers()
-        self.check_credentials()
-        # Verify if it's a special case
-        is_special = self._execute_content_generated_cases("GET")
-        if is_special:
-            cached_file_folder = self._get_cached_file_folder_name(TMP_ROOT)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-        else:
-            cached_file_folder = self._get_cached_file_folder_name(CACHE_ROOT)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-
-        _file_available = os.path.exists(cached_file_content)
-
-        if not _file_available:
-            print("Request for data currently not present in cache: %s" % (cached_file_folder,))
-
-            if not HOST:
-                self.send_response(404)
-                self.end_headers()
-                self.wfile.write('404 Not found, no remote HOST specified on the emulator !!!')
-                print("HOST value is: %s " % (options.proxy))
-                return "404 Not found, no remote HOST specified on the emulator !!!"
-
-            url = '%s%s' % (HOST, self.path)
-            response = requests.get(url, auth=AUTH, headers=HEADERS, stream=True)
-
-            if response.status_code == 200:
-                self._write_cache(cached_file_folder, cached_file_header, cached_file_content, response)
-            else:
-                print('Error when requesting file :')
-                print('Requested url : %s' % (url,))
-                print('Status code : %s' % (response.status_code,))
-                print('Content : %s' % (response.content,))
-                self.send_response(response.status_code)
-                self.end_headers()
-                self.wfile.write('404 Not found, nothing found on the remote server !!!')
-                return response.content
-        else:
-            print("Request for data currently present in cache: %s" % (cached_file_folder,))
-            print("HOST value is: %s " % (HOST))
-
-        self._send_content(cached_file_header, cached_file_content)
-
-        if self.path.startswith("/dcae-service-types?asdcResourceId="):
-            print "DCAE case deleting folder created " + cached_file_folder
-            shutil.rmtree(cached_file_folder, ignore_errors=False, onerror=None)
-        elif self.path.startswith("/dcae-service-types"):
-            print "DCAE case deleting folder created " + cached_file_folder
-            shutil.rmtree(cached_file_folder, ignore_errors=False, onerror=None)
-        else:
-            print "NOT in DCAE case deleting folder created " + cached_file_folder
-
-    def do_POST(self):
-        cached_file_folder = ""
-        cached_file_content =""
-        cached_file_header=""
-        print("\n\n\nGot a POST for %s" % self.path)
-        self.check_credentials()
-        self.data_string = self.rfile.read(int(self.headers['Content-Length']))
-        print("data-string:\n %s" % self.data_string)
-        print("self.headers:\n %s" % self.headers)
-
-        is_special = self._execute_content_generated_cases("POST")
-        if is_special:
-            cached_file_folder = self._get_cached_file_folder_name(TMP_ROOT)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-        else:
-            cached_file_folder = self._get_cached_file_folder_name(CACHE_ROOT)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-
-        _file_available = os.path.exists(cached_file_content)
-
-        if not _file_available:
-        
-            if not HOST:
-                self.send_response(404)
-                self.end_headers()
-                self.wfile.write('404 Not found, no remote HOST specified on the emulator !!!')
-                return "404 Not found, no remote HOST specified on the emulator !!!"
-
-            print("Request for data currently not present in cache: %s" % (cached_file_folder,))
-
-            url = '%s%s' % (HOST, self.path)
-            print("url: %s" % (url,))
-            response = requests.post(url, data=self.data_string, headers=self.headers, stream=True)
-
-            if response.status_code == 200:
-                self._write_cache(cached_file_folder, cached_file_header, cached_file_content, response)
-            else:
-                print('Error when requesting file :')
-                print('Requested url : %s' % (url,))
-                print('Status code : %s' % (response.status_code,))
-                print('Content : %s' % (response.content,))
-                self.send_response(response.status_code)
-                self.end_headers()
-                self.wfile.write('404 Not found, nothing found on the remote server !!!')
-                return response.content
-        else:
-            print("Request for data present in cache: %s" % (cached_file_folder,))
-
-        self._send_content(cached_file_header, cached_file_content)
-
-    def do_PUT(self):
-        cached_file_folder = ""
-        cached_file_content =""
-        cached_file_header=""
-        print("\n\n\nGot a PUT for %s " % self.path)
-        self.check_credentials()
-        self.data_string = self.rfile.read(int(self.headers['Content-Length']))
-        print("data-string:\n %s" % self.data_string)
-        print("self.headers:\n %s" % self.headers)
-
-        is_special = self._execute_content_generated_cases("PUT")
-        if is_special:
-            cached_file_folder = self._get_cached_file_folder_name(TMP_ROOT)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-        else:
-            cached_file_folder = self._get_cached_file_folder_name(CACHE_ROOT)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-
-        _file_available = os.path.exists(cached_file_content)
-
-        if not _file_available:
-            if not HOST:
-                self.send_response(404)
-                self.end_headers()
-                self.wfile.write('404 Not found, no remote HOST specified on the emulator !!!')
-                return "404 Not found, no remote HOST specified on the emulator !!!"
-
-            print("Request for data currently not present in cache: %s" % (cached_file_folder,))
-
-            url = '%s%s' % (HOST, self.path)
-            print("url: %s" % (url,))
-            response = requests.put(url, data=self.data_string, headers=self.headers, stream=True)
-
-            if response.status_code == 200:
-                self._write_cache(cached_file_folder, cached_file_header, cached_file_content, response)
-            else:
-                print('Error when requesting file :')
-                print('Requested url : %s' % (url,))
-                print('Status code : %s' % (response.status_code,))
-                print('Content : %s' % (response.content,))
-                self.send_response(response.status_code)
-                self.end_headers()
-                self.wfile.write('404 Not found, nothing found on the remote server !!!')
-                return response.content
-        else:
-            print("Request for data present in cache: %s" % (cached_file_folder,))
-
-        self._send_content(cached_file_header, cached_file_content)
-
-
-    def do_DELETE(self):
-        cached_file_folder = ""
-        cached_file_content =""
-        cached_file_header=""
-        print("\n\n\nGot a DELETE for %s " % self.path)
-        self.check_credentials()
-        if self.headers.get('Content-Length') is not None:
-            self.data_string = self.rfile.read(int(self.headers['Content-Length']))
-        else:
-            self.data_string = "empty generated"
-        print("self.headers:\n %s" % self.headers)
-
-        is_special = self._execute_content_generated_cases("DELETE")
-        if is_special:
-            cached_file_folder = self._get_cached_file_folder_name(TMP_ROOT)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-        else:
-            cached_file_folder = self._get_cached_file_folder_name(CACHE_ROOT)
-            cached_file_content = self._get_cached_content_file_name(cached_file_folder)
-            cached_file_header = self._get_cached_header_file_name(cached_file_folder)
-
-        _file_available = os.path.exists(cached_file_content)
-
-        if not _file_available:
-            if not HOST:
-                self.send_response(404)
-                self.end_headers()
-                self.wfile.write('404 Not found, no remote HOST specified on the emulator !!!')
-                return "404 Not found, no remote HOST specified on the emulator !!!"
-
-            print("Request for data currently not present in cache: %s" % (cached_file_folder,))
-
-            url = '%s%s' % (HOST, self.path)
-            print("url: %s" % (url,))
-            response = requests.put(url, data=self.data_string, headers=self.headers, stream=True)
-
-            if response.status_code == 200:
-                self._write_cache(cached_file_folder, cached_file_header, cached_file_content, response)
-            else:
-                print('Error when requesting file :')
-                print('Requested url : %s' % (url,))
-                print('Status code : %s' % (response.status_code,))
-                print('Content : %s' % (response.content,))
-                self.send_response(response.status_code)
-                self.end_headers()
-                self.wfile.write('404 Not found, nothing found on the remote server !!!')
-                return response.content
-        else:
-            print("Request for data present in cache: %s" % (cached_file_folder,))
-
-        self._send_content(cached_file_header, cached_file_content)
-
-
-
-# Main code that start the HTTP server
-httpd = SocketServer.ForkingTCPServer(('', PORT), Proxy)
-httpd.allow_reuse_address = True
-print "Listening on port "+ str(PORT) + "(Press Ctrl+C/Ctrl+Z to stop HTTPD Caching script)"
-print "Caching folder " + CACHE_ROOT + ", Tmp folder for generated files " + TMP_ROOT 
-signal.signal(signal.SIGINT, signal_handler)
-httpd.serve_forever()
\ No newline at end of file
diff --git a/src/test/resources/https/https-test.properties b/src/test/resources/https/https-test.properties
deleted file mode 100644
index 14079a78e..000000000
--- a/src/test/resources/https/https-test.properties
+++ /dev/null
@@ -1,135 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
-#                             reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END============================================
-# ===================================================================
-#
-###
-
-### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time).
-### (See below for the parameter 'server.http.port' if you want to have both enabled) 
-### To have only HTTP, keep the lines server.ssl.* commented
-### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location
-server.port=${clamp.it.tests.https}
-### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port')
-server.ssl.key-store=classpath:clds/aaf/org.onap.clamp.p12
-server.ssl.key-store-password=enc:WWCxchk4WGBNSvuzLq3MLjMs5ObRybJtts5AI0XD1Vc
-server.ssl.key-password=enc:WWCxchk4WGBNSvuzLq3MLjMs5ObRybJtts5AI0XD1Vc
-server.ssl.key-store-type=PKCS12
-server.ssl.key-alias=clamptest
-
-# The key file used to decode the key store and trust store password
-# If not defined, the key store and trust store password will not be decrypted
-clamp.config.keyFile=classpath:clds/aaf/org.onap.clamp.keyfile
-clamp.config.caCerts=classpath:clds/aaf/ssl/ca-certs.pem
-
-## Config part for Client certificates
-server.ssl.client-auth=want
-server.ssl.trust-store=classpath:clds/aaf/truststoreONAPall.jks
-server.ssl.trust-store-password=enc:iDnPBBLq_EMidXlMa1FEuBR8TZzYxrCg66vq_XfLHdJ
-
-### In order to be user friendly when HTTPS is enabled, 
-### you can add another HTTP port that will be automatically redirected to HTTPS
-### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...)
-server.http-to-https-redirection.port=${clamp.it.tests.http-redirected}
-
-### HTTP Example:
-###--------------
-### server.port=8080
-
-### HTTPS Example:
-### --------------
-### server.port=8443
-### server.ssl.key-store=file:/tmp/mykey.jks
-### server.ssl.key-store-password=mypass
-### server.ssl.key-password=mypass
-
-### HTTP (Redirected to HTTPS) and HTTPS Example:
-### --------------------------------------------
-### server.port=8443           <-- The HTTPS port
-### server.ssl.key-store=file:/tmp/mykey.jks
-### server.ssl.key-store-password=mypass
-### server.ssl.key-password=mypass
-### server.http-to-https-redirection.port=8090  <-- The HTTP port
-
-server.servlet.context-path=/
-#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default, clamp-aaf-authentication,clamp-ssl-config
-
-
-#clds datasource connection details
-spring.datasource.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.url=jdbc:mariadb:sequential://localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647
-spring.datasource.username=clds
-spring.datasource.password=sidnnd83K
-spring.datasource.validationQuery=SELECT 1
-spring.datasource.validationQueryTimeout=20000
-spring.datasource.validationInterval=30000
-spring.datasource.testWhileIdle = true
-spring.datasource.minIdle = 0
-spring.datasource.initialSize=0
-# Automatically test whether a connection provided is good or not
-spring.datasource.testOnBorrow=true
-spring.datasource.ignoreExceptionOnPreLoad=true
-
-camel.springboot.consumer-template-cache-size=1000
-camel.springboot.producer-template-cache-size=1000
-# JMX enabled to have Camel Swagger runtime working
-camel.springboot.jmx-enabled=true
-camel.defaultthreadpool.poolsize=10
-camel.defaultthreadpool.maxpoolsize=20
-camel.defaultthreadpool.maxqueuesize=1000
-camel.defaultthreadpool.keepaliveTime=60
-camel.defaultthreadpool.rejectpolicy=CallerRuns
-camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
-camel.springboot.backlog-tracing=true
-camel.springboot.tracing=true
-camel.springboot.message-history=true
-
-#For EELF logback file
-#com.att.eelf.logging.path=
-com.att.eelf.logging.file=logback-default.xml
-#The log folder that will be used in logback.xml file
-clamp.config.log.path=log
-
-clamp.config.httpclient.socketTimeout=20000
-clamp.config.httpclient.connectTimeout=10000
-
-#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !
-clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl
-clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage
-clamp.config.security.permission.type.cl.event=org.onap.clamp.clds.cl.event
-clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf
-clamp.config.security.permission.type.template=org.onap.clamp.clds.template
-clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
-clamp.config.security.permission.type.policies=org.onap.clamp.clds.policies
-#This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
-clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
-
-#AAF related parameters
-clamp.config.cadi.cadiLoglevel=DEBUG
-clamp.config.cadi.cadiLatitude=10
-clamp.config.cadi.cadiLongitude=10
-clamp.config.cadi.aafLocateUrl=https://aaf-locate:8095
-clamp.config.cadi.oauthTokenUrl= https://AAF_LOCATE_URL/locate/onap.org.osaaf.aaf.token:2.1/token
-clamp.config.cadi.oauthIntrospectUrll=https://AAF_LOCATE_URL/locate/onap.org.osaaf.aaf.introspect:2.1/introspect
-clamp.config.cadi.aafEnv=DEV
-clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
-clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
\ No newline at end of file
diff --git a/src/test/resources/https/keystore-test.jks b/src/test/resources/https/keystore-test.jks
deleted file mode 100644
index 04ad3b114..000000000
--- a/src/test/resources/https/keystore-test.jks
+++ /dev/null
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
deleted file mode 100644
index 97a8982a9..000000000
--- a/src/test/resources/logback.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- Empty Configuration to prevent creating log files by Units Tests (e.g LoggingUtilsTest) ! -->
-<configuration>
-    <jmxConfigurator />
-    <!-- Example evaluator filter applied against console appender -->
-    <property
-        name="p_tim"
-        value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}" />
-    <property
-        name="p_lvl"
-        value="%level" />
-    <property
-        name="p_log"
-        value="%logger" />
-    <property
-        name="p_mdc"
-        value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}" />
-    <property
-        name="p_msg"
-        value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}" />
-    <property
-        name="p_exc"
-        value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}" />
-    <property
-        name="p_mak"
-        value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}" />
-    <property
-        name="p_thr"
-        value="%thread" />
-    <property
-        name="defaultPattern"
-        value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n" />
-    <property
-        name="debugPattern"
-        value="%nopexception${p_tim}|${p_lvl}|${p_mdc}|${p_exc}|%msg%n" />
-
-    <!-- Example evaluator filter applied against console appender -->
-    <appender
-        name="STDOUT"
-        class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-    <logger
-        name="org.onap.aaf"
-        level="DEBUG">
-        <appender-ref ref="STDOUT" />
-    </logger>
-    <logger
-        name="org.apache"
-        level="DEBUG">
-        <appender-ref ref="STDOUT" />
-    </logger>
-    <!-- Spring related loggers -->
-    <logger
-        name="org.springframework"
-        level="DEBUG">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <!-- CLDS related loggers -->
-    <logger
-        name="org.onap.policy.clamp"
-        level="DEBUG">
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <!-- CLDS related loggers -->
-    <logger
-        name="com.att.eelf.error"
-        level="OFF">
-        <appender-ref ref="STDOUT" />
-    </logger>
-   
-    <logger
-        name="ch.qos.logback.classic"
-        level="INFO" >
-        <appender-ref ref="STDOUT" />
-    </logger>
-    <logger
-        name="ch.qos.logback.core"
-        level="INFO" >
-        <appender-ref ref="STDOUT" />
-    </logger>
-
-    <!-- logback jms appenders & loggers definition ends here -->
-
-    <root level="DEBUG">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>
diff --git a/src/test/resources/robotframework/Dockerfile b/src/test/resources/robotframework/Dockerfile
deleted file mode 100644
index 03d180c5e..000000000
--- a/src/test/resources/robotframework/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM  ppodgorsek/robot-framework:3.8.0
-
-USER root
-COPY requirements.txt .
-RUN pip3 install --no-cache-dir -r requirements.txt
\ No newline at end of file
diff --git a/src/test/resources/robotframework/requirements.txt b/src/test/resources/robotframework/requirements.txt
deleted file mode 100644
index 2ae8f4500..000000000
--- a/src/test/resources/robotframework/requirements.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-certifi
-chardet
-idna
-requests
-urllib3
-robotframework-extendedrequestslibrary
diff --git a/src/test/resources/robotframework/robotframework-test.properties b/src/test/resources/robotframework/robotframework-test.properties
deleted file mode 100644
index fed074198..000000000
--- a/src/test/resources/robotframework/robotframework-test.properties
+++ /dev/null
@@ -1,180 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP POLICY-CLAMP
-# ================================================================================
-# Copyright (C) 2017-2018, 2021 AT&T Intellectual Property. All rights
-#                             reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END============================================
-# ===================================================================
-#
-###
-
-### Set the port for HTTP or HTTPS protocol (Controlled by Spring framework, only one at a time).
-### (See below for the parameter 'server.http.port' if you want to have both enabled)
-### To have only HTTP, keep the lines server.ssl.* commented
-### To have only HTTPS enabled, uncomment the server.ssl.* lines and specify a right keystore location
-server.port=${clamp.it.tests.robotframework.http}
-### Settings for HTTPS (this automatically enables the HTTPS on the port 'server.port')
-#server.ssl.key-store=file:/tmp/mykey.jks
-#server.ssl.key-store-password=pass
-#server.ssl.key-password=pass
-
-clamp.config.keyFile=classpath:clds/aaf/org.onap.clamp.keyfile
-
-### In order to be user friendly when HTTPS is enabled,
-### you can add another HTTP port that will be automatically redirected to HTTPS
-### by enabling this parameter (server.http.port) and set it to another port (80 or 8080, 8090, etc ...)
-#server.http-to-https-redirection.port=8090
-
-### HTTP Example:
-###--------------
-### server.port=8080
-
-### HTTPS Example:
-### --------------
-### server.port=8443
-### server.ssl.key-store=file:/tmp/mykey.jks
-### server.ssl.key-store-password=mypass
-### server.ssl.key-password=mypass
-
-### HTTP (Redirected to HTTPS) and HTTPS Example:
-### --------------------------------------------
-### server.port=8443           <-- The HTTPS port
-### server.ssl.key-store=file:/tmp/mykey.jks
-### server.ssl.key-store-password=mypass
-### server.ssl.key-password=mypass
-### server.http-to-https-redirection.port=8090  <-- The HTTP port
-
-server.servlet.context-path=/
-#Modified engine-rest applicationpath
-spring.profiles.active=clamp-default,clamp-default-user
-spring.http.converters.preferred-json-mapper=gson
-
-#The max number of active threads in this pool
-server.tomcat.max-threads=200
-#The minimum number of threads always kept alive
-server.tomcat.min-Spare-Threads=25
-#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads
-server.tomcat.max-idle-time=60000
-
-#Servlet context parameters
-server.context_parameters.p-name=value #context parameter with p-name as key and value as value.
-
-camel.springboot.consumer-template-cache-size=1000
-camel.springboot.producer-template-cache-size=1000
-# JMX enabled to have Camel Swagger runtime working
-camel.springboot.jmx-enabled=true
-camel.defaultthreadpool.poolsize=10
-camel.defaultthreadpool.maxpoolsize=20
-camel.defaultthreadpool.maxqueuesize=1000
-camel.defaultthreadpool.keepaliveTime=60
-camel.defaultthreadpool.rejectpolicy=CallerRuns
-camel.springboot.xml-routes=classpath:/clds/camel/routes/*.xml
-camel.springboot.xml-rests=classpath:/clds/camel/rest/*.xml
-camel.springboot.backlog-tracing=true
-camel.springboot.tracing=true
-camel.springboot.message-history=true
-
-#clds datasource connection details
-spring.datasource.driverClassName=org.mariadb.jdbc.Driver
-spring.datasource.url=jdbc:mariadb:sequential://localhost:3306,localhost:${docker.mariadb.port.host}/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3
-spring.datasource.username=clds
-spring.datasource.password=sidnnd83K
-spring.datasource.validationQuery=SELECT 1
-spring.datasource.validationQueryTimeout=20000
-spring.datasource.validationInterval=30000
-spring.datasource.testWhileIdle = true
-spring.datasource.minIdle = 0
-spring.datasource.initialSize=0
-# Automatically test whether a connection provided is good or not
-spring.datasource.testOnBorrow=true
-spring.datasource.ignoreExceptionOnPreLoad=true
-
-spring.jpa.properties.javax.persistence.schema-generation.database.action=none
-#spring.jpa.properties.javax.persistence.schema-generation.create-source=metadata
-#spring.jpa.properties.javax.persistence.schema-generation.scripts.action=create
-#spring.jpa.properties.javax.persistence.schema-generation.scripts.create-target=create.sql
-# disable Hibernate DDL generation because the schema will be generated from a sql script
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
-spring.jpa.properties.hibernate.ddl-auto=validate
-spring.jpa.properties.hibernate.hbm2ddl.delimiter=;
-spring.jpa.properties.hibernate.format_sql=true
-spring.jpa.properties.hibernate.use-new-id-generator-mappings=true
-
-# Whether to enable logging of SQL statements.
-#spring.jpa.show-sql=true
-
-#Async Executor default Parameters
-async.core.pool.size=10
-async.max.pool.size=20
-async.queue.capacity=500
-
-#For EELF logback file
-#com.att.eelf.logging.path=
-clamp.config.logback.filename=logback-default.xml
-#The log folder that will be used in logback.xml file
-clamp.config.log.path=log
-clamp.config.files.systemProperties=classpath:/system.properties
-clamp.config.files.cldsUsers=classpath:/clds/clds-users.json
-clamp.config.files.globalProperties=classpath:/clds/templates/globalProperties.json
-clamp.config.files.sdcController=classpath:/clds/sdc-controllers-config.json
-
-clamp.config.httpclient.socketTimeout=20000
-clamp.config.httpclient.connectTimeout=10000
-
-#
-# Configuration Settings for Policy Engine Components
-clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.policy.api.userName=healthcheck
-clamp.config.policy.api.password=zb!XztG34
-clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.policy.pap.userName=healthcheck
-clamp.config.policy.pap.password=zb!XztG34
-
-# Sdc service properties
-#
-clamp.config.sdc.csarFolder = ${project.build.directory}/sdc-tests
-
-#DCAE Inventory Url Properties
-clamp.config.dcae.inventory.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.dcae.intentory.retry.interval=100
-clamp.config.dcae.intentory.retry.limit=1
-
-#DCAE Deployment Url Properties
-clamp.config.dcae.deployment.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.dcae.deployment.userName=test
-clamp.config.dcae.deployment.password=test
-
-#Define user permission related parameters, the permission type can be changed but MUST be redefined in clds-users.properties in that case !
-clamp.config.security.permission.type.cl=org.onap.clamp.clds.cl
-clamp.config.security.permission.type.cl.manage=org.onap.clamp.clds.cl.manage
-clamp.config.security.permission.type.cl.event=org.onap.clamp.clds.cl.event
-clamp.config.security.permission.type.filter.vf=org.onap.clamp.clds.filter.vf
-clamp.config.security.permission.type.template=org.onap.clamp.clds.template
-clamp.config.security.permission.type.tosca=org.onap.clamp.clds.tosca
-clamp.config.security.permission.type.policies=org.onap.clamp.clds.policies
-#This one indicates the type of instances (dev|prod|perf...), this must be set accordingly in clds-users.properties
-clamp.config.security.permission.instance=dev
-clamp.config.security.authentication.class=org.onap.aaf.cadi.principal.X509Principal, org.onap.aaf.cadi.principal.CachedBasicPrincipal
-
-# Configuration settings for CDS
-clamp.config.cds.url=http://localhost:${docker.http-cache.port.host}
-clamp.config.cds.userName=ccsdkapps
-clamp.config.cds.password=ccsdkapps
-
-## Tosca converter
-clamp.config.tosca.converter.json.schema.templates=classpath:/clds/tosca-converter/templates.json
-clamp.config.tosca.converter.default.datatypes=classpath:/clds/tosca-converter/default-tosca-types.yaml
-clamp.config.tosca.converter.dictionary.support.enabled=true
\ No newline at end of file
diff --git a/src/test/resources/robotframework/tests/01_healthcheck.robot b/src/test/resources/robotframework/tests/01_healthcheck.robot
deleted file mode 100644
index f19266781..000000000
--- a/src/test/resources/robotframework/tests/01_healthcheck.robot
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Settings ***
-Library     Collections
-Library     RequestsLibrary
-Library     OperatingSystem
-Library     json
-Library     OperatingSystem
-*** Variables ***
-${login}                     admin
-${passw}                     password
-*** Keywords ***
-Create the sessions
-*** Test Cases ***
-Get Requests health check ok
-    ${port} =    Get Environment Variable   CLAMP_PORT
-    ${auth}=    Create List     ${login}    ${passw}
-    Create Session   clamp  http://localhost:${port}   auth=${auth}   disable_warnings=1
-    Set Global Variable     ${clamp_session}      clamp
-    ${resp}=    Get Request    ${clamp_session}   /restservices/clds/v1/healthcheck
-    Should Be Equal As Strings  ${resp.status_code}     200
\ No newline at end of file
diff --git a/src/test/resources/robotframework/tests/02_policy_queries.robot b/src/test/resources/robotframework/tests/02_policy_queries.robot
deleted file mode 100644
index 713a39f52..000000000
--- a/src/test/resources/robotframework/tests/02_policy_queries.robot
+++ /dev/null
@@ -1,21 +0,0 @@
-*** Settings ***
-Library     Collections
-Library     RequestsLibrary
-Library     OperatingSystem
-Library     json
-Library     OperatingSystem
-*** Variables ***
-${login}                     admin
-${passw}                     password
-${reponse_pdp_group}         pdpGroupInfo
-*** Keywords ***
-Create the sessions
-*** Test Cases ***
-Get Requests policies list ok
-    ${port} =    Get Environment Variable   CLAMP_PORT
-    ${auth} =    Create List     ${login}    ${passw}
-    Create Session   clamp  http://localhost:${port}   auth=${auth}   disable_warnings=1
-    Set Global Variable     ${clamp_session}      clamp
-    ${response_query}=    Get Request    ${clamp_session}   /restservices/clds/v2/policies
-    Should Be Equal As Strings  ${response_query.status_code}     200
-    Should Contain   ${response_query.text}   ${reponse_pdp_group}
\ No newline at end of file
diff --git a/src/test/resources/tosca/micro-service-policy-payload.json b/src/test/resources/tosca/micro-service-policy-payload.json
deleted file mode 100644
index 2533a5410..000000000
--- a/src/test/resources/tosca/micro-service-policy-payload.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-	"tosca_definitions_version": "tosca_simple_yaml_1_0_0",
-	"topology_template": {
-		"policies": [
-			{
-				"testPolicy": {
-					"type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-					"type_version": "1.0.0",
-					"version": "1.0.0",
-					"metadata": {
-						"policy-id": "testPolicy"
-					},
-					"properties": {
-						"tca_policy": {
-							"domain": "measurementsForVfScaling",
-							"metricsPerEventName": [
-								{
-									"policyVersion": "1.0.0",
-									"thresholds": [
-										{
-											"severity": "CRITICAL",
-											"fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-											"thresholdValue": 1,
-											"closedLoopEventStatus": "ONSET",
-											"closedLoopControlName": "test",
-											"version": "1.0.0",
-											"direction": "LESS"
-										}
-									],
-									"policyName": "test",
-									"controlLoopSchemaType": "VM",
-									"policyScope": "test",
-									"eventName": "test"
-								}
-							]
-						}
-					}
-				}
-			}
-		]
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/micro-service-policy-properties.json b/src/test/resources/tosca/micro-service-policy-properties.json
deleted file mode 100644
index 04fe0cc7f..000000000
--- a/src/test/resources/tosca/micro-service-policy-properties.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "tca_policy": {
-    "domain": "measurementsForVfScaling",
-    "metricsPerEventName": [
-      {
-        "policyVersion": "1.0.0",
-        "thresholds": [
-          {
-            "severity": "CRITICAL",
-            "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-            "thresholdValue": 1,
-            "closedLoopEventStatus": "ONSET",
-            "closedLoopControlName": "test",
-            "version": "1.0.0",
-            "direction": "LESS"
-          }
-        ],
-        "policyName": "test",
-        "controlLoopSchemaType": "VM",
-        "policyScope": "test",
-        "eventName": "test"
-      }
-    ]
-  }
-}
diff --git a/src/test/resources/tosca/model-properties-cds.json b/src/test/resources/tosca/model-properties-cds.json
deleted file mode 100644
index fea658431..000000000
--- a/src/test/resources/tosca/model-properties-cds.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-	"serviceDetails": {
-		"serviceType": "",
-		"namingPolicy": "",
-		"environmentContext": "General_Revenue-Bearing",
-		"serviceEcompNaming": "true",
-		"serviceRole": "",
-		"name": "vLoadBalancerMS",
-		"description": "vLBMS",
-		"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-		"ecompGeneratedNaming": "true",
-		"category": "Network L4+",
-		"type": "Service",
-		"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-		"instantiationType": "A-la-carte"
-	},
-	"resourceDetails": {
-		"CP": {},
-		"VL": {},
-		"VF": {
-			"vLoadBalancerMS 0": {
-				"resourceVendor": "Test",
-				"resourceVendorModelNumber": "",
-				"name": "vLoadBalancerMS",
-				"description": "vLBMS",
-				"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-				"subcategory": "Load Balancer",
-				"category": "Application L4+",
-				"type": "VF",
-				"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-				"version": "1.0",
-				"resourceVendorRelease": "1.0",
-				"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"template-prefix": {
-									"required": true,
-									"type": "list",
-									"entry_schema": {
-										"type": "string"
-									}
-								},
-								"template-prefix-with-complex-type": {
-									"type": "list",
-									"properties": {
-										"prefix-id": {
-											"description": "",
-											"required": false,
-											"type": "string",
-											"status": "",
-											"constraints": [
-												{}
-											],
-											"entry_schema": {
-												"type": ""
-											}
-										}
-									}
-								},
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"private1-prefix-id": {
-											"description": "",
-											"required": false,
-											"type": "string",
-											"status": "",
-											"constraints": [
-												{}
-											],
-											"entry_schema": {
-												"type": ""
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"CR": {},
-		"VFC": {},
-		"PNF": {},
-		"Service": {},
-		"CVFC": {},
-		"Service Proxy": {},
-		"Configuration": {},
-		"AllottedResource": {},
-		"VFModule": {
-			"Vloadbalancerms..vpkg..module-1": {
-				"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-				"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-				"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vpkg",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vdns..module-3": {
-				"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-				"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-				"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vdns",
-				"max_vf_module_instances": 50,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..base_template..module-0": {
-				"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-				"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-				"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-				"min_vf_module_instances": 1,
-				"vf_module_label": "base_template",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Base",
-				"isBase": true,
-				"initial_count": 1,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vlb..module-2": {
-				"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-				"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-				"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vlb",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/model-properties-operational-policy.json b/src/test/resources/tosca/model-properties-operational-policy.json
deleted file mode 100644
index 2a6568528..000000000
--- a/src/test/resources/tosca/model-properties-operational-policy.json
+++ /dev/null
@@ -1,353 +0,0 @@
-{
-	"serviceDetails": {
-		"serviceType": "",
-		"namingPolicy": "",
-		"environmentContext": "General_Revenue-Bearing",
-		"serviceEcompNaming": "true",
-		"serviceRole": "",
-		"name": "vLoadBalancerMS",
-		"description": "vLBMS",
-		"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-		"ecompGeneratedNaming": "true",
-		"category": "Network L4+",
-		"type": "Service",
-		"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-		"instantiationType": "A-la-carte"
-	},
-	"resourceDetails": {
-		"CP": {
-		},
-		"VL": {
-		},
-		"VF": {
-			"vLoadBalancerMS 0": {
-				"resourceVendor": "Test",
-				"resourceVendorModelNumber": "",
-				"name": "vLoadBalancerMS",
-				"description": "vLBMS",
-				"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-				"subcategory": "Load Balancer",
-				"category": "Application L4+",
-				"type": "VF",
-				"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-				"version": "1.0",
-				"resourceVendorRelease": "1.0",
-				"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate": {
-							"inputs": {
-								"activate-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-restconf": {
-							"inputs": {
-								"activate-restconf-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-cli": {
-							"inputs": {
-								"activate-cli-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"assign-activate": {
-							"inputs": {
-								"assign-activate-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"imperative-test-wf": {
-							"inputs": {
-								"imperative-test-wf-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"CR": {
-		},
-		"VFC": {
-		},
-		"PNF": {
-		},
-		"Service": {
-		},
-		"CVFC": {
-		},
-		"Service Proxy": {
-		},
-		"Configuration": {
-		},
-		"AllottedResource": {
-		},
-		"VFModule": {
-			"Vloadbalancerms..vpkg..module-1": {
-				"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-				"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-				"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vpkg",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vdns..module-3": {
-				"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-				"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-				"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vdns",
-				"max_vf_module_instances": 50,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..base_template..module-0": {
-				"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-				"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-				"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-				"min_vf_module_instances": 1,
-				"vf_module_label": "base_template",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Base",
-				"isBase": true,
-				"initial_count": 1,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vlb..module-2": {
-				"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-				"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-				"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vlb",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/model-properties.json b/src/test/resources/tosca/model-properties.json
deleted file mode 100644
index 1c0fe24b4..000000000
--- a/src/test/resources/tosca/model-properties.json
+++ /dev/null
@@ -1,353 +0,0 @@
-{
-	"serviceDetails": {
-		"serviceType": "",
-		"namingPolicy": "",
-		"environmentContext": "General_Revenue-Bearing",
-		"serviceEcompNaming": "true",
-		"serviceRole": "",
-		"name": "vLoadBalancerMS",
-		"description": "vLBMS",
-		"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-		"ecompGeneratedNaming": "true",
-		"category": "Network L4+",
-		"type": "Service",
-		"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-		"instantiationType": "A-la-carte"
-	},
-	"resourceDetails": {
-		"CP": {
-		},
-		"VL": {
-		},
-		"VF": {
-			"vLoadBalancerMS 0": {
-				"resourceVendor": "Test",
-				"resourceVendorModelNumber": "",
-				"name": "vLoadBalancerMS",
-				"description": "vLBMS",
-				"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-				"subcategory": "Load Balancer",
-				"category": "Application L4+",
-				"type": "VF",
-				"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-				"version": "1.0",
-				"resourceVendorRelease": "1.0",
-				"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-restconf": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-cli": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"assign-activate": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"imperative-test-wf": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		},
-		"CR": {
-		},
-		"VFC": {
-		},
-		"PNF": {
-		},
-		"Service": {
-		},
-		"CVFC": {
-		},
-		"Service Proxy": {
-		},
-		"Configuration": {
-		},
-		"AllottedResource": {
-		},
-		"VFModule": {
-			"Vloadbalancerms..vpkg..module-1": {
-				"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-				"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-				"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vpkg",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vdns..module-3": {
-				"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-				"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-				"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vdns",
-				"max_vf_module_instances": 50,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			},
-			"Vloadbalancerms..base_template..module-0": {
-				"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-				"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-				"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-				"min_vf_module_instances": 1,
-				"vf_module_label": "base_template",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Base",
-				"isBase": true,
-				"initial_count": 1,
-				"volume_group": false
-			},
-			"Vloadbalancerms..vlb..module-2": {
-				"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-				"vfModuleModelVersion": "1",
-				"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-				"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-				"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-				"min_vf_module_instances": 0,
-				"vf_module_label": "vlb",
-				"max_vf_module_instances": 1,
-				"vf_module_type": "Expansion",
-				"isBase": false,
-				"initial_count": 0,
-				"volume_group": false
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/constraints.yaml b/src/test/resources/tosca/new-converter/constraints.yaml
deleted file mode 100644
index 7a94ca965..000000000
--- a/src/test/resources/tosca/new-converter/constraints.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0

-policy_types:

-    onap.policies.controlloop.operational.common.Drools:

-        derived_from: onap.policies.controlloop.operational.Common

-        type_version: 1.0.0

-        version: 1.0.0

-        description: Operational policies for Drools PDP

-        properties:

-            controllerName:

-                type: String

-                description: Drools controller properties

-                required: true

-data_types:

-    onap.datatype.controlloop.Operation:

-        derived_from: tosca.datatypes.Root

-        description: An operation supported by an actor

-        properties:

-            id:

-                type: String

-                description: Unique identifier for the operation

-                required: true

-                constraints:

-                - length: 8

-            description:

-                type: Array

-                description: A user-friendly description of the intent for the operation

-                required: false

-                constraints:

-                - min_length: 5

-                - max_length: 7

-            test:

-                type: Integer

-                description: |

-                    Overall timeout for executing all the operations. This timeout should equal or exceed the total

-                    timeout for each operation listed.

-                required: true

-                constraints:

-                    - greater_than: 7

-                    - greater_or_equal: 1

-                    - less_than: 7

-                    - less_or_equal: 1

-            timeout:

-                type: Integer

-                description: The amount of time for the actor to perform the operation.

-                required: true

-                constraints:

-                - valid_values: [3,4,5.5,6,10]

-            retries:

-                type: Integer

-                description: The number of retries the actor should attempt to perform the operation.

-                required: true

-                default: 0

-                constraints:

-                - equal: 5

-            success:

-                type: String

-                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.

-                required: false

-                constraints:

-                - valid_values: [VALID,TERMINATED]

diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml b/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml
deleted file mode 100644
index c2afeccdc..000000000
--- a/src/test/resources/tosca/new-converter/sampleOperationalPolicies.yaml
+++ /dev/null
@@ -1,160 +0,0 @@
-

-tosca_definitions_version: tosca_simple_yaml_1_0_0

-policy_types:

-    onap.policies.controlloop.operational.Common:

-        derived_from: tosca.policies.Root

-        version: 1.0.0

-        description: Operational Policy for Control Loop execution

-        properties:

-            id:

-                type: String

-                description: The unique control loop id.

-                required: true

-            timeout:

-                type: Integer

-                description: |

-                    Overall timeout for executing all the operations. This timeout should equal or exceed the total

-                    timeout for each operation listed.

-                required: true

-            abatement:

-                type: Boolean

-                description: Whether an abatement event message will be expected for the control loop from DCAE.

-                required: true

-                default: false

-            trigger:

-                type: String

-                description: Initial operation to execute upon receiving an Onset event message for the Control Loop.

-                required: true

-            operations:

-                type: List

-                description: List of operations to be performed when Control Loop is triggered.

-                required: true

-                entry_schema:

-                    type: onap.datatype.controlloop.Operation

-    onap.policies.controlloop.operational.common.Drools:

-        derived_from: onap.policies.controlloop.operational.Common

-        type_version: 1.0.0

-        version: 1.0.0

-        description: Operational policies for Drools PDP

-        properties:

-            controllerName:

-                type: String

-                description: Drools controller properties

-                required: false

-data_types:

-    # TBD if this is needed

-    onap.datatype.controlloop.operation.Failure:

-        derived_from: tosca.datatypes.Root

-        description: Captures information of an operational failure performed for control loop

-        properties:

-            messages:

-                type: String

-                description: error message

-                required: true

-            category:

-                type: String

-                description: |

-                    The category the error occurred in. Whether this is a general error from the actor, or the operation

-                    timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the

-                    operation from occuring, or an exception in the system caused the failure.

-                constraints:

-                - valid_values: [error, timeout, retries, guard, exception]

-    onap.datatype.controlloop.Target:

-        derived_from: tosca.datatypes.Root

-        description: Definition for a entity in A&AI to perform a control loop operation on

-        properties:

-            targetType:

-                type: String

-                description: Category for the target type

-                required: true

-                constraints:

-                - valid_values: [VNF, VM, VFMODULE, PNF]

-            entityIds:

-                type: Map

-                description: |

-                    Map of values that identify the resource. If none are provided, it is assumed that the

-                    entity that generated the ONSET event will be the target.

-                required: false

-                entry_schema:

-                    type: String

-    onap.datatype.controlloop.Actor:

-        derived_from: tosca.datatypes.Root

-        description: An actor/operation/target definition

-        properties:

-            actor:

-                type: String

-                description: The actor performing the operation.

-                required: true

-            operation:

-                type: String

-                description: The operation the actor is performing.

-                required: true

-            target:

-                type: String

-                description: The resource the operation should be performed on.

-                required: true

-                metadata:

-                    clamp_possible_values: <string:see clamp project for syntax>

-            payload:

-                type: Map

-                description: Name/value pairs of payload information passed by Policy to the actor

-                required: false

-                entry_schema:

-                    type: String

-    onap.datatype.controlloop.Operation:

-        derived_from: tosca.datatypes.Root

-        description: An operation supported by an actor

-        properties:

-            id:

-                type: String

-                description: Unique identifier for the operation

-                required: true

-            description:

-                type: String

-                description: A user-friendly description of the intent for the operation

-                required: false

-            operation:

-                type: onap.datatype.controlloop.Actor

-                description: The definition of the operation to be performed.

-                required: true

-                metadata:

-                    clamp_possible_values: <string:see clamp project for syntax>

-            timeout:

-                type: Integer

-                description: The amount of time for the actor to perform the operation.

-                required: true

-            retries:

-                type: Integer

-                description: The number of retries the actor should attempt to perform the operation.

-                required: true

-                default: 0

-            success:

-                type: String

-                description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.

-                required: false

-                default: final_success

-            failure:

-                type: String

-                description: Points to the operation to invoke on Actor operation failure.

-                required: false

-                default: final_failure

-            failure_timeout:

-                type: String

-                description: Points to the operation to invoke when the time out for the operation occurs.

-                required: false

-                default: final_failure_timeout

-            failure_retries:

-                type: String

-                description: Points to the operation to invoke when the current operation has exceeded its max retries.

-                required: false

-                default: final_failure_retries

-            failure_exception:

-                type: String

-                description: Points to the operation to invoke when the current operation causes an exception.

-                required: false

-                default: final_failure_exception

-            failure_guard:

-                type: String

-                description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.

-                required: false

-                default: final_failure_guard

diff --git a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml b/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
deleted file mode 100644
index 780acadc2..000000000
--- a/src/test/resources/tosca/new-converter/sampleOperationalPoliciesEXTENTED.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-  onap.policies.controlloop.operational.Common:
-    derived_from: onap.datatype.controlloop.operation.Failure
-    version: 1.0.0
-    description: Operational Policy for Control Loop execution
-    properties:
-      id:
-        type: String
-        description: The unique control loop id.
-        required: true
-      timeout:
-        type: Integer
-        description: |
-          Overall timeout for executing all the operations. This timeout should equal or exceed the total
-          timeout for each operation listed.
-        required: true
-        constraints:
-          - valid_values: [1, 2, 5]
-          - equal: 5
-          - greater_than: 7
-          - greater_or_equal: 1
-          - less_than: 7
-          - less_or_equal: 1
-      abatement:
-        type: Boolean
-        description: Whether an abatement event message will be expected for the control loop from DCAE.
-        required: true
-        default: false
-      trigger:
-        type: String
-        description: Initial operation to execute upon receiving an Onset event message for the Control Loop.
-        required: true
-      operations:
-        type: List
-        description: List of operations to be performed when Control Loop is triggered.
-        required: true
-        entry_schema:
-          type: onap.datatype.controlloop.Operation
-  onap.policies.controlloop.operational.common.Drools:
-    derived_from: onap.policies.controlloop.operational.Common
-    type_version: 1.0.0
-    version: 1.0.0
-    description: Operational policies for Drools PDP
-    properties:
-      controllerName:
-        type: String
-        description: Drools controller properties
-        required: true
-data_types:
-  # TBD if this is needed
-  onap.datatype.controlloop.operation.Failure:
-    derived_from: onap.datatype.controlloop.Target
-    description: Captures information of an operational failure performed for control loop
-    properties:
-      messages:
-        type: String
-        description: error message
-        required: true
-      category:
-        type: String
-        description: |
-          The category the error occurred in. Whether this is a general error from the actor, or the operation
-          timed out, retries were exhausted in trying to execute the operation, a guard policy prevented the
-          operation from occuring, or an exception in the system caused the failure.
-        constraints:
-          - valid_values: [error, timeout, retries, guard, exception]
-  onap.datatype.controlloop.Target:
-    derived_from: tosca.datatypes.Root
-    description: Definition for a entity in A&AI to perform a control loop operation on
-    properties:
-      targetType:
-        type: String
-        description: Category for the target type
-        required: true
-        constraints:
-          - valid_values: [VNF, VM, VFMODULE, PNF]
-      entityIds:
-        type: Map
-        description: |
-          Map of values that identify the resource. If none are provided, it is assumed that the
-          entity that generated the ONSET event will be the target.
-        required: false
-        entry_schema:
-          type: String
-  onap.datatype.controlloop.Actor:
-    derived_from: tosca.datatypes.Root
-    description: An actor/operation/target definition
-    properties:
-      actor:
-        type: String
-        description: The actor performing the operation.
-        required: true
-        default: [1,"String",5.5,true]
-      operation:
-        type: String
-        description: The operation the actor is performing.
-        required: true
-      target:
-        type: String
-        description: The resource the operation should be performed on.
-        required: true
-        metadata:
-          clamp_possible_values: <string:see clamp project for syntax>
-      payload:
-        type: Map
-        description: Name/value pairs of payload information passed by Policy to the actor
-        required: false
-        entry_schema:
-          type: String
-  onap.datatype.controlloop.Operation:
-    derived_from: tosca.datatypes.Root
-    description: An operation supported by an actor
-    properties:
-      id:
-        type: String
-        description: Unique identifier for the operation
-        required: true
-      description:
-        type: Array
-        description: A user-friendly description of the intent for the operation
-        required: false
-        constraints:
-          - min_length: 5
-          - max_length: 7
-          - length: 1
-      operation:
-        type: onap.datatype.controlloop.Actor
-        description: The definition of the operation to be performed.
-        required: true
-        metadata:
-          clamp_possible_values: <string:see clamp project for syntax>
-      timeout:
-        type: Integer
-        description: The amount of time for the actor to perform the operation.
-        required: true
-        constraints:
-          - valid_values: [3, 4, 5.5, 6, 10]
-      retries:
-        type: Integer
-        description: The number of retries the actor should attempt to perform the operation.
-        required: true
-        default: 0
-      success:
-        type: String
-        description: Points to the operation to invoke on success. A value of "final_success" indicates and end to the operation.
-        required: false
-        default: final_success
-      failure:
-        type: String
-        description: Points to the operation to invoke on Actor operation failure.
-        required: false
-        default: final_failure
-      failure_timeout:
-        type: String
-        description: Points to the operation to invoke when the time out for the operation occurs.
-        required: false
-        default: final_failure_timeout
-      failure_retries:
-        type: String
-        description: Points to the operation to invoke when the current operation has exceeded its max retries.
-        required: false
-        default: final_failure_retries
-      failure_exception:
-        type: String
-        description: Points to the operation to invoke when the current operation causes an exception.
-        required: false
-        default: final_failure_exception
-      failure_guard:
-        type: String
-        description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
-        required: false
-        default: final_failure_guard
diff --git a/src/test/resources/tosca/new-converter/tca-with-metadata.json b/src/test/resources/tosca/new-converter/tca-with-metadata.json
deleted file mode 100644
index 3a700c8ee..000000000
--- a/src/test/resources/tosca/new-converter/tca-with-metadata.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "title": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-  "type": "object",
-  "required": [],
-  "properties": {
-    "tca_policy": {
-      "type": "object",
-      "description": "TCA Policy JSON",
-      "properties": {
-        "onap.datatypes.monitoring.tca_policy": {
-          "title": "onap.datatypes.monitoring.tca_policy",
-          "type": "object",
-          "required": [
-            "domain",
-            "metricsPerEventName"
-          ],
-          "properties": {
-            "domain": {
-              "type": "string",
-              "description": "Domain name to which TCA needs to be applied",
-              "default": "measurementsForVfScaling",
-              "const": "measurementsForVfScaling"
-            },
-            "metricsPerEventName": {
-              "type": "array",
-              "description": "Contains eventName and threshold details that need to be applied to given eventName",
-              "items": {
-                "title": "onap.datatypes.monitoring.metricsPerEventName",
-                "type": "object",
-                "required": [
-                  "controlLoopSchemaType",
-                  "eventName",
-                  "policyName",
-                  "policyScope",
-                  "policyVersion",
-                  "thresholds",
-                  "context",
-                  "signature"
-                ],
-                "properties": {
-                  "controlLoopSchemaType": {
-                    "type": "string",
-                    "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                    "enum": [
-                      "VM",
-                      "VNF"
-                    ]
-                  },
-                  "eventName": {
-                    "type": "string",
-                    "description": "Event name to which thresholds need to be applied"
-                  },
-                  "policyName": {
-                    "type": "string",
-                    "description": "TCA Policy Scope Name"
-                  },
-                  "policyScope": {
-                    "type": "string",
-                    "description": "TCA Policy Scope"
-                  },
-                  "policyVersion": {
-                    "type": "string",
-                    "description": "TCA Policy Scope Version"
-                  },
-                  "thresholds": {
-                    "type": "array",
-                    "description": "Thresholds associated with eventName",
-                    "items": {
-                      "title": "onap.datatypes.monitoring.thresholds",
-                      "type": "object",
-                      "required": [
-                        "closedLoopControlName",
-                        "closedLoopEventStatus",
-                        "direction",
-                        "fieldPath",
-                        "severity",
-                        "thresholdValue",
-                        "version"
-                      ],
-                      "properties": {
-                        "closedLoopControlName": {
-                          "type": "string",
-                          "description": "Closed Loop Control Name associated with the threshold"
-                        },
-                        "closedLoopEventStatus": {
-                          "type": "string",
-                          "description": "Closed Loop Event Status of the threshold",
-                          "enum": [
-                            "ONSET",
-                            "ABATED"
-                          ]
-                        },
-                        "direction": {
-                          "type": "string",
-                          "description": "Direction of the threshold",
-                          "enum": [
-                            "LESS",
-                            "LESS_OR_EQUAL",
-                            "GREATER",
-                            "GREATER_OR_EQUAL",
-                            "EQUAL"
-                          ]
-                        },
-                        "fieldPath": {
-                          "type": "string",
-                          "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                          "enum": [
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                            "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                            "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                            "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                            "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                          ]
-                        },
-                        "severity": {
-                          "type": "string",
-                          "description": "Threshold Event Severity",
-                          "enum": [
-                            "CRITICAL",
-                            "MAJOR",
-                            "MINOR",
-                            "WARNING",
-                            "NORMAL"
-                          ]
-                        },
-                        "thresholdValue": {
-                          "type": "integer",
-                          "description": "Threshold value for the field Path inside CEF message"
-                        },
-                        "version": {
-                          "type": "string",
-                          "description": "Version number associated with the threshold"
-                        }
-                      }
-                    },
-                    "format": "tabs-top"
-                  },
-                  "context": {
-                    "type": "string",
-                    "description": "TCA Policy Dummy Context",
-                    "enum": [
-                      "PROD"
-                    ],
-                    "options": {
-                      "enum_titles": [
-                        "PROD"
-                      ]
-                    }
-                  },
-                  "signature": {
-                    "title": "onap.datatypes.monitoring.Dummy_Signature",
-                    "type": "object",
-                    "required": [
-                      "filter_clause"
-                    ],
-                    "properties": {
-                      "filter_clause": {
-                        "type": "qbldr",
-                        "description": "Filter Clause",
-                        "minLength": 1,
-                        "qschema": {
-                          "filters": [
-                            {
-                              "type": "string",
-                              "minLength": 1,
-                              "id": "alarmCondition",
-                              "label": "alarmCondition",
-                              "operators": [
-                                "equals"
-                              ]
-                            }
-                          ]
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "format": "tabs-top"
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
deleted file mode 100644
index 4519d5c9f..000000000
--- a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json
+++ /dev/null
@@ -1,577 +0,0 @@
-{
-  "title": "onap.policies.controlloop.operational.common.Apex",
-  "type": "object",
-  "description": "Operational policies for Apex PDP",
-  "required": [
-    "abatement",
-    "operations",
-    "trigger",
-    "timeout",
-    "id",
-    "engineServiceParameters",
-    "eventOutputParameters",
-    "eventInputParameters"
-  ],
-  "properties": {
-    "abatement": {
-      "type": "boolean",
-      "description": "Whether an abatement event message will be expected for the control loop from DCAE.",
-      "default": "false"
-    },
-    "operations": {
-      "type": "array",
-      "description": "List of operations to be performed when Control Loop is triggered.",
-      "items": {
-        "title": "onap.datatype.controlloop.Operation",
-        "type": "object",
-        "description": "An operation supported by an actor",
-        "required": [
-          "id",
-          "operation",
-          "retries",
-          "timeout"
-        ],
-        "properties": {
-          "failure_retries": {
-            "type": "string",
-            "description": "Points to the operation to invoke when the current operation has exceeded its max retries.",
-            "default": "final_failure_retries"
-          },
-          "id": {
-            "type": "string",
-            "description": "Unique identifier for the operation"
-          },
-          "failure_timeout": {
-            "type": "string",
-            "description": "Points to the operation to invoke when the time out for the operation occurs.",
-            "default": "final_failure_timeout"
-          },
-          "failure": {
-            "type": "string",
-            "description": "Points to the operation to invoke on Actor operation failure.",
-            "default": "final_failure"
-          },
-          "operation": {
-            "title": "onap.datatype.controlloop.Actor",
-            "type": "object",
-            "description": "An actor/operation/target definition",
-            "required": [
-              "target",
-              "actor",
-              "operation"
-            ],
-            "properties": {
-              "payload": {
-                "type": "object",
-                "description": "Name/value pairs of payload information passed by Policy to the actor",
-                "anyOf": [
-                  {
-                    "title": "User defined",
-                    "properties": {}
-                  },
-                  {
-                    "title": "resource-assignment",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "activate",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "activate-restconf",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "activate-cli",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "assign-activate",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  },
-                  {
-                    "title": "imperative-test-wf",
-                    "properties": {
-                      "artifact_name": {
-                        "title": "artifact name",
-                        "type": "string",
-                        "default": "baseconfiguration",
-                        "readOnly": true
-                      },
-                      "artifact_version": {
-                        "title": "artifact version",
-                        "type": "string",
-                        "default": "1.0.0",
-                        "readOnly": true
-                      },
-                      "mode": {
-                        "title": "mode",
-                        "type": "string",
-                        "default": "async",
-                        "readOnly": false
-                      },
-                      "data": {
-                        "title": "data",
-                        "type": "string",
-                        "format": "textarea",
-                        "default": "{\"request-id\":\"\",\"service-instance-id\":\"\",\"hostname\":\"\",\"request-info\":{\"prop1\":\"\",\"prop2\":\"\"}}"
-                      }
-                    }
-                  }
-                ]
-              },
-              "target": {
-                "title": "onap.datatype.controlloop.Target",
-                "type": "object",
-                "description": "Definition for a entity in A&AI to perform a control loop operation on",
-                "required": [
-                  "targetType"
-                ],
-                "properties": {
-                  "entityIds": {
-                    "type": "object",
-                    "description": "Map of values that identify the resource. If none are provided, it is assumed that the\nentity that generated the ONSET event will be the target.\n",
-                    "anyOf": [
-                      {
-                        "title": "User defined",
-                        "properties": {}
-                      },
-                      {
-                        "title": "VNF-vLoadBalancerMS 0",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-                            "readOnly": "True"
-                          }
-                        }
-                      },
-                      {
-                        "title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vpkg..module-1",
-                            "readOnly": "True"
-                          },
-                          "modelInvariantId": {
-                            "title": "Model Invariant Id (ModelInvariantUUID)",
-                            "type": "string",
-                            "default": "ca052563-eb92-4b5b-ad41-9111768ce043",
-                            "readOnly": "True"
-                          },
-                          "modelVersionId": {
-                            "title": "Model Version Id (ModelUUID)",
-                            "type": "string",
-                            "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-                            "readOnly": "True"
-                          },
-                          "modelName": {
-                            "title": "Model Name",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vpkg..module-1",
-                            "readOnly": "True"
-                          },
-                          "modelVersion": {
-                            "title": "Model Version",
-                            "type": "string",
-                            "default": "1",
-                            "readOnly": "True"
-                          },
-                          "modelCustomizationId": {
-                            "title": "Customization ID",
-                            "type": "string",
-                            "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-                            "readOnly": "True"
-                          }
-                        }
-                      },
-                      {
-                        "title": "VFMODULE-Vloadbalancerms..vdns..module-3",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vdns..module-3",
-                            "readOnly": "True"
-                          },
-                          "modelInvariantId": {
-                            "title": "Model Invariant Id (ModelInvariantUUID)",
-                            "type": "string",
-                            "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                            "readOnly": "True"
-                          },
-                          "modelVersionId": {
-                            "title": "Model Version Id (ModelUUID)",
-                            "type": "string",
-                            "default": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                            "readOnly": "True"
-                          },
-                          "modelName": {
-                            "title": "Model Name",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vdns..module-3",
-                            "readOnly": "True"
-                          },
-                          "modelVersion": {
-                            "title": "Model Version",
-                            "type": "string",
-                            "default": "1",
-                            "readOnly": "True"
-                          },
-                          "modelCustomizationId": {
-                            "title": "Customization ID",
-                            "type": "string",
-                            "default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-                            "readOnly": "True"
-                          }
-                        }
-                      },
-                      {
-                        "title": "VFMODULE-Vloadbalancerms..base_template..module-0",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "Vloadbalancerms..base_template..module-0",
-                            "readOnly": "True"
-                          },
-                          "modelInvariantId": {
-                            "title": "Model Invariant Id (ModelInvariantUUID)",
-                            "type": "string",
-                            "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-                            "readOnly": "True"
-                          },
-                          "modelVersionId": {
-                            "title": "Model Version Id (ModelUUID)",
-                            "type": "string",
-                            "default": "63734409-f745-4e4d-a38b-131638a0edce",
-                            "readOnly": "True"
-                          },
-                          "modelName": {
-                            "title": "Model Name",
-                            "type": "string",
-                            "default": "Vloadbalancerms..base_template..module-0",
-                            "readOnly": "True"
-                          },
-                          "modelVersion": {
-                            "title": "Model Version",
-                            "type": "string",
-                            "default": "1",
-                            "readOnly": "True"
-                          },
-                          "modelCustomizationId": {
-                            "title": "Customization ID",
-                            "type": "string",
-                            "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-                            "readOnly": "True"
-                          }
-                        }
-                      },
-                      {
-                        "title": "VFMODULE-Vloadbalancerms..vlb..module-2",
-                        "properties": {
-                          "resourceID": {
-                            "title": "Resource ID",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vlb..module-2",
-                            "readOnly": "True"
-                          },
-                          "modelInvariantId": {
-                            "title": "Model Invariant Id (ModelInvariantUUID)",
-                            "type": "string",
-                            "default": "a772a1f4-0064-412c-833d-4749b15828dd",
-                            "readOnly": "True"
-                          },
-                          "modelVersionId": {
-                            "title": "Model Version Id (ModelUUID)",
-                            "type": "string",
-                            "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-                            "readOnly": "True"
-                          },
-                          "modelName": {
-                            "title": "Model Name",
-                            "type": "string",
-                            "default": "Vloadbalancerms..vlb..module-2",
-                            "readOnly": "True"
-                          },
-                          "modelVersion": {
-                            "title": "Model Version",
-                            "type": "string",
-                            "default": "1",
-                            "readOnly": "True"
-                          },
-                          "modelCustomizationId": {
-                            "title": "Customization ID",
-                            "type": "string",
-                            "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-                            "readOnly": "True"
-                          }
-                        }
-                      }
-                    ]
-                  },
-                  "targetType": {
-                    "type": "string",
-                    "description": "Category for the target type",
-                    "enum": [
-                      "VNF",
-                      "VM",
-                      "VFMODULE",
-                      "PNF"
-                    ]
-                  }
-                }
-              },
-              "actor": {
-                "type": "string",
-                "description": "The actor performing the operation.",
-                "enum": [
-                  "SDNR",
-                  "SDNC",
-                  "VFC",
-                  "SO",
-                  "APPC",
-                  "CDS"
-                ],
-                "options": {
-                  "enum_titles": [
-                    "SDNR",
-                    "SDNC",
-                    "VFC",
-                    "SO",
-                    "APPC"
-                  ]
-                }
-              },
-              "operation": {
-                "type": "string",
-                "description": "The operation the actor is performing.",
-                "enum": [
-                  "BandwidthOnDemand",
-                  "VF Module Delete",
-                  "Reroute",
-                  "VF Module Create",
-                  "ModifyConfig",
-                  "Rebuild",
-                  "Restart",
-                  "Migrate",
-                  "Health-Check",
-                  "resource-assignment",
-                  "activate",
-                  "activate-restconf",
-                  "activate-cli",
-                  "assign-activate",
-                  "imperative-test-wf"
-                ],
-                "options": {
-                  "enum_titles": [
-                    "BandwidthOnDemand (SDNC operation)",
-                    "VF Module Delete (SO operation)",
-                    "Reroute (SDNC operation)",
-                    "VF Module Create (SO operation)",
-                    "ModifyConfig (APPC/VFC operation)",
-                    "Rebuild (APPC operation)",
-                    "Restart (APPC operation)",
-                    "Migrate (APPC operation)",
-                    "Health-Check (APPC operation)",
-                    "resource-assignment (CDS operation)",
-                    "activate (CDS operation)",
-                    "activate-restconf (CDS operation)",
-                    "activate-cli (CDS operation)",
-                    "assign-activate (CDS operation)",
-                    "imperative-test-wf (CDS operation)"
-                  ]
-                }
-              }
-            }
-          },
-          "failure_guard": {
-            "type": "string",
-            "description": "Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.",
-            "default": "final_failure_guard"
-          },
-          "retries": {
-            "type": "integer",
-            "description": "The number of retries the actor should attempt to perform the operation.",
-            "default": "0"
-          },
-          "timeout": {
-            "type": "integer",
-            "description": "The amount of time for the actor to perform the operation."
-          },
-          "failure_exception": {
-            "type": "string",
-            "description": "Points to the operation to invoke when the current operation causes an exception.",
-            "default": "final_failure_exception"
-          },
-          "description": {
-            "type": "string",
-            "description": "A user-friendly description of the intent for the operation"
-          },
-          "success": {
-            "type": "string",
-            "description": "Points to the operation to invoke on success. A value of \"final_success\" indicates and end to the operation.",
-            "default": "final_success"
-          }
-        }
-      },
-      "format": "tabs-top"
-    },
-    "trigger": {
-      "type": "string",
-      "description": "Initial operation to execute upon receiving an Onset event message for the Control Loop."
-    },
-    "timeout": {
-      "type": "integer",
-      "description": "Overall timeout for executing all the operations. This timeout should equal or exceed the total\ntimeout for each operation listed.\n"
-    },
-    "id": {
-      "type": "string",
-      "description": "The unique control loop id."
-    },
-    "engineServiceParameters": {
-      "type": "string",
-      "description": "The engine parameters like name, instanceCount, policy implementation, parameters etc."
-    },
-    "eventOutputParameters": {
-      "type": "string",
-      "description": "The event output parameters."
-    },
-    "javaProperties": {
-      "type": "string",
-      "description": "Name/value pairs of properties to be set for APEX if needed."
-    },
-    "eventInputParameters": {
-      "type": "string",
-      "description": "The event input parameters."
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml b/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml
deleted file mode 100644
index 7fe9d5398..000000000
--- a/src/test/resources/tosca/new-converter/tosca_metadata_clamp_possible_values.yaml
+++ /dev/null
@@ -1,184 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-        metadata:
-            policy_model_type: onap.policies.monitoring.cdap.tca.hi.lo.app
-            acronym: tca
-            
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-            context:
-                type: string
-                required: true
-                description: TCA Policy Dummy Context
-                metadata:
-                    clamp_possible_values: Dictionary:Context
-
-            signature:
-                type: onap.datatypes.monitoring.Dummy_Signature
-                description: Signature
-                required: true
-        
-    onap.datatypes.monitoring.Dummy_Signature:
-        derived_from: tosca.datatypes.Root
-        properties:
-            filter_clause:
-                type: string
-                description: Filter Clause
-                required: true
-                metadata:
-                    clamp_possible_values: Dictionary:EventDictionary#Operators
-            
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json b/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
deleted file mode 100644
index 9a9308e3b..000000000
--- a/src/test/resources/tosca/operational-policy-cds-payload-with-list.json
+++ /dev/null
@@ -1,590 +0,0 @@
-{
-  "type": "object",
-  "title": "Configuration",
-  "required": [
-    "operational_policy"
-  ],
-  "properties": {
-    "operational_policy": {
-      "type": "object",
-      "title": "Related Parameters",
-      "required": [
-        "controlLoop",
-        "policies"
-      ],
-      "properties": {
-        "controlLoop": {
-          "type": "object",
-          "title": "Control Loop details",
-          "required": [
-            "timeout",
-            "abatement",
-            "trigger_policy",
-            "controlLoopName"
-          ],
-          "properties": {
-            "timeout": {
-              "type": "string",
-              "title": "Overall Time Limit",
-              "default": "0",
-              "format": "number"
-            },
-            "abatement": {
-              "type": "string",
-              "title": "Abatement",
-              "enum": [
-                "True",
-                "False"
-              ]
-            },
-            "trigger_policy": {
-              "type": "string",
-              "title": "Policy Decision Entry"
-            },
-            "controlLoopName": {
-              "type": "string",
-              "title": "Control loop name",
-              "readOnly": "True"
-            }
-          }
-        },
-        "policies": {
-          "uniqueItems": "true",
-          "id": "policies_array",
-          "type": "array",
-          "title": "Policy Decision Tree",
-          "format": "tabs-top",
-          "items": {
-            "title": "Policy Decision",
-            "type": "object",
-            "id": "policy_item",
-            "headerTemplate": "{{self.id}} - {{self.recipe}}",
-            "format": "categories",
-            "basicCategoryTitle": "recipe",
-            "required": [
-              "id",
-              "retry",
-              "timeout",
-              "actor",
-              "success",
-              "failure",
-              "failure_timeout",
-              "failure_retries",
-              "failure_exception",
-              "failure_guard",
-              "target"
-            ],
-            "properties": {
-              "id": {
-                "default": "Policy 1",
-                "title": "Policy ID",
-                "type": "string"
-              },
-              "retry": {
-                "default": "0",
-                "title": "Number of Retry",
-                "type": "string",
-                "format": "number"
-              },
-              "timeout": {
-                "default": "0",
-                "title": "Timeout",
-                "type": "string",
-                "format": "number"
-              },
-              "actor": {
-                "type": "object",
-                "title": "Actor",
-                "anyOf": [
-                  {
-                    "title": "APPC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "APPC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "Restart",
-                          "Rebuild",
-                          "Migrate",
-                          "Health-Check",
-                          "ModifyConfig"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "SO",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "SO",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "VF Module Create",
-                          "VF Module Delete"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "SDNC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "SDNC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "Reroute",
-                          "BandwidthOnDemand"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "VFC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "ModifyConfig"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "CDS",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "CDS",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "object",
-                        "anyOf": [
-                          {
-                            "title": "user-defined",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "user-defined",
-                                "format": "textarea"
-                              },
-                              "payload": {
-                                "title": "Payload (YAML)",
-                                "type": "string",
-                                "default": "",
-                                "format": "textarea"
-                              }
-                            }
-                          },
-                          {
-                            "title": "resource-assignment",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "resource-assignment",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "template-prefix": {
-                                        "title": "template-prefix",
-                                        "type": "array"
-                                      },
-                                      "template-prefix-with-complex-type": {
-                                        "title": "template-prefix-with-complex-type",
-                                        "type": "array",
-                                        "items": {
-                                          "properties": {
-                                            "prefix-id": {
-                                              "title": "prefix-id",
-                                              "type": "string"
-                                            }
-                                          }
-                                        }
-                                      },
-                                      "private1-prefix-id": {
-                                        "title": "private1-prefix-id",
-                                        "type": "string"
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  }
-                ]
-              },
-              "success": {
-                "default": "final_success",
-                "title": "When Success",
-                "type": "string"
-              },
-              "failure": {
-                "default": "final_failure",
-                "title": "When Failure",
-                "type": "string"
-              },
-              "failure_timeout": {
-                "default": "final_failure_timeout",
-                "title": "When Failure Timeout",
-                "type": "string"
-              },
-              "failure_retries": {
-                "default": "final_failure_retries",
-                "title": "When Failure Retries",
-                "type": "string"
-              },
-              "failure_exception": {
-                "default": "final_failure_exception",
-                "title": "When Failure Exception",
-                "type": "string"
-              },
-              "failure_guard": {
-                "default": "final_failure_guard",
-                "title": "When Failure Guard",
-                "type": "string"
-              },
-              "target": {
-                "type": "object",
-                "required": [
-                  "type",
-                  "resourceID"
-                ],
-                "anyOf": [
-                  {
-                    "title": "User Defined",
-                    "additionalProperties": "True",
-                    "properties": {
-                      "type": {
-                        "title": "Target type",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "VNF",
-                          "VFMODULE",
-                          "VM"
-                        ]
-                      },
-                      "resourceID": {
-                        "title": "Target type",
-                        "type": "string",
-                        "default": ""
-                      }
-                    }
-                  },
-                  {
-                    "title": "User defined",
-                    "properties": {}
-                  },
-                  {
-                    "title": "VNF-vLoadBalancerMS 0",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VNF",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vpkg..module-1",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "ca052563-eb92-4b5b-ad41-9111768ce043",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vpkg..module-1",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vdns..module-3",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vdns..module-3",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vdns..module-3",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..base_template..module-0",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..base_template..module-0",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "63734409-f745-4e4d-a38b-131638a0edce",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..base_template..module-0",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vlb..module-2",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vlb..module-2",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "a772a1f4-0064-412c-833d-4749b15828dd",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vlb..module-2",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-                        "readOnly": "True"
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-json-schema.json b/src/test/resources/tosca/operational-policy-json-schema.json
deleted file mode 100644
index dc6c32fa7..000000000
--- a/src/test/resources/tosca/operational-policy-json-schema.json
+++ /dev/null
@@ -1,936 +0,0 @@
-{
-  "type": "object",
-  "title": "Configuration",
-  "required": [
-    "operational_policy"
-  ],
-  "properties": {
-    "operational_policy": {
-      "type": "object",
-      "title": "Related Parameters",
-      "required": [
-        "controlLoop",
-        "policies"
-      ],
-      "properties": {
-        "controlLoop": {
-          "type": "object",
-          "title": "Control Loop details",
-          "required": [
-            "timeout",
-            "abatement",
-            "trigger_policy",
-            "controlLoopName"
-          ],
-          "properties": {
-            "timeout": {
-              "type": "string",
-              "title": "Overall Time Limit",
-              "default": "0",
-              "format": "number"
-            },
-            "abatement": {
-              "type": "string",
-              "title": "Abatement",
-              "enum": [
-                "True",
-                "False"
-              ]
-            },
-            "trigger_policy": {
-              "type": "string",
-              "title": "Policy Decision Entry"
-            },
-            "controlLoopName": {
-              "type": "string",
-              "title": "Control loop name",
-              "readOnly": "True"
-            }
-          }
-        },
-        "policies": {
-          "uniqueItems": "true",
-          "id": "policies_array",
-          "type": "array",
-          "title": "Policy Decision Tree",
-          "format": "tabs-top",
-          "items": {
-            "title": "Policy Decision",
-            "type": "object",
-            "id": "policy_item",
-            "headerTemplate": "{{self.id}} - {{self.recipe}}",
-            "format": "categories",
-            "basicCategoryTitle": "recipe",
-            "required": [
-              "id",
-              "retry",
-              "timeout",
-              "actor",
-              "success",
-              "failure",
-              "failure_timeout",
-              "failure_retries",
-              "failure_exception",
-              "failure_guard",
-              "target"
-            ],
-            "properties": {
-              "id": {
-                "default": "Policy 1",
-                "title": "Policy ID",
-                "type": "string"
-              },
-              "retry": {
-                "default": "0",
-                "title": "Number of Retry",
-                "type": "string",
-                "format": "number"
-              },
-              "timeout": {
-                "default": "0",
-                "title": "Timeout",
-                "type": "string",
-                "format": "number"
-              },
-              "actor": {
-                "type": "object",
-                "title": "Actor",
-                "anyOf": [
-                  {
-                    "title": "APPC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "APPC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "Restart",
-                          "Rebuild",
-                          "Migrate",
-                          "Health-Check",
-                          "ModifyConfig"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "SO",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "SO",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "VF Module Create",
-                          "VF Module Delete"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "SDNC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "SDNC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "Reroute",
-                          "BandwidthOnDemand"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFC",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "VFC",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "ModifyConfig"
-                        ]
-                      },
-                      "payload": {
-                        "title": "Payload (YAML)",
-                        "type": "string",
-                        "format": "textarea"
-                      }
-                    }
-                  },
-                  {
-                    "title": "CDS",
-                    "type": "object",
-                    "properties": {
-                      "actor": {
-                        "title": "actor",
-                        "type": "string",
-                        "default": "CDS",
-                        "options": {
-                          "hidden": true
-                        }
-                      },
-                      "recipe": {
-                        "title": "recipe",
-                        "type": "object",
-                        "anyOf": [
-                          {
-                            "title": "user-defined",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "user-defined",
-                                "format": "textarea"
-                              },
-                              "payload": {
-                                "title": "Payload (YAML)",
-                                "type": "string",
-                                "default": "",
-                                "format": "textarea"
-                              }
-                            }
-                          },
-                          {
-                            "title": "resource-assignment",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "resource-assignment",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "activate",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "activate",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "activate-restconf",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "activate-restconf",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "activate-cli",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "activate-cli",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "assign-activate",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "assign-activate",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          },
-                          {
-                            "title": "imperative-test-wf",
-                            "type": "object",
-                            "properties": {
-                              "recipe": {
-                                "title": "recipe",
-                                "type": "string",
-                                "default": "imperative-test-wf",
-                                "options": {
-                                  "hidden": true
-                                }
-                              },
-                              "payload": {
-                                "title": "Payload",
-                                "type": "object",
-                                "properties": {
-                                  "artifact_name": {
-                                    "title": "artifact name",
-                                    "type": "string",
-                                    "default": "baseconfiguration",
-                                    "readOnly": "True"
-                                  },
-                                  "artifact_version": {
-                                    "title": "artifact version",
-                                    "type": "string",
-                                    "default": "1.0.0",
-                                    "readOnly": "True"
-                                  },
-                                  "mode": {
-                                    "title": "mode",
-                                    "type": "string",
-                                    "default": "async"
-                                  },
-                                  "data": {
-                                    "title": "data",
-                                    "properties": {
-                                      "request-id": {
-                                        "title": "request-id",
-                                        "type": "string"
-                                      },
-                                      "service-instance-id": {
-                                        "title": "service-instance-id",
-                                        "type": "string"
-                                      },
-                                      "hostname": {
-                                        "title": "hostname",
-                                        "type": "string"
-                                      },
-                                      "request-info": {
-                                        "title": "request-info",
-                                        "type": "object",
-                                        "properties": {
-                                          "prop1": {
-                                            "title": "prop1",
-                                            "type": "string"
-                                          },
-                                          "prop2": {
-                                            "title": "prop2",
-                                            "type": "string"
-                                          }
-                                        }
-                                      }
-                                    }
-                                  }
-                                }
-                              }
-                            }
-                          }
-                        ]
-                      }
-                    }
-                  }
-                ]
-              },
-              "success": {
-                "default": "final_success",
-                "title": "When Success",
-                "type": "string"
-              },
-              "failure": {
-                "default": "final_failure",
-                "title": "When Failure",
-                "type": "string"
-              },
-              "failure_timeout": {
-                "default": "final_failure_timeout",
-                "title": "When Failure Timeout",
-                "type": "string"
-              },
-              "failure_retries": {
-                "default": "final_failure_retries",
-                "title": "When Failure Retries",
-                "type": "string"
-              },
-              "failure_exception": {
-                "default": "final_failure_exception",
-                "title": "When Failure Exception",
-                "type": "string"
-              },
-              "failure_guard": {
-                "default": "final_failure_guard",
-                "title": "When Failure Guard",
-                "type": "string"
-              },
-              "target": {
-                "type": "object",
-                "required": [
-                  "type",
-                  "resourceID"
-                ],
-                "anyOf": [
-                  {
-                    "title": "User Defined",
-                    "additionalProperties": "True",
-                    "properties": {
-                      "type": {
-                        "title": "Target type",
-                        "type": "string",
-                        "default": "",
-                        "enum": [
-                          "VNF",
-                          "VFMODULE",
-                          "VM"
-                        ]
-                      },
-                      "resourceID": {
-                        "title": "Target type",
-                        "type": "string",
-                        "default": ""
-                      }
-                    }
-                  },
-                  {
-                    "title": "User defined",
-                    "properties": {}
-                  },
-                  {
-                    "title": "VNF-vLoadBalancerMS 0",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VNF",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vpkg..module-1",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vpkg..module-1",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "ca052563-eb92-4b5b-ad41-9111768ce043",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vpkg..module-1",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vdns..module-3",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vdns..module-3",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "4fa73b49-8a6c-493e-816b-eb401567b720",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vdns..module-3",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..base_template..module-0",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..base_template..module-0",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "63734409-f745-4e4d-a38b-131638a0edce",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..base_template..module-0",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-                        "readOnly": "True"
-                      }
-                    }
-                  },
-                  {
-                    "title": "VFMODULE-Vloadbalancerms..vlb..module-2",
-                    "properties": {
-                      "type": {
-                        "title": "Type",
-                        "type": "string",
-                        "default": "VFMODULE",
-                        "readOnly": "True"
-                      },
-                      "resourceID": {
-                        "title": "Resource ID",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vlb..module-2",
-                        "readOnly": "True"
-                      },
-                      "modelInvariantId": {
-                        "title": "Model Invariant Id (ModelInvariantUUID)",
-                        "type": "string",
-                        "default": "a772a1f4-0064-412c-833d-4749b15828dd",
-                        "readOnly": "True"
-                      },
-                      "modelVersionId": {
-                        "title": "Model Version Id (ModelUUID)",
-                        "type": "string",
-                        "default": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-                        "readOnly": "True"
-                      },
-                      "modelName": {
-                        "title": "Model Name",
-                        "type": "string",
-                        "default": "Vloadbalancerms..vlb..module-2",
-                        "readOnly": "True"
-                      },
-                      "modelVersion": {
-                        "title": "Model Version",
-                        "type": "string",
-                        "default": "1",
-                        "readOnly": "True"
-                      },
-                      "modelCustomizationId": {
-                        "title": "Customization ID",
-                        "type": "string",
-                        "default": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-                        "readOnly": "True"
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-no-guard-properties.json b/src/test/resources/tosca/operational-policy-no-guard-properties.json
deleted file mode 100644
index fdb1906a4..000000000
--- a/src/test/resources/tosca/operational-policy-no-guard-properties.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"operational_policy": {
-		"controlLoop": {
-			"trigger_policy": "new",
-			"timeout": "0",
-			"abatement": "on",
-			"controlLoopName": "LOOP_iYTIP_v1_0_ResourceInstanceName1_tca"
-		},
-		"policies": [
-			{
-				"id": "new",
-				"recipe": "Restart",
-				"retry": "10",
-				"timeout": "10",
-				"actor": "SO",
-				"payload": "",
-				"success": "",
-				"failure": "",
-				"failure_timeout": "",
-				"failure_retries": "",
-				"failure_exception": "",
-				"failure_guard": "",
-				"target": {
-					"type": "VM",
-					"resourceID": "",
-					"modelInvariantId": "",
-					"modelVersionId": "",
-					"modelName": "",
-					"modelVersion": "",
-					"modelCustomizationId": ""
-				}
-			}
-		]
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/operational-policy-properties.json b/src/test/resources/tosca/operational-policy-properties.json
deleted file mode 100644
index a38334b55..000000000
--- a/src/test/resources/tosca/operational-policy-properties.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  "operational_policy": {
-    "controlLoop": {
-      "timeout": "0",
-      "abatement": "True",
-      "trigger_policy": "policy1",
-      "controlLoopName": "LOOP_ASJOy_v1_0_ResourceInstanceName1_tca"
-    },
-    "policies": [
-      {
-        "actor": {
-          "actor": "APPC",
-          "recipe": "Restart",
-          "payload": "requestParameters: '{\"usePreload\":true,\"userParams\":[]}'\r\nconfigurationParameters: '[{\"ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[10].value\",\"oam-ip-addr\":\"$.vf-module-topology.vf-module-parameters.param[15].value\",\"enabled\":\"$.vf-module-topology.vf-module-parameters.param[22].value\"}]'"
-        },
-        "id": "policy1",
-        "retry": "0",
-        "timeout": "0",
-        "success": "final_success",
-        "failure": "policy2",
-        "failure_timeout": "final_failure_timeout",
-        "failure_retries": "final_failure_retries",
-        "failure_exception": "final_failure_exception",
-        "failure_guard": "final_failure_guard",
-        "target": {
-          "type": "VNF",
-          "resourceID": "vLoadBalancerMS"
-        }
-      },
-      {
-        "actor": {
-          "actor": "SO",
-          "recipe": "VF Module Create",
-          "payload": ""
-        },
-        "id": "policy2",
-        "retry": "0",
-        "timeout": "0",
-        "success": "final_success",
-        "failure": "final_failure",
-        "failure_timeout": "final_failure_timeout",
-        "failure_retries": "final_failure_retries",
-        "failure_exception": "final_failure_exception",
-        "failure_guard": "final_failure_guard",
-        "target": {
-          "type": "VFMODULE",
-          "resourceID": "Vloadbalancerms..vpkg..module-1",
-          "modelInvariantId": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "modelVersionId": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "modelName": "Vloadbalancerms..vpkg..module-1",
-          "modelVersion": "1",
-          "modelCustomizationId": "1bffdc31-a37d-4dee-b65c-dde623a76e52"
-        }
-      },
-      {
-        "actor": {
-          "actor": "CDS",
-          "recipe": {
-            "recipe": "resource-assignment",
-            "payload": {
-              "artifact_name": "baseconfiguration",
-              "artifact_version": "1.0.0",
-              "mode": "async",
-              "data": {
-                "resource-assignment-properties": {
-                  "request-id": "request-id",
-                  "service-instance-id": "service-instance-id",
-                  "vnf-id": "vnf-id",
-                  "action-name": "action-name",
-                  "scope-type": "scope-type",
-                  "hostname": "hostname",
-                  "vnf_name": "vnf_name"
-                }
-              }
-            }
-          }
-        },
-        "id": "policy3",
-        "retry": "0",
-        "timeout": "0",
-        "success": "final_success",
-        "failure": "final_failure",
-        "failure_timeout": "final_failure_timeout",
-        "failure_retries": "final_failure_retries",
-        "failure_exception": "final_failure_exception",
-        "failure_guard": "final_failure_guard",
-        "target": {
-          "type": "VFMODULE",
-          "resourceID": "Vloadbalancerms..vpkg..module-1",
-          "modelInvariantId": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "modelVersionId": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "modelName": "Vloadbalancerms..vpkg..module-1",
-          "modelVersion": "1",
-          "modelCustomizationId": "1bffdc31-a37d-4dee-b65c-dde623a76e52"
-        }
-      },
-      {
-        "actor": {
-          "actor": "CDS",
-          "recipe": {
-            "recipe": "modify-config",
-            "payload": {
-              "artifact_name": "baseconfiguration",
-              "artifact_version": "1.0.0",
-              "mode": "async",
-              "data": {
-              }
-            }
-          }
-        },
-        "id": "policy4",
-        "retry": "0",
-        "timeout": "0",
-        "success": "final_success",
-        "failure": "final_failure",
-        "failure_timeout": "final_failure_timeout",
-        "failure_retries": "final_failure_retries",
-        "failure_exception": "final_failure_exception",
-        "failure_guard": "final_failure_guard",
-        "target": {
-          "type": "VFMODULE",
-          "resourceID": "Vloadbalancerms..vpkg..module-1",
-          "modelInvariantId": "ca052563-eb92-4b5b-ad41-9111768ce043",
-          "modelVersionId": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-          "modelName": "Vloadbalancerms..vpkg..module-1",
-          "modelVersion": "1",
-          "modelCustomizationId": "1bffdc31-a37d-4dee-b65c-dde623a76e52"
-        }
-      }
-    ]
-  }
-}
diff --git a/src/test/resources/tosca/resource-details-cds.json b/src/test/resources/tosca/resource-details-cds.json
deleted file mode 100644
index d972d0cb9..000000000
--- a/src/test/resources/tosca/resource-details-cds.json
+++ /dev/null
@@ -1,336 +0,0 @@
-{
-	"CP": {
-	},
-	"VL": {
-	},
-	"VF": {
-		"vLoadBalancerMS 0": {
-			"resourceVendor": "Test",
-			"resourceVendorModelNumber": "",
-			"name": "vLoadBalancerMS",
-			"description": "vLBMS",
-			"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-			"subcategory": "Load Balancer",
-			"category": "Application L4+",
-			"type": "VF",
-			"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-			"version": "1.0",
-			"resourceVendorRelease": "1.0",
-			"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate": {
-							"inputs": {
-								"activate-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-restconf": {
-							"inputs": {
-								"activate-restconf-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-cli": {
-							"inputs": {
-								"activate-cli-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"assign-activate": {
-							"inputs": {
-								"assign-activate-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"imperative-test-wf": {
-							"inputs": {
-								"imperative-test-wf-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						} 
-				 }
-		}
-		}
-	},
-	"CR": {
-	},
-	"VFC": {
-	},
-	"PNF": {
-	},
-	"Service": {
-	},
-	"CVFC": {
-	},
-	"Service Proxy": {
-	},
-	"Configuration": {
-	},
-	"AllottedResource": {
-	},
-	"VFModule": {
-		"Vloadbalancerms..vpkg..module-1": {
-			"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-			"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-			"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vpkg",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		},
-		"Vloadbalancerms..vdns..module-3": {
-			"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-			"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-			"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vdns",
-			"max_vf_module_instances": 50,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		},
-		"Vloadbalancerms..base_template..module-0": {
-			"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-			"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-			"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-			"min_vf_module_instances": 1,
-			"vf_module_label": "base_template",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Base",
-			"isBase": true,
-			"initial_count": 1,
-			"volume_group": false
-		},
-		"Vloadbalancerms..vlb..module-2": {
-			"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-			"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-			"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vlb",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/resource-details.json b/src/test/resources/tosca/resource-details.json
deleted file mode 100644
index b55adbf52..000000000
--- a/src/test/resources/tosca/resource-details.json
+++ /dev/null
@@ -1,336 +0,0 @@
-{
-	"CP": {
-	},
-	"VL": {
-	},
-	"VF": {
-		"vLoadBalancerMS 0": {
-			"resourceVendor": "Test",
-			"resourceVendorModelNumber": "",
-			"name": "vLoadBalancerMS",
-			"description": "vLBMS",
-			"invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
-			"subcategory": "Load Balancer",
-			"category": "Application L4+",
-			"type": "VF",
-			"UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
-			"version": "1.0",
-			"resourceVendorRelease": "1.0",
-			"customizationUUID": "465246dc-7748-45f4-a013-308d92922552",
-				"controllerProperties": {
-					"sdnc_model_name": "baseconfiguration",
-					"sdnc_model_version": "1.0.0",
-					"workflows": {
-						"resource-assignment": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-restconf": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"activate-cli": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"assign-activate": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						},
-						"imperative-test-wf": {
-							"inputs": {
-								"resource-assignment-properties": {
-									"type": "object",
-									"properties": {
-										"request-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"service-instance-id": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"hostname": {
-											"type": "string",
-											"required": true,
-											"input-param": true
-										},
-										"request-info": {
-											"type": "object",
-											"properties": {
-												"prop1": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												},
-												"prop2": {
-													"required": true,
-													"type": "string",
-													"input-param": true
-												}
-											}
-										}
-									}
-								}
-							}
-						} 
-				 }
-		}
-		}
-	},
-	"CR": {
-	},
-	"VFC": {
-	},
-	"PNF": {
-	},
-	"Service": {
-	},
-	"CVFC": {
-	},
-	"Service Proxy": {
-	},
-	"Configuration": {
-	},
-	"AllottedResource": {
-	},
-	"VFModule": {
-		"Vloadbalancerms..vpkg..module-1": {
-			"vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
-			"vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
-			"vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vpkg",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		},
-		"Vloadbalancerms..vdns..module-3": {
-			"vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vdns..module-3",
-			"vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
-			"vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vdns",
-			"max_vf_module_instances": 50,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		},
-		"Vloadbalancerms..base_template..module-0": {
-			"vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..base_template..module-0",
-			"vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
-			"vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
-			"min_vf_module_instances": 1,
-			"vf_module_label": "base_template",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Base",
-			"isBase": true,
-			"initial_count": 1,
-			"volume_group": false
-		},
-		"Vloadbalancerms..vlb..module-2": {
-			"vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
-			"vfModuleModelVersion": "1",
-			"vfModuleModelName": "Vloadbalancerms..vlb..module-2",
-			"vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
-			"vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
-			"min_vf_module_instances": 0,
-			"vf_module_label": "vlb",
-			"max_vf_module_instances": 1,
-			"vf_module_type": "Expansion",
-			"isBase": false,
-			"initial_count": 0,
-			"volume_group": false
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/service-details.json b/src/test/resources/tosca/service-details.json
deleted file mode 100644
index f41eec107..000000000
--- a/src/test/resources/tosca/service-details.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"serviceType": "",
-	"namingPolicy": "",
-	"environmentContext": "General_Revenue-Bearing",
-	"serviceEcompNaming": "true",
-	"serviceRole": "",
-	"name": "vLoadBalancerMS",
-	"description": "vLBMS",
-	"invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
-	"ecompGeneratedNaming": "true",
-	"category": "Network L4+",
-	"type": "Service",
-	"UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
-	"instantiationType": "A-la-carte"
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/tca_hi_lo.json b/src/test/resources/tosca/tca_hi_lo.json
deleted file mode 100644
index cb3ed893f..000000000
--- a/src/test/resources/tosca/tca_hi_lo.json
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-  "title": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-  "type": "object",
-  "required": [
-    "tca_policy"
-  ],
-  "properties": {
-    "tca_policy": {
-      "title": "onap.datatypes.monitoring.tca_policy",
-      "type": "object",
-      "required": [
-        "domain",
-        "metricsPerEventName"
-      ],
-      "properties": {
-        "domain": {
-          "type": "string",
-          "description": "Domain name to which TCA needs to be applied",
-          "default": "measurementsForVfScaling",
-          "const": "measurementsForVfScaling"
-        },
-        "metricsPerEventName": {
-          "type": "array",
-          "description": "Contains eventName and threshold details that need to be applied to given eventName",
-          "items": {
-            "title": "onap.datatypes.monitoring.metricsPerEventName",
-            "type": "object",
-            "required": [
-              "controlLoopSchemaType",
-              "eventName",
-              "policyName",
-              "policyScope",
-              "policyVersion",
-              "thresholds"
-            ],
-            "properties": {
-              "controlLoopSchemaType": {
-                "type": "string",
-                "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                "enum": [
-                  "VM",
-                  "VNF"
-                ]
-              },
-              "eventName": {
-                "type": "string",
-                "description": "Event name to which thresholds need to be applied"
-              },
-              "policyName": {
-                "type": "string",
-                "description": "TCA Policy Scope Name"
-              },
-              "policyScope": {
-                "type": "string",
-                "description": "TCA Policy Scope"
-              },
-              "policyVersion": {
-                "type": "string",
-                "description": "TCA Policy Scope Version"
-              },
-              "thresholds": {
-                "type": "array",
-                "description": "Thresholds associated with eventName",
-                "items": {
-                  "title": "onap.datatypes.monitoring.thresholds",
-                  "type": "object",
-                  "required": [
-                    "closedLoopControlName",
-                    "closedLoopEventStatus",
-                    "direction",
-                    "fieldPath",
-                    "severity",
-                    "thresholdValue",
-                    "version"
-                  ],
-                  "properties": {
-                    "closedLoopControlName": {
-                      "type": "string",
-                      "description": "Closed Loop Control Name associated with the threshold"
-                    },
-                    "closedLoopEventStatus": {
-                      "type": "string",
-                      "description": "Closed Loop Event Status of the threshold",
-                      "enum": [
-                        "ONSET",
-                        "ABATED"
-                      ]
-                    },
-                    "direction": {
-                      "type": "string",
-                      "description": "Direction of the threshold",
-                      "enum": [
-                        "LESS",
-                        "LESS_OR_EQUAL",
-                        "GREATER",
-                        "GREATER_OR_EQUAL",
-                        "EQUAL"
-                      ]
-                    },
-                    "fieldPath": {
-                      "type": "string",
-                      "description": "Json field Path as per CEF message which needs to be analyzed for TCA",
-                      "enum": [
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                        "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                        "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                        "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                        "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                      ]
-                    },
-                    "severity": {
-                      "type": "string",
-                      "description": "Threshold Event Severity",
-                      "enum": [
-                        "CRITICAL",
-                        "MAJOR",
-                        "MINOR",
-                        "WARNING",
-                        "NORMAL"
-                      ]
-                    },
-                    "thresholdValue": {
-                      "type": "integer",
-                      "description": "Threshold value for the field Path inside CEF message"
-                    },
-                    "version": {
-                      "type": "string",
-                      "description": "Version number associated with the threshold"
-                    }
-                  }
-                },
-                "format": "tabs-top"
-              }
-            }
-          },
-          "format": "tabs-top"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/tosca_example.yaml b/src/test/resources/tosca/tosca_example.yaml
deleted file mode 100644
index b0119f887..000000000
--- a/src/test/resources/tosca/tosca_example.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold
diff --git a/src/test/resources/tosca/tosca_with_date_time_json_schema.json b/src/test/resources/tosca/tosca_with_date_time_json_schema.json
deleted file mode 100644
index e15942cc5..000000000
--- a/src/test/resources/tosca/tosca_with_date_time_json_schema.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
-   "schema":{
-      "uniqueItems":"true",
-      "format":"tabs",
-      "type":"array",
-      "title":"TCA Policy JSON",
-      "items":{
-         "type":"object",
-         "title":"TCA Policy JSON",
-         "required":[
-            "domain",
-            "metricsPerEventName"
-         ],
-         "properties":{
-            "domain":{
-               "propertyOrder":1001,
-               "default":"measurementsForVfScaling",
-               "title":"Domain name to which TCA needs to be applied",
-               "type":"string"
-            },
-            "metricsPerEventName":{
-               "propertyOrder":1002,
-               "uniqueItems":"true",
-               "format":"tabs-top",
-               "title":"Contains eventName and threshold details that need to be applied to given eventName",
-               "type":"array",
-               "items":{
-                  "type":"object",
-                  "required":[
-                     "controlLoopSchemaType",
-                     "eventName",
-                     "policyName",
-                     "policyScope",
-                     "policyVersion",
-                     "thresholds",
-                     "context",
-                     "signature"
-                  ],
-                  "properties":{
-                     "policyVersion":{
-                        "propertyOrder":1007,
-                        "title":"TCA Policy Scope Version",
-                        "type":"string"
-                     },
-                     "thresholds":{
-                        "propertyOrder":1008,
-                        "uniqueItems":"true",
-                        "format":"tabs-top",
-                        "title":"Thresholds associated with eventName",
-                        "type":"array",
-                        "items":{
-                           "type":"object",
-                           "required":[
-                              "closedLoopControlName",
-                              "closedLoopEventStatus",
-                              "direction",
-                              "fieldPath",
-                              "severity",
-                              "thresholdValue",
-                              "version"
-                           ],
-                           "properties":{
-                              "severity":{
-                                 "propertyOrder":1013,
-                                 "title":"Threshold Event Severity",
-                                 "type":"string",
-                                 "enum":[
-                                    "CRITICAL",
-                                    "MAJOR",
-                                    "MINOR",
-                                    "WARNING",
-                                    "NORMAL"
-                                 ]
-                              },
-                              "fieldPath":{
-                                 "propertyOrder":1012,
-                                 "title":"Json field Path as per CEF message which needs to be analyzed for TCA",
-                                 "type":"string",
-                                 "enum":[
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
-                                    "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
-                                    "$.event.measurementsForVfScalingFields.meanRequestLatency",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
-                                    "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
-                                    "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
-                                 ]
-                              },
-                              "thresholdValue":{
-                                 "propertyOrder":1014,
-                                 "title":"Threshold value for the field Path inside CEF message",
-                                 "type":"integer"
-                              },
-                              "closedLoopEventStatus":{
-                                 "propertyOrder":1010,
-                                 "title":"Closed Loop Event Status of the threshold",
-                                 "type":"string",
-                                 "enum":[
-                                    "ONSET",
-                                    "ABATED"
-                                 ]
-                              },
-                              "closedLoopControlName":{
-                                 "propertyOrder":1009,
-                                 "title":"Closed Loop Control Name associated with the threshold",
-                                 "type":"string"
-                              },
-                              "version":{
-                                 "propertyOrder":1015,
-                                 "title":"Version number associated with the threshold",
-                                 "type":"string"
-                              },
-                              "direction":{
-                                 "propertyOrder":1011,
-                                 "title":"Direction of the threshold",
-                                 "type":"string",
-                                 "enum":[
-                                    "LESS",
-                                    "LESS_OR_EQUAL",
-                                    "GREATER",
-                                    "GREATER_OR_EQUAL",
-                                    "EQUAL"
-                                 ]
-                              }
-                           }
-                        }
-                     },
-                     "policyName":{
-                        "propertyOrder":1005,
-                        "title":"TCA Policy Scope Name",
-                        "type":"string"
-                     },
-                     "signature":{
-                        "propertyOrder":1017,
-                        "title":"Signature",
-                        "required":[
-                           "filter_clause"
-                        ],
-                        "properties":{
-                           "filter_clause":{
-                              "propertyOrder":30002,
-                              "qschema":{
-                                 "filters":[
-                                    {
-                                       "plugin":"datetimepicker",
-                                       "operators":[
-                                          "equals"
-                                       ],
-                                       "minLength":1,
-                                       "id":"timeEpoch",
-                                       "label":"timeEpoch",
-                                       "type":"datetime",
-                                       "input_event":"dp.change",
-                                       "validation":{
-                                          "format":"YYYY/MM/DD HH:mm:ss"
-                                       }
-                                    }
-                                 ]
-                              },
-                              "minLength":1,
-                              "title":"Filter Clause",
-                              "type":"qbldr"
-                           }
-                        }
-                     },
-                     "controlLoopSchemaType":{
-                        "propertyOrder":1003,
-                        "title":"Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
-                        "type":"string",
-                        "enum":[
-                           "VM",
-                           "VNF"
-                        ]
-                     },
-                     "policyScope":{
-                        "propertyOrder":1006,
-                        "title":"TCA Policy Scope",
-                        "type":"string"
-                     },
-                     "context":{
-                        "propertyOrder":1016,
-                        "options":{
-                           "enum_titles":[
-                              "PROD"
-                           ]
-                        },
-                        "title":"TCA Policy Dummy Context",
-                        "type":"string",
-                        "enum":[
-                           "PROD"
-                        ]
-                     },
-                     "eventName":{
-                        "propertyOrder":1004,
-                        "title":"Event name to which thresholds need to be applied",
-                        "type":"string"
-                     }
-                  }
-               }
-            }
-         }
-      }
-   }
-}
\ No newline at end of file
diff --git a/src/test/resources/tosca/tosca_with_metadata.yaml b/src/test/resources/tosca/tosca_with_metadata.yaml
deleted file mode 100644
index 5967d1569..000000000
--- a/src/test/resources/tosca/tosca_with_metadata.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-policy_types:
-    onap.policies.Monitoring:
-        derived_from: tosca.policies.Root
-        description: a base policy type for all policies that governs monitoring provisioning
-    onap.policies.monitoring.cdap.tca.hi.lo.app:
-        derived_from: onap.policies.Monitoring
-        version: 1.0.0
-        properties:
-            tca_policy:
-                type: map
-                description: TCA Policy JSON
-                entry_schema:
-                    type: onap.datatypes.monitoring.tca_policy
-        metadata:
-            policy_model_type: onap.policies.monitoring.cdap.tca.hi.lo.app
-            acronym: tca
-            
-data_types:
-    onap.datatypes.monitoring.metricsPerEventName:
-        derived_from: tosca.datatypes.Root
-        properties:
-            controlLoopSchemaType:
-                type: string
-                required: true
-                description: Specifies Control Loop Schema Type for the event Name e.g. VNF, VM
-                constraints:
-                  - valid_values:
-                      - VM
-                      - VNF
-            eventName:
-                type: string
-                required: true
-                description: Event name to which thresholds need to be applied
-            policyName:
-                type: string
-                required: true
-                description: TCA Policy Scope Name
-            policyScope:
-                type: string
-                required: true
-                description: TCA Policy Scope
-            policyVersion:
-                type: string
-                required: true
-                description: TCA Policy Scope Version
-            thresholds:
-                type: list
-                required: true
-                description: Thresholds associated with eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.thresholds
-    onap.datatypes.monitoring.tca_policy:
-        derived_from: tosca.datatypes.Root
-        properties:
-            domain:
-                type: string
-                required: true
-                description: Domain name to which TCA needs to be applied
-                default: measurementsForVfScaling
-                constraints:
-                  - equal: measurementsForVfScaling
-            metricsPerEventName:
-                type: list
-                required: true
-                description: Contains eventName and threshold details that need to be applied to given eventName
-                entry_schema:
-                    type: onap.datatypes.monitoring.metricsPerEventName
-    onap.datatypes.monitoring.thresholds:
-        derived_from: tosca.datatypes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-                description: Closed Loop Control Name associated with the threshold
-            closedLoopEventStatus:
-                type: string
-                required: true
-                description: Closed Loop Event Status of the threshold
-                constraints:
-                  - valid_values:
-                      - ONSET
-                      - ABATED
-            direction:
-                type: string
-                required: true
-                description: Direction of the threshold
-                constraints:
-                  - valid_values:
-                      - LESS
-                      - LESS_OR_EQUAL
-                      - GREATER
-                      - GREATER_OR_EQUAL
-                      - EQUAL
-            fieldPath:
-                type: string
-                required: true
-                description: Json field Path as per CEF message which needs to be analyzed for TCA
-                constraints:
-                  - valid_values:
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait
-                      - $.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage
-                      - $.event.measurementsForVfScalingFields.meanRequestLatency
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree
-                      - $.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed
-                      - $.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value
-            severity:
-                type: string
-                required: true
-                description: Threshold Event Severity
-                constraints:
-                  - valid_values:
-                      - CRITICAL
-                      - MAJOR
-                      - MINOR
-                      - WARNING
-                      - NORMAL
-            thresholdValue:
-                type: integer
-                required: true
-                description: Threshold value for the field Path inside CEF message
-            version:
-                type: string
-                required: true
-                description: Version number associated with the threshold