HwHostPhase1Slot -> HwM2Slot

Author: jgallagher

nexus/db-model/src/inventory.rs

@@ -160,26 +160,26 @@ impl From<HwRotSlot> for RotSlot {
 
 // See [`M2Slot`].
 impl_enum_type!(
-    HwHostPhase1SlotEnum:
+    HwM2SlotEnum:
 
     #[derive(Copy, Clone, Debug, AsExpression, FromSqlRow, PartialEq)]
-    pub enum HwHostPhase1Slot;
+    pub enum HwM2Slot;
 
     // Enum values
     A => b"A"
     B => b"B"
 );
 
-impl From<HwHostPhase1Slot> for M2Slot {
-    fn from(value: HwHostPhase1Slot) -> Self {
+impl From<HwM2Slot> for M2Slot {
+    fn from(value: HwM2Slot) -> Self {
         match value {
-            HwHostPhase1Slot::A => Self::A,
-            HwHostPhase1Slot::B => Self::B,
+            HwM2Slot::A => Self::A,
+            HwM2Slot::B => Self::B,
         }
     }
 }
 
-impl From<M2Slot> for HwHostPhase1Slot {
+impl From<M2Slot> for HwM2Slot {
     fn from(value: M2Slot) -> Self {
         match value {
             M2Slot::A => Self::A,
@@ -791,7 +791,7 @@ pub struct InvHostPhase1FlashHash {
     pub time_collected: DateTime<Utc>,
     pub source: String,
 
-    pub slot: HwHostPhase1Slot,
+    pub slot: HwM2Slot,
     pub hash: ArtifactHash,
 }
 

nexus/db-queries/src/db/datastore/inventory.rs

@@ -31,7 +31,7 @@ use nexus_db_errors::ErrorHandler;
 use nexus_db_errors::public_error_from_diesel;
 use nexus_db_errors::public_error_from_diesel_lookup;
 use nexus_db_model::ArtifactHash;
-use nexus_db_model::HwHostPhase1Slot;
+use nexus_db_model::HwM2Slot;
 use nexus_db_model::InvCaboose;
 use nexus_db_model::InvClickhouseKeeperMembership;
 use nexus_db_model::InvCockroachStatus;
@@ -72,7 +72,7 @@ use nexus_db_model::{
 };
 use nexus_db_model::{HwPowerState, InvZoneManifestNonBoot};
 use nexus_db_model::{HwRotSlot, InvMupdateOverrideNonBoot};
-use nexus_db_schema::enums::HwHostPhase1SlotEnum;
+use nexus_db_schema::enums::HwM2SlotEnum;
 use nexus_db_schema::enums::HwRotSlotEnum;
 use nexus_db_schema::enums::RotImageErrorEnum;
 use nexus_db_schema::enums::RotPageWhichEnum;
@@ -699,8 +699,8 @@ impl DataStore {
                             phase1.source
                                 .clone()
                                 .into_sql::<diesel::sql_types::Text>(),
-                            HwHostPhase1Slot::from(phase1.slot)
-                                .into_sql::<HwHostPhase1SlotEnum>(),
+                            HwM2Slot::from(phase1.slot)
+                                .into_sql::<HwM2SlotEnum>(),
                             ArtifactHash(phase1.hash)
                                 .into_sql::<diesel::sql_types::Text>(),
                         ))

nexus/db-schema/src/enums.rs

@@ -39,7 +39,7 @@ define_enums! {
     DownstairsClientStopRequestReasonEnum => "downstairs_client_stop_request_reason_type",
     DownstairsClientStoppedReasonEnum => "downstairs_client_stopped_reason_type",
     FailureDomainEnum => "failure_domain",
-    HwHostPhase1SlotEnum => "hw_host_phase_1_slot",
+    HwM2SlotEnum => "hw_m2_slot",
     HwPowerStateEnum => "hw_power_state",
     HwRotSlotEnum => "hw_rot_slot",
     IdentityProviderTypeEnum => "provider_type",

nexus/db-schema/src/schema.rs

@@ -1564,7 +1564,7 @@ table! {
         time_collected -> Timestamptz,
         source -> Text,
 
-        slot -> crate::enums::HwHostPhase1SlotEnum,
+        slot -> crate::enums::HwM2SlotEnum,
         hash -> Text,
     }
 }

schema/crdb/add-inv-host-phase-1-flash-hash/up1.sql

@@ -1,4 +1,4 @@
-CREATE TYPE IF NOT EXISTS omicron.public.hw_host_phase_1_slot AS ENUM (
+CREATE TYPE IF NOT EXISTS omicron.public.hw_m2_slot AS ENUM (
     'A',
     'B'
 );

schema/crdb/add-inv-host-phase-1-flash-hash/up2.sql

@@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS omicron.public.inv_host_phase_1_flash_hash (
     hw_baseboard_id UUID NOT NULL,
     time_collected TIMESTAMPTZ NOT NULL,
     source TEXT NOT NULL,
-    slot omicron.public.hw_host_phase_1_slot NOT NULL,
+    slot omicron.public.hw_m2_slot NOT NULL,
     hash STRING(64) NOT NULL,
     PRIMARY KEY (inv_collection_id, hw_baseboard_id, slot)
 );

schema/crdb/dbinit.sql

@@ -3506,7 +3506,7 @@ CREATE TABLE IF NOT EXISTS omicron.public.inv_root_of_trust (
 );
 
 -- host phase 1 slots
-CREATE TYPE IF NOT EXISTS omicron.public.hw_host_phase_1_slot AS ENUM (
+CREATE TYPE IF NOT EXISTS omicron.public.hw_m2_slot AS ENUM (
     'A',
     'B'
 );
@@ -3527,7 +3527,7 @@ CREATE TABLE IF NOT EXISTS omicron.public.inv_host_phase_1_flash_hash (
     source TEXT NOT NULL,
 
     -- phase 1 slot for this hash
-    slot omicron.public.hw_host_phase_1_slot NOT NULL,
+    slot omicron.public.hw_m2_slot NOT NULL,
     -- the actual hash of the contents
     hash STRING(64) NOT NULL,