aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-08-07 09:16:42 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-07 09:16:42 +0000
commit943d158b18264860870887f7b5a78bf41036ad10 (patch)
tree91f7c1099a2fcf57acf17f8509ce96299144519f
parent5e1f03fab614cf3e49fb3f990fe9c0b01ae2fd1b (diff)
parent7ec34a110f0060a73bd9db9d4efdaf53245fbbd2 (diff)
Merge "Use lcpRegionOptionId as value in resume"
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js2
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html6
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts3
-rw-r--r--vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json3
4 files changed, 8 insertions, 6 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
index 3b5384e14..a7f7e9128 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
@@ -50,7 +50,7 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
DataService.setCloudRegionTenantList(response);
$scope.lcpAndTenant = response;
$scope.isFeatureFlagCloudOwner = featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST);
- $scope.lcpRegionList = _.uniqBy(response, 'cloudRegionId');
+ $scope.lcpRegionList = _.uniqBy(response, 'cloudRegionOptionId');
$scope.vendorInCloudOwnerRegex = /^[^-]*-/;
});
}
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html
index eb67e6ed9..3fbe07e83 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.html
@@ -58,11 +58,11 @@
data-tests-id="lcpRegion" data-ng-model="regionSelection.lcpRegion"
data-ng-change="regionSelection.tenant = null; regionSelection.legacyRegion = null;">
<option class="lcp-region-placeholder" value="" selected>Select LCP Region</option>
- <option ng-repeat="option in lcpRegionList" value="{{option.cloudRegionId}}"
+ <option ng-repeat="option in lcpRegionList" value="{{option.cloudRegionOptionId}}"
data-ng-if="option.isPermitted && !isFeatureFlagCloudOwner">{{option.cloudRegionId}}
</option>
- <option ng-repeat="option in lcpRegionList" value="{{option.cloudRegionId}}"
+ <option ng-repeat="option in lcpRegionList" value="{{option.cloudRegionOptionId}}"
data-ng-if="option.isPermitted && isFeatureFlagCloudOwner">
{{option.cloudRegionId}} ({{removeVendorFromCloudOwner(option.cloudOwner).toUpperCase()}})
</option>
@@ -81,7 +81,7 @@
data-tests-id="tenant" data-ng-model="regionSelection.tenant">
<option class="tenant-placeholder" value="" selected>Select Tenant Name</option>
<option ng-repeat="option in lcpAndTenant" class="tenantOption" value="{{option.tenantId}}"
- data-ng-if="option.isPermitted && option.cloudRegionId === regionSelection.lcpRegion">{{option.tenantName}}
+ data-ng-if="option.isPermitted && option.cloudRegionOptionId === regionSelection.lcpRegion">{{option.tenantName}}
</option>
</select>
</div>
diff --git a/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
index 65913d46b..cec915a91 100644
--- a/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
@@ -84,6 +84,7 @@ describe('Resume tests', function () {
status : 200,
url : Cypress.config('baseUrl') + "/flags**",
response : {
+ "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST" : true,
"FLAG_ADD_MSO_TESTAPI_FIELD": true,
"FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": false
}
@@ -103,7 +104,7 @@ describe('Resume tests', function () {
.getElementByDataTestsId('resumeVFModuleButton-' + vfModuleName).click().then(()=> {
cy.getElementByDataTestsId('confirmResumeDeleteButton').should('be.visible')
.getElementByDataTestsId('softDeleteButton').should('not.be.visible')
- .getElementByDataTestsId('lcpRegion').should('be.visible').select("hvf6")
+ .getElementByDataTestsId('lcpRegion').should('be.visible').select("option-irma-aic-hvf6")
.getElementByDataTestsId('tenant').should('be.visible').select("bae71557c5bb4d5aac6743a4e5f1d054");
cy.getElementByDataTestsId('confirmResumeDeleteButton').not('.button--inactive').click().then(()=> {
cy.wait('@actualResumeCall').then(xhr => {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json
index 53cb341a1..d10c2bd32 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json
@@ -22,7 +22,8 @@
},
"cloudConfiguration": {
"lcpCloudRegionId": "hvf6",
- "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054"
+ "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+ "cloudOwner": "irma-aic"
},
"relatedInstanceList": [{
"relatedInstance": {