From: Jing Zhang <jing.c.zhang@nokia.com>
Date: Thu, 30 Mar 2017 13:26:55 +0000 (-0400)
Subject: Store packetsize in influxdb
X-Git-Tag: danube.2.RC1~3
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F34241%2F1;p=yardstick.git

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)
---

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']