X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=main%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Frest%2FTestApiRestServer.java;fp=main%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fapi%2Fmain%2Frest%2FTestApiRestServer.java;h=442f9dba800db1cbcb7b8100205cd97a39eac9f5;hb=5b4fbae502f73a4ad58135a58ef348b704cc6ad3;hp=665616b55839152e9f497229392946d3fb93e627;hpb=9b4c685930a76acf43bd5cad5bf2a127a38ed656;p=policy%2Fapi.git

diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
index 665616b5..442f9dba 100644
--- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
@@ -105,12 +105,17 @@ public class TestApiRestServer {
         + "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_LATEST = "policytypes/"
         + "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 GUARD_POLICIES_VDNS_FL_LATEST =
             "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.frequency.scaleout"
             + "/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";
     private static final String GUARD_POLICIES_VDNS_MINMAX_LATEST =
             "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/guard.minmax.scaleout"
             + "/versions/latest";
@@ -122,33 +127,23 @@ public class TestApiRestServer {
     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.Guard/versions/1.0.0/policies/operational.restart"
+            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart"
             + "/versions/latest";
+    private static final String OPS_POLICIES_VCPE_DEPLOYED =
+            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart"
+            + "/versions/deployed";
     private static final String OPS_POLICIES_VDNS_LATEST =
-            "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/operational.scaleout"
+            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.scaleout"
             + "/versions/latest";
     private static final String OPS_POLICIES_VFIREWALL_LATEST =
-            "policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/operational.modifyconfig"
+            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.modifyconfig"
             + "/versions/latest";
     private static final String OPS_POLICIES_VCPE_VERSION = "policytypes/"
-        + "onap.policies.controlloop.Guard/versions/1.0.0/policies/operational.restart/versions/1";
+        + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.restart/versions/1";
     private static final String OPS_POLICIES_VDNS_VERSION = "policytypes/"
-        + "onap.policies.controlloop.Guard/versions/1.0.0/policies/operational.scaleout/versions/1";
+        + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.scaleout/versions/1";
     private static final String OPS_POLICIES_VFIREWALL_VERSION = "policytypes/"
-        + "onap.policies.controlloop.Guard/versions/1.0.0/policies/operational.modifyconfig/versions/1";
-
-    private static final String GET_DEPLOYED_VERSION_OF_POLICY =
-            "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/"
-        + "1.0.0/policies/onap.restart.tca/versions/deployed";
-    private static final String GET_LATEST_VERSION_OF_OPERATIONAL_POLICY =
-            "policytypes/onap.policies.controlloop.Operational/versions/"
-            + "1.0.0/policies/operational.scaleout/versions/latest";
-    private static final String GET_SPECIFIC_VERSION_OF_OPERATIONAL_POLICY =
-            "policytypes/onap.policies.controlloop.Operational/versions/"
-            + "1.0.0/policies/operational.scaleout/versions/3";
-    private static final String DEL_SPECIFIC_VERSION_OF_OPERATIONAL_POLICY =
-            "policytypes/onap.policies.controlloop.Operational/versions/1.0.0/"
-                    + "policies/operational.scaleout/versions/1";
+        + "onap.policies.controlloop.Operational/versions/1.0.0/policies/operational.modifyconfig/versions/1";
 
     private static final String KEYSTORE = System.getProperty("user.dir") + "/src/test/resources/ssl/policy-keystore";
     private static final CommonTestData COMMON_TEST_DATA = new CommonTestData();
@@ -567,6 +562,15 @@ public class TestApiRestServer {
         }).doesNotThrowAnyException();
     }
 
+    @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();
+    }
+
     @Test
     public void testDeleteOperationalPolicy() {
 
@@ -638,7 +642,7 @@ public class TestApiRestServer {
     public void testGetDeployedVersionsOfPolicy() {
         assertThatCode(() -> {
             main = startApiService(true);
-            Response rawResponse = readResource(GET_DEPLOYED_VERSION_OF_POLICY, true);
+            Response rawResponse = readResource(POLICYTYPES_TCA_POLICIES_VCPE_DEPLOYED, true);
             assertEquals(Response.Status.NOT_FOUND.getStatusCode(), rawResponse.getStatus());
         }).doesNotThrowAnyException();
     }
@@ -647,7 +651,7 @@ public class TestApiRestServer {
     public void testGetLatestVersionOfOperationalPolicy() {
         assertThatCode(() -> {
             main = startApiService(true);
-            Response rawResponse = readResource(GET_LATEST_VERSION_OF_OPERATIONAL_POLICY, true);
+            Response rawResponse = readResource(OPS_POLICIES_VDNS_LATEST, true);
             assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
         }).doesNotThrowAnyException();
     }
@@ -656,16 +660,25 @@ public class TestApiRestServer {
     public void testGetSpecificVersionOfOperationalPolicy() {
         assertThatCode(() -> {
             main = startApiService(true);
-            Response rawResponse = readResource(GET_SPECIFIC_VERSION_OF_OPERATIONAL_POLICY, true);
+            Response rawResponse = readResource(OPS_POLICIES_VDNS_VERSION, true);
             assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
         }).doesNotThrowAnyException();
     }
 
+    @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();
+    }
+
     @Test
     public void testDeleteSpecificVersionOfOperationalPolicy() {
         assertThatCode(() -> {
             main = startApiService(true);
-            Response rawResponse = deleteResource(DEL_SPECIFIC_VERSION_OF_OPERATIONAL_POLICY, true);
+            Response rawResponse = deleteResource(OPS_POLICIES_VDNS_VERSION, true);
             assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), rawResponse.getStatus());
         }).doesNotThrowAnyException();
     }