summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJing Zhang <jing.c.zhang@nokia.com>2017-03-30 09:26:55 -0400
committerJing Lu <lvjing5@huawei.com>2017-05-04 12:38:04 +0000
commit478a499e8cb048abf434559c8d47259ec238ed24 (patch)
treeb595dc08ada913cb4053c7cdcf61f7cdbd0e1de8
parentf4f7104e942988e6cf294c3ad80d1a96dc051aaa (diff)
Store packetsize in influxdb
This allows calculating throughput in Gbps. Add: test_pktgen.py Change-Id: I7e2132ec71985c14570ef18b952b2264ebf7abbc JIRA: YARKSTICK-611 Signed-off-by: Jing Zhang <jing.c.zhang@nokia.com> (cherry picked from commit 639450d91ab409f70b6f119291197da40b1d5f0b)
-rw-r--r--tests/unit/benchmark/scenarios/networking/test_pktgen.py6
-rw-r--r--yardstick/benchmark/scenarios/networking/pktgen.py1
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/unit/benchmark/scenarios/networking/test_pktgen.py b/tests/unit/benchmark/scenarios/networking/test_pktgen.py
index f50fa108c..989c5b712 100644
--- a/tests/unit/benchmark/scenarios/networking/test_pktgen.py
+++ b/tests/unit/benchmark/scenarios/networking/test_pktgen.py
@@ -132,7 +132,7 @@ class PktgenTestCase(unittest.TestCase):
p._iptables_get_result = mock_iptables_result
sample_output = '{"packets_per_second": 9753, "errors": 0, \
- "packets_sent": 149776, "flows": 110}'
+ "packets_sent": 149776, "packetsize": 60, "flows": 110}'
mock_ssh.SSH().execute.return_value = (0, sample_output, '')
p.run(result)
@@ -158,7 +158,7 @@ class PktgenTestCase(unittest.TestCase):
p._iptables_get_result = mock_iptables_result
sample_output = '{"packets_per_second": 9753, "errors": 0, \
- "packets_sent": 149776, "flows": 110}'
+ "packets_sent": 149776, "packetsize": 60, "flows": 110}'
mock_ssh.SSH().execute.return_value = (0, sample_output, '')
p.run(result)
@@ -184,7 +184,7 @@ class PktgenTestCase(unittest.TestCase):
p._iptables_get_result = mock_iptables_result
sample_output = '{"packets_per_second": 9753, "errors": 0, \
- "packets_sent": 149776, "flows": 110}'
+ "packets_sent": 149776, "packetsize": 60, "flows": 110}'
mock_ssh.SSH().execute.return_value = (0, sample_output, '')
self.assertRaises(AssertionError, p.run, result)
diff --git a/yardstick/benchmark/scenarios/networking/pktgen.py b/yardstick/benchmark/scenarios/networking/pktgen.py
index b61337a70..9a8725cfd 100644
--- a/yardstick/benchmark/scenarios/networking/pktgen.py
+++ b/yardstick/benchmark/scenarios/networking/pktgen.py
@@ -137,6 +137,7 @@ class Pktgen(base.Scenario):
result.update(jsonutils.loads(stdout))
result['packets_received'] = self._iptables_get_result()
+ result['packetsize'] = packetsize
if "sla" in self.scenario_cfg:
sent = result['packets_sent']