- Fix PM_Notes.md
- include ME Class ID info as part for UniStatus group metric
Change-Id: I42ddd9df833c802601c1cba7970fe60d2396a680
diff --git a/internal/pkg/onuadaptercore/onu_metrics_manager.go b/internal/pkg/onuadaptercore/onu_metrics_manager.go
index d94e102..984f8ab 100644
--- a/internal/pkg/onuadaptercore/onu_metrics_manager.go
+++ b/internal/pkg/onuadaptercore/onu_metrics_manager.go
@@ -82,8 +82,9 @@
// UniStatusGroupMetrics are supported UNI status names
var UniStatusGroupMetrics = map[string]voltha.PmConfig_PmType{
"uni_port_no": voltha.PmConfig_CONTEXT,
+ "me_class_id": voltha.PmConfig_CONTEXT,
"entity_id": voltha.PmConfig_CONTEXT,
- "ethernet_type": voltha.PmConfig_GAUGE,
+ "sensed_type": voltha.PmConfig_GAUGE,
"oper_status": voltha.PmConfig_GAUGE,
"uni_admin_state": voltha.PmConfig_GAUGE,
}
@@ -764,9 +765,11 @@
for _, uni := range mm.pDeviceHandler.uniEntityMap {
if uni.entityID == entityID {
unigMetrics["uni_port_no"] = float32(uni.portNo)
+ break
}
}
}
+ unigMetrics["me_class_id"] = float32(me.UniGClassID)
// create slice of metrics given that there could be more than one UNI-G instance
metricInfo := voltha.MetricInformation{Metadata: &mmd, Metrics: unigMetrics}
@@ -798,7 +801,7 @@
// Populate metric only if it was enabled.
for k := range UniStatusGroupMetrics {
switch k {
- case "ethernet_type":
+ case "sensed_type":
if val, ok := meAttributes["SensedType"]; ok && val != nil {
pptpMetrics[k] = float32(val.(byte))
}
@@ -822,9 +825,11 @@
for _, uni := range mm.pDeviceHandler.uniEntityMap {
if uni.entityID == entityID {
pptpMetrics["uni_port_no"] = float32(uni.portNo)
+ break
}
}
}
+ pptpMetrics["me_class_id"] = float32(me.PhysicalPathTerminationPointEthernetUniClassID)
// create slice of metrics given that there could be more than one PPTP instance and
metricInfo := voltha.MetricInformation{Metadata: &mmd, Metrics: pptpMetrics}
@@ -876,9 +881,11 @@
for _, uni := range mm.pDeviceHandler.uniEntityMap {
if uni.entityID == entityID {
veipMetrics["uni_port_no"] = float32(uni.portNo)
+ break
}
}
}
+ veipMetrics["me_class_id"] = float32(me.VirtualEthernetInterfacePointClassID)
// create slice of metrics given that there could be more than one VEIP instance
metricInfo := voltha.MetricInformation{Metadata: &mmd, Metrics: veipMetrics}