Updated ONOS and Cassandra drivers, test modified for compatability
diff --git a/TestON/drivers/common/cli/cassandraclidriver.py b/TestON/drivers/common/cli/cassandraclidriver.py
index d307f93..6a961ee 100644
--- a/TestON/drivers/common/cli/cassandraclidriver.py
+++ b/TestON/drivers/common/cli/cassandraclidriver.py
@@ -55,7 +55,7 @@
self.ssh_handle = self.handle
if self.handle :
- self.start()
+ #self.start()
return main.TRUE
else :
main.log.error("Connection failed to the host "+self.user_name+"@"+self.ip_address)
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 3b9e86b..4861e05 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -76,7 +76,17 @@
main.log.error("ONOS expect script missed something... ")
return main.FALSE
-
+
+ def start_embedded(self):
+ self.handle.sendline("")
+ self.handle.expect("\$")
+ self.handle.sendline("~/ONOS/start-onos-embedded.sh start")
+ try:
+ self.handle.expect("start...")
+ main.log.info("Embedded ONOS started")
+ except:
+ main.log.info("Embedded ONOS failed to start")
+
def link_down(self, **linkParams):
'''
Specifically used for the ONOS demo on the HW.