Commit Graph
100 Commits
Author SHA1 Message Date
Bob Lantz 8a130deae5 Support for generating documentation with doxygen/doxypy (such as it is.) 2010-10-27 21:21:53 -07:00
Bob Lantz 1d67218d1f Modified to add eth1. 2010-10-25 21:54:14 -07:00
Bob Lantz 76521ef1d4 Added example of adding hw interface to mininet. 2010-10-25 21:53:29 -07:00
Bob Lantz 7e643d36c0 Removed udpbwgraph - not ready for prime time. 2010-10-25 21:53:10 -07:00
Bob Lantz 11782ae0de Commented out kernel ref, moved to Open vSwitch. 2010-10-25 21:52:14 -07:00
Bob Lantz 24baea734f Changed networkx import line; we may have to deal with version issues here. 2010-10-17 17:36:48 -07:00
Bob Lantz 87737a7064 One more merge fix. 2010-10-17 17:25:16 -07:00
Bob Lantz 4876b43fe9 Merge branch 'of1.0' into testing
Conflicts:

	bin/mn
	mininet/cli.py
	mininet/moduledeps.py
	mininet/node.py
	mininet/topo.py
	util/install.sh
2010-10-17 17:23:23 -07:00
Bob Lantz 57fd19efaa Rename Controller.controller to .command 2010-09-01 20:52:29 -07:00
Bob Lantz e30f2c99c2 Rename Controller.controller to .command 2010-09-01 20:51:40 -07:00
Bob Lantz 55ca2d0c96 Pass code check. 2010-09-01 20:51:27 -07:00
Bob Lantz 74a56e2bae Pass code check. 2010-09-01 20:50:42 -07:00
Bob Lantz 444f9d8d76 Pass code check. 2010-09-01 20:50:28 -07:00
Bob Lantz 300efb2b80 Added simple example of using API just to create a namespace. 2010-09-01 19:54:10 -07:00
Bob Lantz e0e69bbeec Added new example of multiple controllers. 2010-09-01 19:53:09 -07:00
Bob Lantz 276bdaf0d3 Added more dependencies for some installs and for Debian. 2010-09-01 19:52:30 -07:00
Bob Lantz cde0c25bfe Fix for new networkx. 2010-09-01 19:51:54 -07:00
Bob Lantz 73a098a499 Use __dict__.update to update an object's fields. 2010-09-01 19:51:09 -07:00
Bob Lantz eaf5888ae0 Added controller class arg to addController(). 2010-09-01 19:50:30 -07:00
Bob Lantz 2a75022403 Fixed args for nox. 2010-09-01 19:50:00 -07:00
Bob Lantz fe769afa22 Added port to controller args; changed NOX to new arg format. 2010-09-01 19:46:48 -07:00
Bob Lantz 5c24e18639 Disable (broken) scripting for interactive commands. 2010-08-20 08:48:10 -07:00
Bob Lantz cc960215fc Added --prefixlen option - this may help with router tutorial. 2010-08-19 20:53:40 -07:00
Bob Lantz ec226c9b83 Better order - kernel first, then mininet, then everything else. 2010-08-19 16:49:06 -07:00
Bob Lantz ee7ee4065c Get the options right... 2010-08-19 16:48:02 -07:00
Bob Lantz 40beaabc14 More edits for pre-beta. 2010-08-19 16:45:11 -07:00
Bob Lantz e900a16caf Don't try to modprobe tun if it's built-in (e.g. Ubuntu.) 2010-08-19 14:42:33 -07:00
Bob Lantz 05c2d669a9 Add make to mininet deps. 2010-08-18 23:39:07 -07:00
Bob Lantz cc16d2ce29 Attempt to fix OS detection for Debian. 2010-08-18 23:33:48 -07:00
Bob Lantz f9654e5654 Better error messages when switch setup() fails. 2010-08-18 10:58:24 -07:00
Bob Lantz a77e7a029e Update for openflow.org URLs. 2010-08-18 10:23:14 -07:00
Bob Lantz bd507eecfa Oops, get rid of debug print. 2010-08-18 10:07:57 -07:00
Bob Lantz 9802686b32 Switches use high default intf; disable slicing for user switch. ;-(
This should fix --switch user --innamespace.
2010-08-18 10:04:42 -07:00
Bob Lantz 2d48b4633c More installation edits. 2010-08-17 23:11:10 -07:00
Bob Lantz f6149e4d18 More edits. 2010-08-17 23:01:12 -07:00
Bob Lantz 6555c9294b Added more hopefully useful information.
We may want to start cutting things at some point - it looks more
complicated than it really is!
2010-08-17 22:54:44 -07:00
Bob Lantz 4c85d6d3ec Quotes are better. 2010-08-17 22:36:40 -07:00
Bob Lantz 8e5892e2fd Make it easier to see what the error was on failed module load. 2010-08-17 22:35:24 -07:00
Bob Lantz 59d326295f Fixed module installation error, for real. 2010-08-17 22:32:22 -07:00
Bob Lantz dd2a2442c4 Hack: run depmod twice so it works (hopefully) on Ubuntu. 2010-08-17 20:40:53 -07:00
Bob Lantz 7268f6943c Add gcc to mininet dependencies. 2010-08-17 19:33:24 -07:00
Bob Lantz a0ca68b6b8 Install mininet along with its dependencies. 2010-08-17 17:41:01 -07:00
Bob Lantz cf9c968756 Change to not try to install kernel on ubuntu. 2010-08-17 17:31:02 -07:00
Bob Lantz 25f64a39a0 Changed to not install kernel on ubuntu. 2010-08-17 17:04:57 -07:00
Bob Lantz 57a0bb2f95 Removed unneeded lenny function. 2010-08-17 16:49:45 -07:00
Bob Lantz 01eea3503b Updated other install and help message. 2010-08-17 16:36:42 -07:00
Bob Lantz 85b69adbf8 Version that hopefully will work on Ubuntu with an ext3 root FS. 2010-08-17 16:07:07 -07:00
Bob Lantz 52c700ff0c Updated for 1.0 and to reflect install.sh. 2010-08-17 16:06:34 -07:00
Bob Lantz 5d4d630580 Getting close to Ubuntu install. 2010-08-17 03:04:30 -07:00
Bob Lantz 455194a3b8 Delete spaces around =. 2010-08-17 03:04:12 -07:00
Bob Lantz 0533e1cc1e Remove hard-wired /home/mininet directory. 2010-08-17 00:30:25 -07:00
Bob Lantz b13a2c17c5 Removed test for reference kernel implementation, for now at least. ;-( 2010-08-17 00:02:33 -07:00
Bob Lantz 2f40c85691 Added additional sanity checks for when OF/OVS isn't installed. 2010-08-17 00:02:33 -07:00
Bob Lantz ab312967fe Added pathCheck for additional sanity when OF/OVS isn't installed. 2010-08-17 00:02:32 -07:00
Bob Lantz 2c07d62b3c Remove blank lines to pass code check. 2010-08-17 00:02:31 -07:00
Bob Lantz e3a1fbb047 Added support for pre- and post-test CLI scripts. 2010-08-17 00:02:31 -07:00
Bob Lantz 9de7873bc8 Change to automatically update IP and MAC addresses. 2010-08-17 00:02:31 -07:00
Bob Lantz b7097daad4 Pass make codecheck. 2010-08-17 00:02:30 -07:00
Bob Lantz 52082ff3f9 mininet.node.SWITCH_PORT_BASE specifies first switch port number.
This should be mostly cosmetic, but it causes switches to number
their ports consistently with OpenFlow 1.0, which starts at 1.
For older versions of OpenFlow, SWITCH_PORT_BASE may be set to zero.
2010-08-17 00:02:30 -07:00
Bob Lantz b78c938201 Changed license to OpenFlow license. 2010-08-17 00:02:30 -07:00
Bob Lantz dde9c91dcf Added error message if we can't read script file. 2010-08-17 00:02:30 -07:00
Bob Lantz 9d0dbe488a Added "source" command and restored echo after noecho command.
Interactive commands should "work", sort of.
2010-08-17 00:02:29 -07:00
Bob Lantz 6d2416ecbe Removed test for reference kernel implementation, for now at least. ;-( 2010-08-16 23:02:04 -07:00
Bob Lantz f00101716b Added additional sanity checks for when OF/OVS isn't installed. 2010-08-16 23:01:31 -07:00
Bob Lantz b47cdfea26 Added pathCheck for additional sanity when OF/OVS isn't installed. 2010-08-16 23:01:06 -07:00
Bob Lantz f95aebb4f9 Remove blank lines to pass code check. 2010-08-16 23:00:43 -07:00
Bob Lantz d869d82027 Added support for pre- and post-test CLI scripts. 2010-08-16 20:21:08 -07:00
Bob Lantz 54d026f656 Change to automatically update IP and MAC addresses. 2010-08-16 19:36:00 -07:00
Bob Lantz 68c89df8a1 Pass make codecheck. 2010-08-16 19:35:49 -07:00
Bob Lantz dd159b4a73 mininet.node.SWITCH_PORT_BASE specifies first switch port number.
This should be mostly cosmetic, but it causes switches to number
their ports consistently with OpenFlow 1.0, which starts at 1.
For older versions of OpenFlow, SWITCH_PORT_BASE may be set to zero.
2010-08-16 14:49:02 -07:00
Bob Lantz fa8693480a Changed license to OpenFlow license. 2010-08-16 11:49:44 -07:00
Bob Lantz 6e9074f89e Added error message if we can't read script file. 2010-08-10 18:57:00 -07:00
Bob Lantz 6aff964ea0 Added "source" command and restored echo after noecho command.
Interactive commands should "work", sort of.
2010-08-10 18:47:15 -07:00
Bob Lantz 272d496dfe Darned trailing whitespace. 2010-06-16 12:24:45 -07:00
Bob Lantz a6661f0ac1 Consistently use tcp:%s:%d for controller IP address format.
(In user, kernel and ovsk switch classes.)
2010-06-16 12:21:43 -07:00
Bob Lantz 68f5925ed6 Changed port to int type (was string, which caused %d not to work in node.py.) 2010-06-16 12:15:29 -07:00
Bob Lantz c26875cb55 Fixed minor breakage due to code cleanup. 2010-05-07 01:15:41 -07:00
Bob Lantz e3f6ecca97 Pass codecheck. 2010-05-06 17:48:15 -07:00
Bob Lantz 82b7207295 Pass pylint. 2010-05-06 16:24:15 -07:00
Bob Lantz 259d713315 Pass pyflakes. 2010-05-04 19:11:12 -07:00
Bob Lantz c79882b766 Fixed typo. 2010-05-04 17:32:46 -07:00
Bob Lantz fa20913b56 Added space to one line. 2010-04-29 16:18:25 -07:00
Bob Lantz 271013e0dc Minor cleanup. 2010-04-27 15:13:25 -07:00
Bob Lantz 6c5cc2bfee Fix malformed patch format.
For some reason, the leading spaces were missing.
2010-04-23 15:08:30 -07:00
Bob Lantz 83e7ea2a0d Correction: blacklist.conf -> blacklist
On debian, the module blacklist is blacklist, not
blacklist.conf.
2010-04-23 15:06:42 -07:00
Bob Lantz 6ef2973fe2 Use switches rather than switches.keys().
Minor cosmetic change, really.
2010-04-22 17:16:53 -07:00
Bob Lantz e55cbef182 Removed debugging printing.
Note now that we can pass options into switches; for example,
we could enable stp with Switch( 's1', opts='--stp' ).
2010-04-22 17:12:22 -07:00
Bob Lantz 3758da2ec8 Minor comment change. 2010-04-22 17:08:39 -07:00
Bob Lantz 121eb4496b Changed to support new cmd() interface.
It seems that it is more convenient to be able to call

cmd( 'foo', 'bar', 1)

for example. However, this may make it slightly less
efficient, so we will see how it works.
2010-04-22 17:06:34 -07:00
Bob Lantz 8bc0037938 Fixed link check and updated quietRun interface.
Link check wasn't quite right - e.g. 'eth1' could be found in
'eth10' previously.

Updated quietRun to allow passing in args directly rather than
as a list.
2010-04-22 17:05:27 -07:00
Bob Lantz 54dfb2434a Changed to use new cmd interface.
I'm still not 100% sure on this.
2010-04-22 17:04:48 -07:00
Bob Lantz b145865407 Added comment advising use of high-level API. 2010-04-22 17:04:17 -07:00
Bob Lantz 83332c1a42 Handle interfaces (e.g. real interfaces) without remote Node. 2010-04-22 17:03:26 -07:00
Bob Lantz d2ff558da7 Correctly handle xterm creation with new makeTerm interface. 2010-04-22 17:02:41 -07:00
Bob Lantz 34954fe671 Minor comment change. 2010-04-22 17:02:19 -07:00
Bob Lantz ab1fb093d1 Added output hook and graph. 2010-04-22 17:01:54 -07:00
Bob Lantz 2a554ae33c Changed 'args' to 'line' and fixed iperfudp. 2010-04-12 18:56:50 -07:00
Bob Lantz caf024bc98 Made help string a class var. 2010-04-12 18:52:00 -07:00
Bob Lantz e555f83c97 Replaced stdout.write() with output() 2010-04-12 18:45:43 -07:00
Bob Lantz c16679863b Updated comments to reflect interactive command support.
It may be fragile, but it does sort of work.
2010-04-12 18:37:33 -07:00