Comment tweaks.

This commit is contained in:
Bob Lantz
2010-02-05 17:29:15 -08:00
parent e85f8bdf29
commit 7c371cf32a
+4 -3
View File
@@ -26,7 +26,8 @@ Controller: superclass for OpenFlow controllers. The default controller
NOXController: a controller node using NOX (noxrepo.org). NOXController: a controller node using NOX (noxrepo.org).
RemoteController: a remote controller node, which may use any RemoteController: a remote controller node, which may use any
arbitrary OpenFlow-compatible controller. arbitrary OpenFlow-compatible controller, and which is not
created or managed by mininet.
""" """
from subprocess import Popen, PIPE, STDOUT from subprocess import Popen, PIPE, STDOUT
@@ -142,7 +143,7 @@ class Node( object ):
def waitOutput( self ): def waitOutput( self ):
"""Wait for a command to complete. """Wait for a command to complete.
Completion is signaled by a sentinel character, ASCII( 127 ) Completion is signaled by a sentinel character, ASCII(127)
appearing in the output stream. Wait for the sentinel and return appearing in the output stream. Wait for the sentinel and return
the output, including trailing newline.""" the output, including trailing newline."""
assert self.waiting assert self.waiting
@@ -404,7 +405,7 @@ class OVSKernelSwitch( Switch ):
class Controller( Node ): class Controller( Node ):
"""A Controller is a Node that is running ( or has execed ) an """A Controller is a Node that is running (or has execed?) an
OpenFlow controller.""" OpenFlow controller."""
def __init__( self, name, inNamespace=False, controller='controller', def __init__( self, name, inNamespace=False, controller='controller',