[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