Starting Topology Performance test framework
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 44d796a..d023a99 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -81,9 +81,11 @@
'''
response = ''
try:
+ self.handle.sendline("")
+ self.handle.expect("onos>")
self.handle.sendline("system:shutdown")
self.handle.expect("Confirm")
- self.handle.sendline("Yes")
+ self.handle.sendline("yes")
self.handle.expect("\$")
except pexpect.EOF:
@@ -479,7 +481,7 @@
main.log.info(self.name+" ::::::")
main.cleanup()
main.exit()
-
+
def paths(self, src_id, dst_id):
'''
Returns string of paths, and the cost.
@@ -520,8 +522,6 @@
main.cleanup()
main.exit()
-
-
#Wrapper functions ****************
#Wrapper functions use existing driver
#functions and extends their use case.
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index ff13e5d..5532b8a 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -457,6 +457,8 @@
os.system("scp "+temp_directory+file_name+
" admin@"+bench_ip+":"+cell_directory)
+ return main.TRUE
+
except pexpect.EOF:
main.log.error(self.name + ": EOF exception found")
main.log.error(self.name + ": " + self.handle.before)