diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-08-25 10:48:30 -0700 |
|---|---|---|
| committer | Ross Brattain <ross.b.brattain@intel.com> | 2017-08-25 11:07:05 -0700 |
| commit | 15f6586bf0d2ed6b3f03dc3574a4dff5d9a3c64e (patch) | |
| tree | e57a9bf88d38d92b2fcf9f0ff7167edb26a541c4 | |
| parent | b49d8593d8ebe22aa7f3c9580f6934a92a6fdddd (diff) | |
Trex: fix KPI collection
return super result
Change-Id: I723a37281da15c1887ae1b3cf91d7e957b1924d1
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_trex.py b/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_trex.py index 3dcb02f02..ad8c6494e 100644 --- a/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_trex.py +++ b/tests/unit/network_services/vnf_generic/vnf/test_tg_rfc2544_trex.py @@ -233,7 +233,7 @@ class TestTrexTrafficGenRFC(unittest.TestCase): def test_collect_kpi(self, ssh): mock_ssh(ssh) trex_traffic_gen = TrexTrafficGenRFC('vnf1', self.VNFD_0) - self.assertIsNone(trex_traffic_gen.collect_kpi()) + self.assertEqual(trex_traffic_gen.collect_kpi(), {}) @mock.patch(SSH_HELPER) def test_listen_traffic(self, ssh): diff --git a/yardstick/benchmark/scenarios/networking/vnf_generic.py b/yardstick/benchmark/scenarios/networking/vnf_generic.py index aecc228bc..4510bcfba 100644 --- a/yardstick/benchmark/scenarios/networking/vnf_generic.py +++ b/yardstick/benchmark/scenarios/networking/vnf_generic.py @@ -523,7 +523,7 @@ printf "%s/driver:" $1 ; basename $(readlink -s $1/device/driver); } \ for vnf in self.vnfs: # Result example: # {"VNF1: { "tput" : [1000, 999] }, "VNF2": { "latency": 100 }} - LOG.debug("vnf") + LOG.debug("collect KPI for %s", vnf.name) result.update(self.collector.get_kpi(vnf)) def teardown(self): diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py index d94a9a6e6..15c9c0e1d 100644 --- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py +++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_trex.py @@ -98,7 +98,7 @@ class TrexRfcResourceHelper(TrexResourceHelper): def collect_kpi(self): self.rfc2544_helper.iteration.value += 1 - super(TrexRfcResourceHelper, self).collect_kpi() + return super(TrexRfcResourceHelper, self).collect_kpi() class TrexTrafficGenRFC(TrexTrafficGen): |