Skip to content

Commit 635b0b6

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "bug-fix: 'bytes' type in python3 cause command fail"
2 parents b4375af + 8d4ae4f commit 635b0b6

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

tools/worlddump.py

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def network_dump():
174174
_dump_cmd("ip %s" % cmd)
175175
for netns_ in _netns_list():
176176
for cmd in ip_cmds:
177-
args = {'netns': netns_, 'cmd': cmd}
177+
args = {'netns': bytes.decode(netns_), 'cmd': cmd}
178178
_dump_cmd('sudo ip netns exec %(netns)s ip %(cmd)s' % args)
179179

180180

@@ -195,7 +195,7 @@ def ovs_dump():
195195
_dump_cmd("sudo ovs-vsctl show")
196196
for ofctl_cmd in ofctl_cmds:
197197
for bridge in bridges:
198-
args = {'vers': vers, 'cmd': ofctl_cmd, 'bridge': bridge}
198+
args = {'vers': vers, 'cmd': ofctl_cmd, 'bridge': bytes.decode(bridge)}
199199
_dump_cmd("sudo ovs-ofctl --protocols=%(vers)s %(cmd)s %(bridge)s" % args)
200200

201201

0 commit comments

Comments
 (0)