From 2add2157043ac5142fc0f4a3880b7e3b48c55d5a Mon Sep 17 00:00:00 2001
From: Huy Pham <42948410+hpham@users.noreply.github.com>
Date: Fri, 6 Dec 2019 15:06:35 -0800
Subject: [PATCH] fix configuring newly added services

---
 coretk/coretk/coreclient.py          | 14 +++++++++++++-
 coretk/coretk/dialogs/nodeservice.py |  1 +
 coretk/coretk/graph/node.py          |  3 ---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/coretk/coretk/coreclient.py b/coretk/coretk/coreclient.py
index 91d88487..b7b0a0df 100644
--- a/coretk/coretk/coreclient.py
+++ b/coretk/coretk/coreclient.py
@@ -432,6 +432,14 @@ class CoreClient:
         )
         process_time = time.perf_counter() - start
         logging.debug("start session(%s), result: %s", self.session_id, response.result)
+        # # print(self.client.get_node_service(self.session_id, 1, "DefaultRoute"))
+        # # print(self.client.set_service_defaults(self.session_id, {"router": ["DefaultRouter"]}))
+        # print(self.client.set_node_service(self.session_id, 1, "DefaultRoute", ["echo hello"], [], []))
+        #
+        # # print(self.client.get_service_defaults(self.session_id))
+        #
+        # # print(self.client.get_node_service(self.session_id, 1, "DefaultRoute"))
+        # # print(self.client.get_node_service_file(self.session_id, 1, "DefaultRoute", "defaultroute.sh"))
         self.app.statusbar.start_session_callback(process_time)
 
         # display mobility players
@@ -516,8 +524,11 @@ class CoreClient:
             self.client.set_session_state(
                 self.session_id, core_pb2.SessionState.DEFINITION
             )
+
+        # temp
+        self.client.set_session_state(self.session_id, core_pb2.SessionState.DEFINITION)
         for node_proto in node_protos:
-            if node_proto.id not in self.created_nodes:
+            if node_proto.id not in self.created_nodes or True:
                 response = self.client.add_node(self.session_id, node_proto)
                 logging.debug("create node: %s", response)
                 self.created_nodes.add(node_proto.id)
@@ -525,6 +536,7 @@ class CoreClient:
             if (
                 tuple([link_proto.node_one_id, link_proto.node_two_id])
                 not in self.created_links
+                or True
             ):
                 response = self.client.add_link(
                     self.session_id,
diff --git a/coretk/coretk/dialogs/nodeservice.py b/coretk/coretk/dialogs/nodeservice.py
index 35142497..d950371b 100644
--- a/coretk/coretk/dialogs/nodeservice.py
+++ b/coretk/coretk/dialogs/nodeservice.py
@@ -87,6 +87,7 @@ class NodeService(Dialog):
         self.current.listbox.delete(0, tk.END)
         for name in sorted(self.current_services):
             self.current.listbox.insert(tk.END, name)
+        self.canvas_node.core_node.services[:] = self.current_services
 
     def click_configure(self):
         current_selection = self.current.listbox.curselection()
diff --git a/coretk/coretk/graph/node.py b/coretk/coretk/graph/node.py
index 83b29da2..27f6a5dc 100644
--- a/coretk/coretk/graph/node.py
+++ b/coretk/coretk/graph/node.py
@@ -144,9 +144,6 @@ class CanvasNode:
     def on_leave(self, event):
         self.tooltip.on_leave(event)
 
-    def click(self, event):
-        print("click")
-
     def double_click(self, event):
         if self.app.core.is_runtime():
             self.canvas.core.launch_terminal(self.core_node.id)