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

improved check for downed link in parsePingFull

Browse Source 
fixes #176
This commit is contained in:
Brian O'Connor
2013-07-23 17:03:51 -07:00
parent c26b4525aa
commit 1ecc63dfec
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/net.py
+10 -3
View File
@@ -480,19 +480,26 @@ class Mininet( object ):
@staticmethod @staticmethod
def _parsePingFull( pingOutput ): def _parsePingFull( pingOutput ):
"Parse ping output and return all data." "Parse ping output and return all data."
errorTuple = (1, 0, 0, 0, 0, 0)
# Check for downed link # Check for downed link
if 'connect: Network is unreachable' in pingOutput: r = r'[uU]nreachable'
return (1, 0) m = re.search( r, pingOutput )
if m is not None:
return errorTuple
r = r'(\d+) packets transmitted, (\d+) received' r = r'(\d+) packets transmitted, (\d+) received'
m = re.search( r, pingOutput ) m = re.search( r, pingOutput )
if m is None: if m is None:
error( '*** Error: could not parse ping output: %s\n' % error( '*** Error: could not parse ping output: %s\n' %
pingOutput ) pingOutput )
return (1, 0, 0, 0, 0, 0) return errorTuple
sent, received = int( m.group( 1 ) ), int( m.group( 2 ) ) sent, received = int( m.group( 1 ) ), int( m.group( 2 ) )
r = r'rtt min/avg/max/mdev = ' r = r'rtt min/avg/max/mdev = '
r += r'(\d+\.\d+)/(\d+\.\d+)/(\d+\.\d+)/(\d+\.\d+) ms' r += r'(\d+\.\d+)/(\d+\.\d+)/(\d+\.\d+)/(\d+\.\d+) ms'
m = re.search( r, pingOutput ) m = re.search( r, pingOutput )
if m is None:
error( '*** Error: could not parse ping output: %s\n' %
pingOutput )
return errorTuple
rttmin = float( m.group( 1 ) ) rttmin = float( m.group( 1 ) )
rttavg = float( m.group( 2 ) ) rttavg = float( m.group( 2 ) )
rttmax = float( m.group( 3 ) ) rttmax = float( m.group( 3 ) )