Bob Lantz
ab594b6afe
Merge branch '2.0dev' into 2.0merge
...
Conflicts:
.gitignore
.pylint
examples/miniedit.py
mininet/node.py
mininet/util.py
util/install.sh
util/vm/install-mininet-vm.sh
2012-11-15 22:54:27 -08:00
Bob Lantz
e3c8066a9e
OK, github is broken - reverting to old spacing.
2012-11-09 00:09:41 -08:00
Bob Lantz
78e3e18c42
trying to fix list spacing
2012-11-09 00:09:11 -08:00
Bob Lantz
01e028c19f
Add Mininet-HiFi comment
2012-11-09 00:07:56 -08:00
Bob Lantz
d49aaf0f70
Hmm, maybe this is better.
2012-11-09 00:04:40 -08:00
Bob Lantz
f7d6c9e7a1
Another attempt.
2012-11-09 00:03:36 -08:00
Bob Lantz
015aaa2107
That didn't work...
2012-11-09 00:02:54 -08:00
Bob Lantz
bad8656361
More header madness.
2012-11-09 00:02:17 -08:00
Bob Lantz
eb3b74ea34
sudo mn seems lonely if it takes up the whole line
2012-11-08 23:58:54 -08:00
Bob Lantz
dabc0b812a
Bash in tt, abolish forward single quotes.
2012-11-08 23:57:39 -08:00
Bob Lantz
dd1a450b50
Mars needs commas!
2012-11-08 23:55:31 -08:00
Bob Lantz
ead9f83050
Reflow text and try crazy idea for heading.
2012-11-08 23:52:07 -08:00
Bob Lantz
0fb91f186e
More minor tweaks....
2012-11-08 23:47:48 -08:00
Bob Lantz
3e38a959c3
Moved installation instructions and prereqs into INSTALL.
2012-11-08 23:31:31 -08:00
Bob Lantz
535e61d2be
Still trying to fix the typeface and spacing...
2012-11-08 23:18:56 -08:00
Bob
4885cb24ed
Update README.md
...
File and command names in typewriter text.
2012-11-08 22:05:52 -08:00
Bob Lantz
ff4b41439a
Minor changes.
2012-11-03 21:59:04 -07:00
Bob Lantz
21b2c2c4aa
VERSION -> 2.0.0rc1
2012-11-03 21:38:59 -07:00
Bob Lantz
e2b799b815
Fix/work around setuptools' evil PYTHONPATH madness.
2012-11-03 21:36:03 -07:00
Bob Lantz
4744aa2b78
Updated README to reflect Mininet 2.0.
2012-11-03 16:53:26 -07:00
Bob Lantz
c04ef88e5c
Add note regarding removing old OVS junk.
2012-11-03 16:10:57 -07:00
Bob Lantz
4b1dc93bcc
Avoid modifying keyword parameter dictionary in customized()
2012-10-30 16:58:51 -07:00
Bob Lantz
f58f83c043
Allow controller to optionally be a list of constructors/classes
2012-10-30 16:50:12 -07:00
Bob Lantz
22b8e5e427
Add custom name to customized functions.
...
Note: we could probably use functools.partial.
2012-10-30 16:45:11 -07:00
Bob Lantz
31015ef5d8
Make doc a real subdirectory so we can put other things there.
2012-10-29 15:36:19 -07:00
Bob Lantz
600dad2498
Added package installation "instructions"
2012-10-04 19:08:37 -07:00
Bob Lantz
4ff6243fd6
Update version number to 2.0.0d3 (and pass version check)
2012-10-04 19:02:44 -07:00
Bob Lantz
9c0ed88c72
Create version check utility and add to code check.
...
Fixes #70
2012-10-04 19:02:27 -07:00
Bob Lantz
93f9b956e4
Updated copyright to fix #68
2012-10-01 18:01:29 -07:00
Bob Lantz
b69ef234ac
Fix multi-controller/failover support on User, OVSLegacy switches
2012-09-14 18:23:30 -07:00
Bob Lantz
2988429747
show method names in git diff output
2012-09-14 15:18:17 -07:00
Bob Lantz
d4ece25ba6
Deprecate NOX-classic; "install" POX. Fixes #61
2012-09-11 06:49:11 -07:00
Bob
ad85e44d78
Update util/install.sh
...
Update to reflect new NOX classic repo on github and default branch.
2012-08-29 16:00:33 -07:00
Bob
655194d3e1
Update util/install.sh
...
Update to reflect new NOX classic repo on github and default branch.
2012-08-29 15:10:36 -07:00
Bob Lantz
6eb01d7923
Minor formatting changes.
2012-08-23 18:36:50 -07:00
Bob Lantz
ae6475598f
Change README to README.md for github presentation.
...
This isn't the final README text, of course, but it should
show up formatted now on github.
2012-08-23 18:28:15 -07:00
Bob Lantz
62499d96df
Adjust README slightly to be markdown-compatible.
2012-08-23 18:27:48 -07:00
Bob Lantz
4f33cad025
Ignore more stuff, notably generated docs and man pages.
2012-08-17 18:20:22 -07:00
Bob Lantz
2aafefc2fa
Fix typo in RemoteController.__init__ comment.
...
Thanks to Isaku Yamahata.
2012-08-17 15:26:19 -07:00
Bob Lantz
9d5a21a799
Fix typo MANPAGE->MANPAGES
...
Thanks to Isaku Yamahata.
2012-08-17 15:25:06 -07:00
Bob Lantz
ce15c4f67d
rename Topo() methods for consistency: add_node() -> addNode()
2012-08-16 18:48:41 -07:00
Bob Lantz
01e0758e5d
Add 'type mn -h for details' to usage message.
2012-08-16 16:12:55 -07:00
Bob Lantz
e8238d185d
Use Mininet version number from mininet.net
...
Contributing toward issue #46 .
2012-08-10 12:47:35 -07:00
Bob Lantz
54c51c0299
Fix whitespace and change no controller exception to warning.
2012-08-06 11:41:00 -07:00
Bob Lantz
fa24f22d4d
Re-enable slicing in UserSwitch since it's fixed with newer kernels.
2012-07-31 17:23:08 -07:00
Bob Lantz
ce823507cd
Fix man page install.
2012-07-31 17:22:13 -07:00
Bob Lantz
cd580debb6
Removed redundant debian/mininet.manpages
2012-07-07 22:29:46 -07:00
Bob Lantz
1e9106badb
Add option to mangle github tarball filename.
2012-07-07 22:23:53 -07:00
Bob Lantz
232acc8261
Track tagged versions on github directly.
2012-07-07 19:07:20 -07:00
Bob Lantz
55179737f9
Change version to 2.0.0d2 - there has to be a better way.
2012-07-06 23:44:27 -07:00
Bob Lantz
28c2cdc2c4
Workaround for openvswitch_mod rename and pass code check.
2012-07-06 23:30:14 -07:00
Bob Lantz
d85a58feeb
Autogenerate man page for mnexec.
2012-07-06 23:18:24 -07:00
Bob Lantz
89a6dea7f9
Remove unnecessary copy to bin/
2012-07-06 22:43:11 -07:00
Bob Lantz
9a518b1eee
Add missing packaging files from launchpad.
2012-07-06 22:30:19 -07:00
Bob Lantz
d54cde46e0
Add PYTHONPATH=. to allow "make man" to work if Mininet is not installed.
2012-07-06 19:54:42 -07:00
Bob Lantz
320df7fe28
Merging in James Page's packaging tweaks for quantal.
2012-07-06 16:06:19 -07:00
Bob Lantz
0ab282400e
update maintainer for ppa submission to work
2012-07-04 10:46:25 -07:00
Bob Lantz
8aa7e05d83
Added missing help2man to build deps.
2012-07-04 00:23:06 -07:00
Bob Lantz
b43a67edbd
Pass lintian. This is still annoyingly redundant. ;-(
...
y
2012-07-03 23:53:47 -07:00
Bob Lantz
9c4d047462
Ugh, it looks like lintian wants a duplication of the license in debian/copyright....
2012-07-03 23:19:08 -07:00
Bob Lantz
ccc0b1a1cf
Fixed debian/copyright
2012-07-03 23:09:37 -07:00
Bob Lantz
78b2f585ae
Fixed support for adding man page to debian package - to pass lintian!
2012-07-03 22:50:53 -07:00
Bob Lantz
39128f8cf8
Add VERSION string.
2012-07-03 22:08:33 -07:00
Bob Lantz
7fe847967d
clean up "make man" slightly
2012-07-03 22:08:25 -07:00
Bob Lantz
f2e7884ade
Add support for generating man page from mn --help.
2012-07-01 23:23:56 -07:00
Bob Lantz
0809105bed
Fixing some lintian problems.
2012-07-01 23:22:44 -07:00
Bob Lantz
93bf7793cb
Debian copyright wants a real file, so change LICENSE to symlink.
2012-07-01 23:22:05 -07:00
Bob Lantz
ec969b7f99
Change default controller for mn to ovsc (ovs-controller.)
...
Also add check to see if another controller is running -
eventually we should really detect errors from starting the
controller!!
2012-07-01 20:31:30 -07:00
Bob Lantz
cb859243a5
Added Debian/Ubuntu packaging - thanks to James Page.
2012-07-01 19:16:41 -07:00
Bob Lantz
e04c207c3c
Update for Mininet 2.0.0 development.
2012-07-01 19:08:20 -07:00
Bob Lantz
0f832c9226
Propagate prefix length to host IP configuration.
2012-06-25 14:14:09 -07:00
Bob Lantz
d9fd4ea245
Add VM install script
2012-05-23 22:37:53 -07:00
Bob Lantz
6c947bca07
More indent errors - curse you emacs.
2012-05-23 21:12:24 -07:00
Bob Lantz
e4514a4ecb
Still more indentation errors. ;-p
2012-05-23 21:09:14 -07:00
Bob Lantz
8c778bb081
Fix indentation errors.
2012-05-23 21:06:15 -07:00
Bob Lantz
f1bf3c60e0
Added popenpoll.py example of using popen()/pmonitor()
2012-05-23 20:56:35 -07:00
Bob Lantz
06f7408cf2
Fix popen to allow popen( cmd, arg1, arg2, arg3 )
2012-05-23 20:04:36 -07:00
Bob Lantz
e1ca7196c7
configHosts(): don't try to configure nonexistent interfaces.
2012-05-23 13:37:02 -07:00
Bob Lantz
8f310286f8
Add setLinkInfo() which seems to be missing.
2012-05-21 23:09:11 -07:00
Bob Lantz
b91008345f
Fix pexec('echo foo', shell=True)
2012-05-16 23:59:12 -07:00
Bob Lantz
2f8dfe5810
Ignore error installing OVS controller, and disable its startup script.
2012-05-14 17:29:24 -07:00
Bob Lantz
79dcdc0491
Add libconfig-dev dependency for oflops.
2012-05-14 16:58:36 -07:00
Bob Lantz
b0fb398833
Patch/hacks to enable NOX destiny/classic to compile on Ubuntu 12.04
2012-05-14 16:03:48 -07:00
Bob Lantz
6e64deec08
Fix typo.
2012-05-13 15:29:08 -07:00
Bob Lantz
b97c1dbd56
Set dpid on OVSSwitch.
2012-05-13 15:11:41 -07:00
Bob Lantz
d75e39ac61
Change wireshark install to reflect new repository location.
2012-05-13 14:43:25 -07:00
Bob Lantz
88dd4f7329
Change wireshark install to reflect new repository location.
2012-05-13 14:37:45 -07:00
Bob Lantz
e8d60e0fcf
Pass code check.
2012-05-10 22:37:49 -07:00
Bob Lantz
0d94548a09
Fix default dpid which should be 12 digits for reference user switch.
2012-05-10 22:36:20 -07:00
Bob Lantz
4c3ff8f184
Remove accidentally added debugging line.
2012-05-10 22:23:31 -07:00
Bob Lantz
49d84f7cfc
Fix poller to only check if stdin and node are readable.
...
Fixes busy waiting and excessive CPU usage in CLI.
Thanks to James Zeng for pointing this out!
2012-05-10 17:35:34 -07:00
Bob Lantz
0e8cca0869
Remove unnecessary and broken --ip option.
2012-05-10 16:54:03 -07:00
Bob Lantz
0eba655d2d
Fix RemoteController which was still using defaultIP rather than ip.
2012-05-10 16:52:40 -07:00
Bob Lantz
cece39e439
Fix poller to only check if stdin and node are readable.
...
Thanks to James Zeng for pointing this out!
2012-05-10 16:32:55 -07:00
Bob Lantz
cfd381134f
Fix errRun to not exit until all of stdout and stderr have been read.
2012-05-09 22:59:30 -07:00
Bob Lantz
7676c17f27
Add missing libconfig-dev dependency for oflops.
2012-04-25 17:39:55 -07:00
Bob Lantz
55cf19c4de
Improve error handling for defaultDpid()
...
I think it's worth considering how we want to specify dpids for
switches. One way would be to have Mininet (optionally) pick them
automatically. Another way, which I have currently implemented, is
to intuit them from the name, for example s1 -> 1. The latter is
slightly inefficient, but is convenient because it ensures that
there is a logical mapping between switch names and dpids, which
is very helpful for debugging an OpenFlow system!
Probably we should just clarify that the easiest way to set a dpid
is to include it in the switch name, but you can also pass it in
as a custom parameter to the constructor.
2012-04-25 14:21:39 -07:00
Bob Lantz
50cebe6753
Add pmonitor() to make it easy to monitor popen objects.
2012-04-13 17:42:37 -07:00
Bob Lantz
237a3c54cf
Begin test/example for popen().
2012-04-13 15:50:45 -07:00
Bob Lantz
5ca91f9ced
White space edits for code check.
2012-04-13 15:50:45 -07:00