Skip to content

Commit 59ee53e

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 59ee53e

2 files changed

Lines changed: 21 additions & 1 deletion

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(255) 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", "dpuBaremetal2"})
7474
private String hypervisorType;
7575
/**
7676
* @desc see field 'type' of :ref:`ClusterInventory` for details

0 commit comments

Comments
 (0)