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
bbe5f8a389
Minor comment changes.
2010-04-11 01:42:58 -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
a650b8e657
Fixed catch: typo.
2010-04-10 22:04:55 -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
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
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
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
Brandon Heller
15b482e375
Support gnome terminals too
...
Caution: code is incomplete - can't set a default type from the CLI
and in some places the phrase xterm should be replaced by terminal.
2010-04-05 02:27:00 -07:00
Brandon Heller
e540ab5726
Use quit rather than kill when cleaning up screens
...
Kill seems to get ignored, while quit kills the detached sessions.
2010-04-05 02:07:23 -07:00
Brandon Heller
ce9cd5bee5
Add command to spawn an xterm
2010-04-05 01:06:30 -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
5eac2a8403
Changed help message to be a bit clearer.
2010-03-26 18:47:41 -07:00
Brandon Heller
f5191b855f
Revert "Add ability to pause and resume any node"
...
This reverts commit 07aad11081 .
When the semantics are clear, functionality like this will get added back to
Mininet.
Conflicts:
mininet/node.py
2010-03-23 01:15:51 -07:00
Brandon Heller
f32a546855
Fix NOX breakage
...
Controllers are no longer namespace-able, and all calls need one fewer
arg.
Also use more sensible temporary variable name.
2010-03-23 00:48:35 -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
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
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
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
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
Brandon Heller
a3d899123d
Comment clarification
2010-03-14 03:57:25 -07:00
Brandon Heller
b055728fd5
Automatically load kernel module dependencies
...
Before this commit, you'd have to manually insert the kernel module for
OVS or OF kernel modules, and you couldn't run one regression test with
all 3.
Now, these are kmod insert/remove is handled automatically.
2010-03-14 03:53:16 -07:00