[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/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" )