[status] Update onu metrics for monitoring

Author: kostorr

README.md

@@ -588,20 +588,23 @@ metric format for the CRORC and the CRU is different, as different parameters ar
 
 ###### Metric: `"onu"`
 
-| Value name         - | Value                       | Type   | 
-| ---------------------| --------------------------- | ------ | 
-| `"onuStickyStatus"`  | 0/1 (DOWN/UP)               | int    |
-| `"onuAddress"`       | ONU Address                 | int    |
-| `"rx40Locked"`       | 0/1 (False/True)            | int    |
-| `"phaseGood"`        | 0/1 (False/True)            | int    |
-| `"rxLocked"`         | 0/1 (False/True)            | int    |
-| `"operational"`      | 0/1 (False/True)            | int    |
-| `"mgtTxReady"`       | 0/1 (False/True)            | int    |
-| `"mgtRxReady"`       | 0/1 (False/True)            | int    |
-| `"mgtTxPllLocked"`   | 0/1 (False/True)            | int    |
-| `"mgtRxPllLocked"`   | 0/1 (False/True)            | int    |
-| `"ponQualityStatus"` | 0/1 (Bad/Good)              | int    |
-| `"ponRxPower"`       | dBm                         | int    |
+| Value name              | Value                          | Type   | 
+| ----------------------- | ------------------------------ | ------ | 
+| `"onuDownstreamStatus"` | 0/1 (DOWN/UP)                  | int    |
+| `"onuUpstreamStatus"`   | 0/1 (DOWN/UP)                  | int    |
+| `"onuStickyValue"`      | 8-bit                          | int    |
+| `"onuStickyVaulePrev"`  | 8-bit                          | int    |
+| `"onuAddress"`          | ONU Address                    | int    |
+| `"rx40Locked"`          | 0/1 (False/True)               | int    |
+| `"phaseGood"`           | 0/1 (False/True)               | int    |
+| `"rxLocked"`            | 0/1 (False/True)               | int    |
+| `"operational"`         | 0/1 (False/True)               | int    |
+| `"mgtTxReady"`          | 0/1 (False/True)               | int    |
+| `"mgtRxReady"`          | 0/1 (False/True)               | int    |
+| `"mgtTxPllLocked"`      | 0/1 (False/True)               | int    |
+| `"mgtRxPllLocked"`      | 0/1 (False/True)               | int    |
+| `"ponQualityStatus"`    | 0/1 (Bad/Good)                 | int    |
+| `"ponRxPower"`          | dBm                            | int    |
 
 | Tag key               | Value                 |
 | --------------------- | --------------------- |

src/CommandLineUtilities/ProgramStatus.cxx

@@ -250,28 +250,15 @@ class ProgramStatus : public Program
         uint32_t onuStickyValue = onuStatus.stickyStatus.stickyValue;
         uint32_t onuStickyValuePrev = onuStatus.stickyStatus.stickyValuePrev;
 
-        // TODO: remove when monitoring is updated
-        std::string onuStickyStatus;
-        int onuStickyStatusInt = 0;
-
-        if (onuStatus.stickyStatus.monStatus == Cru::LinkStatus::Up) {
-          onuStickyStatus = "UP";
-          onuStickyStatusInt = 1;
-        } else if (onuStatus.stickyStatus.monStatus == Cru::LinkStatus::UpWasDown) {
-          onuStickyStatus = "UP (was DOWN)";
-          // force status = 1 (vs = 2) when UP(was DOWN) for monitoring
-          onuStickyStatusInt = 1;
-        } else if (onuStatus.stickyStatus.monStatus == Cru::LinkStatus::Down) {
-          onuStickyStatus = "DOWN";
-          onuStickyStatusInt = 0;
-        }
-
         std::string ponQualityStatusStr;
         ponQualityStatusStr = onuStatus.ponQualityStatus ? "good" : "bad";
 
         if (mOptions.monitoring) {
           monitoring->send(Metric{ "onu" }
-                             .addValue(onuStickyStatusInt, "onuStickyStatus")
+                             .addValue(onuStatus.stickyStatus.upstreamStatus, "onuUpstreamStatus")
+                             .addValue(onuStatus.stickyStatus.downstreamStatus, "onuDownstreamStatus")
+                             .addValue(int(onuStatus.stickyStatus.stickyValue), "onuStickyValue")
+                             .addValue(int(onuStatus.stickyStatus.stickyValuePrev), "onuStickyVaulePrev")
                              .addValue(int(onuStatus.onuAddress), "onuAddress")
                              .addValue(onuStatus.rx40Locked, "rx40Locked")
                              .addValue(onuStatus.phaseGood, "phaseGood")

src/Cru/Common.h

@@ -118,7 +118,6 @@ struct ReportInfo {
 };
 
 struct OnuStickyStatus {
-  LinkStatus monStatus; // TODO: Remove after monitoring is updated
   LinkStatus upstreamStatus;
   LinkStatus downstreamStatus;
   uint32_t stickyValue;
@@ -135,10 +134,7 @@ struct OnuStatus {
   bool mgtRxReady;
   bool mgtTxPllLocked;
   bool mgtRxPllLocked;
-  /* NEW */
-  //LinkStatus stickyBit;
   OnuStickyStatus stickyStatus;
-  /* NEW */
   uint32_t ponQuality;
   int ponQualityStatus;
   double ponRxPower;

src/Cru/Ttc.cxx

@@ -152,7 +152,7 @@ bool Ttc::configurePonTx(uint32_t onuAddress)
 // from rogue invocations of roc-status
 OnuStickyStatus Ttc::getOnuStickyStatus(bool monitoring)
 {
-  LinkStatus monStatus = LinkStatus::Down, upstreamStatus = LinkStatus::Down, downstreamStatus = LinkStatus::Down;
+  LinkStatus upstreamStatus = LinkStatus::Down, downstreamStatus = LinkStatus::Down;
   uint32_t was, is;
   if (monitoring) {
     was = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY_MON.index);
@@ -173,14 +173,7 @@ OnuStickyStatus Ttc::getOnuStickyStatus(bool monitoring)
     downstreamStatus = LinkStatus::Up;
   }
 
-  if (was == 0x0 && is == 0x0) {
-    monStatus = LinkStatus::Up;
-  } else if (was != 0x0 && is == 0x0) {
-    monStatus = LinkStatus::UpWasDown;
-  }
-
   return {
-    monStatus,
     upstreamStatus,
     downstreamStatus,
     is,