From 35b6e05185dcd6154c958175112352f662be6244 Mon Sep 17 00:00:00 2001 From: Yoav Schneiderman Date: Mon, 25 Nov 2019 13:47:12 +0200 Subject: upgrade vfModule retainAssignments true by default. Issue-ID: VID-603 Signed-off-by: Yoav Schneiderman Change-Id: I9f8761b756968dcc91ab1cae998d47fa74ecccd0 --- .../payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json | 2 +- .../payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json | 2 +- .../cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts | 1 + .../vfModuleUpgrade/vfModule.upgrade.popuop.service.ts | 2 +- .../vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json index 42a62e268..46c99e77c 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json @@ -33,7 +33,7 @@ "xbitestmodulereplace0..XbiTestModuleReplace..base_ocg..module-0": { "b0732bed-3ddf-43cc-b193-7f18db84e476": { "action": "None_Upgrade", - "retainAssignments" : true, + "retainAssignments" : false, "instanceName": "PST-VfMod-Replace-5-Vfmod", "instanceId": "b0732bed-3ddf-43cc-b193-7f18db84e476", "orchStatus": "Active", diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json index 8e090ae39..98ba26c18 100644 --- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json +++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json @@ -33,7 +33,7 @@ } ], "requestParameters": { - "retainAssignments": true, + "retainAssignments": false, "userParams": [], "testApi": "VNF_API" }, diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts index 2d1ef87fd..b5ed89469 100644 --- a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts +++ b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts @@ -217,6 +217,7 @@ describe('View Edit Page: Upgrade VFModule', function () { // The following is needed when enabling FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS cy.getElementByDataTestsId('retainAssignments').click(); + cy.screenshot(); cy.getElementByDataTestsId('form-set').click(); } diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts index 251a14720..ff3f23ff4 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts @@ -46,7 +46,7 @@ export class VfModuleUpgradePopupService extends VfModulePopuopService { controlName: 'retainAssignments', displayName: 'Retain Assignments', dataTestId: 'retainAssignments', - value: false, + value: true, validations: [] }) ]; diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts index 50b0d36c1..5850d25f0 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts @@ -84,6 +84,6 @@ describe('VFModule popup service', () => { }); expect(retainAssignmentsControl).toBeDefined(); - expect(retainAssignmentsControl.value).toBeFalsy(); + expect(retainAssignmentsControl.value).toBeTruthy(); }); }); -- cgit 1.2.3-korg