summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-05-23 08:55:55 +0000
committerIttay Stern <ittay.stern@att.com>2019-05-23 08:55:55 +0000
commit7d55439ad0a5665fe5e6b7c6db3111c34f50c680 (patch)
tree60f2b68d22275f86775256eb650fd35789d281bb
parent17532bb4f1f4600327a697355a1a66a5126fe506 (diff)
Revert "Differentiate cloudRegions with same name and different owner"
This reverts commit 17532bb4f1f4600327a697355a1a66a5126fe506. Issue-ID: VID-482 Change-Id: I513efb9bf20647bc9131bc2f46176b9c34961671 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, 9 insertions, 12 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 4ffccb49b..030faf524 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,9 +448,6 @@ 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 937b83e61..d5fd32001 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.cloudId === lcpRegion;
+ return region.cloudRegionId === 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].cloudId) {
+ if (parameter.optionList[j].id === cloudRegionTenantList[i].cloudRegionId) {
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].cloudId,
+ id : cloudRegionTenantList[i].cloudRegionId,
name: optionName,
isPermitted : cloudRegionTenantList[i].isPermitted
});
@@ -1132,14 +1132,14 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
return parameter;
};
- var getTenantList = function(cloudId) {
+ var getTenantList = function(cloudRegionId) {
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].cloudId === cloudId) {
+ if (cloudRegionTenantList[i].cloudRegionId === cloudRegionId) {
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 d65fd6fc2..6163184c2 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].cloudId) {
+ if (parameter.optionList[j].id === cloudRegionTenantList[i].cloudRegionId) {
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].cloudId,
+ id : cloudRegionTenantList[i].cloudRegionId,
name: optionName,
isPermitted : cloudRegionTenantList[i].isPermitted
@@ -438,14 +438,14 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
return parameter;
};
- var getTenantList = function(cloudId) {
+ var getTenantList = function(cloudRegionId) {
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].cloudId === cloudId) {
+ if (cloudRegionTenantList[i].cloudRegionId === cloudRegionId) {
parameter.optionList.push({
id : cloudRegionTenantList[i].tenantId,
name : cloudRegionTenantList[i].tenantName,