"action": "Create",
"instanceId": null,
"instanceName": "hvf6arlba007",
+ "vnfStoreKey": "vProbe_NC_VNF 0",
"instanceParams": [
{
}
.getElementByDataTestsId("sdncPreLoad").should('have.value', 'on')
.getElementByDataTestsId("cancelButton").click();
- assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd();
+ assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd([
+ {path: [...vnfPath, "vnfStoreKey"], value: "vProbe_NC_VNF 0"}, // side-effect
+ ]);
});
it(`Given a stored template - when "edit" service is opened - then template’s details are visible as expected`, function () {
});
- it.skip(`Given a stored template - add one VfModule, edit it's details, and deploy - deploy is added with the vfModule details`, () => {
- // Test is disabled, as an issue currently prevents from clicking the [+] button.
-
+ it(`Given a stored template - add one VfModule, edit its details, and deploy - deploy is added with the vfModule details`, () => {
loadDrawingBoardWithRecreateMode();
let newVfModuleName = "new.vfmodule.name";
// Then...
cy.getReduxState().then((state) => {
- let vnfPath = [
- "vnfs", "vProbe_NC_VNF 0"
- ];
-
let vfModules_1Path = [
...vnfPath, "vfModules", module1CustomizationId,
];
);
assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd([
+ {path: [...vnfPath, "vnfStoreKey"], value: "vProbe_NC_VNF 0"}, // side-effect
{path: ["existingNames", newVfModuleName], value: ""},
{path: ["existingNames", `${newVfModuleName}_vol`], value: ""},
{path: latestVfModule_1Path, value: latestVfModule_1ExpectedValue},
cy.getElementByDataTestsId('form-set').click();
// Then...
- let vnfPath = [
- "vnfs", "vProbe_NC_VNF 0"
- ];
let vfModule_0Path = [
...vnfPath, "vfModules",
"vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0",
const serviceModelId = '6cfeeb18-c2b0-49df-987a-da47493c8e38';
+const vnfPath = [
+ "vnfs", "vProbe_NC_VNF 0"
+];
+
function loadDrawingBoardWithRecreateMode() {
const templateUuid = "46390edd-7100-46b2-9f18-419bd24fb60b";
"modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
"properties": {
"minCountInstances": 0,
- "maxCountInstances": null,
+ "maxCountInstances": 3,
"initialCount": 0,
"vfModuleLabel": "FE_Add_On_Module_vlbagent_eph",
"baseModule": false
"modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
"properties": {
"minCountInstances": 0,
- "maxCountInstances": null,
+ "maxCountInstances": 3,
"initialCount": 0,
"vfModuleLabel": "FE_Add_On_Module_vlbagent_eph",
"baseModule": false
"modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
"properties": {
"minCountInstances": 0,
- "maxCountInstances": null,
+ "maxCountInstances": 3,
"initialCount": 0,
"vfModuleLabel": "FE_Add_On_Module_vlbagent_eph",
"baseModule": false
"modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
"properties": {
"minCountInstances": 0,
- "maxCountInstances": null,
+ "maxCountInstances": 3,
"initialCount": 0,
"vfModuleLabel": "FE_Add_On_Module_vlbagent_eph",
"baseModule": false
if (this._sharedTreeService.selectedVNF) {
this.store.dispatch(createVFModuleInstance(vfModule, node.data.name, this.serviceModelId, null, this._sharedTreeService.selectedVNF));
DrawingBoardTreeComponent.triggerreCalculateIsDirty.next(this.serviceModelId);
- } else if (this._availableModelsTreeService.getOptionalVNFs(this.serviceModelId, node.parent.data.name).length === 1) {
+ } else if (this._availableModelsTreeService.getOptionalVNFs(this.serviceModelId, node.parent.data.modelUniqueId).length === 1) {
let existVnf = this._store.getState().service.serviceInstance[this.serviceModelId].vnfs;
if(!_.isNil(existVnf)){
for(let vnfKey in existVnf){
- const modelUniqueId = existVnf[vnfKey]['modelInfo'].modelCustomizationId || existVnf[vnfKey]['modelInfo'].modelInvariantId;
+ const modelUniqueId = this._sharedTreeService.modelUniqueId(existVnf[vnfKey]);
if(modelUniqueId === node.parent.data.id){
this.store.dispatch(createVFModuleInstance(vfModule, node.data.name, this.serviceModelId, null, vnfKey));
DrawingBoardTreeComponent.triggerreCalculateIsDirty.next(this.serviceModelId);
import {AppState} from "../../../shared/store/reducers";
import {MessageBoxData} from "../../../shared/components/messageBox/messageBox.data";
import {MessageBoxService} from "../../../shared/components/messageBox/messageBox.service";
-import * as _ from "lodash";
-import { SdcUiCommon} from "onap-ui-angular";
+import {SdcUiCommon} from "onap-ui-angular";
import {SharedTreeService} from "../objectsToTree/shared.tree.service";
import {VrfModel} from "../../../shared/models/vrfModel";
import {clearAllGenericModalhelper} from "../../../shared/storeUtil/utils/global/global.actions";
+import * as _ from "lodash";
export class AvailableNodeIcons {
addIcon: boolean;
export class AvailableModelsTreeService {
constructor(private _defaultDataGeneratorService: DefaultDataGeneratorService,
private store: NgRedux<AppState>,
- public _shareTreeService : SharedTreeService) {
+ public _sharedTreeService : SharedTreeService) {
}
return false;
}
- getOptionalVNFs(serviceUUID: string, vnfOriginalModelName : string) : any[] {
+ getOptionalVNFs(serviceUUID: string, vnfModelUniqueId: string) : any[] {
let result = [];
if(!_.isNil(this.store.getState().service.serviceInstance) && !_.isNil(this.store.getState().service.serviceInstance[serviceUUID])){
const serviceVNFsInstances = this.store.getState().service.serviceInstance[serviceUUID].vnfs;
for(let vnfKey in serviceVNFsInstances){
- if(serviceVNFsInstances[vnfKey].originalName === vnfOriginalModelName){
+ if (this._sharedTreeService.modelUniqueId(serviceVNFsInstances[vnfKey]) === vnfModelUniqueId) {
serviceVNFsInstances[vnfKey].vnfStoreKey = vnfKey;
result.push(serviceVNFsInstances[vnfKey]);
}
}
}
-
-
return result;
}
});
test('showNodeIcons should return true, false if reachLimit of max', ()=>{
- let serviceId : string = 'servicedId';
let node = {
data : {
id : 'vfModuleId',
- name : 'vfModuleName'
+ modelUniqueId : 'vfModuleCustomizationId'
},
parent : {
data : {
id : 'vnfId',
- name : 'vnfName'
+ modelUniqueId : 'vnfCustomizationId'
}
}
};
jest.spyOn(_sharedTreeService, 'getSelectedVNF').mockReturnValue('vnfName');
- jest.spyOn(vfModuleModel, 'getOptionalVNFs').mockReturnValue(['vnfName']);
+ jest.spyOn(_sharedTreeService, 'modelUniqueId').mockReturnValue('vnfCustomizationId');
+ jest.spyOn(vfModuleModel, 'getOptionalVNFs').mockReturnValue([{vnfStoreKey: 'vnfName'}]);
jest.spyOn(MockNgRedux.getInstance(), 'getState').mockReturnValue({
global : {},
service : {
'servicedId' : {
'vnfs' : {
'vnfName' : {
+ modelInfo: {
+ modelCustomizationId: 'vnfCustomizationId'
+ },
'properties' : {
'max_instances' : 1
}
},
'vfModules' : {
'vfModuleName' : {
+ modelInfo: {
+ modelCustomizationId: 'vfModuleCustomizationId'
+ },
'properties' : {
- maxCountInstances : 1
+ maxCountInstances : 2
}
}
}
},
'vnfs' : {
'vnfName' :{
- 'originalName' : 'vnfName',
'vfModules' : {
'vfModuleName' : {
});
- test('showNodeIcons should return false, true if reachLimit of max', ()=>{
- let serviceId : string = 'servicedId';
- let node = {
- data : {
- id : 'vfModuleId',
- name : 'vfModuleName'
- },
- parent : {
- data : {
- id : 'vnfId',
- name : 'vnfName'
- }
- }
- };
- jest.spyOn(_sharedTreeService, 'getSelectedVNF').mockReturnValue('vnfName');
- jest.spyOn(vfModuleModel, 'getOptionalVNFs').mockReturnValue(['vnfName']);
- jest.spyOn(MockNgRedux.getInstance(), 'getState').mockReturnValue({
- global : {},
- service : {
- serviceHierarchy : {
- 'servicedId' : {
- 'vnfs' : {
- 'vnfName' : {
- 'properties' : {
- 'max_instances' : 1
- }
- }
- },
- 'vfModules' : {
- 'vfModuleName' : {
- 'properties' : {
- maxCountInstances : 2
- }
- }
- }
- }
- },
- serviceInstance : {
- 'servicedId' : {
- 'existingVNFCounterMap' : {
- 'vnfId' : 1
- },
- 'vnfs' : {
- 'vnfName' :{
- 'originalName' : 'vnfName',
- 'vfModules' : {
- 'vfModuleName' : {
-
- }
- }
- }
- }
- }
- }
- }
- });
-
- let result = vfModuleModel.showNodeIcons(<any>node, 'servicedId');
- expect(result).toEqual(new AvailableNodeIcons(true , false));
- });
-
-
test('getOptionalVNFs should instance if exist', ()=>{
let serviceId : string = 'servicedId';
jest.spyOn(MockNgRedux.getInstance(), 'getState').mockReturnValue({
test('getNodeCount should return number of nodes', ()=>{
let serviceId : string = 'servicedId';
+ let vfModuleModelUniqueId = 'vfModuleCustomizationId';
+ jest.spyOn(_sharedTreeService, 'modelUniqueId').mockReturnValue(vfModuleModelUniqueId);
jest.spyOn(MockNgRedux.getInstance(), 'getState').mockReturnValue({
global : {},
service : {
'servicedId' : {
'vnfs' : {
'vnfName' : {
+ modelInfo: {
+ modelCustomizationId: 'vnfCustomizationId'
+ },
'properties' : {
'max_instances' : 1
}
},
'vfModules' : {
'vfModuleName' : {
+ modelInfo: {
+ modelCustomizationId: vfModuleModelUniqueId
+ },
'properties' : {
maxCountInstances : 2
}
'vnfModuleName_111': {
'action': 'Create',
'modelInfo' : {
- modelVersionId : 'vfModuleId'
+ modelCustomizationId : vfModuleModelUniqueId
}
},
'vnfModuleName_111_1': {
'action': 'Create',
'modelInfo' : {
- modelVersionId : 'vfModuleId'
+ modelCustomizationId : vfModuleModelUniqueId
}
}
}
'vnfModuleName_111': {
'action': 'Create',
'modelInfo' : {
- modelVersionId : 'vfModuleId'
+ modelCustomizationId : vfModuleModelUniqueId
}
},
'vnfModuleName_111_1': {
'action': 'Create',
'modelInfo' : {
- modelVersionId : 'vfModuleId'
+ modelCustomizationId : vfModuleModelUniqueId
}
}
}
let node = {
data : {
id : 'vfModuleId',
- name : 'vfModuleName',
+ modelUniqueId: vfModuleModelUniqueId,
'action': 'Create',
},
parent : {
data : {
id : 'vnfId',
- name : 'vnfName',
+ modelUniqueId: 'vnfCustomizationId',
'action': 'Create',
}
}
test('getNodeCount should return number of nodes : there is selectedVNF', ()=>{
let serviceId : string = 'servicedId';
+ let vfModuleModelUniqueId = 'vfModuleCustomizationId';
+ jest.spyOn(_sharedTreeService, 'modelUniqueId').mockReturnValue(vfModuleModelUniqueId);
jest.spyOn(MockNgRedux.getInstance(), 'getState').mockReturnValue({
global : {},
service : {
'vnfModuleName_111': {
'action': 'Create',
'modelInfo' : {
- modelVersionId : 'vfModuleId'
+ modelCustomizationId : vfModuleModelUniqueId
}
},
'vnfModuleName_111_1': {
'action': 'Create',
'modelInfo' : {
- modelVersionId : 'vfModuleId'
+ modelCustomizationId : vfModuleModelUniqueId
}
}
}
'vnfModuleName_111': {
'action': 'Create',
'modelInfo' : {
- modelVersionId : 'vfModuleId'
+ modelCustomizationId: vfModuleModelUniqueId
}
}
}
let node = {
data : {
id : 'vfModuleId',
- name : 'vfModuleName',
+ modelUniqueId: vfModuleModelUniqueId,
'action': 'Create',
},
parent : {
data : {
id : 'vnfId',
- name : 'vnfName_1',
+ modelUniqueId: 'vnfCustomizationId',
'action': 'Create',
}
}
import {VfModule} from "../../../../../shared/models/vfModule";
import {NgRedux} from "@angular-redux/store";
import {ITreeNode} from "angular-tree-component/dist/defs/api";
-import {GenericFormPopupComponent, PopupType} from "../../../../../shared/components/genericFormPopup/generic-form-popup.component";
+import {
+ GenericFormPopupComponent,
+ PopupType
+} from "../../../../../shared/components/genericFormPopup/generic-form-popup.component";
import {DialogService} from "ng2-bootstrap-modal";
import {VfModulePopupService} from "../../../../../shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
import {AppState} from "../../../../../shared/store/reducers";
import {MessageBoxService} from "../../../../../shared/components/messageBox/messageBox.service";
import {AvailableNodeIcons} from "../../../available-models-tree/available-models-tree.service";
import {IframeService} from "../../../../../shared/utils/iframe.service";
-import {deleteActionVfModuleInstance, deleteVFModuleField, removeVfModuleInstance, undoDeleteVfModuleInstance, undoUgradeVFModule, updateVFModulePosition, upgradeVFModule} from "../../../../../shared/storeUtil/utils/vfModule/vfModule.actions";
+import {
+ deleteActionVfModuleInstance,
+ deleteVFModuleField,
+ removeVfModuleInstance,
+ undoDeleteVfModuleInstance,
+ undoUgradeVFModule,
+ updateVFModulePosition,
+ upgradeVFModule
+} from "../../../../../shared/storeUtil/utils/vfModule/vfModule.actions";
import {ComponentInfoService} from "../../../component-info/component-info.service";
import {ComponentInfoType} from "../../../component-info/component-info-model";
import {ModelInformationItem} from "../../../../../shared/components/model-information/model-information.component";
getDefaultVNF(node: ITreeNode, serviceModelId: string): string {
let keys = _.keys(_.pickBy(this._store.getState().service.serviceInstance[serviceModelId].vnfs, vnf => {
- return (vnf.originalName == node.data.name);
+ return (this._sharedTreeService.modelUniqueId(vnf) === node.data.modelUniqueId);
}));
return keys.length === 1 ? this._store.getState().service.serviceInstance[serviceModelId].vnfs[keys[0]].vnfStoreKey : null;
}
let count = 0;
for (let vfModuleKey in vnf['vfModules']) {
for (let vfModule in vnf['vfModules'][vfModuleKey]) {
- if (vnf['vfModules'][vfModuleKey][vfModule]['modelInfo'].modelCustomizationId === node.data.modelUniqueId) {
+ if (this._sharedTreeService.modelUniqueId(vnf['vfModules'][vfModuleKey][vfModule]) === node.data.modelUniqueId) {
const vfModuleObj = vnf['vfModules'][vfModuleKey][vfModule];
if (!(!_.isNil(vfModuleObj) && !_.isNil(vfModuleObj.action) && vfModuleObj.action.split('_').pop() === 'Delete')) count++;
}
if (selectedVNF) {
return this.showVFModuleOnSelectedVNF(node, selectedVNF, serviceModelId);
} else {
- const optionalSelected = this.getOptionalVNFs(serviceModelId, node.parent.data.name);
+ const optionalSelected = this.getOptionalVNFs(serviceModelId, node.parent.data.modelUniqueId);
if (optionalSelected.length === 1) {
return this.showVFModuleOnSelectedVNF(node, optionalSelected[0].vnfStoreKey, serviceModelId);
} else {
showVFModuleOnSelectedVNF(node: ITreeNode, selectedVNF: string, serviceModelId: string): AvailableNodeIcons {
- if (!_.isNil(this._store.getState().service.serviceInstance[serviceModelId].vnfs[selectedVNF]) && node.parent.data.name === this._store.getState().service.serviceInstance[serviceModelId].vnfs[selectedVNF].originalName) {
+ if (!_.isNil(this._store.getState().service.serviceInstance[serviceModelId].vnfs[selectedVNF])
+ && node.parent.data.modelUniqueId === this._sharedTreeService.modelUniqueId(this._store.getState().service.serviceInstance[serviceModelId].vnfs[selectedVNF])) {
const existingVFModules = this.getCountVFModuleOfSelectedVNF(node, selectedVNF, serviceModelId);
const reachedLimit = this.isVFModuleReachedLimit(node, this._store.getState().service.serviceHierarchy, serviceModelId, existingVFModules);
const showAddIcon = this._sharedTreeService.shouldShowAddIcon() && !reachedLimit;
}
- getOptionalVNFs(serviceUUID: string, vnfOriginalModelName: string): any[] {
+ getOptionalVNFs(serviceUUID: string, vnfModelUniqueId: string): any[] {
let result = [];
if (!_.isNil(this._store.getState().service.serviceInstance) && !_.isNil(this._store.getState().service.serviceInstance[serviceUUID])) {
const serviceVNFsInstances = this._store.getState().service.serviceInstance[serviceUUID].vnfs;
for (let vnfKey in serviceVNFsInstances) {
- if (serviceVNFsInstances[vnfKey].originalName === vnfOriginalModelName) {
+ if (this._sharedTreeService.modelUniqueId(serviceVNFsInstances[vnfKey]) === vnfModelUniqueId) {
serviceVNFsInstances[vnfKey].vnfStoreKey = vnfKey;
result.push(serviceVNFsInstances[vnfKey]);
}
import {FeatureFlagsService, Features} from "../../../shared/services/featureFlag/feature-flags.service";
import {Utils} from "../../../shared/utils/utils";
import {Constants} from "../../../shared/utils/constants";
+import {NodeInstance} from "../../../shared/models/nodeInstance";
@Injectable()
export class SharedTreeService {
}
}
+ /**
+ * Determines a consistent unique ID for a given right-tree
+ * node instance.
+ */
+ modelUniqueId = (nodeInstance: NodeInstance): string => {
+ return _.isNil(nodeInstance.modelInfo)
+ ? null
+ : (nodeInstance.modelInfo.modelCustomizationId || nodeInstance.modelInfo.modelInvariantId);
+ };
+
hasMissingData(instance, dynamicInputs: any, isEcompGeneratedNaming: boolean, requiredFields: string[]): boolean {
if (!isEcompGeneratedNaming && _.isEmpty(instance.instanceName)) {
return true;
**********************************************/
shouldShowAddIcon(): boolean{
const mode = this._store.getState().global.drawingBoardStatus;
- return mode === DrawingBoardModes.EDIT || mode=== DrawingBoardModes.CREATE;
+ return mode === DrawingBoardModes.EDIT || mode=== DrawingBoardModes.CREATE || mode=== DrawingBoardModes.RECREATE;
}
Code Review / vid.git / commitdiff