lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
1,903 Commits 1 Branch 0 Tags
0d9a6796df731ea0631ba1aa01e5101e670b1692
Commit Graph
890 Commits
Author SHA1 Message Date
Brandon Heller 7ae73e677f Fix pylint warnings 2010-03-04 22:36:34 -08:00
Brandon Heller 3eb5abe6a7 Make cleanup a param of mn, not a separate script 
Also switch from print to info statements, to enable a non-verbose
clean.  Instead of 'mnclean', now run 'mn -c'.
 2010-03-04 21:47:50 -08:00
Brandon Heller 4e69ae83dd Slightly reduce cliinfo verbosity 2010-03-04 21:34:01 -08:00
Brandon Heller bb941950d5 Add flexible topology input parsing 
Now you can pass a topology name followed by params.  For example, to
create a switch with 3 hosts:

  sudo mn --topo single,3
 2010-03-04 21:29:32 -08:00
Brandon Heller 1a40cd0477 Add new loglevel to display CLI output only 
Also print warning if user chooses a loglevel that will hide CLI output.
 2010-03-04 18:58:37 -08:00
Bob Lantz e3a2ef011f Fixed docstrings for switch arg: name. 2010-03-09 21:52:36 -08:00
Bob Lantz d44a5843d3 Reinstantiated inNamespace and routed control network. 
We need to figure out how to specify the IP addresses for the
routed control network. For now I'm going back to 192.168.12x.y

Also changed controller params to use IP strings rather than
numbers. However, we still need to clarify what ControllerParams
is actually for.
 2010-03-09 21:48:14 -08:00
Bob Lantz 47dbca2921 Made iperf verbose and fixed node command output. 2010-03-09 21:47:32 -08:00
Bob Lantz 80be564274 Removed underscores for public Node methods. Minor cleanup & comments. 2010-03-08 15:32:41 -08:00
Bob Lantz b924c5b562 Fixed printing in CLI.net() 2010-03-05 17:00:44 -08:00
Bob Lantz 11a6d400c5 Added mininet.topolib to store useful topologies. 2010-03-05 15:07:00 -08:00
Bob Lantz 1bda2d21ad Changed to use Node.MAC(). 2010-03-05 14:12:31 -08:00
Bob Lantz 6f45478f18 Removed spaces. 2010-03-05 13:59:52 -08:00
Bob Lantz 75d72d960b Restored accidentally deleted kill %ofpd lines. Added Node.MAC() 2010-03-05 13:58:20 -08:00
Bob Lantz 086ef80e8e Changed setIP to accept numeric prefix len. Added Node.deleteIntfs(). 2010-03-04 16:53:39 -08:00
Bob Lantz ddfbfc734c Added convenience mode to allow info( 'a', 1, 'b' ) 
Later we may wish to optimize this so that the arg lists are
not created if the logging level is too low.
 2010-03-04 16:51:10 -08:00
Bob Lantz dc630c540a Restored scratchnet and scratchnetuser demos. 
Also changed the str format for nodes to use str() rather
than repr() so we don't end up with extraneous quotes.
 2010-03-03 14:37:14 -08:00
Bob Lantz efc9a01cf1 Moved link creation into Node.addIntf() and fixed util:CreateLink(). 
Also tweaked cmd/cmdPrint to make them more beautiful and functional,
and a few other minor changes, such as using a new idiom for verbose.

These changes support reinstating the examples.
 2010-03-03 13:52:50 -08:00
Bob Lantz 04fa18dc61 Changed cmdPrint to cmd. 2010-03-03 13:51:58 -08:00
Bob Lantz a681f9b645 Added debug() convenience function. 2010-03-03 13:50:25 -08:00
Bob Lantz 1fdcd6768c Added py command to evaluate Python expressions, e.g. h1.cmd('ls') 2010-03-03 13:46:44 -08:00
Bob Lantz 137ec3054d Removed trailing spaces. 2010-03-01 15:38:02 -08:00
Bob Lantz 63214ea2af Merge branch 'customtopos' into bl-dev 2010-03-01 15:34:40 -08:00
Bob Lantz e0cfcdd505 Tweaks to pass code check. 2010-03-01 15:21:29 -08:00
Bob Lantz 2235f21698 Minor cleanup of mn/net and fixes for CLI. 
All commands should work now.
 2010-02-27 23:40:05 -08:00
Bob Lantz c3a4440025 Changed custom feature so that params aren't added to globals. 
There is probably a better way of doing this, but currently
parseCustomFile can modify globals (e.g. TOPOS) as well as
instance variables (self.validate) and classes (e.g. MyTopo),
which are also in the global name space.

Inconveniently enough, lambdas don't seem to be full closures
in Python; if they were, this trickiness would be unnecessary.

Even so, using execfile() seems like it might be a bit dubious...
 2010-02-27 23:19:57 -08:00
Bob Lantz 5468377680 Removed blank line at EOF. 2010-02-27 13:55:12 -08:00
Bob Lantz dba3b59929 Changed to dump bad iperf output. 2010-02-27 13:54:38 -08:00
Bob Lantz 78073e1b6f Fixed to be compatible with modified Mininet() class. 2010-02-27 13:54:10 -08:00
Bob Lantz d40b0a9973 Merge branch 'customtopos' into bl-dev 2010-02-26 18:54:32 -08:00
Bob Lantz 235415cf49 Ran unpep8 on test_nets.py. 2010-02-26 17:25:38 -08:00
Bob Lantz 019bff8282 Made it possible to create a Mininet() without using a Topo object. 
This increases flexibility by allowing a topology to be manually created
in Python, or specified using another format, without having to create
a Topo object first.

However, Topos are useful, and are still the default topology object!
 2010-02-26 17:16:07 -08:00
Brandon Heller 4f4f1dd2fa Fix KeyError for missing NOX env var 2010-02-18 11:44:08 -08:00
Bob Lantz 31b43002e7 Added a bit to comments, and removed trailing spaces. 2010-02-16 14:42:58 -08:00
Bob Lantz 64c451e01f Minor bug fixes and tweaks. 
Shell now works (although we should use quietRun instead to avoid
file descriptor problem!)

exit/quit/EOF now all exit.

Renamed pingall and pingpair to make them easier to type - I think
commands should not require use of the shift key in general, although
ping-all and ping-pair might be OK.
 2010-02-09 22:40:51 -08:00
Bob Lantz e34cd9a6cf Added warn to complement info, error. 2010-02-09 22:37:22 -08:00
Brandon Heller befa1310df Revamp custom topology input 
Defining custom topologies, switch types, controllers, and hosts is now
much easier.  Plus, all Ripcord-specific stuff has been moved out.
 2010-01-30 02:46:08 -08:00
Brandon Heller 114dcd5653 Improve CLI line editing capabilities 
Convert CLI to use Python Cmd object, which provides line editing.
 2010-01-29 14:42:53 -08:00
Brandon Heller 83097ff942 Fix errors from style changes 2010-01-29 13:29:12 -08:00
Bob Lantz 6d72a3cb0c Minor cleanup; clarified fdToNode (still need to test however.) 2010-02-08 15:51:43 -08:00
Bob Lantz d5886525cc Changed to use info() and error() logging aliases. 2010-02-08 15:51:25 -08:00
Bob Lantz f8952d56e1 Added info() and error() as aliases for lg.info() and lg.error() 2010-02-08 15:49:32 -08:00
Bob Lantz bd1e997f15 Remove backslash. 2010-02-08 15:43:23 -08:00
Bob Lantz 7c371cf32a Comment tweaks. 2010-02-05 17:29:15 -08:00
Bob Lantz e85f8bdf29 Removed hash-bang in module files which aren't executed directly, 
with the exception of topo.py, which I haven't touched.
 2010-02-05 17:22:18 -08:00
Bob Lantz 7d4b7b7f47 Comment tweaks and additions. 2010-02-05 17:18:08 -08:00
Bob Lantz 496b5f9ed0 Moved CLI into its own file. Also, MininetCLI is now just 'CLI'. 2010-02-05 17:01:03 -08:00
Bob Lantz 281f6e59db Minor changes to get 'make test' to pass. 
- some namespace conflicts due to unpep8
- fixed infinite recursion caused by removing redundant makeIntfPair
 2010-02-05 16:42:01 -08:00
Bob Lantz 80a8fa62d5 First crack at restoring mininet python style, assisted by handy 
'unpep8' script, which does most of the work.

- topo.py is still in pep8
- not all examples work, but this is due to other issues
 2010-02-05 02:33:34 -08:00
Bob Lantz 0df8b19568 Renamed logging_mod.py -> log.py 
Updated other files accordingly.
 2010-02-03 15:38:29 -08:00