Merge "Fixing VFC simulator for junit tests"

2 files changed, 16 insertions, 5 deletions

diff --git a/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/VfcSimulatorJaxRs.java b/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/VfcSimulatorJaxRs.java
index 51a85ce60..cd894825c 100644
--- a/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/VfcSimulatorJaxRs.java
+++ b/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/VfcSimulatorJaxRs.java
@@ -24,21 +24,30 @@ import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.Context;
 
 @Path("/api/nslcm/v1")
 public class VfcSimulatorJaxRs {
 	
 	@POST
 	@Path("/ns/{nsInstanceId}/heal")
-	public String vfcPostQuery(@PathParam("nsInstanceId") String nsInstanceId)
+	public String vfcPostQuery(@PathParam("nsInstanceId") String nsInstanceId,
+                                   @Context final HttpServletResponse response)
 	{
+                response.setStatus(HttpServletResponse.SC_ACCEPTED);
+                try {
+                        response.flushBuffer();
+                }catch(Exception e){}
+
 		return "{\"jobId\":\"1\"}";
 	}
 	
 	@GET
-	@Path("/jobs/{jobId}&responseId={responseId}")
-	public String vfcGetQuery(@PathParam("jobId") String jobId, @PathParam("responseId") String responseId){
-		return "{\"jobId\" : "+jobId+",\"responseDescriptor\" : {\"progress\" : \"40\",\"status\" : \"proccessing\",\"statusDescription\" : \"OMC VMs are decommissioned in VIM\",\"errorCode\" : null,\"responseId\": "+responseId+",\"responseHistoryList\": [{\"progress\" : \"40\",\"status\" : \"proccessing\",\"statusDescription\" : \"OMC VMs are decommissioned in VIM\",\"errorCode\" : null,\"responseId\" : \"1\"}, {\"progress\" : \"41\",\"status\" : \"proccessing\",\"statusDescription\" : \"OMC VMs are decommissioned in VIM\",\"errorCode\" : null,\"responseId\" : \"2\"}]}}";
+	@Path("/jobs/{jobId}")
+	public String vfcGetQuery(@PathParam("jobId") String jobId) {
+		return "{\"jobId\" : "+jobId+",\"responseDescriptor\" : {\"progress\" : \"40\",\"status\" : \"finished\",\"statusDescription\" : \"OMC VMs are decommissioned in VIM\",\"errorCode\" : null,\"responseId\": 101 ,\"responseHistoryList\": [{\"progress\" : \"40\",\"status\" : \"proccessing\",\"statusDescription\" : \"OMC VMs are decommissioned in VIM\",\"errorCode\" : null,\"responseId\" : \"1\"}, {\"progress\" : \"41\",\"status\" : \"proccessing\",\"statusDescription\" : \"OMC VMs are decommissioned in VIM\",\"errorCode\" : null,\"responseId\" : \"2\"}]}}";
 	}
 	
 }
+
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
index 0fb41ab9b..7dadaadef 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
@@ -22,6 +22,7 @@ package org.onap.policy.simulators;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
+import static org.junit.Assert.assertTrue;
 
 import java.util.HashMap;
 
@@ -54,13 +55,14 @@ public class VfcSimulatorTest {
 	public void testPost(){
 		Pair<Integer, String> httpDetails = RESTManager.post("http://localhost:6668/api/nslcm/v1/ns/1234567890/heal", "username", "password", new HashMap<String, String>(), "application/json", "Some Request Here");
 		assertNotNull(httpDetails);
+                assertTrue(httpDetails.a == 202);
 		VFCResponse response = Serialization.gsonPretty.fromJson(httpDetails.b, VFCResponse.class);
 		assertNotNull(response);
 	}
 	
 	@Test
 	public void testGet(){
-		Pair<Integer, String> httpDetails = RESTManager.get("http://localhost:6668/api/nslcm/v1/jobs/1234&responseId=5678", "username", "password", new HashMap<String, String>());
+		Pair<Integer, String> httpDetails = RESTManager.get("http://localhost:6668/api/nslcm/v1/jobs/1234", "username", "password", new HashMap<String, String>());
 		assertNotNull(httpDetails);
 		VFCResponse response = Serialization.gsonPretty.fromJson(httpDetails.b, VFCResponse.class);
 		assertNotNull(response);