Minor changes for TestON startup compatibility
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index b91689a..2c9c0cb 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -3,11 +3,12 @@
TODO: Document
'''
-
+import sys
import time
import pexpect
import re
import traceback
+import os.path
sys.path.append("../")
from drivers.common.clidriver import CLI
@@ -31,7 +32,7 @@
self.name = self.options['name']
- self.handle = super(OnosCliDriver,self).connect(user_name = self.user_name, ip_address = self.ip_address,port = self.port, pwd = self.pwd, home = self.home)
+ self.handle = super(OnosDriver,self).connect(user_name = self.user_name, ip_address = self.ip_address,port = self.port, pwd = self.pwd, home = self.home)
if self.handle:
return self.handle
@@ -71,7 +72,6 @@
Produce a self-contained tar.gz file that can be deployed
and executed on any platform with Java 7 JRE.
'''
- import os.path
try:
self.handle.sendline("onos-package")
@@ -95,7 +95,7 @@
else:
return main.FALSE
- except:
+ except pexpect.EOF:
main.log.error(self.name + ": EOF exception found")
main.log.error(self.name + ": " + self.handle.before)
except:
diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.params b/TestON/tests/ONOSNextTest/ONOSNextTest.params
new file mode 100755
index 0000000..016a0e9
--- /dev/null
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.params
@@ -0,0 +1,9 @@
+<PARAMS>
+
+ <testcases>1</testcases>
+
+ <CTRL>
+ <ip1>10.128.20.11</ip1>
+ </CTRL>
+
+</PARAMS>
diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.py b/TestON/tests/ONOSNextTest/ONOSNextTest.py
old mode 100644
new mode 100755
index def2a89..cc38a8c
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.py
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.py
@@ -2,6 +2,10 @@
#Testing the basic functionality of ONOS Next
#For sanity and driver functionality excercises only.
+import time
+import sys
+import os
+
class ONOSNextTest:
def __init__(self):
self.default = ''
@@ -17,5 +21,14 @@
onos-install -f
onos-wait-for-start
'''
+
+
+ install_result = main.ONOSbench.clean_install()
+ package_result = main.ONOSbench.onos_package()
+
+ print install_result
+ print package_result
+ print (install_result and package_result)
+
diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.topo b/TestON/tests/ONOSNextTest/ONOSNextTest.topo
new file mode 100755
index 0000000..87f8c73
--- /dev/null
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.topo
@@ -0,0 +1,36 @@
+<TOPOLOGY>
+ <COMPONENT>
+
+ <ONOSbench>
+ <host>10.128.20.10</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosDriver</type>
+ <connect_order>1</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOSbench>
+
+ <ONOS1>
+ <host>10.128.20.11</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>OnosDriver</type>
+ <connect_order>2</connect_order>
+ <COMPONENTS> </COMPONENTS>
+ </ONOS1>
+
+ <Mininet1>
+ <host>10.128.10.90</host>
+ <user>admin</user>
+ <password>onos_test</password>
+ <type>MininetCliDriver</type>
+ <connect_order>2</connect_order>
+ <COMPONENTS>
+ <arg1> </arg1>
+ <arg2> </arg2>
+ <controller>remote</controller>
+ </COMPONENTS>
+ </Mininet1>
+
+ </COMPONENT>
+</TOPOLOGY>