refactor(backend-status): rename LteInfo to CellularStatus (#653)

## changes
- renamed `LteInfo` to `CellularStatus`
- made all `CellularStatus` fields public

Author: vmenge

backend-status/dbus/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod types;
 
 use orb_telemetry::TraceCtx;
-use types::{CoreStats, LteInfo, NetStats, UpdateProgress, WifiNetwork};
+use types::{CellularStatus, CoreStats, NetStats, UpdateProgress, WifiNetwork};
 use zbus::{fdo::Result, interface};
 
 pub trait BackendStatusT: Send + Sync + 'static {
@@ -20,7 +20,7 @@ pub trait BackendStatusT: Send + Sync + 'static {
     fn provide_net_stats(&self, net_stats: NetStats, trace_ctx: TraceCtx)
         -> Result<()>;
 
-    fn provide_lte_info(&self, lte_info: LteInfo) -> Result<()>;
+    fn provide_cellular_status(&self, status: CellularStatus) -> Result<()>;
 
     fn provide_core_stats(
         &self,
@@ -64,8 +64,8 @@ impl<T: BackendStatusT> BackendStatusT for BackendStatus<T> {
         self.0.provide_net_stats(net_stats, trace_ctx)
     }
 
-    fn provide_lte_info(&self, lte_info: LteInfo) -> Result<()> {
-        self.0.provide_lte_info(lte_info)
+    fn provide_cellular_status(&self, status: CellularStatus) -> Result<()> {
+        self.0.provide_cellular_status(status)
     }
 
     fn provide_core_stats(

backend-status/dbus/src/types.rs

@@ -67,20 +67,20 @@ pub struct NetIntf {
 /// All Option<T> fields make use of the `option-as-array` features of zbus.
 /// https://dbus2.github.io/zbus/faq.html#2-encoding-as-an-array-a
 #[derive(Debug, Clone, Type, Serialize, Deserialize, PartialEq)]
-pub struct LteInfo {
-    imei: String,
-    iccid: String,
+pub struct CellularStatus {
+    pub imei: String,
+    pub iccid: String,
     /// Radio Access Technology -- e.g.: gsm, lte
-    rat: Option<String>,
-    operator: Option<String>,
+    pub rat: Option<String>,
+    pub operator: Option<String>,
     /// Reference Option Received Power — how strong the LTE signal is.
-    rsrp: Option<f64>,
+    pub rsrp: Option<f64>,
     ///Reference Signal Received Quality — signal quality, affected by interference.
-    rsrq: Option<f64>,
+    pub rsrq: Option<f64>,
     /// Received Signal Strength Indicator — total signal power (including noise)
-    rssi: Option<f64>,
+    pub rssi: Option<f64>,
     /// Signal-to-Noise Ratio — how "clean" the signal is.
-    snr: Option<f64>,
+    pub snr: Option<f64>,
 }
 
 //--------------------------------

backend-status/src/dbus/intf_impl.rs

@@ -1,6 +1,6 @@
 use crate::backend::status::{BackendStatusClientT, StatusClient};
 use orb_backend_status_dbus::{
-    types::{CoreStats, LteInfo, NetStats, UpdateProgress, WifiNetwork},
+    types::{CellularStatus, CoreStats, NetStats, UpdateProgress, WifiNetwork},
     BackendStatusT,
 };
 use orb_telemetry::TraceCtx;
@@ -27,7 +27,7 @@ pub struct CurrentStatus {
     pub wifi_networks: Option<Vec<WifiNetwork>>,
     pub update_progress: Option<UpdateProgress>,
     pub net_stats: Option<NetStats>,
-    pub lte_info: Option<LteInfo>,
+    pub cellular_status: Option<CellularStatus>,
     pub core_stats: Option<CoreStats>,
 }
 
@@ -101,7 +101,7 @@ impl BackendStatusT for BackendStatusImpl {
         Ok(())
     }
 
-    fn provide_lte_info(&self, lte_info: LteInfo) -> zbus::fdo::Result<()> {
+    fn provide_cellular_status(&self, status: CellularStatus) -> zbus::fdo::Result<()> {
         let Ok(mut current_status_guard) = self
             .current_status
             .lock()
@@ -111,7 +111,7 @@ impl BackendStatusT for BackendStatusImpl {
         };
 
         let mut current_status = current_status_guard.take().unwrap_or_default();
-        current_status.lte_info = Some(lte_info);
+        current_status.cellular_status = Some(status);
         *current_status_guard = Some(current_status);
 
         self.notify.notify_one();
@@ -178,10 +178,14 @@ impl BackendStatusImpl {
         let wifi_networks = current_status.wifi_networks.is_some();
         let update_progress = current_status.update_progress.is_some();
         let net_stats = current_status.net_stats.is_some();
-        let lte_info = current_status.lte_info.is_some();
+        let cellular_status = current_status.cellular_status.is_some();
 
         let core_stats = current_status.core_stats.is_some();
-        if !wifi_networks && !update_progress && !net_stats && !lte_info && !core_stats
+        if !wifi_networks
+            && !update_progress
+            && !net_stats
+            && !cellular_status
+            && !core_stats
         {
             // nothing to send
             return None;
@@ -191,7 +195,7 @@ impl BackendStatusImpl {
             ?wifi_networks,
             ?update_progress,
             ?net_stats,
-            ?lte_info,
+            ?cellular_status,
             ?core_stats,
             "Updating backend-status"
         );

location/src/dbus.rs

@@ -82,9 +82,9 @@ mod tests {
             Ok(())
         }
 
-        fn provide_lte_info(
+        fn provide_cellular_status(
             &self,
-            _lte_info: orb_backend_status_dbus::types::LteInfo,
+            _status: orb_backend_status_dbus::types::CellularStatus,
         ) -> zbus::fdo::Result<()> {
             Ok(())
         }