X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=nokia%2Fvnfmdriver%2Fvfcadaptorservice%2Fvfcadaptor%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm%2Fvnfmdriver%2Fcontroller%2FVnfmDriverController.java;h=c51717d8d4aa63f57faed45841cab3ae96af35f2;hb=7014e3fe05b59edfaf164d53cbf540813b3e4143;hp=c48268626e56a92d94f9d72ce97af2558e532715;hpb=f089d0903beb6b87cccc7aad62352469c93189ea;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java
index c4826862..c51717d8 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/controller/VnfmDriverController.java
@@ -20,8 +20,8 @@ import java.io.IOException;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.http.HttpStatus;
 import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpStatus;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.exception.VnfmDriverException;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse;
@@ -58,7 +58,8 @@ public class VnfmDriverController {
 	private Gson gson = new Gson();
 	
 	@RequestMapping(value = "/swagger.json", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    public String apidoc() throws IOException {
+	@ResponseBody
+	public String apidoc() throws IOException {
         ClassLoader classLoader = getClass().getClassLoader();
         return IOUtils.toString(classLoader.getResourceAsStream("swagger.json"));
     }
@@ -72,6 +73,8 @@ public class VnfmDriverController {
 		
 		InstantiateVnfResponse response = vnfmDriverMgmr.instantiateVnf(request, vnfmId);
 		
+		logger.info("VnfmDriverController --> instantiateVnf response is " + gson.toJson(response));
+		
 		httpResponse.setStatus(HttpStatus.SC_CREATED);
 		
 		return response;
@@ -87,6 +90,8 @@ public class VnfmDriverController {
 		try {
 			TerminateVnfResponse response = vnfmDriverMgmr.terminateVnf(request, vnfmId, vnfInstanceId);
 			httpResponse.setStatus(HttpStatus.SC_CREATED);
+			
+			logger.info("VnfmDriverController --> terminateVnf response is " + gson.toJson(response));
 			return response;
 		}
 		catch(VnfmDriverException e)
@@ -107,6 +112,7 @@ public class VnfmDriverController {
 		try {
 			QueryVnfResponse response = vnfmDriverMgmr.queryVnf(vnfmId, vnfInstanceId);
 			httpResponse.setStatus(HttpStatus.SC_CREATED);
+			logger.info("VnfmDriverController --> queryVnf response is " + gson.toJson(response));
 			return response;
 		}
 		catch(VnfmDriverException e)
@@ -125,6 +131,8 @@ public class VnfmDriverController {
 		try {
 			OperStatusVnfResponse response = vnfmDriverMgmr.getOperStatus(vnfmId, jobId);
 			httpResponse.setStatus(HttpStatus.SC_CREATED);
+			
+			logger.info("VnfmDriverController --> getOperStatus response is " + gson.toJson(response));
 			return response;
 		}
 		catch(VnfmDriverException e)
@@ -146,6 +154,7 @@ public class VnfmDriverController {
 		try {
 			ScaleVnfResponse response = vnfmDriverMgmr.scaleVnf(request, vnfmId, vnfInstanceId);
 			httpResponse.setStatus(HttpStatus.SC_CREATED);
+			logger.info("VnfmDriverController --> scaleVnf response is " + gson.toJson(response));
 			return response;
 		}
 		catch(VnfmDriverException e)
@@ -167,6 +176,7 @@ public class VnfmDriverController {
 		try {
 			HealVnfResponse response = vnfmDriverMgmr.healVnf(request, vnfmId, vnfInstanceId);
 			httpResponse.setStatus(HttpStatus.SC_CREATED);
+			logger.info("VnfmDriverController --> healVnf response is " + gson.toJson(response));
 			return response;
 		}
 		catch(VnfmDriverException e)
@@ -186,6 +196,4 @@ public class VnfmDriverController {
 			logger.error("VnfmDriverController --> processControllerException error to sendError ", e1);
 		}
 	}
-
-
 }