Skip to content

Commit 35ca1ac

Browse files
author
gitlab
committed
Merge branch 'app-merge@@2' into 'master'
App merge@@2 See merge request zstackio/zstack!6119
2 parents 3589056 + 366b046 commit 35ca1ac

107 files changed

Lines changed: 5675 additions & 38 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,11 @@
261261
<artifactId>cloudformation</artifactId>
262262
<version>${project.version}</version>
263263
</dependency>
264+
<dependency>
265+
<groupId>org.zstack</groupId>
266+
<artifactId>appcenter</artifactId>
267+
<version>${project.version}</version>
268+
</dependency>
264269
<dependency>
265270
<groupId>org.zstack</groupId>
266271
<artifactId>hybrid</artifactId>
@@ -452,6 +457,11 @@
452457
<artifactId>iam2-script-plugin</artifactId>
453458
<version>${project.version}</version>
454459
</dependency>
460+
<dependency>
461+
<groupId>org.zstack</groupId>
462+
<artifactId>zbox</artifactId>
463+
<version>${project.version}</version>
464+
</dependency>
455465
</dependencies>
456466
</profile>
457467
</profiles>

‎compute/src/main/java/org/zstack/compute/host/HostBase.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,8 @@ protected void handleLocalMessage(Message msg) {
548548
handle((ChangeHostConnectionStateMsg) msg);
549549
} else if (msg instanceof PingHostMsg) {
550550
handle((PingHostMsg) msg);
551+
} else if (msg instanceof ScanVmPortMsg) {
552+
handle((ScanVmPortMsg) msg);
551553
} else if (msg instanceof UpdateHostOSMsg) {
552554
handle((UpdateHostOSMsg) msg);
553555
} else {
@@ -603,7 +605,17 @@ public String getName() {
603605
});
604606
}
605607

606-
private void doPingHost(PingHostMsg msg, ReturnValueCompletion<PingHostReply> completion) {
608+
protected void scanVmPorts(final ScanVmPortMsg msg) {
609+
ScanVmPortReply reply = new ScanVmPortReply();
610+
reply.setSupportScan(false);
611+
bus.reply(msg, reply);
612+
}
613+
614+
private void handle(final ScanVmPortMsg msg) {
615+
scanVmPorts(msg);
616+
}
617+
618+
private void doPingHost(final PingHostMsg msg, ReturnValueCompletion<PingHostReply> completion) {
607619
final PingHostReply reply = new PingHostReply();
608620
if (self.getStatus() == HostStatus.Connecting) {
609621
completion.fail(operr("host is connecting, ping failed"));

‎compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ public class VmSystemTags {
127127
);
128128

129129
public static PatternedSystemTag PACKER_BUILD = new PatternedSystemTag("packer", VmInstanceVO.class);
130-
131130
public static final String VM_PRIORITY_TOKEN = "vmPriority";
132131
public static PatternedSystemTag VM_PRIORITY = new PatternedSystemTag(String.format("vmPriority::{%s}", VM_PRIORITY_TOKEN), VmInstanceVO.class
133132
);

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

Lines changed: 159 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,162 @@ ALTER TABLE `zstack`.`PolicyRouteTableVO` ADD COLUMN type VARCHAR(64) DEFAULT "U
2424
ALTER TABLE `zstack`.`VmNicVO` ADD COLUMN `driverType` varchar(64) DEFAULT NULL;
2525

2626
ALTER TABLE `zstack`.`AutoScalingGroupInstanceVO` ADD COLUMN protectionStrategy VARCHAR(128) DEFAULT "Unprotected" NOT NULL;
27-
ALTER TABLE `zstack`.`AutoScalingGroupInstanceVO` MODIFY COLUMN `protectionStrategy` VARCHAR(128) NOT NULL;
27+
ALTER TABLE `zstack`.`AutoScalingGroupInstanceVO` MODIFY COLUMN `protectionStrategy` VARCHAR(128) NOT NULL;
28+
CREATE TABLE IF NOT EXISTS `zstack`.`ZBoxVO` (
29+
`uuid` VARCHAR(32) NOT NULL,
30+
`name` VARCHAR(256) NOT NULL,
31+
`description` VARCHAR(2048) DEFAULT NULL,
32+
`state` VARCHAR(32) NOT NULL,
33+
`status` VARCHAR(32) NOT NULL,
34+
`mountPath` VARCHAR(2048) DEFAULT NULL,
35+
`totalCapacity` BIGINT UNSIGNED,
36+
`availableCapacity` BIGINT UNSIGNED,
37+
`busNum` varchar(32) DEFAULT NULL,
38+
`devNum` varchar(32) DEFAULT NULL,
39+
`idVendor` varchar(32) DEFAULT NULL,
40+
`idProduct` varchar(32) DEFAULT NULL,
41+
`iManufacturer` varchar(1024) DEFAULT NULL,
42+
`iProduct` varchar(1024) DEFAULT NULL,
43+
`iSerial` varchar(32) DEFAULT NULL,
44+
`usbVersion` varchar(32) DEFAULT NULL,
45+
`lastOpDate` TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
46+
`createDate` TIMESTAMP,
47+
48+
PRIMARY KEY (`uuid`)
49+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
50+
51+
CREATE TABLE IF NOT EXISTS `zstack`.`ZBoxLocationRefVO` (
52+
`id` bigint(20) NOT NULL AUTO_INCREMENT,
53+
`zboxUuid` VARCHAR(32) NOT NULL,
54+
`resourceUuid` VARCHAR(32) NOT NULL,
55+
`resourceType` VARCHAR(256) NOT NULL,
56+
57+
PRIMARY KEY (`id`),
58+
CONSTRAINT `fkZBoxLocationRefVOZBoxVO` FOREIGN KEY (`zboxUuid`) REFERENCES `zstack`.`ZBoxVO` (`uuid`) ON DELETE CASCADE
59+
) 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;

‎conf/errorCodes/zbox.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<error>
2+
<prefix>zbox</prefix>
3+
4+
<code>
5+
<id>1000</id>
6+
<description>wait to attach zbox</description>
7+
</code>
8+
</error>

‎header/src/main/java/org/zstack/header/host/ScanVmPortMsg.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
package org.zstack.header.host;
2+
3+
import org.zstack.header.message.NeedReplyMessage;
4+
5+
/**
6+
* Created by mingjian.deng on 2019/11/25.
7+
*/
8+
public class ScanVmPortMsg extends NeedReplyMessage implements HostMessage {
9+
private String ip;
10+
private String brName;
11+
private int port;
12+
private String hostUuid;
13+
14+
public String getIp() {
15+
return ip;
16+
}
17+
18+
public void setIp(String ip) {
19+
this.ip = ip;
20+
}
21+
22+
public String getBrName() {
23+
return brName;
24+
}
25+
26+
public void setBrName(String brName) {
27+
this.brName = brName;
28+
}
29+
30+
public int getPort() {
31+
return port;
32+
}
33+
34+
public void setPort(int port) {
35+
this.port = port;
36+
}
37+
38+
@Override
39+
public String getHostUuid() {
40+
return hostUuid;
41+
}
42+
43+
public void setHostUuid(String hostUuid) {
44+
this.hostUuid = hostUuid;
45+
}
46+
}

‎header/src/main/java/org/zstack/header/host/ScanVmPortReply.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package org.zstack.header.host;
2+
3+
import org.zstack.header.message.MessageReply;
4+
5+
import java.util.HashMap;
6+
import java.util.Map;
7+
8+
/**
9+
* Created by mingjian.deng on 2019/11/25.
10+
*/
11+
public class ScanVmPortReply extends MessageReply {
12+
Map<String, String> status = new HashMap<>();
13+
private boolean supportScan;
14+
15+
public Map<String, String> getStatus() {
16+
return status;
17+
}
18+
19+
public void setStatus(Map<String, String> status) {
20+
this.status = status;
21+
}
22+
23+
public boolean isSupportScan() {
24+
return supportScan;
25+
}
26+
27+
public void setSupportScan(boolean supportScan) {
28+
this.supportScan = supportScan;
29+
}
30+
}

‎header/src/main/java/org/zstack/header/query/APIQueryMessage.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public abstract class APIQueryMessage extends APISyncCallMessage {
1414
private boolean count;
1515
private String groupBy;
1616
private boolean replyWithCount;
17+
private String filterName;
1718
private String sortBy;
1819
@APIParam(required = false, validValues = {"asc", "desc"})
1920
private String sortDirection = "asc";
@@ -121,4 +122,12 @@ public boolean isCount() {
121122
public void setCount(boolean count) {
122123
this.count = count;
123124
}
125+
126+
public String getFilterName() {
127+
return filterName;
128+
}
129+
130+
public void setFilterName(String filterName) {
131+
this.filterName = filterName;
132+
}
124133
}

‎header/src/main/java/org/zstack/header/query/QueryBelongFilter.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.zstack.header.query;
2+
3+
import java.util.List;
4+
5+
/**
6+
* Created by mingjian.deng on 2020/3/6.
7+
*/
8+
public interface QueryBelongFilter {
9+
String filterName();
10+
void filter(List result, String condition);
11+
}

‎image/src/main/java/org/zstack/image/ImageSystemTags.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ public class ImageSystemTags {
3737
public static PatternedSystemTag IMAGE_CREATED_BY_SYSTEM =
3838
new PatternedSystemTag(String.format("%s", IMAGE_CREATED_BY_SYSTEM_TOKEN), ImageVO.class);
3939

40-
public static PatternedSystemTag PACKER_BUILD = new PatternedSystemTag("packer", ImageVO.class);
41-
4240
public static String IMAGE_GUEST_TOOLS_VERSION_TOKEN = "guestToolsVersion";
4341
public static PatternedSystemTag IMAGE_GUEST_TOOLS =
4442
new PatternedSystemTag(String.format("GuestTools::{%s}", IMAGE_GUEST_TOOLS_VERSION_TOKEN), ImageVO.class);
43+
public static String APPCENTER_BUILD_TOKEN = "buildapp";
44+
public static PatternedSystemTag APPCENTER_BUILD = new PatternedSystemTag(String.format("buildapp::{%s}", APPCENTER_BUILD_TOKEN), ImageVO.class);
45+
46+
public static PatternedSystemTag PACKER_BUILD = new PatternedSystemTag("packer", ImageVO.class);
4547
}

0 commit comments

Comments
 (0)