[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/floodlightclidriver.py b/TestON/drivers/common/cli/remotetestbed/floodlightclidriver.py
index 4f55a90..68345e6 100644
--- a/TestON/drivers/common/cli/remotetestbed/floodlightclidriver.py
+++ b/TestON/drivers/common/cli/remotetestbed/floodlightclidriver.py
@@ -34,7 +34,7 @@
FloodLightCliDriver is the basic driver which will handle the Mininet functions
"""
def __init__( self ):
- super( RemoteTestBedDriver, self ).__init__()
+ super( FloodLightCliDriver, self ).__init__()
def connect( self, **connectargs ):
for key in connectargs:
@@ -51,16 +51,16 @@
pwd=self.pwd )
if self.handle:
main.log.info( "Connected " + self.name )
- self.execute( cmd="\r", prompt="\$", timeout=10 )
+ self.execute( cmd="\r", prompt=self.prompt, timeout=10 )
self.execute(
cmd="cd /home/openflow/floodlight/",
- prompt="floodlight\$",
+ prompt="floodlight" + self.prompt,
timeout=3 )
self.execute(
cmd="java -jar target/floodlight.jar &",
- prompt="\$",
+ prompt=self.prompt,
timeout=3 )
- self.execute( cmd="\r", prompt="\$", timeout=10 )
+ self.execute( cmd="\r", prompt=self.prompt, timeout=10 )
return self.handle
else:
return main.FALSE
diff --git a/TestON/drivers/common/cli/remotetestbed/remotepoxdriver.py b/TestON/drivers/common/cli/remotetestbed/remotepoxdriver.py
index 50100c9..0273a18 100644
--- a/TestON/drivers/common/cli/remotetestbed/remotepoxdriver.py
+++ b/TestON/drivers/common/cli/remotetestbed/remotepoxdriver.py
@@ -35,7 +35,7 @@
RemoteVMDriver is the basic driver which will handle the Mininet functions
"""
def __init__( self ):
- super( RemoteTestBedDriver, self ).__init__()
+ super( RemotePoxDriver, self ).__init__()
def connect( self, **connectargs ):
for key in connectargs:
@@ -56,7 +56,7 @@
self.execute(
cmd="cd " +
self.options[ 'pox_lib_location' ],
- prompt="/pox\$",
+ prompt="/pox" + self.prompt,
timeout=120 )
self.execute(
cmd='./pox.py samples.of_tutorial',
@@ -67,6 +67,6 @@
def disconnect( self, handle ):
if self.handle:
- self.execute( cmd="exit()", prompt="/pox\$", timeout=120 )
+ self.execute( cmd="exit()", prompt="/pox" + self.prompt, timeout=120 )
else:
main.log.error( "Connection failed to the host" )
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" )