commit 86dc3083e477393e8203b48462ab73952804e8d3
author andrewonlab <andrew@onlab.us> Mon Oct 13 18:18:38 2014 -0400
committer andrewonlab <andrew@onlab.us> Mon Oct 13 18:18:38 2014 -0400
tree 29d3458f935f74bb27cb46bbb3e8d91c9e706dc7
parent c2d05aa5a65b8c8a118a365a7d7968a6fc2afa7a

added devices driver function

TestON/tests/ONOSNextTest/ONOSNextTest.py

diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.py b/TestON/tests/ONOSNextTest/ONOSNextTest.py
index dd91efb..fcdc28e 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.py
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.py
@@ -148,6 +148,8 @@
         '''
         Test the ONOS-cli functionality
         '''
+        import time
+        
         cell_name = main.params['ENV']['cellName']
         ONOS1_ip = main.params['CTRL']['ip1']
         
@@ -157,8 +159,31 @@
         main.ONOScli.set_cell(cell_name)
 
         main.step("Start ONOS-cli")
-        main.ONOScli.start_onos_cli()
+        main.ONOScli.start_onos_cli(ONOS1_ip)
 
         main.step("issue command: onos:topology")
-        main.ONOScli.onos_topology()
+        topology_obj = main.ONOScli.onos_topology()
+
+        main.step("issue various feature:install <str> commands")
+        main.ONOScli.feature_install("onos-app-fwd")
+        main.ONOScli.feature_install("onos-rest")
+
+        main.step("Add a bad node")
+        node_result = main.ONOScli.add_node("111", "10.128.20.")
+        if node_result == main.TRUE:
+            main.log.info("Node successfully added")
+
+        main.step("Add a correct node")
+        node_result = main.ONOScli.add_node("111", "10.128.20.12")
+
+        main.step("List devices")
+        for i in range(1,8):
+            main.Mininet2.handle.sendline("sudo ovs-vsctl set-controller s"+str(i)+
+                    " tcp:10.128.20.11")
+            main.Mininet2.handle.expect("\$")
+        #Need to sleep to allow switch add processing
+        time.sleep(10)
+        list_result = main.ONOScli.devices()
+        main.log.info(list_result)
+
 

TestON/tests/ONOSNextTest/ONOSNextTest.topo

diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.topo b/TestON/tests/ONOSNextTest/ONOSNextTest.topo
index de31bc9..1e319d8 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.topo
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.topo
@@ -43,5 +43,19 @@
             </COMPONENTS>
         </Mininet1>
 
+        <Mininet2>
+            <host>10.128.10.90</host>
+            <user>admin</user>
+            <password>onos_test</password>
+            <type>RemoteMininetDriver</type>
+            <connect_order>5</connect_order>
+            <COMPONENTS> 
+                <arg1> --custom topo-intentTPtest.py </arg1>
+                <arg2> --arp --mac</arg2>
+                <arg3> --topo mytopo</arg3>
+                <controller> remote </controller>
+            </COMPONENTS>
+        </Mininet2>
+
     </COMPONENT>
 </TOPOLOGY>