diff options
| author |   Maryam Tahhan <maryam.tahhan@intel.com> | 2016-08-08 08:15:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-08 08:15:57 +0000 |
| commit | 77de48c31767556fb9f0de76285d1beed16dd828 (patch) | |
| tree | 0047f144e62f9d31438bb6a18110c072c911b5c7 | |
| parent | 896f0fe61346916a560c01c0eae638894d653d7e (diff) | |
| parent | 76d7d9f3db6549331b1c1762d67f0e7ffb5be4fd (diff) | |
Merge "Xena: Modify aggregate_stats one port no stats when bi-direction"
| -rw-r--r-- | tools/pkt_gen/xena/XenaDriver.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tools/pkt_gen/xena/XenaDriver.py b/tools/pkt_gen/xena/XenaDriver.py index aa8443c9..d3862312 100644 --- a/tools/pkt_gen/xena/XenaDriver.py +++ b/tools/pkt_gen/xena/XenaDriver.py @@ -1001,9 +1001,21 @@ class XenaTXStats(object): mydict = statdict return mydict - def aggregate_stats(stat1, stat2): """ + Judge whether stat1 and stat2 both have same key, if both have same key, + call the aggregate fuction, else use the stat1's value + """ + newstat = dict() + for keys in stat1.keys(): + if keys in stat2 and isinstance(stat1[keys], dict): + newstat[keys] = aggregate(stat1[keys], stat2[keys]) + else: + newstat[keys] = stat1[keys] + return newstat + +def aggregate(stat1, stat2): + """ Recursive function to aggregate two sets of statistics. This is used when bi directional traffic is done and statistics need to be calculated based on two sets of statistics. @@ -1014,7 +1026,7 @@ def aggregate_stats(stat1, stat2): newstat = dict() for (keys1, keys2) in zip(stat1.keys(), stat2.keys()): if isinstance(stat1[keys1], dict): - newstat[keys1] = aggregate_stats(stat1[keys1], stat2[keys2]) + newstat[keys1] = aggregate(stat1[keys1], stat2[keys2]) else: if not isinstance(stat1[keys1], int) and not isinstance( [keys1], float): |