commit 0e1825c609746e32bc8344638501539849fc3fbb
author andrewonlab <andrew@onlab.us> Thu Nov 20 20:07:00 2014 -0500
committer andrewonlab <andrew@onlab.us> Thu Nov 20 20:07:00 2014 -0500
tree ee9bc076c3cd3c3dab48c94b0f7df013818c2eda
parent 7b4e8ba729ac5631d81c9e51fb3fff48b8839932

Configuration file for event accumulator settings now adjusts according to specific test

TestON/tests/TopoPerfNext/TopoPerfNext.params

diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.params b/TestON/tests/TopoPerfNext/TopoPerfNext.params
index 7eac6ef..42512e8 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.params
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.params
@@ -1,5 +1,5 @@
 <PARAMS>
-    <testcases>1,2,3,4</testcases>
+    <testcases>1,2,3</testcases>
 
     <ENV>
         <cellName>topo_perf_test</cellName>
@@ -38,6 +38,13 @@
         <debugMode>off</debugMode>
         <onosLogFile>/opt/onos/log/karaf*</onosLogFile>
 
+        <topo_config_file>
+        single_topo_event_accumulator.cfg
+        </topo_config_file>
+        <topo_config_name>
+        org.onlab.onos.net.topology.impl.DefaultTopologyProvider.cfg
+        </topo_config_name>
+
         #Number of times to iterate each case
         <numIter>20</numIter>
         <numSwitch>2</numSwitch>

TestON/tests/TopoPerfNext/TopoPerfNext.py

diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.py b/TestON/tests/TopoPerfNext/TopoPerfNext.py
index 21f5f44..0ec69d2 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.py
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.py
@@ -42,7 +42,18 @@
         MN1_ip = main.params['MN']['ip1']
         BENCH_ip = main.params['BENCH']['ip']
 
+        topo_cfg_file = main.params['TEST']['topo_config_file']
+        topo_cfg_name = main.params['TEST']['topo_config_name']
+        
         main.case("Setting up test environment")
+        main.step("Copying topology event accumulator config file to "+
+            "ONOS /package/etc")
+        main.ONOSbench.handle.sendline("cp ~/"+
+            topo_cfg_file+
+            "~/ONOS/tools/package/etc/"+
+            topo_cfg_name)
+        main.ONOSbench.handle.expect("\$")
+
         main.log.report("Setting up test environment")
 
         main.step("Cleaning previously installed ONOS if any")