X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nfvbench%2Fpacket_stats.py;h=63b1f11574a58c23f790e7493f70884ea57e822c;hb=95f2491ed89ac99b0d8bd006b4a13cbeb1eb96ce;hp=4b9eac549d96ddcc371d9f0765b8534810cb1002;hpb=ed1df5da8e6468ec7a0e25a853fe803bfc0af3f6;p=nfvbench.git diff --git a/nfvbench/packet_stats.py b/nfvbench/packet_stats.py index 4b9eac5..63b1f11 100644 --- a/nfvbench/packet_stats.py +++ b/nfvbench/packet_stats.py @@ -21,7 +21,7 @@ PacketPathStatsManager manages all packet path stats for all chains. import copy -from traffic_gen.traffic_base import Latency +from .traffic_gen.traffic_base import Latency class InterfaceStats(object): """A class to hold the RX and TX counters for a virtual or physical interface. @@ -237,6 +237,8 @@ class PacketPathStats(object): results = {'lat_min_usec': latency.min_usec, 'lat_max_usec': latency.max_usec, 'lat_avg_usec': latency.avg_usec} + if latency.hdrh: + results['hdrh'] = latency.hdrh else: results = {} results['packets'] = counters @@ -290,7 +292,7 @@ class PacketPathStatsManager(object): chains['total'] = agg_pps.get_stats(reverse) for index, pps in enumerate(self.pps_list): - chains[index] = pps.get_stats(reverse) + chains[str(index)] = pps.get_stats(reverse) return {'interfaces': self._get_if_agg_name(reverse), 'chains': chains} @@ -305,11 +307,11 @@ class PacketPathStatsManager(object): 'Forward': { 'interfaces': ['Port0', 'vhost0', 'Port1'], 'chains': { - 0: {'packets': [2000054, 1999996, 1999996], + '0': {'packets': [2000054, 1999996, 1999996], 'min_usec': 10, 'max_usec': 187, 'avg_usec': 45}, - 1: {...}, + '1': {...}, 'total': {...} } },