Commit 1322079e authored by Julien Muchembled's avatar Julien Muchembled

Revert "Monkey-patch NEMU to fix demo with recent iproute"

This reverts commit 7dbc38d7.

Fixed upstream in version 0.2
See also http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725344
parent 7dbc38d7
......@@ -33,29 +33,6 @@ def _add_interface(node, iface):
return Node__add_interface(node, iface)
nemu.Node._add_interface = _add_interface
def get_addr_data():
ipdata = backticks([IP_PATH, "-o", "addr", "list"])
byidx = {}
bynam = {}
for line in ipdata.split("\n"):
if line == "":
continue
match = re.search(r'^(\d+):\s+(\S+?)(:?)\s+(.*)', line)
if not match:
raise RuntimeError("Invalid `ip' command output")
idx = int(match.group(1))
name = match.group(2)
# <patch>
if name not in bynam:
bynam[name] = byidx[idx] = []
if match.group(3): # BBB: old iproute also shows link info
continue
# </patch>
bynam[name].append(_parse_ip_addr(match.group(4)))
return byidx, bynam
nemu.iproute.get_addr_data.func_code = get_addr_data.func_code
# create nodes
for name in """internet=I registry=R
gateway1=g1 machine1=1 machine2=2
......
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