summaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/cypress/integration
diff options
context:
space:
mode:
authorAmichai Hemli <amichai.hemli@intl.att.com>2020-02-23 19:29:42 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-23 19:29:42 +0000
commitbf58511a20b396e97ab0a88dfe6fce3d7a54395f (patch)
tree20b88a465b5b542ac02c20629e788cf4229d5477 /vid-webpack-master/cypress/integration
parentb1fa496ef661ff3ed0a883f4979355a85f0c7906 (diff)
parent44ffee127dc8f1dc4cd793f4dd1e375057c33086 (diff)
Merge "upgrade vfmodule when upgraded already service, vnf and brother vfmodule e2e"
Diffstat (limited to 'vid-webpack-master/cypress/integration')
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts6
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts45
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts2
3 files changed, 48 insertions, 5 deletions
diff --git a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
index 4a8b89a2c..88ad8e8a2 100644
--- a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
@@ -3415,7 +3415,7 @@ describe('Drawing board', function () {
"modelInfo": {
"modelType": "VF",
"modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
- "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+ "modelVersionId": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
"modelName": "2017-488_PASQUALE-vPE",
"modelVersion": "9.0",
"modelCustomizationName": "2017-488_PASQUALE-vPE 0"
@@ -3455,7 +3455,7 @@ describe('Drawing board', function () {
"modelInfo": {
"modelType": "VF",
"modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
- "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+ "modelVersionId": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
"modelName": "2017-488_PASQUALE-vPE",
"modelVersion": "9.0",
"modelCustomizationName": "2017-488_PASQUALE-vPE 0"
@@ -5065,7 +5065,7 @@ describe('Drawing board', function () {
"modelInfo": {
"modelType": "VF",
"modelInvariantId": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e",
- "modelVersionId": "f4d84bb4-a416-4b4e-997e-0059973630b9",
+ "modelVersionId": "ea81d6f7-0861-44a7-b7d5-d173b562c350",
"modelName": "2017-488_PASQUALE-vPE",
"modelVersion": "9.0",
"modelCustomizationName": "2017-488_PASQUALE-vPE 0"
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
index ad15ce383..6338a10b5 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
@@ -143,7 +143,6 @@ describe('View Edit Page: Upgrade VFModule', function () {
afterEach(() => {
cy.screenshot();
});
-
it(`Upgrade a VFModule: another case e2e`, function () {
const serviceType = 'Emanuel';
@@ -189,6 +188,50 @@ describe('View Edit Page: Upgrade VFModule', function () {
});
+ it(`Upgrade a VFModule: upgrade vfmodule when upgraded already service, vnf and borther vfmodule e2e`, function () {
+
+ const serviceType = 'Emanuel';
+ const subscriberId = 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb';
+ const serviceModelId = 'a243da28-c11e-45a8-9f26-0284a9a789bc';
+ const serviceInstanceId = 'b153e8ce-2d00-4466-adc0-14bad70f150c';
+ const serviceInvariantUuid = "dd5a69b7-c50c-4dde-adc2-966b79bb8fd6";
+
+ cy.initDrawingBoardUserPermission();
+
+ cy.route(`**/rest/models/services/${serviceModelId}`,
+ 'fixture:../support/jsonBuilders/mocks/jsons/upgradeVfModule/upgrade_vfmodule_when_service_vnf_and_brother_vfmodule_alredy_upgraded_e2e__service_model.json')
+ .as('serviceModel2');
+
+ cy.route(`**/aai_get_service_instance_topology/${subscriberId}/${serviceType}/${serviceInstanceId}`,
+ 'fixture:../support/jsonBuilders/mocks/jsons/upgradeVfModule/upgrade_vfmodule_when_service_vnf_and_brother_vfmodule_alredy_upgraded_e2e__service_instance.json')
+ .as('serviceInstance2');
+
+ cy.route(`**/aai_get_newest_model_version_by_invariant/${serviceInvariantUuid}`, {
+ "modelVersionId": "a243da28-c11e-45a8-9f26-0284a9a789bc",
+ "modelName": "CHARLOTTE 01222020 Svc",
+ "modelVersion": "3.0",
+ "distributionStatus": "DISTRIBUTION_COMPLETE_OK",
+ "resourceVersion": "1580246673596",
+ "modelDescription": "test model for VF module replacement",
+ "orchestrationType": null
+ }
+ ).as("newestModelVersion2");
+
+ cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${serviceModelId}&subscriberId=${subscriberId}&serviceType=${serviceType}&serviceInstanceId=${serviceInstanceId}`);
+
+ upgradeTheVFM('node-3412fe1f-e103-4777-90c0-f66d888f4bed-mdns012220200..Mdns01222020..dns_az_01..module-1', false);
+
+ mockAsyncBulkResponse();
+ cy.getDrawingBoardDeployBtn().click();
+
+ cy.wait('@expectedPostAsyncInstantiation').then(xhr => {
+ cy.readFile('../vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json').then((expectedResult) => {
+ cy.deepCompare(xhr.request.body, expectedResult);
+ });
+ });
+
+ });
+
});
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts
index de5facf89..1d94454fb 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts
@@ -232,7 +232,7 @@ describe('View only drawing board', function () {
'status-property-provStatus': '',
'status-property-inMaint': '',
},
- 'node-undefined-dc229cd8-c132-4455-8517-5c1787c18b14:0': {
+ 'node-dc229cd8-c132-4455-8517-5c1787c18b14-dc229cd8-c132-4455-8517-5c1787c18b14:0': {
'node-type-indicator': 'M',
'node-name': 'ss820f_0918_base',
'status-property-orchStatus': 'Assigned',