Merged conflicts
diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.py b/TestON/tests/ONOSNextTest/ONOSNextTest.py
index 9e790a5..a49a73d 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.py
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.py
@@ -24,11 +24,11 @@
cell_name = main.params['ENV']['cellName']
ONOS1_ip = main.params['CTRL']['ip1']
-
+
main.case("Setting up test environment")
main.step("Using mvn clean & compile")
- install_result = main.ONOSbench.clean_install()
+ clean_install_result = main.ONOSbench.clean_install()
main.step("Creating ONOS package")
package_result = main.ONOSbench.onos_package()
@@ -36,14 +36,17 @@
main.step("Applying cell variable to environment")
cell_result = main.ONOSbench.set_cell(cell_name)
verify_result = main.ONOSbench.verify_cell()
+
+ main.step("Installing ONOS package")
+ onos_install_result = main.ONOSbench.onos_install()
+ onos1_isup = main.ONOSbench.isup()
main.step("Starting ONOS service")
start_result = main.ONOSbench.onos_start(ONOS1_ip)
-
-
- case1_result = (install_result and package_result and\
- cell_result and verify_result and start_result)
+ case1_result = (clean_install_result and package_result and\
+ cell_result and verify_result and onos_install_result\
+ and onos1_isup and start_result)
utilities.assert_equals(expect=main.TRUE, actual=case1_result,
onpass="Test startup successful",
onfail="Test startup NOT successful")