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

1 files changed, 7 insertions, 2 deletions

diff --git a/vid-webpack-master/src/app/shared/models/treeNodeModel.ts b/vid-webpack-master/src/app/shared/models/treeNodeModel.ts
index 39f56228e..8da204ce6 100644
--- a/vid-webpack-master/src/app/shared/models/treeNodeModel.ts
+++ b/vid-webpack-master/src/app/shared/models/treeNodeModel.ts
@@ -34,9 +34,14 @@ export class TreeNodeModel {
   instanceName?: string;
 
   constructor(instance: ChildNodeInstance, nodeModel: NodeModel){
+
     this.modelInvariantId = nodeModel.invariantUuid;
-    this.modelCustomizationId = nodeModel.customizationUuid;
-    this.modelId = nodeModel.uuid;
+    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;