diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2020-02-02 18:09:40 +0200 |
|---|---|---|
| committer | Ittay Stern <ittay.stern@att.com> | 2020-02-03 19:32:49 +0200 |
| commit | 0814238f615f3e3b855a53add72730b957f6c790 (patch) | |
| tree | a9170ece7827b039de56534459bcfa0c76ebb7e5 /vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree | |
| parent | 52670a9e0b450074dfbe0d151925d0133bc8442a (diff) | |
NodeInfo::getModel expects the instance-model
Now callers (objectToInstanceTree, objectToModelTree, etc.) pass the hierarchy
itself, instead of providing only the service hierarchy and keys.
Issue-ID: VID-724
Change-Id: I80cde29887d86b2cc986d96b220ff769562f38b8
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree')
2 files changed, 9 insertions, 3 deletions
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts index ec6f2a4c5..7fa679bb5 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.spec.ts @@ -211,6 +211,7 @@ describe('Model Tree Generator service', () => { "name": "2017-388_PASQUALE-vPE 1", "tooltip": "VF", "type": "VF", + "modelTypeName": "vnfs", "count": 0, "max": 1, "children": [], @@ -228,6 +229,7 @@ describe('Model Tree Generator service', () => { "name": "2017-388_PASQUALE-vPE 0", "tooltip": "VF", "type": "VF", + "modelTypeName": "vnfs", "count": 0, "max": 1, "children": [], @@ -243,6 +245,7 @@ describe('Model Tree Generator service', () => { "name": "2017-488_PASQUALE-vPE 0", "tooltip": "VF", "type": "VF", + "modelTypeName": "vnfs", "count": 0, "max": 1, "children": [{ @@ -253,6 +256,7 @@ describe('Model Tree Generator service', () => { "name": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "tooltip": "VFmodule", "type": "VFmodule", + "modelTypeName": "vfModules", "count": 0, "max": 1, "children": [], @@ -268,6 +272,7 @@ describe('Model Tree Generator service', () => { "name": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "tooltip": "VFmodule", "type": "VFmodule", + "modelTypeName": "vfModules", "count": 0, "max": 1, "children": [], @@ -283,6 +288,7 @@ describe('Model Tree Generator service', () => { "name": "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "tooltip": "VFmodule", "type": "VFmodule", + "modelTypeName": "vfModules", "count": 0, "max": 1, "children": [], diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.ts index f1ebdaff9..c3c8fa1b3 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/objectToModelTree/objectToModelTree.service.ts @@ -121,11 +121,11 @@ export class ObjectToModelTreeService { node.getNodeCount = (node, serviceId) => levelNodeInfo.getNodeCount(node, serviceId); node.getMenuAction = (node, serviceId) => levelNodeInfo.getMenuAction(node, serviceId); node.showNodeIcons = (node, serviceId) => levelNodeInfo.showNodeIcons(node, serviceId); - node.typeName = levelNodeInfo.typeName; node.getModel = levelNodeInfo.getModel.bind(levelNodeInfo); - node.getInfo = !_.isNil(levelNodeInfo.getInfo) ? levelNodeInfo.getInfo.bind(levelNodeInfo) : () => { - }; + node.getInfo = !_.isNil(levelNodeInfo.getInfo) ? levelNodeInfo.getInfo.bind(levelNodeInfo) : () => {}; node.componentInfoType = levelNodeInfo.componentInfoType; + node.typeName = levelNodeInfo.typeName; + node.modelTypeName = levelNodeInfo.name; return node; } } |