upgrade vfmodule when upgraded already service, vnf and brother vfmodule e2e

[vid.git] / vid-webpack-master / src / app / shared / models / treeNodeModel.ts

diff --git a/vid-webpack-master/src/app/shared/models/treeNodeModel.ts b/vid-webpack-master/src/app/shared/models/treeNodeModel.ts
index 9242add..8da204c 100644 (file)
--- 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,8 +34,14 @@ export class TreeNodeModel {
   instanceName?: string;
 
   constructor(instance: ChildNodeInstance, nodeModel: NodeModel){
-    this.modelCustomizationId = nodeModel.customizationUuid;
-    this.modelId = nodeModel.uuid;
+
+    this.modelInvariantId = nodeModel.invariantUuid;
+    if (instance.modelInfo) {
+      this.modelCustomizationId = instance.modelInfo.modelCustomizationId;
+      this.modelId = instance.modelInfo.modelVersionId;
+    } else {
+      console.debug("no 'modelInfo' in node-instance", instance)
+    }
     this.modelUniqueId = this.modelCustomizationId || this.modelId;
     this.missingData = false;
     this.id = instance.trackById;