start associating cases with SPs

Author: hawkw

nexus/db-model/src/fm/case.rs

@@ -6,9 +6,13 @@
 
 use super::DiagnosisEngine;
 use crate::DbTypedUuid;
+use crate::SpMgsSlot;
+use crate::SpType;
 use crate::ereport;
 use chrono::{DateTime, Utc};
-use nexus_db_schema::schema::{fm_case, fm_ereport_in_case};
+use nexus_db_schema::schema::{
+    fm_case, fm_case_impacts_sp_slot, fm_ereport_in_case,
+};
 use omicron_uuid_kinds::{CaseKind, EreporterRestartKind, SitrepKind};
 
 #[derive(Queryable, Insertable, Clone, Debug, Selectable)]
@@ -36,3 +40,14 @@ pub struct CaseEreport {
     pub sitrep_id: DbTypedUuid<SitrepKind>,
     pub assigned_sitrep_id: DbTypedUuid<SitrepKind>,
 }
+
+#[derive(Queryable, Insertable, Clone, Debug, Selectable)]
+#[diesel(table_name = fm_case_impacts_sp_slot)]
+pub struct CaseImpactsSp {
+    pub sitrep_id: DbTypedUuid<SitrepKind>,
+    pub case_id: DbTypedUuid<CaseKind>,
+    pub sp_type: SpType,
+    pub sp_slot: SpMgsSlot,
+    pub created_sitrep_id: DbTypedUuid<SitrepKind>,
+    pub comment: String,
+}

nexus/db-schema/src/schema.rs

@@ -2889,6 +2889,17 @@ table! {
 
 allow_tables_to_appear_in_same_query!(fm_sitrep, fm_case);
 
+table! {
+    fm_case_impacts_sp_slot (sitrep_id, case_id, sp_type, sp_slot) {
+        sitrep_id -> Uuid,
+        case_id -> Uuid,
+        sp_type -> crate::enums::SpTypeEnum,
+        sp_slot -> Int4,
+        created_sitrep_id -> Uuid,
+        comment -> Text,
+    }
+}
+
 table! {
     fm_alert_request (sitrep_id, id) {
         id -> Uuid,

nexus/fm/src/case.rs

@@ -17,6 +17,7 @@ use chrono::Utc;
 use std::sync::Arc;
 
 pub mod alert;
+pub mod case;
 pub mod de;
 
 #[derive(Debug)]
@@ -87,6 +88,7 @@ impl<'a> SitrepBuilder<'a> {
                     comment: String::new(),
                     ereports: Default::default(),
                     alerts_requested: Default::default(),
+                    impacted_sp_slots: Default::default(),
                 };
                 entry.insert(CaseBuilder::new(&self.log, sitrep_id, case))
             }

nexus/fm/src/lib.rs

@@ -13,13 +13,15 @@ pub use ereport::{Ereport, EreportId};
 mod alert;
 pub use alert::*;
 
+pub mod case;
+pub use case::Case;
+
 use chrono::{DateTime, Utc};
-use iddqd::{IdOrdItem, IdOrdMap};
+use iddqd::IdOrdMap;
 use omicron_uuid_kinds::{
     CaseUuid, CollectionUuid, OmicronZoneUuid, SitrepUuid,
 };
 use serde::{Deserialize, Serialize};
-use std::sync::Arc;
 
 /// A fault management situation report, or _sitrep_.
 ///
@@ -118,39 +120,6 @@ pub struct SitrepVersion {
     pub time_made_current: DateTime<Utc>,
 }
 
-#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
-pub struct Case {
-    pub id: CaseUuid,
-    pub created_sitrep_id: SitrepUuid,
-    pub time_created: DateTime<Utc>,
-
-    pub closed_sitrep_id: Option<SitrepUuid>,
-    pub time_closed: Option<DateTime<Utc>>,
-
-    pub de: DiagnosisEngine,
-
-    pub ereports: IdOrdMap<Arc<Ereport>>,
-
-    pub alerts_requested: IdOrdMap<AlertRequest>,
-
-    pub comment: String,
-}
-
-impl Case {
-    pub fn is_open(&self) -> bool {
-        self.time_closed.is_none()
-    }
-}
-
-impl IdOrdItem for Case {
-    type Key<'a> = &'a CaseUuid;
-    fn key(&self) -> Self::Key<'_> {
-        &self.id
-    }
-
-    iddqd::id_upcast!();
-}
-
 #[derive(
     Copy,
     Clone,

nexus/types/src/fm.rs

@@ -0,0 +1,67 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+use crate::fm::AlertRequest;
+use crate::fm::DiagnosisEngine;
+use crate::fm::Ereport;
+use crate::inventory::SpType;
+use chrono::{DateTime, Utc};
+use iddqd::{IdOrdItem, IdOrdMap};
+use omicron_uuid_kinds::{
+    CaseUuid, CollectionUuid, OmicronZoneUuid, SitrepUuid,
+};
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
+
+#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
+pub struct Case {
+    pub id: CaseUuid,
+    pub created_sitrep_id: SitrepUuid,
+    pub time_created: DateTime<Utc>,
+
+    pub closed_sitrep_id: Option<SitrepUuid>,
+    pub time_closed: Option<DateTime<Utc>>,
+
+    pub de: DiagnosisEngine,
+
+    pub ereports: IdOrdMap<Arc<Ereport>>,
+
+    pub alerts_requested: IdOrdMap<AlertRequest>,
+
+    pub impacted_sp_slots: IdOrdMap<ImpactedSpSlot>,
+
+    pub comment: String,
+}
+
+impl Case {
+    pub fn is_open(&self) -> bool {
+        self.time_closed.is_none()
+    }
+}
+
+impl IdOrdItem for Case {
+    type Key<'a> = &'a CaseUuid;
+    fn key(&self) -> Self::Key<'_> {
+        &self.id
+    }
+
+    iddqd::id_upcast!();
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
+pub struct ImpactedSpSlot {
+    pub sp_type: SpType,
+    pub slot: u8,
+    pub created_sitrep_id: SitrepUuid,
+    pub comment: String,
+}
+
+impl IdOrdItem for ImpactedSpSlot {
+    type Key<'a> = (&'a SpType, &'a u8);
+    fn key(&self) -> Self::Key<'_> {
+        (&self.sp_type, &self.slot)
+    }
+
+    iddqd::id_upcast!();
+}

nexus/types/src/fm/case.rs

@@ -6894,6 +6894,19 @@ CREATE INDEX IF NOT EXISTS
     lookup_ereports_assigned_to_fm_case
 ON omicron.public.fm_ereport_in_case (sitrep_id, case_id);
 
+CREATE TABLE IF NOT EXISTS omicron.public.fm_case_impacts_sp_slot (
+    sitrep_id UUID NOT NULL,
+    case_id UUID NOT NULL,
+    -- location of this device according to MGS
+    sp_type omicron.public.sp_type NOT NULL,
+    sp_slot INT4 NOT NULL,
+
+    -- ID of the sitrep in which this SP was added to the case.
+    created_sitrep_id UUID NOT NULL,
+    comment TEXT NOT NULL,
+
+    PRIMARY KEY (sitrep_id, case_id, sp_type, sp_slot)
+);
 
 CREATE TABLE IF NOT EXISTS omicron.public.fm_alert_request (
     -- Requested alert UUID