[ONOS-6619] Allow different bash prompts in TestON components, Also including part of ONOS-6595
Change-Id: I31c923347dd8fac018aaf47868394552a2deefbc
diff --git a/TestON/drivers/common/cli/remotetestbed/remotevmdriver.py b/TestON/drivers/common/cli/remotetestbed/remotevmdriver.py
index f4a1f1a..e8f4c00 100644
--- a/TestON/drivers/common/cli/remotetestbed/remotevmdriver.py
+++ b/TestON/drivers/common/cli/remotetestbed/remotevmdriver.py
@@ -37,7 +37,7 @@
RemoteVMDriver is the basic driver which will handle the Mininet functions
"""
def __init__( self ):
- super( RemoteTestBedDriver, self ).__init__()
+ super( RemoteVMDriver, self ).__init__()
def connect( self, **connectargs ):
for key in connectargs:
@@ -102,7 +102,7 @@
if i == 1:
main.log.info( "ssh connection asked for password, gave password" )
self.handle.sendline( self.pwd )
- self.handle.expect( '>|#|$' )
+ self.handle.expect( self.prompt )
elif i == 2:
main.log.error( "Connection timeout" )