From a65b4e619ec21d2affcb9c41a6c7b277bc4989cf Mon Sep 17 00:00:00 2001 From: MarvinTorres Date: Fri, 14 Aug 2020 11:10:12 -0400 Subject: [PATCH 1/3] Changed keys.extend(..) to keys.append(..) - This fixes #64 --- graph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graph.py b/graph.py index c20d672c..39a9223e 100644 --- a/graph.py +++ b/graph.py @@ -46,7 +46,7 @@ def update_links(self, links): if link.is_active(): self.graph.add_edge(link.endpoint_a.id, link.endpoint_b.id) for key, value in link.metadata.items(): - keys.extend(key) + keys.append(key) endpoint_a = link.endpoint_a.id endpoint_b = link.endpoint_b.id self.graph[endpoint_a][endpoint_b][key] = value From 6bbe7a1c513c4c9c4140bca5dd82b709e5b00dea Mon Sep 17 00:00:00 2001 From: MarvinTorres Date: Tue, 18 Aug 2020 22:24:48 -0400 Subject: [PATCH 2/3] Matched key setup in update_links and its test - This hopefully ensures that #64 will not reoccur. --- tests/unit/test_graph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_graph.py b/tests/unit/test_graph.py index d61e7a00..de00e97c 100644 --- a/tests/unit/test_graph.py +++ b/tests/unit/test_graph.py @@ -58,7 +58,8 @@ def test_update_links(self, mock_set_default_metadata): keys = [] all_metadata = [link.metadata for link in topology.links.values()] for metadata in all_metadata: - keys.extend(key for key in metadata.keys()) + for key in metadata.keys(): + keys.append(key) mock_set_default_metadata.assert_called_with(keys) def test_remove_switch_hops(self): From 56c08837fc5bcdf82e4754301c3fe2cd3f64915a Mon Sep 17 00:00:00 2001 From: MarvinTorres Date: Thu, 10 Sep 2020 20:31:54 -0400 Subject: [PATCH 3/3] Revert test_graph.py --- tests/unit/test_graph.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/unit/test_graph.py b/tests/unit/test_graph.py index de00e97c..d61e7a00 100644 --- a/tests/unit/test_graph.py +++ b/tests/unit/test_graph.py @@ -58,8 +58,7 @@ def test_update_links(self, mock_set_default_metadata): keys = [] all_metadata = [link.metadata for link in topology.links.values()] for metadata in all_metadata: - for key in metadata.keys(): - keys.append(key) + keys.extend(key for key in metadata.keys()) mock_set_default_metadata.assert_called_with(keys) def test_remove_switch_hops(self):