Add workflowName and operationName to v8 of

Add workflowName and operationName to v8 of orchestrationRequests
response.
Fix typo in the schema for infra_active_requests.
Change version matching for the new interface fields.

Issue-ID: SO-2799
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: Icc7f3c6271023a578df2c1d969c807a578cc9577
(cherry picked from commit 654db79e01a20632cf1d7c3c6a786160aaa82eed)

1 files changed, 22 insertions, 4 deletions

diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Request.java b/common/src/main/java/org/onap/so/serviceinstancebeans/Request.java
index 75a6ba8280..2d8b12c12f 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/Request.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Request.java
@@ -35,6 +35,8 @@ public class Request {
     protected String finishTime;
     protected String requestScope;
     protected String requestType;
+    protected String workflowName;
+    protected String operationName;
     protected String originalRequestId;
     protected RequestDetails requestDetails;
     protected InstanceReferences instanceReferences;
@@ -83,6 +85,22 @@ public class Request {
         this.requestType = requestType;
     }
 
+    public String getWorkflowName() {
+        return workflowName;
+    }
+
+    public void setWorkflowName(String workflowName) {
+        this.workflowName = workflowName;
+    }
+
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName;
+    }
+
     public RequestStatus getRequestStatus() {
         return requestStatus;
     }
@@ -136,9 +154,9 @@ public class Request {
     public String toString() {
         return new ToStringBuilder(this).append("requestId", requestId).append("startTime", startTime)
                 .append("finishTime", finishTime).append("requestScope", requestScope)
-                .append("requestType", requestType).append("requestDetails", requestDetails)
-                .append("instanceReferences", instanceReferences).append("requestStatus", requestStatus)
-                .append("requestProcessingData", requestProcessingData).append("cloudRequestData", cloudRequestData)
-                .append("originalRequestId", originalRequestId).toString();
+                .append("requestType", requestType).append("workflowName", workflowName)
+                .append("requestDetails", requestDetails).append("instanceReferences", instanceReferences)
+                .append("requestStatus", requestStatus).append("requestProcessingData", requestProcessingData)
+                .append("cloudRequestData", cloudRequestData).append("originalRequestId", originalRequestId).toString();
     }
 }