From e91b2815fa29c8bef39f85a9c35a965f91e8b2e3 Mon Sep 17 00:00:00 2001 From: Bob Lantz Date: Wed, 24 Mar 2010 17:21:57 -0700 Subject: [PATCH] Moved waitForNode. Maybe candidate for util.py or static method... --- mininet/cli.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/mininet/cli.py b/mininet/cli.py index a6440fb..aefb935 100644 --- a/mininet/cli.py +++ b/mininet/cli.py @@ -35,16 +35,6 @@ from cmd import Cmd from mininet.log import info, output, error - -def waitForNode( node ): - "Wait for a node to finish, and print its output." - while node.waiting: - try: - data = node.monitor() - info( '%s' % data ) - except KeyboardInterrupt: - node.sendInt() - class CLI( Cmd ): "Simple command-line interface to talk to nodes." @@ -228,3 +218,16 @@ class CLI( Cmd ): self.stdout.write( '*** Unknown syntax: %s\n' % line ) # pylint: enable-msg=W0613,R0201 + + +# This function may be a candidate for util.py + +def waitForNode( node ): + "Wait for a node to finish, and print its output." + while node.waiting: + try: + data = node.monitor() + info( '%s' % data ) + except KeyboardInterrupt: + node.sendInt() +