set default values in VFM Upgrade popup

Issue-ID: VID-794
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: Ic8c896e0eea0535e0e52a394c403c2e167240b47
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>

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 16d369b..dc9d82c 100644 (file)
--- 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,8 +33,8 @@
         "xbitestmodulereplace0..XbiTestModuleReplace..base_ocg..module-0": {
           "b0732bed-3ddf-43cc-b193-7f18db84e476": {
             "action": "None_Upgrade",
-            "retainAssignments" : false,
-            "sdncPreLoad" : true,
+            "retainAssignments" : true,
+            "sdncPreLoad" : 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 5c258f6..d72dc7a 100644 (file)
--- 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,8 +33,8 @@
       }
     ],
     "requestParameters": {
-      "retainAssignments": false,
-      "usePreload" : true,
+      "retainAssignments": true,
+      "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 46eb342..842d694 100644 (file)
--- 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
@@ -174,9 +174,9 @@
             "platformName": null,
             "productFamilyId": null,
             "provStatus": null,
-            "retainAssignments": false,
-            "retainVolumeGroups": false,
-            "sdncPreLoad": true,
+            "retainAssignments": true,
+            "retainVolumeGroups": true,
+            "sdncPreLoad": false,
             "supplementaryFile": null,
             "supplementaryFile_hidden": null,
             "supplementaryFile_hidden_content": null,

diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.spec.ts
index f456a74..b141a1e 100644 (file)
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.spec.ts
@@ -9,6 +9,7 @@ import {FeatureFlagsService} from "../../../../services/featureFlag/feature-flag
 import {DropdownFormControl} from "../../../../models/formControlModels/dropdownFormControl.model";
 import {FormControlModel, ValidatorOptions} from "../../../../models/formControlModels/formControl.model";
 import {ControlGeneratorUtil} from "../control.generator.util.service";
+import each from "jest-each";
 
 
 describe('Shared Controllers Service', () => {
@@ -99,11 +100,19 @@ describe('Shared Controllers Service', () => {
     expect(lcpRegionControl.isDisabled).toBeFalsy();
   });
 
-  test('sdn-preload checkbox is visible', () => {
-    const instance = {};
-    const sdncPreload: FormControlModel = service.getSDNCControl(instance);
+  each(
+    [
+      [' checked', true, true],
+      [' not checked', false, false ]
+    ]
+  ).
+  test('sdn-preload checkbox is %s', (
+    description: string, checkedByDefault: boolean, expected: boolean
+  ) => {
+    const instance = null;
+    const sdncPreload: FormControlModel = service.getSDNCControl(instance, checkedByDefault);
     expect (sdncPreload.displayName).toEqual('SDN-C pre-load');
-    expect (sdncPreload.value).toBeFalsy();
+    expect (sdncPreload.value).toBe(expected);
   });
 
   test('getlegacyRegion with AAIAIC25 - isVisible true', () => {

diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
index 32259b1..d82ba36 100644 (file)
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
@@ -236,12 +236,13 @@ export class SharedControllersService {
     tenantsControl['hasEmptyOptions'] = tenants && tenants.length === 0;
   };
 
-  getSDNCControl = (instance: any, extraContents? : object[]): FormControlModel => {
+
+  getSDNCControl = (instance: any, checkedByDefault: boolean, extraContents? : object[]): FormControlModel => {
     return new CheckboxFormControl({
       controlName: SDN_C_PRE_LOAD,
       displayName: 'SDN-C pre-load',
       dataTestId: 'sdncPreLoad',
-      value: instance ? instance.sdncPreLoad : false,
+      value: instance ? instance.sdncPreLoad : checkedByDefault,
       validations: [new ValidatorModel(ValidatorOptions.required, 'is required')],
       extraContents
     })

diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts
index b614ecf..b7cf80b 100644 (file)
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts
@@ -132,7 +132,7 @@ export class VfModuleControlGenerator {
       result.push(this._sharedControllersService.getTenantControl(serviceId, vfModuleInstance));
     }
     result.push(this._sharedControllersService.getRollbackOnFailureControl(vfModuleInstance));
-    result.push(this._sharedControllersService.getSDNCControl(vfModuleInstance, this.getSdncExtraContents()));
+    result.push(this._sharedControllersService.getSDNCControl(vfModuleInstance, false, this.getSdncExtraContents()));
     if (this.store.getState().global.flags['FLAG_SUPPLEMENTARY_FILE']) {
       result = this._basicControlGenerator.concatSupplementaryFile(result, vfModuleInstance);
     }

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 5fcdc30..afc099c 100644 (file)
--- 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
@@ -45,8 +45,9 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase {
   getControls(serviceId: string, vnfStoreKey: string, vfModuleStoreKey: string, isUpdateMode: boolean): FormControlModel[]  {
     let result: FormControlModel[] =[
       this.getRetainAssignmentsControl(),
-      this._sharedControllersService.getSDNCControl(null)
+      this._sharedControllersService.getSDNCControl(null, true)
     ];
+
     const vfModuleInstance :VfModuleInstance = this._vfModuleControlGenerator.getVfModuleInstance(serviceId, vnfStoreKey, this.uuidData, isUpdateMode);
 
     let volumeGroupAllowed = this._store.getState().service.serviceHierarchy[serviceId].vfModules[this.uuidData['modelName']].volumeGroupAllowed;
@@ -83,7 +84,7 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase {
       controlName: UpgradeFormControlNames.RETAIN_VOLUME_GROUPS,
       displayName: 'Retain Volume Groups',
       dataTestId: UpgradeFormControlNames.RETAIN_VOLUME_GROUPS,
-      value: true,
+      value: false,
       validations: []
     })
   };
@@ -94,7 +95,7 @@ export class VfModuleUpgradePopupService extends VfModulePopupServiceBase {
       controlName: UpgradeFormControlNames.RETAIN_ASSIGNMENTS,
       displayName: 'Retain Assignments',
       dataTestId: UpgradeFormControlNames.RETAIN_ASSIGNMENTS,
-      value: true,
+      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 2123d6a..86ec666 100644 (file)
--- 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,12 +133,12 @@ describe('VFModule popup service', () => {
     }
   }
 
-  test('get controls should return retainAssignments control with true value', ()=> {
-    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_ASSIGNMENTS, true, true);
+  test('get controls should return retainAssignments control with false', ()=> {
+    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_ASSIGNMENTS, false, true);
   });
 
-  test('get controls should return retainVolumeGroup control with true value', ()=> {
-    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS, true, true);
+  test('get controls should return retainVolumeGroup control with false', ()=> {
+    getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS, false, true);
   });
 
   [true, false].forEach(notExistsOnModel => {
@@ -149,7 +149,7 @@ describe('VFModule popup service', () => {
 
       jest.spyOn(_sharedTreeService, 'isVfModuleCustomizationIdNotExistsOnModel').mockReturnValue(notExistsOnModel);
 
-      getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS, true, notExistsOnModel);
+      getControlByNameAndCheckValue(UpgradeFormControlNames.RETAIN_VOLUME_GROUPS, false, notExistsOnModel);
     });
   });
 
@@ -232,7 +232,7 @@ describe('VFModule popup service', () => {
   });
 
 
-  test( 'get controls should return usePreload with false value', () => {
-    getControlByNameAndCheckValue(SDN_C_PRE_LOAD, false, true);
+  test( 'get controls should return usePreload with true value', () => {
+    getControlByNameAndCheckValue(SDN_C_PRE_LOAD, true, true);
   });
 });