From 7feaa94e569653066c7ebff3dda3218869797f39 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max (mb388a)" Date: Sat, 10 Nov 2018 12:29:48 -0500 Subject: Added groupInstanceId and groupInstanceName column Updated schema.sql to include new columns Added groupInstanceId and groupInstanceName columns Change-Id: I6dab9acea9bb4954c8b113034d70f01bbd9437db Issue-ID: SO-1206 Signed-off-by: Benjamin, Max (mb388a) --- .../db/migration/V5.2__Add_Instance_Group_Data.sql | 7 +++++++ .../src/test/resources/schema.sql | 4 ++++ .../onap/so/db/request/beans/InfraRequests.java | 23 +++++++++++++++++++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 adapters/mso-requests-db-adapter/src/main/resources/db/migration/V5.2__Add_Instance_Group_Data.sql 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(); } } -- cgit 1.2.3-korg