[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/tool/dpctlclidriver.py b/TestON/drivers/common/cli/tool/dpctlclidriver.py
index 683f16e..bb12089 100644
--- a/TestON/drivers/common/cli/tool/dpctlclidriver.py
+++ b/TestON/drivers/common/cli/tool/dpctlclidriver.py
@@ -84,7 +84,7 @@
cmd = cmd + tcpIP + ":" + tcpPort + " in_port=" + \
str( args[ "INPORT" ] ) + ",idle_timeout=" + str(
args[ "TIMEOUT" ] ) + ",actions=" + args[ "ACTION" ]
- response = self.execute( cmd=cmd, prompt="\~\$", timeout=60 )
+ response = self.execute( cmd=cmd, prompt="\~" + self.prompt, timeout=60 )
if utilities.assert_matches( expect="openflow", actual=response, onpass="Flow Added Successfully", onfail="Adding Flow Failed!!!" ):
return main.TRUE
else: