Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions crates/api-model/src/hardware_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ impl Display for MachineInventorySoftwareComponent {
pub struct MachineNvLinkInfo {
pub domain_uuid: NvLinkDomainId,
/// Chassis serial from the first GPU `GpuPlatformInfo` at discovery (or operator RPC).
#[serde(default)]
Comment thread
rtamma-nv marked this conversation as resolved.
pub chassis_serial: String,
pub gpus: Vec<NvLinkGpu>,
}
Expand Down Expand Up @@ -415,6 +416,36 @@ mod tests {
const DPU_BF3_INFO_JSON: &[u8] = include_bytes!("hardware_info/test_data/dpu_bf3_info.json");
const X86_INFO_JSON: &[u8] = include_bytes!("hardware_info/test_data/x86_info.json");

/// Pre-NMX-C rows stored `nvlink_info` without `chassis_serial` (and GPUs carried `nmx_m_id`).
#[test]
fn machine_nvlink_info_deserializes_legacy_json_without_chassis_serial() {
let domain_uuid: NvLinkDomainId = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee".parse().unwrap();
let legacy_json = r#"{
"domain_uuid": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
"gpus": [{
"nmx_m_id": "legacy-partition-id",
"tray_index": 0,
"slot_id": 1,
"device_id": 1,
"guid": 12345
}]
}"#;

let info: MachineNvLinkInfo = serde_json::from_str(legacy_json).unwrap();

assert_eq!(info.domain_uuid, domain_uuid);
assert_eq!(info.chassis_serial, "");
assert_eq!(
info.gpus,
vec![NvLinkGpu {
tray_index: 0,
slot_id: 1,
device_id: 1,
guid: 12345,
}]
);
}

#[test]
fn test_machine_inventory_json_representation() {
let inventory = MachineInventory {
Expand Down
11 changes: 9 additions & 2 deletions crates/nvlink-manager/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ fn build_machine_nvlink_info_from_nmx_c_hello(
}
}

/// Populates missing `machines.nvlink_info` entries (or nil `domain_uuid`) using NMX-C hello.
/// Populates missing `machines.nvlink_info` entries, nil `domain_uuid`, or empty `chassis_serial`
/// using NMX-C hello.
fn populate_machine_nvlink_info_if_needed(
machine_nvlink_info: &mut HashMap<MachineId, Option<MachineNvLinkInfo>>,
managed_host_snapshots: &HashMap<MachineId, ManagedHostStateSnapshot>,
Expand All @@ -172,7 +173,13 @@ fn populate_machine_nvlink_info_if_needed(
let existing = machine_nvlink_info
.get(machine_id)
.and_then(|info| info.as_ref());
if existing.is_some_and(|info| info.domain_uuid != NvLinkDomainId::nil()) {
let needs_update = match existing {
None => true,
Some(info) => {
info.domain_uuid == NvLinkDomainId::nil() || info.chassis_serial.trim().is_empty()
}
};
if !needs_update {
continue;
}

Expand Down
Loading