nfvbenchvm: fix image URL in build log
[nfvbench.git] / nfvbench / summarizer.py
index 326de10..7c69f52 100644 (file)
@@ -219,35 +219,6 @@ class Summarizer(object):
 class NFVBenchSummarizer(Summarizer):
     """Summarize nfvbench json result."""
 
-    ndr_pdr_header = [
-        ('-', Formatter.fixed),
-        ('L2 Frame Size', Formatter.standard),
-        ('Rate (fwd+rev)', Formatter.bits),
-        ('Rate (fwd+rev)', Formatter.suffix(' pps')),
-        ('Avg Drop Rate', Formatter.suffix('%')),
-        ('Avg Latency (usec)', Formatter.standard),
-        ('Min Latency (usec)', Formatter.standard),
-        ('Max Latency (usec)', Formatter.standard)
-    ]
-
-    single_run_header = [
-        ('L2 Frame Size', Formatter.standard),
-        ('Drop Rate', Formatter.suffix('%')),
-        ('Avg Latency (usec)', Formatter.standard),
-        ('Min Latency (usec)', Formatter.standard),
-        ('Max Latency (usec)', Formatter.standard)
-    ]
-
-    config_header = [
-        ('Direction', Formatter.standard),
-        ('Requested TX Rate (bps)', Formatter.bits),
-        ('Actual TX Rate (bps)', Formatter.bits),
-        ('RX Rate (bps)', Formatter.bits),
-        ('Requested TX Rate (pps)', Formatter.suffix(' pps')),
-        ('Actual TX Rate (pps)', Formatter.suffix(' pps')),
-        ('RX Rate (pps)', Formatter.suffix(' pps'))
-    ]
-
     direction_keys = ['direction-forward', 'direction-reverse', 'direction-total']
     direction_names = ['Forward', 'Reverse', 'Total']
 
@@ -260,11 +231,46 @@ class NFVBenchSummarizer(Summarizer):
         self.record_data = None
         self.sender = sender
 
+        self.ndr_pdr_header = [
+            ('-', Formatter.fixed),
+            ('L2 Frame Size', Formatter.standard),
+            ('Rate (fwd+rev)', Formatter.bits),
+            ('Rate (fwd+rev)', Formatter.suffix(' pps')),
+            ('Avg Drop Rate', Formatter.suffix('%')),
+            ('Avg Latency (usec)', Formatter.standard),
+            ('Min Latency (usec)', Formatter.standard),
+            ('Max Latency (usec)', Formatter.standard)
+        ]
+
+        self.single_run_header = [
+            ('L2 Frame Size', Formatter.standard),
+            ('Drop Rate', Formatter.suffix('%')),
+            ('Avg Latency (usec)', Formatter.standard),
+            ('Min Latency (usec)', Formatter.standard),
+            ('Max Latency (usec)', Formatter.standard)
+        ]
+
+        self.config_header = [
+            ('Direction', Formatter.standard),
+            ('Requested TX Rate (bps)', Formatter.bits),
+            ('Actual TX Rate (bps)', Formatter.bits),
+            ('RX Rate (bps)', Formatter.bits),
+            ('Requested TX Rate (pps)', Formatter.suffix(' pps')),
+            ('Actual TX Rate (pps)', Formatter.suffix(' pps')),
+            ('RX Rate (pps)', Formatter.suffix(' pps'))
+        ]
+
         # 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 self.config.periodic_gratuitous_arp:
+            self.direction_keys.insert(2, 'garp-direction-total')
+            self.direction_names.insert(2, 'Gratuitous ARP')
+
         # if sender is available initialize record
         if self.sender:
             self.__record_init()
@@ -421,6 +427,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 +463,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 +487,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'],
@@ -496,9 +509,15 @@ class NFVBenchSummarizer(Summarizer):
             data['lat_percentile'] = {}
         for percentile in self.config.lat_percentiles:
             if add_key:
-                data['lat_percentile_' + str(percentile)] = lat_percentile[percentile]
+                try:
+                    data['lat_percentile_' + str(percentile)] = lat_percentile[percentile]
+                except TypeError:
+                    data['lat_percentile_' + str(percentile)] = "n/a"
             else:
-                data.append(lat_percentile[percentile])
+                try:
+                    data.append(lat_percentile[percentile])
+                except TypeError:
+                    data.append("n/a")
 
     def __get_config_table(self, run_config, frame_size):
         config_table = Table(self.config_header)
@@ -550,29 +569,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:
-                header.append((lat_map[key], Formatter.standard))
+            for lat_value in lat_map.values():
+                # 'append' expects a single parameter => double parentheses
+                header.append((lat_value, 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 _ in self.config.lat_percentiles:
+                                row.append('n/a')
             table.add_row(row)
         return table
 
@@ -606,9 +633,9 @@ class NFVBenchSummarizer(Summarizer):
                     run_specific_data['pdr'] = data['pdr']
                     run_specific_data['pdr']['drop_limit'] = self.config['measurement']['PDR']
                     del data['pdr']
-                for key in run_specific_data:
+                for data_value in run_specific_data.values():
                     data_to_send = data.copy()
-                    data_to_send.update(run_specific_data[key])
+                    data_to_send.update(data_value)
                     self.sender.record_send(data_to_send)
             self.__record_init()