From a6661f0ac16d5f3821d47a0266f26a7c65fffa4e Mon Sep 17 00:00:00 2001 From: Bob Lantz Date: Wed, 16 Jun 2010 12:21:43 -0700 Subject: [PATCH] Consistently use tcp:%s:%d for controller IP address format. (In user, kernel and ovsk switch classes.) --- mininet/node.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mininet/node.py b/mininet/node.py index 9e18180..e7641c1 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -440,7 +440,8 @@ class UserSwitch( Switch ): ' punix:/tmp/' + self.name + ' 1> ' + ofdlog + ' 2> ' + ofdlog + ' &' ) self.cmd( 'ofprotocol unix:/tmp/' + self.name + - ' tcp:' + controller.IP() + ' --fail=closed ' + self.opts + + ' tcp:%s:%d' % ( controller.IP(), controller.port ) + + ' --fail=closed ' + self.opts + ' 1> ' + ofplog + ' 2>' + ofplog + ' &' ) def stop( self ): @@ -544,7 +545,7 @@ class OVSKernelSwitch( Switch ): # Run protocol daemon controller = controllers[ 0 ] self.cmd( 'ovs-openflowd ' + self.dp + - ' tcp:%s:%i' % ( controller.IP(), controller.port ) + + ' tcp:%s:%d' % ( controller.IP(), controller.port ) + ' --fail=closed ' + self.opts + ' 1>' + ofplog + ' 2>' + ofplog + '&' ) self.execed = False