Update get operation status part

[vfc/nfvo/driver/vnfm/svnfm.git] / nokia / vnfmdriver / vfcadaptorservice / vfcadaptor / src / main / java / org / onap / vfc / nfvo / driver / vnfm / svnfm / vnfmdriver / controller / VnfmDriverController.java

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 c482686..c51717d 100644 (file)
--- 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);
                }
        }
-
-
 }