Add constants

Author: Laura Abbott

nexus/reconfigurator/planning/src/mgs_updates/mod.rs

@@ -680,6 +680,7 @@ mod test {
     use std::collections::BTreeSet;
     use std::sync::Arc;
     use strum::IntoEnumIterator;
+    use sled_hardware_types::GIMLET_SLED_MODEL;
 
     // Confirm our behaviour for skipped updates
     #[test]
@@ -868,7 +869,7 @@ mod test {
         // each of the sled boards, and report no pending updates
         let mut expected_blocked_updates = Vec::new();
         for baseboard_id in &collection.baseboards {
-            if baseboard_id.part_number == "913-0000019" {
+            if baseboard_id.part_number == GIMLET_SLED_MODEL {
                 expected_blocked_updates.push(BlockedMgsUpdate {
                     baseboard_id: baseboard_id.clone(),
                     reason: FailedMgsUpdateReason::HostOs(

nexus/reconfigurator/planning/src/mgs_updates/test_helpers.rs

@@ -52,6 +52,7 @@ use tufaceous_artifact::ArtifactHash;
 use tufaceous_artifact::ArtifactKind;
 use tufaceous_artifact::ArtifactVersion;
 use tufaceous_artifact::KnownArtifactKind;
+use sled_hardware_types::GIMLET_SLED_MODEL;
 
 use crate::mgs_updates::PendingHostPhase2Changes;
 
@@ -966,7 +967,7 @@ impl<'a> TestBoardCollectionBuilder<'a> {
             let sp_state = SpState {
                 // We assume a valid model ID for sleds
                 model: match sp_id.type_ {
-                    SpType::Sled => "913-0000019".to_string(),
+                    SpType::Sled => GIMLET_SLED_MODEL.to_string(),
                     _ => format!("dummy_{}", sp_id.type_),
                 },
                 serial_number: serial.to_string(),

nexus/reconfigurator/planning/src/system.rs

@@ -82,6 +82,7 @@ use std::time::Duration;
 use tufaceous_artifact::ArtifactHash;
 use tufaceous_artifact::ArtifactVersion;
 use tufaceous_artifact::KnownArtifactKind;
+use sled_hardware_types::GIMLET_SLED_MODEL;
 
 /// Describes an actual or synthetic Oxide rack for planning and testing
 ///
@@ -1271,7 +1272,7 @@ impl Sled {
     ) -> Sled {
         use typed_rng::TypedUuidRng;
         let unique = unique.unwrap_or_else(|| hardware_slot.to_string());
-        let model = "913-0000019".to_string();
+        let model = GIMLET_SLED_MODEL.to_string();
         let serial = format!("serial{}", unique);
         let revision = 0;
         let mut zpool_rng = TypedUuidRng::from_seed(

nexus/types/src/deployment.rs

@@ -2413,6 +2413,7 @@ mod test {
     use super::PendingMgsUpdates;
     use crate::inventory::BaseboardId;
     use gateway_types::component::SpType;
+    use sled_hardware_types::GIMLET_SLED_MODEL;
 
     #[test]
     fn test_serialize_pending_mgs_updates() {
@@ -2429,7 +2430,7 @@ mod test {
         let mut pending_mgs_updates = PendingMgsUpdates::new();
         let update = PendingMgsUpdate {
             baseboard_id: Arc::new(BaseboardId {
-                part_number: String::from("913-0000019"),
+                part_number: String::from(GIMLET_SLED_MODEL),
                 serial_number: String::from("BRM27230037"),
             }),
             sp_type: SpType::Sled,

sled-hardware/types/src/lib.rs

@@ -8,6 +8,9 @@ use std::ops::RangeInclusive;
 
 pub mod underlay;
 
+pub const GIMLET_SLED_MODEL: &str = "913-0000019";
+pub const COSMO_SLED_MODEL: &str = "913-0000023";
+
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum OxideSled {
     Gimlet,
@@ -27,8 +30,8 @@ impl OxideSled {
 
     pub fn try_from_model(model: &str) -> Option<Self> {
         match model {
-            "913-0000023" => Some(Self::Cosmo),
-            "913-0000019" | "913-0000006" => Some(Self::Gimlet),
+            COSMO_SLED_MODEL => Some(Self::Cosmo),
+            GIMLET_SLED_MODEL | "913-0000006" => Some(Self::Gimlet),
             _ => None,
         }
     }