From 54675c5c927186b7b0d017fb64ca034e584461a5 Mon Sep 17 00:00:00 2001
From: Peter Gubka <pgubka@cisco.com>
Date: Wed, 15 Apr 2015 14:09:05 +0200
Subject: [PATCH] new openflow rest api perf suite

changes needed to integrate already present robot and script files with a new tesplan file
it basically implements https://trello.com/c/nHYXeOYa/94-performance-prepare-e2e-flow-push-test-using-jan-s-scripts

Change-Id: I57e4082bd5e65f6314a3397839b05f4f2d53dd80
Signed-off-by: Peter Gubka <pgubka@cisco.com>
---
 .../010_Rest_Config_Flows.robot}                   | 14 ++++++++------
 .../openflowplugin-config-performance.txt          |  2 ++
 .../create_plot_data_files.py                      | 11 +++--------
 3 files changed, 13 insertions(+), 14 deletions(-)
 rename test/{tools/odl-mdsal-clustering-tests/clustering-performance-test/of-perf.txt => csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot} (82%)
 create mode 100644 test/csit/testplans/openflowplugin-config-performance.txt

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/of-perf.txt b/test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
similarity index 82%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/of-perf.txt
rename to test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
index 64fee05e5b..b9f939cce6 100644
--- a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/of-perf.txt
+++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
@@ -4,9 +4,9 @@ Library        OperatingSystem
 Library        Collections
 Library        XML
 Library        Process
-Variables      ../../../../test/csit/variables/Variables.py
-Library        ../../../../test/csit/libraries/RequestsLibrary.py
-Library        ../../../../test/csit/libraries/Common.py
+Variables      ../../../variables/Variables.py
+Library        ../../../libraries/RequestsLibrary.py
+Library        ../../../libraries/Common.py
 Library        SSHLibrary
 Suite Setup       Start Suite
 Suite Teardown    Stop Suite
@@ -24,16 +24,18 @@ Are Switches Connected
 Configure And Deconfigure Flows
       ${result}=    Run Process    ${PERFSCRIPT}  --host  ${CONTROLLER}  --flows  ${flows}  --threads  ${threads}  --auth  shell=yes
       Log           ${result.stdout}
-      Create File    ${CURDIR}/out.log.txt  content=${result.stdout}
+      Create File   out.log.txt  content=${result.stdout}
       Log           ${result.stderr}
       Should Be Equal As Integers       ${result.rc}    0
+      ${result}=    Run Process    python  ${PARSESCRIPT}
 
 *** Variables ***
 ${switches}       10
-${flows}          1000
+${flows}          100
 ${threads}        5
 ${start}          sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${switches},1 --switch ovsk,protocols=OpenFlow13
-${PERFSCRIPT}     ${CURDIR}/flow_add_delete_test.py
+${PERFSCRIPT}     ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py
+${PARSESCRIPT}    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
 
 *** Keywords ***
 Start Suite
diff --git a/test/csit/testplans/openflowplugin-config-performance.txt b/test/csit/testplans/openflowplugin-config-performance.txt
new file mode 100644
index 0000000000..fd9f22e8fd
--- /dev/null
+++ b/test/csit/testplans/openflowplugin-config-performance.txt
@@ -0,0 +1,2 @@
+# Place the suites in run order:
+integration/test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py b/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
index 1e7fde46c7..1719defa4f 100644
--- a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
+++ b/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
@@ -12,12 +12,7 @@ for line in log.splitlines():
         data.append(ll[0][24:])
 print data
 
-text_file = open("plot_data_create.txt", "w")
-text_file.write('Rate_create\n')
-text_file.write('{0}\n'.format(data[0]))
-text_file.close()
-
-text_file = open("plot_data_delete.txt", "w")
-text_file.write('Rate_delete\n')
-text_file.write('{0}\n'.format(data[1]))
+text_file = open("rates.csv", "w")
+text_file.write('Add,Delete\n')
+text_file.write('{0},{1}\n'.format(data[0], data[1]))
 text_file.close()
-- 
2.36.6