<feature>[dpu-bm2]: support dpu bm2 instance

shan.wu · shan.wu · commit 993afb1087fa · 2026-03-30T11:27:14.000+08:00
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
4. support online resizing of volume of dpu baremetal2 instance

Resolves/Related: ZSTAC-83415

Change-Id: I636d637a7168656a6c726c6769777a726e616974
diff --git a/header/src/main/java/org/zstack/header/volume/VolumeProtocol.java b/header/src/main/java/org/zstack/header/volume/VolumeProtocol.java
@@ -5,5 +5,6 @@ public enum VolumeProtocol {
     iSCSI,
     Vhost,
     CBD,
-    NBD
+    NBD,
+    RBD
 }
diff --git a/header/src/main/java/org/zstack/header/volume/VolumeProtocolCapability.java b/header/src/main/java/org/zstack/header/volume/VolumeProtocolCapability.java
@@ -65,4 +65,12 @@ public boolean isSupportReadonly() {
     public void setSupportReadonly(boolean supportReadonly) {
         this.supportReadonly = supportReadonly;
     }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public String getHypervisor() {
+        return hypervisor;
+    }
 }
diff --git a/sdk/src/main/java/SourceClassMap.java b/sdk/src/main/java/SourceClassMap.java
@@ -66,6 +66,7 @@ public class SourceClassMap {
 			put("org.zstack.baremetal2.chassis.BareMetal2ChassisInventory", "org.zstack.sdk.BareMetal2ChassisInventory");
 			put("org.zstack.baremetal2.chassis.BareMetal2ChassisNicInventory", "org.zstack.sdk.BareMetal2ChassisNicInventory");
 			put("org.zstack.baremetal2.chassis.BareMetal2ChassisPciDeviceInventory", "org.zstack.sdk.BareMetal2ChassisPciDeviceInventory");
+			put("org.zstack.baremetal2.chassis.dpu.BareMetal2DpuChassisConfig", "org.zstack.sdk.BareMetal2DpuChassisConfig");
 			put("org.zstack.baremetal2.chassis.dpu.BareMetal2DpuChassisInventory", "org.zstack.sdk.BareMetal2DpuChassisInventory");
 			put("org.zstack.baremetal2.chassis.ipmi.BareMetal2IpmiChassisInventory", "org.zstack.sdk.BareMetal2IpmiChassisInventory");
 			put("org.zstack.baremetal2.configuration.BareMetal2ChassisOfferingInventory", "org.zstack.sdk.BareMetal2ChassisOfferingInventory");
@@ -960,6 +961,7 @@ public class SourceClassMap {
 			put("org.zstack.sdk.BareMetal2ChassisNicInventory", "org.zstack.baremetal2.chassis.BareMetal2ChassisNicInventory");
 			put("org.zstack.sdk.BareMetal2ChassisOfferingInventory", "org.zstack.baremetal2.configuration.BareMetal2ChassisOfferingInventory");
 			put("org.zstack.sdk.BareMetal2ChassisPciDeviceInventory", "org.zstack.baremetal2.chassis.BareMetal2ChassisPciDeviceInventory");
+			put("org.zstack.sdk.BareMetal2DpuChassisConfig", "org.zstack.baremetal2.chassis.dpu.BareMetal2DpuChassisConfig");
 			put("org.zstack.sdk.BareMetal2DpuChassisInventory", "org.zstack.baremetal2.chassis.dpu.BareMetal2DpuChassisInventory");
 			put("org.zstack.sdk.BareMetal2DpuHostInventory", "org.zstack.baremetal2.dpu.BareMetal2DpuHostInventory");
 			put("org.zstack.sdk.BareMetal2GatewayInventory", "org.zstack.baremetal2.gateway.BareMetal2GatewayInventory");
diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisConfig.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisConfig.java
@@ -0,0 +1,39 @@
+package org.zstack.sdk;
+
+
+
+public class BareMetal2DpuChassisConfig  {
+
+    public java.lang.String ipmiAddress;
+    public void setIpmiAddress(java.lang.String ipmiAddress) {
+        this.ipmiAddress = ipmiAddress;
+    }
+    public java.lang.String getIpmiAddress() {
+        return this.ipmiAddress;
+    }
+
+    public int ipmiPort;
+    public void setIpmiPort(int ipmiPort) {
+        this.ipmiPort = ipmiPort;
+    }
+    public int getIpmiPort() {
+        return this.ipmiPort;
+    }
+
+    public java.lang.String ipmiUsername;
+    public void setIpmiUsername(java.lang.String ipmiUsername) {
+        this.ipmiUsername = ipmiUsername;
+    }
+    public java.lang.String getIpmiUsername() {
+        return this.ipmiUsername;
+    }
+
+    public java.lang.String ipmiPassword;
+    public void setIpmiPassword(java.lang.String ipmiPassword) {
+        this.ipmiPassword = ipmiPassword;
+    }
+    public java.lang.String getIpmiPassword() {
+        return this.ipmiPassword;
+    }
+
+}
diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisInventory.java
@@ -1,23 +1,24 @@
 package org.zstack.sdk;
 
-
+import org.zstack.sdk.BareMetal2DpuChassisConfig;
+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 BareMetal2DpuChassisConfig config;
+    public void setConfig(BareMetal2DpuChassisConfig config) {
         this.config = config;
     }
-    public java.lang.String getConfig() {
+    public BareMetal2DpuChassisConfig 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
@@ -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";

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@ public enum VolumeProtocol {`
`5`	`5`	`iSCSI,`
`6`	`6`	`Vhost,`
`7`	`7`	`CBD,`
`8`		`- NBD`
	`8`	`+ NBD,`
	`9`	`+ RBD`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,4 +65,12 @@ public boolean isSupportReadonly() {`
`65`	`65`	`public void setSupportReadonly(boolean supportReadonly) {`
`66`	`66`	`this.supportReadonly = supportReadonly;`
`67`	`67`	`}`
	`68`	`+`
	`69`	`+ public String getProtocol() {`
	`70`	`+ return protocol;`
	`71`	`+ }`
	`72`	`+`
	`73`	`+ public String getHypervisor() {`
	`74`	`+ return hypervisor;`
	`75`	`+ }`
`68`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,24 @@`
`1`	`1`	`package org.zstack.sdk;`
`2`	`2`
`3`		`-`
	`3`	`+import org.zstack.sdk.BareMetal2DpuChassisConfig;`
	`4`	`+import org.zstack.sdk.BareMetal2DpuHostInventory;`
`4`	`5`
`5`	`6`	`public class BareMetal2DpuChassisInventory extends org.zstack.sdk.BareMetal2ChassisInventory {`
`6`	`7`
`7`		`- public java.lang.String config;`
`8`		`- public void setConfig(java.lang.String config) {`
	`8`	`+ public BareMetal2DpuChassisConfig config;`
	`9`	`+ public void setConfig(BareMetal2DpuChassisConfig config) {`
`9`	`10`	`this.config = config;`
`10`	`11`	`}`
`11`		`- public java.lang.String getConfig() {`
	`12`	`+ public BareMetal2DpuChassisConfig getConfig() {`
`12`	`13`	`return this.config;`
`13`	`14`	`}`
`14`	`15`
`15`		`- public java.lang.String hostUuid;`
`16`		`- public void setHostUuid(java.lang.String hostUuid) {`
`17`		`- this.hostUuid = hostUuid;`
	`16`	`+ public BareMetal2DpuHostInventory dpuHost;`
	`17`	`+ public void setDpuHost(BareMetal2DpuHostInventory dpuHost) {`
	`18`	`+ this.dpuHost = dpuHost;`
`18`	`19`	`}`
`19`		`- public java.lang.String getHostUuid() {`
`20`		`- return this.hostUuid;`
	`20`	`+ public BareMetal2DpuHostInventory getDpuHost() {`
	`21`	`+ return this.dpuHost;`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`}`