afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

simplify some join session logic to loop over nodes once

Browse source
This commit is contained in:
Blake Harnden 2019-12-04 14:44:43 -08:00
parent 5a387537bb
commit 5aa01d9bb5
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
coretk/coretk/coreclient.py
View file

@ -211,12 +211,6 @@ class CoreClient:
for hook in response.hooks: for hook in response.hooks:
self.hooks[hook.file] = hook self.hooks[hook.file] = hook
# get wlan configs
for node in session.nodes:
if node.type == core_pb2.NodeType.WIRELESS_LAN:
response = self.client.get_wlan_config(self.session_id, node.id)
self.wlan_configs[node.id] = response.config
# get mobility configs # get mobility configs
response = self.client.get_mobility_configs(self.session_id) response = self.client.get_mobility_configs(self.session_id)
for node_id in response.configs: for node_id in response.configs:
@ -238,13 +232,17 @@ class CoreClient:
node_id = int(_id / 1000) node_id = int(_id / 1000)
self.set_emane_model_config(node_id, config.model, config.config, interface) self.set_emane_model_config(node_id, config.model, config.config, interface)
# get node service config and file config # save and retrieve data, needed for session nodes
for node in session.nodes: for node in session.nodes:
# get node service config and file config
self.created_nodes.add(node.id) self.created_nodes.add(node.id)
for link in session.links:
self.created_links.add(tuple(sorted([link.node_one_id, link.node_two_id]))) # get wlan configs for wlan nodes
for node in session.nodes: if node.type == core_pb2.NodeType.WIRELESS_LAN:
if node.type == core_pb2.NodeType.DEFAULT: response = self.client.get_wlan_config(self.session_id, node.id)
self.wlan_configs[node.id] = response.config
# retrieve service configurations data for default nodes
elif node.type == core_pb2.NodeType.DEFAULT:
for service in node.services: for service in node.services:
response = self.client.get_node_service( response = self.client.get_node_service(
self.session_id, node.id, service self.session_id, node.id, service
@ -262,6 +260,10 @@ class CoreClient:
self.file_configs[node.id][service] = {} self.file_configs[node.id][service] = {}
self.file_configs[node.id][service][file] = response.data self.file_configs[node.id][service][file] = response.data
# store links as created links
for link in session.links:
self.created_links.add(tuple(sorted([link.node_one_id, link.node_two_id])))
# draw session # draw session
self.app.canvas.reset_and_redraw(session) self.app.canvas.reset_and_redraw(session)