show SPs by default in omdb inventory collections (#9372)

davepacheco · web-flow · commit 528764a88a96 · 2025-11-12T11:01:13.000-08:00
diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout
@@ -120,6 +120,81 @@ started:    <REDACTED_TIMESTAMP>
 done:       <REDACTED_TIMESTAMP>
 errors:     0
 
+Sled serial0
+    part number: model0
+    power:    A2
+    revision: 0
+    MGS slot: Sled 0
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
+Sled serial1
+    part number: model1
+    power:    A2
+    revision: 0
+    MGS slot: Sled 1
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
+Sled serial2
+    part number: model2
+    power:    A2
+    revision: 0
+    MGS slot: Sled 2
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
 SLED AGENTS
 
 sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c (role = Gimlet, serial serial1)
diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-nexus-generation-autobump-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-nexus-generation-autobump-stdout
@@ -446,6 +446,84 @@ started:    <REDACTED_TIMESTAMP>
 done:       <REDACTED_TIMESTAMP>
 errors:     0
 
+Sled serial0
+    part number: model0
+    power:    A2
+    revision: 0
+    MGS slot: Sled 0
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    b99d5273ba1418bebb19d74b701d716896409566d41de76ada71bded4c9b166b 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 1.0.0   unknown    n/a         
+        RotSlotA SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+        RotSlotB SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
+Sled serial1
+    part number: model1
+    power:    A2
+    revision: 0
+    MGS slot: Sled 1
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    b99d5273ba1418bebb19d74b701d716896409566d41de76ada71bded4c9b166b 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 1.0.0   unknown    n/a         
+        RotSlotA SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+        RotSlotB SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
+Sled serial2
+    part number: model2
+    power:    A2
+    revision: 0
+    MGS slot: Sled 2
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    b99d5273ba1418bebb19d74b701d716896409566d41de76ada71bded4c9b166b 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 1.0.0   unknown    n/a         
+        RotSlotA SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+        RotSlotB SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      1.0.0   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
 SLED AGENTS
 
 sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c (role = Gimlet, serial serial1)
diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-target-release-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-target-release-stdout
@@ -435,6 +435,81 @@ started:    <REDACTED_TIMESTAMP>
 done:       <REDACTED_TIMESTAMP>
 errors:     0
 
+Sled serial0
+    part number: model0
+    power:    A2
+    revision: 0
+    MGS slot: Sled 0
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
+Sled serial1
+    part number: model1
+    power:    A2
+    revision: 0
+    MGS slot: Sled 1
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
+Sled serial2
+    part number: model2
+    power:    A2
+    revision: 0
+    MGS slot: Sled 2
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
 SLED AGENTS
 
 sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c (role = Gimlet, serial serial1)
diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-unsafe-zone-mgs-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-unsafe-zone-mgs-stdout
@@ -419,6 +419,81 @@ started:    <REDACTED_TIMESTAMP>
 done:       <REDACTED_TIMESTAMP>
 errors:     0
 
+Sled serial0
+    part number: model0
+    power:    A2
+    revision: 0
+    MGS slot: Sled 0
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
+Sled serial1
+    part number: model1
+    power:    A2
+    revision: 0
+    MGS slot: Sled 1
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
+Sled serial2
+    part number: model2
+    power:    A2
+    revision: 0
+    MGS slot: Sled 2
+    found at: <REDACTED_TIMESTAMP> from fake MGS 1
+    host phase 1 active slot: A
+    host phase 1 hashes:
+        SLOT HASH                                                             
+        A    0101010101010101010101010101010101010101010101010101010101010101 
+        B    0202020202020202020202020202020202020202020202020202020202020202 
+    cabooses:
+        SLOT     BOARD       NAME        VERSION GIT_COMMIT SIGN        
+        SpSlot0  SimGimletSp SimGimletSp 0.0.1   unknown    n/a         
+        RotSlotA SimRot      SimRot      0.0.2   unknown    sign-gimlet 
+        Stage0   SimRot      SimRot      0.0.1   unknown    sign-gimlet 
+    RoT pages:
+        SLOT DATA_BASE64 
+    RoT: active slot: slot A
+    RoT: persistent boot preference: slot A
+    RoT: pending persistent boot preference: -
+    RoT: transient boot preference: -
+    RoT: slot A SHA3-256: slotAdigest1
+    RoT: slot B SHA3-256: slotBdigest1
+
 SLED AGENTS
 
 sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c (role = Gimlet, serial serial1)
diff --git a/nexus/types/src/inventory/display.rs b/nexus/types/src/inventory/display.rs
@@ -56,7 +56,7 @@ impl<'a> CollectionDisplay<'a> {
         Self {
             collection,
             // Display all items by default.
-            include_sps: CollectionDisplayIncludeSps::None,
+            include_sps: CollectionDisplayIncludeSps::All,
             include_sleds: true,
             include_orphaned_datasets: true,
             include_clickhouse_keeper_membership: true,
