Allow semantic versioning in all templates in api
[policy/api.git] / main / src / test / java / org / onap / policy / api / main / rest / TestApiRestServer.java
index 756c7ae..5896b35 100644 (file)
@@ -1,7 +1,9 @@
 /*-
  * ============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-2021 AT&T Intellectual Property. All rights reserved.
+ *  Modifications Copyright (C) 2019-2020, 2022-2023 Nordix Foundation.
+ *  Modifications Copyright (C) 2020-2023 Bell Canada. 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.
 
 package org.onap.policy.api.main.rest;
 
-import static org.assertj.core.api.Assertions.assertThatCode;
-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 static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+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.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.Test;
-import org.onap.policy.api.main.exception.PolicyApiException;
-import org.onap.policy.api.main.parameters.CommonTestData;
-import org.onap.policy.api.main.parameters.RestServerParameters;
-import org.onap.policy.api.main.startstop.Main;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.onap.policy.api.main.PolicyApiApplication;
+import org.onap.policy.api.main.rest.utils.CommonTestRestController;
 import org.onap.policy.common.endpoints.report.HealthCheckReport;
-import org.onap.policy.common.gson.GsonMessageBodyHandler;
 import org.onap.policy.common.utils.coder.StandardCoder;
 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.common.utils.security.SelfSignedKeyStore;
 import org.onap.policy.models.errors.concepts.ErrorResponse;
 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;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.annotation.DirtiesContext.ClassMode;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 
 /**
- * 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 {
+@SpringBootTest(classes = PolicyApiApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ActiveProfiles({ "test", "default" })
+@DirtiesContext(classMode = ClassMode.AFTER_CLASS)
+class TestApiRestServer extends CommonTestRestController {
 
-    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 POLICYTYPES = "policytypes";
-    private static final String POLICYTYPES_TCA = "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app";
+    private static final String POLICYTYPES_TCA = "policytypes/onap.policies.monitoring.tcagen2";
     private static final String POLICYTYPES_COLLECTOR =
             "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server";
-    private static final String POLICYTYPES_TCA_VERSION =
-            "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0";
-    private static final String POLICYTYPES_TCA_LATEST =
-            "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/latest";
+    private static final String POLICYTYPES_TCA_VERSION = "policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0";
+    private static final String POLICYTYPES_TCA_LATEST = "policytypes/onap.policies.monitoring.tcagen2/versions/latest";
     private static final String POLICYTYPES_COLLECTOR_VERSION =
             "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server/versions/1.0.0";
     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";
+            "policytypes/onap.policies.monitoring.tcagen2/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";
+            "policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies/onap.restart.tca";
+    private static final String POLICYTYPES_TCA_POLICIES_VCPE_VERSION1 =
+            "policytypes/" + "onap.policies.monitoring.tcagen2/versions/1.0.0/policies/onap.restart.tca/versions/1.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";
-
-    private static final String GUARD_POLICIES =
-            "policytypes/onap.policy.controlloop.guard/versions/1.0.0/policies";
-    private static final String GUARD_POLICIES_VDNS_FL =
-            "policytypes/onap.policy.controlloop.guard/versions/1.0.0/policies/guard.frequency.scaleout";
-    private static final String GUARD_POLICIES_VDNS_MINMAX =
-            "policytypes/onap.policy.controlloop.guard/versions/1.0.0/policies/guard.minmax.scaleout";
-    private static final String GUARD_POLICIES_VDNS_FL_VERSION = "policytypes/"
-        + "onap.policy.controlloop.guard/versions/1.0.0/policies/guard.frequency.scaleout/versions/1.0.0";
-    private static final String GUARD_POLICIES_VDNS_MINMAX_VERSION = "policytypes/"
-        + "onap.policy.controlloop.guard/versions/1.0.0/policies/guard.minmax.scaleout/versions/1.0.0";
-
-    private static final String OPS_POLICIES =
-            "policytypes/onap.policy.controlloop.operational/versions/1.0.0/policies";
-    private static final String OPS_POLICIES_VCPE =
-            "policytypes/onap.policy.controlloop.guard/versions/1.0.0/policies/operational.restart";
-    private static final String OPS_POLICIES_VDNS =
-            "policytypes/onap.policy.controlloop.guard/versions/1.0.0/policies/operational.scaleout";
-    private static final String OPS_POLICIES_VFIREWALL =
-            "policytypes/onap.policy.controlloop.guard/versions/1.0.0/policies/operational.modifyconfig";
-    private static final String OPS_POLICIES_VCPE_VERSION = "policytypes/"
-        + "onap.policy.controlloop.guard/versions/1.0.0/policies/operational.restart/versions/1.0.0";
-    private static final String OPS_POLICIES_VDNS_VERSION = "policytypes/"
-        + "onap.policy.controlloop.guard/versions/1.0.0/policies/operational.scaleout/versions/1.0.0";
-    private static final String OPS_POLICIES_VFIREWALL_VERSION = "policytypes/"
-        + "onap.policy.controlloop.guard/versions/1.0.0/policies/operational.modifyconfig/versions/1.0.0";
-
-    private static String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore";
-    private Main main;
-    private ApiRestServer restServer;
-    private StandardCoder standardCoder = new StandardCoder();
+            + "onap.policies.monitoring.tcagen2/versions/1.0.0/policies/onap.restart.tca/versions/latest";
+
+    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 POLICIES = "policies";
+
+    private static final String TOSCA_POLICY_VER_RESOURCE =
+        "policytypes/onap.restart.tca.snapshot.yaml";
     // @formatter:off
-    private String[] toscaPolicyResourceNames = {
-        "policies/vCPE.policy.monitoring.input.tosca.json",
-        "policies/vDNS.policy.monitoring.input.tosca.json",
-        "policies/vFirewall.policy.monitoring.input.tosca.json",
-    };
-
-    private String[] toscaPolicyTypeResourceNames = {
-        "policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.json",
-        "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.json"
-    };
-
-    private String[] legacyGuardPolicyResourceNames = {
-        "policies/vDNS.policy.guard.frequency.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[] TOSCA_POLICY_RESOURCE_NAMES = {"policies/vCPE.policy.monitoring.input.tosca.json",
+        "policies/vCPE.policy.monitoring.input.tosca.yaml", "policies/vDNS.policy.monitoring.input.tosca.json",
+        "policies/vDNS.policy.monitoring.input.tosca.v2.yaml"};
+
+    private static final String[] TOSCA_POLICIES_RESOURCE_NAMES = {
+        "policies/vCPE.policies.optimization.input.tosca.json", "policies/vCPE.policies.optimization.input.tosca.yaml"};
+
+    private static final String TOSCA_POLICYTYPE_OP_RESOURCE =
+        "policytypes/onap.policies.controlloop.operational.Common.yaml";
+
+    private static final String TOSCA_POLICYTYPE_VER_RESOURCE =
+        "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.snapshot.yaml";
+
+    private static final String[] TOSCA_POLICYTYPE_RESOURCE_NAMES = {
+        "policytypes/onap.policies.monitoring.tcagen2.yaml",
+        "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml",
+        "policytypes/onap.policies.controlloop.operational.common.Drools.yaml",
+        "policytypes/onap.policies.controlloop.guard.Common.yaml",
+        "policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml",
+        "policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml",
+        "policytypes/onap.policies.controlloop.guard.common.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 POLICIES_VCPE_VERSION1 = "policies/onap.restart.tca/versions/1.0.0";
     // @formatter:on
 
+    private static final StandardCoder standardCoder = new StandardCoder();
+    private static SelfSignedKeyStore keystore;
+
+    @LocalServerPort
+    private int apiPort;
+
     /**
-     * Method for cleanup after each test.
+     * Initializes parameters and set up test environment.
+     *
+     * @throws IOException on I/O exceptions
+     * @throws InterruptedException if interrupted
      */
-    @After
-    public void teardown() {
-
-        try {
-            if (NetworkUtil.isTcpPortOpen("localhost", 6969, 1, 1000L)) {
-                if (main != null) {
-                    stopApiService(main);
-                } else if (restServer != null) {
-                    restServer.stop();
-                }
-            }
-        } catch (InterruptedException | IOException | PolicyApiException exp) {
-            LOGGER.error("teardown failed", exp);
-        }
+    @BeforeAll
+    static void setupParameters() throws IOException, InterruptedException {
+        keystore = new SelfSignedKeyStore();
     }
 
-    @Test
-    public void testHealthCheckSuccess() {
-
-        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);
-        } catch (final Exception exp) {
-            LOGGER.error("testHealthCheckSuccess failed", exp);
-            fail("Test should not throw an exception");
-        }
+    @DynamicPropertySource
+    static void registerPgProperties(DynamicPropertyRegistry registry) {
+        registry.add("server.ssl.enabled", () -> "true");
+        registry.add("server.ssl.key-store", () -> keystore.getKeystoreName());
+        registry.add("server.ssl.key-store-password", () -> SelfSignedKeyStore.KEYSTORE_PASSWORD);
+        registry.add("server.ssl.key-store-type", () -> "PKCS12");
+        registry.add("server.ssl.key-alias", () -> "policy@policy.onap.org");
+        registry.add("server.ssl.key-password", () -> SelfSignedKeyStore.PRIVATE_KEY_PASSWORD);
     }
 
     @Test
-    public void testHealthCheckFailure() throws InterruptedException, IOException {
-
-        final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false);
-        restServerParams.setName(CommonTestData.API_GROUP_NAME);
-        restServer = new ApiRestServer(restServerParams);
-        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("ApiRestServer [servers="));
-        } catch (final Exception exp) {
-            LOGGER.error("testHealthCheckFailure failed", exp);
-            fail("Test should not throw an exception");
-        }
+    void testSwagger() throws Exception {
+        super.testSwagger(apiPort);
     }
 
     @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");
+    void testCreatePolicyTypes() throws Exception {
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+            ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+            assertNotNull(response);
+            assertFalse(response.getPolicyTypes().isEmpty());
         }
-    }
 
-    @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");
-        }
+        // Send a policy type with a null value to trigger an error
+        Response rawResponse = readResource(POLICYTYPES, APP_JSON, apiPort);
+        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), apiPort);
+        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 testApiStatistics_500() {
-
-        final RestServerParameters restServerParams = new CommonTestData().getRestServerParameters(false);
-        restServerParams.setName(CommonTestData.API_GROUP_NAME);
-        restServer = new ApiRestServer(restServerParams);
-        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");
+    void testCreatePolicies() throws Exception {
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort);
+            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");
-        }
+        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.tcagen2", "IDontExist");
+        TextFileUtils.putStringAsTextFile(toscaPolicy, "src/test/resources/policies/BadTestPolicy.yaml");
+
+        Response rawResponse2 =
+                createResource(POLICYTYPES_TCA_POLICIES,
+                    "src/test/resources/policies/BadTestPolicy.yaml", apiPort);
+        assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), rawResponse2.getStatus());
+        ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class);
+        assertThat(errorResponse.getErrorMessage())
+                .contains("item \"entity\" value \"onap.restart.tca:1.0.0\" INVALID, does not equal existing entity");
     }
 
     @Test
-    public void testApiStatisticsConstructorIsPrivate() {
-
-        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"));
+    void testSimpleCreatePolicies() throws Exception {
+        for (String resrcName : TOSCA_POLICIES_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICIES, resrcName, apiPort);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
         }
-    }
 
-    @Test
-    public void testCreatePolicyTypes() {
+        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]);
 
-        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();
+        toscaPolicy = toscaPolicy.replaceAll("onap.policies.monitoring.tcagen2", "IDontExist");
+        toscaPolicy = toscaPolicy.replaceAll("onap.restart.tca", "onap.restart.tca.IDontExist");
+        TextFileUtils.putStringAsTextFile(toscaPolicy, "src/test/resources/policies/BadTestPolicy.yaml");
+
+        Response rawResponse2 =
+            createResource(POLICIES, "src/test/resources/policies/BadTestPolicy.yaml", apiPort);
+        ErrorResponse errorResponse = rawResponse2.readEntity(ErrorResponse.class);
+        assertEquals(Response.Status.NOT_ACCEPTABLE.getStatusCode(), rawResponse2.getStatus());
+        assertThat(errorResponse.getErrorMessage())
+                .contains("item \"policy type\" value \"IDontExist:1.0.0\" INVALID, not found");
     }
 
     @Test
-    public void testReadPolicyTypes() {
+    void testPoliciesVersioning() throws Exception {
+        var rawResponse = createResource(POLICYTYPES, TOSCA_POLICYTYPE_VER_RESOURCE, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        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().get(0).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();
+        rawResponse = createResource(POLICIES, TOSCA_POLICY_VER_RESOURCE, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
+    @SuppressWarnings("unchecked")
     @Test
-    public void testDeletePolicyType() {
+    void testToscaCompliantOpDroolsPolicies() throws Exception {
+        Response rawResponse = createResource(POLICYTYPES, TOSCA_POLICYTYPE_OP_RESOURCE, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        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());
+        rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-            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();
-    }
+        rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    @Test
-    public void testCreatePolicies() {
+        rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        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();
-    }
+        rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    @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();
-    }
+        rawResponse = deleteResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    @Test
-    public void testDeletePolicies() {
+        rawResponse = createResource(POLICIES, TOSCA_POLICY_OP_DROOLS_VCPE_RESOURSE_YAML, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_POLICIES_VCPE_VERSION, APP_YAML, apiPort);
+        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());
 
-        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();
+        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, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
     @Test
-    public void testCreateGuardPolicies() {
-
-        assertThatCode(() -> {
-            main = startApiService(true);
-            for (String resrcName : legacyGuardPolicyResourceNames) {
-                Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, true);
-                assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
-            }
-        }).doesNotThrowAnyException();
+    void testHealthCheckSuccessJson() throws Exception {
+        testHealthCheckSuccess(APP_JSON);
     }
 
     @Test
-    public void testCreateOperationalPolicies() {
+    void testHealthCheckSuccessYaml() throws Exception {
+        testHealthCheckSuccess(APP_YAML);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(true);
-            for (String resrcName : legacyOperationalPolicyResourceNames) {
-                Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, true);
-                assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
-            }
-        }).doesNotThrowAnyException();
+    private void testHealthCheckSuccess(String mediaType) throws Exception {
+        final Invocation.Builder invocationBuilder = sendHttpsRequest(
+                HEALTHCHECK_ENDPOINT, mediaType, apiPort);
+        final HealthCheckReport report = invocationBuilder.get(HealthCheckReport.class);
+        validateHealthCheckReport(NAME, SELF, true, 200, ALIVE, report);
     }
 
     @Test
-    public void testReadGuardPolicies() {
-
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(GUARD_POLICIES_VDNS_FL, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy ID: guard.frequency.scaleout",
-                    error.getErrorMessage());
-
-            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 ID: guard.frequency.scaleout",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(GUARD_POLICIES_VDNS_MINMAX, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy ID: guard.minmax.scaleout",
-                    error.getErrorMessage());
-
-            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 ID: guard.minmax.scaleout",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
+    void testReadPolicyTypesJson() throws Exception {
+        testReadPolicyTypes(APP_JSON);
     }
 
     @Test
-    public void testReadOperationalPolicies() {
-
-        assertThatCode(() -> {
-            main = startApiService(true);
-            Response rawResponse = readResource(OPS_POLICIES_VCPE, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            ErrorResponse error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy ID: operational.restart",
-                    error.getErrorMessage());
-
-            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 ID: operational.restart",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(OPS_POLICIES_VDNS, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy ID: operational.scaleout",
-                    error.getErrorMessage());
-
-            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 ID: operational.scaleout",
-                    error.getErrorMessage());
-
-            rawResponse = readResource(OPS_POLICIES_VFIREWALL, true);
-            assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
-            error = rawResponse.readEntity(ErrorResponse.class);
-            assertEquals("no policy found for policy ID: operational.modifyconfig",
-                    error.getErrorMessage());
-
-            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 ID: operational.modifyconfig",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
+    void testReadPolicyTypesYaml() throws Exception {
+        testReadPolicyTypes(APP_YAML);
     }
 
-    @Test
-    public void testDeleteGuardPolicy() {
+    private void testReadPolicyTypes(String mediaType) throws Exception {
+        Response rawResponse =
+            readResource("policytypes/onap.policies.optimization.resource.HpaPolicy", mediaType,
+                apiPort);
+        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());
 
-        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 ID: guard.frequency.scaleout",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
-    }
+        rawResponse = readResource(POLICYTYPES, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertFalse(response.getPolicyTypes().isEmpty());
 
-    @Test
-    public void testDeleteOperationalPolicy() {
+        rawResponse = readResource(POLICYTYPES_TCA, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        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 ID: operational.restart",
-                    error.getErrorMessage());
-        }).doesNotThrowAnyException();
-    }
+        rawResponse = readResource(POLICYTYPES_TCA_VERSION, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    @Test
-    public void testHttpsCreatePolicyTypes() {
+        rawResponse = readResource(POLICYTYPES_TCA_LATEST, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        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();
-    }
+        rawResponse = readResource(POLICYTYPES_COLLECTOR, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    @Test
-    public void testHttpsCreatePolicies() {
+        rawResponse = readResource(POLICYTYPES_COLLECTOR_VERSION, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        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();
-    }
+        rawResponse = readResource(POLICYTYPES_COLLECTOR_LATEST, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    @Test
-    public void testHttpsCreateGuardPolicies() {
+        rawResponse = readResource(POLICYTYPES_DROOLS, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_VERSION, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = readResource(POLICYTYPES_DROOLS_VERSION_LATEST, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        assertThatCode(() -> {
-            main = startApiService(false);
-            for (String resrcName : legacyGuardPolicyResourceNames) {
-                Response rawResponse = createGuardPolicy(GUARD_POLICIES, resrcName, false);
-                assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
-            }
-        }).doesNotThrowAnyException();
+        rawResponse = readResource(POLICYTYPES_NAMING_VERSION, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
     }
 
     @Test
-    public void testHttpsCreateOperationalPolicies() {
+    void testDeletePolicyTypeJson() throws Exception {
+        testDeletePolicyType(APP_JSON);
+    }
 
-        assertThatCode(() -> {
-            main = startApiService(false);
-            for (String resrcName : legacyOperationalPolicyResourceNames) {
-                Response rawResponse = createOperationalPolicy(OPS_POLICIES, resrcName, false);
-                assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
-            }
-        }).doesNotThrowAnyException();
+    @Test
+    void testDeletePolicyTypeYaml() throws Exception {
+        testDeletePolicyType(APP_YAML);
     }
 
-    private Response createResource(String endpoint, String resourceName, boolean http) throws Exception {
+    private void testDeletePolicyType(String mediaType) throws Exception {
+        Response rawResponse = deleteResource("policytypes/onap.policies.IDoNotExist/versions/1.0.0",
+            mediaType, apiPort);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
 
-        ToscaServiceTemplate rawServiceTemplate = standardCoder.decode(
-                ResourceUtils.getResourceAsString(resourceName), ToscaServiceTemplate.class);
-        final Invocation.Builder invocationBuilder;
+        rawResponse = createResource(POLICYTYPES, "policytypes/onap.policies.Test.yaml", apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
-        }
+        rawResponse =
+            readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse =
+            deleteResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        Entity<ToscaServiceTemplate> entity = Entity.entity(rawServiceTemplate, MediaType.APPLICATION_JSON);
-        return invocationBuilder.post(entity);
+        rawResponse =
+            readResource("policytypes/onap.policies.Test/versions/1.0.0", mediaType, apiPort);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
     }
 
-    private Response createGuardPolicy(String endpoint, String resourceName, boolean http) throws Exception {
+    @Test
+    void testReadPoliciesJson() throws Exception {
+        testReadPolicies(APP_JSON);
+    }
 
-        LegacyGuardPolicyInput rawGuardPolicy = standardCoder.decode(
-                ResourceUtils.getResourceAsString(resourceName), LegacyGuardPolicyInput.class);
-        final Invocation.Builder invocationBuilder;
+    @Test
+    void testReadPoliciesYaml() throws Exception {
+        testReadPolicies(APP_YAML);
+    }
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
+    private void testReadPolicies(String mediaType) throws Exception {
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
         }
 
-        Entity<LegacyGuardPolicyInput> entity = Entity.entity(rawGuardPolicy, MediaType.APPLICATION_JSON);
-        return invocationBuilder.post(entity);
-    }
+        Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    private Response createOperationalPolicy(String endpoint, String resourceName, boolean http) throws Exception {
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        LegacyOperationalPolicy rawOpsPolicy = standardCoder.decode(
-                ResourceUtils.getResourceAsString(resourceName), LegacyOperationalPolicy.class);
-        final Invocation.Builder invocationBuilder;
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
-        }
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        Entity<LegacyOperationalPolicy> entity = Entity.entity(rawOpsPolicy, MediaType.APPLICATION_JSON);
-        return invocationBuilder.post(entity);
-    }
+        rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    private Response readResource(String endpoint, boolean http) throws Exception {
+    }
 
-        final Invocation.Builder invocationBuilder;
+    @Test
+    void testNamingPolicyGet() throws Exception {
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
-        }
+        Response rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/"
+                + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0", APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        return invocationBuilder.get();
+        rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/"
+                + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0?mode=referenced", APP_JSON, apiPort);
+        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());
 
-    private Response deleteResource(String endpoint, boolean http) throws Exception {
+        rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/"
+                + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/latest?mode=referenced", APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        final Invocation.Builder invocationBuilder;
+        namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size());
+        assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size());
+        assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size());
 
-        if (http) {
-            invocationBuilder = sendHttpRequest(endpoint);
-        } else {
-            invocationBuilder = sendHttpsRequest(endpoint);
-        }
+        rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/policies"
+                + "?mode=referenced", APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        return invocationBuilder.delete();
-    }
+        namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size());
+        assertEquals(1, namingServiceTemplate.getPolicyTypesAsMap().size());
+        assertEquals(3, namingServiceTemplate.getDataTypesAsMap().size());
 
-    private Main startApiService(final boolean http) {
+        rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/"
+                + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/1.0.0", APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        final String[] apiConfigParameters = new String[2];
-        if (http) {
-            apiConfigParameters[0] = "-c";
-            apiConfigParameters[1] = "parameters/ApiConfigParameters.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);
-            apiConfigParameters[0] = "-c";
-            apiConfigParameters[1] = "parameters/ApiConfigParameters_Https.json";
-        }
-        return new Main(apiConfigParameters);
-    }
+        namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
 
-    private void stopApiService(final Main main) throws PolicyApiException {
+        assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size());
+        assertNull(namingServiceTemplate.getPolicyTypes());
+        assertNull(namingServiceTemplate.getDataTypes());
 
-        main.shutdown();
-    }
+        rawResponse = readResource("policytypes/onap.policies.Naming/versions/1.0.0/"
+                + "policies/SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP/versions/latest", APP_JSON, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-    private Invocation.Builder sendHttpRequest(final String endpoint) throws Exception {
+        namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size());
+        assertNull(namingServiceTemplate.getPolicyTypes());
+        assertNull(namingServiceTemplate.getDataTypes());
 
-        final ClientConfig clientConfig = new ClientConfig();
+        rawResponse =
+            readResource("policytypes/onap.policies.Naming/versions/1.0.0/policies", APP_JSON,
+                apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic("healthcheck", "zb!XztG34");
-        clientConfig.register(feature);
+        namingServiceTemplate = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertEquals(1, namingServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap().size());
+        assertNull(namingServiceTemplate.getPolicyTypes());
+        assertNull(namingServiceTemplate.getDataTypes());
+    }
 
-        final Client client = ClientBuilder.newClient(clientConfig);
+    @Test
+    void testDeletePoliciesJson() throws Exception {
+        testDeletePolicies(APP_JSON);
+    }
 
-        client.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, "true");
-        client.register(GsonMessageBodyHandler.class);
+    @Test
+    void testDeletePoliciesYaml() throws Exception {
+        testDeletePolicies(APP_YAML);
+    }
 
-        final WebTarget webTarget = client.target("http://localhost:6969/policy/api/v1/" + endpoint);
+    private void testDeletePolicies(String mediaType) throws Exception {
+        Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort);
+        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());
+    }
 
-        final Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON);
+    @Test
+    void testDeletePolicyVersionJson() throws Exception {
+        testDeletePolicyVersion(APP_JSON);
+    }
 
-        if (!NetworkUtil.isTcpPortOpen("localhost", 6969, 6, 10000L)) {
-            throw new IllegalStateException("cannot connect to port 6969");
-        }
-        return invocationBuilder;
+    @Test
+    void testDeletePolicyVersionYaml() throws Exception {
+        testDeletePolicyVersion(APP_YAML);
     }
 
-    private Invocation.Builder sendHttpsRequest(final String endpoint) throws Exception {
+    private void testDeletePolicyVersion(String mediaType) throws Exception {
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort);
+            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, apiPort);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        }
+        Response rawResponse = deleteResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
 
-        final TrustManager[] noopTrustManager = new TrustManager[] { new X509TrustManager() {
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_VERSION1, mediaType, apiPort);
+        assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
+        ErrorResponse errorResponse = rawResponse.readEntity(ErrorResponse.class);
+        assertEquals("policies for onap.restart.tca:1.0.0 do not exist", errorResponse.getErrorMessage());
 
-            @Override
-            public X509Certificate[] getAcceptedIssuers() {
-                return new X509Certificate[0];
-            }
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE, mediaType, apiPort);
+        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());
 
-            @Override
-            public void checkClientTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {}
+        rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_LATEST, mediaType, apiPort);
+        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());
+    }
 
-            @Override
-            public void checkServerTrusted(final java.security.cert.X509Certificate[] certs, final String authType) {}
-        } };
+    @Test
+    void testGetAllVersionOfPolicyJson() throws Exception {
+        testGetAllVersionOfPolicy(APP_JSON);
+    }
 
-        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 Client client = clientBuilder.build();
-        final HttpAuthenticationFeature feature = HttpAuthenticationFeature.basic("healthcheck", "zb!XztG34");
-        client.register(feature);
+    @Test
+    void testGetAllVersionOfPolicyYaml() throws Exception {
+        testGetAllVersionOfPolicy(APP_YAML);
+    }
 
-        client.property(ClientProperties.METAINF_SERVICES_LOOKUP_DISABLE, "true");
-        client.register(GsonMessageBodyHandler.class);
+    private void testGetAllVersionOfPolicy(String mediaType) throws Exception {
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort);
+            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, apiPort);
+            assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+        }
+        Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES, mediaType, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+    }
 
-        final WebTarget webTarget = client.target("https://localhost:6969/policy/api/v1/" + endpoint);
+    @Test
+    void testGetPoliciesJson() throws Exception {
+        getPolicies(APP_JSON);
+    }
 
-        final Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON);
+    @Test
+    void testGetPoliciesYaml() throws Exception {
+        getPolicies(APP_YAML);
+    }
 
-        if (!NetworkUtil.isTcpPortOpen("localhost", 6969, 6, 10000L)) {
-            throw new IllegalStateException("cannot connect to port 6969");
+    private void getPolicies(String mediaType) throws Exception {
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort);
+            assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+            ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+            assertThat(response).isNotNull();
+            assertThat(response.getPolicyTypes()).isNotEmpty();
+        }
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort);
+            assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
         }
-        return invocationBuilder;
+        Response rawResponse = readResource(POLICIES, mediaType, apiPort);
+        assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+        ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertThat(response.getToscaTopologyTemplate().getPolicies()).isNotEmpty();
     }
 
-    private void updateApiStatistics() {
+    @Test
+    void testGetSpecificPolicyJson() throws Exception {
+        getSpecificPolicy(APP_JSON);
+    }
 
-        ApiStatisticsManager.updateTotalApiCallCount();
-        ApiStatisticsManager.updateApiCallSuccessCount();
-        ApiStatisticsManager.updateApiCallFailureCount();
-        ApiStatisticsManager.updateTotalPolicyGetCount();
-        ApiStatisticsManager.updateTotalPolicyPostCount();
-        ApiStatisticsManager.updateTotalPolicyTypeGetCount();
-        ApiStatisticsManager.updateTotalPolicyTypePostCount();
-        ApiStatisticsManager.updatePolicyGetSuccessCount();
-        ApiStatisticsManager.updatePolicyGetFailureCount();
-        ApiStatisticsManager.updatePolicyPostSuccessCount();
-        ApiStatisticsManager.updatePolicyPostFailureCount();
-        ApiStatisticsManager.updatePolicyTypeGetSuccessCount();
-        ApiStatisticsManager.updatePolicyTypeGetFailureCount();
-        ApiStatisticsManager.updatePolicyTypePostSuccessCount();
-        ApiStatisticsManager.updatePolicyTypePostFailureCount();
+    @Test
+    void testGetSpecificPolicyYaml() throws Exception {
+        getSpecificPolicy(APP_YAML);
     }
 
-    private void validateStatisticsReport(final StatisticsReport report, final int code) {
+    private void getSpecificPolicy(String mediaType) throws Exception {
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES, resrcName, apiPort);
+            assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+            ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+            assertThat(response).isNotNull();
+            assertThat(response.getPolicyTypes()).isNotEmpty();
+        }
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            Response rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort);
+            assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+        }
+        Response rawResponse = readResource(POLICIES_VCPE_VERSION1, mediaType, apiPort);
+        assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+        ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+        assertThat(response.getToscaTopologyTemplate().getPolicies()).hasSize(1);
+    }
+
+    @Test
+    void testDeleteSpecificPolicy() throws Exception {
+        Response rawResponse;
+        for (String resrcName : TOSCA_POLICYTYPE_RESOURCE_NAMES) {
+            rawResponse = createResource(POLICYTYPES, resrcName, apiPort);
+            assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+            ToscaServiceTemplate response = rawResponse.readEntity(ToscaServiceTemplate.class);
+            assertThat(response).isNotNull();
+            assertThat(response.getPolicyTypes()).isNotEmpty();
+        }
+        for (String resrcName : TOSCA_POLICY_RESOURCE_NAMES) {
+            rawResponse = createResource(POLICYTYPES_TCA_POLICIES, resrcName, apiPort);
+            assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+        }
+
+        rawResponse = readResource(POLICIES_VCPE_VERSION1, APP_JSON, apiPort);
+        assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+
+        // delete a particular policy
+        rawResponse = deleteResource(POLICIES_VCPE_VERSION1, APP_JSON, apiPort);
+        assertThat(rawResponse.getStatus()).isEqualTo(Response.Status.OK.getStatusCode());
+
+        rawResponse = readResource(POLICIES_VCPE_VERSION1, APP_JSON, apiPort);
+        assertThat(rawResponse.getStatus()).isEqualTo(Status.NOT_FOUND.getStatusCode());
+
+        rawResponse = deleteResource(POLICIES_VCPE_VERSION1, APP_JSON, apiPort);
+        assertThat(rawResponse.getStatus()).isEqualTo(Status.NOT_FOUND.getStatusCode());
 
-        assertEquals(code, report.getCode());
     }
 
     private void validateHealthCheckReport(final String name, final String url, final boolean healthy, final int code,
@@ -807,4 +697,4 @@ public class TestApiRestServer {
         assertEquals(code, report.getCode());
         assertEquals(message, report.getMessage());
     }
-}
\ No newline at end of file
+}