Commit Graph
177 Commits
Author SHA1 Message Date
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 1a9d2eac29 Fixed createLink args and cleaned up slightly. 2010-03-09 21:47:02 -08:00
Bob Lantz 73a323f2a2 Made compatible with rearranged args for createLink. 2010-03-09 21:46:32 -08:00
Bob Lantz 315cbf9e79 Use IP address strings rather than hex number. 2010-03-09 21:45:32 -08:00
Bob Lantz 7ecd095c45 Allow *args and **kwargs. 2010-03-09 21:44:45 -08:00
Bob Lantz 7ba9e05542 Fixed errors due to renaming buffer to buf. 2010-03-08 15:36:09 -08:00
Bob Lantz 80be564274 Removed underscores for public Node methods. Minor cleanup & comments. 2010-03-08 15:32:41 -08:00
Bob Lantz 2626693241 Changed to report repeated pep8 issues. 2010-03-08 15:31:23 -08:00
Bob Lantz a16fae676f Tweaks to separate command and options. 2010-03-05 17:19:02 -08:00
Bob Lantz 91b9e374a0 Revived sshd.py example. 2010-03-05 17:13:44 -08:00
Bob Lantz be96355468 Added some additional explanatory comments. 2010-03-05 17:01:37 -08:00
Bob Lantz b924c5b562 Fixed printing in CLI.net() 2010-03-05 17:00:44 -08:00
Bob Lantz 73360ab95c Moved TreeTopo to mininet.topolib. 2010-03-05 15:15:40 -08:00
Bob Lantz 5156b3894c Renamed LinearTestTopo() and added full ping test. 2010-03-05 15:15:05 -08:00
Bob Lantz 11a6d400c5 Added mininet.topolib to store useful topologies. 2010-03-05 15:07:00 -08:00
Bob Lantz fd21c46f64 Restored udpbwtest.py 2010-03-05 14:49:17 -08:00
Bob Lantz c80e18cd46 Worked once on user, kernel for 1-20 switches. 2010-03-05 14:12:54 -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 c246e2d55e Renamed topo_2sw_2host.py -> topo-2sw-2host.py
Still could be better though.... and we need more topology
examples.
2010-03-04 16:56:11 -08:00
Bob Lantz 95f6e7b728 linearbandwidth.py now works for kernel switch. 2010-03-04 16:55:38 -08:00
Bob Lantz 47e26cce19 Fixed to be compatible with new setIP(). 2010-03-04 16:55:21 -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 48a8d297d1 Removed blank line. 2010-03-04 16:52:29 -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 54977c79cd Changed to be executable. 2010-03-03 13:49:58 -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 28ab4a33d6 Add env var to install script 2010-02-18 12:10:36 -08:00