Skip to content

Commit f8d6bde

Browse files
author
shan.wu
committed
<feature>[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
1 parent 0f4c337 commit f8d6bde

3 files changed

Lines changed: 13 additions & 9 deletions

File tree

header/src/main/java/org/zstack/header/host/APIQueryHostReply.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.zstack.header.host;
22

3+
import org.zstack.header.log.MaskSensitiveInfo;
34
import org.zstack.header.query.APIQueryReply;
45
import org.zstack.header.rest.RestResponse;
56

@@ -9,6 +10,7 @@
910
import java.util.List;
1011

1112
@RestResponse(allTo = "inventories")
13+
@MaskSensitiveInfo
1214
public class APIQueryHostReply extends APIQueryReply {
1315
private List<HostInventory> inventories;
1416

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package org.zstack.sdk;
22

3-
3+
import org.zstack.sdk.BareMetal2DpuHostInventory;
44

55
public class BareMetal2DpuChassisInventory extends org.zstack.sdk.BareMetal2ChassisInventory {
66

7-
public java.lang.String config;
8-
public void setConfig(java.lang.String config) {
7+
public java.util.LinkedHashMap config;
8+
public void setConfig(java.util.LinkedHashMap config) {
99
this.config = config;
1010
}
11-
public java.lang.String getConfig() {
11+
public java.util.LinkedHashMap getConfig() {
1212
return this.config;
1313
}
1414

15-
public java.lang.String hostUuid;
16-
public void setHostUuid(java.lang.String hostUuid) {
17-
this.hostUuid = hostUuid;
15+
public BareMetal2DpuHostInventory dpuHost;
16+
public void setDpuHost(BareMetal2DpuHostInventory dpuHost) {
17+
this.dpuHost = dpuHost;
1818
}
19-
public java.lang.String getHostUuid() {
20-
return this.hostUuid;
19+
public BareMetal2DpuHostInventory getDpuHost() {
20+
return this.dpuHost;
2121
}
2222

2323
}

utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5490,6 +5490,8 @@ public class CloudOperationsErrorCode {
54905490

54915491
public static final String ORG_ZSTACK_BAREMETAL2_DPU_10001 = "ORG_ZSTACK_BAREMETAL2_DPU_10001";
54925492

5493+
public static final String ORG_ZSTACK_BAREMETAL2_DPU_10002 = "ORG_ZSTACK_BAREMETAL2_DPU_10002";
5494+
54935495
public static final String ORG_ZSTACK_STORAGE_PRIMARY_SHAREDBLOCK_10000 = "ORG_ZSTACK_STORAGE_PRIMARY_SHAREDBLOCK_10000";
54945496

54955497
public static final String ORG_ZSTACK_STORAGE_PRIMARY_SHAREDBLOCK_10001 = "ORG_ZSTACK_STORAGE_PRIMARY_SHAREDBLOCK_10001";

0 commit comments

Comments
 (0)