From f6204c8b0f9b4f778419c16400b8a431f5797beb Mon Sep 17 00:00:00 2001 From: Einat Vinouze Date: Mon, 6 Apr 2020 09:16:40 +0300 Subject: Add another VNF to the new view/edit screen - Integration test Issue-ID: VID-803 Signed-off-by: Einat Vinouze Change-Id: I9e2a58863855353b75edab44129c96b319511dde Signed-off-by: Einat Vinouze --- .../iFrames/viewEditAddNewInstace.e2e.ts | 125 +++++++++++++++++++++ .../integration/iFrames/viewEditNetwork.e2e.ts | 83 -------------- 2 files changed, 125 insertions(+), 83 deletions(-) create mode 100644 vid-webpack-master/cypress/integration/iFrames/viewEditAddNewInstace.e2e.ts delete mode 100644 vid-webpack-master/cypress/integration/iFrames/viewEditNetwork.e2e.ts (limited to 'vid-webpack-master/cypress/integration') diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditAddNewInstace.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditAddNewInstace.e2e.ts new file mode 100644 index 000000000..d4fea70fe --- /dev/null +++ b/vid-webpack-master/cypress/integration/iFrames/viewEditAddNewInstace.e2e.ts @@ -0,0 +1,125 @@ +/// / + + +import {JsonBuilder} from "../../support/jsonBuilders/jsonBuilder"; +import {ServiceModel} from "../../support/jsonBuilders/models/service.model"; +import {AaiServiceInstancesModel} from "../../support/jsonBuilders/models/serviceInstances.model"; +import {AAISubViewEditModel} from "../../support/jsonBuilders/models/aaiSubViewEdit.model"; + +const jsonBuilderAndMock: JsonBuilder = new JsonBuilder(); +let jsonBuilderAAIService: JsonBuilder = new JsonBuilder(); +let jsonBuilderAaiServiceInstances: JsonBuilder = new JsonBuilder(); +let jsonBuilderAAISubViewEditModel: JsonBuilder = new JsonBuilder(); + + +describe('View Edit page: Add a second instance', () =>{ + beforeEach(() => { + cy.clearSessionStorage(); + cy.initGetAAISubDetails(); + cy.initAAIServices(); + cy.initTenants(); + cy.setTestApiParamToGR(); + cy.initVidMock(); + cy.login(); + + }); + + afterEach(() => { + cy.screenshot(); + }); + + it(`Add new network to service with one existing network `, () =>{ + const serviceType = 'Emanuel'; + const subscriberId = 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb'; + const serviceModelId = 'f93e72e1-77fc-4f54-b207-298d766d0886'; + const serviceInstanceId = 'ce2821fc-3b28-4759-9613-1e514d7563c0'; + + cy.initDrawingBoardUserPermission(); + cy.route(`**/rest/models/services/${serviceModelId}`, + 'fixture:../support/jsonBuilders/mocks/jsons/add_Network/add_network_model.json') + .as('serviceModelAddNetwork'); + + cy.route(`**/aai_get_service_instance_topology/${subscriberId}/${serviceType}/${serviceInstanceId}`, + 'fixture:../support/jsonBuilders/mocks/jsons/add_Network/add_network_instance.json') + .as('serviceInstanceAddNetwork'); + + cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${serviceModelId}&subscriberId=${subscriberId}&serviceType=${serviceType}&serviceInstanceId=${serviceInstanceId}`); + + cy.getElementByDataTestsId('node-OVS Provider-add-btn').click({force: true}).then(() => { + + cy.fillNetworkPopup(); + }); + + mockAsyncBulkResponse(); + //click update + cy.getElementByDataTestsId('deployBtn').should('have.text', 'UPDATE').click(); + + cy.getReduxState().then((state) => { + + const networks = state.service.serviceInstance['f93e72e1-77fc-4f54-b207-298d766d0886'].networks; + cy.wait('@expectedPostAsyncInstantiation').then(xhr => { + cy.readFile('../vid-app-common/src/test/resources/payload_jsons/Network/one_network_exists_add_another_network_expected_bulk.json').then((expectedResult) => { + + //set randomized trackById into bulk expected file + expectedResult.networks['OVS Provider'].trackById = networks['OVS Provider'].trackById; + + cy.deepCompare(xhr.request.body, expectedResult); + }); + }); + }); + + }); + + it(`Add new VNF to service with one existing VNF `, () =>{ + const serviceType = 'Mobility'; + const subscriberId = 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb'; + const serviceModelId = '82255513-e19f-46e5-bdfb-957c6bf57b82'; + const serviceInstanceId = 'e6cc1c4f-05f7-49bc-8e86-ac2eb92baaaa'; + + cy.initDrawingBoardUserPermission(); + cy.route(`**/rest/models/services/${serviceModelId}`, + 'fixture:../support/jsonBuilders/mocks/jsons/add_vnf/add_vnf_model.json') + .as('serviceModelAddVnf'); + + cy.route(`**/aai_get_service_instance_topology/${subscriberId}/${serviceType}/${serviceInstanceId}`, + 'fixture:../support/jsonBuilders/mocks/jsons/add_vnf/add_vnf_instance.json') + .as('serviceInstanceAddVnf'); + + cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${serviceModelId}&subscriberId=${subscriberId}&serviceType=${serviceType}&serviceInstanceId=${serviceInstanceId}`); + + cy.getElementByDataTestsId('node-iperf_vnf_2002_by5924 0-add-btn').click({force: true}).then(() => { + + cy.fillVnfPopup(); + }); + + mockAsyncBulkResponse(); + // click update + cy.getElementByDataTestsId('deployBtn').should('have.text', 'UPDATE').click(); + + cy.getReduxState().then((state) => { + + const vnfs = state.service.serviceInstance['82255513-e19f-46e5-bdfb-957c6bf57b82'].vnfs; + cy.wait('@expectedPostAsyncInstantiation').then(xhr => { + cy.readFile('../vid-app-common/src/test/resources/payload_jsons/vnf/one_vnf_exists_add_another_vnf_expected_bulk.json').then((expectedResult) => { + + //set randomized trackById into bulk expected file + expectedResult.vnfs['iperf_vnf_2002_by5924 0'].trackById = vnfs['iperf_vnf_2002_by5924 0'].trackById; + + cy.deepCompare(xhr.request.body, expectedResult); + }); + }); + }); + + }); + + + function mockAsyncBulkResponse() { + cy.server().route({ + url: Cypress.config('baseUrl') + '/asyncInstantiation/bulk', + method: 'POST', + status: 200, + response: "[]", + }).as("expectedPostAsyncInstantiation"); + } + +}); diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditNetwork.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditNetwork.e2e.ts deleted file mode 100644 index 084680acd..000000000 --- a/vid-webpack-master/cypress/integration/iFrames/viewEditNetwork.e2e.ts +++ /dev/null @@ -1,83 +0,0 @@ -/// / - - -import {JsonBuilder} from "../../support/jsonBuilders/jsonBuilder"; -import {ServiceModel} from "../../support/jsonBuilders/models/service.model"; -import {AaiServiceInstancesModel} from "../../support/jsonBuilders/models/serviceInstances.model"; -import {AAISubViewEditModel} from "../../support/jsonBuilders/models/aaiSubViewEdit.model"; - -const jsonBuilderAndMock: JsonBuilder = new JsonBuilder(); -let jsonBuilderAAIService: JsonBuilder = new JsonBuilder(); -let jsonBuilderAaiServiceInstances: JsonBuilder = new JsonBuilder(); -let jsonBuilderAAISubViewEditModel: JsonBuilder = new JsonBuilder(); - - -describe('View Edit page: Add network', () =>{ - beforeEach(() => { - cy.clearSessionStorage(); - cy.initGetAAISubDetails(); - cy.initAAIServices(); - cy.initTenants(); - cy.setTestApiParamToGR(); - cy.initVidMock(); - cy.login(); - - }); - - afterEach(() => { - cy.screenshot(); - }); - - it(`Add new network to service with one existing network `, () =>{ - const serviceType = 'Emanuel'; - const subscriberId = 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb'; - const serviceModelId = 'f93e72e1-77fc-4f54-b207-298d766d0886'; - const serviceInstanceId = 'ce2821fc-3b28-4759-9613-1e514d7563c0'; - const serviceInvariantUuid = "8c364754-4c76-4abc-b8f3-88da5f67d588"; - - cy.initDrawingBoardUserPermission(); - cy.route(`**/rest/models/services/${serviceModelId}`, - 'fixture:../support/jsonBuilders/mocks/jsons/add_Network/add_network_model.json') - .as('serviceModelAddNetwork'); - - cy.route(`**/aai_get_service_instance_topology/${subscriberId}/${serviceType}/${serviceInstanceId}`, - 'fixture:../support/jsonBuilders/mocks/jsons/add_Network/add_network_instance.json') - .as('serviceInstanceAddNetwork'); - - cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${serviceModelId}&subscriberId=${subscriberId}&serviceType=${serviceType}&serviceInstanceId=${serviceInstanceId}`); - - cy.getElementByDataTestsId('node-OVS Provider-add-btn').click({force: true}).then(() => { - - cy.fillNetworkPopup(); - }); - - mockAsyncBulkResponse(); - //click update - cy.getElementByDataTestsId('deployBtn').should('have.text', 'UPDATE').click(); - - cy.getReduxState().then((state) => { - - const networks = state.service.serviceInstance['f93e72e1-77fc-4f54-b207-298d766d0886'].networks; - cy.wait('@expectedPostAsyncInstantiation').then(xhr => { - cy.readFile('../vid-app-common/src/test/resources/payload_jsons/Network/one_network_exists_add_another_network_expected_bulk.json').then((expectedResult) => { - - //set randomized trackById into bulk expected file - expectedResult.networks['OVS Provider'].trackById = networks['OVS Provider'].trackById; - - cy.deepCompare(xhr.request.body, expectedResult); - }); - }); - }); - - }); - - function mockAsyncBulkResponse() { - cy.server().route({ - url: Cypress.config('baseUrl') + '/asyncInstantiation/bulk', - method: 'POST', - status: 200, - response: "[]", - }).as("expectedPostAsyncInstantiation"); - } - -}); -- cgit 1.2.3-korg