diff options
Diffstat (limited to 'vid-webpack-master/src/app/shared')
7 files changed, 99 insertions, 46 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts index 70b23f23b..47d3413b5 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service.ts @@ -40,9 +40,10 @@ export abstract class VfModulePopupServiceBase { formValues.uuid = formValues.modelInfo.uuid; formValues.isMissingData = false; if (!that.uuidData.vFModuleStoreKey) { - this._store.dispatch(createVFModuleInstance(formValues, that.uuidData.modelName, that.uuidData.serviceId, 0, that.uuidData.vnfStoreKey)); + let positionOfNextInstance = this._defaultDataGeneratorService.calculatePositionOfVfmodule(that.uuidData.serviceId); + this._store.dispatch(createVFModuleInstance(formValues, that.uuidData.modelName, that.uuidData.serviceId, !_.isNil(positionOfNextInstance)? positionOfNextInstance : null, that.uuidData.vnfStoreKey)); } else { - this._store.dispatch(updateVFModuleInstance(formValues, that.uuidData.modelName, that.uuidData.serviceId, that.uuidData.vFModuleStoreKey, that.uuidData.vnfStoreKey)); + this._store.dispatch(updateVFModuleInstance(formValues, that.uuidData.modelName, that.uuidData.serviceId, that.uuidData.vFModuleStoreKey, that.uuidData.vnfStoreKey, this.getInstance(that.uuidData.serviceId, that.uuidData.vnfStoreKey, that.uuidData.vFModuleStoreKey).position)); } }; diff --git a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts index 79cd0682e..e00b259a0 100644 --- a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts +++ b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts @@ -15,7 +15,7 @@ import {NetworkTreeNode} from "../../models/networkTreeNode"; import {createVNFInstance} from "../../storeUtil/utils/vnf/vnf.actions"; import {changeInstanceCounter} from "../../storeUtil/utils/general/general.actions"; import {createNetworkInstance} from "../../storeUtil/utils/network/network.actions"; -import {createVFModuleInstance} from "../../storeUtil/utils/vfModule/vfModule.actions"; +import {createVFModuleInstance, updateVFModulePosition} from "../../storeUtil/utils/vfModule/vfModule.actions"; import {createVnfGroupInstance} from "../../storeUtil/utils/vnfGroup/vnfGroup.actions"; import {VnfGroupTreeNode} from "../../models/vnfGroupTreeNode"; import {ModelInfo} from "../../models/modelInfo"; @@ -234,6 +234,7 @@ export class DefaultDataGeneratorService { this.addDefaultVfModulesInRedux( serviceId, vfModuleModel.properties.initialCount, + vfModuleModel.properties.baseModule, vfModule, vnfModuleUUID, vnfUUID @@ -282,9 +283,14 @@ export class DefaultDataGeneratorService { } } - addDefaultVfModulesInRedux(serviceId: string, numberOfVfModules: number, vfModuleData: any, vfModuleName: string, vnfUUID : string){ + addDefaultVfModulesInRedux(serviceId: string, numberOfVfModules: number,baseModule:boolean, vfModuleData: any, vfModuleName: string, vnfUUID : string){ for (let i = 0; i < numberOfVfModules; i++) { - this.store.dispatch(createVFModuleInstance(vfModuleData, vfModuleName, serviceId, null, vnfUUID)); + if(baseModule) { + this.store.dispatch(createVFModuleInstance(vfModuleData, vfModuleName, serviceId, 1, vnfUUID)); + } else { + this.store.dispatch(createVFModuleInstance(vfModuleData, vfModuleName, serviceId, i+1, vnfUUID)); + } + } } @@ -460,4 +466,55 @@ export class DefaultDataGeneratorService { return newVfModule; } + calculatePositionOfVfmodule(serviceModelId:string) { + const serviceInstance = this.store.getState().service.serviceInstance[serviceModelId]; + const serviceHierarchy = this.store.getState().service.serviceHierarchy[serviceModelId]; + + const vnfList = serviceInstance.vnfs; + let totalSecondListLength =1; + if (!_.isEmpty(vnfList)) { + for (let vnfStoreKey in vnfList) { + const firstVfModuleInstanceList = vnfList[vnfStoreKey].vfModules; + if (!_.isEmpty(firstVfModuleInstanceList)) { + for (let vfModuleInstanceKey in firstVfModuleInstanceList) { + let secondVfModuleInstanceList = firstVfModuleInstanceList[vfModuleInstanceKey]; + let numSecondVfModuleInstanceList = Object.keys(secondVfModuleInstanceList).length; + totalSecondListLength = totalSecondListLength + numSecondVfModuleInstanceList; + + } + } else { + //No instances added yet , hence start from 1 + totalSecondListLength = 1; + } + + } + } + + return totalSecondListLength; + } + + + updatePositionForRemainingVfModules(serviceModelId: string) { + + const serviceInstance = this.store.getState().service.serviceInstance[serviceModelId]; + const vnfList = serviceInstance.vnfs; + if (!_.isEmpty(vnfList)) { + for (let vnfStoreKey in vnfList) { + const firstVfModuleInstanceList = vnfList[vnfStoreKey].vfModules; + if (!_.isEmpty(firstVfModuleInstanceList)) { + for (let vfModuleInstanceKey in firstVfModuleInstanceList) { + let secondVfModuleInstanceList = firstVfModuleInstanceList[vfModuleInstanceKey]; + for(let secondVfModuleInstanceKey in secondVfModuleInstanceList) { + let secondVfModuleObj = secondVfModuleInstanceList[secondVfModuleInstanceKey]; + if(!_.isNil(secondVfModuleObj.position)) { + this.store.dispatch(updateVFModulePosition(vfModuleInstanceKey,secondVfModuleInstanceKey, secondVfModuleObj.position+1,serviceModelId, vnfStoreKey)); + } + } + + } + } + + } + } + } } diff --git a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts index e652be79d..758aa4b15 100644 --- a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts +++ b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts @@ -25,6 +25,8 @@ export enum Features { FLAG_2006_PAUSE_VFMODULE_INSTANTIATION_CREATION = 'FLAG_2006_PAUSE_VFMODULE_INSTANTIATION_CREATION', FLAG_2008_PAUSE_INSTANTIATION_ON_VFMODULE_POPUP = 'FLAG_2008_PAUSE_INSTANTIATION_ON_VFMODULE_POPUP', FLAG_2008_REMOVE_PAUSE_INSTANTIATION = 'FLAG_2008_REMOVE_PAUSE_INSTANTIATION', + FLAG_2008_DISABLE_DRAG_FOR_BASE_MODULE ='FLAG_2008_DISABLE_DRAG_FOR_BASE_MODULE', + FLAG_2008_CREATE_VFMODULE_INSTANTIATION_ORDER_NUMBER ='FLAG_2008_CREATE_VFMODULE_INSTANTIATION_ORDER_NUMBER' } @Injectable() diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts index cc2ed4fe3..c192ece48 100644 --- a/vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/reducersHelper.ts @@ -28,17 +28,3 @@ function resetUpgradeStatus(newState: any, serviceUuid: string){ newState.serviceInstance[serviceUuid].upgradedVFMSonsCounter = 0; newState.serviceInstance[serviceUuid].isUpgraded = false; } - -export function calculatePosition(newState :any,serviceUuid: string, vnfStoreKey :string) { - - let totalNumOfVfModules =(Object.keys(newState.serviceInstance[serviceUuid].vnfs[vnfStoreKey].vfModules).length); - totalNumOfVfModules = 0; - _.forOwn(newState.serviceInstance[serviceUuid].vnfs[vnfStoreKey].vfModules, (vfModuleInstance) => { - _.forOwn(vfModuleInstance, (module) => { - module.position = totalNumOfVfModules +1; - totalNumOfVfModules= totalNumOfVfModules+1; - }) - }); - - -} diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts index c250993df..8096940d4 100644 --- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.actions.ts @@ -17,7 +17,9 @@ export enum VfModuleActions { export interface UpdateVFModluePosition extends Action { - node: any, + vfKey: string, + dynamicModelName?: string, + position: number, instanceId : string, vnfStoreKey ?: string; } @@ -43,7 +45,8 @@ export interface UpdateVFModuleInstanceAction extends Action { vfId: string; serviceUuid: string; dynamicModelName : string; - vnfStoreKey : string + vnfStoreKey : string, + position : number } @@ -124,13 +127,14 @@ export const createVFModuleInstance: ActionCreator<CreateVFModuleInstanceAction> vnfStoreKey : vnfStoreKey }); -export const updateVFModuleInstance: ActionCreator<UpdateVFModuleInstanceAction> = (vfInstance, vfId, serviceUuid, dynamicModelName, vnfStoreKey) => ({ +export const updateVFModuleInstance: ActionCreator<UpdateVFModuleInstanceAction> = (vfInstance, vfId, serviceUuid, dynamicModelName, vnfStoreKey, position) => ({ type: VfModuleActions.UPDATE_VF_MODULE, vfInstance: vfInstance, vfId: vfId, serviceUuid: serviceUuid, dynamicModelName : dynamicModelName, - vnfStoreKey : vnfStoreKey + vnfStoreKey : vnfStoreKey, + position : position }); export const deleteActionVfModuleInstance: ActionCreator<DeleteActionVfModuleInstanceAction> = (dynamicModelName, vnfStoreKey, serviceId, vfModuleModelName) => ({ @@ -149,12 +153,16 @@ export const undoDeleteVfModuleInstance: ActionCreator<UndoDeleteActionVfModuleI vfModuleModelName }); -export const updateVFModulePosition: ActionCreator<UpdateVFModluePosition> = (node, instanceId, vnfStoreKey) => ({ - type: VfModuleActions.UPDATE_VFMODULE_POSITION, - node: node, - instanceId: instanceId, - vnfStoreKey : vnfStoreKey -}); +export const updateVFModulePosition: ActionCreator<UpdateVFModluePosition> = (vfKey,dynamicModelName,position,instanceId, vnfStoreKey) => { + return ({ + type: VfModuleActions.UPDATE_VFMODULE_POSITION, + vfKey: vfKey, + dynamicModelName: dynamicModelName, + position: position, + instanceId: instanceId, + vnfStoreKey: vnfStoreKey + }); +}; export const upgradeVFModule: ActionCreator<UpgradeVfModuleInstanceAction> = (modelName, vnfStoreKey, serviceId, dynamicModelName) => ({ type: VfModuleActions.UPGRADE_VFMODULE, diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts index 50981e158..97e25d27e 100644 --- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.spec.ts @@ -177,9 +177,10 @@ test('#UPDATE_VFMODULE_POSITION: should update position', () => { vnfs: { 'vfName': { vfModules: { - 'modelName': { - 'dynamicModelName': { - isMissingData: true + 'vfKey': { + dynamicModelName: { + isMissingData: true, + position :1 } } } @@ -190,15 +191,13 @@ test('#UPDATE_VFMODULE_POSITION: should update position', () => { }, <UpdateVFModluePosition>{ type: VfModuleActions.UPDATE_VFMODULE_POSITION, - node: { - position: 1, - dynamicModelName: "dynamicModelName", - modelName: "modelName" - }, + vfKey: "vfKey", + dynamicModelName: "dynamicModelName", + position: 1, instanceId: "serviceModelId", vnfStoreKey: "vfName" - }).serviceInstance['serviceModelId'].vnfs['vfName'].vfModules["modelName"]["dynamicModelName"]; + }).serviceInstance['serviceModelId'].vnfs['vfName'].vfModules["vfKey"]["dynamicModelName"]; expect(vfModule.position).toEqual(1); }); diff --git a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts index f3584ebd9..d2f6bdf2b 100644 --- a/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts +++ b/vid-webpack-master/src/app/shared/storeUtil/utils/vfModule/vfModule.reducers.ts @@ -18,7 +18,6 @@ import {VfModuleMap} from "../../../models/vfModulesMap"; import {ServiceState} from "../main.reducer"; import {PauseStatus, ServiceInstanceActions} from "../../../models/serviceInstanceActions"; import {updateServiceValidationCounter} from "../reducersHelper"; -import {calculatePosition} from "../reducersHelper"; export function vfModuleReducer(state: ServiceState , action: Action) : ServiceState{ @@ -29,6 +28,7 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS const serviceUuid = updateVFModuleInstanceAction.serviceUuid; const vfModuleId = updateVFModuleInstanceAction.vfId; const vnfStoreKey = updateVFModuleInstanceAction.vnfStoreKey; + const position = updateVFModuleInstanceAction.index; let newState = Object.assign({}, state); @@ -42,8 +42,7 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS updateServiceValidationCounter(newState, false, vfInstance['isMissingData'], serviceUuid); newState.serviceInstance[serviceUuid].vnfs[vnfStoreKey].vfModules[vfModuleId] = vfModulesMap; - //update position of newly added VF module - calculatePosition(newState,serviceUuid, vnfStoreKey); + newState.serviceInstance[serviceUuid].vnfs[vnfStoreKey].vfModules[vfModuleId][dynamicName].position = position; return newState; } case VfModuleActions.UPDATE_VF_MODULE: { @@ -51,6 +50,7 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS const vfInstance = updateVFModuleInstanceAction.vfInstance; const serviceUuid = updateVFModuleInstanceAction.serviceUuid; const vfModuleId = updateVFModuleInstanceAction.vfId; + const position = updateVFModuleInstanceAction.position; const newState = _.cloneDeep(state); const vnfs = newState.serviceHierarchy[serviceUuid].vnfs; let vnfId = getVfModuleParentVnfId(vnfs, vfModuleId); @@ -64,8 +64,8 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS updateUniqueNames(vfModulesMap[updateVFModuleInstanceAction.dynamicModelName].volumeGroupName, vfInstance.volumeGroupName, newState.serviceInstance[serviceUuid]); vfModulesMap[updateVFModuleInstanceAction.dynamicModelName] = vfInstance; newState.serviceInstance[serviceUuid].vnfs[vnfId].vfModules[vfModuleId] = vfModulesMap; - //retain the position of newly added VF module -- change logic - calculatePosition(newState,serviceUuid, vnfStoreKey); + //retain the position of newly added VF module + newState.serviceInstance[serviceUuid].vnfs[vnfId].vfModules[vfModuleId][updateVFModuleInstanceAction.dynamicModelName].position= updateVFModuleInstanceAction.position; return newState; } case VfModuleActions.REMOVE_VNF_MODULE_INSTANCE: { @@ -130,11 +130,11 @@ export function vfModuleReducer(state: ServiceState , action: Action) : ServiceS case VfModuleActions.UPDATE_VFMODULE_POSITION : { const updateVFModluePosition = <UpdateVFModluePosition>action; const serviceUuid = updateVFModluePosition.instanceId; - const dynamicModelName = updateVFModluePosition.node.dynamicModelName; - const modelName = updateVFModluePosition.node.modelName; + const dynamicModelName = updateVFModluePosition.dynamicModelName; + const modelName = updateVFModluePosition.vfKey; const newState = _.cloneDeep(state); - newState.serviceInstance[serviceUuid].vnfs[updateVFModluePosition.vnfStoreKey].vfModules[modelName][dynamicModelName].position = updateVFModluePosition.node.position; + newState.serviceInstance[serviceUuid].vnfs[updateVFModluePosition.vnfStoreKey].vfModules[modelName][dynamicModelName].position = updateVFModluePosition.position; return newState; } |