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

now include links for session data, helps make a single request able to draw out a session

Browse source
This commit is contained in:
Blake J. Harnden 2018-08-06 14:07:26 -07:00
parent f053f11eb4
commit f4c2c5f5f8
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
webapp/app.py
View file

@ -173,6 +173,7 @@ def get_session(session_id):
return jsonify(error="session does not exist"), 404 return jsonify(error="session does not exist"), 404
nodes = [] nodes = []
links = []
for node in session.objects.itervalues(): for node in session.objects.itervalues():
emane_model = None emane_model = None
if nodeutils.is_node(node, NodeTypes.EMANE): if nodeutils.is_node(node, NodeTypes.EMANE):
@ -194,9 +195,22 @@ def get_session(session_id):
"url": "/sessions/%s/nodes/%s" % (session_id, node.objid) "url": "/sessions/%s/nodes/%s" % (session_id, node.objid)
}) })
links_data = node.all_link_data(0)
for link_data in links_data:
link = link_data._asdict()
del link["message_type"]
link_data_str(link, "interface1_ip4")
link_data_str(link, "interface1_ip6")
link_data_str(link, "interface1_mac")
link_data_str(link, "interface2_ip4")
link_data_str(link, "interface2_ip6")
link_data_str(link, "interface2_mac")
links.append(link)
return jsonify( return jsonify(
state=session.state, state=session.state,
nodes=nodes nodes=nodes,
links=links
) )