Browse code

Merge "Fix error in 'ip netns' parsing"

Jenkins authored on 2017/02/27 06:43:54
Showing 1 changed files
... ...
@@ -153,7 +153,11 @@ def iptables_dump():
153 153
 def _netns_list():
154 154
     process = subprocess.Popen(['ip', 'netns'], stdout=subprocess.PIPE)
155 155
     stdout, _ = process.communicate()
156
-    return stdout.split()
156
+    # NOTE(jlvillal): Sometimes 'ip netns list' can return output like:
157
+    #   qrouter-0805fd7d-c493-4fa6-82ca-1c6c9b23cd9e (id: 1)
158
+    #   qdhcp-bb2cc6ae-2ae8-474f-adda-a94059b872b5 (id: 0)
159
+    output = [x.split()[0] for x in stdout.splitlines()]
160
+    return output
157 161
 
158 162
 
159 163
 def network_dump():