added cli option onoscell & updated setCell
Change-Id: I5add9bf26475173716bc59ec74946f08ff6c99bd
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 8d95cfc..8bc2666 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -674,6 +674,7 @@
"""
Calls 'cell <name>' to set the environment variables on ONOSbench
"""
+ import re
try:
if not cellname:
main.log.error( "Must define cellname" )
@@ -692,9 +693,13 @@
self.handle.expect("\$")
handleMore = self.handle.before
- main.log.info( "Cell call returned: " + handleBefore +
+ cell_result = handleBefore + handleAfter + handleMore
+ print cell_result
+ if( re.search( "No such cell", cell_result ) ):
+ main.log.error( "Cell call returned: " + handleBefore +
handleAfter + handleMore )
-
+ main.cleanup()
+ main.exit()
return main.TRUE
except pexpect.EOF: