[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/remotetestbeddriver.py b/TestON/drivers/common/cli/remotetestbeddriver.py
index ebf8fbe..3c0b109 100644
--- a/TestON/drivers/common/cli/remotetestbeddriver.py
+++ b/TestON/drivers/common/cli/remotetestbeddriver.py
@@ -31,7 +31,7 @@
# The common functions for emulator included in RemoteTestBedDriver
def __init__( self ):
- super( CLI, self ).__init__()
+ super( RemoteTestBedDriver, self ).__init__()
def connect( self, **connectargs ):
for key in connectargs:
@@ -53,9 +53,9 @@
pwd=remote_pwd )
if self.handle:
- self.execute( cmd="\n", prompt="\$|>|#", timeout=10 )
- self.execute( cmd="SET CYGWIN=notty", prompt="\$|>|#", timeout=10 )
- self.execute( cmd="\n", prompt="\$|>|#", timeout=10 )
+ self.execute( cmd="\n", prompt=self.prompt, timeout=10 )
+ self.execute( cmd="SET CYGWIN=notty", prompt=self.prompt, timeout=10 )
+ self.execute( cmd="\n", prompt=self.prompt, timeout=10 )
main.log.info(
"ssh " +
self.vm_user_name +
@@ -68,8 +68,8 @@
self.vm_ip_address,
prompt="(.*)",
timeout=10 )
- self.execute( cmd="\n", prompt="assword:", timeout=10 )
- self.execute( cmd=self.vm_pwd, prompt="\$", timeout=10 )
+ self.execute( cmd="\n", prompt="password:", timeout=10 )
+ self.execute( cmd=self.vm_pwd, prompt=self.prompt, timeout=10 )
return self.handle
else: