diff options
author | Ittay Stern <ittay.stern@att.com> | 2020-01-29 18:20:23 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2020-02-02 12:54:38 +0200 |
commit | 74e6271d3c9a5f0f2f471c607ca7bc9b8f3d5fc0 (patch) | |
tree | c4cd63d23007d8b3d66939146db43fd95b3220f7 /vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf | |
parent | aefc6a0e43b8ce36134dbbed71cf2b4cb9745a9f (diff) |
originalName fallbacks to customizationId or invariantId
Issue-ID: VID-724
Change-Id: I3db8d09cabfb700dc1acd469d6fb8acb4764cd73
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf')
-rw-r--r-- | vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vnf/vnf.model.info.ts | 5 |
1 files changed, 2 insertions, 3 deletions
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 |