merged latest code from rodolfos merge from the latest github pull
This commit is contained in:
commit
613e550e8a
32 changed files with 267 additions and 276 deletions
|
@ -76,7 +76,7 @@ def main():
|
|||
values[names.index('propagationmodel')] = '2ray'
|
||||
|
||||
session.emane.setconfig(wlan.objid, EmaneIeee80211abgModel.name, values)
|
||||
services_str = "zebra|OSPFv3MDR|vtysh|IPForward"
|
||||
services_str = "zebra|OSPFv3MDR|IPForward"
|
||||
|
||||
print "creating %d nodes with addresses from %s" % \
|
||||
(options.numnodes, prefix)
|
||||
|
|
|
@ -97,7 +97,7 @@ def main():
|
|||
parser.add_option("-s", "--services", dest="services", type=str,
|
||||
help="pipe-delimited list of services added to each "
|
||||
"node (default = %s)\n(Example: zebra|OSPFv2|OSPFv3|"
|
||||
"vtysh|IPForward)" % parser.defaults["services"])
|
||||
"IPForward)" % parser.defaults["services"])
|
||||
|
||||
def usage(msg=None, err=0):
|
||||
sys.stdout.write("\n")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue