summaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-requests-db
diff options
context:
space:
mode:
authorKuleshov, Elena <evn@att.com>2020-04-07 15:50:32 -0400
committerBenjamin, Max (mb388a) <mb388a@att.com>2020-04-07 15:50:34 -0400
commit654db79e01a20632cf1d7c3c6a786160aaa82eed (patch)
tree5098ed345998eee759fa2b193ebaac47b48bf795 /mso-api-handlers/mso-requests-db
parentda123b489a80779f3162d9e007616c6a083414bc (diff)
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
Diffstat (limited to 'mso-api-handlers/mso-requests-db')
-rw-r--r--mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java4
-rw-r--r--mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java3
-rw-r--r--mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java23
3 files changed, 27 insertions, 3 deletions
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java
index 8c4d0718b1..019530aea4 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/ArchivedInfraRequests.java
@@ -78,7 +78,9 @@ public class ArchivedInfraRequests extends InfraRequests {
.append("networkName", getNetworkName()).append("networkType", getNetworkType())
.append("requestorId", getRequestorId()).append("configurationId", getConfigurationId())
.append("configurationName", getConfigurationName()).append("operationalEnvId", getOperationalEnvId())
- .append("operationalEnvName", getOperationalEnvName()).append("requestUrl", getRequestUrl()).toString();
+ .append("operationalEnvName", getOperationalEnvName()).append("requestUrl", getRequestUrl())
+ .append("tenantName", getTenantName()).append("productFamilyName", getProductFamilyName())
+ .append("workflowName", getWorkflowName()).append("operationName", getOperationName()).toString();
}
}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java
index 49fce7608b..02e403c37e 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraActiveRequests.java
@@ -90,6 +90,7 @@ public class InfraActiveRequests extends InfraRequests {
.append("originalRequestId", getOriginalRequestId())
.append("extSystemErrorSource", getExtSystemErrorSource())
.append("rollbackExtSystemErrorSource", getRollbackExtSystemErrorSource())
- .append("tenantName", getTenantName()).append("productFamilyName", getProductFamilyName()).toString();
+ .append("tenantName", getTenantName()).append("productFamilyName", getProductFamilyName())
+ .append("workflowName", getWorkflowName()).append("operationName", getOperationName()).toString();
}
}
diff --git a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
index a6d6af8a07..cf6cf687b0 100644
--- a/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
+++ b/mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java
@@ -155,6 +155,10 @@ public abstract class InfraRequests implements java.io.Serializable {
private String tenantName;
@Column(name = "PRODUCT_FAMILY_NAME", length = 80)
private String productFamilyName;
+ @Column(name = "WORKFLOW_NAME", length = 200)
+ private String workflowName;
+ @Column(name = "OPERATION_NAME", length = 200)
+ private String operationName;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@JoinColumn(name = "SO_REQUEST_ID", referencedColumnName = "REQUEST_ID", updatable = false)
@@ -580,6 +584,22 @@ public abstract class InfraRequests implements java.io.Serializable {
this.productFamilyName = productFamilyName;
}
+ 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;
+ }
+
@PrePersist
protected void onCreate() {
if (requestScope == null)
@@ -641,6 +661,7 @@ public abstract class InfraRequests implements java.io.Serializable {
.append("instanceGroupName", getInstanceGroupName()).append("requestUrl", getRequestUrl())
.append("originalRequestId", originalRequestId).append("extSystemErrorSource", extSystemErrorSource)
.append("rollbackExtSystemErrorSource", rollbackExtSystemErrorSource).append("tenantName", tenantName)
- .append("productFamilyName", productFamilyName).toString();
+ .append("productFamilyName", productFamilyName).append("workflowName", workflowName)
+ .append("operationName", operationName).toString();
}
}