removing retain assignments checkbox from upgade vfModule screen

Change-Id: I7f28de1ebc34ae393828bf139716533248e8897a
Issue-ID: VID-922
Signed-off-by: rachitha.ramappa@att.com

7 files changed, 9 insertions, 23 deletions

diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/delete_vfmodule_expected_bulk.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/delete_vfmodule_expected_bulk.json
index 804f6d889..e708258e9 100644
--- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/delete_vfmodule_expected_bulk.json
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/delete_vfmodule_expected_bulk.json
@@ -59,7 +59,7 @@
             "trackById": "b0732bed-3ddf-43cc-b193-7f18db84e476",
             "isBase": true,
             "volumeGroupName": null,
-            "retainAssignments": true,
+            "retainAssignments": false,
             "sdncPreLoad": false,
             "supplementaryFile": null,
             "supplementaryFile_hidden": null,
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 90525604c..6547663b2 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
@@ -35,7 +35,7 @@
         "xbitestmodulereplace0..XbiTestModuleReplace..base_ocg..module-0": {
           "b0732bed-3ddf-43cc-b193-7f18db84e476": {
             "action": "None_Upgrade",
-            "retainAssignments" : true,
+            "retainAssignments" : false,
             "sdncPreLoad" : false,
             "instanceName": "PST-VfMod-Replace-5-Vfmod",
             "instanceId": "b0732bed-3ddf-43cc-b193-7f18db84e476",
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 c10f45023..80ee86d1f 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,
       "usePreload" : false,
       "userParams": [],
       "testApi": "GR_API"
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json
index 0e3f97f72..d49ac2b8a 100644
--- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_not_related_to_current_model_e2e__fe_input_cypress.json
@@ -176,7 +176,7 @@
             "platformName": null,
             "productFamilyId": null,
             "provStatus": null,
-            "retainAssignments": true,
+            "retainAssignments": false,
             "retainVolumeGroups": true,
             "sdncPreLoad": false,
             "supplementaryFile": null,
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
index 2e6e800de..7f469d889 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
@@ -318,7 +318,7 @@ describe('View Edit Page: Upgrade VFModule', function () {
     .drawingBoardTreeClickOnContextMenuOptionByName("Upgrade");
     // The following is needed when enabling FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS
 
-    cy.getElementByDataTestsId('retainAssignments').click();
+    //cy.getElementByDataTestsId('retainAssignments').click();
     if (shouldVGCheckboxExist) {
       cy.getElementByDataTestsId('retainVolumeGroups').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 afc099c1e..60d981cba 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
@@ -44,7 +44,6 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase {
 
   getControls(serviceId: string, vnfStoreKey: string, vfModuleStoreKey: string, isUpdateMode: boolean): FormControlModel[]  {
     let result: FormControlModel[] =[
-      this.getRetainAssignmentsControl(),
       this._sharedControllersService.getSDNCControl(null, true)
     ];
 
@@ -70,6 +69,7 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase {
 
     this.updateFormValueWithSupplementaryFile(form, that);
 
+form.value[UpgradeFormControlNames.RETAIN_ASSIGNMENTS] = false;
     this._store.dispatch(upgradeVFModule(modelName, vnfStoreKey, serviceInstanceId, dynamicModelName));
     this._store.dispatch(mergeObjectByPathAction(['serviceInstance', serviceInstanceId, 'vnfs', vnfStoreKey, 'vfModules', modelName, dynamicModelName], form.value));
     this._sharedTreeService.upgradeBottomUp(node, serviceInstanceId);
@@ -88,15 +88,4 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase {
       validations: []
     })
   };
-
-  getRetainAssignmentsControl = (): CheckboxFormControl => {
-    return new CheckboxFormControl({
-      type: FormControlType.CHECKBOX,
-      controlName: UpgradeFormControlNames.RETAIN_ASSIGNMENTS,
-      displayName: 'Retain Assignments',
-      dataTestId: UpgradeFormControlNames.RETAIN_ASSIGNMENTS,
-      value: false,
-      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 86ec66652..988e2a7c2 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
@@ -133,10 +133,6 @@ describe('VFModule popup service', () => {
     }
   }
 
-  test('get controls should return retainAssignments control with false', ()=> {
-    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_ASSIGNMENTS, false, true);
-  });
-
   test('get controls should return retainVolumeGroup control with false', ()=> {
     getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS, false, true);
   });
@@ -209,12 +205,13 @@ describe('VFModule popup service', () => {
         }
       }
     };
-
+form.value['retainAssignments'] = false;
     let expectedMergePayload = {
       a: "value",
       b: "another",
       supplementaryFileContent: [{"name": "c", "value": "c"}, {"name": "d", "value": "1"}],
-      supplementaryFileName: "name"
+      supplementaryFileName: "name",
+	  retainAssignments: false
     };
 
     spyOn(store, 'dispatch');