commit c7345f2b678ec68f4ba2b51c786998eec60e0e91
author andrewonlab <andrew@onlab.us> Mon Oct 13 14:12:59 2014 -0400
committer andrewonlab <andrew@onlab.us> Mon Oct 13 14:12:59 2014 -0400
tree fdf1725452f1bac503886b326f4a788252da3418
parent 95ce832ac3c6f80c1e190c656d1ce2199c27c555

Added cases for onosclidriver

TestON/tests/ONOSNextTest/ONOSNextTest.params

diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.params b/TestON/tests/ONOSNextTest/ONOSNextTest.params
index d2c7e51..01c432e 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.params
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.params
@@ -1,6 +1,6 @@
 <PARAMS>
     
-    <testcases>1,4,3</testcases>
+    <testcases>1,5</testcases>
 
     #Environment variables
     <ENV>

TestON/tests/ONOSNextTest/ONOSNextTest.py

diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.py b/TestON/tests/ONOSNextTest/ONOSNextTest.py
index e4b7a48..dd91efb 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.py
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.py
@@ -144,3 +144,21 @@
                 onpass="Pingall Test successful",
                 onfail="Pingall Test NOT successful")
 
+    def CASE5(self, main):
+        '''
+        Test the ONOS-cli functionality
+        '''
+        cell_name = main.params['ENV']['cellName']
+        ONOS1_ip = main.params['CTRL']['ip1']
+        
+        main.case("Testing the ONOS-cli")
+        
+        main.step("Set cell for ONOS-cli environment")
+        main.ONOScli.set_cell(cell_name)
+
+        main.step("Start ONOS-cli")
+        main.ONOScli.start_onos_cli()
+
+        main.step("issue command: onos:topology")
+        main.ONOScli.onos_topology()
+

TestON/tests/ONOSNextTest/ONOSNextTest.topo

diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.topo b/TestON/tests/ONOSNextTest/ONOSNextTest.topo
index 0f7388e..de31bc9 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.topo
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.topo
@@ -10,12 +10,21 @@
             <COMPONENTS> </COMPONENTS>
         </ONOSbench>
 
+        <ONOScli>
+            <host>10.128.20.10</host>
+            <user>admin</user>
+            <password>onos_test</password>
+            <type>OnosCliDriver</type>
+            <connect_order>2</connect_order>
+            <COMPONENTS> </COMPONENTS>
+        </ONOScli>
+
         <ONOS1>
             <host>10.128.20.11</host>
             <user>sdn</user>
             <password>sdn</password>
             <type>OnosDriver</type>
-            <connect_order>2</connect_order>
+            <connect_order>3</connect_order>
             <COMPONENTS> </COMPONENTS>
         </ONOS1>
 
@@ -24,7 +33,7 @@
             <user>admin</user>
             <password>onos_test</password>
             <type>MininetCliDriver</type>
-            <connect_order>3</connect_order>
+            <connect_order>4</connect_order>
             <COMPONENTS>
                 #Specify the Option for mininet
                 <arg1> --topo tree,2,3</arg1>