diff options
Diffstat (limited to 'vid-webpack-master/cypress/integration')
| -rw-r--r-- | vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts | 2 | ||||
| -rw-r--r-- | vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts index 6fb667588..027901f0f 100644 --- a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts @@ -235,7 +235,7 @@ describe('View Edit Page: Upgrade VFModule', function () { }); - it(`Upgrade a VFModule: upgrade vfmodule when upgraded already service, vnf and borther vfmodule e2e`, function () { + it(`Upgrade a VFModule: upgrade vfmodule when upgraded already service, vnf and brother vfmodule e2e`, function () { const serviceType = 'Emanuel'; const subscriberId = 'a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb'; diff --git a/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts index 1d94454fb..efe9d5408 100644 --- a/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts @@ -96,6 +96,13 @@ describe('View only drawing board', function () { }); cy.readFile('../vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json').then((res) => { + res.vnfs['2017-488_PASQUALE-vPE 0'] + .vfModules['2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0']['2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot'] + .modelInfo.modelVersion = '2'; + res.vnfs['2017-488_PASQUALE-vPE 0'] + .vfModules['2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1']['2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc'] + .modelInfo.modelVersion = null; + jsonBuilderAndMock.basicJson( res, Cypress.config('baseUrl') + "/aai_get_service_instance_topology/e433710f-9217-458d-a79d-1c7aff376d89/TYLER SILVIA/f8791436-8d55-4fde-b4d5-72dd2cf13cfb", @@ -127,6 +134,14 @@ describe('View only drawing board', function () { cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').find("[data-tests-id='status-property-orchStatus']").eq(0).should('have.text', 'Active'); cy.getElementByDataTestsId('node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0').find("[data-tests-id='status-property-inMaint']").eq(0).should('have.text', ''); + checkVfModuleModelVersion('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0', + 'node-f8360508-3f17-4414-a2ed-6bc71161e8db-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0', + '2'); + + checkVfModuleModelVersion('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0', + 'node-25284168-24bb-4698-8cb4-3f509146eca5-2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1', + ''); + cy.getElementByDataTestsId("serviceInstance").should('have.text', 'Service instance:'); cy.getElementByDataTestsId("serviceName").should('have.text', 'mCaNkinstancename'); cy.getElementByDataTestsId("orchStatusLabel").should('have.text', 'Orch Status:'); @@ -326,6 +341,11 @@ describe('View only drawing board', function () { }); + function checkVfModuleModelVersion(vnfNodeDataTestId: string, vfModuleDataTestId: string, vfModuleModelVersion: string){ + cy.getElementByDataTestsId(vnfNodeDataTestId) + .getElementByDataTestsId(vfModuleDataTestId) + .find("[data-tests-id='status-property-modelVersion']").eq(0).should('have.text', vfModuleModelVersion); + } function testComponentInfoForVNF(){ const labelsAndValuesForModel = [ ['Model version', '2.0'], |