From 1ff8957d70a95919c2a1b130c21124afbc075bb2 Mon Sep 17 00:00:00 2001
From: Yuichi Ito <ito.yuichi0@gmail.com>
Date: Fri, 28 Mar 2014 13:25:09 +0900
Subject: sw test tool: Enable throughput analysis

Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com>
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 ryu/tests/switch/tester.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ryu/tests/switch/tester.py b/ryu/tests/switch/tester.py
index 8b330584..0e172a40 100644
--- a/ryu/tests/switch/tester.py
+++ b/ryu/tests/switch/tester.py
@@ -402,6 +402,7 @@ class OfTester(app_manager.RyuApp):
                                    self.tester_sw, flow)
                         self._test(STATE_THROUGHPUT_FLOW_EXIST_CHK,
                                    self.tester_sw, flow)
+                    start = self._test(STATE_GET_THROUGHPUT)
                 elif KEY_TBL_MISS in pkt:
                     before_stats = self._test(STATE_GET_MATCH_COUNT)
 
@@ -423,6 +424,10 @@ class OfTester(app_manager.RyuApp):
                                      else KEY_PKT_IN)
                         self._test(STATE_NO_PKTIN_REASON, test_type,
                                    target_pkt_count, tester_pkt_count)
+                elif KEY_THROUGHPUT in pkt:
+                    end = self._test(STATE_GET_THROUGHPUT)
+                    self._test(STATE_THROUGHPUT_CHK, pkt[KEY_THROUGHPUT],
+                               start, end)
                 elif KEY_TBL_MISS in pkt:
                     self._test(STATE_SEND_BARRIER)
                     hub.sleep(INTERVAL)
-- 
cgit v1.2.3