diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver')
3 files changed, 11 insertions, 77 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/OperStatusVnfResponse.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/OperStatusVnfResponse.java index f47c4058..8d91940c 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/OperStatusVnfResponse.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/OperStatusVnfResponse.java @@ -24,22 +24,7 @@ public class OperStatusVnfResponse { @JsonProperty("jobId") private String jobId; - @JsonProperty("status") - private String status; - - @JsonProperty("progress") - private String progress; - - @JsonProperty("statusDescription") - private String statusDescription; - - @JsonProperty("errorCode") - private String errorCode; - - @JsonProperty("responseId") - private String responseId; - - @JsonProperty("responseDescriptor")//Including:vnfStatus��statusDescription��errorCode��progress��responseHistoryList��responseId + @JsonProperty("responsedescriptor")//Including:vnfStatus��statusDescription��errorCode��progress��responseHistoryList��responseId private ResponseDescriptor responseDescriptor; public String getJobId() { @@ -57,45 +42,5 @@ public class OperStatusVnfResponse { public void setResponseDescriptor(ResponseDescriptor responseDescriptor) { this.responseDescriptor = responseDescriptor; } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getProgress() { - return progress; - } - - public void setProgress(String progress) { - this.progress = progress; - } - - public String getStatusDescription() { - return statusDescription; - } - - public void setStatusDescription(String statusDescription) { - this.statusDescription = statusDescription; - } - - public String getErrorCode() { - return errorCode; - } - - public void setErrorCode(String errorCode) { - this.errorCode = errorCode; - } - - public String getResponseId() { - return responseId; - } - - public void setResponseId(String responseId) { - this.responseId = responseId; - } } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/entity/ResponseDescriptor.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/entity/ResponseDescriptor.java index 83aa8580..e5dc7411 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/entity/ResponseDescriptor.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/entity/ResponseDescriptor.java @@ -38,8 +38,8 @@ public class ResponseDescriptor { @JsonProperty("responseId") private String responseId; - @JsonProperty("responseHistoryList") - private List<ResponseHistoryList> responseHistoryList; +// @JsonProperty("responseHistoryList") +// private List<ResponseHistoryList> responseHistoryList; public String getStatus() { return status; @@ -81,20 +81,4 @@ public class ResponseDescriptor { public void setResponseId(String responseId) { this.responseId = responseId; } - - public List<ResponseHistoryList> getResponseHistoryList() { - return responseHistoryList; - } - - public void setResponseHistoryList(List<ResponseHistoryList> responseHistoryList) { - this.responseHistoryList = responseHistoryList; - } - - - - - - - - } 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 8dd68323..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 @@ -73,7 +73,7 @@ public class VnfmDriverController { InstantiateVnfResponse response = vnfmDriverMgmr.instantiateVnf(request, vnfmId); - logger.info("InstantiateVnfResponse is " + gson.toJson(response)); + logger.info("VnfmDriverController --> instantiateVnf response is " + gson.toJson(response)); httpResponse.setStatus(HttpStatus.SC_CREATED); @@ -90,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) @@ -110,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) @@ -128,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) @@ -149,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) @@ -170,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) @@ -189,6 +196,4 @@ public class VnfmDriverController { logger.error("VnfmDriverController --> processControllerException error to sendError ", e1); } } - - } |