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>

1 files changed, 7 insertions, 1 deletions

diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts
index c9a89cf6f..56d708bb9 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts
@@ -77,7 +77,13 @@ export class AvailableModelsTreeService {
   shouldOpenVRFModal(nodes, serviceModelId: string , service)  {
     for(const node of nodes){
       if(node.type === 'VRF' && service.serviceInstance[serviceModelId].existingVRFCounterMap && !service.serviceInstance[serviceModelId].existingVRFCounterMap[node.modelUniqueId]){
-        const vrfModel : VrfModel = node.getModel(node.name, node, service.serviceInstance[serviceModelId]);
+        const serviceHierarchy = service.serviceHierarchy[serviceModelId];
+
+        const instanceModel = this._sharedTreeService.modelByIdentifiers(
+          serviceHierarchy, node.modelTypeName, node.modelCustomizationId, node.name
+        );
+
+        const vrfModel : VrfModel = node.getModel(instanceModel);
         const vrfCounter : number = service.serviceInstance[serviceModelId].existingVRFCounterMap[node.modelUniqueId];
         console.log('vrfCounter', vrfCounter);
         if(vrfModel.min > 0 && (_.isNil(vrfCounter) || vrfCounter === 0)){