Additional driver functions for packet optical
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index 2acddb4..ffb5151 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -416,6 +416,15 @@
main.cleanup()
main.exit()
+ def run_optical_mn_script(self):
+ self.handle.sendline("")
+ self.handle.expect("\$")
+ self.handle.sendline("cd ~")
+ self.handle.expect("\$")
+ self.handle.sendline("sudo python optical.py")
+ self.handle.expect("\$")
+
+
def del_switch(self,sw):
self.handle.sendline("")
self.handle.expect("\$")
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index cb42a8d..3d2d6c9 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -407,7 +407,7 @@
lines=response.splitlines()
for line in lines:
print "line = ",line
- returnValue = lines[2]+lines[4]
+ returnValue = lines[2]+lines[3]+line[4]
return returnValue
except pexpect.EOF:
main.log.error(self.name + ": EOF exception found")
@@ -885,7 +885,7 @@
self.handle.sendline("onos-wait-for-start " + node )
self.handle.expect("onos-wait-for-start")
#NOTE: this timeout is arbitrary"
- i = self.handle.expect(["\$", pexpect.TIMEOUT], timeout = 120)
+ i = self.handle.expect(["\$", pexpect.TIMEOUT], timeout = 300)
if i == 0:
main.log.info(self.name + ": " + node + " is up")
return main.TRUE
@@ -1022,6 +1022,22 @@
main.exit()
+
+ def run_onos_topo_cfg(self):
+ '''
+ On ONOS bench, run this command: ./~/ONOS/tools/test/bin/onos-topo-cfg
+ which starts the rest and copies the json file to the onos instance
+ '''
+ self.handle.sendline("")
+ self.handle.expect("\$")
+ self.handle.sendline("cd ~/ONOS/tools/test/bin")
+ self.handle.expect("/bin$")
+ self.handle.sendline("./onos-topo-cfg")
+ self.handle.expect("{}admin@onosTestBench")
+ self.handle.sendline("cd ~")
+ self.handle.expect("\$")
+
+
def tshark_grep(self, grep, directory, interface='eth0'):
'''
Required: