From 11e9514af6e6d9e993b469fae3ce6671c3d3e536 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Wed, 11 Mar 2020 12:46:44 +0100 Subject: NodePath: Make path computation deterministic In Python3, set operations seem to result in indeterministic order. + Remove verbose logging from topology.py Change-Id: I47cc90637a0b2969e1686b4216b7d8fe4fe2aaab Signed-off-by: Vratko Polak --- resources/libraries/python/topology.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'resources/libraries/python/topology.py') diff --git a/resources/libraries/python/topology.py b/resources/libraries/python/topology.py index 7dec51619c..338ccb6b57 100644 --- a/resources/libraries/python/topology.py +++ b/resources/libraries/python/topology.py @@ -879,8 +879,6 @@ class Topology: :rtype: list """ - logger.trace(f"node1: {str(node1)}") - logger.trace(f"node2: {str(node2)}") node1_links = self._get_node_active_link_names( node1, filter_list=filter_list_node1 ) @@ -894,7 +892,10 @@ class Topology: elif node2_links is None: logger.error(u"Unable to find active links for node2") else: - connecting_links = list(set(node1_links).intersection(node2_links)) + # Not using set operations, as we need deterministic order. + connecting_links = [ + link for link in node1_links if link in node2_links + ] return connecting_links -- cgit 1.2.3-korg