diff options
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/mso')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/mso/rest/AsyncRequestStatus.java | 54 | ||||
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestStatus.java | 39 |
2 files changed, 89 insertions, 4 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/rest/AsyncRequestStatus.java b/vid-app-common/src/main/java/org/onap/vid/mso/rest/AsyncRequestStatus.java index 61e0d3af6..09c571c29 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/rest/AsyncRequestStatus.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/rest/AsyncRequestStatus.java @@ -31,6 +31,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonIgnoreProperties(ignoreUnknown = true) public class AsyncRequestStatus { + public Request request; public AsyncRequestStatus(Request request) { @@ -88,14 +89,61 @@ public class AsyncRequestStatus { public static class RequestDetails { public RequestInfo requestInfo; + public ModelInfo modelInfo; + public RequestParameters requestParameters; + public Project project; + public OwningEntity owningEntity; + public CloudConfiguration cloudConfiguration; + public LineOfBusiness lineOfBusiness; + public Platform platform; + + } + + @JsonIgnoreProperties(ignoreUnknown = true) + public static class LineOfBusiness { + public String lineOfBusinessName; + } + @JsonIgnoreProperties(ignoreUnknown = true) + public static class CloudConfiguration { + public String tenantId; + public String tenantName; + public String cloudOwner; + public String lcpCloudRegionId; + } + @JsonIgnoreProperties(ignoreUnknown = true) + public static class Platform { + public String platformName; } @JsonIgnoreProperties(ignoreUnknown = true) public static class RequestInfo { public String instanceName; + public String source; + } + @JsonIgnoreProperties(ignoreUnknown = true) + public static class ModelInfo { + public String modelInvariantId; + public String modelType; + public String modelName; + public String modelVersion; + public String modelVersionId; + public String modelUuid; + public String modelInvariantUuid; + } + @JsonIgnoreProperties(ignoreUnknown = true) + public static class RequestParameters { + public String subscriptionServiceType; + public String aLaCarte; + public String testApi; + } + @JsonIgnoreProperties(ignoreUnknown = true) + public static class Project { + public String projectName; + } + @JsonIgnoreProperties(ignoreUnknown = true) + public static class OwningEntity { + public String owningEntityId; + public String owningEntityName; } - - - } diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestStatus.java b/vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestStatus.java index 29356aa4d..c574e5ae5 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestStatus.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/rest/RequestStatus.java @@ -50,6 +50,21 @@ public class RequestStatus { this.statusMessage = statusMessage; this.timestamp = timestamp; } + public RequestStatus(String requestState, String statusMessage, String timestamp, String flowStatus) { + this.requestState = requestState; + this.statusMessage = statusMessage; + this.timestamp = timestamp; + this.flowStatus = flowStatus; + } + + /** + * short description of the flow status + * (Required) + * + */ + @JsonProperty("flowStatus") + private String flowStatus; + /** * percentage complete estimate from 0 to 100 @@ -215,6 +230,28 @@ public class RequestStatus { this.additionalProperties.put(name, value); } + /** + * additional descriptive information about the status + * + * @return + * The flowStatus + */ + @JsonProperty("flowStatus") + public String getFlowStatus() { + return flowStatus; + } + + /** + * additional descriptive information about the status + * + * @param flowStatus + * The flowStatus + */ + @JsonProperty("flowStatus") + public void setFlowStatus(String flowStatus) { + this.flowStatus = flowStatus; + } + @Override public int hashCode() { return new HashCodeBuilder().append(percentProgress).append(requestState).append(statusMessage).append(timestamp).append(wasRolledBack).append(additionalProperties).toHashCode(); @@ -229,7 +266,7 @@ public class RequestStatus { return false; } RequestStatus rhs = ((RequestStatus) other); - return new EqualsBuilder().append(percentProgress, rhs.percentProgress).append(requestState, rhs.requestState).append(statusMessage, rhs.statusMessage).append(timestamp, rhs.timestamp).append(wasRolledBack, rhs.wasRolledBack).append(additionalProperties, rhs.additionalProperties).isEquals(); + return new EqualsBuilder().append(percentProgress, rhs.percentProgress).append(requestState, rhs.requestState).append(statusMessage, rhs.statusMessage).append(timestamp, rhs.timestamp).append(wasRolledBack, rhs.wasRolledBack).append(flowStatus, rhs.flowStatus).append(additionalProperties, rhs.additionalProperties).isEquals(); } } |