lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Restore CLI=MyCLI customization in --custom files

Browse Source 
fixes #746
This commit is contained in:
Bob Lantz
2017-06-02 14:11:36 -07:00
parent 7366645c81
commit 87e26ef931
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/mn
+4 -1
View File
@@ -314,6 +314,8 @@ class MininetRunner( object ):
def begin( self ): def begin( self ):
"Create and run mininet." "Create and run mininet."
global CLI
opts = self.options opts = self.options
if opts.cluster: if opts.cluster:
@@ -385,7 +387,8 @@ class MininetRunner( object ):
if opts.ensure_value( 'nat', False ): if opts.ensure_value( 'nat', False ):
mn.addNAT( *opts.nat_args, **opts.nat_kwargs ).configDefault() mn.addNAT( *opts.nat_args, **opts.nat_kwargs ).configDefault()
CLI = mininet.cli.CLI # --custom files can set CLI or change mininet.cli.CLI
globals().setdefault( 'CLI', mininet.cli.CLI )
if opts.pre: if opts.pre:
CLI( mn, script=opts.pre ) CLI( mn, script=opts.pre )