diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-05-26 19:21:47 +0300 |
|---|---|---|
| committer | Ittay Stern <ittay.stern@att.com> | 2019-06-03 10:51:50 +0300 |
| commit | 87bb08875e573f84c880ba26e7f74f8724e24177 (patch) | |
| tree | e9879bc2e23f08a0789d2e38d7134eeab2b04c39 /vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js | |
| parent | 2bc8ebda0282cf3a3941815eb2b29dc08d8772f9 (diff) | |
Differentiate cloudRegions with same name and different owner
Replaces change I22c0b07173950c253a9272b8a96ab63e006efa49
Resolves defect:
Issue-ID: VID-482
Cherry-picked from change: I38c2f6a86a044297b1b76c1316e50cacb0264da9
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Change-Id: I2ecf07aa5614e94fce49eeaa7fef71b683f6c3c8
Diffstat (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js')
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/scripts/services/aaiService.js | 9 |
1 files changed, 7 insertions, 2 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..af2483b68 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 @@ -445,9 +445,14 @@ var AaiService = function ($http, $log, PropertyService, UtilityService, COMPONE var aaiLcpCloudRegionTenants = response.data; for (var i = 0; i < aaiLcpCloudRegionTenants.length; i++) { + var cloudOwner = aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_OWNER]; + var cloudRegionId = aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_REGION_ID]; + var cloudRegionOptionId = 'option-' + cloudOwner + '-' + cloudRegionId; + lcpCloudRegionTenants.push({ - "cloudRegionId": aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_REGION_ID], - "cloudOwner": aaiLcpCloudRegionTenants[i][COMPONENT.CLOUD_OWNER], + "cloudOwner": cloudOwner, + "cloudRegionId": cloudRegionId, + "cloudRegionOptionId": cloudRegionOptionId.toLowerCase(), "tenantName": aaiLcpCloudRegionTenants[i][COMPONENT.TENANT_NAME], "tenantId": aaiLcpCloudRegionTenants[i][COMPONENT.TENANT_ID], "isPermitted": aaiLcpCloudRegionTenants[i][COMPONENT.IS_PERMITTED]}); |