lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
164 Commits 1 Branch 0 Tags
2626693241d5a5652861af32865ae32c819eb349
Commit Graph
96 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bob Lantz 3e021c2579 Merge branch 'master' of yuba.stanford.edu:mininet 2010-02-16 16:04:31 -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
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 8895862acf Munged mn and mnclean into mininet style. 2010-02-08 15:42:31 -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 bebe9dbed2 First crack at restoring Mininet style (via handy 'unpep8' script, which 
does most of the work.)

topo.py is still in pep8, however
 2010-02-04 23:35:07 -08:00
Bob Lantz 46fa564a8a Changed to ignore W0511, which fails on TODO, FIXME, etc.. 
We may wish to re-enable this later.
 2010-02-04 23:13:33 -08:00
Bob Lantz 0df8b19568 Renamed logging_mod.py -> log.py 
Updated other files accordingly.
 2010-02-03 15:38:29 -08:00
Bob Lantz ac9554d6dc Renamed mn_run.py -> mn, mn_clean.py -> mnclean; updated Makefle 
It's possible that mn_clean is a bit easier to read; mnclean may be easier
to type, however.

Added variables to Makefile so that source files are listed in a single
location.
 2010-02-03 15:29:07 -08:00
Bob Lantz 799242c617 Fixed undefined variable 'custom' in setup(). 2010-02-03 15:06:41 -08:00
Bob Lantz 40580731cd Added simple all-to-all UDP bandwidth test. 2009-12-17 16:31:42 -08:00
Bob Lantz 9bb15c76e9 Added missing value (60) in list. ;-) 2009-12-17 16:31:14 -08:00
Bob Lantz b7640209a8 Changed to use class vars and method to track nodes. 
Useful for monitoring the output of a set of nodes.
 2009-12-17 16:30:40 -08:00
Bob Lantz 1417fe7283 Changed cleanup to do fast things first. 2009-12-17 16:29:55 -08:00
Bob Lantz 7df36e476e Changed linearbandwidth.py to be much (!) smarter - it now *reuses* the network! Amazing. 2009-12-15 22:40:12 -08:00
Bob Lantz f939eb5625 Changes to mininet.py: 
- invoke ofdatapath with --fail=closed (no controller = no connectivity!)
- stop hosts before switches before the controller
	- this seems slightly more sensible
	- it's the reverse of the startup order
- fix retry() so it kind of works (it's actually helpful I think!)
 2009-12-15 22:38:17 -08:00
Bob Lantz 0b4ae53a7e We don't need to print the links. 2009-12-15 22:37:56 -08:00
Bob Lantz e04f092232 Bah, wasn't using correct command to remove datapaths! Fixed. 2009-12-15 21:01:19 -08:00
Bob Lantz 05cce994c3 Haha, retry is definitely not right. Time to take a break I think. 2009-12-15 19:59:48 -08:00
Bob Lantz 0a9ea29fd2 Fixed problem for empty lists in cleanup. 
Added retry() function for createLink to see if it helps (probably won't.)
Random edits to docs.
 2009-12-15 19:53:22 -08:00
Bob Lantz 696a619d0e Minor tweaks and corrections. 
Added commentary on control network to mininet.py.
Hopefully fixed linearbandwidth.py for real.
 2009-12-15 18:50:44 -08:00
Bob Lantz ea420ee29f First crack at converting cleanup to Python. 2009-12-15 18:49:46 -08:00
Bob Lantz 2708cadd40 Fixed LinearNet to pass correct parametersto GridNet.__init__() 2009-12-15 17:31:36 -08:00
Bob Lantz 657333199b Fixed treeping1024.py to import Cli, so it should work now. 2009-12-15 17:22:56 -08:00
Bob Lantz 6a30c394b1 Changed to include linux/sched.c for compiling on debian-stable. 2009-12-15 17:14:30 -08:00
Bob Lantz 93519c04f9 Fixed control network/user datapath networks. 2009-12-15 06:13:52 -08:00
Bob Lantz 9dbb68df9e Fixed iperf test. 
Not sure if I want nox_core -v in nox.py - it's useful for debugging.
ripcordtest.py (and grid.py) still depend on routing, which I haven't been
able to test yet.
 2009-12-14 22:37:19 -08:00
Bob Lantz 77131e8f24 OK, now we run 'routing' for the nox configurations with loops. 
Unfortunately, I can't test this at the moment since nox seems not to
be able to find the routing module.

Added/renamed examples: grid.py, tree1024.py

Added -v flag to nox arguments, so we have some chance of figuring
out why nox is dying, as it generally is.
 2009-12-14 22:13:53 -08:00
Bob Lantz c53fa3ba32 Second crack at a ripcordtest.py that actually works. 
ripcord.py was a name conflict - ugh!
This one creates a network successfully, but ping doesn't work with
nox out of the box at least.
 2009-12-14 21:35:08 -08:00
Bob Lantz 0b084dd51a Added ripcord.py, which attempts to make a FatTree using ripcord and 
instantiate a mininet Network based on its topology.

Also minor cleanup of nox.py and GridNet class in mininet.py.
 2009-12-14 21:01:45 -08:00
Bob Lantz 2f53491343 First crack at allowing Controller to be customized. 
Network may now be used with custom controllers.
An example of doing this is in nox.py, which instantiates at TreeNet
using a custom Controller, NoxController, that runs nox_core rather
than the reference controller.
 2009-12-14 20:14:44 -08:00
Bob Lantz 845dedca32 One more change to revert the broken exec behavior. 2009-12-14 19:21:17 -08:00
Bob Lantz ac75d7cff4 Inadvertently added verbosity into Node.setIP(); removed. 2009-12-14 13:46:36 -08:00
Bob Lantz fb7658c8ca Since execing controller/ofprotocol was broken, reverting to just running in background. 
This should eliminate ofprotocol bogons living on past the end of a test.
 2009-12-14 13:38:10 -08:00
Bob Lantz 98332cb616 Tweaks to documentation files and sshd and xterms examples. 
Added scratchnetuser.
 2009-12-14 13:22:03 -08:00
Bob Lantz 433503cf8a Added "from scratch" examples, to show how to create a network using 
low-level primitives.

The "nox.py" example attempts to use nox as a controller rather than
controller(8).

More edits for INSTALL and README, and refinements for sshd and xterm
examples.
 2009-12-14 12:43:42 -08:00
Bob Lantz 55dd936829 Cleanup of doc files. 
Fixed xterm.py (and cleanup) to clean up screen sessions.
Cleaned up sshd.py (though interface is still in flux.)
Added 1024-node network example (treenet1024.py).
Added example showing multiple tests on a single network (multitest.py).
Renamed examples to make them easier to type!
 2009-12-11 09:21:36 -08:00
Bob Lantz 08cef003f7 Changed cleanup to vaporize zombie screen sessions. 
Other minor cleanup.
 2009-12-11 06:17:42 -08:00
Bob Lantz f4d9e05d05 Fixed treePing64. 
Minor tweaks to other files.
 2009-12-11 04:25:31 -08:00
Bob Lantz 2a0cad3c85 Renamed and tweaked treePing64. 2009-12-11 04:01:56 -08:00
Bob Lantz b3dd44d41b Fixed bigTreePing64. 
More edits for INSTALL and README files.
Batteries still not included (for the moment.) ;-)
 2009-12-11 03:58:54 -08:00
Bob Lantz 3da2b1482c Place 'root namespace' in xterm title to make it clearer that 
the node is running in the root namespace.
 2009-12-11 03:33:38 -08:00
Bob Lantz d8ef79dff7 Tweaks for install and readme files. 2009-12-11 03:31:45 -08:00
Bob Lantz af8f0b61b6 Added INSTALL file incorporating Brandon's suggestions. 
More tweaks for examples, which are still in progress.
 2009-12-11 03:22:09 -08:00
Bob Lantz 42ba5d92c3 Added sshd example, which starts up sshd on each host, allowing host access via ssh. 
(It also adds a route from the root namespace to the data network via
the first OpenFlow switch, so when you ssh in you go through OpenFlow!)

Modified Network() to optionally decouple starting the network, running
tests, and stopping the network. This allows multiple tests to be run
(or additional modifications to be made to the network before actually
starting the switches and controller.)

Still tweaking xterms - it sort of works but the screen sessions are not
cleaned up, which leads to nasty garbage.
 2009-12-11 02:34:21 -08:00
Bob Lantz 748e35d50f Working on examples. 
Added new example to create xterms.
Other minor changes.
 2009-12-10 23:39:06 -08:00
Bob Lantz 4ccc7ee941 Added examples, which may or may not work yet. 2009-12-10 01:47:00 -08:00
Bob Lantz 95d9a374b2 Added README. 
Modified cleanup to use dpctl to remove kernel datapaths.
 2009-12-10 00:21:26 -08:00
Bob Lantz 994c68f648 Modified test infrastructure to return results. 
Ping and iperf tests now return something possibly useful.
 2009-12-09 23:24:27 -08:00
Bob Lantz 9011e0d22c Fixed user datapath support. 2009-12-09 22:13:46 -08:00