aboutsummaryrefslogtreecommitdiffstats
path: root/vid-webpack-master
diff options
context:
space:
mode:
Diffstat (limited to 'vid-webpack-master')
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts2
-rw-r--r--vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service.ts13
-rw-r--r--vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popup.service.spec.ts9
3 files changed, 5 insertions, 19 deletions
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');