diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver')
3 files changed, 67 insertions, 21 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 9f96bd38..f47c4058 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 @@ -22,7 +22,22 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class OperStatusVnfResponse { @JsonProperty("jobId") - private String 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 private ResponseDescriptor responseDescriptor; @@ -42,10 +57,45 @@ 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/TerminateVnfRequest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/TerminateVnfRequest.java index c4795d32..8bd31bc8 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/TerminateVnfRequest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/TerminateVnfRequest.java @@ -26,17 +26,17 @@ public class TerminateVnfRequest { private String vnfInstanceId; @JsonProperty("terminationType") - private TerminationType terminationType; + private String terminationType; @JsonProperty("gracefulTerminationTimeout") private Integer gracefulTerminationTimeout; - public TerminationType getTerminationType() { + public String getTerminationType() { return terminationType; } - public void setTerminationType(TerminationType terminationType) { + public void setTerminationType(String terminationType) { this.terminationType = terminationType; } 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 e1b8f967..83aa8580 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 @@ -27,16 +27,16 @@ public class ResponseDescriptor { private String status;//started;processing;finished;error @JsonProperty("progress") - private Integer progress;//progress (1-100) + private String progress;//progress (1-100) @JsonProperty("statusDescription") private String statusDescription; @JsonProperty("errorCode") - private Integer errorCode; + private String errorCode; @JsonProperty("responseId") - private Integer responseId; + private String responseId; @JsonProperty("responseHistoryList") private List<ResponseHistoryList> responseHistoryList; @@ -49,17 +49,13 @@ public class ResponseDescriptor { this.status = status; } - - - public Integer getProgress() { + public String getProgress() { return progress; } - public void setProgress(Integer progr) { - if(progr>0 && progr<100) { + public void setProgress(String progr) { progress = progr; - } } public String getStatusDescription() { @@ -70,19 +66,19 @@ public class ResponseDescriptor { this.statusDescription = statusDescription; } - public Integer getErrorCode() { + public String getErrorCode() { return errorCode; } - public void setErrorCode(Integer errorCode) { + public void setErrorCode(String errorCode) { this.errorCode = errorCode; } - public Integer getResponseId() { + public String getResponseId() { return responseId; } - public void setResponseId(Integer responseId) { + public void setResponseId(String responseId) { this.responseId = responseId; } |