From e767b72ea193f968a61b18422d249a8d8f4c5584 Mon Sep 17 00:00:00 2001 From: loissotolopez Date: Sun, 19 Jul 2020 11:24:38 -0700 Subject: [PATCH] Fix main.py logic. Nodes now display proper links --- main.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 61c7011..93ac341 100755 --- a/main.py +++ b/main.py @@ -37,8 +37,11 @@ def get_topo_view_xml(xml): view_node_mac.text = str(libxml2.parseDoc(str(n)).xpathEval('/node/addresses/mac/text()')[0]) for l in links: + print(view_node_id.text) + print(str(libxml2.parseDoc(str(l)).xpathEval('/link/link-id/text()')[0]).split("/")[0]) + print((str(libxml2.parseDoc(str(l)).xpathEval('/link/link-id/text()')[0]).split("/")[0]).find(view_node_id.text)) # Get first half of identifier (link source) - if str(libxml2.parseDoc(str(l)).xpathEval('/link/link-id/text()')[0]).split("/")[0] == view_node_id.text: + if (str(libxml2.parseDoc(str(l)).xpathEval('/link/link-id/text()')[0]).split("/")[0]).find(view_node_id.text) != -1: link = etree.SubElement(view_node, "link") link_id = etree.SubElement(link, "link-id") link_id.text = str(libxml2.parseDoc(str(l)).xpathEval('/link/link-id/text()')[0])