Skip to content

<feature>[dpu-bm2]: support dpu baremetal2 instance #3492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatheMatrix wants to merge 1 commit into
base: 5.5.12
Choose a base branch
from
+61 −10
Open

<feature>[dpu-bm2]: support dpu baremetal2 instance #3492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion header/src/main/java/org/zstack/header/volume/VolumeProtocol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ public enum VolumeProtocol {
iSCSI,
Vhost,
CBD,
NBD
NBD,
RBD
}
8 changes: 8 additions & 0 deletions header/src/main/java/org/zstack/header/volume/VolumeProtocolCapability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
2 changes: 2 additions & 0 deletions sdk/src/main/java/SourceClassMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down
37 changes: 37 additions & 0 deletions sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
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 java.lang.Integer ipmiPort;
public void setIpmiPort(java.lang.Integer ipmiPort) {
this.ipmiPort = ipmiPort;
}
public java.lang.Integer 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;
}

}
19 changes: 10 additions & 9 deletions sdk/src/main/java/org/zstack/sdk/BareMetal2DpuChassisInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}

}
2 changes: 2 additions & 0 deletions utils/src/main/java/org/zstack/utils/clouderrorcode/CloudOperationsErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down