Commit Graph
146 Commits
Author SHA1 Message Date
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
Brandon Heller 4f4f1dd2fa Fix KeyError for missing NOX env var 2010-02-18 11:44:08 -08:00
Brandon Heller 8ff7ee4297 Remove NOX_INSTALL file
NOX Install is covered in the wiki and in util/deb/install_nox.sh.
2010-02-18 11:37:50 -08:00
Brandon Heller 4e94bac0ae Update custom topo instructions 2010-02-18 11:36:56 -08:00
Brandon Heller fe29f64dd3 More specific topo example filename 2010-02-18 10:49:23 -08:00
Brandon Heller 2b083dd191 Add gitk to installed VM tools 2010-02-18 06:02:00 -08:00
Brandon Heller 777c90236e Add VM install scripts 2010-02-18 00:09:12 -08:00
Brandon Heller 8d8ac76e85 Move sysctl script to util 2010-02-17 22:47:03 -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
Brandon Heller f52edfc545 Move sysctl params to separate file
Simplifies installation step
2010-01-31 06:58:02 -08:00
Brandon Heller befa1310df Revamp custom topology input
Defining custom topologies, switch types, controllers, and hosts is now
much easier.  Plus, all Ripcord-specific stuff has been moved out.
2010-01-30 02:46:08 -08:00
Brandon Heller 3774f234f0 Update license and add networkx dependency 2010-01-29 18:49:08 -08:00
Brandon Heller 114dcd5653 Improve CLI line editing capabilities
Convert CLI to use Python Cmd object, which provides line editing.
2010-01-29 14:42:53 -08:00
Brandon Heller 83097ff942 Fix errors from style changes 2010-01-29 13:29:12 -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