track unrelated mgs changes (factor me out pls)

Author: hawkw

gateway-types/src/component_details.rs

@@ -374,6 +374,7 @@ pub enum MeasurementKind {
     InputCurrent,
     InputVoltage,
     Speed,
+    CpuTctl,
 }
 
 impl From<gateway_messages::measurement::MeasurementKind> for MeasurementKind {
@@ -387,6 +388,7 @@ impl From<gateway_messages::measurement::MeasurementKind> for MeasurementKind {
             MeasurementKind::InputCurrent => Self::InputCurrent,
             MeasurementKind::InputVoltage => Self::InputVoltage,
             MeasurementKind::Speed => Self::Speed,
+            MeasurementKind::CpuTctl => Self::CpuTctl,
         }
     }
 }

gateway/src/metrics.rs

@@ -791,11 +791,13 @@ impl SpPoller {
                     // We do this first so that we only have to clone the
                     // sensor's name if there's an error, rather than always
                     // cloning it in *case* there's an error.
+                    const TCTL_NAME: &str = "amd_cpu_tctl";
                     if let Err(error) = m.value {
                         let kind = match m.kind {
                             MeasurementKind::Temperature if is_tctl => {
-                                "amd_cpu_tctl"
+                                TCTL_NAME
                             }
+                            MeasurementKind::CpuTctl => TCTL_NAME,
                             MeasurementKind::Temperature => "temperature",
                             MeasurementKind::Current => "current",
                             MeasurementKind::Voltage => "voltage",
@@ -878,6 +880,17 @@ impl SpPoller {
                                 &metric::Temperature { sensor, datum: 0.0 },
                             )
                         }
+
+                        (Ok(datum), MeasurementKind::CpuTctl) => Sample::new(
+                            target,
+                            &metric::AmdCpuTctl { sensor, datum },
+                        ),
+                        (Err(_), MeasurementKind::CpuTctl) => {
+                            Sample::new_missing(
+                                target,
+                                &metric::AmdCpuTctl { sensor, datum: 0.0 },
+                            )
+                        }
                         (Ok(datum), MeasurementKind::Current) => Sample::new(
                             target,
                             &metric::Current { sensor, datum },
@@ -1204,5 +1217,8 @@ fn comms_error_str(error: CommunicationError) -> &'static str {
         CommunicationError::BadTrailingDataSize { .. } => {
             "bad_trailing_data_size"
         }
+        CommunicationError::BadDecompressionSize { .. } => {
+            "bad_decompressed_size"
+        }
     }
 }

sp-sim/src/gimlet.rs

@@ -34,6 +34,8 @@ use gateway_messages::SpError;
 use gateway_messages::SpPort;
 use gateway_messages::SpRequest;
 use gateway_messages::SpStateV2;
+use gateway_messages::DumpSegment;
+use gateway_messages::DumpTask;
 use gateway_messages::ignition::{self, LinkEvents};
 use gateway_messages::sp_impl::Sender;
 use gateway_messages::sp_impl::SpHandler;
@@ -1502,6 +1504,28 @@ impl SpHandler for Handler {
             }
         }
     }
+
+    fn get_task_dump_count(&mut self) -> Result<u32, SpError> {
+        unimplemented!()
+    }
+
+    fn task_dump_read_start(
+        &mut self,
+        _index: u32,
+        _key: [u8; 16],
+    ) -> Result<DumpTask, SpError> {
+        unimplemented!()
+    }
+
+    fn task_dump_read_continue(
+        &mut self,
+        _key: [u8; 16],
+        _seq: u32,
+        _buf: &mut [u8],
+    ) -> Result<Option<DumpSegment>, SpError> {
+        unimplemented!()
+    }
+
 }
 
 impl SimSpHandler for Handler {

sp-sim/src/sidecar.rs

@@ -27,6 +27,8 @@ use gateway_messages::ComponentAction;
 use gateway_messages::ComponentActionResponse;
 use gateway_messages::ComponentDetails;
 use gateway_messages::DiscoverResponse;
+use gateway_messages::DumpSegment;
+use gateway_messages::DumpTask;
 use gateway_messages::IgnitionCommand;
 use gateway_messages::IgnitionState;
 use gateway_messages::MgsError;
@@ -1202,6 +1204,27 @@ impl SpHandler for Handler {
             }
         }
     }
+
+    fn get_task_dump_count(&mut self) -> Result<u32, SpError> {
+        unimplemented!()
+    }
+
+    fn task_dump_read_start(
+        &mut self,
+        _index: u32,
+        _key: [u8; 16],
+    ) -> Result<DumpTask, SpError> {
+        unimplemented!()
+    }
+
+    fn task_dump_read_continue(
+        &mut self,
+        _key: [u8; 16],
+        _seq: u32,
+        _buf: &mut [u8],
+    ) -> Result<Option<DumpSegment>, SpError> {
+        unimplemented!()
+    }
 }
 
 impl SimSpHandler for Handler {