Use ConfigurationInd element in PPTP ME instead of SensedType to
fetch the detected port speed information.
Change-Id: I62fda2c2c0a618a58baaaeab02c3766955078659
diff --git a/PM_Notes.md b/PM_Notes.md
index f8674cb..8851c50 100644
--- a/PM_Notes.md
+++ b/PM_Notes.md
@@ -41,7 +41,7 @@
"uni_port_no": voltha.PmConfig_CONTEXT,
"me_class_id": voltha.PmConfig_CONTEXT,
"entity_id": voltha.PmConfig_CONTEXT,
- "sensed_type": voltha.PmConfig_GAUGE,
+ "configuration_ind": voltha.PmConfig_GAUGE,
"oper_status": voltha.PmConfig_GAUGE,
"uni_admin_state": voltha.PmConfig_GAUGE,
}
@@ -49,7 +49,7 @@
Note:
1. UniStatusMetrics comprise metrics for either PPTP or VEIP ME's and the UNI-G ME.
2. me_class_id defines the corresponding metric type with the ME class value as defined in G988, Table 12.2.4-1
-3. `sensed_type` is relevant only for PPTP ME (meaning me_class_id = 11) and per G.988 specification, "When a circuit pack is present, this attribute represents its type as one of the values from Table 9.1.5-1."
+3. `configuration_ind` is relevant only for PPTP ME (meaning me_class_id = 11) and per G.988 specification, "When a circuit pack is present, this attribute represents its type as one of the values from Table 9.1.5-1."
4. Valid values for `oper_state` are 0 (enabled) and 1 (disabled)
5. Valid values for `uni_admin_state` are 0 (unlocks) and 1 (locks)
6. `oper_state` and `uni_admin_state` are relevant for both PPTP (me_class_id = 11) and VEIP ME (me_class_id = 329), however only `uni_admin_state` is relevant for UNI-G ME (me_class_id = 264).
diff --git a/VERSION b/VERSION
index a8cbc32..673c471 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.2-dev214
+1.3.2-dev215
diff --git a/internal/pkg/onuadaptercore/onu_metrics_manager.go b/internal/pkg/onuadaptercore/onu_metrics_manager.go
index d122951..ed1e869 100644
--- a/internal/pkg/onuadaptercore/onu_metrics_manager.go
+++ b/internal/pkg/onuadaptercore/onu_metrics_manager.go
@@ -103,12 +103,12 @@
// 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,
- "sensed_type": voltha.PmConfig_GAUGE,
- "oper_status": voltha.PmConfig_GAUGE,
- "uni_admin_state": voltha.PmConfig_GAUGE,
+ "uni_port_no": voltha.PmConfig_CONTEXT,
+ "me_class_id": voltha.PmConfig_CONTEXT,
+ "entity_id": voltha.PmConfig_CONTEXT,
+ "configuration_ind": voltha.PmConfig_GAUGE,
+ "oper_status": voltha.PmConfig_GAUGE,
+ "uni_admin_state": voltha.PmConfig_GAUGE,
}
// UniStatusGroupMetrics specific constants
@@ -878,7 +878,7 @@
var meAttributes me.AttributeValueMap
pptpMetrics := make(map[string]float32)
- requestedAttributes := me.AttributeValueMap{"SensedType": 0, "OperationalState": 0, "AdministrativeState": 0}
+ requestedAttributes := me.AttributeValueMap{"ConfigurationInd": 0, "OperationalState": 0, "AdministrativeState": 0}
meInstance, err := mm.pDeviceHandler.pOnuOmciDevice.PDevOmciCC.sendGetMe(ctx, me.PhysicalPathTerminationPointEthernetUniClassID, pptpInstID, requestedAttributes, mm.pDeviceHandler.pOpenOnuAc.omciTimeout, true, mm.pAdaptFsm.commChan)
if err != nil {
logger.Errorw(ctx, "GetMe failed, failure PM FSM!", log.Fields{"device-id": mm.pAdaptFsm.deviceID})
@@ -899,8 +899,8 @@
// Populate metric only if it was enabled.
for k := range UniStatusGroupMetrics {
switch k {
- case "sensed_type":
- if val, ok := meAttributes["SensedType"]; ok && val != nil {
+ case "configuration_ind":
+ if val, ok := meAttributes["ConfigurationInd"]; ok && val != nil {
pptpMetrics[k] = float32(val.(byte))
}
case "oper_status":