Add topology cli command and check_status
diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.py b/TestON/tests/ONOSNextTest/ONOSNextTest.py
index dd91efb..c768db6 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.py
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.py
@@ -30,18 +30,6 @@
main.case("Setting up test environment")
- main.step("Git checkout and pull master")
- #main.ONOSbench.git_checkout("master")
- #git_pull_result = main.ONOSbench.git_pull()
-
-
- main.step("Using mvn clean & install")
- #clean_install_result = main.ONOSbench.clean_install()
- clean_install_result = main.TRUE
-
- main.step("Creating ONOS package")
- package_result = main.ONOSbench.onos_package()
-
main.step("Creating cell file")
#params: (bench ip, cell name, mininet ip, *onos ips)
cell_file_result = main.ONOSbench.create_cell_file(
@@ -52,6 +40,18 @@
cell_result = main.ONOSbench.set_cell(cell_name)
verify_result = main.ONOSbench.verify_cell()
+ main.step("Git checkout and pull master")
+ main.ONOSbench.git_checkout("master")
+ git_pull_result = main.ONOSbench.git_pull()
+
+
+ main.step("Using mvn clean & install")
+ clean_install_result = main.ONOSbench.clean_install()
+ #clean_install_result = main.TRUE
+
+ main.step("Creating ONOS package")
+ package_result = main.ONOSbench.onos_package()
+
main.step("Installing ONOS package")
onos_install_result = main.ONOSbench.onos_install()
onos1_isup = main.ONOSbench.isup()
@@ -107,22 +107,31 @@
cmdstr2 = "onos:topology"
cmd_result2 = main.ONOSbench.onos_cli(ONOS1_ip, cmdstr2)
main.log.info("onos command returned: "+cmd_result2)
+
+ main.step("Testing check_status")
+ check_status_results = main.ONOSbench.check_status(ONOS1_ip, 4, 6)
+ main.log.info("Results of check_status " + str(check_status_results))
main.step("Sending command 'onos -w <onos-ip> bundle:list'")
cmdstr3 = "bundle:list"
cmd_result3 = main.ONOSbench.onos_cli(ONOS1_ip, cmdstr3)
main.log.info("onos command returned: "+cmd_result3)
+ case3_result = (cmd_result1 and cmd_result2 and\
+ check_status_results and cmd_result3 )
+ utilities.assert_equals(expect=main.TRUE, actual=case3_result,
+ onpass="Test case 3 successful",
+ onfail="Test case 3 NOT successful")
def CASE4(self, main):
import re
import time
- main.case("Pingall Test")
+ main.case("Pingall Test(No intents are added)")
main.step("Assigning switches to controllers")
- for i in range(1,29):
+ for i in range(1,5): #1 to (num of switches +1)
main.Mininet1.assign_sw_controller(sw=str(i),
ip1=ONOS1_ip, port1=ONOS1_port)
switch_mastership = main.TRUE
- for i in range (1,29):
+ for i in range (1,5):
response = main.Mininet1.get_sw_controller("s"+str(i))
print("Response is " + str(response))
if re.search("tcp:"+ONOS1_ip,response):