[12/n] [wicket-common] use IdOrdMap within MgsV1Inventory (#10861)

Make the SP-uniqueness invariant explicit.

This can be landed without breaking rkdeploy because the wire protocol
is the same (`IdOrdMap` serializes as a sequence).

Depends on:

* #10859

Author: sunshowers

Cargo.lock

@@ -2620,10 +2620,22 @@
         "type": "object",
         "properties": {
           "sps": {
+            "title": "IdOrdMap",
+            "x-rust-type": {
+              "crate": "iddqd",
+              "parameters": [
+                {
+                  "$ref": "#/components/schemas/SpInventory"
+                }
+              ],
+              "path": "iddqd::IdOrdMap",
+              "version": "*"
+            },
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/SpInventory"
-            }
+            },
+            "uniqueItems": true
           }
         },
         "required": [

openapi/wicketd.json

@@ -13,6 +13,7 @@ dpd-client.workspace = true
 dropshot.workspace = true
 gateway-client.workspace = true
 gateway-types.workspace = true
+iddqd.workspace = true
 maplit.workspace = true
 omicron-common.workspace = true
 omicron-workspace-hack.workspace = true

wicket-common/Cargo.toml

@@ -8,6 +8,7 @@ use std::{collections::BTreeMap, net::Ipv6Addr};
 
 use gateway_types::component::{SpState, SpType};
 use gateway_types::rot::{RotSlot, RotState};
+use iddqd::id_ord_map;
 use maplit::{btreemap, btreeset};
 use sled_agent_types::early_networking::{
     BgpConfig, BgpPeerConfig, LinkFec, LinkSpeed, LldpAdminStatus,
@@ -68,14 +69,9 @@ impl ExampleRackSetupData {
             identifier: "serial 1 2 3".into(),
         };
 
-        let mut inventory = MgsV1Inventory {
-            sps: vec![
-                SpInventory::new(SpIdentifier { slot: 1, typ: SpType::Sled }),
-                SpInventory::new(SpIdentifier { slot: 5, typ: SpType::Sled }),
-            ],
-        };
-
-        inventory.sps[0].state = Some(SpState {
+        let mut sp0 =
+            SpInventory::new(SpIdentifier { slot: 1, typ: SpType::Sled });
+        sp0.state = Some(SpState {
             serial_number: "serial 1 2 3".into(),
             model: "model1".into(),
             revision: 3,
@@ -91,7 +87,9 @@ impl ExampleRackSetupData {
                 slot_b_sha3_256_digest: None,
             },
         });
-        inventory.sps[1].state = Some(SpState {
+        let mut sp1 =
+            SpInventory::new(SpIdentifier { slot: 5, typ: SpType::Sled });
+        sp1.state = Some(SpState {
             serial_number: "serial 4 5 6".into(),
             model: "model2".into(),
             revision: 5,
@@ -107,6 +105,7 @@ impl ExampleRackSetupData {
                 slot_b_sha3_256_digest: None,
             },
         });
+        let inventory = MgsV1Inventory { sps: id_ord_map! { sp0, sp1 } };
 
         let ddm_discovered_sleds: BTreeMap<_, _> = [
             (our_baseboard.clone(), Ipv6Addr::LOCALHOST),

wicket-common/src/example.rs

@@ -10,6 +10,7 @@ pub use gateway_client::types::{
 pub use gateway_types::component::{SpIdentifier, SpState, SpType};
 pub use gateway_types::ignition::{SpIgnition, SpIgnitionSystemType};
 pub use gateway_types::rot::{RotSlot, RotState};
+use iddqd::{IdOrdItem, IdOrdMap, id_upcast};
 use omicron_common::snake_case_result;
 use omicron_common::snake_case_result::SnakeCaseResult;
 use schemars::JsonSchema;
@@ -46,7 +47,7 @@ pub struct MgsV1InventorySnapshot {
 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "mgs_inventory", rename_all = "snake_case")]
 pub struct MgsV1Inventory {
-    pub sps: Vec<SpInventory>,
+    pub sps: IdOrdMap<SpInventory>,
 }
 
 impl From<BTreeSet<BootstrapSledDescription>> for SledInventory {
@@ -191,6 +192,16 @@ impl SpInventory {
     }
 }
 
+impl IdOrdItem for SpInventory {
+    type Key<'a> = SpIdentifier;
+
+    fn key(&self) -> Self::Key<'_> {
+        self.id
+    }
+
+    id_upcast!();
+}
+
 /// RoT-related data that isn't already supplied in [`SpState`].
 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
 #[serde(tag = "sp_inventory", rename_all = "snake_case")]