Consistently use tcp:%s:%d for controller IP address format.

(In user, kernel and ovsk switch classes.)
2010-06-16 12:21:43 -07:00
parent 68f5925ed6
commit a6661f0ac1
1 changed files with 3 additions and 2 deletions
@@ -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