Skip to content

Commit fd5a1c7

Browse files
author
gitlab
committed
Merge branch 'ZSTAC-54773' into '4.6.31'
Zstac 54773 See merge request zstackio/zstack!3836
2 parents 48de845 + f2e4d8b commit fd5a1c7

13 files changed

+229
-141
lines changed

‎header/src/main/java/org/zstack/header/vm/VmSchedHistoryInventory.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
foreignKey = "zoneUuid", expandedInventoryKey = "uuid"),
2121
})
2222
public class VmSchedHistoryInventory implements Serializable {
23-
@APINoSee
2423
private long id;
2524
private String vmInstanceUuid;
2625
private String accountUuid;

‎sdk/src/main/java/SourceClassMap.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ public class SourceClassMap {
304304
put("org.zstack.header.storage.snapshot.group.VolumeSnapshotGroupAvailability", "org.zstack.sdk.VolumeSnapshotGroupAvailability");
305305
put("org.zstack.header.storage.snapshot.group.VolumeSnapshotGroupInventory", "org.zstack.sdk.VolumeSnapshotGroupInventory");
306306
put("org.zstack.header.storage.snapshot.group.VolumeSnapshotGroupRefInventory", "org.zstack.sdk.VolumeSnapshotGroupRefInventory");
307+
put("org.zstack.header.storageDevice.LunInventory", "org.zstack.sdk.LunInventory");
307308
put("org.zstack.header.storageDevice.ScsiLunClusterStatusInventory", "org.zstack.sdk.ScsiLunClusterStatusInventory");
308309
put("org.zstack.header.storageDevice.ScsiLunHostRefInventory", "org.zstack.sdk.ScsiLunHostRefInventory");
309310
put("org.zstack.header.storageDevice.ScsiLunInventory", "org.zstack.sdk.ScsiLunInventory");
@@ -379,9 +380,9 @@ public class SourceClassMap {
379380
put("org.zstack.kvm.KVMHostInventory", "org.zstack.sdk.KVMHostInventory");
380381
put("org.zstack.kvm.KVMIsoTO", "org.zstack.sdk.KVMIsoTO");
381382
put("org.zstack.kvm.hypervisor.datatype.HostOsCategoryInventory", "org.zstack.sdk.HostOsCategoryInventory");
383+
put("org.zstack.kvm.hypervisor.datatype.HypervisorVersionState", "org.zstack.sdk.HypervisorVersionState");
382384
put("org.zstack.kvm.hypervisor.datatype.KvmHostHypervisorMetadataInventory", "org.zstack.sdk.KvmHostHypervisorMetadataInventory");
383385
put("org.zstack.kvm.hypervisor.datatype.KvmHypervisorInfoInventory", "org.zstack.sdk.KvmHypervisorInfoInventory");
384-
put("org.zstack.kvm.hypervisor.datatype.HypervisorVersionState", "org.zstack.sdk.HypervisorVersionState");
385386
put("org.zstack.ldap.LdapAccountRefInventory", "org.zstack.sdk.LdapAccountRefInventory");
386387
put("org.zstack.ldap.LdapServerInventory", "org.zstack.sdk.LdapServerInventory");
387388
put("org.zstack.license.AdditionalLicenseInfo", "org.zstack.sdk.AdditionalLicenseInfo");
@@ -542,6 +543,7 @@ public class SourceClassMap {
542543
put("org.zstack.storage.device.localRaid.RaidPhysicalDriveInventory", "org.zstack.sdk.RaidPhysicalDriveInventory");
543544
put("org.zstack.storage.device.localRaid.RunningState", "org.zstack.sdk.RunningState");
544545
put("org.zstack.storage.device.localRaid.SmartDataStruct", "org.zstack.sdk.SmartDataStruct");
546+
put("org.zstack.storage.device.nvme.NvmeLunHostRefInventory", "org.zstack.sdk.NvmeLunHostRefInventory");
545547
put("org.zstack.storage.device.nvme.NvmeLunInventory", "org.zstack.sdk.NvmeLunInventory");
546548
put("org.zstack.storage.device.nvme.NvmeTargetInventory", "org.zstack.sdk.NvmeTargetInventory");
547549
put("org.zstack.storage.primary.block.BlockPrimaryStorageInventory", "org.zstack.sdk.BlockPrimaryStorageInventory");
@@ -859,6 +861,7 @@ public class SourceClassMap {
859861
put("org.zstack.sdk.HybridEipAddressInventory", "org.zstack.header.hybrid.network.eip.HybridEipAddressInventory");
860862
put("org.zstack.sdk.HybridEipStatus", "org.zstack.header.hybrid.network.eip.HybridEipStatus");
861863
put("org.zstack.sdk.HybridType", "org.zstack.hybrid.core.HybridType");
864+
put("org.zstack.sdk.HypervisorVersionState", "org.zstack.kvm.hypervisor.datatype.HypervisorVersionState");
862865
put("org.zstack.sdk.IPsecConnectionInventory", "org.zstack.ipsec.IPsecConnectionInventory");
863866
put("org.zstack.sdk.IPsecL3NetworkRefInventory", "org.zstack.ipsec.IPsecL3NetworkRefInventory");
864867
put("org.zstack.sdk.IPsecPeerCidrInventory", "org.zstack.ipsec.IPsecPeerCidrInventory");
@@ -921,6 +924,7 @@ public class SourceClassMap {
921924
put("org.zstack.sdk.LoginAuthenticationProcedureDesc", "org.zstack.header.identity.login.LoginAuthenticationProcedureDesc");
922925
put("org.zstack.sdk.LongJobInventory", "org.zstack.header.longjob.LongJobInventory");
923926
put("org.zstack.sdk.LongJobState", "org.zstack.header.longjob.LongJobState");
927+
put("org.zstack.sdk.LunInventory", "org.zstack.header.storageDevice.LunInventory");
924928
put("org.zstack.sdk.ManagementNodeInventory", "org.zstack.header.managementnode.ManagementNodeInventory");
925929
put("org.zstack.sdk.MdevDeviceChooser", "org.zstack.pciDevice.virtual.vfio_mdev.MdevDeviceChooser");
926930
put("org.zstack.sdk.MdevDeviceInventory", "org.zstack.pciDevice.virtual.vfio_mdev.MdevDeviceInventory");
@@ -957,6 +961,7 @@ public class SourceClassMap {
957961
put("org.zstack.sdk.NetworkServiceL3NetworkRefInventory", "org.zstack.header.network.service.NetworkServiceL3NetworkRefInventory");
958962
put("org.zstack.sdk.NetworkServiceProviderInventory", "org.zstack.header.network.service.NetworkServiceProviderInventory");
959963
put("org.zstack.sdk.NormalIpRangeInventory", "org.zstack.header.network.l3.NormalIpRangeInventory");
964+
put("org.zstack.sdk.NvmeLunHostRefInventory", "org.zstack.storage.device.nvme.NvmeLunHostRefInventory");
960965
put("org.zstack.sdk.NvmeLunInventory", "org.zstack.storage.device.nvme.NvmeLunInventory");
961966
put("org.zstack.sdk.NvmeTargetInventory", "org.zstack.storage.device.nvme.NvmeTargetInventory");
962967
put("org.zstack.sdk.OAuth2ClientInventory", "org.zstack.sso.header.OAuth2ClientInventory");
@@ -1157,7 +1162,6 @@ public class SourceClassMap {
11571162
put("org.zstack.sdk.VirtualRouterVmInventory", "org.zstack.network.service.virtualrouter.VirtualRouterVmInventory");
11581163
put("org.zstack.sdk.VirtualizerInfo", "org.zstack.header.vm.VirtualizerInfo");
11591164
put("org.zstack.sdk.VirtualizerInfoInventory", "org.zstack.header.vm.VirtualizerInfoInventory");
1160-
put("org.zstack.sdk.HypervisorVersionState", "org.zstack.kvm.hypervisor.datatype.HypervisorVersionState");
11611165
put("org.zstack.sdk.VmCPUBillingInventory", "org.zstack.billing.generator.vm.cpu.VmCPUBillingInventory");
11621166
put("org.zstack.sdk.VmCPUSpendingDetails", "org.zstack.billing.spendingcalculator.vm.VmCPUSpendingDetails");
11631167
put("org.zstack.sdk.VmCapabilities", "org.zstack.header.vm.VmCapabilities");

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ public Result throwExceptionIfError() {
3434
@Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
3535
public java.lang.String targetResourceUuid;
3636

37-
@Param(required = true, validValues = {"startVm", "stopVm", "rebootVm", "volumeSnapshot", "volumeBackup", "volumeSnapshotGroup",
38-
"rootVolumeBackup", "vmBackup", "databaseBackup", "localRaidSelfTest", "runAutoScalingGroup",
39-
"cancelIAM2ProjectLoginExpired", "takeIAM2ProjectLoginExpired"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
37+
@Param(required = true, validValues = {"startVm","stopVm","rebootVm","volumeSnapshot","volumeSnapshotGroup","volumeBackup","rootVolumeBackup","vmBackup","databaseBackup","localRaidSelfTest","runAutoScalingGroup","cancelIAM2ProjectLoginExpired","takeIAM2ProjectLoginExpired"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
4038
public java.lang.String type;
4139

4240
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,7 @@ public Result throwExceptionIfError() {
3131
@Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
3232
public java.lang.String description;
3333

34-
@Param(required = true, validValues = {"startVm", "stopVm", "rebootVm", "volumeSnapshot", "volumeSnapshotGroup",
35-
"volumeBackup", "rootVolumeBackup", "vmBackup", "databaseBackup", "runAutoScalingGroup",
36-
"cancelIAM2ProjectLoginExpired", "takeIAM2ProjectLoginExpired"}, nonempty = false, nullElements = false,
37-
emptyString = true, noTrim = false)
34+
@Param(required = true, validValues = {"startVm","stopVm","rebootVm","volumeSnapshot","volumeSnapshotGroup","volumeBackup","rootVolumeBackup","vmBackup","databaseBackup","runAutoScalingGroup","cancelIAM2ProjectLoginExpired","takeIAM2ProjectLoginExpired"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false)
3835
public java.lang.String type;
3936

4037
@Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false)

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

+8
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,12 @@ public java.lang.String getMorval() {
2020
return this.morval;
2121
}
2222

23+
public java.lang.String esxiVersion;
24+
public void setEsxiVersion(java.lang.String esxiVersion) {
25+
this.esxiVersion = esxiVersion;
26+
}
27+
public java.lang.String getEsxiVersion() {
28+
return this.esxiVersion;
29+
}
30+
2331
}

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.zstack.sdk;
22

3+
4+
35
public class GuestToolsStateInventory {
46

57
public java.lang.String vmInstanceUuid;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.zstack.sdk;
22

3-
3+
import org.zstack.sdk.HypervisorVersionState;
44

55
public class KvmHypervisorInfoInventory {
66

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

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
package org.zstack.sdk;
2+
3+
4+
5+
public class LunInventory {
6+
7+
public java.lang.String name;
8+
public void setName(java.lang.String name) {
9+
this.name = name;
10+
}
11+
public java.lang.String getName() {
12+
return this.name;
13+
}
14+
15+
public java.lang.String uuid;
16+
public void setUuid(java.lang.String uuid) {
17+
this.uuid = uuid;
18+
}
19+
public java.lang.String getUuid() {
20+
return this.uuid;
21+
}
22+
23+
public java.lang.String wwid;
24+
public void setWwid(java.lang.String wwid) {
25+
this.wwid = wwid;
26+
}
27+
public java.lang.String getWwid() {
28+
return this.wwid;
29+
}
30+
31+
public java.lang.String vendor;
32+
public void setVendor(java.lang.String vendor) {
33+
this.vendor = vendor;
34+
}
35+
public java.lang.String getVendor() {
36+
return this.vendor;
37+
}
38+
39+
public java.lang.String model;
40+
public void setModel(java.lang.String model) {
41+
this.model = model;
42+
}
43+
public java.lang.String getModel() {
44+
return this.model;
45+
}
46+
47+
public java.lang.String wwn;
48+
public void setWwn(java.lang.String wwn) {
49+
this.wwn = wwn;
50+
}
51+
public java.lang.String getWwn() {
52+
return this.wwn;
53+
}
54+
55+
public java.lang.String serial;
56+
public void setSerial(java.lang.String serial) {
57+
this.serial = serial;
58+
}
59+
public java.lang.String getSerial() {
60+
return this.serial;
61+
}
62+
63+
public java.lang.String type;
64+
public void setType(java.lang.String type) {
65+
this.type = type;
66+
}
67+
public java.lang.String getType() {
68+
return this.type;
69+
}
70+
71+
public java.lang.String hctl;
72+
public void setHctl(java.lang.String hctl) {
73+
this.hctl = hctl;
74+
}
75+
public java.lang.String getHctl() {
76+
return this.hctl;
77+
}
78+
79+
public java.lang.String path;
80+
public void setPath(java.lang.String path) {
81+
this.path = path;
82+
}
83+
public java.lang.String getPath() {
84+
return this.path;
85+
}
86+
87+
public java.lang.String state;
88+
public void setState(java.lang.String state) {
89+
this.state = state;
90+
}
91+
public java.lang.String getState() {
92+
return this.state;
93+
}
94+
95+
public java.lang.Long size;
96+
public void setSize(java.lang.Long size) {
97+
this.size = size;
98+
}
99+
public java.lang.Long getSize() {
100+
return this.size;
101+
}
102+
103+
public java.lang.String multipathDeviceUuid;
104+
public void setMultipathDeviceUuid(java.lang.String multipathDeviceUuid) {
105+
this.multipathDeviceUuid = multipathDeviceUuid;
106+
}
107+
public java.lang.String getMultipathDeviceUuid() {
108+
return this.multipathDeviceUuid;
109+
}
110+
111+
public java.lang.String source;
112+
public void setSource(java.lang.String source) {
113+
this.source = source;
114+
}
115+
public java.lang.String getSource() {
116+
return this.source;
117+
}
118+
119+
public java.sql.Timestamp createDate;
120+
public void setCreateDate(java.sql.Timestamp createDate) {
121+
this.createDate = createDate;
122+
}
123+
public java.sql.Timestamp getCreateDate() {
124+
return this.createDate;
125+
}
126+
127+
public java.sql.Timestamp lastOpDate;
128+
public void setLastOpDate(java.sql.Timestamp lastOpDate) {
129+
this.lastOpDate = lastOpDate;
130+
}
131+
public java.sql.Timestamp getLastOpDate() {
132+
return this.lastOpDate;
133+
}
134+
135+
}

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

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
package org.zstack.sdk;
2+
3+
4+
5+
public class NvmeLunHostRefInventory {
6+
7+
public java.lang.String nvmeLunUuid;
8+
public void setNvmeLunUuid(java.lang.String nvmeLunUuid) {
9+
this.nvmeLunUuid = nvmeLunUuid;
10+
}
11+
public java.lang.String getNvmeLunUuid() {
12+
return this.nvmeLunUuid;
13+
}
14+
15+
public java.lang.String hostUuid;
16+
public void setHostUuid(java.lang.String hostUuid) {
17+
this.hostUuid = hostUuid;
18+
}
19+
public java.lang.String getHostUuid() {
20+
return this.hostUuid;
21+
}
22+
23+
public java.lang.String path;
24+
public void setPath(java.lang.String path) {
25+
this.path = path;
26+
}
27+
public java.lang.String getPath() {
28+
return this.path;
29+
}
30+
31+
public java.lang.String hctl;
32+
public void setHctl(java.lang.String hctl) {
33+
this.hctl = hctl;
34+
}
35+
public java.lang.String getHctl() {
36+
return this.hctl;
37+
}
38+
39+
public java.sql.Timestamp createDate;
40+
public void setCreateDate(java.sql.Timestamp createDate) {
41+
this.createDate = createDate;
42+
}
43+
public java.sql.Timestamp getCreateDate() {
44+
return this.createDate;
45+
}
46+
47+
public java.sql.Timestamp lastOpDate;
48+
public void setLastOpDate(java.sql.Timestamp lastOpDate) {
49+
this.lastOpDate = lastOpDate;
50+
}
51+
public java.sql.Timestamp getLastOpDate() {
52+
return this.lastOpDate;
53+
}
54+
55+
}

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
public class NvmeLunInventory extends org.zstack.sdk.ScsiLunInventory {
5+
public class NvmeLunInventory extends org.zstack.sdk.LunInventory {
66

77
public java.lang.String nvmeTargetUuid;
88
public void setNvmeTargetUuid(java.lang.String nvmeTargetUuid) {
@@ -12,4 +12,12 @@ public java.lang.String getNvmeTargetUuid() {
1212
return this.nvmeTargetUuid;
1313
}
1414

15+
public java.util.List nvmeLunHostRefs;
16+
public void setNvmeLunHostRefs(java.util.List nvmeLunHostRefs) {
17+
this.nvmeLunHostRefs = nvmeLunHostRefs;
18+
}
19+
public java.util.List getNvmeLunHostRefs() {
20+
return this.nvmeLunHostRefs;
21+
}
22+
1523
}

0 commit comments

Comments
 (0)