Skip to content

Commit f44f1a0

Browse files
author
gitlab
committed
Merge branch 'zmigrate-ZSV-1000@@3' into 'feature-zsv-5.0.0-zmigrate'
<fix>[volume]: support thirdPartySoftwarePackage See merge request zstackio/zstack!9141
2 parents 13b74e6 + fb8ce37 commit f44f1a0

36 files changed

Lines changed: 2401 additions & 262 deletions

File tree

‎build/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,11 @@
523523
<artifactId>zce-x-plugin</artifactId>
524524
<version>${project.version}</version>
525525
</dependency>
526+
<dependency>
527+
<groupId>org.zstack</groupId>
528+
<artifactId>zmigrate-plugin</artifactId>
529+
<version>${project.version}</version>
530+
</dependency>
526531
<dependency>
527532
<groupId>org.zstack</groupId>
528533
<artifactId>zsv</artifactId>

‎conf/errorCodes/ZMigratePlugin.xml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<error>
2+
<prefix>ZMigrate</prefix>
3+
4+
<code>
5+
<id>1000</id>
6+
<description>ZMigrate generic error</description>
7+
</code>
8+
9+
<code>
10+
<id>1001</id>
11+
<description>Failed to create account in ZMigrate</description>
12+
</code>
13+
14+
<code>
15+
<id>1002</id>
16+
<description>Failed to verify platform connection</description>
17+
</code>
18+
19+
<code>
20+
<id>1003</id>
21+
<description>Failed to register ZSV to ZMigrate</description>
22+
</code>
23+
24+
<code>
25+
<id>1004</id>
26+
<description>Failed to verify gateway connection</description>
27+
</code>
28+
29+
<code>
30+
<id>1005</id>
31+
<description>Failed to register gateway to ZMigrate</description>
32+
</code>
33+
34+
<code>
35+
<id>1006</id>
36+
<description>Failed to get ZMigrate management server information</description>
37+
</code>
38+
39+
<code>
40+
<id>1007</id>
41+
<description>Failed to get platform information</description>
42+
</code>
43+
44+
<code>
45+
<id>1008</id>
46+
<description>Failed to get gateway server information</description>
47+
</code>
48+
49+
<code>
50+
<id>1009</id>
51+
<description>Failed to get migration jobs</description>
52+
</code>
53+
54+
<code>
55+
<id>1010</id>
56+
<description>Failed to get licenses from ZMigrate</description>
57+
</code>
58+
59+
<code>
60+
<id>1011</id>
61+
<description>Failed to get encrypt key</description>
62+
</code>
63+
64+
<code>
65+
<id>1012</id>
66+
<description>Failed to get gateway hostname</description>
67+
</code>
68+
</error>

‎header/src/main/java/org/zstack/header/storage/backup/CancelDownloadFileOnBackupStorageHostMsg.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package org.zstack.header.storage.backup;
2+
3+
import org.zstack.header.message.CancelMessage;
4+
5+
public class CancelDownloadFileOnBackupStorageHostMsg extends CancelMessage implements BackupStorageMessage {
6+
private String backupStorageUuid;
7+
private String backupStorageHostUuid;
8+
9+
@Override
10+
public String getBackupStorageUuid() {
11+
return backupStorageUuid;
12+
}
13+
14+
public void setBackupStorageUuid(String backupStorageUuid) {
15+
this.backupStorageUuid = backupStorageUuid;
16+
}
17+
18+
public String getBackupStorageHostUuid() {
19+
return backupStorageHostUuid;
20+
}
21+
22+
public void setBackupStorageHostUuid(String backupStorageHostUuid) {
23+
this.backupStorageHostUuid = backupStorageHostUuid;
24+
}
25+
}

‎header/src/main/java/org/zstack/header/storage/backup/CancelDownloadFileOnBackupStorageHostReply.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.zstack.header.storage.backup;
2+
3+
import org.zstack.header.message.MessageReply;
4+
5+
public class CancelDownloadFileOnBackupStorageHostReply extends MessageReply {
6+
}

‎header/src/main/java/org/zstack/header/storage/backup/DeleteFilesOnBackupStorageHostMsg.java‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package org.zstack.header.storage.backup;
2+
3+
import org.zstack.header.message.NeedReplyMessage;
4+
5+
import java.util.ArrayList;
6+
import java.util.List;
7+
8+
public class DeleteFilesOnBackupStorageHostMsg extends NeedReplyMessage implements BackupStorageMessage {
9+
private String backupStorageUuid;
10+
private String backupStorageHostUuid;
11+
private List<String> filePaths = new ArrayList<>();
12+
13+
@Override
14+
public String getBackupStorageUuid() {
15+
return backupStorageUuid;
16+
}
17+
18+
public void setBackupStorageUuid(String backupStorageUuid) {
19+
this.backupStorageUuid = backupStorageUuid;
20+
}
21+
22+
public String getBackupStorageHostUuid() {
23+
return backupStorageHostUuid;
24+
}
25+
26+
public void setBackupStorageHostUuid(String backupStorageHostUuid) {
27+
this.backupStorageHostUuid = backupStorageHostUuid;
28+
}
29+
30+
public List<String> getFilePaths() {
31+
return filePaths;
32+
}
33+
34+
public void setFilePaths(List<String> filePaths) {
35+
this.filePaths = filePaths == null ? new ArrayList<>() : filePaths;
36+
}
37+
}

‎header/src/main/java/org/zstack/header/storage/backup/DeleteFilesOnBackupStorageHostReply.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.zstack.header.storage.backup;
2+
3+
import org.zstack.header.message.MessageReply;
4+
5+
public class DeleteFilesOnBackupStorageHostReply extends MessageReply {
6+
}

‎header/src/main/java/org/zstack/header/storage/backup/GetFileDownloadProgressFromBackupStorageHostMsg.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package org.zstack.header.storage.backup;
2+
3+
import org.zstack.header.message.NeedReplyMessage;
4+
5+
public class GetFileDownloadProgressFromBackupStorageHostMsg extends NeedReplyMessage implements BackupStorageMessage {
6+
private String backupStorageUuid;
7+
private String backupStorageHostUuid;
8+
private String taskUuid;
9+
10+
@Override
11+
public String getBackupStorageUuid() {
12+
return backupStorageUuid;
13+
}
14+
15+
public void setBackupStorageUuid(String backupStorageUuid) {
16+
this.backupStorageUuid = backupStorageUuid;
17+
}
18+
19+
public String getBackupStorageHostUuid() {
20+
return backupStorageHostUuid;
21+
}
22+
23+
public void setBackupStorageHostUuid(String backupStorageHostUuid) {
24+
this.backupStorageHostUuid = backupStorageHostUuid;
25+
}
26+
27+
public String getTaskUuid() {
28+
return taskUuid;
29+
}
30+
31+
public void setTaskUuid(String taskUuid) {
32+
this.taskUuid = taskUuid;
33+
}
34+
}

‎header/src/main/java/org/zstack/header/storage/backup/GetFileDownloadProgressFromBackupStorageHostReply.java‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
package org.zstack.header.storage.backup;
2+
3+
import org.zstack.header.message.MessageReply;
4+
5+
public class GetFileDownloadProgressFromBackupStorageHostReply extends MessageReply {
6+
private boolean completed;
7+
private int progress;
8+
9+
private long size;
10+
private long actualSize;
11+
private long downloadSize;
12+
private String installPath;
13+
private long lastOpTime;
14+
private boolean supportSuspend;
15+
private String md5sum;
16+
private String format;
17+
18+
public boolean isCompleted() {
19+
return completed;
20+
}
21+
22+
public void setCompleted(boolean completed) {
23+
this.completed = completed;
24+
}
25+
26+
public int getProgress() {
27+
return progress;
28+
}
29+
30+
public void setProgress(int progress) {
31+
this.progress = progress;
32+
}
33+
34+
public long getSize() {
35+
return size;
36+
}
37+
38+
public void setSize(long size) {
39+
this.size = size;
40+
}
41+
42+
public long getActualSize() {
43+
return actualSize;
44+
}
45+
46+
public void setActualSize(long actualSize) {
47+
this.actualSize = actualSize;
48+
}
49+
50+
public String getInstallPath() {
51+
return installPath;
52+
}
53+
54+
public void setInstallPath(String installPath) {
55+
this.installPath = installPath;
56+
}
57+
58+
public String getFormat() {
59+
return format;
60+
}
61+
62+
public void setFormat(String format) {
63+
this.format = format;
64+
}
65+
66+
public long getLastOpTime() {
67+
return lastOpTime;
68+
}
69+
70+
public void setLastOpTime(long lastOpTime) {
71+
this.lastOpTime = lastOpTime;
72+
}
73+
74+
public long getDownloadSize() {
75+
return downloadSize;
76+
}
77+
78+
public void setDownloadSize(long downloadSize) {
79+
this.downloadSize = downloadSize;
80+
}
81+
82+
public boolean isSupportSuspend() {
83+
return supportSuspend;
84+
}
85+
86+
public void setSupportSuspend(boolean supportSuspend) {
87+
this.supportSuspend = supportSuspend;
88+
}
89+
90+
public String getMd5sum() {
91+
return md5sum;
92+
}
93+
94+
public void setMd5sum(String md5sum) {
95+
this.md5sum = md5sum;
96+
}
97+
}

‎header/src/main/java/org/zstack/header/storage/backup/SoftwareUpgradePackageDeployMsg.java‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
package org.zstack.header.storage.backup;
2+
3+
import org.zstack.header.log.NoLogging;
4+
import org.zstack.header.message.NeedReplyMessage;
5+
6+
public class SoftwareUpgradePackageDeployMsg extends NeedReplyMessage implements BackupStorageMessage {
7+
private String backupStorageUuid;
8+
private String backupStorageHostUuid;
9+
private String upgradePackagePath;
10+
private String upgradePackageTargetPath;
11+
private int targetHostSshPort;
12+
private String targetHostSshUsername;
13+
@NoLogging
14+
private String targetHostSshPassword;
15+
private String targetHostIp;
16+
private String upgradeScriptPath;
17+
18+
@Override
19+
public String getBackupStorageUuid() {
20+
return backupStorageUuid;
21+
}
22+
23+
public void setBackupStorageUuid(String backupStorageUuid) {
24+
this.backupStorageUuid = backupStorageUuid;
25+
}
26+
27+
public String getBackupStorageHostUuid() {
28+
return backupStorageHostUuid;
29+
}
30+
31+
public void setBackupStorageHostUuid(String backupStorageHostUuid) {
32+
this.backupStorageHostUuid = backupStorageHostUuid;
33+
}
34+
35+
public String getUpgradePackageTargetPath() {
36+
return upgradePackageTargetPath;
37+
}
38+
39+
public void setUpgradePackageTargetPath(String upgradePackageTargetPath) {
40+
this.upgradePackageTargetPath = upgradePackageTargetPath;
41+
}
42+
43+
public String getUpgradePackagePath() {
44+
return upgradePackagePath;
45+
}
46+
47+
public void setUpgradePackagePath(String upgradePackagePath) {
48+
this.upgradePackagePath = upgradePackagePath;
49+
}
50+
51+
public int getTargetHostSshPort() {
52+
return targetHostSshPort;
53+
}
54+
55+
public void setTargetHostSshPort(int targetHostSshPort) {
56+
this.targetHostSshPort = targetHostSshPort;
57+
}
58+
59+
public String getTargetHostSshUsername() {
60+
return targetHostSshUsername;
61+
}
62+
63+
public void setTargetHostSshUsername(String targetHostSshUsername) {
64+
this.targetHostSshUsername = targetHostSshUsername;
65+
}
66+
67+
public String getTargetHostSshPassword() {
68+
return targetHostSshPassword;
69+
}
70+
71+
public void setTargetHostSshPassword(String targetHostSshPassword) {
72+
this.targetHostSshPassword = targetHostSshPassword;
73+
}
74+
75+
public String getTargetHostIp() {
76+
return targetHostIp;
77+
}
78+
79+
public void setTargetHostIp(String targetHostIp) {
80+
this.targetHostIp = targetHostIp;
81+
}
82+
83+
public String getUpgradeScriptPath() {
84+
return upgradeScriptPath;
85+
}
86+
87+
public void setUpgradeScriptPath(String upgradeScriptPath) {
88+
this.upgradeScriptPath = upgradeScriptPath;
89+
}
90+
}

‎header/src/main/java/org/zstack/header/storage/backup/SoftwareUpgradePackageDeployReply.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package org.zstack.header.storage.backup;
2+
3+
import org.zstack.header.message.MessageReply;
4+
5+
public class SoftwareUpgradePackageDeployReply extends MessageReply {
6+
}

0 commit comments

Comments
 (0)