Merge changes Ib4430bf2,Icc0bdb9e,I2736b984

* changes:
  Merge from ecomp 718fd196 - Ext. Services Simulator
  Merge from ecomp 718fd196 - Integration Tests
  Merge from ecomp 718fd196 - Modern UI

1 files changed, 8 insertions, 16 deletions

diff --git a/vid-webpack-master/src/app/shared/models/networkTreeNode.ts b/vid-webpack-master/src/app/shared/models/networkTreeNode.ts
index d09d5e4c5..3b68a4c94 100644
--- a/vid-webpack-master/src/app/shared/models/networkTreeNode.ts
+++ b/vid-webpack-master/src/app/shared/models/networkTreeNode.ts
@@ -1,23 +1,15 @@
 import {NetworkInstance} from "./networkInstance";
-import {TreeNodeModel} from "./treeNodeModel";
 import {Level1Model} from "./nodeModel";
+import {FirstLevelTreeNode} from "./firstLevelTreeNode";
 
 
+export class NetworkTreeNode extends FirstLevelTreeNode {
+  routeTargetId: string;
+  routeTargetRole: string;
 
-export class NetworkTreeNode extends TreeNodeModel {
-  networkStoreKey : string;
-  typeName: string;
-  menuActions: { [p: string]: { method: Function; visible: Function; enable: Function } };
-  isFailed: boolean;
-  statusMessage?: string;
-
-  constructor(instance: NetworkInstance, networkModel: Level1Model, networkStoreKey : string){
-    super(instance, networkModel);
-    this.name = instance.instanceName? instance.instanceName: !networkModel.isEcompGeneratedNaming ? networkModel.modelCustomizationName : '<Automatically Assigned>';
-    this.modelName = networkModel.modelCustomizationName;
-    this.type = networkModel.type;
-    this.isEcompGeneratedNaming = networkModel.isEcompGeneratedNaming;
-    this.networkStoreKey = networkStoreKey;
+  constructor(instance: NetworkInstance, networkModel: Level1Model, networkStoreKey: string) {
+    super(instance, networkModel, networkStoreKey);
+    this.routeTargetId = instance &&  instance.routeTarget ? instance.routeTarget.globalRouteTarget : null;
+    this.routeTargetRole = instance &&  instance.routeTarget ? instance.routeTarget.routeTargetRole : null;
   }
 }
-