Skip to content
Snippets Groups Projects
Commit 41badb96 authored by Bob Lantz's avatar Bob Lantz
Browse files

Pass code check.

parent 45e82d09
No related branches found
No related tags found
No related merge requests found
...@@ -17,7 +17,7 @@ def TreeNet( depth=1, fanout=2, **kwargs ): ...@@ -17,7 +17,7 @@ def TreeNet( depth=1, fanout=2, **kwargs ):
"Convenience function for creating tree networks." "Convenience function for creating tree networks."
topo = TreeTopo( depth, fanout ) topo = TreeTopo( depth, fanout )
return Mininet( topo, **kwargs ) return Mininet( topo, **kwargs )
if __name__ == '__main__': if __name__ == '__main__':
setLogLevel( 'info' ) setLogLevel( 'info' )
init() init()
......
#!/usr/bin/python #!/usr/bin/python
"Create a 64-node tree network, and test connectivity using ping." "Create a 64-node tree network, and test connectivity using ping."
from mininet.cli import CLI
from mininet.log import setLogLevel from mininet.log import setLogLevel
from mininet.net import init, Mininet from mininet.net import init, Mininet
from mininet.node import KernelSwitch, UserSwitch, OVSKernelSwitch from mininet.node import KernelSwitch, UserSwitch, OVSKernelSwitch
...@@ -12,8 +11,10 @@ def TreeNet( depth=1, fanout=2, **kwargs ): ...@@ -12,8 +11,10 @@ def TreeNet( depth=1, fanout=2, **kwargs ):
"Convenience function for creating tree networks." "Convenience function for creating tree networks."
topo = TreeTopo( depth, fanout ) topo = TreeTopo( depth, fanout )
return Mininet( topo, **kwargs ) return Mininet( topo, **kwargs )
def treePing64(): def treePing64():
"Run ping test on 64-node tree networks."
results = {} results = {}
switches = { 'reference kernel': KernelSwitch, switches = { 'reference kernel': KernelSwitch,
'reference user': UserSwitch, 'reference user': UserSwitch,
...@@ -26,13 +27,13 @@ def treePing64(): ...@@ -26,13 +27,13 @@ def treePing64():
result = network.run( network.pingAll ) result = network.run( network.pingAll )
results[ name ] = result results[ name ] = result
print print
print "*** Tree network ping results:" print "*** Tree network ping results:"
for name in switches.keys(): for name in switches.keys():
print "%s: %d%% packet loss" % ( name, results[ name ] ) print "%s: %d%% packet loss" % ( name, results[ name ] )
print print
if __name__ == '__main__': if __name__ == '__main__':
setLogLevel( 'info' ) setLogLevel( 'info' )
init() init()
treePing64() treePing64()
\ No newline at end of file
...@@ -170,9 +170,9 @@ def newfn( *args ): ...@@ -170,9 +170,9 @@ def newfn( *args ):
setattr( newfn, '__doc__', fn.__doc__ ) setattr( newfn, '__doc__', fn.__doc__ )
return newfn return newfn
info, output, warn, error, debug = ( info, output, warn, error, debug = (
lg.info, lg.output, lg.warn, lg.error, lg.debug ) = [ lg.info, lg.output, lg.warn, lg.error, lg.debug ) = [
makeListCompatible( f ) for f in makeListCompatible( f ) for f in
lg.info, lg.output, lg.warn, lg.error, lg.debug ] lg.info, lg.output, lg.warn, lg.error, lg.debug ]
setLogLevel = lg.setLogLevel setLogLevel = lg.setLogLevel
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment