Removing deployed from policy/api
[policy/api.git] / main / src / test / java / org / onap / policy / api / main / rest / TestApiRestServer.java
index 442f9db..95a2069 100644 (file)
@@ -1,7 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved.
- *  Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ *  Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2019-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.
 
 package org.onap.policy.api.main.rest;
 
-import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThat;
 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.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.Properties;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-
-import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.policy.api.main.exception.PolicyApiException;
+import org.onap.policy.api.main.parameters.ApiParameterGroup;
 import org.onap.policy.api.main.parameters.CommonTestData;
+import org.onap.policy.api.main.rest.provider.PolicyProvider;
+import org.onap.policy.api.main.rest.provider.PolicyTypeProvider;
 import org.onap.policy.api.main.startstop.Main;
-import org.onap.policy.common.endpoints.http.server.RestServer;
-import org.onap.policy.common.endpoints.parameters.RestServerParameters;
+import org.onap.policy.common.endpoints.http.server.YamlMessageBodyHandler;
 import org.onap.policy.common.endpoints.report.HealthCheckReport;
 import org.onap.policy.common.gson.GsonMessageBodyHandler;
+import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.common.utils.coder.StandardCoder;
+import org.onap.policy.common.utils.coder.StandardYamlCoder;
 import org.onap.policy.common.utils.network.NetworkUtil;
 import org.onap.policy.common.utils.resources.ResourceUtils;
+import org.onap.policy.common.utils.resources.TextFileUtils;
+import org.onap.policy.models.base.PfModelException;
 import org.onap.policy.models.errors.concepts.ErrorResponse;
+import org.onap.policy.models.provider.PolicyModelsProviderParameters;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
 import org.onap.policy.models.tosca.legacy.concepts.LegacyGuardPolicyInput;
 import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- * Class to perform unit test of {@link ApiRestServer}.
+ * Class to perform unit test of {@link ApiRestController}.
  *
  * @author Chenfei Gao (cgao@research.att.com)
  */
 public class TestApiRestServer {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(TestApiRestServer.class);
-    private static final String NOT_ALIVE = "not alive";
     private static final String ALIVE = "alive";
-    private static final String SELF = "self";
+    private static final String SELF = NetworkUtil.getHostname();
     private static final String NAME = "Policy API";
+    private static final String APP_JSON = "application/json";
+    private static final String APP_YAML = "application/yaml";
 
     private static final String HEALTHCHECK_ENDPOINT = "healthcheck";
     private static final String STATISTICS_ENDPOINT = "statistics";
 
+    private static final String OP_POLICY_NAME_VCPE = "operational.restart";
+    private static final String OP_POLICY_NAME_VDNS = "operational.scaleout";
+    private static final String OP_POLICY_NAME_VFW = "operational.modifyconfig";
+
     private static final String POLICYTYPES = "policytypes";
     private static final String POLICYTYPES_TCA = "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app";
     private static final String POLICYTYPES_COLLECTOR =
@@ -97,749 +104,950 @@ public class TestApiRestServer {
     private static final String POLICYTYPES_COLLECTOR_LATEST =
             "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server/versions/latest";
 
+    private static final String POLICYTYPES_DROOLS = "policytypes/onap.policies.controlloop.operational.common.Drools";
+    private static final String POLICYTYPES_DROOLS_VERSION = POLICYTYPES_DROOLS + "/versions/1.0.0";
+    private static final String POLICYTYPES_DROOLS_VERSION_LATEST = POLICYTYPES_DROOLS + "/versions/latest";
+
+    private static final String POLICYTYPES_NAMING_VERSION =
+            POLICYTYPES + "/onap.policies.Naming/versions/1.0.0";
+
     private static final String POLICYTYPES_TCA_POLICIES =
             "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies";
     private static final String POLICYTYPES_TCA_POLICIES_VCPE =
             "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca";
-    private static final String POLICYTYPES_TCA_POLICIES_VCPE_VERSION = "policytypes/"
-        + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0";
+    private static final String POLICYTYPES_TCA_POLICIES_VCPE_VERSION1 = "policytypes/"
+            + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/1.0.0";
+    private static final String POLICYTYPES_TCA_POLICIES_VCPE_VERSION2 = "policytypes/"
+            + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/2.0.0";
     private static final String POLICYTYPES_TCA_POLICIES_VCPE_LATEST = "policytypes/"
-        + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/latest";
+            + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/latest";
     private static final String POLICYTYPES_TCA_POLICIES_VCPE_DEPLOYED = "policytypes/"
             + "onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.restart.tca/versions/deployed";
 
-    private static final String GUARD_POLICIES =
-            "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies";
+    private static final String POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION =
+            POLICYTYPES_DROOLS_VERSION + "/policies/" + OP_POLICY_NAME_VCPE + "/versions/1.0.0";
+
+    private static final String GUARD_POLICIES = "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies";
     private static final String GUARD_POLICIES_VDNS_FL_LATEST =
             "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.frequency.scaleout"
-            + "/versions/latest";
+                    + "/versions/latest";
     private static final String GUARD_POLICIES_VDNS_FL_DEPLOYED =
             "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.frequency.scaleout"
-            + "/versions/deployed";
+                    + "/versions/deployed";
     private static final String GUARD_POLICIES_VDNS_MINMAX_LATEST =
             "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.minmax.scaleout"
-            + "/versions/latest";
+                    + "/versions/latest";
     private static final String GUARD_POLICIES_VDNS_FL_VERSION = "policytypes/"
-        + "onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.frequency.scaleout/versions/1";
-    private static final String GUARD_POLICIES_VDNS_MINMAX_VERSION = "policytypes/"
-        + "onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.minmax.scaleout/versions/1";
+            + "onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.frequency.scaleout/versions/1";
+    private static final String GUARD_POLICIES_VDNS_MINMAX_VERSION =
+            "policytypes/" + "onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.minmax.scaleout/versions/1";
 
     private static final String OPS_POLICIES =
             "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies";
     private static final String OPS_POLICIES_VCPE_LATEST =
-            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart"
-            + "/versions/latest";
+            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VCPE
+                    + "/versions/latest";
     private static final String OPS_POLICIES_VCPE_DEPLOYED =
-            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart"
-            + "/versions/deployed";
+            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VCPE
+                    + "/versions/deployed";
     private static final String OPS_POLICIES_VDNS_LATEST =
-            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.scaleout"
-            + "/versions/latest";
+            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VDNS
+                    + "/versions/latest";
     private static final String OPS_POLICIES_VFIREWALL_LATEST =
-            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.modifyconfig"
-            + "/versions/latest";
+            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VFW
+                    + "/versions/latest";
     private static final String OPS_POLICIES_VCPE_VERSION = "policytypes/"
-        + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart/versions/1";
+            + "onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VCPE + "/versions/1";
     private static final String OPS_POLICIES_VDNS_VERSION = "policytypes/"
-        + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.scaleout/versions/1";
+            + "onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VDNS + "/versions/1";
     private static final String OPS_POLICIES_VFIREWALL_VERSION = "policytypes/"
-        + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.modifyconfig/versions/1";
+            + "onap.policies.controlloop.Operational/versions/1.0.0/policies/" + OP_POLICY_NAME_VFW + "/versions/1";
+    private static final String POLICIES = "policies";
 
     private static final String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore";
-    private static final CommonTestData COMMON_TEST_DATA = new CommonTestData();
-    private Main main;
-    private RestServer restServer;
-    private StandardCoder standardCoder = new StandardCoder();
-    private int port;
 
     // @formatter:off
-    private String[] toscaPolicyResourceNames = {
+    private static final String[] TOSCA_POLICY_RESOURCE_NAMES = {
         "policies/vCPE.policy.monitoring.input.tosca.json",
+        "policies/vCPE.policy.monitoring.input.tosca.v2.yaml",
         "policies/vDNS.policy.monitoring.input.tosca.json",
-        "policies/vFirewall.policy.monitoring.input.tosca.json",
+        "policies/vDNS.policy.monitoring.input.tosca.v2.yaml"
     };
 
-    private String[] toscaPolicyTypeResourceNames = {
-        "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.json",
-        "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.json"
+    private static final String[] TOSCA_POLICIES_RESOURCE_NAMES = {
+        "policies/vCPE.policies.optimization.input.tosca.json",
+        "policies/vCPE.policies.optimization.input.tosca.v2.yaml"
     };
 
-    private String[] legacyGuardPolicyResourceNames = {
+    private static final String TOSCA_POLICYTYPE_OP_RESOURCE =
+        "policytypes/onap.policies.controlloop.operational.Common.yaml";
+
+    private static final String LEGACY_POLICYTYPE_OP_RESOURCE =
+        "policytypes/onap.policies.controlloop.Operational.yaml";
+
+    private static final String[] TOSCA_POLICYTYPE_RESOURCE_NAMES = {
+        "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml",
+        "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml",
+        "policytypes/onap.policies.Optimization.yaml",
+        LEGACY_POLICYTYPE_OP_RESOURCE,
+        TOSCA_POLICYTYPE_OP_RESOURCE,
+        "policytypes/onap.policies.controlloop.operational.common.Drools.yaml",
+        "policytypes/onap.policies.controlloop.guard.Blacklist.yaml",
+        "policytypes/onap.policies.controlloop.guard.FrequencyLimiter.yaml",
+        "policytypes/onap.policies.controlloop.guard.MinMax.yaml",
+        "policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml",
+        "policytypes/onap.policies.optimization.resource.AffinityPolicy.yaml",
+        "policytypes/onap.policies.optimization.resource.DistancePolicy.yaml",
+        "policytypes/onap.policies.optimization.resource.HpaPolicy.yaml",
+        "policytypes/onap.policies.optimization.resource.OptimizationPolicy.yaml",
+        "policytypes/onap.policies.optimization.resource.PciPolicy.yaml",
+        "policytypes/onap.policies.optimization.service.QueryPolicy.yaml",
+        "policytypes/onap.policies.optimization.service.SubscriberPolicy.yaml",
+        "policytypes/onap.policies.optimization.resource.Vim_fit.yaml",
+        "policytypes/onap.policies.optimization.resource.VnfPolicy.yaml"
+    };
+
+    private static final String TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_JSON =
+        "policies/vCPE.policy.operational.input.tosca.json";
+
+    private static final String TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML =
+        "policies/vCPE.policy.operational.input.tosca.yaml";
+
+    private static final String[] LEGACY_GUARD_POLICY_RESOURCE_NAMES = {
         "policies/vDNS.policy.guard.frequency.input.json",
-        "policies/vDNS.policy.guard.minmax.input.json",
+        "policies/vDNS.policy.guard.minmax.input.json"
     };
 
-    private String[] legacyOperationalPolicyResourceNames = {
-        "policies/vCPE.policy.operational.input.json",
-        "policies/vDNS.policy.operational.input.json",
-        "policies/vFirewall.policy.operational.input.json"
+    private static final String[] LEGACY_OPERATIONAL_POLICY_RESOURCE_NAMES = {
+        "policies/vCPE.policy.operational.legacy.input.json",
+        "policies/vDNS.policy.operational.legacy.input.json",
+        "policies/vFirewall.policy.operational.legacy.input.json"
     };
+
+    private static PolicyModelsProviderParameters providerParams;
+    private static ApiParameterGroup apiParamGroup;
+    private static PolicyProvider policyProvider;
+    private static PolicyTypeProvider policyTypeProvider;
+
     // @formatter:on
 
+    private static final StandardCoder standardCoder = new StandardCoder();
+
+    private static int apiPort;
+    private static Main apiMain;
+
+    private static StandardYamlCoder standardYamlCoder = new StandardYamlCoder();
+
+    /**
+     * Initializes parameters and set up test environment.
+     *
+     * @throws PfModelException the PfModel parsing exception
+     * @throws IOException on I/O exceptions
+     */
+    @BeforeClass
+    public static void setupParameters() throws PfModelException, IOException {
+        providerParams = new PolicyModelsProviderParameters();
+        // H2, use "org.mariadb.jdbc.Driver" and "jdbc:mariadb://localhost:3306/policy" for locally installed MariaDB
+        providerParams.setDatabaseDriver("org.h2.Driver");
+        providerParams.setDatabaseUrl("jdbc:h2:mem:testdb");
+        providerParams.setDatabaseUser("policy");
+        providerParams.setDatabasePassword(Base64.getEncoder().encodeToString("P01icY".getBytes()));
+        providerParams.setPersistenceUnit("ToscaConceptTest");
+        apiParamGroup = new ApiParameterGroup("ApiGroup", null, providerParams,
+                Collections.emptyList(), Collections.emptyList());
+        ParameterService.register(apiParamGroup, true);
+
+        policyTypeProvider = new PolicyTypeProvider();
+        policyProvider = new PolicyProvider();
+
+        apiPort = NetworkUtil.allocPort();
+
+        final String[] apiConfigParameters = new String[2];
+        final Properties systemProps = System.getProperties();
+        systemProps.put("javax.net.ssl.keyStore", KEYSTORE);
+        systemProps.put("javax.net.ssl.keyStorePassword", "Pol1cy_0nap");
+        System.setProperties(systemProps);
+        new CommonTestData().makeParameters("src/test/resources/parameters/ApiConfigParameters_Https.json",
+                "src/test/resources/parameters/ApiConfigParameters_HttpsXXX.json", apiPort);
+        apiConfigParameters[0] = "-c";
+        apiConfigParameters[1] = "src/test/resources/parameters/ApiConfigParameters_HttpsXXX.json";
+
+        apiMain = new Main(apiConfigParameters);
+    }
+
     /**
      * Method for cleanup after each test.
      */
-    @After
-    public void teardown() throws Exception {
-        if (main != null) {
-            stopApiService(main);
-        } else if (restServer != null) {
-            restServer.stop();
+    @AfterClass
+    public static void teardown() throws Exception {
+        policyTypeProvider.close();
+        policyProvider.close();
+
+        if (apiMain != null) {
+            apiMain.shutdown();
         }
     }
 
     @Test
-    public void testHealthCheckSuccess() {
+    public void testApiStatisticsConstructorIsPrivate() {
 
         try {
-            main = startApiService(true);
-            final Invocation.Builder invocationBuilder = sendHttpRequest(HEALTHCHECK_ENDPOINT);
-            final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
-            validateHealthCheckReport(NAME, SELF, true, 200, ALIVE, report);
+            final Constructor<ApiStatisticsManager> constructor = ApiStatisticsManager.class.getDeclaredConstructor();
+            assertTrue(Modifier.isPrivate(constructor.getModifiers()));
+            constructor.setAccessible(true);
+            constructor.newInstance();
+
         } catch (final Exception exp) {
-            LOGGER.error("testHealthCheckSuccess failed", exp);
-            fail("Test should not throw an exception");
+            assertTrue(exp.getCause().toString().contains("Instantiation of the class is not allowed"));
         }
     }
 
     @Test
-    public void testHealthCheckFailure() throws InterruptedException, IOException {
-
-        port = NetworkUtil.allocPort();
-        final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false, port);
-        restServerParams.setName(CommonTestData.API_GROUP_NAME);
-        restServer = new RestServer(restServerParams, null, ApiRestController.class);
-        try {
-            restServer.start();
-            final Invocation.Builder invocationBuilder = sendHttpRequest(HEALTHCHECK_ENDPOINT);
-            final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
-            validateHealthCheckReport(NAME, SELF, false, 500, NOT_ALIVE, report);
-            assertTrue(restServer.isAlive());
-            assertTrue(restServer.toString().startsWith("RestServer [servers="));
-        } catch (final Exception exp) {
-            LOGGER.error("testHealthCheckFailure failed", exp);
-            fail("Test should not throw an exception");
+    public void testCreatePolicyTypes() throws Exception {
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+            ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+            assertNotNull(response);
+            assertFalse(response.getPolicyTypes().isEmpty());
         }
+
+        // Send a policy type with a null value to trigger an error
+        Response rawResponse = readResource(POLICYTYPES, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+        String firstPolicyType = response.getPolicyTypes().keySet().iterator().next();
+        response.getPolicyTypes().put(firstPolicyType, null);
+        Response rawResponse2 = createResource(POLICYTYPES, standardCoder.encode(response));
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse2.getStatus());
+        ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class);
+        assertEquals("no policy types specified on service template", errorResponse.getErrorMessage());
     }
 
     @Test
-    public void testHttpsHealthCheckSuccess() {
-
-        try {
-            main = startApiService(false);
-            final Invocation.Builder invocationBuilder = sendHttpsRequest(HEALTHCHECK_ENDPOINT);
-            final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
-            validateHealthCheckReport(NAME, SELF, true, 200, ALIVE, report);
-        } catch (final Exception exp) {
-            LOGGER.error("testHttpsHealthCheckSuccess failed", exp);
-            fail("Test should not throw an exception");
+    public void testCreatePolicies() throws Exception {
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
         }
+
+        new File("src/test/resources/policies/BadTestPolicy.yaml").deleteOnExit();
+
+        // Send a policy with no policy type trigger an error
+        String toscaPolicy = ResourceUtils
+                .getResourceAsString(TOSCA_POLICY_RESOURCE_NAMES[TOSCA_POLICIES_RESOURCE_NAMES.length - 1]);
+
+        toscaPolicy = toscaPolicy.replaceAll("onap.policies.monitoring.cdap.tca.hi.lo.app", "");
+        TextFileUtils.putStringAsTextFile(toscaPolicy, "src/test/resources/policies/BadTestPolicy.yaml");
+
+        Response rawResponse2 =
+                createResource(POLICYTYPES_TCA_POLICIES, "src/test/resources/policies/BadTestPolicy.yaml");
+        assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), rawResponse2.getStatus());
+        ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class);
+        assertThat(errorResponse.getErrorMessage())
+                .contains("entity in incoming fragment does not equal existing entity");
     }
 
     @Test
-    public void testApiStatistics_200() {
-
-        try {
-            main = startApiService(true);
-            Invocation.Builder invocationBuilder = sendHttpRequest(STATISTICS_ENDPOINT);
-            StatisticsReport report = invocationBuilder.get(StatisticsReport.class);
-            validateStatisticsReport(report, 200);
-            updateApiStatistics();
-            invocationBuilder = sendHttpRequest(STATISTICS_ENDPOINT);
-            report = invocationBuilder.get(StatisticsReport.class);
-            validateStatisticsReport(report, 200);
-            ApiStatisticsManager.resetAllStatistics();
-        } catch (final Exception exp) {
-            LOGGER.error("testApiStatistics_200 failed", exp);
-            fail("Test should not throw an exception");
+    public void testSimpleCreatePolicies() throws Exception {
+        for (String resrcName : TOSCA_POLICIES_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
         }
+
+        new File("src/test/resources/policies/BadTestPolicy.yaml").deleteOnExit();
+
+        // Send a policy with no policy type trigger an error
+        String toscaPolicy = ResourceUtils
+                .getResourceAsString(TOSCA_POLICY_RESOURCE_NAMES[TOSCA_POLICIES_RESOURCE_NAMES.length - 1]);
+
+        toscaPolicy = toscaPolicy.replaceAll("onap.policies.monitoring.cdap.tca.hi.lo.app", "");
+        TextFileUtils.putStringAsTextFile(toscaPolicy, "src/test/resources/policies/BadTestPolicy.yaml");
+
+        Response rawResponse2 = createResource(POLICIES, "src/test/resources/policies/BadTestPolicy.yaml");
+        ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class);
+        assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), rawResponse2.getStatus());
+        assertThat(errorResponse.getErrorMessage()).contains("policy type NULL:1.0.0 referenced in policy not found");
     }
 
     @Test
-    public void testApiStatistics_500() throws Exception {
-
-        port = NetworkUtil.allocPort();
-        final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false, port);
-        restServerParams.setName(CommonTestData.API_GROUP_NAME);
-        restServer = new RestServer(restServerParams, null, ApiRestController.class);
-        try {
-            restServer.start();
-            final Invocation.Builder invocationBuilder = sendHttpRequest(STATISTICS_ENDPOINT);
-            final StatisticsReport report = invocationBuilder.get(StatisticsReport.class);
-            validateStatisticsReport(report, 500);
-            ApiStatisticsManager.resetAllStatistics();
-        } catch (final Exception exp) {
-            LOGGER.error("testApiStatistics_500 failed", exp);
-            fail("Test should not throw an exception");
+    public void testCreateGuardPolicies() throws Exception {
+        for (String resrcName : LEGACY_GUARD_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
         }
+
+        Response rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
     @Test
-    public void testHttpsApiStatistics() {
-
-        try {
-            main = startApiService(false);
-            final Invocation.Builder invocationBuilder = sendHttpsRequest(STATISTICS_ENDPOINT);
-            final StatisticsReport report = invocationBuilder.get(StatisticsReport.class);
-            validateStatisticsReport(report, 200);
-        } catch (final Exception exp) {
-            LOGGER.error("testHttpsApiStatistics failed", exp);
-            fail("Test should not throw an exception");
+    public void testCreateOperationalPolicies() throws Exception {
+        for (String resrcName : LEGACY_OPERATIONAL_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
         }
+
+        Response rawResponse = deleteResource(OPS_POLICIES + "/operational.restart/versions/1", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(OPS_POLICIES + "/operational.scaleout/versions/1", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(OPS_POLICIES + "/operational.modifyconfig/versions/1", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
+    @SuppressWarnings("unchecked")
     @Test
-    public void testApiStatisticsConstructorIsPrivate() {
+    public void testToscaCompliantOpDroolsPolicies() throws Exception {
+        Response rawResponse = createResource(POLICYTYPES, TOSCA_POLICYTYPE_OP_RESOURCE);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        try {
-            final Constructor<ApiStatisticsManager> constructor = ApiStatisticsManager.class.getDeclaredConstructor();
-            assertTrue(Modifier.isPrivate(constructor.getModifiers()));
-            constructor.setAccessible(true);
-            constructor.newInstance();
-        } catch (final Exception exp) {
-            assertTrue(exp.getCause().toString().contains("Instantiation of the class is not allowed"));
-        }
+        rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, APP_JSON);
+        //
+        // PLD not sure how to fix this? How do I merge 2 policy types?
+        //
+        ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        System.err.println(errorResponse.getErrorMessage());
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_YAML);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        ToscaServiceTemplate toscaVcpeSt = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertEquals(1, toscaVcpeSt.getToscaTopologyTemplate().getPolicies().size());
+        assertEquals(OP_POLICY_NAME_VCPE,
+                toscaVcpeSt.getToscaTopologyTemplate().getPolicies().get(0).get(OP_POLICY_NAME_VCPE).getName());
+
+        Map<String, Object> props =
+                toscaVcpeSt.getToscaTopologyTemplate().getPolicies().get(0).get(OP_POLICY_NAME_VCPE).getProperties();
+        assertNotNull(props);
+
+        List<Object> operations = (List<Object>) props.get("operations");
+        assertEquals(1, operations.size());
+        assertEquals(props.get("trigger"), ((Map<String, Object>) operations.get(0)).get("id"));
+
+        Map<String, Object> operation =
+                (Map<String, Object>) ((Map<String, Object>) operations.get(0)).get("operation");
+        assertEquals("APPC", operation.get("actor"));
+        assertEquals("Restart", operation.get("operation"));
+
+        rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+    }
+
+    @Test
+    public void testHealthCheckSuccessJson() throws Exception {
+        testHealthCheckSuccess(APP_JSON);
     }
 
     @Test
-    public void testCreatePolicyTypes() {
+    public void testHealthCheckSuccessYaml() throws Exception {
+        testHealthCheckSuccess(APP_YAML);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(true);
-            for (String resrcName : toscaPolicyTypeResourceNames) {
-                Response rawResponse = createResource(POLICYTYPES, resrcName, true);
-                assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
-                ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
-                assertNotNull(response);
-                assertFalse(response.getPolicyTypes().get(0).isEmpty());
-            }
-        }).doesNotThrowAnyException();
+    private void testHealthCheckSuccess(String mediaType) throws Exception {
+        final Invocation.Builder invocationBuilder = sendHttpsRequest(HEALTHCHECK_ENDPOINT, mediaType);
+        final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
+        validateHealthCheckReport(NAME, SELF, true, 200, ALIVE, report);
     }
 
     @Test
-    public void testReadPolicyTypes() {
+    public void testApiStatistics_200_Json() throws Exception {
+        testApiStatistics_200(APP_JSON);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(POLICYTYPES, true);
-            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
-            ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
-            assertTrue(response.getPolicyTypes().isEmpty());
-
-            rawResponse = readResource(POLICYTYPES_TCA, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:null does not exist",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(POLICYTYPES_TCA_VERSION, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(POLICYTYPES_TCA_LATEST, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:null does not exist",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(POLICYTYPES_COLLECTOR, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy type with ID "
-                + "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:null does not exist",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(POLICYTYPES_COLLECTOR_VERSION, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy type with ID "
-                + "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:1.0.0 does not exist",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(POLICYTYPES_COLLECTOR_LATEST, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy type with ID "
-                + "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:null does not exist",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
-    }
-
-    @Test
-    public void testDeletePolicyType() {
-
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = deleteResource(POLICYTYPES_TCA_VERSION, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                    error.getErrorMessage());
+    @Test
+    public void testApiStatistics_200_Yaml() throws Exception {
+        testApiStatistics_200(APP_YAML);
+    }
 
-            rawResponse = deleteResource(POLICYTYPES_COLLECTOR_VERSION, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy type with ID "
-                + "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server:1.0.0 does not exist",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
-    }
-
-    @Test
-    public void testCreatePolicies() {
-
-        assertThatCode(() -> {
-            main = startApiService(true);
-            for (String resrcName : toscaPolicyResourceNames) {
-                Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, true);
-                assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-                ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-                assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                        error.getErrorMessage());
-            }
-        }).doesNotThrowAnyException();
-    }
-
-    @Test
-    public void testReadPolicies() {
-
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy with ID null:null and "
-                + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy with ID onap.restart.tca:null and "
-                + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy with ID onap.restart.tca:1.0.0 and "
-                + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy with ID onap.restart.tca:null and "
-                + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
-    }
-
-    @Test
-    public void testDeletePolicies() {
-
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("policy with ID onap.restart.tca:1.0.0 and "
-                + "type onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
-    }
-
-    @Test
-    public void testCreateGuardPolicies() {
-
-        assertThatCode(() -> {
-            main = startApiService(true);
-            for (String resrcName : legacyGuardPolicyResourceNames) {
-                Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, true);
-                assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            }
-        }).doesNotThrowAnyException();
+    private void testApiStatistics_200(String mediaType) throws Exception {
+        Invocation.Builder invocationBuilder = sendHttpsRequest(STATISTICS_ENDPOINT, mediaType);
+        StatisticsReport report = invocationBuilder.get(StatisticsReport.class);
+        validateStatisticsReport(report, 200);
+        updateApiStatistics();
+        invocationBuilder = sendHttpsRequest(STATISTICS_ENDPOINT, mediaType);
+        report = invocationBuilder.get(StatisticsReport.class);
+        validateStatisticsReport(report, 200);
+        ApiStatisticsManager.resetAllStatistics();
     }
 
     @Test
-    public void testCreateOperationalPolicies() {
+    public void testReadPolicyTypesJson() throws Exception {
+        testReadPolicyTypes(APP_JSON);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(true);
-            for (String resrcName : legacyOperationalPolicyResourceNames) {
-                Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, true);
-                assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            }
-        }).doesNotThrowAnyException();
+    @Test
+    public void testReadPolicyTypesYaml() throws Exception {
+        testReadPolicyTypes(APP_YAML);
+    }
+
+    private void testReadPolicyTypes(String mediaType) throws Exception {
+        Response rawResponse = readResource("policytypes/onap.policies.optimization.resource.HpaPolicy", mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        ToscaServiceTemplate namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertNotNull(namingServiceTemplate);
+        assertEquals(3, namingServiceTemplate.getPolicyTypesAsMap().size());
+        assertEquals(5, namingServiceTemplate.getDataTypesAsMap().size());
+
+        rawResponse = readResource(POLICYTYPES, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertFalse(response.getPolicyTypes().isEmpty());
+
+        rawResponse = readResource(POLICYTYPES_TCA, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_TCA_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_TCA_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_COLLECTOR, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_COLLECTOR_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_COLLECTOR_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_VERSION_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_NAMING_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
     @Test
-    public void testReadGuardPolicies() {
+    public void testDeletePolicyTypeJson() throws Exception {
+        testDeletePolicyType(APP_JSON);
+    }
+
+    @Test
+    public void testDeletePolicyTypeYaml() throws Exception {
+        testDeletePolicyType(APP_YAML);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_LATEST, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: guard.frequency.scaleout:null",
-                    error.getErrorMessage());
+    private void testDeletePolicyType(String mediaType) throws Exception {
+        Response rawResponse = deleteResource("policytypes/onap.policies.IDoNotExist/versions/1.0.0", mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
 
-            rawResponse = readResource(GUARD_POLICIES_VDNS_FL_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: guard.frequency.scaleout:1",
-                    error.getErrorMessage());
+        rawResponse = createResource(POLICYTYPES, "policytypes/onap.policies.Test.yaml");
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-            rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_LATEST, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: guard.minmax.scaleout:null",
-                    error.getErrorMessage());
+        rawResponse = readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+    }
 
-            rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: guard.minmax.scaleout:1",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
+    @Test
+    public void testReadPoliciesJson() throws Exception {
+        testReadPolicies(APP_JSON);
     }
 
     @Test
-    public void testReadOperationalPolicies() {
+    public void testReadPoliciesYaml() throws Exception {
+        testReadPolicies(APP_YAML);
+    }
+
+    private void testReadPolicies(String mediaType) throws Exception {
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        }
+
+        Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(OPS_POLICIES_VCPE_LATEST, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: operational.restart:null",
-                    error.getErrorMessage());
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-            rawResponse = readResource(OPS_POLICIES_VCPE_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: operational.restart:1",
-                    error.getErrorMessage());
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-            rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: operational.scaleout:null",
-                    error.getErrorMessage());
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION2, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-            rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: operational.scaleout:1",
-                    error.getErrorMessage());
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-            rawResponse = readResource(OPS_POLICIES_VFIREWALL_LATEST, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: operational.modifyconfig:null",
-                    error.getErrorMessage());
+        rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-            rawResponse = readResource(OPS_POLICIES_VFIREWALL_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: operational.modifyconfig:1",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
+        rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION2, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
     @Test
-    public void testDeleteGuardPolicy() {
+    public void testNamingPolicyGet() throws Exception {
+
+        Response rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/"
+                + "policies/SDNC_Policy.ONAP_VNF_NAMING_TIMESTAMP/versions/1.0.0", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        ToscaServiceTemplate namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size());
+        assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size());
+        assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size());
 
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: guard.frequency.scaleout:1",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
+        rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/"
+                + "policies/SDNC_Policy.ONAP_VNF_NAMING_TIMESTAMP/versions/latest", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size());
+        assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size());
+        assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size());
+
+        rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/policies", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size());
+        assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size());
+        assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size());
     }
 
     @Test
-    public void testGetDeployedVersionsOfGuardPolicy() {
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_DEPLOYED, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-        }).doesNotThrowAnyException();
+    public void testDeletePoliciesJson() throws Exception {
+        testDeletePolicies(APP_JSON);
     }
 
     @Test
-    public void testDeleteOperationalPolicy() {
+    public void testDeletePoliciesYaml() throws Exception {
+        testDeletePolicies(APP_YAML);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = deleteResource(OPS_POLICIES_VCPE_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy: operational.restart:1",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
+    private void testDeletePolicies(String mediaType) throws Exception {
+        Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("policy onap.restart.tca:1.0.0 not found", error.getErrorMessage());
     }
 
     @Test
-    public void testHttpsCreatePolicyTypes() {
-
-        assertThatCode(() -> {
-            main = startApiService(false);
-            for (String resrcName : toscaPolicyTypeResourceNames) {
-                Response rawResponse = createResource(POLICYTYPES, resrcName, false);
-                assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
-                ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
-                assertNotNull(response);
-                assertFalse(response.getPolicyTypes().get(0).isEmpty());
-            }
-        }).doesNotThrowAnyException();
+    public void testDeletePolicyVersionJson() throws Exception {
+        testDeletePolicyVersion(APP_JSON);
     }
 
     @Test
-    public void testHttpsCreatePolicies() {
+    public void testDeletePolicyVersionYaml() throws Exception {
+        testDeletePolicyVersion(APP_YAML);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(false);
-            for (String resrcName : toscaPolicyResourceNames) {
-                Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, false);
-                assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-                ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-                assertEquals("policy type with ID onap.policies.monitoring.cdap.tca.hi.lo.app:1.0.0 does not exist",
-                        error.getErrorMessage());
-            }
-        }).doesNotThrowAnyException();
+    private void testDeletePolicyVersion(String mediaType) throws Exception {
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+            ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+            assertNotNull(response);
+            assertFalse(response.getPolicyTypes().isEmpty());
+        }
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        }
+        Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals(
+                "policies for filter ToscaPolicyFilter(name=onap.restart.tca, version=1.0.0, versionPrefix=null, "
+                        + "type=onap.policies.monitoring.cdap.tca.hi.lo.app, typeVersion=1.0.0) do not exist",
+                errorResponse.getErrorMessage());
+
+        rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION2, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION2, mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+        errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("policies for onap.restart.tca:2.0.0 do not exist", errorResponse.getErrorMessage());
+
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+        errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("policies for onap.restart.tca:null do not exist", errorResponse.getErrorMessage());
+
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+        errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("policies for onap.restart.tca:null do not exist", errorResponse.getErrorMessage());
     }
 
     @Test
-    public void testHttpsCreateGuardPolicies() {
-
-        assertThatCode(() -> {
-            main = startApiService(false);
-            for (String resrcName : legacyGuardPolicyResourceNames) {
-                Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, false);
-                assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            }
-        }).doesNotThrowAnyException();
+    public void testGetAllVersionOfPolicyJson() throws Exception {
+        testGetAllVersionOfPolicy(APP_JSON);
     }
 
     @Test
-    public void testHttpsCreateOperationalPolicies() {
+    public void testGetAllVersionOfPolicyYaml() throws Exception {
+        testGetAllVersionOfPolicy(APP_YAML);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(false);
-            for (String resrcName : legacyOperationalPolicyResourceNames) {
-                Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, false);
-                assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            }
-        }).doesNotThrowAnyException();
+    private void testGetAllVersionOfPolicy(String mediaType) throws Exception {
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+            ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+            assertNotNull(response);
+            assertFalse(response.getPolicyTypes().isEmpty());
+        }
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        }
+        Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
     @Test
-    public void testGetDeployedVersionsOfPolicy() {
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_DEPLOYED, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-        }).doesNotThrowAnyException();
+    public void testReadGuardPoliciesJson() throws Exception {
+        testReadGuardPolicies(APP_JSON);
     }
 
     @Test
-    public void testGetLatestVersionOfOperationalPolicy() {
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-        }).doesNotThrowAnyException();
+    public void testReadGuardPoliciesYaml() throws Exception {
+        testReadGuardPolicies(APP_YAML);
     }
 
-    @Test
-    public void testGetSpecificVersionOfOperationalPolicy() {
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-        }).doesNotThrowAnyException();
+    private void testReadGuardPolicies(String mediaType) throws Exception {
+        for (String resrcName : LEGACY_GUARD_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        }
+
+        Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(GUARD_POLICIES_VDNS_FL_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
     @Test
-    public void testGetDeployedVersionsOfOperationalPolicy() {
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(OPS_POLICIES_VCPE_DEPLOYED, true);
-            assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
-        }).doesNotThrowAnyException();
+    public void testReadOperationalPoliciesJson() throws Exception {
+        testReadOperationalPolicies(APP_JSON);
     }
 
     @Test
-    public void testDeleteSpecificVersionOfOperationalPolicy() {
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = deleteResource(OPS_POLICIES_VDNS_VERSION, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-        }).doesNotThrowAnyException();
+    public void testReadOperationalPoliciesYaml() throws Exception {
+        testReadOperationalPolicies(APP_YAML);
     }
 
-    private Response createResource(String endpoint, String resourceName, boolean http) throws Exception {
+    private void testReadOperationalPolicies(String mediaType) throws Exception {
+        for (String resrcName : LEGACY_OPERATIONAL_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        }
 
-        ToscaServiceTemplate rawServiceTemplate = standardCoder.decode(
-                ResourceUtils.getResourceAsString(resourceName), ToscaServiceTemplate.class);
-        final Invocation.Builder invocationBuilder;
+        Response rawResponse = readResource(OPS_POLICIES_VCPE_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
-        }
+        rawResponse = readResource(OPS_POLICIES_VCPE_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(OPS_POLICIES_VFIREWALL_LATEST, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(OPS_POLICIES_VFIREWALL_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(OPS_POLICIES + "/operational.restart/versions/1", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(OPS_POLICIES + "/operational.scaleout/versions/1", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(OPS_POLICIES + "/operational.modifyconfig/versions/1", APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        Entity<ToscaServiceTemplate> entity = Entity.entity(rawServiceTemplate, MediaType.APPLICATION_JSON);
-        return invocationBuilder.post(entity);
     }
 
-    private Response createGuardPolicy(String endpoint, String resourceName, boolean http) throws Exception {
+    @Test
+    public void testDeleteGuardPolicyJson() throws Exception {
+        testDeleteGuardPolicy(APP_JSON);
+    }
 
-        LegacyGuardPolicyInput rawGuardPolicy = standardCoder.decode(
-                ResourceUtils.getResourceAsString(resourceName), LegacyGuardPolicyInput.class);
-        final Invocation.Builder invocationBuilder;
+    @Test
+    public void testDeleteGuardPolicyYaml() throws Exception {
+        testDeleteGuardPolicy(APP_YAML);
+    }
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
+    private void testDeleteGuardPolicy(String mediaType) throws Exception {
+        for (String resrcName : LEGACY_GUARD_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
         }
 
-        Entity<LegacyGuardPolicyInput> entity = Entity.entity(rawGuardPolicy, MediaType.APPLICATION_JSON);
-        return invocationBuilder.post(entity);
+        Response rawResponse = deleteResource(GUARD_POLICIES_VDNS_FL_VERSION, mediaType);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = deleteResource(GUARD_POLICIES_VDNS_MINMAX_VERSION, APP_JSON);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
-    private Response createOperationalPolicy(String endpoint, String resourceName, boolean http) throws Exception {
+    @Test
+    public void testGetDeployedVersionsOfGuardPolicyJson() throws Exception {
+        testGetDeployedVersionsOfGuardPolicy(APP_JSON);
+    }
 
-        LegacyOperationalPolicy rawOpsPolicy = standardCoder.decode(
-                ResourceUtils.getResourceAsString(resourceName), LegacyOperationalPolicy.class);
-        final Invocation.Builder invocationBuilder;
+    @Test
+    public void testGetDeployedVersionsOfGuardPolicyYaml() throws Exception {
+        testGetDeployedVersionsOfGuardPolicy(APP_YAML);
+    }
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
-        }
+    private void testGetDeployedVersionsOfGuardPolicy(String mediaType) throws Exception {
+        Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL_DEPLOYED, mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals(
+                "could not find policy with ID guard.frequency.scaleout and type "
+                        + "onap.policies.controlloop.guard.FrequencyLimiter:1.0.0 deployed in any pdp group",
+                errorResponse.getErrorMessage());
+    }
 
-        Entity<LegacyOperationalPolicy> entity = Entity.entity(rawOpsPolicy, MediaType.APPLICATION_JSON);
-        return invocationBuilder.post(entity);
+    @Test
+    public void testDeleteOperationalPolicyJson() throws Exception {
+        testDeleteOperationalPolicy(APP_JSON);
     }
 
-    private Response readResource(String endpoint, boolean http) throws Exception {
+    @Test
+    public void testDeleteOperationalPolicyYaml() throws Exception {
+        testDeleteOperationalPolicy(APP_YAML);
+    }
 
-        final Invocation.Builder invocationBuilder;
+    private void testDeleteOperationalPolicy(String mediaType) throws Exception {
+        Response rawResponse = deleteResource(OPS_POLICIES_VCPE_VERSION, mediaType);
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("no policy found for policy: operational.restart:1", error.getErrorMessage());
+    }
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
-        }
+    @Test
+    public void testGetLatestVersionOfOperationalPolicyJson() throws Exception {
+        testGetLatestVersionOfOperationalPolicy(APP_JSON);
+    }
 
-        return invocationBuilder.get();
+    @Test
+    public void testGetLatestVersionOfOperationalPolicyYaml() throws Exception {
+        testGetLatestVersionOfOperationalPolicy(APP_YAML);
+    }
 
+    private void testGetLatestVersionOfOperationalPolicy(String mediaType) throws Exception {
+        Response rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, mediaType);
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("no policy found for policy: " + OP_POLICY_NAME_VDNS + ":null", errorResponse.getErrorMessage());
     }
 
-    private Response deleteResource(String endpoint, boolean http) throws Exception {
+    @Test
+    public void testGetSpecificVersionOfOperationalPolicyJson() throws Exception {
+        testGetSpecificVersionOfOperationalPolicy(APP_JSON);
+    }
 
-        final Invocation.Builder invocationBuilder;
+    @Test
+    public void testGetSpecificVersionOfOperationalPolicyYaml() throws Exception {
+        testGetSpecificVersionOfOperationalPolicy(APP_YAML);
+    }
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
-        }
+    private void testGetSpecificVersionOfOperationalPolicy(String mediaType) throws Exception {
+        Response rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, mediaType);
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("no policy found for policy: " + OP_POLICY_NAME_VDNS + ":1", errorResponse.getErrorMessage());
+    }
 
-        return invocationBuilder.delete();
+    @Test
+    public void testGetDeployedVersionsOfOperationalPolicyJson() throws Exception {
+        testGetDeployedVersionsOfOperationalPolicy(APP_JSON);
     }
 
-    private Main startApiService(final boolean http) throws Exception {
-        port = NetworkUtil.allocPort();
+    @Test
+    public void testGetDeployedVersionsOfOperationalPolicyYaml() throws Exception {
+        testGetDeployedVersionsOfOperationalPolicy(APP_YAML);
+    }
 
-        final String[] apiConfigParameters = new String[2];
-        if (http) {
-            COMMON_TEST_DATA.makeParameters("src/test/resources/parameters/ApiConfigParameters.json",
-                            "src/test/resources/parameters/ApiConfigParametersXXX.json", port);
-            apiConfigParameters[0] = "-c";
-            apiConfigParameters[1] = "src/test/resources/parameters/ApiConfigParametersXXX.json";
-        } else {
-            final Properties systemProps = System.getProperties();
-            systemProps.put("javax.net.ssl.keyStore", KEYSTORE);
-            systemProps.put("javax.net.ssl.keyStorePassword", "Pol1cy_0nap");
-            System.setProperties(systemProps);
-            COMMON_TEST_DATA.makeParameters("src/test/resources/parameters/ApiConfigParameters_Https.json",
-                            "src/test/resources/parameters/ApiConfigParameters_HttpsXXX.json", port);
-            apiConfigParameters[0] = "-c";
-            apiConfigParameters[1] = "src/test/resources/parameters/ApiConfigParameters_HttpsXXX.json";
+    private void testGetDeployedVersionsOfOperationalPolicy(String mediaType) throws Exception {
+        Response rawResponse = readResource(OPS_POLICIES_VCPE_DEPLOYED, mediaType);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals(
+                "could not find policy with ID " + OP_POLICY_NAME_VCPE + " and type "
+                        + "onap.policies.controlloop.Operational:1.0.0 deployed in any pdp group",
+                errorResponse.getErrorMessage());
+    }
+
+    @Test
+    public void testDeleteSpecificVersionOfOperationalPolicy() throws Exception {
+        Response rawResponse = deleteResource(OPS_POLICIES_VDNS_VERSION, APP_YAML);
+        assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("no policy found for policy: " + OP_POLICY_NAME_VDNS + ":1", errorResponse.getErrorMessage());
+    }
+
+    private Response createResource(String endpoint, String resourceName) throws Exception {
+
+        String mediaType = APP_JSON; // default media type
+        ToscaServiceTemplate rawServiceTemplate = new ToscaServiceTemplate();
+        if (resourceName.endsWith(".json")) {
+            rawServiceTemplate =
+                    standardCoder.decode(ResourceUtils.getResourceAsString(resourceName), ToscaServiceTemplate.class);
+        } else if (resourceName.endsWith(".yaml") || resourceName.endsWith(".yml")) {
+            mediaType = APP_YAML;
+            rawServiceTemplate = standardYamlCoder.decode(ResourceUtils.getResourceAsString(resourceName),
+                    ToscaServiceTemplate.class);
         }
-        return new Main(apiConfigParameters);
+
+        final Invocation.Builder invocationBuilder;
+
+        invocationBuilder = sendHttpsRequest(endpoint, mediaType);
+
+        Entity<ToscaServiceTemplate> entity = Entity.entity(rawServiceTemplate, mediaType);
+        return invocationBuilder.post(entity);
     }
 
-    private void stopApiService(final Main main) throws PolicyApiException {
+    private Response createGuardPolicy(String endpoint, String resourceName) throws Exception {
+
+        String mediaType = APP_JSON; // default media type
+        LegacyGuardPolicyInput rawGuardPolicy = new LegacyGuardPolicyInput();
+        if (resourceName.endsWith(".json")) {
+            rawGuardPolicy =
+                    standardCoder.decode(ResourceUtils.getResourceAsString(resourceName), LegacyGuardPolicyInput.class);
+        } else if (resourceName.endsWith(".yaml") || resourceName.endsWith(".yml")) {
+            mediaType = APP_YAML;
+            rawGuardPolicy = standardYamlCoder.decode(ResourceUtils.getResourceAsString(resourceName),
+                    LegacyGuardPolicyInput.class);
+        }
+
+        final Invocation.Builder invocationBuilder;
+
+        invocationBuilder = sendHttpsRequest(endpoint, mediaType);
 
-        main.shutdown();
+        Entity<LegacyGuardPolicyInput> entity = Entity.entity(rawGuardPolicy, mediaType);
+        return invocationBuilder.post(entity);
     }
 
-    private Invocation.Builder sendHttpRequest(final String endpoint) throws Exception {
+    private Response createOperationalPolicy(String endpoint, String resourceName) throws Exception {
+
+        String mediaType = APP_JSON; // default media type
+        LegacyOperationalPolicy rawOpsPolicy = new LegacyOperationalPolicy();
+        if (resourceName.endsWith(".json")) {
+            rawOpsPolicy = standardCoder.decode(ResourceUtils.getResourceAsString(resourceName),
+                    LegacyOperationalPolicy.class);
+        } else if (resourceName.endsWith(".yaml") || resourceName.endsWith(".yml")) {
+            mediaType = APP_YAML;
+            rawOpsPolicy = standardYamlCoder.decode(ResourceUtils.getResourceAsString(resourceName),
+                    LegacyOperationalPolicy.class);
+        }
 
-        final ClientConfig clientConfig = new ClientConfig();
+        final Invocation.Builder invocationBuilder;
 
-        final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic("healthcheck", "zb!XztG34");
-        clientConfig.register(feature);
+        invocationBuilder = sendHttpsRequest(endpoint, mediaType);
 
-        final Client client = ClientBuilder.newClient(clientConfig);
+        Entity<LegacyOperationalPolicy> entity = Entity.entity(rawOpsPolicy, mediaType);
+        return invocationBuilder.post(entity);
+    }
 
-        client.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, "true");
-        client.register(GsonMessageBodyHandler.class);
+    private Response readResource(String endpoint, String mediaType) throws Exception {
 
-        final WebTarget webTarget = client.target("http://localhost:" + port + "/policy/api/v1/" + endpoint);
+        final Invocation.Builder invocationBuilder;
 
-        final Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON);
+        invocationBuilder = sendHttpsRequest(endpoint, mediaType);
+
+        return invocationBuilder.get();
 
-        if (!NetworkUtil.isTcpPortOpen("localhost", port, 60, 1000L)) {
-            throw new IllegalStateException("cannot connect to port " + port);
-        }
-        return invocationBuilder;
     }
 
-    private Invocation.Builder sendHttpsRequest(final String endpoint) throws Exception {
+    private Response deleteResource(String endpoint, String mediaType) throws Exception {
 
-        final TrustManager[] noopTrustManager = new TrustManager[] { new X509TrustManager() {
+        final Invocation.Builder invocationBuilder;
 
-            @Override
-            public X509Certificate[] getAcceptedIssuers() {
-                return new X509Certificate[0];
-            }
+        invocationBuilder = sendHttpsRequest(endpoint, mediaType);
 
-            @Override
-            public void checkClientTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {}
+        return invocationBuilder.delete();
+    }
+
+    private Invocation.Builder sendHttpsRequest(final String endpoint, String mediaType) throws Exception {
 
-            @Override
-            public void checkServerTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {}
-        } };
+        final TrustManager[] noopTrustManager = NetworkUtil.getAlwaysTrustingManager();
 
         final SSLContext sc = SSLContext.getInstance("TLSv1.2");
         sc.init(null, noopTrustManager, new SecureRandom());
-        final ClientBuilder clientBuilder = ClientBuilder.newBuilder().sslContext(sc).hostnameVerifier((host,
-                session) -> true);
+        final ClientBuilder clientBuilder =
+                ClientBuilder.newBuilder().sslContext(sc).hostnameVerifier((host, session) -> true);
         final Client client = clientBuilder.build();
         final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic("healthcheck", "zb!XztG34");
         client.register(feature);
 
         client.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, "true");
-        client.register(GsonMessageBodyHandler.class);
+        if (APP_JSON.equalsIgnoreCase(mediaType)) {
+            client.register(GsonMessageBodyHandler.class);
+        } else if (APP_YAML.equalsIgnoreCase(mediaType)) {
+            client.register(YamlMessageBodyHandler.class);
+        }
 
-        final WebTarget webTarget = client.target("https://localhost:" + port + "/policy/api/v1/" + endpoint);
+        final WebTarget webTarget = client.target("https://localhost:" + apiPort + "/policy/api/v1/" + endpoint);
 
-        final Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON);
+        final Invocation.Builder invocationBuilder = webTarget.request(mediaType);
 
-        if (!NetworkUtil.isTcpPortOpen("localhost", port, 60, 1000L)) {
-            throw new IllegalStateException("cannot connect to port " + port);
+        if (!NetworkUtil.isTcpPortOpen("localhost", apiPort, 60, 1000L)) {
+            throw new IllegalStateException("cannot connect to port " + apiPort);
         }
         return invocationBuilder;
     }