-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
8602e46
commit ed56f03
Showing
6 changed files
with
545 additions
and
1 deletion.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| [package] | ||
| name = "nexus-inventory" | ||
| version = "0.1.0" | ||
| edition = "2021" | ||
| license = "MPL-2.0" | ||
|
|
||
| [dependencies] | ||
| anyhow.workspace = true | ||
| chrono.workspace = true | ||
| futures.workspace = true | ||
| gateway-client.workspace = true | ||
| gateway-messages.workspace = true | ||
| nexus-db-model.workspace = true | ||
| nexus-db-queries.workspace = true | ||
| strum.workspace = true | ||
| uuid.workspace = true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,230 @@ | ||
| // 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/. | ||
|
|
||
| //! Interface for building [`Collection`] dynamically | ||
| use crate::BaseboardId; | ||
| use crate::Caboose; | ||
| use crate::Collection; | ||
| use crate::RotState; | ||
| use crate::ServiceProcessor; | ||
| use anyhow::anyhow; | ||
| use chrono::DateTime; | ||
| use chrono::Utc; | ||
| use gateway_client::types::SpState; | ||
| use std::collections::BTreeMap; | ||
| use std::collections::BTreeSet; | ||
| use std::sync::Arc; | ||
| use strum::EnumIter; | ||
|
|
||
| // XXX-dap add rack id | ||
|
|
||
| #[derive(Clone, Copy, Debug, EnumIter)] | ||
| pub enum CabooseWhich { | ||
| SpSlot0, | ||
| SpSlot1, | ||
| RotSlotA, | ||
| RotSlotB, | ||
| } | ||
|
|
||
| #[derive(Debug)] | ||
| pub struct CollectionBuilder { | ||
| errors: Vec<anyhow::Error>, | ||
| time_started: DateTime<Utc>, | ||
| creator: String, | ||
| comment: String, | ||
| baseboards: BTreeSet<Arc<BaseboardId>>, | ||
| cabooses: BTreeSet<Arc<Caboose>>, | ||
| sps: BTreeMap<Arc<BaseboardId>, ServiceProcessor>, | ||
| // ignition_found: Vec<SpIdentifier>, | ||
| // ignition_powered_off: Vec<SpIdentifier>, | ||
| // ignition_missing: Vec<SpIdentifier>, | ||
| } | ||
|
|
||
| impl CollectionBuilder { | ||
| pub fn new(creator: &str, comment: &str) -> Self { | ||
| CollectionBuilder { | ||
| errors: vec![], | ||
| time_started: Utc::now(), | ||
| creator: creator.to_owned(), | ||
| comment: comment.to_owned(), | ||
| baseboards: BTreeSet::new(), | ||
| cabooses: BTreeSet::new(), | ||
| sps: BTreeMap::new(), | ||
| // ignition_found: vec![], | ||
| // ignition_powered_off: vec![], | ||
| // ignition_missing: vec![], | ||
| } | ||
| } | ||
|
|
||
| pub fn build(self) -> Collection { | ||
| Collection { | ||
| errors: self.errors, | ||
| time_started: self.time_started, | ||
| time_done: Utc::now(), | ||
| creator: self.creator, | ||
| comment: self.comment, | ||
| baseboards: self.baseboards, | ||
| cabooses: self.cabooses, | ||
| sps: self.sps, | ||
| } | ||
| } | ||
|
|
||
| // XXX-dap I think this just belongs in the caller. | ||
| // pub fn found_ignition( | ||
| // &mut self, | ||
| // sp_id: SpIdentifier, | ||
| // ignition: SpIgnition, | ||
| // ) { | ||
| // let mut vec = match ignition { | ||
| // SpIgnition::Yes { power: true, .. } => &mut self.ignition_found, | ||
| // SpIgnition::Yes { power: false, .. } => { | ||
| // &mut self.ignition_powered_off | ||
| // } | ||
| // SpIgnition::No => &mut self.ignition_missing, | ||
| // }; | ||
| // | ||
| // vec.push(sp_id); | ||
| // } | ||
|
|
||
| // XXX-dap this model here, where we invoke enum_ignition() and then | ||
| // powered_on_sps() and expect to do enum_sp() after that...it's promising, | ||
| // but I think it currently assumes that SpIdentifiers will be consistent | ||
| // across MGS instances. It would be better to avoid this if we can. And | ||
| // we should be able to. | ||
| // | ||
| // I think it's really more like: | ||
| // | ||
| // - found_mgs_client(mgs_client) | ||
| // - enum_mgs_clients(): for each: | ||
| // - found_ignition(client, ignition) | ||
| // - next_wanted() returns an (mgs_client, sp_id, SpInfoWanted) | ||
| // - SpInfoWanted = State | Caboose1 | Caboose2 | ... | ||
| // - this tells the caller exactly what to do next | ||
| // - am I putting too much control flow into this struct? wasn't the | ||
| // idea to make this simple and passive and _not_ include all that | ||
| // logic? That's a nice idea but the problem is that intrinsically one | ||
| // needs the state about what information we have about what SPs and | ||
| // which MGS's we've tried in order to decide what to do next | ||
| // - but this approach is not concurrency-friendly, and I don't really | ||
| // see a way to make it concurrency-friendly without baking the whole | ||
| // thing into this struct, which, again, defeats the point. | ||
| // | ||
| // That brings me back to: let's make this thing really simple. Caller | ||
| // reports what it's found. Caller is responsible for control flow and | ||
| // figuring out what's next and in what order. | ||
| // | ||
| // Next step: rethink this struct, then go back to collector.rs and write a | ||
| // driver. | ||
| //pub fn powered_on_sps(&self) -> impl Iterator<Item = SpIdentifier> { | ||
| // self.ignition_found.iter().cloned(); | ||
| //} | ||
|
|
||
| pub fn found_sp_state( | ||
| &mut self, | ||
| source: &str, | ||
| sp_state: SpState, | ||
| ) -> Arc<BaseboardId> { | ||
| let baseboard = Self::enum_item( | ||
| &mut self.baseboards, | ||
| BaseboardId { | ||
| serial_number: sp_state.serial_number, | ||
| part_number: sp_state.model, | ||
| }, | ||
| ); | ||
|
|
||
| let rot = RotState::try_from(sp_state.rot).ok(); | ||
| let _ = self.sps.entry(baseboard.clone()).or_insert_with(|| { | ||
| ServiceProcessor { | ||
| baseboard: baseboard.clone(), | ||
| time_collected: Utc::now(), | ||
| source: source.to_owned(), | ||
| hubris_archive: sp_state.hubris_archive_id, | ||
| power_state: sp_state.power_state, | ||
| rot, | ||
| sp_slot0_caboose: None, | ||
| sp_slot1_caboose: None, | ||
| rot_slot_a_caboose: None, | ||
| rot_slot_b_caboose: None, | ||
| } | ||
| }); | ||
|
|
||
| baseboard | ||
| } | ||
|
|
||
| pub fn sp_found_caboose_already( | ||
| &self, | ||
| baseboard: &BaseboardId, | ||
| which: CabooseWhich, | ||
| ) -> bool { | ||
| self.sps | ||
| .get(baseboard) | ||
| .map(|sp| { | ||
| let ptr = match which { | ||
| CabooseWhich::SpSlot0 => &sp.sp_slot0_caboose, | ||
| CabooseWhich::SpSlot1 => &sp.sp_slot1_caboose, | ||
| CabooseWhich::RotSlotA => &sp.rot_slot_a_caboose, | ||
| CabooseWhich::RotSlotB => &sp.rot_slot_b_caboose, | ||
| }; | ||
| ptr.is_some() | ||
| }) | ||
| .unwrap_or(false) | ||
| } | ||
|
|
||
| pub fn found_sp_caboose( | ||
| &mut self, | ||
| baseboard: &BaseboardId, | ||
| which: CabooseWhich, | ||
| caboose: Caboose, | ||
| ) -> Result<(), anyhow::Error> { | ||
| let caboose = Self::enum_item(&mut self.cabooses, caboose); | ||
| let sp = self.sps.get_mut(baseboard).ok_or_else(|| { | ||
| anyhow!("reporting caboose for unknown baseboard: {:?}", baseboard) | ||
| })?; | ||
| let ptr = match which { | ||
| CabooseWhich::SpSlot0 => &mut sp.sp_slot0_caboose, | ||
| CabooseWhich::SpSlot1 => &mut sp.sp_slot1_caboose, | ||
| CabooseWhich::RotSlotA => &mut sp.rot_slot_a_caboose, | ||
| CabooseWhich::RotSlotB => &mut sp.rot_slot_b_caboose, | ||
| }; | ||
|
|
||
| if let Some(already) = ptr { | ||
| let error = if *already == caboose { | ||
| anyhow!("reported multiple times (same value)",) | ||
| } else { | ||
| anyhow!( | ||
| "reported caboose multiple times (previously {:?}, \ | ||
| now {:?}, keeping only the first one)", | ||
| already, | ||
| caboose | ||
| ) | ||
| }; | ||
| Err(error.context(format!( | ||
| "baseboard {:?} caboose {:?}", | ||
| baseboard, which | ||
| ))) | ||
| } else { | ||
| *ptr = Some(caboose); | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| fn enum_item<T: Clone + Ord>( | ||
| items: &mut BTreeSet<Arc<T>>, | ||
| item: T, | ||
| ) -> Arc<T> { | ||
| match items.get(&item) { | ||
| Some(found_item) => found_item.clone(), | ||
| None => { | ||
| let new_item = Arc::new(item); | ||
| items.insert(new_item.clone()); | ||
| new_item | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn found_error(&mut self, error: anyhow::Error) { | ||
| self.errors.push(error); | ||
| } | ||
| } |
Oops, something went wrong.