commit 2a7ea9b1e2e7779ed907ac760e13cfe673948f08
author andrewonlab <andrew@onlab.us> Fri Oct 24 12:21:05 2014 -0400
committer andrewonlab <andrew@onlab.us> Fri Oct 24 12:21:05 2014 -0400
tree 3ca6a9d08ca744905333792ba77eabf525c98ecc
parent e9fb672d4b8f5da8cf81a8e39aa1abd256554907

merging changes to driver

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 76c7e87..1718a84 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -151,7 +151,17 @@
 
             #Wait for onos start (-w) and enter onos cli
             self.handle.sendline("onos -w "+str(ONOS_ip))
-            self.handle.expect("onos>", timeout = 60)
+            i = self.handle.expect([
+                    "onos>",
+                    pexpect.TIMEOUT],timeout=60)
+
+            if i == 0:
+                main.log.info(str(ONOS_ip)+" CLI Started successfully")
+                return main.TRUE
+            else:
+                main.log.error("Connection to CLI "+\
+                        str(ONOS_ip)+" timeout")
+                return main.FALSE
 
         except pexpect.EOF:
             main.log.error(self.name + ": EOF exception found")