From 74e6271d3c9a5f0f2f471c607ca7bc9b8f3d5fc0 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Wed, 29 Jan 2020 18:20:23 +0200 Subject: originalName fallbacks to customizationId or invariantId Issue-ID: VID-724 Change-Id: I3db8d09cabfb700dc1acd469d6fb8acb4764cd73 Signed-off-by: Ittay Stern --- .../service-planning/objectsToTree/models/vnf/vnf.model.info.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts') diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts index 950e3628c..b2b7b43e2 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts @@ -88,13 +88,12 @@ export class VnfModelInfo implements ILevelNodeInfo { * @param serviceHierarchy - serviceHierarchy ************************************************************/ getModel = (vnfModelId: string, instance: VnfInstance, serviceHierarchy): VNFModel => { - const originalModelName = instance.originalName ? instance.originalName : vnfModelId; + const uniqueIdOrName = this._sharedTreeService.modelUniqueNameOrId(instance); return new VNFModel( - this._sharedTreeService.modelByIdentifier(serviceHierarchy, this.name, originalModelName), + this._sharedTreeService.modelByIdentifiers(serviceHierarchy, this.name, uniqueIdOrName, vnfModelId), this._featureFlagsService.getAllFlags()); }; - /*********************************************************** * return vnf instance tree node * @param instance - vnf instance -- cgit 1.2.3-korg