[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/emulator/poxclidriver.py b/TestON/drivers/common/cli/emulator/poxclidriver.py
index 02c43b1..349e54e 100644
--- a/TestON/drivers/common/cli/emulator/poxclidriver.py
+++ b/TestON/drivers/common/cli/emulator/poxclidriver.py
@@ -41,7 +41,7 @@
PoxCliDriver driver provides the basic functions of POX controller
"""
def __init__( self ):
- super( Emulator, self ).__init__()
+ super( PoxCliDriver, self ).__init__()
self.handle = self
self.wrapped = sys.modules[ __name__ ]
@@ -80,12 +80,12 @@
self.execute(
cmd="cd " +
self.options[ 'pox_lib_location' ],
- prompt="/pox\$",
+ prompt="/pox" + self.prompt,
timeout=120 )
else:
self.execute(
cmd="cd ~/TestON/lib/pox/",
- prompt="/pox\$",
+ prompt="/pox" + self.prompt,
timeout=120 )
# launching pox with components
main.log.info( "launching POX controller with given components" )
@@ -102,7 +102,7 @@
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" )