From f8d6bdeb2d423a0d84358f486a7df8ef1758b2bc Mon Sep 17 00:00:00 2001 From: "shan.wu" Date: Mon, 23 Mar 2026 11:37:45 +0800 Subject: [PATCH] [dpu-bm2]: support dpu bm2 instance 1. add BareMetal2DpuChassisSpec for UT 2. Return baremetal2 IPMI information and dpu information through Query API, and desensitize the password 3. Some simple code optimization Resolves/Related: ZSTAC-83415 Change-Id: I636d637a7168656a6c726c6769777a726e616974 --- .../zstack/header/host/APIQueryHostReply.java | 2 ++ .../sdk/BareMetal2DpuChassisInventory.java | 18 +++++++++--------- .../CloudOperationsErrorCode.java | 2 ++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/header/src/main/java/org/zstack/header/host/APIQueryHostReply.java b/header/src/main/java/org/zstack/header/host/APIQueryHostReply.java index 355d4b5aa65..31e06eb6650 100755 --- a/header/src/main/java/org/zstack/header/host/APIQueryHostReply.java +++ b/header/src/main/java/org/zstack/header/host/APIQueryHostReply.java @@ -1,5 +1,6 @@ package org.zstack.header.host; +import org.zstack.header.log.MaskSensitiveInfo; import org.zstack.header.query.APIQueryReply; import org.zstack.header.rest.RestResponse; @@ -9,6 +10,7 @@ import java.util.List; @RestResponse(allTo = "inventories") +@MaskSensitiveInfo public class APIQueryHostReply extends APIQueryReply { private List inventories; diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisInventory.java index a68225a7c45..95bc951ce76 100644 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisInventory.java @@ -1,23 +1,23 @@ package org.zstack.sdk; - +import org.zstack.sdk.BareMetal2DpuHostInventory; public class BareMetal2DpuChassisInventory extends org.zstack.sdk.BareMetal2ChassisInventory { - public java.lang.String config; - public void setConfig(java.lang.String config) { + public java.util.LinkedHashMap config; + public void setConfig(java.util.LinkedHashMap config) { this.config = config; } - public java.lang.String getConfig() { + public java.util.LinkedHashMap getConfig() { return this.config; } - public java.lang.String hostUuid; - public void setHostUuid(java.lang.String hostUuid) { - this.hostUuid = hostUuid; + public BareMetal2DpuHostInventory dpuHost; + public void setDpuHost(BareMetal2DpuHostInventory dpuHost) { + this.dpuHost = dpuHost; } - public java.lang.String getHostUuid() { - return this.hostUuid; + public BareMetal2DpuHostInventory getDpuHost() { + return this.dpuHost; } } diff --git a/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java b/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java index 0deb26d677d..4abe4832481 100644 --- a/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java +++ b/utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java @@ -5490,6 +5490,8 @@ public class CloudOperationsErrorCode { public static final String ORG_ZSTACK_BAREMETAL2_DPU_10001 = "ORG_ZSTACK_BAREMETAL2_DPU_10001"; + public static final String ORG_ZSTACK_BAREMETAL2_DPU_10002 = "ORG_ZSTACK_BAREMETAL2_DPU_10002"; + public static final String ORG_ZSTACK_STORAGE_PRIMARY_SHAREDBLOCK_10000 = "ORG_ZSTACK_STORAGE_PRIMARY_SHAREDBLOCK_10000"; public static final String ORG_ZSTACK_STORAGE_PRIMARY_SHAREDBLOCK_10001 = "ORG_ZSTACK_STORAGE_PRIMARY_SHAREDBLOCK_10001";