Adding counter type in response VOL-4272
Change-Id: Iebf2b5e4d7e511e5fec86ccf5e817d616e24f9e5
diff --git a/internal/pkg/pmmgr/onu_metrics_manager.go b/internal/pkg/pmmgr/onu_metrics_manager.go
index d3eaf0b..95fcd60 100755
--- a/internal/pkg/pmmgr/onu_metrics_manager.go
+++ b/internal/pkg/pmmgr/onu_metrics_manager.go
@@ -3164,6 +3164,10 @@
// Collect metrics for upstream for all the PM Mes per uni port and aggregate
var pmUpstream extension.OmciEthernetFrameExtendedPm
var pmDownstream extension.OmciEthernetFrameExtendedPm
+ counterFormat := extension.GetOmciEthernetFrameExtendedPmResponse_SIXTY_FOUR_BIT
+ if mm.supportedEthernetFrameExtendedPMClass == me.EthernetFrameExtendedPmClassID {
+ counterFormat = extension.GetOmciEthernetFrameExtendedPmResponse_THIRTY_TWO_BIT
+ }
for entityID, meEnt := range mm.ethernetFrameExtendedPmUpStreamMEByEntityID {
var receivedMask uint16
if metricInfo, errResp := mm.collectEthernetFrameExtendedPMData(ctx, meEnt, entityID, true, &receivedMask); metricInfo != nil { // upstream
@@ -3176,8 +3180,9 @@
Status: extension.GetValueResponse_OK,
Response: &extension.GetValueResponse_OnuCounters{
OnuCounters: &extension.GetOmciEthernetFrameExtendedPmResponse{
- Upstream: &pmUpstream,
- Downstream: &pmDownstream,
+ Upstream: &pmUpstream,
+ Downstream: &pmDownstream,
+ OmciEthernetFrameExtendedPmFormat: counterFormat,
},
},
},
@@ -3205,8 +3210,9 @@
Status: extension.GetValueResponse_OK,
Response: &extension.GetValueResponse_OnuCounters{
OnuCounters: &extension.GetOmciEthernetFrameExtendedPmResponse{
- Upstream: &pmUpstream,
- Downstream: &pmDownstream,
+ Upstream: &pmUpstream,
+ Downstream: &pmDownstream,
+ OmciEthernetFrameExtendedPmFormat: counterFormat,
},
},
},