[status] Add sticky values, upstream, downstream options for onu

Author: kostorr

src/CommandLineUtilities/ProgramStatus.cxx

@@ -245,17 +245,23 @@ class ProgramStatus : public Program
       if (mOptions.onu) {
         Cru::OnuStatus onuStatus = cruBar2->reportOnuStatus(mOptions.monitoring);
 
+        std::string onuUpstreamStatus = Cru::LinkStatusToString(onuStatus.stickyStatus.upstreamStatus);
+        std::string onuDownstreamStatus = Cru::LinkStatusToString(onuStatus.stickyStatus.downstreamStatus);
+        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.stickyBit == Cru::LinkStatus::Up) {
+        if (onuStatus.stickyStatus.monStatus == Cru::LinkStatus::Up) {
           onuStickyStatus = "UP";
           onuStickyStatusInt = 1;
-        } else if (onuStatus.stickyBit == Cru::LinkStatus::UpWasDown) {
+        } 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.stickyBit == Cru::LinkStatus::Down) {
+        } else if (onuStatus.stickyStatus.monStatus == Cru::LinkStatus::Down) {
           onuStickyStatus = "DOWN";
           onuStickyStatusInt = 0;
         }
@@ -282,7 +288,10 @@ class ProgramStatus : public Program
                              .addTag(tags::Key::ID, card.sequenceId)
                              .addTag(tags::Key::Type, tags::Value::CRU));
         } else if (mOptions.jsonOut) {
-          root.put("ONU status", onuStickyStatus);
+          root.put("ONU downstream status", onuDownstreamStatus);
+          root.put("ONU upstream status", onuUpstreamStatus);
+          root.put("ONU sticky value", Utilities::toHexString(onuStickyValue));
+          root.put("ONU sticky value (was)", Utilities::toHexString(onuStickyValuePrev));
           root.put("ONU address", onuStatus.onuAddress);
           root.put("ONU RX40 locked", onuStatus.rx40Locked);
           root.put("ONU phase good", onuStatus.phaseGood);
@@ -297,7 +306,10 @@ class ProgramStatus : public Program
           root.put("PON RX power (dBm)", onuStatus.ponRxPower);
         } else {
           std::cout << "=============================" << std::endl;
-          std::cout << "ONU status: \t\t" << onuStickyStatus << std::endl;
+          std::cout << "ONU downstream status: \t" << onuDownstreamStatus << std::endl;
+          std::cout << "ONU upstream status: \t" << onuUpstreamStatus << std::endl;
+          std::cout << "ONU sticky value: \t0x" << std::hex << onuStickyValue << std::endl;
+          std::cout << "ONU sticky value (was): 0x" << std::hex << onuStickyValuePrev << std::endl;
           std::cout << "ONU address: \t\t" << onuStatus.onuAddress << std::endl;
           std::cout << "-----------------------------" << std::endl;
           std::cout << "ONU RX40 locked: \t" << std::boolalpha << onuStatus.rx40Locked << std::endl;

src/Cru/Common.h

@@ -34,6 +34,20 @@ enum LinkStatus {
   UpWasDown
 };
 
+constexpr const char* LinkStatusToString(LinkStatus status)
+{
+  switch (status) {
+    case LinkStatus::Down:
+      return "DOWN";
+    case LinkStatus::Up:
+      return "UP";
+    case LinkStatus::UpWasDown:
+      return "UP (was DOWN)";
+    default:
+      throw std::invalid_argument("Invalid LinkStatus provided for string conversion");
+  }
+}
+
 struct Link {
   int dwrapper = -1;
   int wrapper = -1;
@@ -103,6 +117,14 @@ struct ReportInfo {
   uint16_t timeFrameLength;
 };
 
+struct OnuStickyStatus {
+  LinkStatus monStatus; // TODO: Remove after monitoring is updated
+  LinkStatus upstreamStatus;
+  LinkStatus downstreamStatus;
+  uint32_t stickyValue;
+  uint32_t stickyValuePrev;
+};
+
 struct OnuStatus {
   uint32_t onuAddress;
   bool rx40Locked;
@@ -113,7 +135,10 @@ struct OnuStatus {
   bool mgtRxReady;
   bool mgtTxPllLocked;
   bool mgtRxPllLocked;
-  LinkStatus stickyBit;
+  /* NEW */
+  //LinkStatus stickyBit;
+  OnuStickyStatus stickyStatus;
+  /* NEW */
   uint32_t ponQuality;
   int ponQualityStatus;
   double ponRxPower;

src/Cru/Ttc.cxx

@@ -31,6 +31,7 @@ namespace roc
 {
 
 using LinkStatus = Cru::LinkStatus;
+using OnuStickyStatus = Cru::OnuStickyStatus;
 using OnuStatus = Cru::OnuStatus;
 using FecStatus = Cru::FecStatus;
 
@@ -149,8 +150,9 @@ bool Ttc::configurePonTx(uint32_t onuAddress)
 // The monitoring parameter is set when roc-status is called through the monitoring infrastructure
 // this reports and clears a different register, so that clock information is not lost
 // from rogue invocations of roc-status
-LinkStatus Ttc::getOnuStickyBit(bool monitoring)
+OnuStickyStatus Ttc::getOnuStickyStatus(bool monitoring)
 {
+  LinkStatus monStatus = LinkStatus::Down, upstreamStatus = LinkStatus::Down, downstreamStatus = LinkStatus::Down;
   uint32_t was, is;
   if (monitoring) {
     was = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY_MON.index);
@@ -163,12 +165,27 @@ LinkStatus Ttc::getOnuStickyBit(bool monitoring)
     mBar->modifyRegister(Cru::Registers::TTC_DATA.index, 28, 1, 0x0);
     is = mBar->readRegister(Cru::Registers::TTC_ONU_STICKY.index);
   }
+
+  if (is == 0x0 || is == 0x8) {
+    upstreamStatus = LinkStatus::Up;
+    downstreamStatus = LinkStatus::Up;
+  } else if (is == 0x1a) {
+    downstreamStatus = LinkStatus::Up;
+  }
+
   if (was == 0x0 && is == 0x0) {
-    return LinkStatus::Up;
+    monStatus = LinkStatus::Up;
   } else if (was != 0x0 && is == 0x0) {
-    return LinkStatus::UpWasDown;
+    monStatus = LinkStatus::UpWasDown;
   }
-  return LinkStatus::Down;
+
+  return {
+    monStatus,
+    upstreamStatus,
+    downstreamStatus,
+    is,
+    was
+  };
 }
 
 OnuStatus Ttc::onuStatus(bool monitoring)
@@ -186,7 +203,7 @@ OnuStatus Ttc::onuStatus(bool monitoring)
     (calStatus >> 5 & 0x1) == 1,
     (calStatus >> 6 & 0x1) == 1,
     (calStatus >> 7 & 0x1) == 1,
-    getOnuStickyBit(monitoring),
+    getOnuStickyStatus(monitoring),
     getPonQuality(),
     getPonQualityStatus(),
     getPonRxPower()

src/Cru/Ttc.h

@@ -28,9 +28,10 @@ namespace roc
 
 class Ttc
 {
+  using LinkStatus = Cru::LinkStatus;
+  using OnuStickyStatus = Cru::OnuStickyStatus;
   using OnuStatus = Cru::OnuStatus;
   using FecStatus = Cru::FecStatus;
-  using LinkStatus = Cru::LinkStatus;
 
  public:
   Ttc(std::shared_ptr<BarInterface> bar, int serial = -1, int endpoint = -1);
@@ -68,7 +69,7 @@ class Ttc
  private:
   void configurePlls(uint32_t clock);
   void setRefGen(int frequency = 240);
-  LinkStatus getOnuStickyBit(bool monitoring = false);
+  OnuStickyStatus getOnuStickyStatus(bool monitoring = false);
   uint32_t getPonQuality();
   int getPonQualityStatus();
   double getPonRxPower();