1 files changed, 75 insertions, 116 deletions
diff --git a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoDummyServer.java b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoDummyServer.java
index 5eb0a01ee..0d719e50d 100644
--- a/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoDummyServer.java
+++ b/controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoDummyServer.java
@@ -25,6 +25,7 @@ package org.onap.policy.so;
 import com.google.gson.Gson;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -38,6 +39,7 @@ public class TestSoDummyServer {
     private static int putMessagesReceived = 0;
     private static int statMessagesReceived = 0;
     private static int getMessagesReceived = 0;
+    private static int deleteMessagesReceived = 0;
 
     private static Map<String, SOResponse> ongoingRequestMap = new ConcurrentHashMap<>();
 
@@ -51,7 +53,9 @@ public class TestSoDummyServer {
     public Response serviceGetStats() {
         statMessagesReceived++;
         return Response.status(200).entity("{\"GET\": " + getMessagesReceived + ",\"STAT\": " + statMessagesReceived
-                        + ",\"POST\": " + postMessagesReceived + ",\"PUT\": " + putMessagesReceived + "}").build();
+                + ",\"POST\": " + postMessagesReceived + ",\"PUT\": " + putMessagesReceived
+                + ",\"DELETE\": " + deleteMessagesReceived + "}").build();
+
     }
 
     /**
@@ -77,98 +81,78 @@ public class TestSoDummyServer {
     @Path("/serviceInstantiation/v7")
     public Response servicePostRequest(final String jsonString) {
         postMessagesReceived++;
+        return buildResponse(jsonString);
+    }
 
-        if (jsonString == null) {
-            return Response.status(400).build();
-        }
-
-        SORequest request = null;
-        try {
-            request = new Gson().fromJson(jsonString, SORequest.class);
-        } catch (Exception e) {
-            return Response.status(400).build();
-        }
-
-        if (request == null) {
-            return Response.status(400).build();
-        }
-
-        if (request.getRequestType() == null) {
-            return Response.status(400).build();
-        }
-
-        if ("ReturnBadJson".equals(request.getRequestType())) {
-            return Response.status(200)
-                            .entity("{\"GET\": , " + getMessagesReceived + ",\"STAT\": " + statMessagesReceived
-                                            + ",\"POST\": , " + postMessagesReceived + ",\"PUT\": "
-                                            + putMessagesReceived + "}")
-                            .build();
-        }
-
-        SOResponse response = new SOResponse();
-        response.setRequest(request);
-        response.setRequestReferences(new SORequestReferences());
-        response.getRequestReferences().setRequestId(request.getRequestId().toString());
-
-        if ("ReturnCompleted".equals(request.getRequestType())) {
-            response.getRequest().getRequestStatus().setRequestState("COMPLETE");
-            response.setHttpResponseCode(200);
-            String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
-        }
-
-        if ("ReturnFailed".equals(request.getRequestType())) {
-            response.getRequest().getRequestStatus().setRequestState("FAILED");
-            response.setHttpResponseCode(200);
-            String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
-        }
-
-        if ("ReturnOnging202".equals(request.getRequestType())) {
-            ongoingRequestMap.put(request.getRequestId().toString(), response);
+    /**
+     * Post.
+     * 
+     * @param serviceInstanceId service instance id
+     * @param vnfInstanceId vnf instance id
+     * @param jsonString json body
+     * @return http response
+     */
+    @POST
+    @Path("/serviceInstantiation/v7/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut")
+    public Response servicePostRequestVfModules(@PathParam("serviceInstanceId") final String serviceInstanceId,
+                    @PathParam("vnfInstanceId") final String vnfInstanceId, final String jsonString) {
+        postMessagesReceived++;
+        return buildResponse(jsonString);
+    }
 
-            response.getRequest().getRequestStatus().setRequestState("ONGOING");
-            response.setHttpResponseCode(202);
-            String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
-        }
+    /**
+     * Get instance ID.
+     * 
+     * @param nsInstanceId node instance id
+     * @return http response
+     */
+    @GET
+    @Path("/orchestrationRequests/v5/{nsInstanceId}")
+    public Response soRequestStatus(@PathParam("nsInstanceId") final String nsInstanceId) {
 
-        if ("ReturnOnging200".equals(request.getRequestType())) {
-            ongoingRequestMap.put(request.getRequestId().toString(), response);
+        SOResponse response = ongoingRequestMap.get(nsInstanceId);
 
-            response.getRequest().getRequestStatus().setRequestState("ONGOING");
-            response.setHttpResponseCode(200);
+        int iterationsLeft = Integer.valueOf(response.getRequest().getRequestScope());
+        if (--iterationsLeft > 0) {
+            response.getRequest().setRequestScope(new Integer(iterationsLeft).toString());
             String responseString = new Gson().toJson(response, SOResponse.class);
             return Response.status(response.getHttpResponseCode()).entity(responseString).build();
         }
 
+        ongoingRequestMap.remove(nsInstanceId);
 
-        if ("ReturnBadAfterWait".equals(request.getRequestType())) {
-            ongoingRequestMap.put(request.getRequestId().toString(), response);
-
-            response.getRequest().getRequestStatus().setRequestState("ONGOING");
-            response.setHttpResponseCode(200);
-            String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
+        if ("ReturnBadAfterWait".equals(response.getRequest().getRequestType())) {
+            return Response.status(400).build();
         }
 
-        return null;
+        response.getRequest().getRequestStatus().setRequestState("COMPLETE");
+        response.getRequest().setRequestScope("0");
+        response.setHttpResponseCode(200);
+        String responseString = new Gson().toJson(response, SOResponse.class);
+        return Response.status(response.getHttpResponseCode()).entity(responseString).build();
     }
 
     /**
-     * Post.
-     * 
+     * Delete.
+     *
      * @param serviceInstanceId service instance id
      * @param vnfInstanceId vnf instance id
+     * @param vfModuleInstanceId vf module instance id
      * @param jsonString json body
      * @return http response
      */
-    @POST
-    @Path("/serviceInstantiation/v7/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/scaleOut")
-    public Response servicePostRequestVfModules(@PathParam("serviceInstanceId") final String serviceInstanceId,
-                    @PathParam("vnfInstanceId") final String vnfInstanceId, final String jsonString) {
-        postMessagesReceived++;
+    @DELETE
+    @Path("/serviceInstances/v7/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}")
+    public Response serviceDeleteRequestVfModules(
+            @PathParam("serviceInstanceId") final String serviceInstanceId,
+            @PathParam("vnfInstanceId") final String vnfInstanceId,
+            @PathParam("vfModuleInstanceId") final String vfModuleInstanceId,
+            final String jsonString) {
+        deleteMessagesReceived++;
+        return buildResponse(jsonString);
+    }
 
+    private Response buildResponse(String jsonString) {
         if (jsonString == null) {
             return Response.status(400).build();
         }
@@ -190,10 +174,9 @@ public class TestSoDummyServer {
 
         if ("ReturnBadJson".equals(request.getRequestType())) {
             return Response.status(200)
-                            .entity("{\"GET\": , " + getMessagesReceived + ",\"STAT\": " + statMessagesReceived
-                                            + ",\"POST\": , " + postMessagesReceived + ",\"PUT\": "
-                                            + putMessagesReceived + "}")
-                            .build();
+                    .entity("{\"GET\": , " + getMessagesReceived + ",\"STAT\": " + statMessagesReceived
+                            + ",\"POST\":" + " , " + postMessagesReceived + ",\"PUT\": " + putMessagesReceived
+                            + ",\"DELETE\": " + deleteMessagesReceived + "}").build();
         }
 
         SOResponse response = new SOResponse();
@@ -205,14 +188,18 @@ public class TestSoDummyServer {
             response.getRequest().getRequestStatus().setRequestState("COMPLETE");
             response.setHttpResponseCode(200);
             String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
+            return Response.status(response.getHttpResponseCode())
+                    .entity(responseString)
+                    .build();
         }
 
         if ("ReturnFailed".equals(request.getRequestType())) {
             response.getRequest().getRequestStatus().setRequestState("FAILED");
             response.setHttpResponseCode(200);
             String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
+            return Response.status(response.getHttpResponseCode())
+                    .entity(responseString)
+                    .build();
         }
 
         if ("ReturnOnging202".equals(request.getRequestType())) {
@@ -221,7 +208,9 @@ public class TestSoDummyServer {
             response.getRequest().getRequestStatus().setRequestState("ONGOING");
             response.setHttpResponseCode(202);
             String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
+            return Response.status(response.getHttpResponseCode())
+                    .entity(responseString)
+                    .build();
         }
 
         if ("ReturnOnging200".equals(request.getRequestType())) {
@@ -230,51 +219,21 @@ public class TestSoDummyServer {
             response.getRequest().getRequestStatus().setRequestState("ONGOING");
             response.setHttpResponseCode(200);
             String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
+            return Response.status(response.getHttpResponseCode())
+                    .entity(responseString)
+                    .build();
         }
 
-
         if ("ReturnBadAfterWait".equals(request.getRequestType())) {
             ongoingRequestMap.put(request.getRequestId().toString(), response);
 
             response.getRequest().getRequestStatus().setRequestState("ONGOING");
             response.setHttpResponseCode(200);
             String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
+            return Response.status(response.getHttpResponseCode())
+                    .entity(responseString)
+                    .build();
         }
-
         return null;
     }
-
-    /**
-     * Get instance ID.
-     * 
-     * @param nsInstanceId node instance id
-     * @return http response
-     */
-    @GET
-    @Path("/orchestrationRequests/v5/{nsInstanceId}")
-    public Response soRequestStatus(@PathParam("nsInstanceId") final String nsInstanceId) {
-
-        SOResponse response = ongoingRequestMap.get(nsInstanceId);
-
-        int iterationsLeft = Integer.valueOf(response.getRequest().getRequestScope());
-        if (--iterationsLeft > 0) {
-            response.getRequest().setRequestScope(new Integer(iterationsLeft).toString());
-            String responseString = new Gson().toJson(response, SOResponse.class);
-            return Response.status(response.getHttpResponseCode()).entity(responseString).build();
-        }
-
-        ongoingRequestMap.remove(nsInstanceId);
-
-        if ("ReturnBadAfterWait".equals(response.getRequest().getRequestType())) {
-            return Response.status(400).build();
-        }
-
-        response.getRequest().getRequestStatus().setRequestState("COMPLETE");
-        response.getRequest().setRequestScope("0");
-        response.setHttpResponseCode(200);
-        String responseString = new Gson().toJson(response, SOResponse.class);
-        return Response.status(response.getHttpResponseCode()).entity(responseString).build();
-    }
 }