diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2017-09-20 15:17:41 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-20 15:17:41 +0000 |
commit | d886bf33fc0880abe2b3d1203cf2eba486f23b43 (patch) | |
tree | cafcc9b73e4c189ab34050269f79d1f110c3a112 /yardstick | |
parent | 05f2d66b34290fd2538f5c50e841db0b86616e77 (diff) | |
parent | 02b047ef1496ea23fdb1a8ce15cf4b98f5e5a3a1 (diff) |
Merge "prox: fix TG KPIs"
Diffstat (limited to 'yardstick')
-rw-r--r-- | yardstick/network_services/vnf_generic/vnf/prox_helpers.py | 12 | ||||
-rw-r--r-- | yardstick/network_services/vnf_generic/vnf/prox_vnf.py | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py index 6b581b6b3..d24710132 100644 --- a/yardstick/network_services/vnf_generic/vnf/prox_helpers.py +++ b/yardstick/network_services/vnf_generic/vnf/prox_helpers.py @@ -907,10 +907,18 @@ class ProxResourceHelper(ClientResourceHelper): LOG.debug("tg_prox done") self._terminated.value = 1 - # use ResourceHelper method to collect KPIs directly. - def collect_kpi(self): + # For VNF use ResourceHelper method to collect KPIs directly. + # for TG leave the superclass ClientResourceHelper collect_kpi_method intact + def collect_collectd_kpi(self): return self._collect_resource_kpi() + def collect_kpi(self): + result = super(ProxResourceHelper, self).collect_kpi() + # add in collectd kpis manually + if result: + result['collect_stats'] = self._collect_resource_kpi() + return result + def terminate(self): # should not be called, use VNF terminate raise NotImplementedError() diff --git a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py index e87d452b4..2ac6ea412 100644 --- a/yardstick/network_services/vnf_generic/vnf/prox_vnf.py +++ b/yardstick/network_services/vnf_generic/vnf/prox_vnf.py @@ -82,7 +82,9 @@ class ProxApproxVnf(SampleVNF): "packets_in": tx_total, "packets_dropped": (tx_total - rx_total), "packets_fwd": rx_total, - "collect_stats": self.resource_helper.collect_kpi(), + # we share ProxResourceHelper with TG, but we want to collect + # collectd KPIs here and not TG KPIs, so use a different method name + "collect_stats": self.resource_helper.collect_collectd_kpi(), } LOG.debug("%s collect KPIs %s", self.APP_NAME, result) return result |