From f4c2c5f5f828ced93d259609c6b777873e38b3d5 Mon Sep 17 00:00:00 2001 From: "Blake J. Harnden" Date: Mon, 6 Aug 2018 14:07:26 -0700 Subject: [PATCH] now include links for session data, helps make a single request able to draw out a session --- webapp/app.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/webapp/app.py b/webapp/app.py index cf35cbd0..5ddbd140 100644 --- a/webapp/app.py +++ b/webapp/app.py @@ -173,6 +173,7 @@ def get_session(session_id): return jsonify(error="session does not exist"), 404 nodes = [] + links = [] for node in session.objects.itervalues(): emane_model = None 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) }) + 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( state=session.state, - nodes=nodes + nodes=nodes, + links=links )