commit fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa
author Girish Gowdra <girish@opennetworking.org> Mon Nov 30 13:06:35 2020 -0800
committer Girish Gowdra <girish@opennetworking.org> Wed Dec 09 10:59:20 2020 -0800
tree edfdacc00af095c4cca1b01f3129d7b52b0c9537
parent dc83ba7429a17b00a8683ae89d83c22348256fae

Bump version to 3.2.0
Update README.md for voltha-2.6 release
Update BUILDING.md file for using BAL3.4.9.6 package
Update debian package files to build for BAL 3.4.9.6
Fix issue in dev_mgmt_daemon service script

Change-Id: I0853bef9f30f67b8db0868f6dbb92c8248ce0130

agent/src/stats_collection.cc

diff --git a/agent/src/stats_collection.cc b/agent/src/stats_collection.cc
index 11766c7..99747f4 100644
--- a/agent/src/stats_collection.cc
+++ b/agent/src/stats_collection.cc
@@ -103,6 +103,7 @@
     bcmos_errno err;
     bcmolt_stat_flags clear_on_read = BCMOLT_STAT_FLAGS_NONE;
     bcmolt_nni_interface_stats nni_stats;
+    bcmolt_onu_itu_pon_stats pon_stats;
     bcmolt_pon_interface_itu_pon_stats itu_pon_stats;
     bcmolt_internal_nni_enet_stats enet_stat;
 
@@ -192,6 +193,27 @@
                 OPENOLT_LOG(ERROR, openolt_log_id,  "Failed to retrieve port statistics, intf_id %d, intf_type %d, err = %s\n",
                     (int)intf_ref.intf_id, (int)intf_ref.intf_type, bcmos_strerror(err));
             }
+#if 1 // Shall be fixed as part of VOL-3691. When fixed, the #else code block should be enabled.
+            {
+                bcmolt_onu_key key;
+                key.pon_ni = (bcmolt_interface)intf_ref.intf_id;
+                BCMOLT_STAT_INIT(&pon_stats, onu, itu_pon_stats, key);
+                BCMOLT_MSG_FIELD_GET(&pon_stats, rx_bytes);
+                BCMOLT_MSG_FIELD_GET(&pon_stats, rx_packets);
+                BCMOLT_MSG_FIELD_GET(&pon_stats, tx_bytes);
+
+                /* call API */
+                err = bcmolt_stat_get((bcmolt_oltid)device_id, &pon_stats.hdr, clear_on_read);
+                if (err == BCM_ERR_OK) {
+                    port_stats->set_rx_bytes(pon_stats.data.rx_bytes);
+                    port_stats->set_rx_packets(pon_stats.data.rx_packets);
+                    port_stats->set_tx_bytes(pon_stats.data.tx_bytes);
+                } else {
+                    OPENOLT_LOG(ERROR, openolt_log_id,  "Failed to retrieve port statistics, intf_id %d, intf_type %d, err = %s\n",
+                        (int)intf_ref.intf_id, (int)intf_ref.intf_type, bcmos_strerror(err));
+                }
+            }
+#else
 
             {
                 bcmolt_internal_nni_key key = {};
@@ -255,6 +277,7 @@
                         (int)intf_ref.intf_id, (int)intf_ref.intf_type, bcmos_strerror(err));
                 }
             }
+#endif
             break;
         }
     }