lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for Connected in checkListening()

Browse Source
This commit is contained in:
Bob Lantz
2013-09-11 12:00:15 -07:00
committed by Brian O'Connor
parent b79ce2a549
commit b55806017a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+2 -2
View File
@@ -1143,7 +1143,7 @@ class Controller( Node ):
"installed." ) "installed." )
listening = self.cmd( "echo A | telnet -e A %s %d" % listening = self.cmd( "echo A | telnet -e A %s %d" %
( self.ip, self.port ) ) ( self.ip, self.port ) )
if 'Unable' not in listening: if 'Connected' in listening:
servers = self.cmd( 'netstat -atp' ).split( '\n' ) servers = self.cmd( 'netstat -atp' ).split( '\n' )
pstr = ':%d ' % self.port pstr = ':%d ' % self.port
clist = servers[ 0:1 ] + [ s for s in servers if pstr in s ] clist = servers[ 0:1 ] + [ s for s in servers if pstr in s ]
@@ -1238,7 +1238,7 @@ class RemoteController( Controller ):
"Warn if remote controller is not accessible" "Warn if remote controller is not accessible"
listening = self.cmd( "echo A | telnet -e A %s %d" % listening = self.cmd( "echo A | telnet -e A %s %d" %
( self.ip, self.port ) ) ( self.ip, self.port ) )
if 'Unable' in listening: if 'Connected' not in listening:
warn( "Unable to contact the remote controller" warn( "Unable to contact the remote controller"
" at %s:%d\n" % ( self.ip, self.port ) ) " at %s:%d\n" % ( self.ip, self.port ) )