]> git.puffer.fish Git - mirror/frr.git/commitdiff
topotests: python3, replace iteritems with items
authorPhilippe Guibert <philippe.guibert@6wind.com>
Wed, 25 Nov 2020 16:23:19 +0000 (16:23 +0000)
committerPhilippe Guibert <philippe.guibert@6wind.com>
Wed, 25 Nov 2020 16:31:45 +0000 (16:31 +0000)
replace iteritems() calls with items()

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
tests/topotests/bgp_features/test_bgp_features.py
tests/topotests/isis-tilfa-topo1/test_isis_tilfa_topo1.py

index bd092c4340f97e723662903ebcd8554787668bf2..9dce9d668b74c50c024286392376a4628e45ab33 100644 (file)
@@ -102,7 +102,7 @@ def setup_module(module):
 
     # Starting Routers
     router_list = tgen.routers()
-    for rname, router in router_list.iteritems():
+    for rname, router in router_list.items():
         router.load_config(
             TopoRouter.RD_ZEBRA, os.path.join(CWD, "{}/zebra.conf".format(rname))
         )
index 6bc097b0e7bdcf5fe4994f4f3ad8f998703abdba..514ea535528121a08fa701ab54d03f3790e970b6 100755 (executable)
@@ -179,7 +179,7 @@ def setup_module(mod):
     router_list = tgen.routers()
 
     # For all registered routers, load the zebra configuration file
-    for rname, router in router_list.iteritems():
+    for rname, router in router_list.items():
         router.load_config(
             TopoRouter.RD_ZEBRA,
             os.path.join(CWD, '{}/zebra.conf'.format(rname))