add r_squared prediction confidence to predicted-flr column

Author: apoorv-arista

utilities_common/netstat.py

@@ -153,6 +153,19 @@ def format_fec_flr(rate):
         return "{:.2e}".format(float(rate))
 
 
+def format_fec_flr_predicted(flr, r_squared):
+    """
+    Show the predicted flr rate with R-squared confidence.
+    """
+    if flr == STATUS_NA:
+        return STATUS_NA
+    elif flr == 0:
+        return "0"
+    else:
+        r_squared_pct = r_squared * 100
+        return "{:.2e} ({:.0f}%)".format(float(flr), r_squared_pct)
+
+
 def format_util(brate, port_rate):
     """
         Calculate the util.

utilities_common/portstat.py

@@ -12,7 +12,7 @@
 import utilities_common.multi_asic as multi_asic_util
 from utilities_common.netstat import ns_diff, table_as_json, format_brate, format_prate, \
                                      format_util, format_number_with_comma, format_util_directly, \
-                                     format_fec_ber, format_fec_flr
+                                     format_fec_ber, format_fec_flr, format_fec_flr_predicted
 
 """
 The order and count of statistics mentioned below needs to be in sync with the values in portstat script
@@ -38,16 +38,16 @@
               'TX_OK', 'TX_BPS', 'TX_UTIL', 'TX_ERR', 'TX_DRP', 'TX_OVR']
 header_errors_only = ['IFACE', 'STATE', 'RX_ERR', 'RX_DRP', 'RX_OVR', 'TX_ERR', 'TX_DRP', 'TX_OVR']
 header_fec_only = ['IFACE', 'STATE', 'FEC_CORR', 'FEC_UNCORR', 'FEC_SYMBOL_ERR', 'FEC_PRE_BER',
-                   'FEC_POST_BER', 'FEC_PRE_BER_MAX', 'FLR(O)', 'FLR(P)']
+                   'FEC_POST_BER', 'FEC_PRE_BER_MAX', 'FLR(O)', 'FLR(P) (Accuracy)']
 header_fec_hist_only = ['IFACE', 'BIN0', 'BIN1', 'BIN2', 'BIN3', 'BIN4', 'BIN5', 'BIN6', 'BIN7',
                         'BIN8', 'BIN9', 'BIN10', 'BIN11', 'BIN12', 'BIN13', 'BIN14', 'BIN15']
 header_rates_only = ['IFACE', 'STATE', 'RX_OK', 'RX_BPS', 'RX_PPS', 'RX_UTIL', 'TX_OK', 'TX_BPS', 'TX_PPS', 'TX_UTIL']
 header_trim_only = ['IFACE', 'STATE', 'TRIM_PKTS', 'TRIM_TX_PKTS', 'TRIM_DRP_PKTS']
 
 rates_key_list = ['RX_BPS', 'RX_PPS', 'RX_UTIL', 'TX_BPS', 'TX_PPS', 'TX_UTIL', 'FEC_PRE_BER',
-                  'FEC_POST_BER', 'FEC_PRE_BER_MAX', 'FEC_FLR', 'FEC_FLR_PREDICTED']
+                  'FEC_POST_BER', 'FEC_PRE_BER_MAX', 'FEC_FLR', 'FEC_FLR_PREDICTED', 'FEC_FLR_R_SQUARED']
 ratestat_fields = ("rx_bps",  "rx_pps", "rx_util", "tx_bps", "tx_pps", "tx_util", "fec_pre_ber", "fec_post_ber",
-                   "fec_pre_ber_max", "fec_flr", "fec_flr_predicted")
+                   "fec_pre_ber_max", "fec_flr", "fec_flr_predicted", "fec_flr_r_squared")
 RateStats = namedtuple("RateStats", ratestat_fields)
 
 """
@@ -356,7 +356,7 @@ def get_rates(table_id):
             """
                 Get the rates from specific table.
             """
-            fields = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"]
+            fields = ["0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"]
             for pos, name in enumerate(rates_key_list):
                 full_table_id = RATES_TABLE_PREFIX + table_id
                 counter_data = self.db.get(self.db.COUNTERS_DB, full_table_id, name)
@@ -662,7 +662,7 @@ def cnstat_diff_print(self, cnstat_new_dict, cnstat_old_dict,
                                   format_fec_ber(rates.fec_post_ber),
                                   format_fec_ber(rates.fec_pre_ber_max),
                                   format_fec_flr(rates.fec_flr),
-                                  format_fec_flr(rates.fec_flr_predicted)))
+                                  format_fec_flr_predicted(rates.fec_flr_predicted, rates.fec_flr_r_squared)))
             elif fec_hist_only:
                 header = header_fec_hist_only