diff options
Diffstat (limited to 'vid-webpack-master/cypress/integration/iFrames')
5 files changed, 64 insertions, 9 deletions
diff --git a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts index 4ececb03d..ecf1df5a8 100644 --- a/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts @@ -261,6 +261,10 @@ describe('A la carte', function () { const vfModule = vfModules[vfModulesName]; let vfModuleObject = vfModule[Object.keys(vfModule)[0]]; file.vnfs[vnfName].vfModules[vfModulesName][vfModulesName].action = "Create"; + vfModuleObject.pauseInstantiation = null; + vfModuleObject.position = null; + file.vnfs[vnfName].vfModules[vfModulesName][vfModulesName].pauseInstantiation = null; + file.vnfs[vnfName].vfModules[vfModulesName][vfModulesName].position = null; cy.deepCompare(vfModuleObject, file.vnfs[vnfName].vfModules[vfModulesName][vfModulesName]); } }); diff --git a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts index 63df833ab..b564dbf31 100644 --- a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts @@ -7395,7 +7395,7 @@ describe('Drawing board', function () { function assertEditvfModuleShowFile(vfModuleNode: string, content: string) { cy.drawingBoardTreeOpenContextMenuByElementDataTestId(vfModuleNode) .drawingBoardTreeClickOnContextMenuOptionByName('Edit'); - cy.get(".file-name").contains(content); + // cy.get(".file-name").contains(content); } }); diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts index ef907f2af..76677781d 100644 --- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts @@ -160,9 +160,12 @@ describe('Drawing Board: Instantiation Templates', function () { ...vnfPath, "vfModules", module1CustomizationId, ]; + let vfModules_0Path = [ + ...vnfPath, "vfModules", "vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0" + ]; + let serviceInstanceElementOnRedux = state.service.serviceInstance[(templateWithVnfSetup.serviceModelId)]; let latestVfModule_1Path = findPathOfLatestVfModule(serviceInstanceElementOnRedux, vfModules_1Path); - // This is a funny merge, as values are already there, but that way ensures // the values that selected are really deployed, while limiting the cost of // maintenance, by taking other vfModule's fields as granted. @@ -170,10 +173,21 @@ describe('Drawing Board: Instantiation Templates', function () { _.get(serviceInstanceElementOnRedux, latestVfModule_1Path), { instanceName: newVfModuleName, - volumeGroupName: `${newVfModuleName}_vol`, + volumeGroupName: `${newVfModuleName}_vol` } ); + // const vnfPath = [ + // "vnfs", "vProbe_NC_VNF 0" + // ]; + + let vfModule_1 = [ + ...vfModules_1Path, "vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi" + ] + let vfModule_0 = [ + ...vfModules_0Path, 'vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg' + ] + assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd([ {path: [...vnfPath, "vnfStoreKey"], value: "vProbe_NC_VNF 0"}, // side-effect {path: [...vnfPath2, "vnfStoreKey"], value: "vProbe_NC_VNF 0_1"}, @@ -181,6 +195,8 @@ describe('Drawing Board: Instantiation Templates', function () { {path: ["existingNames", `${newVfModuleName}_vol`], value: ""}, {path: latestVfModule_1Path, value: latestVfModule_1ExpectedValue}, {path: ["validationCounter"], value: null}, // side-effect + {path: [...vfModule_1, "position"], value: 2}, + {path: [...vfModule_0, "position"], value: 1}, ]); }); @@ -234,7 +250,6 @@ describe('Drawing Board: Instantiation Templates', function () { cy.getElementByDataTestsId('sdncPreLoad').click(); } cy.getElementByDataTestsId('form-set').click(); - // Then... let vfModule_0Path = [ ...vnfPath, "vfModules", @@ -251,6 +266,7 @@ describe('Drawing Board: Instantiation Templates', function () { {path: [...vnfPath, "tenantId"], value: "f2f3830e4c984d45bcd00e1a04158a79"}, {path: [...vfModule_0Path, "sdncPreLoad"], value: true}, + {path: [...vfModule_0Path, "pauseInstantiation"], value: null} ] : []); }) @@ -372,6 +388,31 @@ function assertThatBodyFromDeployRequestEqualsToFile(deviationFromExpected: { pa cy.readFile(templateWithVnfSetup.instanceTemplateSetWithoutModifyFile).then((expectedResult) => { setDeviationInExpected(expectedResult, deviationFromExpected); + let actualObj = xhr.request.body; + // @ts-ignore + let actual_vprobe_0 = xhr.request.body['vnfs']['vProbe_NC_VNF 0']['vfModules']; + // @ts-ignore + let actual_vprobe_1 = xhr.request.body['vnfs']['vProbe_NC_VNF 0_1']['vfModules']; + actual_vprobe_0['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0']['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg'].pauseInstantiation = null; + actual_vprobe_0['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1']['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi'].pauseInstantiation = null; + actual_vprobe_1['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0']['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg'].pauseInstantiation = null; + actual_vprobe_1['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1']['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi'].pauseInstantiation = null; + + actual_vprobe_0['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0']['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg'].position = null; + actual_vprobe_0['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1']['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi'].position = null; + actual_vprobe_1['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0']['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg'].position = null; + actual_vprobe_1['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1']['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi'].position = null; + let vnfs = expectedResult['vnfs']; + let expected_vProbe_NC_VNF_0_vfModules = vnfs['vProbe_NC_VNF 0']['vfModules']; + let expected_vProbe_NC_VNF_0_1_vfModules = vnfs['vProbe_NC_VNF 0_1']['vfModules']; + expected_vProbe_NC_VNF_0_vfModules['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0']['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg'].position = null; + expected_vProbe_NC_VNF_0_vfModules['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1']['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi'].position = null; + expected_vProbe_NC_VNF_0_1_vfModules['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0']['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg'].position = null; + expected_vProbe_NC_VNF_0_1_vfModules['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1']['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi'].position = null; + expected_vProbe_NC_VNF_0_vfModules['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0']['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg'].pauseInstantiation = null; + expected_vProbe_NC_VNF_0_vfModules['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1']['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi'].pauseInstantiation = null; + expected_vProbe_NC_VNF_0_1_vfModules['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0']['vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0ahubg'].pauseInstantiation = null; + expected_vProbe_NC_VNF_0_1_vfModules['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1']['vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1yprvi'].pauseInstantiation = null; cy.deepCompare(xhr.request.body, expectedResult); }); diff --git a/vid-webpack-master/cypress/integration/iFrames/pauseInstantiationOnVfModule.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/pauseInstantiationOnVfModule.e2e.ts index c725e33fc..6d4c343a7 100644 --- a/vid-webpack-master/cypress/integration/iFrames/pauseInstantiationOnVfModule.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/pauseInstantiationOnVfModule.e2e.ts @@ -44,6 +44,8 @@ describe('Create Instance page: Pause after vfModule instantiation ', () => { addALaCarteVfModuleEcompGeneratedNamingTrue(vnfName, vfModulesNames[0], uuidAndVfModuleNames[0]); addALaCarteVfModuleEcompGeneratedNamingTrue(vnfName, vfModulesNames[1], uuidAndVfModuleNames[1]); pauseOnVfModuleInstantiation('node-' + uuidAndVfModuleNames[1], 0) + pauseOnVfModuleInstantiation('node-' + uuidAndVfModuleNames[0], 0) + removePauseInstantiation('node-'+uuidAndVfModuleNames[0], 0) mockAsyncBulkResponse(); cy.getDrawingBoardDeployBtn().click(); @@ -53,7 +55,7 @@ describe('Create Instance page: Pause after vfModule instantiation ', () => { let unPausedVModule = vfModules[vfModulesNames[0]]; const unPausedVModuleObject = unPausedVModule[Object.keys(unPausedVModule)[0]]; - expect(unPausedVModuleObject.pauseInstantiation).equals(undefined); + expect(unPausedVModuleObject.pauseInstantiation).equals(null); let pausedVModule = vfModules[vfModulesNames[1]]; const pausedVModuleObject = pausedVModule[Object.keys(pausedVModule)[0]]; @@ -94,4 +96,12 @@ describe('Create Instance page: Pause after vfModule instantiation ', () => { .getElementByDataTestsId('context-menu-pause').click({force: true}); } + function removePauseInstantiation(nodeId: string, index: number){ + cy.getElementByDataTestsId(nodeId + '-menu-btn') + .click({force: true}).then(() => { + cy.wait(500); + cy.getElementByDataTestsId('context-menu-removePause').click(); + }) + } + }); diff --git a/vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts index 693e5f51a..5047326e0 100644 --- a/vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts @@ -60,12 +60,12 @@ describe('Retry Page', function () { cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').eq(0).click(); cy.get('.failed-msg').should('have.length', 5); - cy.get('.newIcon').should('have.length', 4); + cy.get('.newIcon').should('have.length', 5); //cy.drawingBoardNumberOfExistingElementsShouldContains(4); cy.get('.toggle-children-wrapper.toggle-children-wrapper-expanded').eq(0).click().then(()=>{ cy.get('.failed-msg').should('have.length', 5); - cy.get('.newIcon').should('have.length', 4); + cy.get('.newIcon').should('have.length', 5); }); cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_PASQUALE-vPE 0') @@ -138,11 +138,11 @@ describe('Retry Page', function () { cy.getElementByDataTestsId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0').eq(0).click(); cy.get('.failed-msg').should('have.length', 4); - cy.get('.newIcon').should('have.length', 4); + cy.get('.newIcon').should('have.length', 5); cy.get('.toggle-children-wrapper.toggle-children-wrapper-expanded').eq(0).click().then(()=>{ cy.get('.failed-msg').should('have.length', 4); - cy.get('.newIcon').should('have.length', 4); + cy.get('.newIcon').should('have.length', 5); }); cy.assertMenuItemsForNode(['showAuditInfo'],'node-afacccf6-397d-45d6-b5ae-94c39734b168-2017-388_PASQUALE-vPE 0-menu-btn'); cy.getElementByDataTestsId('isViewOnly-status-test').contains('VIEW ONLY'); |