From b75b28b8e56f19203cb6cce8ffeeaa771b9b60d8 Mon Sep 17 00:00:00 2001
From: "Plummer, Brittany" <brittany.plummer@att.com>
Date: Wed, 26 Jun 2019 10:58:22 -0400
Subject: add rollback ext system error source
Added rollbackExtSystemErrorSource column and updated GET
orchestrationRequests response
Added missing columns from requestDb to schema.sql
Change-Id: I2380f08b9bb1c86922e8faea70454df722c0873a
Issue-ID: SO-2054
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
.../org/onap/so/db/request/beans/InfraActiveRequests.java | 3 ++-
.../java/org/onap/so/db/request/beans/InfraRequests.java | 12 +++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
(limited to 'mso-api-handlers/mso-requests-db')
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 9da6ff21ac..d0a4aa2c5f 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
@@ -89,6 +89,7 @@ public class InfraActiveRequests extends InfraRequests {
.append("configurationName", getConfigurationName()).append("operationalEnvId", getOperationalEnvId())
.append("operationalEnvName", getOperationalEnvName()).append("requestUrl", getRequestUrl())
.append("originalRequestId", getOriginalRequestId())
- .append("extSystemErrorSource", getExtSystemErrorSource()).toString();
+ .append("extSystemErrorSource", getExtSystemErrorSource())
+ .append("rollbackExtSystemErrorSource", getRollbackExtSystemErrorSource()).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 ecc4f46149..464cacb6b0 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
@@ -157,6 +157,8 @@ public abstract class InfraRequests implements java.io.Serializable {
private String originalRequestId;
@Column(name = "EXT_SYSTEM_ERROR_SOURCE", length = 80)
private String extSystemErrorSource;
+ @Column(name = "ROLLBACK_EXT_SYSTEM_ERROR_SOURCE", length = 80)
+ private String rollbackExtSystemErrorSource;
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
@JoinColumn(name = "SO_REQUEST_ID", referencedColumnName = "REQUEST_ID")
@@ -590,6 +592,14 @@ public abstract class InfraRequests implements java.io.Serializable {
this.extSystemErrorSource = extSystemErrorSource;
}
+ public String getRollbackExtSystemErrorSource() {
+ return this.rollbackExtSystemErrorSource;
+ }
+
+ public void setRollbackExtSystemErrorSource(String rollbackExtSystemErrorSource) {
+ this.rollbackExtSystemErrorSource = rollbackExtSystemErrorSource;
+ }
+
@PrePersist
protected void onCreate() {
if (requestScope == null)
@@ -653,6 +663,6 @@ public abstract class InfraRequests implements java.io.Serializable {
.append("operationalEnvName", getOperationalEnvName()).append("instanceGroupId", getInstanceGroupId())
.append("instanceGroupName", getInstanceGroupName()).append("requestUrl", getRequestUrl())
.append("originalRequestId", originalRequestId).append("extSystemErrorSource", extSystemErrorSource)
- .toString();
+ .append("rollbackExtSystemErrorSource", rollbackExtSystemErrorSource).toString();
}
}
--
cgit