diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-12-26 15:21:17 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-12-30 06:18:18 +0200 |
commit | 18c3ce8d1e1d166d5302f9708036202b0258110e (patch) | |
tree | fcbcf8f2c90472d538177cb5e359b17e7b757493 /vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts | |
parent | a371bcd5601df09063af5a00b1579ce197690bfd (diff) |
Fixing the issue which prevents from clicking the [+] button on templates
i) Use modelUniqueName instead of obsolete originalName
ii) Add RECREATE as "editable" case
iii) Lift vfModules limitation in model to 3
Issue-ID: VID-724
Change-Id: I9e55142ee379f4eead3c8634f5b816d2d1db1f8e
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts')
-rw-r--r-- | vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts | 111 |
1 files changed, 32 insertions, 79 deletions
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts index 8bdab11e3..216231813 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.spec.ts @@ -195,21 +195,21 @@ describe('VFModule Model Info', () => { }); 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 : { @@ -217,6 +217,9 @@ describe('VFModule Model Info', () => { 'servicedId' : { 'vnfs' : { 'vnfName' : { + modelInfo: { + modelCustomizationId: 'vnfCustomizationId' + }, 'properties' : { 'max_instances' : 1 } @@ -224,8 +227,11 @@ describe('VFModule Model Info', () => { }, 'vfModules' : { 'vfModuleName' : { + modelInfo: { + modelCustomizationId: 'vfModuleCustomizationId' + }, 'properties' : { - maxCountInstances : 1 + maxCountInstances : 2 } } } @@ -238,7 +244,6 @@ describe('VFModule Model Info', () => { }, 'vnfs' : { 'vnfName' :{ - 'originalName' : 'vnfName', 'vfModules' : { 'vfModuleName' : { @@ -256,68 +261,6 @@ describe('VFModule Model Info', () => { }); - 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({ @@ -379,6 +322,8 @@ describe('VFModule Model Info', () => { 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 : { @@ -386,6 +331,9 @@ describe('VFModule Model Info', () => { 'servicedId' : { 'vnfs' : { 'vnfName' : { + modelInfo: { + modelCustomizationId: 'vnfCustomizationId' + }, 'properties' : { 'max_instances' : 1 } @@ -393,6 +341,9 @@ describe('VFModule Model Info', () => { }, 'vfModules' : { 'vfModuleName' : { + modelInfo: { + modelCustomizationId: vfModuleModelUniqueId + }, 'properties' : { maxCountInstances : 2 } @@ -414,13 +365,13 @@ describe('VFModule Model Info', () => { 'vnfModuleName_111': { 'action': 'Create', 'modelInfo' : { - modelVersionId : 'vfModuleId' + modelCustomizationId : vfModuleModelUniqueId } }, 'vnfModuleName_111_1': { 'action': 'Create', 'modelInfo' : { - modelVersionId : 'vfModuleId' + modelCustomizationId : vfModuleModelUniqueId } } } @@ -434,13 +385,13 @@ describe('VFModule Model Info', () => { 'vnfModuleName_111': { 'action': 'Create', 'modelInfo' : { - modelVersionId : 'vfModuleId' + modelCustomizationId : vfModuleModelUniqueId } }, 'vnfModuleName_111_1': { 'action': 'Create', 'modelInfo' : { - modelVersionId : 'vfModuleId' + modelCustomizationId : vfModuleModelUniqueId } } } @@ -455,13 +406,13 @@ describe('VFModule Model Info', () => { let node = { data : { id : 'vfModuleId', - name : 'vfModuleName', + modelUniqueId: vfModuleModelUniqueId, 'action': 'Create', }, parent : { data : { id : 'vnfId', - name : 'vnfName', + modelUniqueId: 'vnfCustomizationId', 'action': 'Create', } } @@ -473,6 +424,8 @@ describe('VFModule Model Info', () => { 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 : { @@ -508,13 +461,13 @@ describe('VFModule Model Info', () => { 'vnfModuleName_111': { 'action': 'Create', 'modelInfo' : { - modelVersionId : 'vfModuleId' + modelCustomizationId : vfModuleModelUniqueId } }, 'vnfModuleName_111_1': { 'action': 'Create', 'modelInfo' : { - modelVersionId : 'vfModuleId' + modelCustomizationId : vfModuleModelUniqueId } } } @@ -528,7 +481,7 @@ describe('VFModule Model Info', () => { 'vnfModuleName_111': { 'action': 'Create', 'modelInfo' : { - modelVersionId : 'vfModuleId' + modelCustomizationId: vfModuleModelUniqueId } } } @@ -544,13 +497,13 @@ describe('VFModule Model Info', () => { let node = { data : { id : 'vfModuleId', - name : 'vfModuleName', + modelUniqueId: vfModuleModelUniqueId, 'action': 'Create', }, parent : { data : { id : 'vnfId', - name : 'vnfName_1', + modelUniqueId: 'vnfCustomizationId', 'action': 'Create', } } |