commit ec9c321f6bf477acb5e324e5f69fed227276d809
author andrewonlab <andrew@onlab.us> Fri Oct 17 20:02:53 2014 -0400
committer andrewonlab <andrew@onlab.us> Fri Oct 17 20:02:53 2014 -0400
tree 65141eb9ea02e58503a66ff46a26022e8eefd82b
parent 4dbb4d8326317c89fe79d6a40b68f969eb809054

minor edit

TestON/tests/ONOSNextTest/ONOSNextTest.params

diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.params b/TestON/tests/ONOSNextTest/ONOSNextTest.params
index 01c432e..019b746 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.params
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.params
@@ -12,4 +12,9 @@
         <port1>6633</port1>
     </CTRL>
 
+    <GIT>
+        <autoPull>off</autoPull>
+        <checkout>master</checkout>
+    </GIT>
+
 </PARAMS>

TestON/tests/ONOSNextTest/ONOSNextTest.py

diff --git a/TestON/tests/ONOSNextTest/ONOSNextTest.py b/TestON/tests/ONOSNextTest/ONOSNextTest.py
index f01446c..de441ba 100755
--- a/TestON/tests/ONOSNextTest/ONOSNextTest.py
+++ b/TestON/tests/ONOSNextTest/ONOSNextTest.py
@@ -25,9 +25,13 @@
         import time
 
         cell_name = main.params['ENV']['cellName']
+
         ONOS1_ip = main.params['CTRL']['ip1']
         ONOS1_port = main.params['CTRL']['port1']
         
+        git_pull_trigger = main.params['GIT']['autoPull']
+        git_checkout_branch = main.params['GIT']['branch']
+
         main.case("Setting up test environment")
         
         main.step("Creating cell file")
@@ -38,14 +42,18 @@
                 "10.128.20.11")
 
         main.step("Applying cell variable to environment")
-        cell_result = main.ONOSbench.set_cell(cell_name)
-        #cell_result = main.ONOSbench.set_cell("temp_cell_2")
+        #cell_result = main.ONOSbench.set_cell(cell_name)
+        cell_result = main.ONOSbench.set_cell("temp_cell_2")
         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()
-        
+       
+        if git_pull_trigger == 'on':
+            main.step("Git checkout and pull master")
+            main.ONOSbench.git_checkout(git_checkout_branch)
+            git_pull_result = main.ONOSbench.git_pull()
+        else:
+            main.log.info("Git checkout and pull skipped by config")
+            git_pull_result = main.TRUE
+
         main.step("Using mvn clean & install")
         #clean_install_result = main.ONOSbench.clean_install()
         clean_install_result = main.TRUE