Merge pull request #62 from opennetworkinglab/devl/control_strings
Devl/control strings
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 9f08e06..f30289f 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -261,20 +261,22 @@
+ cmdStr + "'\"" )
self.handle.expect( "onos>" )
self.handle.sendline( cmdStr )
- self.handle.expect( cmdStr )
self.handle.expect( "onos>" )
-
- handle = self.handle.before
-
- self.handle.sendline( "" )
- self.handle.expect( "onos>" )
-
main.log.info( "Command '" + str( cmdStr ) + "' sent to "
+ self.name + "." )
+
+ handle = self.handle.before
+ # Remove control strings from output
ansiEscape = re.compile( r'\x1b[^m]*m' )
handle = ansiEscape.sub( '', handle )
+ #Remove extra return chars that get added
+ handle = re.sub( r"\s\r", "", handle )
+ handle = handle.strip()
+ # parse for just the output, remove the cmd from handle
+ output = handle.split( cmdStr, 1 )[1]
- return handle
+
+ return output
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )