diff options
| author |   Steve Smokowski <ss835w@att.com> | 2020-01-06 14:18:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-01-06 14:18:28 +0000 |
| commit | b26dc591a534b8d894b368352a7c9e28cbac0854 (patch) | |
| tree | 319d1af7726a4a4ddf10cdccecb9a80e9b9c4c0d /mso-api-handlers/mso-requests-db/src | |
| parent | 04e0f4e870c7e45a3a1f8f2c56a758bf3a635c2e (diff) | |
| parent | 554b9645b408281b2009bd50fda255588d739afd (diff) | |
Merge "Remove references to AIC"
Diffstat (limited to 'mso-api-handlers/mso-requests-db/src')
3 files changed, 8 insertions, 8 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 2d44eebacd..8c4d0718b1 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 @@ -70,7 +70,7 @@ public class ArchivedInfraRequests extends InfraRequests { .append("lastModifiedBy", getLastModifiedBy()).append("modifyTime", getModifyTime()) .append("volumeGroupId", getVolumeGroupId()).append("volumeGroupName", getVolumeGroupName()) .append("vfModuleId", getVfModuleId()).append("vfModuleName", getVfModuleName()) - .append("vfModuleModelName", getVfModuleModelName()).append("aicCloudRegion", getAicCloudRegion()) + .append("vfModuleModelName", getVfModuleModelName()).append("cloudRegion", getCloudRegion()) .append("callBackUrl", getCallBackUrl()).append("correlator", getCorrelator()) .append("serviceInstanceId", getServiceInstanceId()) .append("serviceInstanceName", getServiceInstanceName()).append("requestScope", getRequestScope()) 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 272221ea78..5848f3b3d9 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 @@ -78,7 +78,7 @@ public class InfraActiveRequests extends InfraRequests { .append("lastModifiedBy", getLastModifiedBy()).append("modifyTime", getModifyTime()) .append("volumeGroupId", getVolumeGroupId()).append("volumeGroupName", getVolumeGroupName()) .append("vfModuleId", getVfModuleId()).append("vfModuleName", getVfModuleName()) - .append("vfModuleModelName", getVfModuleModelName()).append("aicCloudRegion", getAicCloudRegion()) + .append("vfModuleModelName", getVfModuleModelName()).append("CloudRegion", getCloudRegion()) .append("callBackUrl", getCallBackUrl()).append("correlator", getCorrelator()) .append("serviceInstanceId", getServiceInstanceId()) .append("serviceInstanceName", getServiceInstanceName()).append("requestScope", getRequestScope()) 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 a9b199eb39..8f798a207c 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 @@ -108,7 +108,7 @@ public abstract class InfraRequests implements java.io.Serializable { @Column(name = "VF_MODULE_MODEL_NAME", length = 200) private String vfModuleModelName; @Column(name = "CLOUD_REGION", length = 11) - private String aicCloudRegion; + private String cloudRegion; @Column(name = "CALLBACK_URL", length = 200) private String callBackUrl; @Column(name = "CORRELATOR", length = 80) @@ -373,12 +373,12 @@ public abstract class InfraRequests implements java.io.Serializable { this.vfModuleModelName = vfModuleModelName; } - public String getAicCloudRegion() { - return this.aicCloudRegion; + public String getCloudRegion() { + return this.cloudRegion; } - public void setAicCloudRegion(String aicCloudRegion) { - this.aicCloudRegion = aicCloudRegion; + public void setCloudRegion(String cloudRegion) { + this.cloudRegion = cloudRegion; } public String getCallBackUrl() { @@ -599,7 +599,7 @@ public abstract class InfraRequests implements java.io.Serializable { .append("modifyTime", getModifyTime()).append("volumeGroupId", getVolumeGroupId()) .append("volumeGroupName", getVolumeGroupName()).append("vfModuleId", getVfModuleId()) .append("vfModuleName", getVfModuleName()).append("vfModuleModelName", getVfModuleModelName()) - .append("aicCloudRegion", getAicCloudRegion()).append("callBackUrl", getCallBackUrl()) + .append("cloudRegion", getCloudRegion()).append("callBackUrl", getCallBackUrl()) .append("correlator", getCorrelator()).append("serviceInstanceId", getServiceInstanceId()) .append("serviceInstanceName", getServiceInstanceName()).append("requestScope", getRequestScope()) .append("requestAction", getRequestAction()).append("networkId", getNetworkId()) |