NFVBENCH-193: Correct a critical bug introduced in commit NFVBENCH-192

[nfvbench.git] / nfvbench / summarizer.py

diff --git a/nfvbench/summarizer.py b/nfvbench/summarizer.py
index 326de10..0759933 100644 (file)
--- a/nfvbench/summarizer.py
+++ b/nfvbench/summarizer.py
@@ -263,6 +263,7 @@ class NFVBenchSummarizer(Summarizer):
         # add percentiles headers if hdrh enabled
         if not self.config.disable_hdrh:
             for percentile in self.config.lat_percentiles:
+                # 'append' expects a single parameter => double parentheses
                 self.ndr_pdr_header.append((str(percentile) + ' %ile lat.', Formatter.standard))
                 self.single_run_header.append((str(percentile) + ' %ile lat.', Formatter.standard))
         # if sender is available initialize record
@@ -421,6 +422,8 @@ class NFVBenchSummarizer(Summarizer):
                     'rate_bps': analysis['ndr']['rate_bps'],
                     'rate_pps': analysis['ndr']['rate_pps'],
                     'offered_tx_rate_bps': analysis['ndr']['stats']['offered_tx_rate_bps'],
+                    'theoretical_tx_rate_pps': analysis['ndr']['stats']['theoretical_tx_rate_pps'],
+                    'theoretical_tx_rate_bps': analysis['ndr']['stats']['theoretical_tx_rate_bps'],
                     'drop_percentage': analysis['ndr']['stats']['overall']['drop_percentage'],
                     'avg_delay_usec': analysis['ndr']['stats']['overall']['avg_delay_usec'],
                     'min_delay_usec': analysis['ndr']['stats']['overall']['min_delay_usec'],
@@ -455,6 +458,8 @@ class NFVBenchSummarizer(Summarizer):
                     'rate_bps': analysis['pdr']['rate_bps'],
                     'rate_pps': analysis['pdr']['rate_pps'],
                     'offered_tx_rate_bps': analysis['pdr']['stats']['offered_tx_rate_bps'],
+                    'theoretical_tx_rate_pps': analysis['pdr']['stats']['theoretical_tx_rate_pps'],
+                    'theoretical_tx_rate_bps': analysis['pdr']['stats']['theoretical_tx_rate_bps'],
                     'drop_percentage': analysis['pdr']['stats']['overall']['drop_percentage'],
                     'avg_delay_usec': analysis['pdr']['stats']['overall']['avg_delay_usec'],
                     'min_delay_usec': analysis['pdr']['stats']['overall']['min_delay_usec'],
@@ -477,9 +482,12 @@ class NFVBenchSummarizer(Summarizer):
                     self.extract_hdrh_percentiles(
                         analysis['stats']['overall']['rx']['lat_percentile'], row_data)
                 summary_table.add_row(row_data)
+
                 single_run_data = {
                     'type': 'single_run',
                     'offered_tx_rate_bps': analysis['stats']['offered_tx_rate_bps'],
+                    'theoretical_tx_rate_pps': analysis['stats']['theoretical_tx_rate_pps'],
+                    'theoretical_tx_rate_bps': analysis['stats']['theoretical_tx_rate_bps'],
                     'drop_rate_percent': analysis['stats']['overall']['drop_rate_percent'],
                     'avg_delay_usec': analysis['stats']['overall']['rx']['avg_delay_usec'],
                     'min_delay_usec': analysis['stats']['overall']['rx']['min_delay_usec'],
@@ -550,29 +558,37 @@ class NFVBenchSummarizer(Summarizer):
                    'lat_min_usec': 'Min lat.',
                    'lat_max_usec': 'Max lat.'}
         if 'lat_avg_usec' in chains['0']:
-            lat_keys = ['lat_avg_usec', 'lat_min_usec', 'lat_max_usec', 'lat_percentile']
+            lat_keys = ['lat_avg_usec', 'lat_min_usec', 'lat_max_usec']
 
             if not self.config.disable_hdrh:
+                lat_keys.append('lat_percentile')
                 for percentile in self.config.lat_percentiles:
-                    lat_map['lat_' + str(percentile) + '_percentile'] = str(
-                        percentile) + ' %ile lat.'
+                    lat_map['lat_' + str(percentile) + '_percentile'] = \
+                        str(percentile) + ' %ile lat.'
 
             for key in lat_map:
+                # 'append' expects a single parameter => double parentheses
                 header.append((lat_map[key], Formatter.standard))
 
         table = Table(header)
         for chain in sorted(list(chains.keys()), key=str):
             row = [chain] + chains[chain]['packets']
             for lat_key in lat_keys:
-                if chains[chain].get(lat_key, None):
-                    if lat_key == 'lat_percentile':
-                        if not self.config.disable_hdrh:
-                            for percentile in chains[chain][lat_key]:
-                                row.append(Formatter.standard(chains[chain][lat_key][percentile]))
-                    else:
+
+                if lat_key != 'lat_percentile':
+                    if chains[chain].get(lat_key, None):
                         row.append(Formatter.standard(chains[chain][lat_key]))
+                    else:
+                        row.append('n/a')
                 else:
-                    row.append('--')
+                    if not self.config.disable_hdrh:
+                        if chains[chain].get(lat_key, None):
+                            for percentile in chains[chain][lat_key]:
+                                row.append(Formatter.standard(
+                                    chains[chain][lat_key][percentile]))
+                        else:
+                            for percentile in self.config.lat_percentiles:
+                                row.append('n/a')
             table.add_row(row)
         return table