Skip to content

Commit 366b046

Browse files
mingjian2049mingjian2049
committed
[Internal: appcenter]
1 parent e7ffbb0 commit 366b046

21 files changed

Lines changed: 270 additions & 481 deletions

‎conf/db/upgrade/V3.8.0.1__schema.sql‎

Lines changed: 0 additions & 125 deletions
This file was deleted.

‎conf/db/upgrade/V3.9.0__schema.sql‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,129 @@ CREATE TABLE IF NOT EXISTS `zstack`.`ZBoxLocationRefVO` (
5757
PRIMARY KEY (`id`),
5858
CONSTRAINT `fkZBoxLocationRefVOZBoxVO` FOREIGN KEY (`zboxUuid`) REFERENCES `zstack`.`ZBoxVO` (`uuid`) ON DELETE CASCADE
5959
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
60+
61+
CREATE TABLE IF NOT EXISTS `AppBuildSystemVO` (
62+
`uuid` VARCHAR(32) NOT NULL UNIQUE,
63+
`name` VARCHAR(255) NOT NULL,
64+
`description` VARCHAR(2048) DEFAULT NULL,
65+
`storageType` VARCHAR(32) NOT NULL,
66+
`url` VARCHAR(1024) NOT NULL,
67+
`hostname` VARCHAR(255) NOT NULL,
68+
`username` VARCHAR(255) NOT NULL,
69+
`password` VARCHAR(255) NOT NULL,
70+
`sshPort` int unsigned NOT NULL,
71+
`status` varchar(32) NOT NULL,
72+
`state` varchar(32) NOT NULL,
73+
`totalCapacity` bigint unsigned DEFAULT 0,
74+
`availableCapacity` bigint unsigned DEFAULT 0,
75+
`lastOpDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
76+
`createDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
77+
PRIMARY KEY (`uuid`)
78+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
79+
80+
CREATE TABLE IF NOT EXISTS `AppBuildSystemZoneRefVO` (
81+
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT,
82+
`buildSystemUuid` varchar(32) NOT NULL,
83+
`zoneUuid` varchar(32) NOT NULL,
84+
`lastOpDate` timestamp ON UPDATE CURRENT_TIMESTAMP,
85+
`createDate` timestamp,
86+
PRIMARY KEY (`id`),
87+
CONSTRAINT `fkAppBuildSystemZoneRefVOZoneEO` FOREIGN KEY (`zoneUuid`) REFERENCES ZoneEO (`uuid`) ON DELETE CASCADE,
88+
CONSTRAINT `fkAppBuildSystemZoneRefVOAppBuildSystemVO` FOREIGN KEY (`buildSystemUuid`) REFERENCES AppBuildSystemVO (`uuid`) ON DELETE CASCADE
89+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
90+
91+
CREATE TABLE IF NOT EXISTS `BuildApplicationVO` (
92+
`uuid` VARCHAR(32) NOT NULL UNIQUE,
93+
`name` VARCHAR(255) NOT NULL,
94+
`description` VARCHAR(2048) DEFAULT NULL,
95+
`buildSystemUuid` varchar(32) DEFAULT NULL,
96+
`templateContent` mediumtext NOT NULL,
97+
`appMetaData` mediumtext NOT NULL,
98+
`appId` varchar(255) NOT NULL,
99+
`version` varchar(127) NOT NULL,
100+
`installPath` varchar(1024) DEFAULT NULL,
101+
`status` varchar(32) NOT NULL,
102+
`lastOpDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
103+
`createDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
104+
PRIMARY KEY (`uuid`),
105+
CONSTRAINT `fkBuildApplicationVOAppBuildSystemVO` FOREIGN KEY (`buildSystemUuid`) REFERENCES AppBuildSystemVO (`uuid`) ON DELETE RESTRICT
106+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
107+
108+
CREATE TABLE IF NOT EXISTS `BuildAppExportHistoryVO` (
109+
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT,
110+
`buildAppUuid` VARCHAR(32) NOT NULL,
111+
`name` VARCHAR(255) DEFAULT NULL,
112+
`path` VARCHAR(2048) DEFAULT NULL,
113+
`size` bigint unsigned DEFAULT 0,
114+
`md5Sum` varchar(255) NOT NULL,
115+
`version` varchar(127) NOT NULL,
116+
`status` varchar(32) NOT NULL,
117+
`lastOpDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
118+
`createDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
119+
PRIMARY KEY (`id`)
120+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
121+
CREATE INDEX idxBuildAppExportHistoryVObuildAppUuid ON BuildAppExportHistoryVO (buildAppUuid);
122+
CREATE INDEX idxBuildAppExportHistoryVOname ON BuildAppExportHistoryVO (name);
123+
124+
CREATE TABLE IF NOT EXISTS `BuildAppImageRefVO` (
125+
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT,
126+
`imageUuid` varchar(32) NOT NULL,
127+
`imageName` varchar(255) NOT NULL,
128+
`buildAppUuid` varchar(32) NOT NULL,
129+
`backupStorageUuid` varchar(32) NOT NULL,
130+
`lastOpDate` timestamp ON UPDATE CURRENT_TIMESTAMP,
131+
`createDate` timestamp,
132+
PRIMARY KEY (`id`),
133+
CONSTRAINT `fkBuildAppImageRefVOImageVO` FOREIGN KEY (`imageUuid`) REFERENCES ImageEO (`uuid`) ON DELETE RESTRICT,
134+
CONSTRAINT `fkBuildAppImageRefVOBackupStorageEO` FOREIGN KEY (`backupStorageUuid`) REFERENCES BackupStorageEO (`uuid`) ON DELETE RESTRICT,
135+
CONSTRAINT `fkBuildAppImageRefVOBuildApplicationVO` FOREIGN KEY (`buildAppUuid`) REFERENCES BuildApplicationVO (`uuid`) ON DELETE CASCADE
136+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
137+
138+
CREATE TABLE IF NOT EXISTS `PublishAppVO` (
139+
`uuid` VARCHAR(32) NOT NULL UNIQUE,
140+
`name` VARCHAR(255) NOT NULL,
141+
`description` VARCHAR(2048) DEFAULT NULL,
142+
`buildAppUuid` varchar(32) DEFAULT NULL,
143+
`templateContent` mediumtext NOT NULL,
144+
`appMetaData` mediumtext NOT NULL,
145+
`preParams` text DEFAULT NULL,
146+
`appId` varchar(255) NOT NULL,
147+
`version` varchar(127) NOT NULL,
148+
`type` varchar(32) NOT NULL,
149+
`status` varchar(32) NOT NULL,
150+
`lastOpDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
151+
`createDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
152+
PRIMARY KEY (`uuid`),
153+
CONSTRAINT `fkPublishAppVOBuildApplicationVO` FOREIGN KEY (`buildAppUuid`) REFERENCES BuildApplicationVO (`uuid`) ON DELETE SET NULL
154+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
155+
156+
CREATE TABLE IF NOT EXISTS `PublishAppResourceRefVO` (
157+
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT,
158+
`appUuid` VARCHAR(32) NOT NULL,
159+
`resourceUuid` VARCHAR(32) NOT NULL,
160+
`resourceType` VARCHAR(255) NOT NULL,
161+
`lastOpDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
162+
`createDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
163+
CONSTRAINT `fkPublishAppResourceRefVOPublishAppVO` FOREIGN KEY (`appUuid`) REFERENCES PublishAppVO (`uuid`) ON DELETE CASCADE,
164+
CONSTRAINT `fkPublishAppResourceRefVOResourceVO` FOREIGN KEY (`resourceUuid`) REFERENCES ResourceVO (`uuid`) ON DELETE CASCADE,
165+
PRIMARY KEY (`id`)
166+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
167+
168+
ALTER TABLE CloudFormationStackResourceRefVO ADD COLUMN resourceName VARCHAR(255) DEFAULT NULL;
169+
170+
ALTER TABLE PublishAppVO ADD COLUMN vmRelationship text DEFAULT NULL;
171+
172+
CREATE TABLE IF NOT EXISTS `ResourceStackVmPortRefVO` (
173+
`id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT,
174+
`stackUuid` VARCHAR(32) NOT NULL,
175+
`vmInstanceUuid` VARCHAR(32) NOT NULL,
176+
`port` int unsigned NOT NULL,
177+
`status` VARCHAR(64) NOT NULL,
178+
`lastOpDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
179+
`createDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
180+
CONSTRAINT `fkResourceStackVmPortRefVOResourceStackVO` FOREIGN KEY (`stackUuid`) REFERENCES ResourceStackVO (`uuid`) ON DELETE CASCADE,
181+
CONSTRAINT `fkResourceStackVmPortRefVOVmInstanceVO` FOREIGN KEY (`vmInstanceUuid`) REFERENCES VmInstanceEO (`uuid`) ON DELETE CASCADE,
182+
PRIMARY KEY (`id`)
183+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
184+
185+
ALTER TABLE ResourceStackVO ADD COLUMN outputs text DEFAULT NULL;

‎header/src/main/java/org/zstack/header/image/APICreateRootVolumeTemplateFromRootVolumeMsg.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import java.util.concurrent.TimeUnit;
1515

1616
@Action(category = ImageConstant.ACTION_CATEGORY)
17-
@TagResourceType(ImageVO.class)
1817
@RestRequest(
1918
path = "/images/root-volume-templates/from/volumes/{rootVolumeUuid}",
2019
method = HttpMethod.POST,

‎rest/src/main/resources/scripts/RestDocumentationGenerator.groovy‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ class RestDocumentationGenerator implements DocumentGenerator {
8080
"eipUuid": "弹性IP UUID",
8181
"loadBalancerUuid": "负载均衡器UUID",
8282
"rootVolumeUuid": "根云盘UUID",
83-
"userTag": "用户标签",
84-
"systemTag": "系统标签",
83+
"userTags": "用户标签",
84+
"systemTags": "系统标签",
8585
"tagUuids": "标签UUID列表",
86+
"deleteMode": "删除模式(Permissive / Enforcing，Permissive)",
87+
"resourceUuid": "资源UUID",
88+
"buildSystemUuid": "build存储系统UUID"
8689
]
8790

8891
String CHINESE_CN = "zh_cn"

‎sdk/src/main/java/org/zstack/sdk/AddAppBuildSystemAction.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ 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 = {"build","appcenter"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
38-
public java.lang.String type;
39-
4037
@Param(required = false, validValues = {"localStorage"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
4138
public java.lang.String storageType;
4239

‎sdk/src/main/java/org/zstack/sdk/AddBuildAppAction.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ public Result throwExceptionIfError() {
3434
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
3535
public java.lang.String backupStorageUuid;
3636

37-
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
38-
public java.lang.Boolean fromBuild;
39-
4037
@Param(required = false)
4138
public java.lang.String resourceUuid;
4239

‎sdk/src/main/java/org/zstack/sdk/CreateBuildAppAction.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ public Result throwExceptionIfError() {
3434
@Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false)
3535
public java.lang.String dataPath;
3636

37-
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
38-
public java.lang.Boolean buildImage;
39-
4037
@Param(required = false)
4138
public java.lang.String resourceUuid;
4239

‎sdk/src/main/java/org/zstack/sdk/DeleteBuildAppExportHistoryAction.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.HashMap;
44
import java.util.Map;
5+
import org.zstack.sdk.*;
56

67
public class DeleteBuildAppExportHistoryAction extends AbstractAction {
78

@@ -28,10 +29,10 @@ public Result throwExceptionIfError() {
2829
public java.lang.String buildAppUuid;
2930

3031
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
31-
public java.lang.String buildSystemUuid;
32+
public java.lang.String exportId;
3233

3334
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
34-
public java.lang.String exportId;
35+
public java.lang.String buildSystemUuid;
3536

3637
@Param(required = false)
3738
public java.lang.String deleteMode = "Permissive";

0 commit comments

Comments
 (0)