[config] ONU address as dec instead of hex

Author: kostorr

README.md

@@ -237,10 +237,10 @@ params.setDynamicOffsetEnabled(true);
 ...
 ```
 
-Likewise for `OnuAddress`, passing the hex is enough.
+Likewise for `OnuAddress`, passing the int is enough.
 
 ```
-params.setOnuAddress(0x0badcafe)
+params.setOnuAddress(42)
 ```
 
 ### Configuration File
@@ -591,7 +591,7 @@ metric format for the CRORC and the CRU is different, as different parameters ar
 | Value name         - | Value                       | Type   | 
 | ---------------------| --------------------------- | ------ | 
 | `"onuStickyStatus"`  | 0/1 (DOWN/UP)               | int    |
-| `"onuAddress"`       | ONU Address                 | string |
+| `"onuAddress"`       | ONU Address                 | int    |
 | `"rx40Locked"`       | 0/1 (False/True)            | int    |
 | `"phaseGood"`        | 0/1 (False/True)            | int    |
 | `"rxLocked"`         | 0/1 (False/True)            | int    |

cru_template.cfg

@@ -35,8 +35,8 @@ downstreamData=MIDTRG
 # [true | false]
 ponUpstream=false
 
-# [0x0badcafe]
-onuAddress=0x0badcaff
+# [int]
+onuAddress=10
 
 # [true | false]
 dynamicOffset=false

src/CardConfigurator.cxx

@@ -174,8 +174,7 @@ void CardConfigurator::parseConfigUriCru(std::string configUri, Parameters& para
         ponUpstream = subtree.get<bool>("ponUpstream");
         dynamicOffset = subtree.get<bool>("dynamicOffset");
 
-        parsedString = subtree.get<std::string>("onuAddress");
-        onuAddress = Hex::fromString(parsedString);
+        onuAddress = subtree.get<int>("onuAddress");
 
         parsedString = subtree.get<std::string>("cruId");
         cruId = Hex::fromString(parsedString);

src/CommandLineUtilities/ProgramStatus.cxx

@@ -266,7 +266,7 @@ class ProgramStatus : public Program
         if (mOptions.monitoring) {
           monitoring->send(Metric{ "onu" }
                              .addValue(onuStickyStatusInt, "onuStickyStatus")
-                             .addValue(std::to_string(onuStatus.onuAddress), "onuAddress")
+                             .addValue(int(onuStatus.onuAddress), "onuAddress")
                              .addValue(onuStatus.rx40Locked, "rx40Locked")
                              .addValue(onuStatus.phaseGood, "phaseGood")
                              .addValue(onuStatus.rxLocked, "rxLocked")
@@ -298,7 +298,7 @@ class ProgramStatus : public Program
         } else {
           std::cout << "=============================" << std::endl;
           std::cout << "ONU status: \t\t" << onuStickyStatus << std::endl;
-          std::cout << "ONU address: \t\t0x" << std::hex << onuStatus.onuAddress << 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;
           std::cout << "ONU phase good: \t" << std::boolalpha << onuStatus.phaseGood << std::endl;