Commit 25722083 authored by Martín Ferrari's avatar Martín Ferrari

use two ip route invocations

parent a260b16e
...@@ -550,11 +550,15 @@ def del_bridge_port(br, iface): ...@@ -550,11 +550,15 @@ def del_bridge_port(br, iface):
_execute(['brctl', 'delif', brname, ifname]) _execute(['brctl', 'delif', brname, ifname])
def get_all_route_data(): def get_all_route_data():
# FIXME: should be two calls or something else... #ipcmd = subprocess.Popen(["ip", "-o", "route", "list", "table", "all"],
ipcmd = subprocess.Popen(["ip", "-o", "route", "list", "table", "all"], ipcmd = subprocess.Popen(["ip", "-o", "route", "list"],
stdout = subprocess.PIPE) stdout = subprocess.PIPE)
ipdata = ipcmd.communicate()[0] ipdata = ipcmd.communicate()[0]
assert ipcmd.wait() == 0 assert ipcmd.wait() == 0
ipcmd = subprocess.Popen(["ip", "-o", "-f", "inet6", "route", "list"],
stdout = subprocess.PIPE)
ipdata += ipcmd.communicate()[0]
assert ipcmd.wait() == 0
ifdata = get_if_data()[1] ifdata = get_if_data()[1]
ret = [] ret = []
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment