diff --git a/mininet/node.py b/mininet/node.py index 888a28f51d7a418c36ac1a7934572f1bc92d26b1..bb613a4745a981ffb32d5c81a63b502644c80f5c 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -26,7 +26,8 @@ NOXController: a controller node using NOX (noxrepo.org). 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 @@ -142,7 +143,7 @@ def sendInt( self ): def waitOutput( self ): """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 the output, including trailing newline.""" assert self.waiting @@ -404,7 +405,7 @@ def stop( self ): 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.""" def __init__( self, name, inNamespace=False, controller='controller',