diff options
Diffstat (limited to 'vid-webpack-master')
5 files changed, 28 insertions, 17 deletions
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 f456a747a..b141a1e79 100644 --- 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 32259b198..d82ba36a9 100644 --- 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 b614ecf30..b7cf80be3 100644 --- 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 5fcdc3093..afc099c1e 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 @@ -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 2123d6a9f..86ec66652 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,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); }); }); |