From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 18 Sep 2020 22:15:43 +0000 (-0400)
Subject: Merge pull request #7131 from mjstapp/fix_topo_py2_iter
X-Git-Tag: base_7.6~540
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d6b4fbb7238e3a13ee40f42d6379aaa8dac4fd37;p=matthieu%2Ffrr.git

Merge pull request #7131 from mjstapp/fix_topo_py2_iter

tests: use .items instead of .iteritems in topotests
---

d6b4fbb7238e3a13ee40f42d6379aaa8dac4fd37
diff --cc tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py
index bdbe6e0f31,75e1c556bb..01f895891c
mode 100755,100644..100644
--- a/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py
+++ b/tests/topotests/ldp-sync-isis-topo1/test_ldp_sync_isis_topo1.py
diff --cc tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
index 46f3cde086,caa236b96c..9694fa982f
mode 100755,100644..100644
--- a/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py
+++ b/tests/topotests/ldp-sync-ospf-topo1/test_ldp_sync_ospf_topo1.py