summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-11-15 00:36:58 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-15 00:36:58 +0000
commit9f934386f04d1583d1a1833f025a0eed396507ea (patch)
tree3d3438e6e2ff184d60fbe359adb95b726e80fc81
parentb9b50c8cd06a5bb10ccedf3e0dc12965f3177ba2 (diff)
parent7feaa94e569653066c7ebff3dda3218869797f39 (diff)
Merge "Added groupInstanceId and groupInstanceName column"
-rw-r--r--adapters/mso-requests-db-adapter/src/main/resources/db/migration/V5.2__Add_Instance_Group_Data.sql7
-rw-r--r--mso-api-handlers/mso-requests-db-repositories/src/test/resources/schema.sql4
-rw-r--r--mso-api-handlers/mso-requests-db/src/main/java/org/onap/so/db/request/beans/InfraRequests.java23
3 files changed, 33 insertions, 1 deletions
diff --git a/adapters/mso-requests-db-adapter/src/main/resources/db/migration/V5.2__Add_Instance_Group_Data.sql b/adapters/mso-requests-db-adapter/src/main/resources/db/migration/V5.2__Add_Instance_Group_Data.sql
new file mode 100644
index 0000000000..0e48b20528
--- /dev/null
+++ b/adapters/mso-requests-db-adapter/src/main/resources/db/migration/V5.2__Add_Instance_Group_Data.sql
@@ -0,0 +1,7 @@
+use requestdb;
+
+ALTER TABLE infra_active_requests ADD INSTANCE_GROUP_ID varchar(45);
+ALTER TABLE infra_active_requests ADD INSTANCE_GROUP_NAME varchar(200);
+
+ALTER TABLE archived_infra_requests ADD INSTANCE_GROUP_ID varchar(45);
+ALTER TABLE archived_infra_requests ADD INSTANCE_GROUP_NAME varchar(200); \ No newline at end of file
diff --git a/mso-api-handlers/mso-requests-db-repositories/src/test/resources/schema.sql b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/schema.sql
index 57d765f4e5..bf9a9e1dfe 100644
--- a/mso-api-handlers/mso-requests-db-repositories/src/test/resources/schema.sql
+++ b/mso-api-handlers/mso-requests-db-repositories/src/test/resources/schema.sql
@@ -93,6 +93,8 @@ CREATE CACHED TABLE PUBLIC.INFRA_ACTIVE_REQUESTS(
CONFIGURATION_NAME VARCHAR SELECTIVITY 2,
OPERATIONAL_ENV_ID VARCHAR SELECTIVITY 1,
OPERATIONAL_ENV_NAME VARCHAR SELECTIVITY 1,
+ INSTANCE_GROUP_ID VARCHAR SELECTIVITY 1,
+ INSTANCE_GROUP_NAME VARCHAR SELECTIVITY 1,
REQUEST_URL VARCHAR SELECTIVITY 1
);
@@ -153,6 +155,8 @@ CREATE CACHED TABLE PUBLIC.ARCHIVED_INFRA_REQUESTS(
CONFIGURATION_NAME VARCHAR SELECTIVITY 2,
OPERATIONAL_ENV_ID VARCHAR SELECTIVITY 1,
OPERATIONAL_ENV_NAME VARCHAR SELECTIVITY 1,
+ INSTANCE_GROUP_ID VARCHAR SELECTIVITY 1,
+ INSTANCE_GROUP_NAME VARCHAR SELECTIVITY 1,
REQUEST_URL VARCHAR SELECTIVITY 1
);
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 a3743cc371..0959cf61d4 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
@@ -143,6 +143,10 @@ public abstract class InfraRequests implements java.io.Serializable {
private String operationalEnvId;
@Column(name = "OPERATIONAL_ENV_NAME", length = 200)
private String operationalEnvName;
+ @Column(name = "INSTANCE_GROUP_ID", length = 45)
+ private String instanceGroupId;
+ @Column(name = "INSTANCE_GROUP_NAME", length = 200)
+ private String instanceGroupName;
@Column(name = "REQUEST_URL", length = 500)
private String requestUrl;
@@ -525,7 +529,23 @@ public abstract class InfraRequests implements java.io.Serializable {
this.operationalEnvName = operationalEnvName;
}
- public String getRequestUrl() {
+ public String getInstanceGroupId() {
+ return instanceGroupId;
+ }
+
+ public void setInstanceGroupId(String instanceGroupId) {
+ this.instanceGroupId = instanceGroupId;
+ }
+
+ public String getInstanceGroupName() {
+ return instanceGroupName;
+ }
+
+ public void setInstanceGroupName(String instanceGroupName) {
+ this.instanceGroupName = instanceGroupName;
+ }
+
+ public String getRequestUrl() {
return this.requestUrl;
}
@@ -593,6 +613,7 @@ public abstract class InfraRequests implements java.io.Serializable {
.append("requestorId", getRequestorId()).append("configurationId", getConfigurationId())
.append("configurationName", getConfigurationName()).append("operationalEnvId", getOperationalEnvId())
.append("operationalEnvName", getOperationalEnvName())
+ .append("instanceGroupId", getInstanceGroupId()).append("instanceGroupName", getInstanceGroupName())
.append("requestUrl", getRequestUrl()).toString();
}
}