From 7b42dee721e03ee3f0a52dda92010e09d748cf72 Mon Sep 17 00:00:00 2001 From: "Boslet, Cory" Date: Sun, 8 Mar 2020 10:43:59 -0400 Subject: false positive on network creates Added a new resourceStatusMessage field to the GET orch request API added new column to infra active request table updated openstack adapter to record the resource status added support of v8 on GET orch request API. Issue-ID: SO-2718 Signed-off-by: Benjamin, Max (mb388a) Change-Id: I73b35f1562de4df477bf7e5cef01de13440ba98a --- .../onap/so/serviceinstancebeans/RequestStatus.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'common/src/main') diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java index 3ada984b58..f39aa3656a 100644 --- a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java +++ b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestStatus.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,6 +32,8 @@ public class RequestStatus { protected String requestState; @JsonProperty("statusMessage") protected String statusMessage; + @JsonProperty("resourceStatusMessage") + protected String resourceStatusMessage; @JsonProperty("percentProgress") protected Integer percentProgress; @JsonProperty("timestamp") @@ -95,6 +97,14 @@ public class RequestStatus { this.statusMessage = statusMessage; } + public String getResourceStatusMessage() { + return resourceStatusMessage; + } + + public void setResourceStatusMessage(String resourceStatusMessage) { + this.resourceStatusMessage = resourceStatusMessage; + } + public Integer getPercentProgress() { return percentProgress; } @@ -122,8 +132,8 @@ public class RequestStatus { @Override public String toString() { return new ToStringBuilder(this).append("requestState", requestState).append("statusMessage", statusMessage) - .append("percentProgress", percentProgress).append("timestamp", timeStamp) - .append("extSystemErrorSource", extSystemErrorSource) + .append("resourceStatusMessage", resourceStatusMessage).append("percentProgress", percentProgress) + .append("timestamp", timeStamp).append("extSystemErrorSource", extSystemErrorSource) .append("rollbackExtSystemErrorSource", rollbackExtSystemErrorSource).append("flowStatus", flowStatus) .append("retryStatusMessage", retryStatusMessage).append("rollbackStatusMessage", rollbackStatusMessage) .toString(); -- cgit 1.2.3-korg