aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-05-22 20:18:24 +0300
committerIttay Stern <ittay.stern@att.com>2019-05-22 20:19:58 +0300
commit17532bb4f1f4600327a697355a1a66a5126fe506 (patch)
treed929c98db2be5545fa27b0604add15e8dafcb7a7
parentc92d5b7df3e9fb4dee1285e1f32f6cc85034a2b8 (diff)
Differentiate cloudRegions with same name and different owner
Resolves defect: Issue-ID: VID-482 Change-Id: I22c0b07173950c253a9272b8a96ab63e006efa49 Signed-off-by: Ittay Stern <ittay.stern@att.com>
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js3
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js10
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js8
3 files changed, 12 insertions, 9 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
index 030faf524..4ffccb49b 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js
@@ -448,6 +448,9 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE
lcpCloudRegionTenants.push({
"cloudRegionId": aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_REGION_ID],
"cloudOwner": aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_OWNER],
+ "cloudId":
+ aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_REGION_ID] +
+ '+' + aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_OWNER],
"tenantName": aaiLcpCloudRegionTenants[i][COMPONENT.TENANT_NAME],
"tenantId": aaiLcpCloudRegionTenants[i][COMPONENT.TENANT_ID],
"isPermitted": aaiLcpCloudRegionTenants[i][COMPONENT.IS_PERMITTED]});
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
index d5fd32001..937b83e61 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
@@ -547,7 +547,7 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
parameterList);
}
var cloudOwner = _.find(DataService.getCloudRegionTenantList(), function(region){
- return region.cloudRegionId === lcpRegion;
+ return region.cloudId === lcpRegion;
}).cloudOwner;
var params = [];
@@ -1108,7 +1108,7 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
parameter.optionList = new Array();
for (var i = 0; i < cloudRegionTenantList.length; i++) {
for (var j = 0; j < parameter.optionList.length; j++) {
- if (parameter.optionList[j].id === cloudRegionTenantList[i].cloudRegionId) {
+ if (parameter.optionList[j].id === cloudRegionTenantList[i].cloudId) {
parameter.optionList[j].isPermitted =
parameter.optionList[j].isPermitted || cloudRegionTenantList[i].isPermitted;
break;
@@ -1123,7 +1123,7 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
cloudRegionTenantList[i].cloudRegionId;
parameter.optionList.push({
- id : cloudRegionTenantList[i].cloudRegionId,
+ id : cloudRegionTenantList[i].cloudId,
name: optionName,
isPermitted : cloudRegionTenantList[i].isPermitted
});
@@ -1132,14 +1132,14 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
return parameter;
};
- var getTenantList = function(cloudRegionId) {
+ var getTenantList = function(cloudId) {
var cloudRegionTenantList = DataService.getCloudRegionTenantList();
var parameter = "";
if ( UtilityService.hasContents (cloudRegionTenantList) ) {
parameter = FIELD.PARAMETER.TENANT_ENABLED;
parameter.optionList = new Array();
for (var i = 0; i < cloudRegionTenantList.length; i++) {
- if (cloudRegionTenantList[i].cloudRegionId === cloudRegionId) {
+ if (cloudRegionTenantList[i].cloudId === cloudId) {
parameter.optionList.push({
id : cloudRegionTenantList[i].tenantId,
name : cloudRegionTenantList[i].tenantName,
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
index 6163184c2..d65fd6fc2 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
@@ -413,7 +413,7 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
parameter.optionList = new Array();
for (var i = 0; i < cloudRegionTenantList.length; i++) {
for (var j = 0; j < parameter.optionList.length; j++) {
- if (parameter.optionList[j].id === cloudRegionTenantList[i].cloudRegionId) {
+ if (parameter.optionList[j].id === cloudRegionTenantList[i].cloudId) {
parameter.optionList[j].isPermitted =
parameter.optionList[j].isPermitted || cloudRegionTenantList[i].isPermitted;
break;
@@ -428,7 +428,7 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
cloudRegionTenantList[i].cloudRegionId;
parameter.optionList.push({
- id : cloudRegionTenantList[i].cloudRegionId,
+ id : cloudRegionTenantList[i].cloudId,
name: optionName,
isPermitted : cloudRegionTenantList[i].isPermitted
@@ -438,14 +438,14 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
return parameter;
};
- var getTenantList = function(cloudRegionId) {
+ var getTenantList = function(cloudId) {
var parameter = "";
var cloudRegionTenantList = DataService.getCloudRegionTenantList();
if ( UtilityService.hasContents (cloudRegionTenantList) ) {
var parameter = FIELD.PARAMETER.TENANT_ENABLED;
parameter.optionList = new Array();
for (var i = 0; i < cloudRegionTenantList.length; i++) {
- if (cloudRegionTenantList[i].cloudRegionId === cloudRegionId) {
+ if (cloudRegionTenantList[i].cloudId === cloudId) {
parameter.optionList.push({
id : cloudRegionTenantList[i].tenantId,
name : cloudRegionTenantList[i].tenantName,