Added proper OVS-dump-flows.sh.13

Removed get-totals.sh

Change-Id: Ib27b7b227c9fd293ff4a77e012c46263157fe38d
Signed-off-by: Jan Medved <jmedved@cisco.com>

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13 b/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13
deleted file mode 120000 (symlink)
index a5d7cff553636ccdc157843b22ecba9462d52d0b..0000000000000000000000000000000000000000
--- a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13
+++ /dev/null
@@ -1 +0,0 @@
-_OVS-dump-flows.sh
\ No newline at end of file

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13 b/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13
new file mode 100755 (executable)
index 0000000000000000000000000000000000000000..9ee20a5046e92aa416d6294ae3cae9b88226bb1e
--- /dev/null
+++ b/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# author__ = "Michal Rehak"
+# copyright__ = "Copyright(c) 2014, Cisco Systems, Inc."
+# license__ = "New-style BSD"
+# email__ = "jmedved@cisco.com"
+
+if [ -z "$1" ]; then
+    echo "usage:: $0 <switch name, e.g.: s1>"
+    exit 1
+fi
+
+key="${0##*.}"
+#echo "${key}"
+
+sudo ovs-ofctl -O OpenFlow${key} dump-flows $1

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-totals.sh b/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-totals.sh
deleted file mode 100755 (executable)
index 73594b6..0000000
--- a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-totals.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-ECHO=`which echo`
-
-TOTAL=0
-
-i=1
-
-while true;
-do
-    CUR=$((`./OVS-dump-flows.sh.13 s$i 2> /dev/null |wc -l` - 1))
-
-    if [ "$CUR" == "-1" ];
-    then 
-       break
-    else
-        printf "Switch s%d: %d flows\n" $i $CUR
-        TOTAL=$(($TOTAL + $CUR))
-        i=$(($i + 1))
-    fi
-done
-
-printf "\nTotal: %d\n\n" $TOTAL
\ No newline at end of file