commit 48829f65c536025800f7a2d4a892a2b0b2236dc3
author andrewonlab <andrew@onlab.us> Mon Nov 17 13:49:01 2014 -0500
committer andrewonlab <andrew@onlab.us> Mon Nov 17 13:49:01 2014 -0500
tree 42698d57480527e6a0065cbc16b74841b195bc8f
parent cffe038dff5ba6181fdc62cc8f372eb4d596dfeb

Adding success to start_onos_cli function if CLI is already running

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index b7242eb..66dbd23 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -175,7 +175,12 @@
     def start_onos_cli(self, ONOS_ip):
         try:
             self.handle.sendline("")
-            self.handle.expect("\$")
+            x = self.handle.expect([
+                "\$", "onos>"], timeout=10)
+
+            if x == 1:
+                main.log.info("ONOS cli is already running")
+                return main.TRUE
 
             #Wait for onos start (-w) and enter onos cli
             self.handle.sendline("onos -w "+str(ONOS_ip))