From f84164f29eb0c314580f0c44de3d513d9e7b0e5a Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Tue, 4 Feb 2020 14:13:24 +0200 Subject: upgrade VFM is not enabled when other VFM in the same VNF is already upgraded (fix) Also fixes a bug in modelUniqueNameOrId when `instance` contains inner vfModule object. Issue-ID: VID-771 Change-Id: Ie7326780c968fe334dfe3888c518eeb5a8e1919f Signed-off-by: Ittay Stern --- vid-webpack-master/src/app/shared/models/treeNodeModel.ts | 3 +++ 1 file changed, 3 insertions(+) (limited to 'vid-webpack-master/src/app/shared/models') diff --git a/vid-webpack-master/src/app/shared/models/treeNodeModel.ts b/vid-webpack-master/src/app/shared/models/treeNodeModel.ts index 9242add85..39f56228e 100644 --- a/vid-webpack-master/src/app/shared/models/treeNodeModel.ts +++ b/vid-webpack-master/src/app/shared/models/treeNodeModel.ts @@ -3,6 +3,7 @@ import {NodeModel} from "./nodeModel"; import {ServiceNodeTypes} from "./ServiceNodeTypes"; import * as _ from 'lodash'; import {ServiceInstanceActions} from "./serviceInstanceActions"; + export enum TreeLevel { Level_0 , Level_1, Level_2 @@ -16,6 +17,7 @@ interface TreeNodeInstanceInterface { export class TreeNodeModel { type: String; modelId: string; + modelInvariantId?: string; modelCustomizationId?: string; modelUniqueId?: string; id: string; @@ -32,6 +34,7 @@ export class TreeNodeModel { instanceName?: string; constructor(instance: ChildNodeInstance, nodeModel: NodeModel){ + this.modelInvariantId = nodeModel.invariantUuid; this.modelCustomizationId = nodeModel.customizationUuid; this.modelId = nodeModel.uuid; this.modelUniqueId = this.modelCustomizationId || this.modelId; -- cgit 1.2.3-korg