Commit Graph
100 Commits
Author SHA1 Message Date
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
Bob Lantz f800e5124d Tweaks for better interactive command handling. 2010-04-12 18:34:52 -07:00
Bob Lantz f24e70a435 Added timeout option for monitor().
This allows monitor() to be used for polling. Of course, you
probably want to use poll() first anyway, but it's nice not
to have to block if there's no output.
2010-04-12 18:33:20 -07:00
Bob Lantz 3482b4467c Changed to not print control chars we don't handle. 2010-04-12 18:32:32 -07:00
Bob Lantz e7ba6b9ebb Add title to consoles. 2010-04-11 01:43:35 -07:00
Bob Lantz bbe5f8a389 Minor comment changes. 2010-04-11 01:42:58 -07:00
Bob Lantz fce4d59dc1 Added ability to show switches and controllers. 2010-04-11 01:12:23 -07:00
Bob Lantz f583900da9 Added default title of 'Node'. 2010-04-11 01:12:11 -07:00
Bob Lantz 68f97b74ad Added explicit xterm and gterm commands.
This is not as generic as having a single 'term' command, but
it's a lot more convenient to use.
2010-04-10 23:54:05 -07:00
Bob Lantz 9ab2cba870 Fixed gterm support; quote and join -e argument. 2010-04-10 23:53:00 -07:00
Bob Lantz 99c035d9ca Changed to automatically call build() if necessary. 2010-04-10 23:52:15 -07:00
Bob Lantz 6c82d1bae7 Added blurbs for new demos. 2010-04-10 23:51:57 -07:00
Bob Lantz 03e5965236 Changed to use info() and not call build() unnecessarily. 2010-04-10 23:51:34 -07:00
Bob Lantz c3a583c813 Changed comment on iperf. 2010-04-10 22:40:12 -07:00
Bob Lantz e123afea97 Changed to let iperf run indefinitely. Simplifies things. 2010-04-10 22:38:20 -07:00
Bob Lantz 7ad4829203 Added iperf command. 2010-04-10 22:27:55 -07:00
Bob Lantz a650b8e657 Fixed catch: typo. 2010-04-10 22:04:55 -07:00
Bob Lantz a4db2c2fca Removed unnecessary init() calls. 2010-04-10 21:35:58 -07:00
Bob Lantz 4720f559c3 Fixed to import TreeNet and to skip unnecessary init(). 2010-04-10 21:35:35 -07:00
Bob Lantz 56278434a8 Changed to use library TreeNet() and remove unnecessary init(). 2010-04-10 21:35:02 -07:00
Bob Lantz 4a67fc9a4a Changed screen(1) names from hN to mininet.hN.
This should make it easier for people who use screen for other purposes
to identify which sessions were created by mininet.
2010-04-10 21:31:34 -07:00
Bob Lantz 257a2f636b Added ovs-openflowd to list of zombies.
We may still need additional code to clean up after ovs.
2010-04-10 21:30:35 -07:00
Bob Lantz c6e7eaf07c Changed to not die immediately if we send in an empty command.
There might still be some issues with this however...
2010-04-10 21:29:34 -07:00
Bob Lantz cd7457480b Re-added TreeNet convenience function. 2010-04-10 21:29:11 -07:00
Bob Lantz 5fb3d5426c Restored numbering of tree nodes. 2010-04-10 21:15:15 -07:00
Bob Lantz 724f1144ac Changed messages slightly.
For a network, we create "links" rather than "edges" on a graph.

"Edges" is a bit confusing because the links may not be edge links on
the network!

Also, since you're not necessarily running a "test", I changed it to
just say that we're "Done."
2010-04-10 21:10:25 -07:00
Bob Lantz 8e4d818a60 Made the scroll bars narrower to fit ping output on my 15" screen. 2010-04-10 21:01:44 -07:00
Bob Lantz d0e53ca863 Added semi-interactive command line support.
Now you can type commands into each mini-console!
2010-04-10 20:52:45 -07:00
Bob Lantz f89015971f Added default prefix for window titles if none is specified. 2010-04-10 20:52:02 -07:00
Bob Lantz 388f54e148 Fixed regex typo. 2010-04-10 20:25:16 -07:00
Bob Lantz ff6145c015 Change import to reflect renamed mininet.term module. 2010-04-10 20:24:31 -07:00
Bob Lantz 3e6b3dd273 Added an example of how to make an empty Mininet and add things to it. 2010-04-10 19:29:04 -07:00
Bob Lantz c58bb42f57 Added updbwgraph, a demo of how to graphically monitor node output. 2010-04-10 19:28:18 -07:00
Bob Lantz afe0ce81a5 Added simple console tool demo.
The console tool spawns and monitors a bunch of nodes.
2010-04-10 19:26:54 -07:00
Bob Lantz e10abba08d Added a simple graphical network editor demo. 2010-04-10 19:26:20 -07:00
Bob Lantz b5672f1565 Cleaning up read/monitor/interrupt.
Now you don't need to specify a default read count.

Now, by default, we print the pid out in sendCmd() which allows us
to snarf it later and set lastPid correctly.

Now, we wrap os.kill() in a try block, so that if the process is
already gone we don't get an exception.
2010-04-10 19:24:47 -07:00
Bob Lantz de901ef058 Modified to allow execed nodes to work, if we ever reinstate them. 2010-04-10 19:24:11 -07:00
Bob Lantz b1affce867 Removed TreeNet() convenience function (moved to topolib.) 2010-04-10 19:23:45 -07:00
Bob Lantz 8bbd368576 Moved TreeNet() convenience function here. 2010-04-10 19:23:23 -07:00
Bob Lantz ce67093a62 Minor format tweaks. 2010-04-09 01:46:51 -07:00
Bob Lantz b14b1ee441 Remove unneeded '-' in '-n', which was causing error message. 2010-03-30 16:09:43 -07:00
Bob Lantz 06b8210ea1 Changed TreeTopo() to number hosts from h1 to hN. 2010-03-30 15:06:43 -07:00
Bob Lantz f2dee12d93 Added LICENSE.
We may wish to change this just to "mininet is copyrighted by its
authors" or something...
2010-03-26 19:05:22 -07:00
Bob Lantz 5eac2a8403 Changed help message to be a bit clearer. 2010-03-26 18:47:41 -07:00
Bob Lantz 5791f32a2d Fix --controller=remote 2010-03-26 18:41:09 -07:00
Bob Lantz ffd089ea1c Changed git clone command. 2010-03-26 17:50:37 -07:00
Bob Lantz 8eae25501c Changed installation notes to reflect VM image install. 2010-03-26 17:45:44 -07:00
Bob Lantz 9a17de9166 Minor changes for alpha.
Added alpha releas comments, inc. do not distribute yet.

Added install notes for install.sh.
2010-03-26 15:48:25 -07:00
Bob Lantz a0c97d110c Added patches for openflow reference version.
These may not be needed if they are pushed upstream.
2010-03-26 14:05:48 -07:00
Bob Lantz 8125370d8e Minor tweaks for alpha. 2010-03-26 14:04:04 -07:00
Bob Lantz add0ee6059 Added sudo for aptitude install. 2010-03-26 13:50:13 -07:00
Bob Lantz e21aa14fac Minor comment edits. 2010-03-26 12:33:47 -07:00
Bob Lantz 3f02f15e47 Added kbuild script for 2.6.33.1 2010-03-26 12:28:55 -07:00
Bob Lantz e91b2815fa Moved waitForNode. Maybe candidate for util.py or static method... 2010-03-24 17:21:57 -07:00
Bob Lantz c2cc1aacf6 Attempt to handle interrupts in the middle of CLI commands. 2010-03-24 17:17:24 -07:00
Bob Lantz 41badb9686 Pass code check. 2010-03-24 17:08:25 -07:00
Bob Lantz 45e82d0952 Restored treeping64 and tre1024 examples and updated README. 2010-03-24 17:04:11 -07:00
Bob Lantz d93c6ef6ce Change to use setLogLevel() 2010-03-24 17:03:57 -07:00
Bob Lantz fe414722ac Change to use setLogLevel() 2010-03-24 17:03:49 -07:00
Bob Lantz 8423875b37 Change to use new interface to mn.run() 2010-03-24 17:03:27 -07:00
Bob Lantz 47acf53974 Change to use printf rather than echo. 2010-03-24 17:02:44 -07:00
Bob Lantz 67516aa44f Change run() to allow running external functions. 2010-03-24 16:58:44 -07:00
Bob Lantz 6e4e79afc3 Add setLogLevel as an export. 2010-03-24 16:58:27 -07:00
Bob Lantz 22f807fc6f Reinstated multitest example and updated examples/README. 2010-03-24 15:20:22 -07:00
Bob Lantz b2ef87ae51 Changes to pass code check.
We should check NOXController and RemoteController to make sure that
they are not broken, but I cannot do this at the moment.
2010-03-24 15:02:28 -07:00
Bob Lantz 0774c8bbce Added two spaces before in-line # comments. 2010-03-24 14:42:42 -07:00
Bob Lantz cf6f67045b Added two spaces before in-line # comments. 2010-03-24 14:41:40 -07:00
Bob Lantz 353411422e Minor formatting changes. 2010-03-24 13:42:46 -07:00
Bob Lantz c70aab0a38 Changed mininet.link() to mininet.configLinkStatus(src,dst,status)
Also rearranged parameters in link command to

mininet> link s1 h2 up

To resemble ifconfig a bit more.
2010-03-23 15:25:12 -07:00
Bob Lantz fb2f652319 Changed mininet.link() to support multiple links.
It should also probably be renamed to something like:
configLinks(src, dst, status).
2010-03-23 15:05:55 -07:00
Bob Lantz 178a3d8410 Minor tweaks. 2010-03-22 19:34:47 -07:00
Bob Lantz c8fbd4465c Updated installation notes and added patch for controller.c. 2010-03-22 17:50:02 -07:00
Bob Lantz f2eaeac78c Added patch for 2.6.33.x kernel. 2010-03-22 16:24:22 -07:00
Bob Lantz 6ab417ccd7 Added setup for kernel switch. 2010-03-22 16:24:04 -07:00
Bob Lantz 3e624fb237 Added openvswitch kernel switch. 2010-03-17 23:43:03 -07:00
Bob Lantz 8abc3472e3 Pass code check. 2010-03-16 14:59:46 -07:00
Bob Lantz ec7b211c41 Buffered output. Added net.monitor() and node.readline()
Moved monitor() and readline() into net.py and node.py respectively,
which will hopefully be useful for monitoring large sets of hosts,
as is done in udpbwtest.py.

Changed iperf to use interactive command infrastructure (such as it
is), which may make it more reliable. Hopefully it's a bit clearer
as well, although it is slightly more complicated.
2010-03-16 14:59:45 -07:00
Bob Lantz 6ab1f1ff23 Run in non-verbose mode, and print network sizes. 2010-03-16 14:59:45 -07:00
Bob Lantz 736038f8ef Added README for examples. 2010-03-16 14:59:45 -07:00