Browse code

Merge "worlddump: collect networking stack info from namespaces"

Jenkins authored on 2016/02/18 00:08:49
Showing 1 changed files
... ...
@@ -101,14 +101,24 @@ def iptables_dump():
101 101
         _dump_cmd("sudo iptables --line-numbers -L -nv -t %s" % table)
102 102
 
103 103
 
104
+def _netns_list():
105
+    process = subprocess.Popen(['ip', 'netns'], stdout=subprocess.PIPE)
106
+    stdout, _ = process.communicate()
107
+    return stdout.split()
108
+
109
+
104 110
 def network_dump():
105 111
     _header("Network Dump")
106 112
 
107 113
     _dump_cmd("brctl show")
108 114
     _dump_cmd("arp -n")
109
-    _dump_cmd("ip addr")
110
-    _dump_cmd("ip link")
111
-    _dump_cmd("ip route")
115
+    ip_cmds = ["addr", "link", "route"]
116
+    for cmd in ip_cmds + ['netns']:
117
+        _dump_cmd("ip %s" % cmd)
118
+    for netns_ in _netns_list():
119
+        for cmd in ip_cmds:
120
+            args = {'netns': netns_, 'cmd': cmd}
121
+            _dump_cmd('sudo ip netns exec %(netns)s ip %(cmd)s' % args)
112 122
 
113 123
 
114 124
 def ovs_dump():