lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
315 Commits 1 Branch 0 Tags
a650b8e6572ceba21f7493817fdceb0e1186695b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bob Lantz e4c82e526e Change Node.monitor() to just return output. 
It seems easier to rely on node.waiting for the moment.
 2010-03-16 14:59:45 -07:00
Bob Lantz e100d1d9d0 Change ofprotocold -> ovs-openflowd in OVSKernelSwitch. 2010-03-15 19:27:55 -07:00
Bob Lantz ad824e4e84 Pass codecheck. 2010-03-15 19:24:54 -07:00
Bob Lantz cae423e543 For now, make install. 2010-03-14 19:32:10 -07:00
Bob Lantz 7f9eb9e540 Changed remaining refs to netns to refer to mnexec. 2010-03-14 19:28:19 -07:00
Bob Lantz 3465c9ea64 Updated to reflect changes and include 2.6.33 patch. 2010-03-14 19:19:10 -07:00
Bob Lantz ed097b3b9c Working a bit on text files. Removed netns. 2010-03-14 15:18:17 -07:00
Bob Lantz bca38c997e Minor config notes changes. 2010-03-14 00:18:24 -08:00
Bob Lantz 0e2a7240c3 Reinstate mnexec in install. 2010-03-14 00:11:36 -08:00
Bob Lantz 51a1482407 Removed unused variable. 2010-03-14 00:03:54 -08:00
Bob Lantz 0e3fef2fb3 Merge branch 'master' of yuba.stanford.edu:mininet 
Conflicts:
	mininet/node.py
 2010-03-13 18:28:48 -08:00
Bob Lantz bcacfc0510 Support for control-C. Finally. 
I've changed the way things work a bit:

1. netns is replaced by mnexec, a general-purpose mininet helper.

2. For interactive commands, we now use mnexec -p, which prints out
   the pid, so we can kill it when someone hits control-C!

3. We close file descriptors for subshells. This might save memory,
   but who knows.

4. We detach our subshells from the tty using mnexec -s; thus
   control-C should not terminate everything.

5. Given 4, mn -c is now necessary if you kill mininet.
 2010-03-13 18:23:07 -08:00
Bob Lantz c4ae423238 Support for control-C. Finally. 
I've changed the way things work a bit:

1. netns is replaced by mnexec, a general-purpose mininet helper.

2. For interactive commands, we now use mnexec -p, which prints out
   the pid, so we can kill it when someone hits control-C!

3. We close file descriptors for subshells. This might save memory,
   but who knows.

4. We detach our subshells from the tty using mnexec -s; thus
   control-C should not terminate everything.

5. Given 4, mn -c is now necessary if you kill mininet.
 2010-03-13 18:19:23 -08:00
Bob Lantz d4b53ea73d Removing setsid for the moment - breaks shutdown. 
Close to solving this set of problems.
 2010-03-13 16:37:13 -08:00
Bob Lantz e953444fa5 Corrected list checkin sendCmd. 2010-03-13 13:59:03 -08:00
Bob Lantz 74993b6536 Changes to note neither ^C nor interactive commands work atm. 2010-03-12 16:40:58 -08:00
Bob Lantz 7b323bd4f4 Removed executability since mn -c is easier! 2010-03-12 16:38:26 -08:00
Bob Lantz 7cbde77496 Added blank line. 2010-03-12 16:24:28 -08:00
Bob Lantz 08ed5bb68a Made executable. 2010-03-12 16:22:40 -08:00
Bob Lantz 9e7aee2061 Merge branch 'master' of yuba.stanford.edu:mininet 
Conflicts:
	setup.py
 2010-03-12 16:21:52 -08:00
Bob Lantz 740d7ce39a Added newline at EOF. 2010-03-12 16:17:32 -08:00
Bob Lantz 4065511abb Detach shells from tty; monitoring changes. 
Call netns using setsid to detach from the tty; this is
intended to fix the problem of control-C killing your network.

sendInt() doesn't actually work - hopefully we can fix this in the
future, but it's tricky since we want to detach the many shells from
our tty, but then optionally send tty interrupts to them! Ideally we
would either know the pid of the subprocess or be able to send a signal
to bash to get it to interrupt its subprocess.

waitOutput() now uses monitor. We also handle sentinels
coming in the middle of output (but default at end should
still work well.)
 2010-03-12 16:16:28 -08:00
Bob Lantz 2ad03eea40 Minor cleanup; got rid of backslash. 2010-03-12 16:16:27 -08:00
Bob Lantz 406f5da19d Change to mention 2.6.33 kernel. 2010-03-12 16:13:09 -08:00
Bob Lantz 5947e017fd Minor changes and corrections. 2010-03-12 16:13:09 -08:00
Bob Lantz c46c1ae6ef Merge branch 'master' of yuba.stanford.edu:mininet 2010-03-11 17:23:29 -08:00
Bob Lantz 9dbe572abe Detach shells from tty; monitoring changes. 
Call netns using setsid to detach from the tty; this is
intended to fix the problem of control-C killing your network.

sendInt() doesn't actually work - hopefully we can fix this in the
future, but it's tricky since we want to detach the many shells from
our tty, but then optionally send tty interrupts to them! Ideally we
would either know the pid of the subprocess or be able to send a signal
to bash to get it to interrupt its subprocess.

waitOutput() now uses monitor. We also handle sentinels
coming in the middle of output (but default at end should
still work well.)
 2010-03-11 17:16:27 -08:00
Bob Lantz 9f32a08b28 Minor cleanup; got rid of backslash. 2010-03-11 16:54:30 -08:00
Bob Lantz 47abe6d950 Change to mention 2.6.33 kernel. 2010-03-11 16:53:58 -08:00
Bob Lantz 3a7d2a133e Minor changes and corrections. 2010-03-11 16:53:29 -08:00
Bob Lantz e3a2ef011f Fixed docstrings for switch arg: name. 2010-03-09 21:52:36 -08:00
Bob Lantz d44a5843d3 Reinstantiated inNamespace and routed control network. 
We need to figure out how to specify the IP addresses for the
routed control network. For now I'm going back to 192.168.12x.y

Also changed controller params to use IP strings rather than
numbers. However, we still need to clarify what ControllerParams
is actually for.
 2010-03-09 21:48:14 -08:00
Bob Lantz 47dbca2921 Made iperf verbose and fixed node command output. 2010-03-09 21:47:32 -08:00
Bob Lantz 1a9d2eac29 Fixed createLink args and cleaned up slightly. 2010-03-09 21:47:02 -08:00
Bob Lantz 73a323f2a2 Made compatible with rearranged args for createLink. 2010-03-09 21:46:32 -08:00
Bob Lantz 315cbf9e79 Use IP address strings rather than hex number. 2010-03-09 21:45:32 -08:00
Bob Lantz 7ecd095c45 Allow *args and **kwargs. 2010-03-09 21:44:45 -08:00