Skip to content

<fix>[sdk]: refactor HA network group validation #3770

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
zstack-robot-2 wants to merge 1 commit into
base: feature-5.5.6-dpu-net-ha2
Choose a base branch
from
+19 −24
Open

<fix>[sdk]: refactor HA network group validation #3770

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
16 changes: 11 additions & 5 deletions conf/db/upgrade/V5.5.12__schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ CREATE TABLE IF NOT EXISTS `zstack`.`HaNetworkGroupVO` (
`uuid` VARCHAR(32) NOT NULL UNIQUE COMMENT 'uuid',
`name` VARCHAR(255) NOT NULL,
`description` VARCHAR(2048) DEFAULT NULL,
`clusterUuid` VARCHAR(32) NOT NULL,
`type` VARCHAR(128) NOT NULL,
`minAvailableCount` INT(10) NOT NULL DEFAULT 1,
`configVersion` BIGINT UNSIGNED NOT NULL DEFAULT 0,
`state` VARCHAR(32) NOT NULL DEFAULT 'Enabled',
`lastOpDate` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
`createDate` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`uuid`),
CONSTRAINT `fkHaNetworkGroupVOClusterEO` FOREIGN KEY (`clusterUuid`) REFERENCES `zstack`.`ClusterEO` (`uuid`) ON DELETE CASCADE
PRIMARY KEY (`uuid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE IF NOT EXISTS `zstack`.`HaNetworkGroupL3NetworkRefVO` (
Expand All @@ -21,7 +18,7 @@ CREATE TABLE IF NOT EXISTS `zstack`.`HaNetworkGroupL3NetworkRefVO` (
`createDate` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`uuid`),
INDEX `idxHaNetworkGroupL3NetworkRefVOhaNetworkGroupUuid` (`haNetworkGroupUuid`),
INDEX `idxHaNetworkGroupL3NetworkRefVOl3NetworkUuid` (`l3NetworkUuid`),
UNIQUE INDEX `ukHaNetworkGroupL3NetworkRefVOl3NetworkUuid` (`l3NetworkUuid`),
CONSTRAINT `fkHaNetworkGroupL3NetworkRefVOHaNetworkGroupVO` FOREIGN KEY (`haNetworkGroupUuid`) REFERENCES `zstack`.`HaNetworkGroupVO` (`uuid`) ON DELETE CASCADE,
CONSTRAINT `fkHaNetworkGroupL3NetworkRefVOL3NetworkEO` FOREIGN KEY (`l3NetworkUuid`) REFERENCES `zstack`.`L3NetworkEO` (`uuid`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
Expand All @@ -40,3 +37,12 @@ CREATE TABLE IF NOT EXISTS `zstack`.`HostHaNetworkGroupStatusVO` (
CONSTRAINT `fkHostHaNetworkGroupStatusVOHostEO` FOREIGN KEY (`hostUuid`) REFERENCES `zstack`.`HostEO` (`uuid`) ON DELETE CASCADE,
CONSTRAINT `fkHostHaNetworkGroupStatusVOHaNetworkGroupVO` FOREIGN KEY (`networkGroupUuid`) REFERENCES `zstack`.`HaNetworkGroupVO` (`uuid`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE IF NOT EXISTS `zstack`.`HaNetworkGroupGlobalConfigVersionVO` (
`name` VARCHAR(64) NOT NULL,
`version` BIGINT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

INSERT IGNORE INTO `zstack`.`HaNetworkGroupGlobalConfigVersionVO` (`name`, `version`)
VALUES ('ha-network-group', 0);
3 changes: 0 additions & 3 deletions sdk/src/main/java/org/zstack/sdk/CreateHaNetworkGroupAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ public Result throwExceptionIfError() {
@Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String description;

@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String clusterUuid;

@Param(required = true, validValues = {"Flat","Public"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
public java.lang.String type;

Expand Down
16 changes: 0 additions & 16 deletions sdk/src/main/java/org/zstack/sdk/HaNetworkGroupInventory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ public java.lang.String getDescription() {
return this.description;
}

public java.lang.String clusterUuid;
public void setClusterUuid(java.lang.String clusterUuid) {
this.clusterUuid = clusterUuid;
}
public java.lang.String getClusterUuid() {
return this.clusterUuid;
}

public java.lang.String type;
public void setType(java.lang.String type) {
this.type = type;
Expand All @@ -52,14 +44,6 @@ public int getMinAvailableCount() {
return this.minAvailableCount;
}

public java.lang.Long configVersion;
public void setConfigVersion(java.lang.Long configVersion) {
this.configVersion = configVersion;
}
public java.lang.Long getConfigVersion() {
return this.configVersion;
}

public java.lang.String state;
public void setState(java.lang.String state) {
this.state = state;
Expand Down
8 changes: 8 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 @@ -1894,6 +1894,14 @@ public class CloudOperationsErrorCode {

public static final String ORG_ZSTACK_HA_10036 = "ORG_ZSTACK_HA_10036";

public static final String ORG_ZSTACK_HA_10037 = "ORG_ZSTACK_HA_10037";

public static final String ORG_ZSTACK_HA_10038 = "ORG_ZSTACK_HA_10038";

public static final String ORG_ZSTACK_HA_10039 = "ORG_ZSTACK_HA_10039";

public static final String ORG_ZSTACK_HA_10040 = "ORG_ZSTACK_HA_10040";

public static final String ORG_ZSTACK_NETWORK_SERVICE_SLB_10000 = "ORG_ZSTACK_NETWORK_SERVICE_SLB_10000";

public static final String ORG_ZSTACK_NETWORK_SERVICE_SLB_10001 = "ORG_ZSTACK_NETWORK_SERVICE_SLB_10001";
Expand Down