Issue-ID: VID-603
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: Ic297486bc343419415bf3736ebb56944e72bf8b8
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
"action": "None_Upgrade",
"retainAssignments" : false,
"retainVolumeGroups" : false,
"action": "None_Upgrade",
"retainAssignments" : false,
"retainVolumeGroups" : false,
"instanceName": "PST-VfMod-Replace-5-Vfmod",
"instanceId": "b0732bed-3ddf-43cc-b193-7f18db84e476",
"orchStatus": "Active",
"instanceName": "PST-VfMod-Replace-5-Vfmod",
"instanceId": "b0732bed-3ddf-43cc-b193-7f18db84e476",
"orchStatus": "Active",
"requestParameters": {
"retainAssignments": false,
"rebuildVolumeGroups":true,
"requestParameters": {
"retainAssignments": false,
"rebuildVolumeGroups":true,
"userParams": [],
"testApi": "VNF_API"
},
"userParams": [],
"testApi": "VNF_API"
},
cy.getElementByDataTestsId('retainAssignments').click();
cy.getElementByDataTestsId('retainVolumeGroups').click();
cy.getElementByDataTestsId('retainAssignments').click();
cy.getElementByDataTestsId('retainVolumeGroups').click();
+ cy.getElementByDataTestsId('sdncPreLoad').click();
cy.screenshot();
cy.getElementByDataTestsId('form-set').click();
}
cy.screenshot();
cy.getElementByDataTestsId('form-set').click();
}
export enum UpgradeFormControlNames {
RETAIN_VOLUME_GROUPS = 'retainVolumeGroups',
RETAIN_ASSIGNMENTS = 'retainAssignments',
export enum UpgradeFormControlNames {
RETAIN_VOLUME_GROUPS = 'retainVolumeGroups',
RETAIN_ASSIGNMENTS = 'retainAssignments',
+ SDN_C_PRE_LOAD = 'sdncPreLoad',
protected _iframeService: IframeService,
protected _defaultDataGeneratorService: DefaultDataGeneratorService,
protected _aaiService: AaiService,
protected _iframeService: IframeService,
protected _defaultDataGeneratorService: DefaultDataGeneratorService,
protected _aaiService: AaiService,
- protected _basicPopupService : BasicPopupService,
+ protected _basicPopupService: BasicPopupService,
protected _store: NgRedux<AppState>,
protected _store: NgRedux<AppState>,
- private _sharedTreeService : SharedTreeService){
- super(_basicControlGenerator, _vfModuleControlGenerator, _iframeService, _defaultDataGeneratorService, _aaiService, _basicPopupService,_store);
+ private _sharedTreeService: SharedTreeService) {
+ super(_basicControlGenerator, _vfModuleControlGenerator, _iframeService, _defaultDataGeneratorService, _aaiService, _basicPopupService, _store);
node: ITreeNode;
getDynamicInputs = () => null;
node: ITreeNode;
getDynamicInputs = () => null;
- getControls(serviceId: string, vnfStoreKey: string, vfModuleStoreKey: string, isUpdateMode: boolean) {
- let result: FormControlModel[] = [];
- result.push(this.getRetainVolumeGroupsControl());
- result.push(this.getRetainAssignmentsControl());
- return result;
+ getControls = (): FormControlModel[] => {
+ return [
+ this.getRetainAssignmentsControl(),
+ this.getRetainVolumeGroupsControl(),
+ this._basicControlGenerator.getSDNCControl(null)
+ ]
};
getTitle = (): string => 'Upgrade Module';
};
getTitle = (): string => 'Upgrade Module';
const modelName = node.data.modelName;
const dynamicModelName = node.data.dynamicModelName;
const modelName = node.data.modelName;
const dynamicModelName = node.data.dynamicModelName;
- this._store.dispatch(upgradeVFModule(modelName, vnfStoreKey, serviceInstanceId ,dynamicModelName));
- this._store.dispatch(mergeObjectByPathAction(['serviceInstance',serviceInstanceId, 'vnfs', vnfStoreKey, 'vfModules', modelName, dynamicModelName], form.value));
+ 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);
this.postSubmitIframeMessage(that);
this._sharedTreeService.upgradeBottomUp(node, serviceInstanceId);
this.postSubmitIframeMessage(that);
import {VfModuleActions} from "../../../../storeUtil/utils/vfModule/vfModule.actions";
import {ServiceActions} from "../../../../storeUtil/utils/service/service.actions";
import {VfModuleActions} from "../../../../storeUtil/utils/vfModule/vfModule.actions";
import {ServiceActions} from "../../../../storeUtil/utils/service/service.actions";
-class MockModalService<T> {
-}
-
-class MockAppStore<T> {
-}
+class MockModalService<T> {}
+class MockAppStore<T> {}
class MockReduxStore<T> {
getState() {
return {};
}
class MockReduxStore<T> {
getState() {
return {};
}
-class MockFeatureFlagsService {
-}
+class MockFeatureFlagsService {}
describe('VFModule popup service', () => {
let injector;
describe('VFModule popup service', () => {
let injector;
fb = injector.get(FormBuilder);
iframeService = injector.get(IframeService);
store = injector.get(NgRedux);
fb = injector.get(FormBuilder);
iframeService = injector.get(IframeService);
store = injector.get(NgRedux);
})().then(done).catch(done.fail));
test('getTitle should return the correct title', () => {
expect(service.getTitle()).toBe("Upgrade Module")
});
})().then(done).catch(done.fail));
test('getTitle should return the correct title', () => {
expect(service.getTitle()).toBe("Upgrade Module")
});
- test('get controls should return retainAssignments control with false i', ()=> {
+ test('get controls should return retainAssignments control with true i', ()=> {
- const controls = service.getControls('a', 'b', 'c', true);
- expect(controls.length).toEqual(2);
+ const controls = service.getControls();
+ expect(controls.length).toEqual(3);
const retainAssignmentsControl = controls.find((control)=>{
return control.controlName === UpgradeFormControlNames.RETAIN_ASSIGNMENTS;
const retainAssignmentsControl = controls.find((control)=>{
return control.controlName === UpgradeFormControlNames.RETAIN_ASSIGNMENTS;
expect(retainAssignmentsControl).toBeDefined();
expect(retainAssignmentsControl.value).toBeTruthy();
expect(retainAssignmentsControl).toBeDefined();
expect(retainAssignmentsControl.value).toBeTruthy();
const retainVolumeGroup = controls.find((control)=>{
return control.controlName === UpgradeFormControlNames.RETAIN_VOLUME_GROUPS;
});
const retainVolumeGroup = controls.find((control)=>{
return control.controlName === UpgradeFormControlNames.RETAIN_VOLUME_GROUPS;
});
});
test('on submit should call merge action of form value to vfModule', () => {
});
test('on submit should call merge action of form value to vfModule', () => {
const serviceId = "serviceId5";
const vnfStoreKey = 'vnfStoreKey3';
const modelName = 'modelA';
const serviceId = "serviceId5";
const vnfStoreKey = 'vnfStoreKey3';
const modelName = 'modelA';
let mockFrom: FormGroup = mock(FormGroup);
let form = instance(mockFrom);
let mockFrom: FormGroup = mock(FormGroup);
let form = instance(mockFrom);
spyOn(store, 'dispatch');
spyOn(store, 'dispatch');
expect(store.dispatch).toBeCalledWith({type: ServiceActions.UPGRADE_SERVICE_ACTION, serviceUuid: "serviceId5"});
});
expect(store.dispatch).toBeCalledWith({type: ServiceActions.UPGRADE_SERVICE_ACTION, serviceUuid: "serviceId5"});
});
+
+
+ test( 'get controls should return usePreload with false value', () => {
+ const controls = service.getControls();
+ const usePreloadControl = controls.find((control)=>{
+ return control.controlName === 'sdncPreLoad';
+ });
+ expect(usePreloadControl).toBeDefined();
+ expect(usePreloadControl.value).toBeFalsy();
+ });