From a3e54c3e36156bccea5293f87b3e2d9caad2e025 Mon Sep 17 00:00:00 2001 From: Yoav Schneiderman Date: Sun, 2 Feb 2020 20:00:00 +0200 Subject: upgrade VFM is not enable when other VFM in the same VNF is already upgraded. Issue-ID: VID-771 Signed-off-by: Yoav Schneiderman Change-Id: Ia5eca719c50d47c77919a82c2306605da4d2a1c0 Signed-off-by: Yoav Schneiderman --- .../objectsToTree/shared.tree.service.spec.ts | 45 +++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts') diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts index b4c58364b..2ff729d61 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts @@ -196,7 +196,7 @@ describe('Shared Tree Service', () => { .toBeUndefined(); }); - test('openAuditInfoModal should open modal for failed instance', () => { + test('openAuditInfoModalInsideIframe should open modal for failed instance', () => { jest.spyOn(AuditInfoModalComponent.openInstanceAuditInfoModal, 'next'); let modelInfoServiceMock: ILevelNodeInfo = new VnfModelInfo(null, null, @@ -339,6 +339,49 @@ describe('Shared Tree Service', () => { expect(res).toBe(enabled); }); + + const isDiffCustomizationUuidProvider = [ + ['currentVfModule customizationUuid and customizationUuid vfModuleHierarchy are diff' ,true, 'mDNS 01222020 0', 'mdns012220200..Mdns01222020..base_dns..module-0', '82160e6e-d9c4-45ef-bd19-01573ab11b61'], + ['currentVfModule customizationUuid and customizationUuid vfModuleHierarchy are same' , false, 'mDNS 01222020 0', 'mdns012220200..Mdns01222020..base_dns..module-0', 'c9b32003-febc-44e0-a97f-7630fa7fa4a0'], + ['vnfHierarchy is not part of the current model' , true, 'VNF_NOT_PART_OF_THE_MODEL', 'mdns012220200..Mdns01222020..base_dns..module-0', 'c9b32003-febc-44e0-a97f-7630fa7fa4a0'], + ['vfModuleHierarchy is not part of the current model', true, 'mDNS 01222020 1', 'VFM_NOT_PART_OF_THE_MODEL', 'c9b32003-febc-44e0-a97f-7630fa7fa4a0']]; + + each(isDiffCustomizationUuidProvider).test('isDiffCustomizationUuid: when %s should return %s', (description, expected, vnfModelName, vfModuleModelName, customizationUuid) => { + const serviceModelId : string = 'a243da28-c11e-45a8-9f26-0284a9a789bc'; + spyOn(store, 'getState').and.returnValue({ + service : { + serviceHierarchy : { + [serviceModelId] : { + vnfs : { + [vnfModelName] : { + vfModules : { + [vfModuleModelName] : { + customizationUuid : customizationUuid + } + } + } + } + } + } + } + }); + + const node = { + data:{ + modelCustomizationId : 'c9b32003-febc-44e0-a97f-7630fa7fa4a0', + modelName : vfModuleModelName + }, + parent : { + data : { + modelName : "mDNS 01222020 0" + } + } + }; + + const isDiffCustomizationUuidResponse : boolean = service.isDiffCustomizationUuid(node, serviceModelId); + expect(isDiffCustomizationUuidResponse).toEqual(expected); + }); + }); function getStore() { -- cgit 1.2.3-korg