From a29c7c0207aea6bd28f30e73c8ab43225f2b91fb Mon Sep 17 00:00:00 2001 From: Alexey Sandler Date: Tue, 31 Mar 2020 22:40:10 +0300 Subject: Show the VF module version on the view/edit screen Issue-ID: VID-800 Signed-off-by: Alexey Sandler Change-Id: If4eebaeb8f0ce89121e166e0aca10895a17c6155 Signed-off-by: Alexey Sandler --- .../objectToInstanceTree.service.spec.ts | 25 +++++++----- .../objectsToTree/shared.tree.service.spec.ts | 46 ++++++++++++++++++---- .../objectsToTree/shared.tree.service.ts | 14 ++++++- 3 files changed, 66 insertions(+), 19 deletions(-) (limited to 'vid-webpack-master/src/app/drawingBoard') diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts index a81c86025..f8a738ac7 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToInstanceTree/objectToInstanceTree.service.spec.ts @@ -2616,10 +2616,10 @@ describe('Model Tree Generator service', () => { "children": [], "statusMessage": "Failed Vnf Message", "statusProperties": [Object({ - key: 'Prov Status:', + key: 'Prov Status: ', value: 'prov', testId: 'provStatus' - }), Object({ key: 'Orch Status:', value: 'Active', testId: 'orchStatus' }), Object({ + }), Object({ key: 'Orch Status: ', value: 'Active', testId: 'orchStatus' }), Object({ key: 'In-maintenance', value: '', testId: 'inMaint' @@ -2641,10 +2641,10 @@ describe('Model Tree Generator service', () => { "vnfStoreKey": "2017-488_PASQUALE-vPE 0", "typeName": "VNF", "statusProperties": [Object({ - key: 'Prov Status:', + key: 'Prov Status: ', value: undefined, testId: 'provStatus' - }), Object({ key: 'Orch Status:', value: undefined, testId: 'orchStatus' })], + }), Object({ key: 'Orch Status: ', value: undefined, testId: 'orchStatus' })], "children": [{ "parentType": 'VNF', "action": 'None', @@ -2674,10 +2674,15 @@ describe('Model Tree Generator service', () => { "dynamicModelName": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0zssmp", "typeName": "M", "statusProperties": [Object({ - key: 'Prov Status:', + key: 'Prov Status: ', value: undefined, testId: 'provStatus' - }), Object({ key: 'Orch Status:', value: undefined, testId: 'orchStatus' })], + }), Object({ key: 'Orch Status: ', value: undefined, testId: 'orchStatus' }), + Object({ + key: 'Model Version: ', + value: '5', + testId: 'modelVersion' + })], }] }] } @@ -2698,10 +2703,10 @@ describe('Model Tree Generator service', () => { "vnfStoreKey": "2017-488_PASQUALE-vPE 0", "typeName": "VNF", "statusProperties": [Object({ - key: 'Prov Status:', + key: 'Prov Status: ', value: undefined, testId: 'provStatus' - }), Object({ key: 'Orch Status:', value: undefined, testId: 'orchStatus' })], + }), Object({ key: 'Orch Status: ', value: undefined, testId: 'orchStatus' })], "children": [ { "action": 'None', @@ -2788,10 +2793,10 @@ describe('Model Tree Generator service', () => { "networkStoreKey": "ExtVL 0", "typeName": "N", "statusProperties": [Object({ - key: 'Prov Status:', + key: 'Prov Status: ', value: undefined, testId: 'provStatus' - }), Object({ key: 'Orch Status:', value: undefined, testId: 'orchStatus' })], + }), Object({ key: 'Orch Status: ', value: undefined, testId: 'orchStatus' })], }, { "parentType": '', 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 fcef504fd..60f59de4c 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 @@ -312,23 +312,55 @@ describe('Shared Tree Service', () => { }); test('statusProperties should be prop on node according to node properties', () => { - let node = service.addingStatusProperty({orchStatus: 'completed', provStatus: 'inProgress', inMaint: false}); + + let node = service.addingStatusProperty({orchStatus: 'completed', provStatus: 'inProgress', type: 'VFmodule', instanceModelInfo:{modelVersion: '1'}, inMaint: false}); expect(node.statusProperties).toBeDefined(); expect(node.statusProperties).toEqual([Object({ - key: 'Prov Status:', + key: 'Prov Status: ', value: 'inProgress', testId: 'provStatus' - }), Object({key: 'Orch Status:', value: 'completed', testId: 'orchStatus'})]); - node = service.addingStatusProperty({orchStatus: 'completed', provStatus: 'inProgress', inMaint: true}); + }), Object({ + key: 'Orch Status: ', + value: 'completed', + testId: 'orchStatus' + }), + Object({ + key: 'Model Version: ', + value: '1', + testId: 'modelVersion' + })]); + node = service.addingStatusProperty({orchStatus: 'completed', provStatus: 'inProgress',type: 'VFmodule', instanceModelInfo:{}, inMaint: true}); expect(node.statusProperties).toEqual([Object({ - key: 'Prov Status:', + key: 'Prov Status: ', value: 'inProgress', testId: 'provStatus' - }), Object({key: 'Orch Status:', value: 'completed', testId: 'orchStatus'}), Object({ + }), Object({ + key: 'Orch Status: ', + value: 'completed', + testId: 'orchStatus' + }), Object({ + key: 'Model Version: ', + value: undefined, + testId: 'modelVersion' + }), Object({ key: 'In-maintenance', value: '', testId: 'inMaint' - })]); + }) +]); + }); + each([ + ['version 2', '2', '2'], + ['undefined', null, undefined] + ]). + test('getNodeModelVersion should return %s', (description, nodeVersion, expectedVersion) => { + let node = { + instanceModelInfo:{ + modelVersion: nodeVersion + } + }; + let actualVersion = service.getNodeModelVersion(node); + expect(actualVersion).toEqual(expectedVersion); }); each([ diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts index 1e8512784..249f9ec85 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts @@ -120,14 +120,24 @@ export class SharedTreeService { addingStatusProperty(node) { node['statusProperties'] = []; - node['statusProperties'].push({key: 'Prov Status:', value: node.provStatus, testId: 'provStatus'}); - node['statusProperties'].push({key: 'Orch Status:', value: node.orchStatus, testId: 'orchStatus'}); + node['statusProperties'].push({key: 'Prov Status: ', value: node.provStatus, testId: 'provStatus'}); + node['statusProperties'].push({key: 'Orch Status: ', value: node.orchStatus, testId: 'orchStatus'}); + if(node.type === 'VFmodule') { + node['statusProperties'].push({key: 'Model Version: ', value: this.getNodeModelVersion(node), testId: 'modelVersion'}); + } if (node.inMaint) { node['statusProperties'].push({key: 'In-maintenance', value: '', testId: 'inMaint'}); } return node; } + getNodeModelVersion(node): string | undefined { + if(!_.isNil(node.instanceModelInfo) && !_.isNil(node.instanceModelInfo.modelVersion)){ + return node.instanceModelInfo.modelVersion; + } + return undefined; + } + /********************************************** * should delete or remove child instance's "new" -> should remove -- cgit 1.2.3-korg