From: Christopher O'Shea <christopher.o.shea@ericsson.com>
Date: Fri, 5 Dec 2014 02:51:47 +0000 (+0000)
Subject: Merge "Added proper OVS-dump-flows.sh.13 Removed get-totals.sh"
X-Git-Tag: release/lithium~373
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4a0254b1cdd3435616453dfe12fb5af5b44a13c5;hp=4e7a2b6a3675b79d53a499d4835c2e8c0f72270f;p=integration.git

Merge "Added proper OVS-dump-flows.sh.13 Removed get-totals.sh"
---

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
index a5d7cff5..00000000
--- 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
index 00000000..9ee20a50
--- /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
index 73594b60..00000000
--- 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