Skip to content

Commit 3a735d1

Browse files
author
shan.wu
committed
<feature>[dpu-bm2]: support dpu baremetal2 instance
support dpu baremetal2 instance Resolves/Related: ZSTAC-12345 Change-Id: I626d637a7168656a6c726c6769777a726e616973
1 parent 8276487 commit 3a735d1

5 files changed

Lines changed: 27 additions & 3 deletions

File tree

conf/db/upgrade/V5.5.0__schema.sql

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,3 +476,23 @@ CALL ADD_COLUMN('ModelServiceInstanceVO', 'architecture', 'VARCHAR(32)', 1, NULL
476476
CALL ADD_COLUMN('ModelServiceInstanceVO', 'gpuVendor', 'VARCHAR(128)', 1, NULL);
477477

478478
CALL ADD_COLUMN('ModelVO', 'dtype', 'varchar(32)', 1, NULL);
479+
480+
CREATE TABLE IF NOT EXISTS `zstack`.`BareMetal2DpuChassisVO` (
481+
`uuid` varchar(32) NOT NULL UNIQUE,
482+
`config` TEXT DEFAULT NULL,
483+
`hostUuid` varchar(32) DEFAULT NULL,
484+
PRIMARY KEY (`uuid`),
485+
CONSTRAINT `fkBareMetal2DpuChassisVOChassisVO` FOREIGN KEY (`uuid`) REFERENCES `BareMetal2ChassisVO` (`uuid`) ON DELETE CASCADE,
486+
CONSTRAINT `fkBareMetal2DpuChassisVOHostEO` FOREIGN KEY (`hostUuid`) REFERENCES `HostEO` (`uuid`) ON DELETE SET NULL
487+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
488+
489+
CREATE TABLE IF NOT EXISTS `zstack`.`BareMetal2DpuHostVO` (
490+
`uuid` varchar(32) NOT NULL UNIQUE,
491+
`chassisUuid` VARCHAR(32) NOT NULL,
492+
`vendorType` VARCHAR(255) NOT NULL,
493+
`url` VARCHAR(255) NOT NULL,
494+
PRIMARY KEY (`uuid`),
495+
CONSTRAINT `fkBareMetal2DpuHostVOHostVO` FOREIGN KEY (`uuid`) REFERENCES `HostEO` (`uuid`) ON DELETE CASCADE,
496+
CONSTRAINT `fkBareMetal2DpuHostVOChassisVO` FOREIGN KEY (`chassisUuid`) REFERENCES `BareMetal2ChassisVO` (`uuid`) ON DELETE CASCADE
497+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
498+

header/src/main/java/org/zstack/header/cluster/APICreateClusterMsg.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public class APICreateClusterMsg extends APICreateMessage implements CreateClust
7070
* - Simulator
7171
* - baremetal
7272
*/
73-
@APIParam(validValues = {"KVM", "Simulator", "baremetal", "baremetal2", "xdragon"})
73+
@APIParam(validValues = {"KVM", "Simulator", "baremetal", "baremetal2", "xdragon", "baremetal2Dpu"})
7474
private String hypervisorType;
7575
/**
7676
* @desc see field 'type' of :ref:`ClusterInventory` for details

header/src/main/java/org/zstack/header/cluster/APICreateClusterMsgDoc_zh_cn.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ doc {
5656
type "String"
5757
optional false
5858
since "0.6"
59-
values ("KVM","Simulator","baremetal","baremetal2","xdragon")
59+
values ("KVM","Simulator","baremetal","baremetal2","xdragon","baremetal2Dpu")
6060
}
6161
column {
6262
name "type"

sdk/src/main/java/SourceClassMap.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ public class SourceClassMap {
6565
put("org.zstack.baremetal2.chassis.BareMetal2ChassisInventory", "org.zstack.sdk.BareMetal2ChassisInventory");
6666
put("org.zstack.baremetal2.chassis.BareMetal2ChassisNicInventory", "org.zstack.sdk.BareMetal2ChassisNicInventory");
6767
put("org.zstack.baremetal2.chassis.BareMetal2ChassisPciDeviceInventory", "org.zstack.sdk.BareMetal2ChassisPciDeviceInventory");
68+
put("org.zstack.baremetal2.chassis.dpu.BareMetal2DpuChassisInventory", "org.zstack.sdk.BareMetal2DpuChassisInventory");
6869
put("org.zstack.baremetal2.chassis.ipmi.BareMetal2IpmiChassisInventory", "org.zstack.sdk.BareMetal2IpmiChassisInventory");
6970
put("org.zstack.baremetal2.configuration.BareMetal2ChassisOfferingInventory", "org.zstack.sdk.BareMetal2ChassisOfferingInventory");
71+
put("org.zstack.baremetal2.dpu.BareMetal2DpuHostInventory", "org.zstack.sdk.BareMetal2DpuHostInventory");
7072
put("org.zstack.baremetal2.gateway.BareMetal2GatewayInventory", "org.zstack.sdk.BareMetal2GatewayInventory");
7173
put("org.zstack.baremetal2.gateway.BareMetal2GatewayProvisionNicInventory", "org.zstack.sdk.BareMetal2GatewayProvisionNicInventory");
7274
put("org.zstack.baremetal2.instance.BareMetal2InstanceInventory", "org.zstack.sdk.BareMetal2InstanceInventory");
@@ -950,6 +952,8 @@ public class SourceClassMap {
950952
put("org.zstack.sdk.BareMetal2ChassisNicInventory", "org.zstack.baremetal2.chassis.BareMetal2ChassisNicInventory");
951953
put("org.zstack.sdk.BareMetal2ChassisOfferingInventory", "org.zstack.baremetal2.configuration.BareMetal2ChassisOfferingInventory");
952954
put("org.zstack.sdk.BareMetal2ChassisPciDeviceInventory", "org.zstack.baremetal2.chassis.BareMetal2ChassisPciDeviceInventory");
955+
put("org.zstack.sdk.BareMetal2DpuChassisInventory", "org.zstack.baremetal2.chassis.dpu.BareMetal2DpuChassisInventory");
956+
put("org.zstack.sdk.BareMetal2DpuHostInventory", "org.zstack.baremetal2.dpu.BareMetal2DpuHostInventory");
953957
put("org.zstack.sdk.BareMetal2GatewayInventory", "org.zstack.baremetal2.gateway.BareMetal2GatewayInventory");
954958
put("org.zstack.sdk.BareMetal2GatewayProvisionNicInventory", "org.zstack.baremetal2.gateway.BareMetal2GatewayProvisionNicInventory");
955959
put("org.zstack.sdk.BareMetal2InstanceInventory", "org.zstack.baremetal2.instance.BareMetal2InstanceInventory");

sdk/src/main/java/org/zstack/sdk/CreateClusterAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public Result throwExceptionIfError() {
3434
@Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
3535
public java.lang.String description;
3636

37-
@Param(required = true, validValues = {"KVM","Simulator","baremetal","baremetal2","xdragon"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
37+
@Param(required = true, validValues = {"KVM","Simulator","baremetal","baremetal2","xdragon","baremetal2Dpu"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
3838
public java.lang.String hypervisorType;
3939

4040
@Param(required = false, validValues = {"zstack","baremetal","baremetal2"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)

0 commit comments

Comments
 (0)