commit 6f23555c959ce2a121d57c27a7460815808ac2b6
author Jenkins <jenkins@review.openstack.org> Sun Feb 26 21:43:54 2017 +0000
committer Gerrit Code Review <review@openstack.org> Sun Feb 26 21:43:54 2017 +0000
tree a36f693a0d50a6ffdb9d78d27864f62ccbc8b79a
parent f697274eee687ff11f8324df600fca9c0c231081
parent c6e6939e89a44a408065eb4585963175f8d0d6e3

Merge "Fix error in 'ip netns' parsing"

tools/worlddump.py

diff --git a/tools/worlddump.py b/tools/worlddump.py
index 1244dfb..eb109b9 100755
--- a/tools/worlddump.py
+++ b/tools/worlddump.py
@@ -153,7 +153,11 @@
 def _netns_list():
     process = subprocess.Popen(['ip', 'netns'], stdout=subprocess.PIPE)
     stdout, _ = process.communicate()
-    return stdout.split()
+    # NOTE(jlvillal): Sometimes 'ip netns list' can return output like:
+    #   qrouter-0805fd7d-c493-4fa6-82ca-1c6c9b23cd9e (id: 1)
+    #   qdhcp-bb2cc6ae-2ae8-474f-adda-a94059b872b5 (id: 0)
+    output = [x.split()[0] for x in stdout.splitlines()]
+    return output
 
 
 def network_dump():