diff --git a/VERSION b/VERSION index 6001980bf9..f7ee150716 100755 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ MAJOR=4 MINOR=10 -UPDATE=16 +UPDATE=20 diff --git a/build/pom.xml b/build/pom.xml index 2ca7311468..bcea34d5d1 100755 --- a/build/pom.xml +++ b/build/pom.xml @@ -292,11 +292,6 @@ cloudformation ${project.version} - - org.zstack - hybrid - ${project.version} - org.zstack zwatch @@ -317,21 +312,11 @@ sharedblock ${project.version} - - org.zstack - ministorage - ${project.version} - org.zstack storage-device ${project.version} - - org.zstack - mini - ${project.version} - org.zstack autoscaling @@ -357,11 +342,6 @@ xdragon ${project.version} - - org.zstack - aliyun-storage - ${project.version} - org.zstack block-primary-storage @@ -402,21 +382,6 @@ baremetal ${project.version} - - org.zstack - baremetal2 - ${project.version} - - - org.zstack - external-api-adapter - ${project.version} - - - org.zstack - aliyun-proxy - ${project.version} - org.zstack upgrade-hack @@ -468,11 +433,6 @@ vpcFirewall ${project.version} - - org.zstack - sns-aliyun-sms - ${project.version} - org.zstack guesttools @@ -578,6 +538,11 @@ hostNetworkInterface ${project.version} + + org.zstack + managements + ${project.version} + diff --git a/compute/src/main/java/org/zstack/compute/allocator/HostOsVersionAllocatorFlow.java b/compute/src/main/java/org/zstack/compute/allocator/HostOsVersionAllocatorFlow.java index 2fa09f72ff..0598be3f25 100755 --- a/compute/src/main/java/org/zstack/compute/allocator/HostOsVersionAllocatorFlow.java +++ b/compute/src/main/java/org/zstack/compute/allocator/HostOsVersionAllocatorFlow.java @@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; import org.zstack.compute.host.HostManager; -import org.zstack.core.Platform; import org.zstack.core.db.Q; import org.zstack.header.allocator.AbstractHostAllocatorFlow; import org.zstack.header.allocator.HostCandidate; @@ -72,7 +71,8 @@ public void allocate() { private Map generateHostUuidOsMap(List hostList) { final Map hostHypervisorTypeMap = hostList.stream() - .collect(Collectors.toMap(ResourceVO::getUuid, HostAO::getHypervisorType)); + .collect(Collectors.toMap(ResourceVO::getUuid, HostAO::getHypervisorType, + (existing, replacement) -> replacement)); final Set hypervisorTypeSet = new HashSet<>(hostHypervisorTypeMap.values()); final Map results = new HashMap<>(hostList.size()); diff --git a/compute/src/main/java/org/zstack/compute/host/HostApiInterceptor.java b/compute/src/main/java/org/zstack/compute/host/HostApiInterceptor.java index ca555af24e..bd4b13b6ff 100755 --- a/compute/src/main/java/org/zstack/compute/host/HostApiInterceptor.java +++ b/compute/src/main/java/org/zstack/compute/host/HostApiInterceptor.java @@ -1,6 +1,7 @@ package org.zstack.compute.host; import org.springframework.beans.factory.annotation.Autowired; +import org.zstack.compute.vm.VmHostnameUtils; import org.zstack.core.CoreGlobalProperty; import org.zstack.core.componentloader.PluginRegistry; import org.zstack.core.upgrade.UpgradeGlobalConfig; @@ -17,6 +18,7 @@ import org.zstack.header.apimediator.ApiMessageInterceptor; import org.zstack.header.apimediator.StopRoutingException; import org.zstack.header.host.*; +import org.zstack.header.image.ImagePlatform; import org.zstack.header.message.APIMessage; import org.zstack.utils.ShellResult; import org.zstack.utils.ShellUtils; @@ -73,6 +75,8 @@ public APIMessage intercept(APIMessage msg) throws ApiMessageInterceptionExcepti validate((APIGetPhysicalMachineBlockDevicesMsg) msg); } else if (msg instanceof APIMountBlockDeviceMsg) { validate((APIMountBlockDeviceMsg) msg); + } else if (msg instanceof APIUpdateHostnameMsg) { + validate((APIUpdateHostnameMsg) msg); } return msg; @@ -169,6 +173,10 @@ private void validate(APIMountBlockDeviceMsg msg) { validateMountPoint(msg.getMountPoint()); } + private void validate(APIUpdateHostnameMsg msg) { + VmHostnameUtils.validateHostname(msg.getHostname(), false); + } + private void validatePath(String path) { if (path == null || path.isEmpty()) { throw new ApiMessageInterceptionException(operr("path cannot be empty")); diff --git a/compute/src/main/java/org/zstack/compute/host/HostBase.java b/compute/src/main/java/org/zstack/compute/host/HostBase.java index 6c90ce3451..1c42cbaaeb 100755 --- a/compute/src/main/java/org/zstack/compute/host/HostBase.java +++ b/compute/src/main/java/org/zstack/compute/host/HostBase.java @@ -186,11 +186,34 @@ protected void handleApiMessage(APIMessage msg) { handle((APIGetHostPowerStatusMsg) msg); } else if (msg instanceof APIUpdateHostNqnMsg) { handle((APIUpdateHostNqnMsg) msg); + } else if (msg instanceof APIUpdateHostnameMsg) { + handle((APIUpdateHostnameMsg) msg); } else { bus.dealWithUnknownMessage(msg); } } + private void handle(APIUpdateHostnameMsg msg) { + APIUpdateHostnameEvent event = new APIUpdateHostnameEvent(msg.getId()); + UpdateHostnameMsg umsg = new UpdateHostnameMsg(); + umsg.setUuid(msg.getUuid()); + umsg.setHostname(msg.getHostname()); + bus.makeTargetServiceIdByResourceUuid(umsg, HostConstant.SERVICE_ID, msg.getHostUuid()); + bus.send(umsg, new CloudBusCallBack(msg) { + @Override + public void run(MessageReply reply) { + UpdateHostnameReply r = reply.castReply(); + if (!r.isSuccess()) { + event.setSuccess(false); + event.setError(r.getError()); + } else { + event.setInventory(r.getInventory()); + } + bus.publish(event); + } + }); + } + private void handle(APIUpdateHostNqnMsg msg) { APIUpdateHostNqnEvent event = new APIUpdateHostNqnEvent(msg.getId()); UpdateHostNqnMsg umsg = new UpdateHostNqnMsg(); diff --git a/compute/src/main/java/org/zstack/compute/vm/ApplianceVmAllocatePrimaryStorageFlow.java b/compute/src/main/java/org/zstack/compute/vm/ApplianceVmAllocatePrimaryStorageFlow.java index eab79d8e1d..3b5ff77d37 100644 --- a/compute/src/main/java/org/zstack/compute/vm/ApplianceVmAllocatePrimaryStorageFlow.java +++ b/compute/src/main/java/org/zstack/compute/vm/ApplianceVmAllocatePrimaryStorageFlow.java @@ -34,6 +34,8 @@ import java.util.*; +import static org.zstack.utils.CollectionUtils.isEmpty; + @Configurable(preConstruction = true, autowire = Autowire.BY_TYPE) public class ApplianceVmAllocatePrimaryStorageFlow implements Flow { protected static final CLogger logger = Utils.getLogger(ApplianceVmAllocatePrimaryStorageFlow.class); @@ -64,7 +66,7 @@ public void run(final FlowTrigger trigger, final Map data) { List primaryStorageTypes = hostAllocatorMgr.getBackupStoragePrimaryStorageMetrics().get(bsType); DebugUtils.Assert(primaryStorageTypes != null, "why primaryStorageTypes is null"); - DebugUtils.Assert(spec.getDataDiskOfferings().size() == 0, "create appliance vm can not with data volume"); + DebugUtils.Assert(isEmpty(spec.getDeprecatedDisksSpecs()), "create appliance vm can not with data volume"); for (PrimaryStorageAllocatorStrategyExtensionPoint ext : pluginRgty.getExtensionList(PrimaryStorageAllocatorStrategyExtensionPoint.class)) { String allocatorStrategyType = ext.getAllocatorStrategy(destHost); diff --git a/compute/src/main/java/org/zstack/compute/vm/InstantiateVmFromNewCreatedStruct.java b/compute/src/main/java/org/zstack/compute/vm/InstantiateVmFromNewCreatedStruct.java index ae3b56ad48..485d78a1b7 100644 --- a/compute/src/main/java/org/zstack/compute/vm/InstantiateVmFromNewCreatedStruct.java +++ b/compute/src/main/java/org/zstack/compute/vm/InstantiateVmFromNewCreatedStruct.java @@ -1,11 +1,8 @@ package org.zstack.compute.vm; +import org.zstack.header.configuration.VmCustomSpecificationStruct; import org.zstack.header.host.CpuArchitecture; -import org.zstack.header.vm.CreateVmInstanceMsg; -import org.zstack.header.vm.DiskAO; -import org.zstack.header.vm.InstantiateNewCreatedVmInstanceMsg; -import org.zstack.header.vm.VmCreationStrategy; -import org.zstack.header.vm.VmNicSpec; +import org.zstack.header.vm.*; import java.util.ArrayList; import java.util.List; @@ -16,7 +13,6 @@ * Created by xing5 on 2016/9/13. */ public class InstantiateVmFromNewCreatedStruct { - private List dataDiskOfferingUuids; private List dataVolumeTemplateUuids; private Map> dataVolumeFromTemplateSystemTags; private List l3NetworkUuids; @@ -28,12 +24,14 @@ public class InstantiateVmFromNewCreatedStruct { private String requiredHostUuid; private List softAvoidHostUuids; private List avoidHostUuids; - private Map> dataVolumeSystemTagsOnIndex; private List disableL3Networks; private List sshKeyPairUuids; private final List candidatePrimaryStorageUuidsForRootVolume = new ArrayList<>(); private final List candidatePrimaryStorageUuidsForDataVolume = new ArrayList<>(); - private List diskAOs; + private DiskAO rootDisk; + private List dataDisks; + private List deprecatedDataVolumeSpecs = new ArrayList<>(); + private VmCustomSpecificationStruct vmCustomSpecification; public List getCandidatePrimaryStorageUuidsForRootVolume() { return candidatePrimaryStorageUuidsForRootVolume; @@ -57,13 +55,36 @@ public void setCandidatePrimaryStorageUuidsForDataVolume(List candidateP } } + public DiskAO getRootDisk() { + return rootDisk; + } + + public void setRootDisk(DiskAO rootDisk) { + this.rootDisk = rootDisk; + } + + public List getDataDisks() { + return dataDisks; + } + + public void setDataDisks(List dataDisks) { + this.dataDisks = dataDisks; + } + + public List getDeprecatedDataVolumeSpecs() { + return deprecatedDataVolumeSpecs; + } - public List getDiskAOs() { - return diskAOs; + public void setDeprecatedDataVolumeSpecs(List deprecatedDataVolumeSpecs) { + this.deprecatedDataVolumeSpecs = deprecatedDataVolumeSpecs; } - public void setDiskAOs(List diskAOs) { - this.diskAOs = diskAOs; + public VmCustomSpecificationStruct getVmCustomSpecification() { + return vmCustomSpecification; + } + + public void setVmCustomSpecification(VmCustomSpecificationStruct vmCustomSpecification) { + this.vmCustomSpecification = vmCustomSpecification; } public List getRootVolumeSystemTags() { @@ -86,14 +107,6 @@ public static String makeLabelKey(String vmUuid) { return String.format("not-start-vm-%s", vmUuid); } - public List getDataDiskOfferingUuids() { - return dataDiskOfferingUuids; - } - - public void setDataDiskOfferingUuids(List dataDiskOfferingUuids) { - this.dataDiskOfferingUuids = dataDiskOfferingUuids; - } - public List getDataVolumeTemplateUuids() { return dataVolumeTemplateUuids; } @@ -136,7 +149,6 @@ public CpuArchitecture getArchitecture() { public static InstantiateVmFromNewCreatedStruct fromMessage(InstantiateNewCreatedVmInstanceMsg msg) { InstantiateVmFromNewCreatedStruct struct = new InstantiateVmFromNewCreatedStruct(); - struct.setDataDiskOfferingUuids(msg.getDataDiskOfferingUuids()); struct.setDataVolumeTemplateUuids(msg.getDataVolumeTemplateUuids()); struct.setDataVolumeFromTemplateSystemTags(msg.getDataVolumeFromTemplateSystemTags()); struct.setL3NetworkUuids(msg.getL3NetworkUuids()); @@ -150,15 +162,16 @@ public static InstantiateVmFromNewCreatedStruct fromMessage(InstantiateNewCreate struct.setRequiredHostUuid(msg.getHostUuid()); struct.setSoftAvoidHostUuids(msg.getSoftAvoidHostUuids()); struct.setAvoidHostUuids(msg.getAvoidHostUuids()); - struct.setDataVolumeSystemTagsOnIndex(msg.getDataVolumeSystemTagsOnIndex()); struct.setDisableL3Networks(msg.getDisableL3Networks()); - struct.setDiskAOs(msg.getDiskAOs()); + struct.setRootDisk(msg.getRootDisk()); + struct.setDataDisks(msg.getDataDisks()); + struct.setDeprecatedDataVolumeSpecs(msg.getDeprecatedDataVolumeSpecs()); + struct.setVmCustomSpecification(msg.getVmCustomSpecification()); return struct; } public static InstantiateVmFromNewCreatedStruct fromMessage(CreateVmInstanceMsg msg) { InstantiateVmFromNewCreatedStruct struct = new InstantiateVmFromNewCreatedStruct(); - struct.setDataDiskOfferingUuids(msg.getDataDiskOfferingUuids()); struct.setDataVolumeTemplateUuids(msg.getDataVolumeTemplateUuids()); struct.setDataVolumeFromTemplateSystemTags(msg.getDataVolumeFromTemplateSystemTags()); struct.setL3NetworkUuids(msg.getL3NetworkSpecs()); @@ -169,9 +182,11 @@ public static InstantiateVmFromNewCreatedStruct fromMessage(CreateVmInstanceMsg struct.setRootVolumeSystemTags(msg.getRootVolumeSystemTags()); struct.setDataVolumeSystemTags(msg.getDataVolumeSystemTags()); struct.setRequiredHostUuid(msg.getHostUuid()); - struct.setDataVolumeSystemTagsOnIndex(msg.getDataVolumeSystemTagsOnIndex()); struct.setDisableL3Networks(msg.getDisableL3Networks()); - struct.setDiskAOs(msg.getDiskAOs()); + struct.setRootDisk(msg.getRootDisk()); + struct.setDataDisks(msg.getDataDisks()); + struct.setDeprecatedDataVolumeSpecs(msg.getDeprecatedDataVolumeSpecs()); + struct.setVmCustomSpecification(msg.getVmCustomSpecification()); return struct; } @@ -231,12 +246,29 @@ public void setDataVolumeFromTemplateSystemTags(Map> dataVo this.dataVolumeFromTemplateSystemTags = dataVolumeFromTemplateSystemTags; } - public Map> getDataVolumeSystemTagsOnIndex() { - return dataVolumeSystemTagsOnIndex; - } - + @Deprecated public void setDataVolumeSystemTagsOnIndex(Map> dataVolumeSystemTagsOnIndex) { - this.dataVolumeSystemTagsOnIndex = dataVolumeSystemTagsOnIndex; + if (dataVolumeSystemTagsOnIndex == null) { + return; + } + + int maxIndex = dataVolumeSystemTagsOnIndex.keySet().stream().mapToInt(Integer::parseInt).max().orElse(-1); + for (int i = deprecatedDataVolumeSpecs.size(); i <= maxIndex; i++) { + deprecatedDataVolumeSpecs.add(DiskAO.nonRootDisk()); + } + + for (int i = 0; i <= maxIndex; i++) { + String key = i + ""; + if (!dataVolumeSystemTagsOnIndex.containsKey(key)) { + continue; + } + + final DiskAO diskAO = deprecatedDataVolumeSpecs.get(i); + if (diskAO.getSystemTags() == null) { + diskAO.setSystemTags(new ArrayList<>()); + } + diskAO.getSystemTags().addAll(dataVolumeSystemTagsOnIndex.get(key)); + } } public List getDisableL3Networks() { diff --git a/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostAndPrimaryStorageFlow.java b/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostAndPrimaryStorageFlow.java index b5c67052f8..b44398379e 100644 --- a/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostAndPrimaryStorageFlow.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostAndPrimaryStorageFlow.java @@ -385,7 +385,7 @@ private boolean dataVolumePsUnique(VmInstanceSpec spec) { } private boolean needCreateDataVolume(VmInstanceSpec spec) { - return !CollectionUtils.isEmpty(spec.getDataDiskOfferings()); + return !CollectionUtils.isEmpty(spec.getDeprecatedDisksSpecs()); } private FlowChain buildAllocateHostAndPrimaryStorageFlowChain(final FlowTrigger trigger, VmInstanceSpec spec) { @@ -451,8 +451,7 @@ private List> getPrimaryStorageCombinationFromSpec(VmInstanceSpec s autoAllocateDataVolumePs = true; dataPs.addAll(availPsForDataVolume); } - String dataVolumeStrategy = spec.getDataDiskOfferings().get(0).getAllocatorStrategy(); - sortPrimaryStorages(dataPs, dataVolumeStrategy, null); + sortPrimaryStorages(dataPs, PrimaryStorageConstant.DEFAULT_PRIMARY_STORAGE_ALLOCATION_STRATEGY_TYPE, null); } else { dataPs.add(null); } diff --git a/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostFlow.java b/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostFlow.java index 825a1a203a..9d71ad1458 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostFlow.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmAllocateHostFlow.java @@ -21,6 +21,7 @@ import org.zstack.header.image.ImageInventory; import org.zstack.header.message.MessageReply; import org.zstack.header.network.l3.L3NetworkInventory; +import org.zstack.header.storage.primary.PrimaryStorageConstant; import org.zstack.header.vm.*; import org.zstack.header.vm.VmInstanceConstant.VmOperation; import org.zstack.utils.CollectionUtils; @@ -47,8 +48,8 @@ public class VmAllocateHostFlow implements Flow { private long getTotalDataDiskSize(VmInstanceSpec spec) { long size = 0; - for (DiskOfferingInventory dinv : spec.getDataDiskOfferings()) { - size += dinv.getDiskSize(); + for (DiskAO dinv : spec.getDeprecatedDisksSpecs()) { + size += dinv.getSize(); } return size; } @@ -67,7 +68,16 @@ protected AllocateHostMsg prepareMsg(VmInstanceSpec spec) { diskSize = image.getSize(); } diskSize += getTotalDataDiskSize(spec); - diskOfferings.addAll(spec.getDataDiskOfferings()); + + for (DiskAO diskAO : spec.getDeprecatedDisksSpecs()) { + DiskOfferingInventory dinv = new DiskOfferingInventory(); + dinv.setUuid(diskAO.getDiskOfferingUuid()); + dinv.setDiskSize(diskAO.getSize()); + dinv.setAllocatorStrategy(PrimaryStorageConstant.DEFAULT_PRIMARY_STORAGE_ALLOCATION_STRATEGY_TYPE); + dinv.setName("from-DiskAO"); + diskOfferings.add(dinv); + } + msg.getLocationSpecs().addAll(spec.getLocationSpecs().stream() .filter(s -> HostVO.class.getSimpleName().equals(s.getResourceType())) .collect(Collectors.toList())); @@ -113,9 +123,15 @@ protected AllocateHostMsg prepareMsg(VmInstanceSpec spec) { } msg.setAllowNoL3Networks(true); - if (!CollectionUtils.isEmpty(spec.getDiskAOs())) { - msg.getRequiredPrimaryStorageUuids().addAll(spec.getDiskAOs().stream() - .map(DiskAO::getPrimaryStorageUuid).filter(Objects::nonNull).collect(Collectors.toList())); + if (spec.getRootDisk() != null && spec.getRootDisk().getPrimaryStorageUuid() != null) { + msg.getRequiredPrimaryStorageUuids().add(spec.getRootDisk().getPrimaryStorageUuid()); + } + + if (!CollectionUtils.isEmpty(spec.getDataDisks())) { + msg.getRequiredPrimaryStorageUuids().addAll(spec.getDataDisks().stream() + .map(DiskAO::getPrimaryStorageUuid) + .filter(Objects::nonNull) + .collect(Collectors.toList())); } setImageRequiredPrimaryStorageUuidFromDiskAO(msg, spec); @@ -123,15 +139,14 @@ protected AllocateHostMsg prepareMsg(VmInstanceSpec spec) { } private void setImageRequiredPrimaryStorageUuidFromDiskAO(DesignatedAllocateHostMsg msg, VmInstanceSpec spec) { - if (CollectionUtils.isEmpty(spec.getDiskAOs())) { + final DiskAO rootDisk = spec.getRootDisk(); + if (rootDisk == null) { return; } - spec.getDiskAOs().stream().filter(DiskAO::isBoot).findFirst().ifPresent(rootDiskAO -> { - if (rootDiskAO.getPrimaryStorageUuid() != null) { - msg.setImageRequiredPrimaryStorageUuid(rootDiskAO.getPrimaryStorageUuid()); - } - }); + if (rootDisk.getPrimaryStorageUuid() != null) { + msg.setImageRequiredPrimaryStorageUuid(rootDisk.getPrimaryStorageUuid()); + } } @Override diff --git a/compute/src/main/java/org/zstack/compute/vm/VmAllocatePrimaryStorageFlow.java b/compute/src/main/java/org/zstack/compute/vm/VmAllocatePrimaryStorageFlow.java index b3404facb1..4bca73cdbc 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmAllocatePrimaryStorageFlow.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmAllocatePrimaryStorageFlow.java @@ -4,21 +4,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; import org.zstack.compute.allocator.HostAllocatorManager; -import org.zstack.core.Platform; -import org.zstack.core.asyncbatch.AsyncLoop; +import org.zstack.core.asyncbatch.While; import org.zstack.core.cloudbus.CloudBus; import org.zstack.core.cloudbus.CloudBusCallBack; import org.zstack.core.db.DatabaseFacade; import org.zstack.core.db.Q; import org.zstack.core.errorcode.ErrorFacade; -import org.zstack.header.configuration.DiskOfferingInventory; -import org.zstack.header.core.Completion; +import org.zstack.header.core.WhileDoneCompletion; import org.zstack.header.core.workflow.Flow; import org.zstack.header.core.workflow.FlowRollback; import org.zstack.header.core.workflow.FlowTrigger; -import org.zstack.header.errorcode.ErrorCode; +import org.zstack.header.errorcode.ErrorCodeList; +import org.zstack.header.errorcode.OperationFailureException; import org.zstack.header.host.HostInventory; -import org.zstack.header.image.ImageInventory; import org.zstack.header.message.MessageReply; import org.zstack.header.storage.backup.BackupStorageVO; import org.zstack.header.storage.backup.BackupStorageVO_; @@ -27,6 +25,7 @@ import org.zstack.header.storage.primary.PrimaryStorageAllocationPurpose; import org.zstack.header.storage.primary.PrimaryStorageConstant; import org.zstack.header.storage.primary.ReleasePrimaryStorageSpaceMsg; +import org.zstack.header.vm.DiskAO; import org.zstack.header.vm.VmInstanceConstant; import org.zstack.header.vm.VmInstanceSpec; import org.zstack.header.vm.VmInstanceSpec.VolumeSpec; @@ -36,12 +35,17 @@ import org.zstack.utils.logging.CLogger; import java.util.ArrayList; -import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Set; +import static org.zstack.core.Platform.err; import static org.zstack.header.image.ImageConstant.SNAPSHOT_REUSE_IMAGE_SCHEMA; +import static org.zstack.header.vm.VmErrors.WRONG_SPECIFIC_PS_ERROR; +import static org.zstack.utils.CollectionUtils.isEmpty; @Configurable(preConstruction = true, autowire = Autowire.BY_TYPE) public class VmAllocatePrimaryStorageFlow implements Flow { @@ -61,9 +65,55 @@ public void run(final FlowTrigger trigger, final Map data) { final VmInstanceSpec spec = (VmInstanceSpec) data.get(VmInstanceConstant.Params.VmInstanceSpec.toString()); HostInventory destHost = spec.getDestHost(); - // allocate ps for root volume + msgs.add(buildMessageForRootVolume(spec, destHost)); + msgs.addAll(buildMessageForDataVolumes(spec, destHost)); + + new While<>(msgs).each((msg, whileCompletion) -> { + bus.send(msg, new CloudBusCallBack(whileCompletion) { + @Override + public void run(MessageReply reply) { + if (!reply.isSuccess()) { + whileCompletion.addError(reply.getError()); + whileCompletion.allDone(); + return; + } + + VolumeSpec volumeSpec = new VolumeSpec(); + AllocatePrimaryStorageSpaceReply ar = (AllocatePrimaryStorageSpaceReply) reply; + volumeSpec.setAllocatedInstallUrl(ar.getAllocatedInstallUrl()); + volumeSpec.setPrimaryStorageInventory(ar.getPrimaryStorageInventory()); + volumeSpec.setSize(ar.getSize()); + volumeSpec.setType(PrimaryStorageAllocationPurpose.CreateNewVm.toString().equals(msg.getPurpose()) ? + VolumeType.Root.toString() : VolumeType.Data.toString()); + volumeSpec.setDiskOfferingUuid(msg.getDiskOfferingUuid()); + volumeSpec.setTags(msg.getSystemTags()); + if (VolumeType.Root.toString().equals(volumeSpec.getType())) { + spec.getRootDisk().setPrimaryStorageUuid(ar.getPrimaryStorageInventory().getUuid()); + } else { + spec.setAllocatedPrimaryStorageUuidForDataVolume(ar.getPrimaryStorageInventory().getUuid()); + } + + spec.getVolumeSpecs().add(volumeSpec); + whileCompletion.done(); + } + }); + }).run(new WhileDoneCompletion(trigger) { + @Override + public void done(ErrorCodeList errorCodeList) { + if (errorCodeList.getCauses().isEmpty()) { + trigger.next(); + } else { + trigger.fail(errorCodeList.getCauses().get(0)); + } + } + }); + } + + private AllocatePrimaryStorageSpaceMsg buildMessageForRootVolume(final VmInstanceSpec spec, HostInventory destHost) { AllocatePrimaryStorageSpaceMsg rmsg = new AllocatePrimaryStorageSpaceMsg(); - rmsg.setCandidatePrimaryStorageUuids(spec.getCandidatePrimaryStorageUuidsForRootVolume()); + + DiskAO disk = spec.getRootDisk(); + rmsg.setVmInstanceUuid(spec.getVmInventory().getUuid()); if (spec.getImageSpec() != null) { if (spec.getImageSpec().getInventory() != null) { @@ -75,7 +125,7 @@ public void run(final FlowTrigger trigger, final Map data) { Optional.ofNullable(spec.getImageSpec().getSelectedBackupStorage()) .ifPresent(it -> rmsg.setBackupStorageUuid(it.getBackupStorageUuid())); } - rmsg.setSize(spec.getRootDiskAllocateSize()); + rmsg.setSize(disk != null && disk.getSize() > 0 ? disk.getSize() : spec.getRootDiskAllocateSize()); if (spec.getRootDiskOffering() != null) { rmsg.setDiskOfferingUuid(spec.getRootDiskOffering().getUuid()); rmsg.setAllocationStrategy(spec.getRootDiskOffering().getAllocatorStrategy()); @@ -83,75 +133,68 @@ public void run(final FlowTrigger trigger, final Map data) { rmsg.setRequiredHostUuid(destHost.getUuid()); rmsg.setPurpose(PrimaryStorageAllocationPurpose.CreateNewVm.toString()); - rmsg.setPossiblePrimaryStorageTypes(selectPsTypesFromSpec(spec)); - rmsg.setSystemTags(spec.getRootVolumeSystemTags()); + + final List candidatePs = spec.getCandidatePrimaryStorageUuidsForRootVolume(); + if (disk != null && disk.getPrimaryStorageUuid() != null) { + if (!isEmpty(candidatePs) && !candidatePs.contains(disk.getPrimaryStorageUuid())) { + throw new OperationFailureException(err(WRONG_SPECIFIC_PS_ERROR, + "failed to allocate root volume to the primary storage[%s]", disk.getPrimaryStorageUuid()) + .withOpaque("required.primary.storage.uuid", disk.getPrimaryStorageUuid()) + .withOpaque("candidate.primary.storage.uuid.list", candidatePs)); + } + rmsg.setRequiredPrimaryStorageUuid(disk.getPrimaryStorageUuid()); + } else { + rmsg.setCandidatePrimaryStorageUuids(candidatePs); + rmsg.setPossiblePrimaryStorageTypes(selectPsTypesFromSpec(spec)); + } + + Set tags = new HashSet<>(); + if (disk != null && disk.getSystemTags() != null) { + tags.addAll(disk.getSystemTags()); + } + if (spec.getRootVolumeSystemTags() != null) { + tags.addAll(spec.getRootVolumeSystemTags()); + } + + rmsg.setSystemTags(new ArrayList<>(tags)); bus.makeLocalServiceId(rmsg, PrimaryStorageConstant.SERVICE_ID); - msgs.add(rmsg); + return rmsg; + } + + private List buildMessageForDataVolumes(final VmInstanceSpec spec, HostInventory destHost) { + int dataVolumeCount = isEmpty(spec.getDeprecatedDisksSpecs()) ? 0 : spec.getDeprecatedDisksSpecs().size(); + if (dataVolumeCount == 0) { + return Collections.emptyList(); + } + + List msgs = new ArrayList<>(); + for (int i = 0; i < dataVolumeCount; i++) { + DiskAO deprecatedDisk = isEmpty(spec.getDeprecatedDisksSpecs()) || i >= spec.getDeprecatedDisksSpecs().size() ? + null : spec.getDeprecatedDisksSpecs().get(i); - // allocate ps for data volumes - for (DiskOfferingInventory dinv : spec.getDataDiskOfferings()) { AllocatePrimaryStorageSpaceMsg amsg = new AllocatePrimaryStorageSpaceMsg(); amsg.setCandidatePrimaryStorageUuids(spec.getCandidatePrimaryStorageUuidsForDataVolume()); - amsg.setSize(dinv.getDiskSize()); + amsg.setSize(deprecatedDisk != null && deprecatedDisk.getSize() > 0 ? deprecatedDisk.getSize() : 0); amsg.setRequiredHostUuid(destHost.getUuid()); - amsg.setAllocationStrategy(dinv.getAllocatorStrategy()); + amsg.setAllocationStrategy(PrimaryStorageConstant.DEFAULT_PRIMARY_STORAGE_ALLOCATION_STRATEGY_TYPE); amsg.setPurpose(PrimaryStorageAllocationPurpose.CreateDataVolume.toString()); - amsg.setDiskOfferingUuid(dinv.getUuid()); - amsg.setSystemTags(spec.getDataVolumeSystemTags()); - bus.makeLocalServiceId(amsg, PrimaryStorageConstant.SERVICE_ID); - msgs.add(amsg); - } + amsg.setDiskOfferingUuid(deprecatedDisk != null ? deprecatedDisk.getDiskOfferingUuid() : null); - new AsyncLoop(trigger) { - @Override - protected Collection collectionForLoop() { - return msgs; + Set tags = new HashSet<>(); + if (spec.getDataVolumeSystemTags() != null) { + tags.addAll(spec.getDataVolumeSystemTags()); } - - @Override - protected void run(AllocatePrimaryStorageSpaceMsg msg, Completion completion) { - bus.send(msg, new CloudBusCallBack(completion) { - @Override - public void run(MessageReply reply) { - if (!reply.isSuccess()) { - completion.fail(reply.getError()); - return; - } - - VolumeSpec volumeSpec = new VolumeSpec(); - AllocatePrimaryStorageSpaceReply ar = (AllocatePrimaryStorageSpaceReply) reply; - volumeSpec.setAllocatedInstallUrl(ar.getAllocatedInstallUrl()); - volumeSpec.setPrimaryStorageInventory(ar.getPrimaryStorageInventory()); - volumeSpec.setSize(ar.getSize()); - volumeSpec.setType(PrimaryStorageAllocationPurpose.CreateNewVm.toString().equals(msg.getPurpose()) ? - VolumeType.Root.toString() : VolumeType.Data.toString()); - volumeSpec.setDiskOfferingUuid(msg.getDiskOfferingUuid()); - if (VolumeType.Root.toString().equals(volumeSpec.getType())) { - spec.setAllocatedPrimaryStorageUuidForRootVolume(ar.getPrimaryStorageInventory().getUuid()); - volumeSpec.setTags(spec.getRootVolumeSystemTags()); - } else { - spec.setAllocatedPrimaryStorageUuidForDataVolume(ar.getPrimaryStorageInventory().getUuid()); - volumeSpec.setTags(spec.getDataVolumeSystemTags()); - } - - spec.getVolumeSpecs().add(volumeSpec); - - completion.success(); - } - }); + if (deprecatedDisk != null && !isEmpty(deprecatedDisk.getSystemTags())) { + tags.addAll(deprecatedDisk.getSystemTags()); } - @Override - protected void done() { - trigger.next(); - } + amsg.setSystemTags(new ArrayList<>(tags)); + bus.makeLocalServiceId(amsg, PrimaryStorageConstant.SERVICE_ID); + msgs.add(amsg); + } - @Override - protected void error(ErrorCode errorCode) { - trigger.fail(errorCode); - } - }.start(); + return msgs; } @Override diff --git a/compute/src/main/java/org/zstack/compute/vm/VmAllocateVolumeFlow.java b/compute/src/main/java/org/zstack/compute/vm/VmAllocateVolumeFlow.java index 07a9ada4be..b0efbc07bb 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmAllocateVolumeFlow.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmAllocateVolumeFlow.java @@ -1,6 +1,5 @@ package org.zstack.compute.vm; -import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; @@ -21,6 +20,7 @@ import org.zstack.header.errorcode.ErrorCodeList; import org.zstack.header.exception.CloudRuntimeException; import org.zstack.header.message.MessageReply; +import org.zstack.header.vm.DiskAO; import org.zstack.header.vm.VmInstanceConstant; import org.zstack.header.vm.VmInstanceSpec; import org.zstack.header.vm.VmInstanceSpec.VolumeSpec; @@ -34,10 +34,10 @@ import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import static org.zstack.core.progress.ProgressReportService.taskProgress; +import static org.zstack.utils.CollectionUtils.filter; +import static org.zstack.utils.CollectionUtils.isEmpty; import static org.zstack.utils.CollectionUtils.transformAndRemoveNull; @Configurable(preConstruction = true, autowire = Autowire.BY_TYPE) @@ -63,40 +63,47 @@ protected List prepareMsg(Map ctx) { throw new CloudRuntimeException(String.format("accountUuid for vm[uuid:%s] is null", spec.getVmInventory().getUuid())); } - if (!MapUtils.isEmpty(spec.getDataVolumeSystemTagsOnIndex()) && !CollectionUtils.isEmpty(spec.getDataDiskOfferings())) { - List dataVolumeSpecs = spec.getVolumeSpecs().stream() - .filter(s -> s.getType().equals(VolumeType.Data.toString())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(spec.getDeprecatedDisksSpecs())) { + List dataVolumeSpecs = filter(spec.getVolumeSpecs(), s -> s.getType().equals(VolumeType.Data.toString())); + int minLen = Math.min(spec.getDeprecatedDisksSpecs().size(), dataVolumeSpecs.size()); - IntStream.range(0, dataVolumeSpecs.size()).forEach(index -> { - List systemTags = spec.getDataVolumeSystemTagsOnIndex().get(String.valueOf(index)); - if (!CollectionUtils.isEmpty(systemTags)) { - dataVolumeSpecs.get(index).setTags(systemTags); + for (int i = 0; i < minLen; i++) { + DiskAO disk = spec.getDeprecatedDisksSpecs().get(i); + if (!CollectionUtils.isEmpty(disk.getSystemTags())) { + dataVolumeSpecs.get(i).setTags(disk.getSystemTags()); } - }); + } } List volumeSpecs = spec.getVolumeSpecs(); List msgs = new ArrayList<>(volumeSpecs.size()); + int dataVolumeIndex = 0; + for (VolumeSpec vspec : volumeSpecs) { CreateVolumeMsg msg = new CreateVolumeMsg(); Set tags = new HashSet<>(); - if (vspec != null) { - if (vspec.getTags() != null) { - tags.addAll(vspec.getTags()); - } - } else { + if (vspec == null) { continue; } + if (vspec.getTags() != null) { + tags.addAll(vspec.getTags()); + } + DebugUtils.Assert(vspec.getType() != null, "VolumeType can not be null!"); - if (VolumeType.Root.toString().equals(vspec.getType())) { + if (vspec.isRoot()) { + DiskAO disk = spec.getRootDisk(); msg.setResourceUuid((String) ctx.get("uuid")); - msg.setName("ROOT-for-" + spec.getVmInventory().getName()); - msg.setDescription(String.format("Root volume for VM[uuid:%s]", spec.getVmInventory().getUuid())); + String name = disk == null ? null : disk.getName(); + msg.setName(name == null ? "ROOT-for-" + spec.getVmInventory().getName() : name); + + msg.setDescription(String.format("Root volume for VM[uuid:%s]", spec.getVmInventory().getUuid())); if (spec.getImageSpec().relayOnImage()) { msg.setRootImageUuid(spec.getImageSpec().getInventory().getUuid()); + } else if (disk != null && disk.getTemplateUuid() != null) { + msg.setRootImageUuid(disk.getTemplateUuid()); } msg.setFormat(spec.getVolumeFormatFromImage()); @@ -104,13 +111,33 @@ protected List prepareMsg(Map ctx) { if (spec.getRootVolumeSystemTags() != null) { tags.addAll(spec.getRootVolumeSystemTags()); } - } else if (VolumeType.Data.toString().equals(vspec.getType())) { - msg.setName(String.format("DATA-for-%s", spec.getVmInventory().getName())); + + if (disk != null && !isEmpty(disk.getSystemTags())) { + tags.addAll(disk.getSystemTags()); + } + } else if (vspec.isData()) { + DiskAO disk = isEmpty(spec.getDataDisks()) ? null : + spec.getDataDisks().size() > dataVolumeIndex ? spec.getDataDisks().get(dataVolumeIndex) : null; + DiskAO deprecatedDisk = isEmpty(spec.getDeprecatedDisksSpecs()) ? null : + spec.getDeprecatedDisksSpecs().size() > dataVolumeIndex ? spec.getDeprecatedDisksSpecs().get(dataVolumeIndex) : null; + + String name = disk == null ? null : disk.getName(); + msg.setName(name == null ? "DATA-for-" + spec.getVmInventory().getName() : name); + msg.setDescription(String.format("DataVolume-%s", spec.getVmInventory().getUuid())); msg.setFormat(VolumeFormat.getVolumeFormatByMasterHypervisorType(spec.getDestHost().getHypervisorType()).toString()); + if (spec.getDataVolumeSystemTags() != null) { tags.addAll(spec.getDataVolumeSystemTags()); } + if (deprecatedDisk != null && !isEmpty(deprecatedDisk.getSystemTags())) { + tags.addAll(deprecatedDisk.getSystemTags()); + } + if (disk != null && !isEmpty(disk.getSystemTags())) { + tags.addAll(disk.getSystemTags()); + } + + dataVolumeIndex++; } else { continue; } diff --git a/compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java b/compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java index 130de99322..05810e8bf5 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmCascadeExtension.java @@ -314,7 +314,7 @@ protected List handleDeletionForIpRange(List WINDOWS_RESERVED_NAMES = new HashSet<>(Arrays.asList( + "CON", "PRN", "AUX", "NUL", + "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", + "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" + )); + + private static final int MAX_WINDOWS_NETBIOS_LENGTH = 15; + + public static String safeSubstringForHostname(String hostname) { + if (hostname == null) { + return null; + } + int length = hostname.codePointCount(0, hostname.length()); + if (length <= VmHostnameUtils.MAX_WINDOWS_NETBIOS_LENGTH) { + return hostname; + } + int endIndex = hostname.offsetByCodePoints(0, VmHostnameUtils.MAX_WINDOWS_NETBIOS_LENGTH); + return hostname.substring(0, endIndex); + } + + public static void validateHostname(String hostname, boolean isWindows) { + if (hostname == null) { + return; + } else if (hostname.isEmpty()) { + throw new ApiMessageInterceptionException(argerr("hostname is empty")); + } + + if (isWindows) { + String netBiosName = safeSubstringForHostname(hostname); + if (!WINDOWS_NETBIOS_PATTERN.matcher(netBiosName).matches()) { + throw new ApiMessageInterceptionException( + argerr("%s is not a valid Windows NetBIOS hostname", netBiosName) + ); + } + if (WINDOWS_RESERVED_NAMES.contains(netBiosName.toUpperCase())) { + throw new ApiMessageInterceptionException( + argerr("%s is a reserved Windows NetBIOS hostname", netBiosName) + ); + } + + if (!WINDOWS_HOSTNAME_PATTERN.matcher(hostname).matches()) { + throw new ApiMessageInterceptionException( + argerr("%s is not a valid Windows hostname", hostname) + ); + } + } else { + if (!HOSTNAME_PATTERN.matcher(hostname).matches()) { + throw new ApiMessageInterceptionException( + argerr("%s is not a valid hostname", hostname) + ); + } + } + } + + public static void validateDomain(String domain) { + if (StringUtils.isEmpty(domain)) { + return; + } + + if (domain.length() > 255) { + throw new ApiMessageInterceptionException( + argerr("%s exceeds max length 255", domain) + ); + } + + String[] labels = domain.split("\\."); + for (String label : labels) { + if (!WINDOWS_DOMAIN_LABEL_PATTERN.matcher(label).matches()) { + throw new ApiMessageInterceptionException( + argerr("%s is not a valid domain label in %s", label, domain) + ); + } + + if (WINDOWS_RESERVED_NAMES.contains(label.toUpperCase(Locale.ROOT))) { + throw new ApiMessageInterceptionException( + argerr("%s is a reserved Windows label", label) + ); + } + } + } +} diff --git a/compute/src/main/java/org/zstack/compute/vm/VmInstanceApiInterceptor.java b/compute/src/main/java/org/zstack/compute/vm/VmInstanceApiInterceptor.java index 892c3b73bc..30f4559868 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmInstanceApiInterceptor.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmInstanceApiInterceptor.java @@ -50,6 +50,7 @@ import static org.zstack.core.Platform.argerr; import static org.zstack.core.Platform.operr; import static org.zstack.utils.CollectionDSL.*; +import static org.zstack.utils.CollectionUtils.findOneOrNull; import static org.zstack.utils.CollectionUtils.isEmpty; /** @@ -578,7 +579,6 @@ private void validate(APISetVmStaticIpMsg msg) { info.ipv6Gateway = msg.getIpv6Gateway(); ipOperator.validateStaticIp(info, l3NetworkVO, new ArrayList<>()); - msg.setIp(info.ipv4Address); msg.setNetmask(info.ipv4Netmask); msg.setGateway(info.ipv4Gateway); msg.setIp6(info.ipv6Address); @@ -1051,10 +1051,10 @@ private void validate(APICreateVmInstanceMsg msg) { boolean virtIOTagExists = (isEmpty(msg.getSystemTags())) ? false : msg.getSystemTags().contains(VmSystemTags.VIRTIO.getTagFormat()); String platform = msg.getPlatform(), guestOsType = msg.getGuestOsType(), architecture = msg.getArchitecture(); + long rootDiskSize = msg.getRootDiskSize() != null ? msg.getRootDiskSize() : 0L; if (CollectionUtils.isNotEmpty(msg.getDiskAOs())) { - DiskAO rootDiskAO = msg.getDiskAOs().stream() - .filter(DiskAO::isBoot).findFirst().orElse(null); + DiskAO rootDiskAO = isEmpty(msg.getDiskAOs()) ? null : findOneOrNull(msg.getDiskAOs(), DiskAO::isBoot); if (rootDiskAO == null) { throw new ApiMessageInterceptionException(argerr("missing root disk")); } @@ -1062,9 +1062,17 @@ private void validate(APICreateVmInstanceMsg msg) { platform = platform == null ? rootDiskAO.getPlatform() : platform; guestOsType = guestOsType == null ? rootDiskAO.getGuestOsType() : guestOsType; architecture = architecture == null ? rootDiskAO.getArchitecture() : architecture; + rootDiskSize = rootDiskSize == 0L ? rootDiskAO.getSize() : rootDiskSize; + msg.setRootDiskSize(rootDiskSize); + if (!virtIOTagExists && CollectionUtils.isNotEmpty(rootDiskAO.getSystemTags())) { - virtIOTagExists = rootDiskAO.getSystemTags().contains(VmSystemTags.VIRTIO.getTagFormat()); + // "driver::virtio" is tag for VmInstanceVO (not for VolumeVO) + virtIOTagExists = rootDiskAO.getSystemTags().remove(VmSystemTags.VIRTIO.getTagFormat()); } + + // root disk must be the first + msg.getDiskAOs().remove(rootDiskAO); + msg.getDiskAOs().add(0, rootDiskAO); } if (virtIOTagExists && msg.getVirtio() == Boolean.FALSE) { @@ -1088,7 +1096,7 @@ private void validate(APICreateVmInstanceMsg msg) { errorList.add(Platform.missingVariables("architecture")); } - if (msg.getRootDiskOfferingUuid() == null && msg.getRootDiskSize() == null) { + if (msg.getRootDiskOfferingUuid() == null && rootDiskSize <= 0) { errorList.add("rootDiskOfferingUuid or rootDiskSize cannot be all null"); } diff --git a/compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java b/compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java index 664bd86b83..e6c814743a 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmInstanceBase.java @@ -86,6 +86,7 @@ import org.zstack.utils.network.NetworkUtils; import javax.persistence.PersistenceException; +import javax.persistence.Tuple; import javax.persistence.TypedQuery; import java.sql.Timestamp; import java.time.LocalDateTime; @@ -97,6 +98,7 @@ import static org.zstack.core.progress.ProgressReportService.*; import static org.zstack.header.vm.VmErrors.ATTACH_VOLUME_ERROR; import static org.zstack.utils.CollectionDSL.*; +import static org.zstack.utils.CollectionUtils.isEmpty; import static org.zstack.utils.CollectionUtils.transformAndRemoveNull; public class VmInstanceBase extends AbstractVmInstance { @@ -5139,7 +5141,11 @@ private List getAttachableL3Network(String accountUuid) { q.setParameter("uuid", self.getUuid()); List attachedL3Uuids = Q.New(VmNicVO.class).select(VmNicVO_.l3NetworkUuid).eq(VmNicVO_.vmInstanceUuid, self.getUuid()).listValues(); List l3s = q.getResultList(); - l3s = l3s.stream().filter(l3 -> !IpRangeHelper.getNormalIpRanges(l3).isEmpty() || (!l3.enableIpAllocation() && !attachedL3Uuids.contains(l3.getUuid()))).collect(Collectors.toList()); + l3s = l3s.stream() + .filter(l3 -> !IpRangeHelper.getNormalIpRanges(l3).isEmpty() || + (!l3.getEnableIPAM() && + (!attachedL3Uuids.contains(l3.getUuid()) || VmGlobalConfig.MULTI_VNIC_SUPPORT.value(Boolean.class)))) + .collect(Collectors.toList()); return L3NetworkInventory.valueOf(l3s); } @@ -5196,13 +5202,13 @@ protected List scripts() { return new ArrayList<>(); } //filter l3 that already attached - if (!self.getVmNics().isEmpty()) { + if (!self.getVmNics().isEmpty() && !VmGlobalConfig.MULTI_VNIC_SUPPORT.value(Boolean.class)) { List vmL3Uuids = self.getVmNics().stream().flatMap(nic -> VmNicHelper.getL3Uuids(VmNicInventory.valueOf(nic)).stream()) .distinct().collect(Collectors.toList()); l3s = l3s.stream().filter(l3 -> !vmL3Uuids.contains(l3.getUuid())).collect(Collectors.toList()); } - l3s = l3s.stream().filter(l3 -> !IpRangeHelper.getNormalIpRanges(l3).isEmpty() || !l3.enableIpAllocation()).collect(Collectors.toList()); + l3s = l3s.stream().filter(l3 -> !IpRangeHelper.getNormalIpRanges(l3).isEmpty() || !l3.getEnableIPAM()).collect(Collectors.toList()); return L3NetworkInventory.valueOf(l3s); } @@ -6706,7 +6712,7 @@ public void rollback(FlowRollback trigger, Map data) { }); flowChain.then(new NoRollbackFlow() { - String __name__ = "update-nic-ip-for-disable-ipam"; + String __name__ = "update-nic-ip-for-ip-allocation-disabled"; @Override public boolean skip(Map data) { @@ -7628,7 +7634,6 @@ private VmInstanceSpec buildVmInstanceSpecFromStruct(InstantiateVmFromNewCreated spec.setDataVolumeSystemTags(struct.getDataVolumeSystemTags()); spec.setRootVolumeSystemTags(struct.getRootVolumeSystemTags()); spec.setRequiredHostUuid(struct.getRequiredHostUuid()); - spec.setDataVolumeSystemTagsOnIndex(struct.getDataVolumeSystemTagsOnIndex()); spec.setDisableL3Networks(struct.getDisableL3Networks()); spec.setStrategy(struct.getStrategy()); @@ -7644,12 +7649,7 @@ private VmInstanceSpec buildVmInstanceSpecFromStruct(InstantiateVmFromNewCreated for (VmNicSpec nicSpec : struct.getL3NetworkUuids()) { List l3s = new ArrayList<>(); for (L3NetworkInventory inv : nicSpec.getL3Invs()) { - L3NetworkInventory l3 = CollectionUtils.find(nws, new Function() { - @Override - public L3NetworkInventory call(L3NetworkInventory arg) { - return arg.getUuid().equals(inv.getUuid()) ? arg : null; - } - }); + L3NetworkInventory l3 = CollectionUtils.findOneOrNull(nws, arg -> arg.getUuid().equals(inv.getUuid())); if (l3 == null) { throw new OperationFailureException(operr( @@ -7673,30 +7673,27 @@ public L3NetworkInventory call(L3NetworkInventory arg) { spec.setDataVolumeTemplateUuids(struct.getDataVolumeTemplateUuids()); spec.setDataVolumeFromTemplateSystemTags(struct.getDataVolumeFromTemplateSystemTags()); - if (struct.getDataDiskOfferingUuids() != null && !struct.getDataDiskOfferingUuids().isEmpty()) { - SimpleQuery dquery = dbf.createQuery(DiskOfferingVO.class); - dquery.add(DiskOfferingVO_.uuid, SimpleQuery.Op.IN, struct.getDataDiskOfferingUuids()); - List vos = dquery.list(); - - // allow create multiple data volume from the same disk offering - List disks = new ArrayList<>(); - for (final String duuid : struct.getDataDiskOfferingUuids()) { - DiskOfferingVO dvo = CollectionUtils.find(vos, new Function() { - @Override - public DiskOfferingVO call(DiskOfferingVO arg) { - if (duuid.equals(arg.getUuid())) { - return arg; + if (!isEmpty(struct.getDeprecatedDataVolumeSpecs())) { + List uuidList = struct.getDeprecatedDataVolumeSpecs().stream() + .map(DiskAO::getDiskOfferingUuid) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + if (!uuidList.isEmpty()) { + List tuples = Q.New(DiskOfferingVO.class) + .in(DiskOfferingVO_.uuid, uuidList) + .select(DiskOfferingVO_.uuid, DiskOfferingVO_.diskSize) + .listTuple(); + + for (Tuple tuple : tuples) { + String uuid = tuple.get(0, String.class); + Long diskSize = tuple.get(1, Long.class); + for (DiskAO diskAO : struct.getDeprecatedDataVolumeSpecs()) { + if (uuid.equals(diskAO.getDiskOfferingUuid())) { + diskAO.setSize(diskSize); } - return null; } - }); - if (dvo != null) { - disks.add(DiskOfferingInventory.valueOf(dvo)); } } - spec.setDataDiskOfferings(disks); - } else { - spec.setDataDiskOfferings(new ArrayList<>()); } if (struct.getRootDiskOfferingUuid() != null) { @@ -7704,7 +7701,10 @@ public DiskOfferingVO call(DiskOfferingVO arg) { spec.setRootDiskOffering(DiskOfferingInventory.valueOf(rootDisk)); } - spec.setDiskAOs(struct.getDiskAOs()); + spec.setRootDisk(struct.getRootDisk()); + spec.setDataDisks(struct.getDataDisks()); + spec.setDeprecatedDisksSpecs(struct.getDeprecatedDataVolumeSpecs()); + spec.setVmCustomSpecification(struct.getVmCustomSpecification()); List cdRomSpecs = buildVmCdRomSpecsForNewCreated(spec); spec.setCdRomSpecs(cdRomSpecs); diff --git a/compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java b/compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java index 7c0a709bbe..a91b947507 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmInstanceManagerImpl.java @@ -2,7 +2,6 @@ import com.google.common.collect.Maps; import org.apache.commons.lang.StringUtils; -import org.apache.commons.validator.routines.DomainValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.zstack.compute.allocator.HostAllocatorManager; @@ -1204,9 +1203,8 @@ protected VmInstanceVO scripts() { @Override public void setup() { - if (!CollectionUtils.isEmpty(msg.getDiskAOs())) { - otherDisks = msg.getDiskAOs().stream().filter(diskAO -> !diskAO.isBoot()).collect(Collectors.toList()); - setDiskAOsName(otherDisks); + if (!CollectionUtils.isEmpty(msg.getDataDisks())) { + setDiskAOsName(otherDisks = msg.getDataDisks()); attachOtherDisks = !otherDisks.isEmpty(); } @@ -1311,13 +1309,11 @@ public void run(FlowTrigger trigger, Map data) { InstantiateNewCreatedVmInstanceMsg smsg = new InstantiateNewCreatedVmInstanceMsg(); smsg.setDisableL3Networks(msg.getDisableL3Networks()); smsg.setHostUuid(msg.getHostUuid()); - List temporaryDiskOfferingUuids = createDiskOfferingUuidsFromDataDiskSizes(msg, finalVo.getUuid()); - smsg.setDataDiskOfferingUuids(merge(msg.getDataDiskOfferingUuids(), temporaryDiskOfferingUuids)); smsg.setDataVolumeTemplateUuids(msg.getDataVolumeTemplateUuids()); smsg.setDataVolumeFromTemplateSystemTags(msg.getDataVolumeFromTemplateSystemTags()); smsg.setL3NetworkUuids(msg.getL3NetworkSpecs()); - final DiskAO rootDisk = msg.findBootDisk(); + final DiskAO rootDisk = msg.getRootDisk(); DiskOfferingVO dvo = null; if (rootDisk != null) { if (rootDisk.getDiskOfferingUuid() != null) { @@ -1357,8 +1353,10 @@ public void run(FlowTrigger trigger, Map data) { smsg.setTimeout(msg.getTimeout()); smsg.setRootVolumeSystemTags(msg.getRootVolumeSystemTags()); smsg.setDataVolumeSystemTags(msg.getDataVolumeSystemTags()); - smsg.setDataVolumeSystemTagsOnIndex(msg.getDataVolumeSystemTagsOnIndex()); - smsg.setDiskAOs(msg.getDiskAOs()); + smsg.setRootDisk(msg.getRootDisk()); + smsg.setDataDisks(msg.getDataDisks()); + smsg.setDeprecatedDataVolumeSpecs(msg.getDeprecatedDataVolumeSpecs()); + smsg.setVmCustomSpecification(msg.getVmCustomSpecification()); bus.makeTargetServiceIdByResourceUuid(smsg, VmInstanceConstant.SERVICE_ID, finalVo.getUuid()); bus.send(smsg, new CloudBusCallBack(smsg) { @Override @@ -1367,10 +1365,6 @@ public void run(MessageReply reply) { dbf.removeByPrimaryKey(newCreateDiskOfferingUuid, DiskOfferingVO.class); } - if (!temporaryDiskOfferingUuids.isEmpty()) { - dbf.removeByPrimaryKeys(temporaryDiskOfferingUuids, DiskOfferingVO.class); - } - if (reply.isSuccess()) { InstantiateNewCreatedVmInstanceReply r = (InstantiateNewCreatedVmInstanceReply) reply; instantiateVm = r.getVmInventory(); @@ -1461,31 +1455,6 @@ private void setDiskAOsName(List diskAOs) { }).start(); } - private List createDiskOfferingUuidsFromDataDiskSizes(final CreateVmInstanceMsg msg, String vmUuid) { - if (CollectionUtils.isEmpty(msg.getDataDiskSizes())){ - return new ArrayList(); - } - List diskOfferingUuids = new ArrayList<>(); - List diskOfferingVos = new ArrayList<>(); - List volumeSizes = msg.getDataDiskSizes().stream().distinct().collect(Collectors.toList()); - Map sizeDiskOfferingMap = new HashMap<>(); - for (Long size : volumeSizes) { - DiskOfferingVO dvo = new DiskOfferingVO(); - dvo.setUuid(Platform.getUuid()); - dvo.setAccountUuid(msg.getAccountUuid()); - dvo.setDiskSize(size); - dvo.setName(String.format("create-data-volume-for-vm-%s", vmUuid)); - dvo.setType("TemporaryDiskOfferingType"); - dvo.setState(DiskOfferingState.Enabled); - dvo.setAllocatorStrategy(PrimaryStorageConstant.DEFAULT_PRIMARY_STORAGE_ALLOCATION_STRATEGY_TYPE); - diskOfferingVos.add(dvo); - sizeDiskOfferingMap.put(size, dvo.getUuid()); - } - msg.getDataDiskSizes().forEach(size -> diskOfferingUuids.add(sizeDiskOfferingMap.get(size))); - dbf.persistCollection(diskOfferingVos); - return diskOfferingUuids; - } - private void createVmButNotStart(CreateVmInstanceMsg msg, VmInstanceInventory inv) { InstantiateVmFromNewCreatedStruct struct = InstantiateVmFromNewCreatedStruct.fromMessage(msg); new JsonLabel().create(InstantiateVmFromNewCreatedStruct.makeLabelKey(inv.getUuid()), struct, inv.getUuid()); @@ -1780,13 +1749,6 @@ public void updateResourceConfig(ResourceConfig config, String resourceUuid, Str private void installHostnameValidator() { class HostNameValidator implements SystemTagCreateMessageValidator, SystemTagValidator { - private void validateHostname(String tag, String hostname) { - DomainValidator domainValidator = DomainValidator.getInstance(true); - if (!domainValidator.isValid(hostname)) { - throw new ApiMessageInterceptionException(argerr("hostname[%s] specified in system tag[%s] is not a valid domain name", hostname, tag)); - } - } - @Override public void validateSystemTagInCreateMessage(APICreateMessage cmsg) { final NewVmInstanceMessage msg = (NewVmInstanceMessage) cmsg; @@ -1799,8 +1761,7 @@ public void validateSystemTagInCreateMessage(APICreateMessage cmsg) { } String hostname = VmSystemTags.HOSTNAME.getTokenByTag(sysTag, VmSystemTags.HOSTNAME_TOKEN); - - validateHostname(sysTag, hostname); + VmHostnameUtils.validateHostname(hostname, ImagePlatform.Windows.toString().equals(msg.getPlatform())); } } } @@ -1834,12 +1795,11 @@ private void validateHostNameOnDefaultL3Network(String tag, String hostname, Str public void validateSystemTag(String resourceUuid, Class resourceType, String systemTag) { if (VmSystemTags.HOSTNAME.isMatch(systemTag)) { String hostname = VmSystemTags.HOSTNAME.getTokenByTag(systemTag, VmSystemTags.HOSTNAME_TOKEN); - validateHostname(systemTag, hostname); - - SimpleQuery q = dbf.createQuery(VmInstanceVO.class); - q.select(VmInstanceVO_.defaultL3NetworkUuid); - q.add(VmInstanceVO_.uuid, Op.EQ, resourceUuid); - String defaultL3Uuid = q.findValue(); + boolean isWindows = Q.New(VmInstanceVO.class) + .eq(VmInstanceVO_.uuid, resourceUuid) + .eq(VmInstanceVO_.platform, ImagePlatform.Windows.toString()) + .isExists(); + VmHostnameUtils.validateHostname(hostname, isWindows); } else if (VmSystemTags.BOOT_ORDER.isMatch(systemTag)) { validateBootOrder(systemTag); } diff --git a/compute/src/main/java/org/zstack/compute/vm/VmInstanceUtils.java b/compute/src/main/java/org/zstack/compute/vm/VmInstanceUtils.java index 3d253e2237..33afa04327 100644 --- a/compute/src/main/java/org/zstack/compute/vm/VmInstanceUtils.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmInstanceUtils.java @@ -13,10 +13,15 @@ import org.zstack.header.vm.VmInstanceVO; import org.zstack.tag.SystemTagUtils; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Objects; import static java.util.Objects.requireNonNull; +import static org.zstack.compute.vm.VmSystemTags.PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME; +import static org.zstack.compute.vm.VmSystemTags.PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME_TOKEN; import static org.zstack.utils.CollectionDSL.list; import static org.zstack.utils.CollectionUtils.findOneOrNull; import static org.zstack.utils.CollectionUtils.isEmpty; @@ -31,12 +36,9 @@ public static CreateVmInstanceMsg fromAPICreateVmInstanceMsg(APICreateVmInstance if (msg.getAllocatorStrategy() != null) { cmsg.setAllocatorStrategy(msg.getAllocatorStrategy()); } - cmsg.setDataDiskSizes(msg.getDataDiskSizes()); - cmsg.setDataDiskOfferingUuids(msg.getDataDiskOfferingUuids()); cmsg.setRootVolumeSystemTags(msg.getRootVolumeSystemTags()); cmsg.setDataVolumeSystemTags(msg.getDataVolumeSystemTags()); cmsg.setPrimaryStorageUuidForRootVolume(msg.getPrimaryStorageUuidForRootVolume()); - cmsg.setDataVolumeSystemTagsOnIndex(msg.getDataVolumeSystemTagsOnIndex()); cmsg.setSshKeyPairUuids(msg.getSshKeyPairUuids()); cmsg.setPlatform(msg.getPlatform()); cmsg.setGuestOsType(msg.getGuestOsType()); @@ -50,9 +52,15 @@ public static CreateVmInstanceMsg fromAPICreateVmInstanceMsg(APICreateVmInstance } else { cmsg.setVirtio(msg.getVirtio()); } - cmsg.setDiskAOs(msg.getDiskAOs()); - if (isEmpty(cmsg.getDiskAOs())) { + if (!isEmpty(msg.getDiskAOs())) { + DiskAO rootDisk = findOneOrNull(msg.getDiskAOs(), DiskAO::isBoot); + cmsg.setRootDisk(rootDisk); + cmsg.setDataDisks(new ArrayList<>(msg.getDiskAOs())); + cmsg.getDataDisks().remove(rootDisk); + } + + if (cmsg.getRootDisk() == null) { DiskAO bootDisk = DiskAO.rootDisk(); if (msg.getRootDiskOfferingUuid() != null) { @@ -63,9 +71,9 @@ public static CreateVmInstanceMsg fromAPICreateVmInstanceMsg(APICreateVmInstance bootDisk.setPlatform(msg.getPlatform()); bootDisk.setGuestOsType(msg.getGuestOsType()); bootDisk.setArchitecture(msg.getArchitecture()); - cmsg.setDiskAOs(list(bootDisk)); + cmsg.setRootDisk(bootDisk); } else { - DiskAO bootDisk = findOneOrNull(cmsg.getDiskAOs(), DiskAO::isBoot); + DiskAO bootDisk = cmsg.getRootDisk(); if (msg.getRootDiskOfferingUuid() != null) { bootDisk.setDiskOfferingUuid(msg.getRootDiskOfferingUuid()); } else if (msg.getRootDiskSize() != null) { @@ -76,6 +84,64 @@ public static CreateVmInstanceMsg fromAPICreateVmInstanceMsg(APICreateVmInstance bootDisk.setArchitecture(msg.getArchitecture()); } + // dataDiskOfferingUuids + dataDiskSizes -> deprecatedDataVolumeSpecs + int expectDataVolumeCount = + (msg.getDataDiskOfferingUuids() == null ? 0 : msg.getDataDiskOfferingUuids().size()) + + (msg.getDataDiskSizes() == null ? 0 : msg.getDataDiskSizes().size()); + List deprecatedDataVolumeSpecs = new ArrayList<>(); + for (int i = 0; i < expectDataVolumeCount; i++) { + deprecatedDataVolumeSpecs.add(DiskAO.nonRootDisk()); + } + + int index = 0; + if (!isEmpty(msg.getDataDiskOfferingUuids())) { + for (String dataDiskOfferingUuid : msg.getDataDiskOfferingUuids()) { + deprecatedDataVolumeSpecs.get(index).setDiskOfferingUuid(dataDiskOfferingUuid); + index++; + } + } + if (!isEmpty(msg.getDataDiskSizes())) { + for (Long dataDiskSize : msg.getDataDiskSizes()) { + deprecatedDataVolumeSpecs.get(index).setSize(dataDiskSize); + index++; + } + } + + // dataVolumeSystemTagsOnIndex -> deprecatedDataVolumeSpecs + if (msg.getDataVolumeSystemTagsOnIndex() != null) { + final Map> dataVolumeSystemTagsOnIndex = msg.getDataVolumeSystemTagsOnIndex(); + for (int i = 0; i <= expectDataVolumeCount; i++) { + String key = i + ""; + if (!dataVolumeSystemTagsOnIndex.containsKey(key)) { + continue; + } + + final DiskAO diskAO = deprecatedDataVolumeSpecs.get(i); + if (diskAO.getSystemTags() == null) { + diskAO.setSystemTags(new ArrayList<>()); + } + diskAO.getSystemTags().addAll(dataVolumeSystemTagsOnIndex.get(key)); + } + } + cmsg.setDeprecatedDataVolumeSpecs(deprecatedDataVolumeSpecs); + + if (!isEmpty(msg.getSystemTags())) { + for (Iterator it = msg.getSystemTags().iterator(); it.hasNext();) { + String tag = it.next(); + // systemTags: primaryStorageUuidForDataVolume::{uuid} -> candidatePrimaryStorageUuidsForDataVolume + if (PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME.isMatch(tag)) { + String psUuid = PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME.getTokenByTag(tag, PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME_TOKEN); + cmsg.setCandidatePrimaryStorageUuidsForDataVolume(list(psUuid)); + + if (cmsg.getDataDisks() != null) { + cmsg.getDataDisks().forEach(diskAO -> diskAO.setPrimaryStorageUuid(psUuid)); + } + cmsg.getDeprecatedDataVolumeSpecs().forEach(diskAO -> diskAO.setPrimaryStorageUuid(psUuid)); + it.remove(); + } + } + } + return cmsg; } @@ -84,7 +150,7 @@ private static String getPSUuidForDataVolume(List systemTags){ return null; } - return SystemTagUtils.findTagValue(systemTags, VmSystemTags.PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME, VmSystemTags.PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME_TOKEN); + return SystemTagUtils.findTagValue(systemTags, PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME, PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME_TOKEN); } public static UpdateVmInstanceSpec convertToSpec(UpdateVmInstanceMsg message, VmInstanceVO vm) { diff --git a/compute/src/main/java/org/zstack/compute/vm/VmInstantiateOtherDiskFlow.java b/compute/src/main/java/org/zstack/compute/vm/VmInstantiateOtherDiskFlow.java index 068c8bf96f..69537bd55f 100644 --- a/compute/src/main/java/org/zstack/compute/vm/VmInstantiateOtherDiskFlow.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmInstantiateOtherDiskFlow.java @@ -129,6 +129,7 @@ public void run(final FlowTrigger innerTrigger, Map data) { amsg.setDiskOfferingUuid(diskAO.getDiskOfferingUuid()); amsg.setRequiredPrimaryStorageUuid(diskAO.getPrimaryStorageUuid()); amsg.setPurpose(PrimaryStorageAllocationPurpose.CreateDataVolume.toString()); + amsg.setTags(diskAO.getSystemTags()); bus.makeLocalServiceId(amsg, PrimaryStorageConstant.SERVICE_ID); bus.send(amsg, new CloudBusCallBack(innerTrigger) { @Override diff --git a/compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java b/compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java index 76bedcc65d..52aa2282c8 100755 --- a/compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java +++ b/compute/src/main/java/org/zstack/compute/vm/VmSystemTags.java @@ -122,7 +122,12 @@ public class VmSystemTags { public static String VM_INJECT_QEMUGA_TOKEN = "qemuga"; public static PatternedSystemTag VM_INJECT_QEMUGA = new PatternedSystemTag(String.format("%s", VM_INJECT_QEMUGA_TOKEN), VmInstanceVO.class); + @Deprecated public static String PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME_TOKEN = "primaryStorageUuidForDataVolume"; + /** + * use {@link org.zstack.header.vm.DiskAO#setPrimaryStorageUuid(String)} + */ + @Deprecated public static PatternedSystemTag PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME = new PatternedSystemTag(String.format("primaryStorageUuidForDataVolume::{%s}", PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME_TOKEN), VmInstanceVO.class); public static final String VM_SYSTEM_SERIAL_NUMBER_TOKEN = "vmSystemSerialNumber"; diff --git a/conf/db/upgrade/V4.10.18__schema.sql b/conf/db/upgrade/V4.10.18__schema.sql new file mode 100644 index 0000000000..f8ea123edc --- /dev/null +++ b/conf/db/upgrade/V4.10.18__schema.sql @@ -0,0 +1,21 @@ +CREATE TABLE IF NOT EXISTS `zstack`.`VmCustomSpecificationVO` ( + `uuid` varchar(32) NOT NULL UNIQUE, + `vmInstanceUuid` varchar(32) DEFAULT NULL, + `name` varchar(255) NOT NULL, + `description` varchar(2048) DEFAULT NULL, + `platform` varchar(32) NOT NULL, + `hostname` varchar(255) DEFAULT NULL, + `rootPassword` varchar(255) DEFAULT NULL, + `generateSID` boolean DEFAULT FALSE, + `domainMode` varchar(32) DEFAULT 'WorkGroup', + `domainName` varchar(255) DEFAULT NULL, + `domainUsername` varchar(255) DEFAULT NULL, + `domainPassword` varchar(255) DEFAULT NULL, + `organization` varchar(255) DEFAULT NULL, + `lastOpDate` timestamp ON UPDATE CURRENT_TIMESTAMP, + `createDate` timestamp, + PRIMARY KEY (`uuid`), + CONSTRAINT `fkVmCustomSpecificationVOVmInstanceEO` FOREIGN KEY (`vmInstanceUuid`) REFERENCES `VmInstanceEO` (`uuid`) ON DELETE SET NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +DELETE FROM `zstack`.`ResourceConfigVO` WHERE category='sharedblock' AND name='qcow2.allocation' AND value='metadata'; diff --git a/conf/db/upgrade/V4.10.20__schema.sql b/conf/db/upgrade/V4.10.20__schema.sql new file mode 100644 index 0000000000..2885624613 --- /dev/null +++ b/conf/db/upgrade/V4.10.20__schema.sql @@ -0,0 +1,22 @@ +CREATE TABLE IF NOT EXISTS `zstack`.`SoftwarePackageVO` ( + `uuid` char(32) NOT NULL UNIQUE, + `name` varchar(255) NOT NULL, + `hostUuid` char(32), + `managementNodeUuid` char(32), + `installPath` varchar(2048), + `unzipInstallPath` varchar(2048), + `type` varchar(1024), + `md5sum` char(32), + `status` char(32), + `size` bigint unsigned, + `lastOpDate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `createDate` timestamp, + PRIMARY KEY (`uuid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +CALL INSERT_COLUMN('HostEO', 'hostname', 'varchar(256)', 1, NULL, 'nqn'); +DROP VIEW IF EXISTS `zstack`.`HostVO`; +CREATE VIEW `zstack`.`HostVO` AS SELECT uuid, zoneUuid, clusterUuid, name, description, managementIp, hypervisorType, +state, status, architecture, nqn, hostname, createDate, lastOpDate FROM `zstack`.`HostEO` WHERE deleted IS NULL; + diff --git a/conf/errorCodes/SoftwarePackagePlugin.xml b/conf/errorCodes/SoftwarePackagePlugin.xml new file mode 100644 index 0000000000..012c252d14 --- /dev/null +++ b/conf/errorCodes/SoftwarePackagePlugin.xml @@ -0,0 +1,8 @@ + + SoftwarePackage + + + 2000 + Failed to upload software package + + diff --git a/conf/errorCodes/lun.xml b/conf/errorCodes/lun.xml new file mode 100644 index 0000000000..a4ad64cecc --- /dev/null +++ b/conf/errorCodes/lun.xml @@ -0,0 +1,18 @@ + + LUN + + + 1000 + General error + + + + 1001 + Lun has been created + + + + 1002 + Lun cannot be found + + \ No newline at end of file diff --git a/conf/errorCodes/managements.xml b/conf/errorCodes/managements.xml new file mode 100644 index 0000000000..49151a0f91 --- /dev/null +++ b/conf/errorCodes/managements.xml @@ -0,0 +1,34 @@ + + MANAGEMENTS + + + 1000 + General error + + + + 2000 + ZSphere (ZStack) HA2 related error + + + + 2001 + Missing ZSphere HA2 tools + + + + 2101 + Failed to get ZSphere HA2 status + + + + 2102 + Failed to parse ZSphere HA2 status + + + + 2103 + HA environment not installed + + + diff --git a/conf/errorCodes/vm.xml b/conf/errorCodes/vm.xml index bcf8ce5fc3..89b18111c6 100755 --- a/conf/errorCodes/vm.xml +++ b/conf/errorCodes/vm.xml @@ -86,5 +86,20 @@ 1017 Cannot get vnc setting. + + + 1200 + VM allocation error + + + + 1201 + Wrong specific host error + + + + 1202 + Wrong specific primary storage error + diff --git a/conf/errorCodes/vops/vops.xml b/conf/errorCodes/vops/vops.xml new file mode 100644 index 0000000000..3436bc2ad9 --- /dev/null +++ b/conf/errorCodes/vops/vops.xml @@ -0,0 +1,18 @@ + + VOPS + + + 1000 + VOps Generic Errors + + + + 1312 + Http Timed Out + + + + 1315 + Errors on Remote Vops Agent + + diff --git a/conf/globalConfig/cluster.xml b/conf/globalConfig/cluster.xml index 73a310ccc4..88926fe516 100755 --- a/conf/globalConfig/cluster.xml +++ b/conf/globalConfig/cluster.xml @@ -4,7 +4,7 @@ cluster update.os.parallelismDegree The maximum count of cluster that can update operating system at the same time - 2 + 10 java.lang.Integer diff --git a/conf/globalConfig/host.xml b/conf/globalConfig/host.xml index c84a5dbdd6..795d853586 100755 --- a/conf/globalConfig/host.xml +++ b/conf/globalConfig/host.xml @@ -81,7 +81,7 @@ host update.os.parallelismDegree The maximum count of host that can update operating system at the same time - 2 + 10 java.lang.Integer diff --git a/conf/guestOs/guestOsCategory.xml b/conf/guestOs/guestOsCategory.xml index 366f101899..89b190371b 100644 --- a/conf/guestOs/guestOsCategory.xml +++ b/conf/guestOs/guestOsCategory.xml @@ -331,6 +331,12 @@ 2022 WindowsServer 2022 + + Windows + Windows + 2025 + WindowsServer 2025 + Windows Windows diff --git a/conf/guestOs/guestOsCharacter.xml b/conf/guestOs/guestOsCharacter.xml index 9753d8dbed..6431e26c35 100644 --- a/conf/guestOs/guestOsCharacter.xml +++ b/conf/guestOs/guestOsCharacter.xml @@ -297,6 +297,12 @@ WindowsServer 2022 false + + x86_64 + Windows + WindowsServer 2025 + false + x86_64 Windows diff --git a/conf/persistence.xml b/conf/persistence.xml index 6ed53018d9..aa295bcb36 100755 --- a/conf/persistence.xml +++ b/conf/persistence.xml @@ -210,5 +210,6 @@ org.zstack.header.resourceattribute.entity.ResourceAttributeValueVO org.zstack.header.resourceattribute.entity.ResourceAttributeKeyResourceTypeVO org.zstack.header.resourceattribute.entity.ResourceAttributeConstraintVO + org.zstack.softwarePackage.header.SoftwarePackageVO diff --git a/conf/serviceConfig/host.xml b/conf/serviceConfig/host.xml index ce78b04a12..b7aafef93c 100755 --- a/conf/serviceConfig/host.xml +++ b/conf/serviceConfig/host.xml @@ -80,4 +80,8 @@ org.zstack.header.host.APIUpdateHostNqnMsg + + + org.zstack.header.host.APIUpdateHostnameMsg + diff --git a/conf/springConfigXml/ExternalPrimaryStorage.xml b/conf/springConfigXml/ExternalPrimaryStorage.xml index 6b76464906..b1055dc4f1 100644 --- a/conf/springConfigXml/ExternalPrimaryStorage.xml +++ b/conf/springConfigXml/ExternalPrimaryStorage.xml @@ -28,6 +28,7 @@ + diff --git a/conf/springConfigXml/VmInstanceManager.xml b/conf/springConfigXml/VmInstanceManager.xml index 13c0ece52e..20e094378a 100755 --- a/conf/springConfigXml/VmInstanceManager.xml +++ b/conf/springConfigXml/VmInstanceManager.xml @@ -34,7 +34,7 @@ org.zstack.compute.vm.VmImageSelectBackupStorageFlow org.zstack.compute.vm.VmAllocateHostAndPrimaryStorageFlow - org.zstack.compute.vm.VmAllocateVolumeFlow + org.zstack.compute.vm.VmAllocateVolumeFlow org.zstack.compute.vm.VmAllocateNicFlow org.zstack.compute.vm.VmAllocateNicIpFlow org.zstack.compute.vm.VmAllocateCdRomFlow @@ -87,8 +87,8 @@ org.zstack.compute.vm.VmDestroyOnHypervisorFlow org.zstack.compute.vm.VmReturnHostFlow org.zstack.compute.vm.VmReleaseResourceFlow - org.zstack.compute.vm.VmReturnReleaseNicFlow - org.zstack.compute.vm.VmPostReleaseNicFlow + org.zstack.compute.vm.VmReturnReleaseNicFlow + org.zstack.compute.vm.VmPostReleaseNicFlow org.zstack.compute.vm.VmDeleteVolumeFlow @@ -188,7 +188,7 @@ - + diff --git a/core/src/main/java/org/zstack/core/ansible/CallBackNetworkChecker.java b/core/src/main/java/org/zstack/core/ansible/CallBackNetworkChecker.java index e178265f4a..5e833f973e 100644 --- a/core/src/main/java/org/zstack/core/ansible/CallBackNetworkChecker.java +++ b/core/src/main/java/org/zstack/core/ansible/CallBackNetworkChecker.java @@ -47,7 +47,7 @@ public void deleteDestFile() { * if failed, use nmap to try again. */ private ErrorCode useNcatAndNmapToTestConnection(Ssh ssh) { - String srcScript = script.format(password, callBackPort, callbackIp); + String srcScript = script.format(Ssh.shellQuote(password), callBackPort, callbackIp); SshResult ret = ssh.setExecTimeout(60).shell(srcScript).setTimeout(60).runAndClose(); ret.raiseExceptionIfFailed(); diff --git a/core/src/main/java/org/zstack/core/ansible/SshChronyConfigChecker.java b/core/src/main/java/org/zstack/core/ansible/SshChronyConfigChecker.java index 37fad948ab..e9afbb1ee0 100644 --- a/core/src/main/java/org/zstack/core/ansible/SshChronyConfigChecker.java +++ b/core/src/main/java/org/zstack/core/ansible/SshChronyConfigChecker.java @@ -29,11 +29,13 @@ public boolean needDeploy() { .setPassword(password).setPort(sshPort) .setHostname(targetIp); try { - ssh.command("awk '/^\\s*server/{print $2}' /etc/chrony.conf"); + ssh.sudoCommand("awk '/^\\s*server/{print $2}' /etc/chrony.conf"); SshResult ret = ssh.run(); int returnCode = ret.getReturnCode(); ssh.reset(); if (returnCode != 0) { + logger.warn(String.format("exec ssh command failed, return code: %d, stdout: %s, stderr: %s", + ret.getReturnCode(), ret.getStdout(), ret.getStderr())); return true; } diff --git a/core/src/main/java/org/zstack/core/ansible/SshFileExistChecker.java b/core/src/main/java/org/zstack/core/ansible/SshFileExistChecker.java index b09a5441d2..726e1a1e9a 100755 --- a/core/src/main/java/org/zstack/core/ansible/SshFileExistChecker.java +++ b/core/src/main/java/org/zstack/core/ansible/SshFileExistChecker.java @@ -23,7 +23,7 @@ public boolean needDeploy() { .setHostname(targetIp) .setTimeout(5); try { - ssh.command(String.format("echo %s | sudo -S stat %s 2>/dev/null", password, filePath)); + ssh.sudoCommand(String.format("stat %s", filePath)); SshResult ret = ssh.run(); if (ret.getReturnCode() != 0) { logger.debug(String.format("file not exist, file: %s", filePath)); diff --git a/core/src/main/java/org/zstack/core/ansible/SshFileMd5Checker.java b/core/src/main/java/org/zstack/core/ansible/SshFileMd5Checker.java index e39856677a..338a8a2252 100755 --- a/core/src/main/java/org/zstack/core/ansible/SshFileMd5Checker.java +++ b/core/src/main/java/org/zstack/core/ansible/SshFileMd5Checker.java @@ -1,5 +1,6 @@ package org.zstack.core.ansible; +import org.zstack.core.CoreGlobalProperty; import org.zstack.utils.ShellResult; import org.zstack.utils.ShellUtils; import org.zstack.utils.Utils; @@ -11,8 +12,6 @@ import java.util.ArrayList; import java.util.List; -/** - */ public class SshFileMd5Checker implements AnsibleChecker { private static final CLogger logger = Utils.getLogger(SshFileMd5Checker.class); @@ -33,7 +32,9 @@ private SrcDestPair(String srcPath, String destPath) { String destPath; } - public static final String ZSTACKLIB_SRC_PATH = PathUtil.findFileOnClassPath(String.format("ansible/zstacklib/%s", AnsibleGlobalProperty.ZSTACKLIB_PACKAGE_NAME), true).getAbsolutePath(); + public static final String ZSTACKLIB_SRC_PATH = CoreGlobalProperty.UNIT_TEST_ON ? "/tmp" : + PathUtil.findFileOnClassPath(String.format("ansible/zstacklib/%s", + AnsibleGlobalProperty.ZSTACKLIB_PACKAGE_NAME), true).getAbsolutePath(); @Override public boolean needDeploy() { @@ -47,11 +48,11 @@ public boolean needDeploy() { String sourceFilePath = b.srcPath; String destFilePath = b.destPath; - ssh.command(String.format("echo %s | sudo -S md5sum %s 2>/dev/null", - ShellUtils.escapeShellText(password), - destFilePath)); + ssh.sudoCommand(String.format("md5sum %s", destFilePath)); SshResult ret = ssh.run(); if (ret.getReturnCode() != 0) { + logger.warn(String.format("exec ssh command failed, return code: %d, stdout: %s, stderr: %s", + ret.getReturnCode(), ret.getStdout(), ret.getStderr())); return true; } ssh.reset(); @@ -61,7 +62,7 @@ public boolean needDeploy() { sret.raiseExceptionIfFail(); String srcMd5 = sret.getStdout().split(" ")[0]; if (!destMd5.equals(srcMd5)) { - logger.debug(String.format("file MD5 changed, src[%s, md5:%s] dest[%s, md5, %s]", sourceFilePath, + logger.debug(String.format("file MD5 changed, src[%s, md5:%s] dest[%s, md5: %s]", sourceFilePath, srcMd5, destFilePath, destMd5)); return true; } @@ -77,10 +78,15 @@ public boolean needDeploy() { public void deleteDestFile() { for (SrcDestPair b : srcDestPairs) { String destFilePath = b.destPath; + if (!destFilePath.contains("zstack")) { + logger.debug(String.format("skip delete dest file[%s] which is not zstack file", destFilePath)); + continue; + } + Ssh ssh = new Ssh(); ssh.setUsername(username).setPrivateKey(privateKey) .setPassword(password).setPort(sshPort) - .setHostname(targetIp).command(String.format("rm -f %s", destFilePath)).runAndClose(); + .setHostname(targetIp).sudoCommand(String.format("rm -f %s", destFilePath)).runAndClose(); logger.debug(String.format("delete dest file[%s]", destFilePath)); } } diff --git a/core/src/main/java/org/zstack/core/ansible/SshFilesMd5Checker.java b/core/src/main/java/org/zstack/core/ansible/SshFilesMd5Checker.java index 8f66b2af41..71d9cab88b 100644 --- a/core/src/main/java/org/zstack/core/ansible/SshFilesMd5Checker.java +++ b/core/src/main/java/org/zstack/core/ansible/SshFilesMd5Checker.java @@ -29,12 +29,11 @@ public boolean needDeploy() { .setHostname(ip) .setTimeout(5); try { - ssh.command(String.format("echo %s | sudo -S md5sum %s 2>/dev/null", - ShellUtils.escapeShellText(password), - filePath)); + ssh.sudoCommand(String.format("md5sum %s", filePath)); SshResult ret = ssh.run(); if (ret.getReturnCode() != 0) { - logger.warn(String.format("Failed to get MD5 for file %s: %s", filePath, ret.getStderr())); + logger.warn(String.format("exec ssh command failed, return code: %d, stdout: %s, stderr: %s", + ret.getReturnCode(), ret.getStdout(), ret.getStderr())); return true; } ssh.reset(); @@ -52,10 +51,15 @@ public boolean needDeploy() { @Override public void deleteDestFile() { + if (!filePath.contains("zstack")) { + logger.debug(String.format("skip delete dest file[%s] which is not zstack file", filePath)); + return; + } + Ssh ssh = new Ssh(); ssh.setUsername(username).setPrivateKey(privateKey) .setPassword(password).setPort(sshPort) - .setHostname(ip).command(String.format("rm -f %s", filePath)).runAndClose(); + .setHostname(ip).sudoCommand(String.format("rm -f %s", filePath)).runAndClose(); logger.debug(String.format("delete dest file[%s]", filePath)); } diff --git a/core/src/main/java/org/zstack/core/ansible/SshFolderMd5Checker.java b/core/src/main/java/org/zstack/core/ansible/SshFolderMd5Checker.java index ed6b0e4a1d..e86126756f 100755 --- a/core/src/main/java/org/zstack/core/ansible/SshFolderMd5Checker.java +++ b/core/src/main/java/org/zstack/core/ansible/SshFolderMd5Checker.java @@ -11,6 +11,7 @@ import org.zstack.utils.StringDSL.StringWrapper; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; +import org.zstack.utils.ssh.Ssh; import org.zstack.utils.ssh.SshResult; import org.zstack.utils.ssh.SshShell; @@ -107,7 +108,7 @@ public boolean needDeploy() { srcRes.getStdout(), srcRes.getStderr())); } - String dstScript = script.format(dstFolder, password); + String dstScript = script.format(dstFolder, Ssh.shellQuote(password)); SshShell ssh = new SshShell(); ssh.setHostname(hostname); ssh.setUsername(username); diff --git a/core/src/main/java/org/zstack/core/ansible/SshYamlChecker.java b/core/src/main/java/org/zstack/core/ansible/SshYamlChecker.java index 80f48782f6..32e6ca5ae0 100644 --- a/core/src/main/java/org/zstack/core/ansible/SshYamlChecker.java +++ b/core/src/main/java/org/zstack/core/ansible/SshYamlChecker.java @@ -36,9 +36,11 @@ public boolean needDeploy() { .setHostname(targetIp); try { - ssh.command(String.format("grep -o '%s' %s | uniq | wc -l", getGrepArgs(), yamlFilePath)); + ssh.sudoCommand(String.format("grep -o '%s' %s | uniq | wc -l", getGrepArgs(), yamlFilePath)); SshResult ret = ssh.run(); if (ret.getReturnCode() != 0) { + logger.warn(String.format("exec ssh command failed, return code: %d, stdout: %s, stderr: %s", + ret.getReturnCode(), ret.getStdout(), ret.getStderr())); return true; } diff --git a/core/src/main/java/org/zstack/core/ansible/SshYumRepoChecker.java b/core/src/main/java/org/zstack/core/ansible/SshYumRepoChecker.java index 8732f2067e..8438fce4ea 100644 --- a/core/src/main/java/org/zstack/core/ansible/SshYumRepoChecker.java +++ b/core/src/main/java/org/zstack/core/ansible/SshYumRepoChecker.java @@ -36,12 +36,13 @@ public boolean needDeploy() { .setPassword(password).setPort(sshPort) .setHostname(targetIp); try { - ssh.command(String.format( - "echo %s | sudo -S sed -i '/baseurl/s/\\([0-9]\\{1,3\\}\\.\\)\\{3\\}[0-9]\\{1,3\\}:\\([0-9]\\+\\)/%s/g' /etc/yum.repos.d/{zstack,qemu-kvm-ev}-mn.repo", - password, restf.getHostName() + ":" + restf.getPort() + ssh.sudoCommand(String.format("sed -i '/baseurl/s/\\([0-9]\\{1,3\\}\\.\\)\\{3\\}[0-9]\\{1,3\\}:\\([0-9]\\+\\)/%s/g' /etc/yum.repos.d/{zstack,qemu-kvm-ev}-mn.repo", + restf.getHostName() + ":" + restf.getPort() )); SshResult ret = ssh.setTimeout(60).runAndClose(); if (ret.getReturnCode() != 0) { + logger.warn(String.format("exec ssh command failed, return code: %d, stdout: %s, stderr: %s", + ret.getReturnCode(), ret.getStdout(), ret.getStderr())); return true; } diff --git a/core/src/main/java/org/zstack/core/db/QueryMore.java b/core/src/main/java/org/zstack/core/db/QueryMore.java index 9b56f29a1e..21d1441c67 100644 --- a/core/src/main/java/org/zstack/core/db/QueryMore.java +++ b/core/src/main/java/org/zstack/core/db/QueryMore.java @@ -242,7 +242,7 @@ public QueryMore notIn(SingularAttribute attr, QueryMore subQuery) { } public QueryMore notIn(SingularAttribute attr, Q subQuery) { - return in(attr, subQuery.toQueryMore()); + return notIn(attr, subQuery.toQueryMore()); } public QueryMore isNull(SingularAttribute attr) { diff --git a/core/src/main/java/org/zstack/core/rest/AsyncResponseFetcher.java b/core/src/main/java/org/zstack/core/rest/AsyncResponseFetcher.java new file mode 100644 index 0000000000..cc611e4b73 --- /dev/null +++ b/core/src/main/java/org/zstack/core/rest/AsyncResponseFetcher.java @@ -0,0 +1,122 @@ +package org.zstack.core.rest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.zstack.core.thread.PeriodicTask; +import org.zstack.core.thread.ThreadFacade; +import org.zstack.core.timeout.TimeHelper; +import org.zstack.header.core.ReturnValueCompletion; +import org.zstack.header.errorcode.ErrorCode; +import org.zstack.header.errorcode.ErrorableValue; +import org.zstack.header.errorcode.SysErrors; +import org.zstack.header.rest.AbstractAsyncResponseFetcher; +import org.zstack.utils.Utils; +import org.zstack.utils.logging.CLogger; + +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +import static org.zstack.core.Platform.err; + +public class AsyncResponseFetcher extends AbstractAsyncResponseFetcher { + private static final CLogger logger = Utils.getLogger(AsyncResponseFetcher.class); + private Future cancelHandler; + + protected long runUtil; + + @Autowired + protected ThreadFacade threadFacade; + @Autowired + protected TimeHelper timeHelper; + + protected AsyncResponseFetcher(Class returnType) { + super(returnType); + } + + @Override + public void fetch(ReturnValueCompletion completion) { + runUtil = timeHelper.getCurrentTimeMillis() + allAttemptsTimeoutInMillis; + + ReturnValueCompletion completionOnlyIfFinished = new ReturnValueCompletion(completion) { + @Override + public void success(T returnValue) { + onFinished(); + completion.success(returnValue); + } + + @Override + public void fail(ErrorCode errorCode) { + onFinished(); + completion.fail(errorCode); + } + }; + + cancelHandler = threadFacade.submitPeriodicTask(new PeriodicTask() { + @Override + public TimeUnit getTimeUnit() { + return TimeUnit.MILLISECONDS; + } + + @Override + public long getInterval() { + return eachAttemptIntervalInMillis; + } + + @Override + public String getName() { + return "wait-for-api-response"; + } + + @Override + public void run() { + if (cancelHandler == null || cancelHandler.isCancelled()) { + return; + } + + boolean finished = AsyncResponseFetcher.this.run(completionOnlyIfFinished); + if (finished) { + return; + } + + if (timeHelper.getCurrentTimeMillis() > runUtil) { + completionOnlyIfFinished.fail(timeoutError()); + } + } + }); + } + + private void onFinished() { + try { + cancelHandler.cancel(true); + cancelHandler = null; + } catch (Exception e) { + logger.trace("cancel periodic task failed", e); + } + } + + private ErrorCode timeoutError() { + return err(SysErrors.HTTP_ERROR, "http timeout") + .withOpaque("timeout.millis", allAttemptsTimeoutInMillis) + .withOpaque("expect.response.type", returnType.getSimpleName()); + } + + /** + * invoke completionOnlyIfFinished.success/fail ONLY when task finished !!! + * @return finished + */ + protected boolean run(ReturnValueCompletion completionOnlyIfFinished) { + ErrorableValue value = eachAttempt(); + + if (value.isSuccess()) { + completionOnlyIfFinished.success(value.result); + return true; + } + + final ErrorCode error = value.error; + if (error == NOT_FINISHED_YET) { + return false; + } + + completionOnlyIfFinished.fail(error); + return true; + } +} diff --git a/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsAgent.java b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsAgent.java new file mode 100644 index 0000000000..ee59449397 --- /dev/null +++ b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsAgent.java @@ -0,0 +1,63 @@ +package org.zstack.externalservice.vops; + +import org.zstack.core.Platform; +import org.zstack.core.externalservice.AbstractLocalExternalService; +import org.zstack.core.externalservice.ExternalServiceCapabilitiesBuilder; +import org.zstack.header.core.external.service.ExternalServiceCapabilities; +import org.zstack.utils.Bash; + +/** + * Note: VOps is a handler by systemctl. + * It is always running after MN installed. + * + * So it is why we don't need to write "VOpsFactory" class + */ +public class VOpsAgent extends AbstractLocalExternalService { + @Override + protected String[] getCommandLineKeywords() { + return new String[]{"/usr/bin/python3", "/usr/local/vops/vops-agent/setup.py"}; + } + + ExternalServiceCapabilities capabilities = ExternalServiceCapabilitiesBuilder + .build() + .reloadConfig(false); + + @Override + public String getName() { + return "vops-agent"; + } + + @Override + public void start() { + if (isAlive()) { + return; + } + + new Bash() { + @Override + protected void scripts() { + setE(); + sudoRun("systemctl start vops"); + } + }.execute(); + } + + @Override + public boolean isAlive() { + return getPID() != null; + } + + @Override + public ExternalServiceCapabilities getExternalServiceCapabilities() { + return capabilities; + } + + @Override + public void reload() { + // do nothing + } + + public VOpsClient createClient() { + return Platform.New(VOpsClient::new); + } +} diff --git a/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsClient.java b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsClient.java new file mode 100644 index 0000000000..e4095a5782 --- /dev/null +++ b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsClient.java @@ -0,0 +1,58 @@ +package org.zstack.externalservice.vops; + +import org.springframework.beans.factory.annotation.Autowire; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Configurable; +import org.zstack.core.timeout.TimeHelper; +import org.zstack.header.rest.RESTFacade; +import org.zstack.header.rest.RestHttp; + +@Configurable(preConstruction = true, autowire = Autowire.BY_TYPE) +public class VOpsClient { + String hostname = "127.0.0.1"; + int port = VOpsConstant.SERVER_PORT; + String sessionUuid; + + @Autowired + protected RESTFacade restFacade; + + @Autowired + protected TimeHelper timeHelper; + + public VOpsClient withHostname(String hostname) { + this.hostname = hostname; + return this; + } + + public VOpsClient withPort(int port) { + this.port = port; + return this; + } + + public VOpsClient withSession(String sessionUuid) { + this.sessionUuid = sessionUuid; + return this; + } + + long getCurrentTimeMillis() { + return timeHelper.getCurrentTimeMillis(); + } + + protected RestHttp http(Class returnClass) { + return restFacade.http(returnClass); + } + + public VOpsClientRestHttp createHttp(String path) { + if (path.startsWith("/")) { + path = path.substring(1); + } + + VOpsClientRestHttp http = new VOpsClientRestHttp(this) + // "http://{self.hostname}:{self.port}/{path}" + .withPath(String.format("http://%s:%s/%s", hostname, port, path)); + if (sessionUuid != null) { + http.withSession(sessionUuid); + } + return http; + } +} diff --git a/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsClientRestHttp.java b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsClientRestHttp.java new file mode 100644 index 0000000000..d819f1d633 --- /dev/null +++ b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsClientRestHttp.java @@ -0,0 +1,136 @@ +package org.zstack.externalservice.vops; + +import org.springframework.http.HttpMethod; +import org.zstack.header.errorcode.ErrorableValue; +import org.zstack.header.rest.RestHttp; +import org.zstack.utils.gson.JSONObjectUtil; +import com.google.gson.JsonObject; + +import java.util.HashMap; +import java.util.Map; + +import static org.zstack.core.Platform.err; +import static org.zstack.externalservice.vops.VOpsErrors.*; + +public class VOpsClientRestHttp { + public final VOpsClient client; + private String path; + private long timeoutInMillis = 10000L; + protected String body; + protected Map headers = new HashMap<>(); + + public VOpsClientRestHttp(VOpsClient client) { + this.client = client; + } + + public VOpsClientRestHttp withPath(String path) { + this.path = path; + return this; + } + + public VOpsClientRestHttp withTimeoutInMillis(long timeoutInMillis) { + this.timeoutInMillis = timeoutInMillis; + return this; + } + + public VOpsClientRestHttp withBody(String body) { + this.body = body; + return this; + } + + public VOpsClientRestHttp withBodyJson(Object body) { + this.body = JSONObjectUtil.toJsonString(body); + return this; + } + + public VOpsClientRestHttp withHeader(String key, String value) { + this.headers.put(key, value); + return this; + } + + public VOpsClientRestHttp withSession(String sessionUuid) { + return withHeader("Authorization", "OAuth " + sessionUuid); + } + + public ErrorableValue getWithErrorCode() { + return callWithErrorCode(HttpMethod.GET); + } + + public ErrorableValue postWithErrorCode() { + return callWithErrorCode(HttpMethod.POST); + } + + public ErrorableValue putWithErrorCode() { + return callWithErrorCode(HttpMethod.PUT); + } + + public ErrorableValue callWithErrorCode(HttpMethod method) { + long expectEndTime = this.client.getCurrentTimeMillis() + this.timeoutInMillis; + final RestHttp http = client.http(JsonObject.class) + .withPath(path) + .withTimeoutInMillis(timeoutInMillis) + .withoutRetry(); + if (this.headers != null) { + for (Map.Entry entry : this.headers.entrySet()) { + http.withHeader(entry.getKey(), entry.getValue()); + } + } + if (this.body != null) { + http.withBody(this.body); + } + ErrorableValue firstResult = http.callWithErrorCode(method); + if (!firstResult.isSuccess()) { + return firstResult; + } + + if (!firstResult.result.has("api_id")) { + return firstResult; + } + String apiId = firstResult.result.get("api_id").getAsString(); + + RestHttp nextHttp = client.http(JsonObject.class) + .withPath(String.format("http://%s:%s/api/%s", client.hostname, client.port, apiId)) + .withTimeoutInMillis(2000L) + .withoutRetry(); + if (this.headers != null) { + for (Map.Entry entry : this.headers.entrySet()) { + http.withHeader(entry.getKey(), entry.getValue()); + } + } + int waitingCount = 0; + while (this.client.getCurrentTimeMillis() < expectEndTime) { + ErrorableValue nextResult = nextHttp.getWithErrorCode(); + if (!nextResult.isSuccess()) { + return nextResult; + } + + if (!nextResult.result.has("finished")) { + return nextResult; + } + + ++waitingCount; + if (nextResult.result.get("finished").getAsBoolean()) { + if (!nextResult.result.has("success") || !nextResult.result.get("success").getAsBoolean()) { + return ErrorableValue.ofErrorCode(err(REMOTE_AGENT_ERROR, "error on remote node") + .withCause(wrapErrorFromVOpsClient(nextResult.result.getAsJsonObject("error")) + .withOpaque("response.by", "vops") + .withOpaque("path", path) + .withOpaque("api.id", apiId))); + } + + return ErrorableValue.of(nextResult.result.getAsJsonObject("results")); + } + + try { + Thread.sleep(waitingCount < 10 ? 500 : 1000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + return ErrorableValue.ofErrorCode(err(HTTP_TIMED_OUT, "client http timeout") + .withOpaque("response.by", "vops") + .withOpaque("path", path) + .withOpaque("api.id", apiId)); + } +} diff --git a/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsCommands.java b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsCommands.java new file mode 100644 index 0000000000..76ae617277 --- /dev/null +++ b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsCommands.java @@ -0,0 +1,8 @@ +package org.zstack.externalservice.vops; + +public class VOpsCommands { + public static final String ZSHA2_DEMOTE_PATH = "/zsha2/demote"; + public static class ZSha2DemoteCmd { + public Object params = new Object(); // empty object now + } +} \ No newline at end of file diff --git a/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsConstant.java b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsConstant.java new file mode 100644 index 0000000000..30a19efcac --- /dev/null +++ b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsConstant.java @@ -0,0 +1,5 @@ +package org.zstack.externalservice.vops; + +public class VOpsConstant { + public static final int SERVER_PORT = 8078; +} diff --git a/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsErrors.java b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsErrors.java new file mode 100644 index 0000000000..b62acfcc63 --- /dev/null +++ b/externalservice/src/main/java/org/zstack/externalservice/vops/VOpsErrors.java @@ -0,0 +1,31 @@ +package org.zstack.externalservice.vops; + +import org.zstack.header.errorcode.ErrorCode; +import org.zstack.utils.gson.JSONObjectUtil; +import com.google.gson.JsonElement; + +public enum VOpsErrors { + GENERAL_ERROR(1000), + HTTP_TIMED_OUT(1312), + REMOTE_AGENT_ERROR(1315), + ; + + private String code; + + private VOpsErrors(int id) { + code = String.format("VOPS.%s", id); + } + + @Override + public String toString() { + return code; + } + + public static ErrorCode wrapErrorFromVOpsClient(JsonElement json) { + try { + return JSONObjectUtil.rehashObject(json, ErrorCode.class); + } catch (Exception e) { + return new ErrorCode(VOpsErrors.GENERAL_ERROR.toString(), json.toString()); + } + } +} diff --git a/header/src/main/java/org/zstack/header/candidate/CandidateDecision.java b/header/src/main/java/org/zstack/header/candidate/CandidateDecision.java new file mode 100644 index 0000000000..5b951619df --- /dev/null +++ b/header/src/main/java/org/zstack/header/candidate/CandidateDecision.java @@ -0,0 +1,8 @@ +package org.zstack.header.candidate; + +public enum CandidateDecision { + ACCEPTED, + REJECTED, + RECOMMENDED, + NOT_RECOMMENDED, +} diff --git a/header/src/main/java/org/zstack/header/candidate/CandidateDecisionEntry.java b/header/src/main/java/org/zstack/header/candidate/CandidateDecisionEntry.java new file mode 100644 index 0000000000..59dba7a016 --- /dev/null +++ b/header/src/main/java/org/zstack/header/candidate/CandidateDecisionEntry.java @@ -0,0 +1,33 @@ +package org.zstack.header.candidate; + +import java.io.Serializable; + +public class CandidateDecisionEntry implements Serializable { + private CandidateDecision decision; + private String decisionMaker; + private String reason; + + public CandidateDecision getDecision() { + return decision; + } + + public void setDecision(CandidateDecision decision) { + this.decision = decision; + } + + public String getDecisionMaker() { + return decisionMaker; + } + + public void setDecisionMaker(String decisionMaker) { + this.decisionMaker = decisionMaker; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } +} diff --git a/header/src/main/java/org/zstack/header/candidate/CandidateResult.java b/header/src/main/java/org/zstack/header/candidate/CandidateResult.java new file mode 100644 index 0000000000..5d96b76739 --- /dev/null +++ b/header/src/main/java/org/zstack/header/candidate/CandidateResult.java @@ -0,0 +1,63 @@ +package org.zstack.header.candidate; + +import org.zstack.header.rest.SDK; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@SDK +public class CandidateResult implements Serializable { + private T candidate; + private CandidateDecision finalDecision = CandidateDecision.ACCEPTED; + private List decisions = new ArrayList<>(); + + public CandidateResult(T candidate) { + this.candidate = candidate; + } + + public T getCandidate() { + return candidate; + } + + public void setCandidate(T candidate) { + this.candidate = candidate; + } + + public CandidateDecision getFinalDecision() { + return finalDecision; + } + + public void setFinalDecision(CandidateDecision finalDecision) { + this.finalDecision = finalDecision; + } + + public List getDecisions() { + return decisions; + } + + public void setDecisions(List decisions) { + this.decisions = decisions; + } + + public void addFinalDecision(CandidateDecisionEntry entry) { + if (this.decisions == null) { + this.decisions = new ArrayList<>(); + } + if (entry == null) { + return; + } + this.decisions.add(entry); + this.finalDecision = entry.getDecision(); + } + + public static List> getNotRejectedCandidates(List> candidates) { + if (candidates == null) { + return new ArrayList<>(); + } + return candidates.stream() + .filter(c -> c.getFinalDecision() != CandidateDecision.REJECTED) + .collect(Collectors.toList()); + } +} diff --git a/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationDomainMode.java b/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationDomainMode.java new file mode 100644 index 0000000000..c68e8e4289 --- /dev/null +++ b/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationDomainMode.java @@ -0,0 +1,6 @@ +package org.zstack.header.configuration; + +public enum VmCustomSpecificationDomainMode { + WorkGroup, + Domain +} diff --git a/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationDomainModeDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationDomainModeDoc_zh_cn.groovy new file mode 100644 index 0000000000..ab53319568 --- /dev/null +++ b/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationDomainModeDoc_zh_cn.groovy @@ -0,0 +1,21 @@ +package org.zstack.header.configuration + + + +doc { + + title "加域模式" + + field { + name "WorkGroup" + desc "工作组" + type "VmCustomSpecificationDomainMode" + since "4.10.18" + } + field { + name "Domain" + desc "域" + type "VmCustomSpecificationDomainMode" + since "4.10.18" + } +} diff --git a/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationStruct.java b/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationStruct.java new file mode 100644 index 0000000000..47be1c1e3d --- /dev/null +++ b/header/src/main/java/org/zstack/header/configuration/VmCustomSpecificationStruct.java @@ -0,0 +1,103 @@ +package org.zstack.header.configuration; + +import org.zstack.header.log.NoLogging; +import org.zstack.header.rest.SDK; + +import java.io.Serializable; + +@PythonClassInventory +@SDK(sdkClassName = "VmCustomSpecificationStruct") +public class VmCustomSpecificationStruct implements Serializable { + private String uuid; + private String platform; + private String hostname; + @NoLogging + private String rootPassword; + private Boolean generateSID; + private VmCustomSpecificationDomainMode domainMode; + private String domainName; + private String domainUsername; + @NoLogging + private String domainPassword; + private String organization; + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getPlatform() { + return platform; + } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public String getHostname() { + return hostname; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } + + public String getRootPassword() { + return rootPassword; + } + + public void setRootPassword(String rootPassword) { + this.rootPassword = rootPassword; + } + + public Boolean getGenerateSID() { + return generateSID; + } + + public void setGenerateSID(Boolean generateSID) { + this.generateSID = generateSID; + } + + public VmCustomSpecificationDomainMode getDomainMode() { + return domainMode; + } + + public void setDomainMode(VmCustomSpecificationDomainMode domainMode) { + this.domainMode = domainMode; + } + + public String getDomainName() { + return domainName; + } + + public void setDomainName(String domainName) { + this.domainName = domainName; + } + + public String getDomainUsername() { + return domainUsername; + } + + public void setDomainUsername(String domainUsername) { + this.domainUsername = domainUsername; + } + + public String getDomainPassword() { + return domainPassword; + } + + public void setDomainPassword(String domainPassword) { + this.domainPassword = domainPassword; + } + + public String getOrganization() { + return organization; + } + + public void setOrganization(String organization) { + this.organization = organization; + } +} diff --git a/header/src/main/java/org/zstack/header/errorcode/ErrorableValue.java b/header/src/main/java/org/zstack/header/errorcode/ErrorableValue.java index 96728a2673..d02f9c2563 100644 --- a/header/src/main/java/org/zstack/header/errorcode/ErrorableValue.java +++ b/header/src/main/java/org/zstack/header/errorcode/ErrorableValue.java @@ -1,5 +1,7 @@ package org.zstack.header.errorcode; +import org.zstack.header.exception.CloudRuntimeException; + import java.util.Objects; /** @@ -18,6 +20,18 @@ public static ErrorableValue ofErrorCode(ErrorCode error) { Objects.requireNonNull(error, "errorCode in ErrorableValue can not be null")); } + /** + * Make sure this ErrorableValue is not success + */ + @SuppressWarnings("unchecked") + public ErrorableValue cast() { + if (isSuccess()) { + throw new CloudRuntimeException("Can not cast ErrorableValue"); + } else { + return (ErrorableValue) this; + } + } + protected ErrorableValue(T result, ErrorCode error) { this.result = result; this.error = error; diff --git a/header/src/main/java/org/zstack/header/host/APIUpdateHostnameEvent.java b/header/src/main/java/org/zstack/header/host/APIUpdateHostnameEvent.java new file mode 100644 index 0000000000..efa889158b --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/APIUpdateHostnameEvent.java @@ -0,0 +1,45 @@ +package org.zstack.header.host; + +import org.zstack.header.message.APIEvent; +import org.zstack.header.rest.RestResponse; + +@RestResponse(fieldsTo = {"all"}) +public class APIUpdateHostnameEvent extends APIEvent { + private HostInventory inventory; + + public APIUpdateHostnameEvent() { super(null); } + + public APIUpdateHostnameEvent(String apiId) { + super(apiId); + } + + public HostInventory getInventory() { + return inventory; + } + + public void setInventory(HostInventory inventory) { + this.inventory = inventory; + } + + public static APIUpdateHostnameEvent __example__() { + APIUpdateHostnameEvent event = new APIUpdateHostnameEvent(); + HostInventory host = new HostInventory(); + host.setAvailableCpuCapacity(2L); + host.setAvailableMemoryCapacity(4L); + host.setManagementIp("192.168.0.1"); + host.setName("example"); + host.setState(HostState.Enabled.toString()); + host.setStatus(HostStatus.Connected.toString()); + host.setClusterUuid(uuid()); + host.setZoneUuid(uuid()); + host.setUuid(uuid()); + host.setTotalCpuCapacity(4L); + host.setTotalMemoryCapacity(4L); + host.setHypervisorType("KVM"); + host.setDescription("example"); + host.setNqn("nqn.2014-08.org.nvmexpress:uuid:748d0363-8366-44db-803b-146effb96988"); + host.setHostname("hostname"); + event.setInventory(host); + return event; + } +} diff --git a/header/src/main/java/org/zstack/header/host/APIUpdateHostnameEventDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/host/APIUpdateHostnameEventDoc_zh_cn.groovy new file mode 100644 index 0000000000..17c8754f87 --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/APIUpdateHostnameEventDoc_zh_cn.groovy @@ -0,0 +1,31 @@ +package org.zstack.header.host + +import org.zstack.header.errorcode.ErrorCode + +doc { + + title "更新主机hostname返回" + + ref { + name "inventory" + path "org.zstack.header.host.APIUpdateHostnameEvent.inventory" + desc "null" + type "HostInventory" + since "4.10.20" + clz HostInventory.class + } + field { + name "success" + desc "" + type "boolean" + since "4.10.20" + } + ref { + name "error" + path "org.zstack.header.host.APIUpdateHostnameEvent.error" + desc "错误码，若不为null，则表示操作失败, 操作成功时该字段为null",false + type "ErrorCode" + since "4.10.20" + clz ErrorCode.class + } +} diff --git a/header/src/main/java/org/zstack/header/host/APIUpdateHostnameMsg.java b/header/src/main/java/org/zstack/header/host/APIUpdateHostnameMsg.java new file mode 100644 index 0000000000..6ebef33152 --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/APIUpdateHostnameMsg.java @@ -0,0 +1,47 @@ +package org.zstack.header.host; + +import org.springframework.http.HttpMethod; +import org.zstack.header.message.APIMessage; +import org.zstack.header.message.APIParam; +import org.zstack.header.rest.RestRequest; + +@RestRequest( + path = "/hosts/hostname/{uuid}/actions", + method = HttpMethod.PUT, + responseClass = APIUpdateHostnameEvent.class, + isAction = true +) +public class APIUpdateHostnameMsg extends APIMessage implements HostMessage { + @APIParam(resourceType = HostVO.class) + private String uuid; + @APIParam(nonempty = true, emptyString = false) + private String hostname; + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + @Override + public String getHostUuid() { + return uuid; + } + + public String getHostname() { + return hostname; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } + + public static APIUpdateHostnameMsg __example__() { + APIUpdateHostnameMsg msg = new APIUpdateHostnameMsg(); + msg.setUuid(uuid()); + msg.setHostname("user"); + return msg; + } +} diff --git a/header/src/main/java/org/zstack/header/host/APIUpdateHostnameMsgDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/host/APIUpdateHostnameMsgDoc_zh_cn.groovy new file mode 100644 index 0000000000..4821f2cae0 --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/APIUpdateHostnameMsgDoc_zh_cn.groovy @@ -0,0 +1,67 @@ +package org.zstack.header.host + +import org.zstack.header.host.APIUpdateHostnameEvent + +doc { + title "UpdateHostname" + + category "host" + + desc """更新主机hostname""" + + rest { + request { + url "PUT /v1/hosts/hostname/{uuid}/actions" + + header (Authorization: 'OAuth the-session-uuid') + + clz APIUpdateHostnameMsg.class + + desc """更新主机hostname""" + + params { + + column { + name "uuid" + enclosedIn "updateHostname" + desc "主机UUID" + location "url" + type "String" + optional false + since "4.10.20" + } + column { + name "hostname" + enclosedIn "updateHostname" + desc "主机hostname" + location "body" + type "String" + optional false + since "4.10.20" + } + column { + name "systemTags" + enclosedIn "" + desc "系统标签" + location "body" + type "List" + optional true + since "4.10.20" + } + column { + name "userTags" + enclosedIn "" + desc "用户标签" + location "body" + type "List" + optional true + since "4.10.20" + } + } + } + + response { + clz APIUpdateHostnameEvent.class + } + } +} \ No newline at end of file diff --git a/header/src/main/java/org/zstack/header/host/GetFileDownloadProgressMsg.java b/header/src/main/java/org/zstack/header/host/GetFileDownloadProgressMsg.java new file mode 100644 index 0000000000..e818f60a3f --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/GetFileDownloadProgressMsg.java @@ -0,0 +1,25 @@ +package org.zstack.header.host; + +import org.zstack.header.message.CancelMessage; + +public class GetFileDownloadProgressMsg extends CancelMessage implements HostMessage { + private String hostUuid; + private String taskUuid; + + @Override + public String getHostUuid() { + return hostUuid; + } + + public void setHostUuid(String hostUuid) { + this.hostUuid = hostUuid; + } + + public String getTaskUuid() { + return taskUuid; + } + + public void setTaskUuid(String taskUuid) { + this.taskUuid = taskUuid; + } +} diff --git a/header/src/main/java/org/zstack/header/host/GetFileDownloadProgressReply.java b/header/src/main/java/org/zstack/header/host/GetFileDownloadProgressReply.java new file mode 100644 index 0000000000..512e1c4236 --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/GetFileDownloadProgressReply.java @@ -0,0 +1,88 @@ +package org.zstack.header.host; + +import org.zstack.header.message.MessageReply; + +public class GetFileDownloadProgressReply extends MessageReply { + private boolean completed; + private int progress; + + private long size; + private long actualSize; + private long downloadSize; + private String installPath; + private long lastOpTime; + private boolean supportSuspend; + private String md5sum; + + public boolean isCompleted() { + return completed; + } + + public void setCompleted(boolean completed) { + this.completed = completed; + } + + public int getProgress() { + return progress; + } + + public void setProgress(int progress) { + this.progress = progress; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public long getActualSize() { + return actualSize; + } + + public void setActualSize(long actualSize) { + this.actualSize = actualSize; + } + + public String getInstallPath() { + return installPath; + } + + public void setInstallPath(String installPath) { + this.installPath = installPath; + } + + public long getLastOpTime() { + return lastOpTime; + } + + public void setLastOpTime(long lastOpTime) { + this.lastOpTime = lastOpTime; + } + + public long getDownloadSize() { + return downloadSize; + } + + public void setDownloadSize(long downloadSize) { + this.downloadSize = downloadSize; + } + + public boolean isSupportSuspend() { + return supportSuspend; + } + + public void setSupportSuspend(boolean supportSuspend) { + this.supportSuspend = supportSuspend; + } + + public String getMd5sum() { + return md5sum; + } + + public void setMd5sum(String md5sum) { + this.md5sum = md5sum; + } +} diff --git a/header/src/main/java/org/zstack/header/host/HostAO.java b/header/src/main/java/org/zstack/header/host/HostAO.java index 761be50827..c75827fabc 100755 --- a/header/src/main/java/org/zstack/header/host/HostAO.java +++ b/header/src/main/java/org/zstack/header/host/HostAO.java @@ -40,6 +40,9 @@ public class HostAO extends ResourceVO { @Column private String nqn; + @Column + private String hostname; + @Column @Enumerated(EnumType.STRING) private HostState state; @@ -157,4 +160,12 @@ public String getNqn() { public void setNqn(String nqn) { this.nqn = nqn; } + + public String getHostname() { + return hostname; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } } diff --git a/header/src/main/java/org/zstack/header/host/HostAO_.java b/header/src/main/java/org/zstack/header/host/HostAO_.java index 2e34beac2f..660c60defa 100755 --- a/header/src/main/java/org/zstack/header/host/HostAO_.java +++ b/header/src/main/java/org/zstack/header/host/HostAO_.java @@ -22,4 +22,5 @@ public class HostAO_ extends ResourceVO_ { public static volatile SingularAttribute lastOpDate; public static volatile SingularAttribute architecture; public static volatile SingularAttribute nqn; + public static volatile SingularAttribute hostname; } diff --git a/header/src/main/java/org/zstack/header/host/HostInventory.java b/header/src/main/java/org/zstack/header/host/HostInventory.java index b2f9ceb6c5..2afbf35234 100755 --- a/header/src/main/java/org/zstack/header/host/HostInventory.java +++ b/header/src/main/java/org/zstack/header/host/HostInventory.java @@ -187,6 +187,8 @@ public class HostInventory implements Serializable { private String nqn; + private String hostname; + /** * @desc the time this resource gets created */ @@ -210,6 +212,7 @@ protected HostInventory(HostVO vo) { this.setClusterUuid(vo.getClusterUuid()); this.setArchitecture(vo.getArchitecture()); this.setNqn(vo.getNqn()); + this.setHostname(vo.getHostname()); if (vo.getCapacity() != null) { this.setTotalCpuCapacity(vo.getCapacity().getTotalCpu()); this.setAvailableCpuCapacity(vo.getCapacity().getAvailableCpu()); @@ -509,4 +512,12 @@ public HwMonitorStatus getTemperatureStatus() { public void setTemperatureStatus(HwMonitorStatus temperatureStatus) { this.temperatureStatus = temperatureStatus; } + + public String getHostname() { + return hostname; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } } diff --git a/header/src/main/java/org/zstack/header/host/HostInventoryDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/host/HostInventoryDoc_zh_cn.groovy index 3fda8f546b..ec4a235837 100644 --- a/header/src/main/java/org/zstack/header/host/HostInventoryDoc_zh_cn.groovy +++ b/header/src/main/java/org/zstack/header/host/HostInventoryDoc_zh_cn.groovy @@ -207,6 +207,12 @@ doc { type "String" since "zsv 4.10.6" } + field { + name "hostname" + desc "主机名" + type "String" + since "4.10.20" + } field { name "createDate" desc "创建时间" diff --git a/header/src/main/java/org/zstack/header/host/HostResizeVolumeExtensionPoint.java b/header/src/main/java/org/zstack/header/host/HostResizeVolumeExtensionPoint.java new file mode 100644 index 0000000000..d1a1418818 --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/HostResizeVolumeExtensionPoint.java @@ -0,0 +1,10 @@ +package org.zstack.header.host; + +import org.zstack.header.volume.VolumeInventory; + +/** + * Created by kayo on 2018/4/2. + */ +public interface HostResizeVolumeExtensionPoint { + HostResizeVolumeStruct beforeKvmHostResizeVolume(HostResizeVolumeStruct struct, VolumeInventory vol, String hostUuid); +} diff --git a/header/src/main/java/org/zstack/header/host/HostResizeVolumeStruct.java b/header/src/main/java/org/zstack/header/host/HostResizeVolumeStruct.java new file mode 100644 index 0000000000..2f6774c6e1 --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/HostResizeVolumeStruct.java @@ -0,0 +1,35 @@ +package org.zstack.header.host; + +/** + * @author Xingwei Yu + * @date 2025/8/12 14:20 + */ +public class HostResizeVolumeStruct { + private String deviceType; + String installPath; + long size; + + public String getDeviceType() { + return deviceType; + } + + public void setDeviceType(String deviceType) { + this.deviceType = deviceType; + } + + public String getInstallPath() { + return installPath; + } + + public void setInstallPath(String installPath) { + this.installPath = installPath; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } +} diff --git a/header/src/main/java/org/zstack/header/host/UpdateHostnameMsg.java b/header/src/main/java/org/zstack/header/host/UpdateHostnameMsg.java new file mode 100644 index 0000000000..0f31cd978c --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/UpdateHostnameMsg.java @@ -0,0 +1,29 @@ +package org.zstack.header.host; + +import org.zstack.header.message.NeedReplyMessage; + +public class UpdateHostnameMsg extends NeedReplyMessage implements HostMessage { + private String uuid; + private String hostname; + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getHostname() { + return hostname; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } + + @Override + public String getHostUuid() { + return uuid; + } +} diff --git a/header/src/main/java/org/zstack/header/host/UpdateHostnameReply.java b/header/src/main/java/org/zstack/header/host/UpdateHostnameReply.java new file mode 100644 index 0000000000..f997927a4f --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/UpdateHostnameReply.java @@ -0,0 +1,15 @@ +package org.zstack.header.host; + +import org.zstack.header.message.MessageReply; + +public class UpdateHostnameReply extends MessageReply { + HostInventory inventory; + + public HostInventory getInventory() { + return inventory; + } + + public void setInventory(HostInventory inventory) { + this.inventory = inventory; + } +} diff --git a/header/src/main/java/org/zstack/header/host/UploadFileToHostMsg.java b/header/src/main/java/org/zstack/header/host/UploadFileToHostMsg.java new file mode 100644 index 0000000000..68fd5190c9 --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/UploadFileToHostMsg.java @@ -0,0 +1,45 @@ +package org.zstack.header.host; + +import org.zstack.header.log.NoLogging; +import org.zstack.header.message.NeedReplyMessage; + +public class UploadFileToHostMsg extends NeedReplyMessage implements HostMessage { + private String hostUuid; + private String taskUuid; + @NoLogging(type = NoLogging.Type.Uri) + private String url; + private String installPath; + + @Override + public String getHostUuid() { + return hostUuid; + } + + public void setHostUuid(String hostUuid) { + this.hostUuid = hostUuid; + } + + public String getTaskUuid() { + return taskUuid; + } + + public void setTaskUuid(String taskUuid) { + this.taskUuid = taskUuid; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getInstallPath() { + return installPath; + } + + public void setInstallPath(String installPath) { + this.installPath = installPath; + } +} diff --git a/header/src/main/java/org/zstack/header/host/UploadFileToHostReply.java b/header/src/main/java/org/zstack/header/host/UploadFileToHostReply.java new file mode 100644 index 0000000000..4e1106a1d1 --- /dev/null +++ b/header/src/main/java/org/zstack/header/host/UploadFileToHostReply.java @@ -0,0 +1,35 @@ +package org.zstack.header.host; + +import org.zstack.header.log.NoLogging; +import org.zstack.header.message.MessageReply; + +public class UploadFileToHostReply extends MessageReply { + private String md5sum; + private long size; + @NoLogging(type = NoLogging.Type.Uri) + private String directUploadUrl; + + public String getMd5sum() { + return md5sum; + } + + public void setMd5sum(String md5sum) { + this.md5sum = md5sum; + } + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public String getDirectUploadUrl() { + return directUploadUrl; + } + + public void setDirectUploadUrl(String directUploadUrl) { + this.directUploadUrl = directUploadUrl; + } +} diff --git a/header/src/main/java/org/zstack/header/network/l3/L3NetworkInventory.java b/header/src/main/java/org/zstack/header/network/l3/L3NetworkInventory.java index fa95bc3817..d351ebd769 100755 --- a/header/src/main/java/org/zstack/header/network/l3/L3NetworkInventory.java +++ b/header/src/main/java/org/zstack/header/network/l3/L3NetworkInventory.java @@ -72,6 +72,8 @@ foreignKey = "uuid", expandedInventoryKey = "l3NetworkUuid", hidden = true), @ExpandedQuery(expandedField = "usedIp", inventoryClass = UsedIpInventory.class, foreignKey = "uuid", expandedInventoryKey = "l3NetworkUuid"), + @ExpandedQuery(expandedField = "ipRange", inventoryClass = IpRangeInventory.class, + foreignKey = "uuid", expandedInventoryKey = "l3NetworkUuid"), }) @ExpandedQueryAliases({ @ExpandedQueryAlias(alias = "serviceProvider", expandedField = "serviceProviderRef.serviceProvider") diff --git a/header/src/main/java/org/zstack/header/network/l3/UsedIpInventory.java b/header/src/main/java/org/zstack/header/network/l3/UsedIpInventory.java index f5aa381cfe..1a21b629a6 100755 --- a/header/src/main/java/org/zstack/header/network/l3/UsedIpInventory.java +++ b/header/src/main/java/org/zstack/header/network/l3/UsedIpInventory.java @@ -35,6 +35,7 @@ public class UsedIpInventory implements Serializable { @APINoSee private String metaData; private Long ipInLong; + @APINoSee private byte[] ipInBinary; private String vmNicUuid; private Timestamp createDate; @@ -48,6 +49,7 @@ public UsedIpInventory(UsedIpVO vo) { this.setIpVersion(vo.getIpVersion()); this.setIp(vo.getIp()); this.setIpInLong(vo.getIpInLong()); + this.setIpInBinary(vo.getIpInBinary()); this.setIpRangeUuid(vo.getIpRangeUuid()); this.setL3NetworkUuid(vo.getL3NetworkUuid()); this.setGateway(vo.getGateway()); @@ -60,22 +62,7 @@ public UsedIpInventory(UsedIpVO vo) { } public static UsedIpInventory valueOf(UsedIpVO vo) { - UsedIpInventory inv = new UsedIpInventory(); - inv.setCreateDate(vo.getCreateDate()); - inv.setUuid(vo.getUuid()); - inv.setIpVersion(vo.getIpVersion()); - inv.setIp(vo.getIp()); - inv.setIpInLong(vo.getIpInLong()); - inv.setIpInBinary(vo.getIpInBinary()); - inv.setIpRangeUuid(vo.getIpRangeUuid()); - inv.setL3NetworkUuid(vo.getL3NetworkUuid()); - inv.setGateway(vo.getGateway()); - inv.setNetmask(vo.getNetmask()); - inv.setUsedFor(vo.getUsedFor()); - inv.setVmNicUuid(vo.getVmNicUuid()); - inv.setMetaData(vo.getMetaData()); - inv.setLastOpDate(vo.getLastOpDate()); - return inv; + return new UsedIpInventory(vo); } public static List valueOf(Collection vos) { diff --git a/header/src/main/java/org/zstack/header/network/l3/UsedIpInventoryDoc_zh_cn.groovy b/header/src/main/java/org/zstack/header/network/l3/UsedIpInventoryDoc_zh_cn.groovy index ce0c456047..a7d5567966 100644 --- a/header/src/main/java/org/zstack/header/network/l3/UsedIpInventoryDoc_zh_cn.groovy +++ b/header/src/main/java/org/zstack/header/network/l3/UsedIpInventoryDoc_zh_cn.groovy @@ -61,12 +61,6 @@ doc { type "long" since "4.10.0" } - field { - name "ipInBinary" - desc "二进制存储的IP地址（字节数组，IPv4长度4，IPv6长度16，网络序）" - type "byte[]" - since "4.10.16" - } field { name "vmNicUuid" desc "云主机网卡UUID" diff --git a/header/src/main/java/org/zstack/header/network/l3/UsedIpTO.java b/header/src/main/java/org/zstack/header/network/l3/UsedIpTO.java index c42af8f2b0..a222f7da6b 100644 --- a/header/src/main/java/org/zstack/header/network/l3/UsedIpTO.java +++ b/header/src/main/java/org/zstack/header/network/l3/UsedIpTO.java @@ -4,10 +4,14 @@ @PythonClass public class UsedIpTO { + public static final String ACTION_CODE_ADD = "add"; + public static final String ACTION_CODE_REMOVE = "remove"; + private int ipVersion; private String ip; private String netmask; private String gateway; + private String actionCode; public int getIpVersion() { return ipVersion; @@ -41,23 +45,24 @@ public void setGateway(String gateway) { this.gateway = gateway; } - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(String.format("ipVersion: %s,", this.ipVersion)); - sb.append(String.format("ip: %s,", this.ip)); - sb.append(String.format("netmask: %s,", this.netmask)); - sb.append(String.format("gateway: %s,", this.gateway)); + public String getActionCode() { + return actionCode; + } - return sb.toString(); + public void setActionCode(String actionCode) { + this.actionCode = actionCode; } - public String toFullString() { + @Override + public String toString() { StringBuilder sb = new StringBuilder(); sb.append(String.format("ipVersion: %s,", this.ipVersion)); sb.append(String.format("ip: %s,", this.ip)); sb.append(String.format("netmask: %s,", this.netmask)); sb.append(String.format("gateway: %s,", this.gateway)); + if (this.actionCode != null) { + sb.append(String.format("action: %s,", this.actionCode)); + } return sb.toString(); } diff --git a/header/src/main/java/org/zstack/header/network/l3/UsedIpVO_.java b/header/src/main/java/org/zstack/header/network/l3/UsedIpVO_.java index 4186a4a6d5..d319037e9b 100755 --- a/header/src/main/java/org/zstack/header/network/l3/UsedIpVO_.java +++ b/header/src/main/java/org/zstack/header/network/l3/UsedIpVO_.java @@ -11,6 +11,7 @@ public class UsedIpVO_ { public static volatile SingularAttribute l3NetworkUuid; public static volatile SingularAttribute ipVersion; public static volatile SingularAttribute ip; + public static volatile SingularAttribute netmask; public static volatile SingularAttribute usedFor; public static volatile SingularAttribute metaData; public static volatile SingularAttribute ipInLong; diff --git a/header/src/main/java/org/zstack/header/rest/AbstractAsyncResponseFetcher.java b/header/src/main/java/org/zstack/header/rest/AbstractAsyncResponseFetcher.java new file mode 100644 index 0000000000..32381dfc12 --- /dev/null +++ b/header/src/main/java/org/zstack/header/rest/AbstractAsyncResponseFetcher.java @@ -0,0 +1,106 @@ +package org.zstack.header.rest; + +import org.springframework.beans.factory.annotation.Autowire; +import org.springframework.beans.factory.annotation.Configurable; +import org.zstack.header.core.ReturnValueCompletion; +import org.zstack.header.errorcode.ErrorCode; +import org.zstack.header.errorcode.ErrorableValue; +import org.zstack.utils.gson.JSONObjectUtil; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.function.Supplier; + +@Configurable(preConstruction = true, autowire = Autowire.BY_TYPE) +public abstract class AbstractAsyncResponseFetcher { + public final Class returnType; + protected Supplier> restHttpFactory; + protected List>> restHttpDecorators = new ArrayList<>(); + + protected Function resultsBuilder; + protected Predicate donePredicate; + + protected long eachAttemptTimeoutInMillis = 3000L; + protected long eachAttemptIntervalInMillis = 1000L; + protected long allAttemptsTimeoutInMillis = 60000L; + + { + restHttpDecorators.add(http -> http.withTimeoutInMillis(eachAttemptTimeoutInMillis)); + } + + protected static final ErrorCode NOT_FINISHED_YET; + + static { + NOT_FINISHED_YET = new ErrorCode(); + NOT_FINISHED_YET.setCode("AsyncResponseFetcher.NOT_FINISHED_YET"); + NOT_FINISHED_YET.setDetails("Not finished yet"); + } + + protected AbstractAsyncResponseFetcher(Class returnType) { + this.returnType = returnType; + this.resultsBuilder = v -> JSONObjectUtil.toObject(v, this.returnType); + } + + public AbstractAsyncResponseFetcher withRestHttpFactory(Supplier> restHttpFactory) { + this.restHttpFactory = restHttpFactory; + return this; + } + + public AbstractAsyncResponseFetcher withRestHttpDecorator(Consumer> restHttpDecorator) { + this.restHttpDecorators.add(restHttpDecorator); + return this; + } + + public AbstractAsyncResponseFetcher withResultsBuilder(Function resultsBuilder) { + this.resultsBuilder = resultsBuilder; + return this; + } + + public AbstractAsyncResponseFetcher withDonePredicate(Predicate donePredicate) { + this.donePredicate = donePredicate; + return this; + } + + public AbstractAsyncResponseFetcher withEachAttemptTimeoutInMillis(long eachAttemptTimeoutInMillis) { + this.eachAttemptTimeoutInMillis = eachAttemptTimeoutInMillis; + return this; + } + + public AbstractAsyncResponseFetcher withEachAttemptIntervalInMillis(long eachAttemptIntervalInMillis) { + this.eachAttemptIntervalInMillis = eachAttemptIntervalInMillis; + return this; + } + + public AbstractAsyncResponseFetcher withAllAttemptsTimeoutInMillis(long allAttemptsTimeoutInMillis) { + this.allAttemptsTimeoutInMillis = allAttemptsTimeoutInMillis; + return this; + } + + protected RestHttp http() { + return restHttpFactory.get(); + } + + public abstract void fetch(ReturnValueCompletion completion); + + protected ErrorableValue eachAttempt() { + final RestHttp http = http(); + for (Consumer> restHttpDecorator : restHttpDecorators) { + restHttpDecorator.accept(http); + } + + ErrorableValue value = http.getWithErrorCode(); + if (!value.isSuccess()) { + return value.cast(); + } + + T result = resultsBuilder.apply(value.result); + if (donePredicate != null && !donePredicate.test(result)) { + return ErrorableValue.ofErrorCode(NOT_FINISHED_YET); + } + + return ErrorableValue.of(result); + } +} diff --git a/header/src/main/java/org/zstack/header/rest/AsyncHttpCallHandler.java b/header/src/main/java/org/zstack/header/rest/AsyncHttpCallHandler.java deleted file mode 100755 index b755cbbb9e..0000000000 --- a/header/src/main/java/org/zstack/header/rest/AsyncHttpCallHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.zstack.header.rest; - -import org.zstack.header.core.ReturnValueCompletion; - -/** - * Created by frank on 11/1/2015. - */ -public interface AsyncHttpCallHandler extends HttpCallHandler { - void handleAsyncHttpCall(T object, ReturnValueCompletion completion); -} diff --git a/header/src/main/java/org/zstack/header/storage/addon/primary/PrimaryStorageControllerSvc.java b/header/src/main/java/org/zstack/header/storage/addon/primary/PrimaryStorageControllerSvc.java index 14d7d47eb1..5d6896960c 100644 --- a/header/src/main/java/org/zstack/header/storage/addon/primary/PrimaryStorageControllerSvc.java +++ b/header/src/main/java/org/zstack/header/storage/addon/primary/PrimaryStorageControllerSvc.java @@ -52,4 +52,6 @@ public interface PrimaryStorageControllerSvc { void setTrashExpireTime(int timeInSeconds, Completion completion); void onFirstAdditionConfigure(Completion completion); + + long alignSize(long size); } diff --git a/header/src/main/java/org/zstack/header/storage/primary/AfterCreateImageCacheExtensionPoint.java b/header/src/main/java/org/zstack/header/storage/primary/AfterCreateImageCacheExtensionPoint.java index 0e0d36615c..516be2ac0d 100644 --- a/header/src/main/java/org/zstack/header/storage/primary/AfterCreateImageCacheExtensionPoint.java +++ b/header/src/main/java/org/zstack/header/storage/primary/AfterCreateImageCacheExtensionPoint.java @@ -8,7 +8,7 @@ * @Date: 2021/11/16 */ public interface AfterCreateImageCacheExtensionPoint { - void saveEncryptAfterCreateImageCache(String hostUuid, ImageCacheInventory inventory); + void saveEncryptAfterCreateImageCache(String hostUuid, ImageCacheInventory inventory, Completion completion); void checkEncryptImageCache(String hostUuid, ImageCacheInventory inventory, Completion completion); } diff --git a/header/src/main/java/org/zstack/header/storage/primary/AllocatePrimaryStorageMsg.java b/header/src/main/java/org/zstack/header/storage/primary/AllocatePrimaryStorageMsg.java index 5126ffa288..e4c3b3e559 100755 --- a/header/src/main/java/org/zstack/header/storage/primary/AllocatePrimaryStorageMsg.java +++ b/header/src/main/java/org/zstack/header/storage/primary/AllocatePrimaryStorageMsg.java @@ -3,6 +3,7 @@ import org.zstack.header.message.NeedReplyMessage; import org.zstack.utils.CollectionDSL; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -30,6 +31,7 @@ public class AllocatePrimaryStorageMsg extends NeedReplyMessage { private List tags; private String allocationStrategy; private String vmInstanceUuid; + @Nullable private String diskOfferingUuid; private List excludePrimaryStorageUuids; private List excludeAllocatorStrategies; diff --git a/header/src/main/java/org/zstack/header/tag/TagConstant.java b/header/src/main/java/org/zstack/header/tag/TagConstant.java index 6aa7ded2a5..4d79ab91da 100755 --- a/header/src/main/java/org/zstack/header/tag/TagConstant.java +++ b/header/src/main/java/org/zstack/header/tag/TagConstant.java @@ -13,8 +13,4 @@ public interface TagConstant { String RESOURCE_CONFIG_CATEGORY_TOKEN = "category"; String RESOURCE_CONFIG_NAME_TOKEN = "name"; String RESOURCE_CONFIG_VALUE_TOKEN = "value"; - - static boolean isEphemeralTag(String tag) { - return tag.startsWith(String.format("%s::", EPHEMERAL_TAG_PREFIX)); - } } diff --git a/header/src/main/java/org/zstack/header/vm/CreateVmInstanceMessage.java b/header/src/main/java/org/zstack/header/vm/CreateVmInstanceMessage.java index 7983863494..ac59948d8b 100644 --- a/header/src/main/java/org/zstack/header/vm/CreateVmInstanceMessage.java +++ b/header/src/main/java/org/zstack/header/vm/CreateVmInstanceMessage.java @@ -30,17 +30,15 @@ public interface CreateVmInstanceMessage { String getType(); default String getRootDiskOfferingUuid() { - final DiskAO bootDisk = findBootDisk(); + final DiskAO bootDisk = getRootDisk(); return bootDisk == null ? null : bootDisk.getDiskOfferingUuid(); } default long getRootDiskSize() { - final DiskAO bootDisk = findBootDisk(); + final DiskAO bootDisk = getRootDisk(); return bootDisk == null ? 0 : bootDisk.getSize(); } - List getDataDiskOfferingUuids(); - String getZoneUuid(); String getClusterUuid(); @@ -57,9 +55,7 @@ default long getRootDiskSize() { String getStrategy(); // VmCreationStrategy - List getDiskAOs(); + DiskAO getRootDisk(); - default DiskAO findBootDisk() { - return isEmpty(getDiskAOs()) ? null : findOneOrNull(getDiskAOs(),DiskAO::isBoot); - } + List getDataDisks(); } diff --git a/header/src/main/java/org/zstack/header/vm/CreateVmInstanceMsg.java b/header/src/main/java/org/zstack/header/vm/CreateVmInstanceMsg.java index 08640f5131..037d9f8b32 100755 --- a/header/src/main/java/org/zstack/header/vm/CreateVmInstanceMsg.java +++ b/header/src/main/java/org/zstack/header/vm/CreateVmInstanceMsg.java @@ -1,5 +1,6 @@ package org.zstack.header.vm; +import org.zstack.header.configuration.VmCustomSpecificationStruct; import org.zstack.header.message.NeedReplyMessage; import java.util.ArrayList; @@ -20,8 +21,6 @@ public class CreateVmInstanceMsg extends NeedReplyMessage implements CreateVmIns private long reservedMemorySize; private List l3NetworkSpecs; private String type; - private List dataDiskSizes; - private List dataDiskOfferingUuids; private List dataVolumeTemplateUuids; private Map> dataVolumeFromTemplateSystemTags; private String zoneUuid; @@ -38,12 +37,14 @@ public class CreateVmInstanceMsg extends NeedReplyMessage implements CreateVmIns private Boolean virtio; private List rootVolumeSystemTags; private List dataVolumeSystemTags; - private Map> dataVolumeSystemTagsOnIndex; private List disableL3Networks; private List sshKeyPairUuids; private final List candidatePrimaryStorageUuidsForRootVolume = new ArrayList<>(); private final List candidatePrimaryStorageUuidsForDataVolume = new ArrayList<>(); - private List diskAOs; + private DiskAO rootDisk = DiskAO.rootDisk(); + private List dataDisks; + private List deprecatedDataVolumeSpecs = new ArrayList<>(); + private VmCustomSpecificationStruct vmCustomSpecification; public List getCandidatePrimaryStorageUuidsForRootVolume() { return candidatePrimaryStorageUuidsForRootVolume; @@ -75,12 +76,28 @@ public void setGuestOsType(String guestOsType) { this.guestOsType = guestOsType; } - public List getDiskAOs() { - return diskAOs; + public DiskAO getRootDisk() { + return rootDisk; } - public void setDiskAOs(List diskAOs) { - this.diskAOs = diskAOs; + public void setRootDisk(DiskAO rootDisk) { + this.rootDisk = rootDisk; + } + + public List getDataDisks() { + return dataDisks; + } + + public void setDataDisks(List dataDisks) { + this.dataDisks = dataDisks; + } + + public List getDeprecatedDataVolumeSpecs() { + return deprecatedDataVolumeSpecs; + } + + public void setDeprecatedDataVolumeSpecs(List deprecatedDataVolumeSpecs) { + this.deprecatedDataVolumeSpecs = deprecatedDataVolumeSpecs; } public List getRootVolumeSystemTags() { @@ -161,23 +178,6 @@ public void setZoneUuid(String zoneUuid) { this.zoneUuid = zoneUuid; } - @Override - public List getDataDiskOfferingUuids() { - return dataDiskOfferingUuids; - } - - public void setDataDiskOfferingUuids(List dataDiskOfferingUuids) { - this.dataDiskOfferingUuids = dataDiskOfferingUuids; - } - - public List getDataDiskSizes() { - return dataDiskSizes; - } - - public void setDataDiskSizes(List dataDiskSizes) { - this.dataDiskSizes = dataDiskSizes; - } - @Override public String getType() { return type; @@ -316,14 +316,6 @@ public void setDataVolumeFromTemplateSystemTags(Map> dataVo this.dataVolumeFromTemplateSystemTags = dataVolumeFromTemplateSystemTags; } - public Map> getDataVolumeSystemTagsOnIndex() { - return dataVolumeSystemTagsOnIndex; - } - - public void setDataVolumeSystemTagsOnIndex(Map> dataVolumeSystemTagsOnIndex) { - this.dataVolumeSystemTagsOnIndex = dataVolumeSystemTagsOnIndex; - } - public List getDisableL3Networks() { return disableL3Networks; } @@ -363,4 +355,12 @@ public Boolean getVirtio() { public void setVirtio(Boolean virtio) { this.virtio = virtio; } + + public VmCustomSpecificationStruct getVmCustomSpecification() { + return vmCustomSpecification; + } + + public void setVmCustomSpecification(VmCustomSpecificationStruct vmCustomSpecification) { + this.vmCustomSpecification = vmCustomSpecification; + } } diff --git a/header/src/main/java/org/zstack/header/vm/InstantiateNewCreatedVmInstanceMsg.java b/header/src/main/java/org/zstack/header/vm/InstantiateNewCreatedVmInstanceMsg.java index ee5bdd701b..55a5747400 100755 --- a/header/src/main/java/org/zstack/header/vm/InstantiateNewCreatedVmInstanceMsg.java +++ b/header/src/main/java/org/zstack/header/vm/InstantiateNewCreatedVmInstanceMsg.java @@ -1,5 +1,6 @@ package org.zstack.header.vm; +import org.zstack.header.configuration.VmCustomSpecificationStruct; import org.zstack.header.host.CpuArchitecture; import org.zstack.header.message.NeedReplyMessage; @@ -10,7 +11,6 @@ public class InstantiateNewCreatedVmInstanceMsg extends NeedReplyMessage implements VmInstanceMessage { private VmInstanceInventory vmInstanceInventory; private List l3NetworkUuids; - private List dataDiskOfferingUuids; private List dataVolumeTemplateUuids; private Map> dataVolumeFromTemplateSystemTags; private String rootDiskOfferingUuid; @@ -21,10 +21,18 @@ public class InstantiateNewCreatedVmInstanceMsg extends NeedReplyMessage impleme private List dataVolumeSystemTags; private List softAvoidHostUuids; private List avoidHostUuids; - private Map> dataVolumeSystemTagsOnIndex; private List disableL3Networks; private final List candidatePrimaryStorageUuidsForRootVolume = new ArrayList<>(); private final List candidatePrimaryStorageUuidsForDataVolume = new ArrayList<>(); + private VmCustomSpecificationStruct vmCustomSpecification; + + public VmCustomSpecificationStruct getVmCustomSpecification() { + return vmCustomSpecification; + } + + public void setVmCustomSpecification(VmCustomSpecificationStruct vmCustomSpecification) { + this.vmCustomSpecification = vmCustomSpecification; + } public List getCandidatePrimaryStorageUuidsForRootVolume() { return candidatePrimaryStorageUuidsForRootVolume; @@ -48,14 +56,32 @@ public void setCandidatePrimaryStorageUuidsForDataVolume(List candidateP } } - private List diskAOs; + private DiskAO rootDisk; + private List dataDisks; + private List deprecatedDataVolumeSpecs; + + public DiskAO getRootDisk() { + return rootDisk; + } + + public void setRootDisk(DiskAO rootDisk) { + this.rootDisk = rootDisk; + } + + public List getDataDisks() { + return dataDisks; + } + + public void setDataDisks(List dataDisks) { + this.dataDisks = dataDisks; + } - public List getDiskAOs() { - return diskAOs; + public List getDeprecatedDataVolumeSpecs() { + return deprecatedDataVolumeSpecs; } - public void setDiskAOs(List diskAOs) { - this.diskAOs = diskAOs; + public void setDeprecatedDataVolumeSpecs(List deprecatedDataVolumeSpecs) { + this.deprecatedDataVolumeSpecs = deprecatedDataVolumeSpecs; } public List getSoftAvoidHostUuids() { @@ -82,14 +108,6 @@ public void setL3NetworkUuids(List l3NetworkUuids) { this.l3NetworkUuids = l3NetworkUuids; } - public List getDataDiskOfferingUuids() { - return dataDiskOfferingUuids; - } - - public void setDataDiskOfferingUuids(List dataDiskOfferingUuids) { - this.dataDiskOfferingUuids = dataDiskOfferingUuids; - } - public List getDataVolumeTemplateUuids() { return dataVolumeTemplateUuids; } @@ -191,14 +209,6 @@ public void setDataVolumeFromTemplateSystemTags(Map> dataVo this.dataVolumeFromTemplateSystemTags = dataVolumeFromTemplateSystemTags; } - public Map> getDataVolumeSystemTagsOnIndex() { - return dataVolumeSystemTagsOnIndex; - } - - public void setDataVolumeSystemTagsOnIndex(Map> dataVolumeSystemTagsOnIndex) { - this.dataVolumeSystemTagsOnIndex = dataVolumeSystemTagsOnIndex; - } - public List getDisableL3Networks() { return disableL3Networks; } diff --git a/header/src/main/java/org/zstack/header/vm/VmErrors.java b/header/src/main/java/org/zstack/header/vm/VmErrors.java index 5881e524b3..2cbe362a9a 100755 --- a/header/src/main/java/org/zstack/header/vm/VmErrors.java +++ b/header/src/main/java/org/zstack/header/vm/VmErrors.java @@ -20,8 +20,13 @@ public enum VmErrors { RE_IMAGE_VM_NOT_IN_STOPPED_STATE(1014), RE_IMAGE_IMAGE_MEDIA_TYPE_SHOULD_NOT_BE_ISO(1015), RE_IMAGE_CANNOT_FIND_IMAGE_CACHE(1016), - VNC_SETTING_ERROR(1017); + VNC_SETTING_ERROR(1017), + // Errors in VM allocation + VM_ALLOCATION_ERROR(1200), + WRONG_SPECIFIC_HOST_ERROR(1201), + WRONG_SPECIFIC_PS_ERROR(1202), + ; private String code; diff --git a/header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java b/header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java index 94276d073c..9d0efdd77f 100755 --- a/header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java +++ b/header/src/main/java/org/zstack/header/vm/VmInstanceConstant.java @@ -80,7 +80,7 @@ enum VmOperation { SetVmQga } - String USER_VM_REGEX_PASSWORD = "[\\da-zA-Z-`=\\\\\\[\\];',./~!@#$%^&*()_+|{}:\"<>?]{1,}"; + String USER_VM_REGEX_PASSWORD = "[\\da-zA-Z-`=\\\\\\[\\];',./~!@#$%^&*()_+|{}:\"<>?]{0,}"; enum Capability { LiveMigration, diff --git a/header/src/main/java/org/zstack/header/vm/VmInstanceSpec.java b/header/src/main/java/org/zstack/header/vm/VmInstanceSpec.java index 24588eb4ed..4732fb36d4 100755 --- a/header/src/main/java/org/zstack/header/vm/VmInstanceSpec.java +++ b/header/src/main/java/org/zstack/header/vm/VmInstanceSpec.java @@ -4,6 +4,7 @@ import org.zstack.header.allocator.AllocationScene; import org.zstack.header.cluster.ClusterVO; import org.zstack.header.configuration.DiskOfferingInventory; +import org.zstack.header.configuration.VmCustomSpecificationStruct; import org.zstack.header.host.CpuArchitecture; import org.zstack.header.host.HostInventory; import org.zstack.header.host.HostVO; @@ -124,6 +125,10 @@ public void setTags(List tags) { public boolean isRoot() { return VolumeType.Root.toString().equals(type); } + + public boolean isData() { + return VolumeType.Data.toString().equals(type); + } } public static class ImageSpec implements Serializable { @@ -318,7 +323,6 @@ public void setHostname(String hostname) { private VmInstanceInventory vmInventory; private List l3Networks = new ArrayList<>(); - private List dataDiskOfferings; private List dataVolumeTemplateUuids; private Map> dataVolumeFromTemplateSystemTags = new HashMap<>(); private DiskOfferingInventory rootDiskOffering; @@ -332,7 +336,6 @@ public void setHostname(String hostname) { private String requiredClusterUuid; private String requiredHostUuid; private String memorySnapshotUuid; - private String allocatedPrimaryStorageUuidForRootVolume; private String allocatedPrimaryStorageUuidForDataVolume; private final List candidatePrimaryStorageUuidsForRootVolume = new ArrayList<>(); private final List candidatePrimaryStorageUuidsForDataVolume = new ArrayList<>(); @@ -370,7 +373,6 @@ public void setHostname(String hostname) { private List rootVolumeSystemTags; private List dataVolumeSystemTags; - private Map> dataVolumeSystemTagsOnIndex; private boolean skipIpAllocation = false; private VmCreationStrategy strategy; @@ -397,14 +399,41 @@ public void setCandidatePrimaryStorageUuidsForDataVolume(List candidateP } private List disableL3Networks; - private List diskAOs; + private DiskAO rootDisk = DiskAO.rootDisk(); + private List dataDisks; + private List deprecatedDisksSpecs = new ArrayList<>(); + private VmCustomSpecificationStruct vmCustomSpecification; + + public DiskAO getRootDisk() { + return rootDisk; + } + + public void setRootDisk(DiskAO rootDisk) { + this.rootDisk = rootDisk; + } + + public List getDataDisks() { + return dataDisks; + } - public List getDiskAOs() { - return diskAOs; + public void setDataDisks(List dataDisks) { + this.dataDisks = dataDisks; } - public void setDiskAOs(List diskAOs) { - this.diskAOs = diskAOs; + public List getDeprecatedDisksSpecs() { + return deprecatedDisksSpecs; + } + + public void setDeprecatedDisksSpecs(List deprecatedDisksSpecs) { + this.deprecatedDisksSpecs = deprecatedDisksSpecs; + } + + public VmCustomSpecificationStruct getVmCustomSpecification() { + return vmCustomSpecification; + } + + public void setVmCustomSpecification(VmCustomSpecificationStruct vmCustomSpecification) { + this.vmCustomSpecification = vmCustomSpecification; } public boolean isSkipIpAllocation() { @@ -609,17 +638,6 @@ public void setL3Networks(List l3Networks) { this.l3Networks = l3Networks; } - public List getDataDiskOfferings() { - if (dataDiskOfferings == null) { - dataDiskOfferings = new ArrayList<>(0); - } - return dataDiskOfferings; - } - - public void setDataDiskOfferings(List dataDiskOfferings) { - this.dataDiskOfferings = dataDiskOfferings; - } - public DiskOfferingInventory getRootDiskOffering() { return rootDiskOffering; } @@ -757,11 +775,6 @@ public List getRequiredNetworkServiceTypes() { return nsTypes; } - @Deprecated - public String getRequiredPrimaryStorageUuidForRootVolume() { - return this.candidatePrimaryStorageUuidsForRootVolume.isEmpty() ? null : this.candidatePrimaryStorageUuidsForRootVolume.get(0); - } - public void setRequiredPrimaryStorageUuidForRootVolume(String primaryStorageUuidForRootVolume) { this.candidatePrimaryStorageUuidsForRootVolume.clear(); if (primaryStorageUuidForRootVolume != null) { @@ -813,14 +826,6 @@ public void setDataVolumeSystemTags(List dataVolumeSystemTags) { this.dataVolumeSystemTags = dataVolumeSystemTags; } - public Map> getDataVolumeSystemTagsOnIndex() { - return dataVolumeSystemTagsOnIndex; - } - - public void setDataVolumeSystemTagsOnIndex(Map> dataVolumeSystemTagsOnIndex) { - this.dataVolumeSystemTagsOnIndex = dataVolumeSystemTagsOnIndex; - } - public boolean isInstantiateResourcesSuccess() { return instantiateResourcesSuccess; } @@ -868,14 +873,6 @@ public void setDisableL3Networks(List disableL3Networks) { this.disableL3Networks = disableL3Networks; } - public String getAllocatedPrimaryStorageUuidForRootVolume() { - return allocatedPrimaryStorageUuidForRootVolume; - } - - public void setAllocatedPrimaryStorageUuidForRootVolume(String allocatedPrimaryStorageUuidForRootVolume) { - this.allocatedPrimaryStorageUuidForRootVolume = allocatedPrimaryStorageUuidForRootVolume; - } - public String getAllocatedPrimaryStorageUuidForDataVolume() { return allocatedPrimaryStorageUuidForDataVolume; } diff --git a/network/src/main/java/org/zstack/network/l3/L3NetworkApiInterceptor.java b/network/src/main/java/org/zstack/network/l3/L3NetworkApiInterceptor.java index 8e1d2fdc70..5de41fe48f 100755 --- a/network/src/main/java/org/zstack/network/l3/L3NetworkApiInterceptor.java +++ b/network/src/main/java/org/zstack/network/l3/L3NetworkApiInterceptor.java @@ -24,6 +24,7 @@ import org.zstack.header.zone.ZoneVO_; import org.zstack.network.service.MtuGetter; import org.zstack.network.service.NetworkServiceGlobalConfig; +import org.zstack.utils.CollectionUtils; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; import org.zstack.utils.network.IPv6Constants; @@ -549,6 +550,22 @@ private void validate(APIGetIpAddressCapacityMsg msg) { )); } + if (!CollectionUtils.isEmpty(msg.getL3NetworkUuids())) { + List enableIPAML3Uuids = Q.New(L3NetworkVO.class) + .eq(L3NetworkVO_.enableIPAM, true) + .in(L3NetworkVO_.uuid, msg.getL3NetworkUuids()) + .select(L3NetworkVO_.uuid) + .listValues(); + + if (enableIPAML3Uuids.isEmpty()) { + throw new ApiMessageInterceptionException(argerr( + "all the specified L3 networks are IPAM disabled, cannot get ip address capacity" + )); + } else { + msg.setL3NetworkUuids(enableIPAML3Uuids); + } + } + if (msg.isAll() && (msg.getZoneUuids() == null || msg.getZoneUuids().isEmpty())) { SimpleQuery q = dbf.createQuery(ZoneVO.class); q.select(ZoneVO_.uuid); diff --git a/network/src/main/java/org/zstack/network/l3/L3NetworkManagerImpl.java b/network/src/main/java/org/zstack/network/l3/L3NetworkManagerImpl.java index d747d0a0e0..258c2febd5 100755 --- a/network/src/main/java/org/zstack/network/l3/L3NetworkManagerImpl.java +++ b/network/src/main/java/org/zstack/network/l3/L3NetworkManagerImpl.java @@ -325,14 +325,14 @@ public IpCapacity call() { return ret; } else if (msg.getZoneUuids() != null && !msg.getZoneUuids().isEmpty()) { reply.setResourceType(ZoneVO.class.getSimpleName()); - String sql = "select ipr.startIp, ipr.endIp, ipr.netmask, ipr.ipVersion, zone.uuid from IpRangeVO ipr, L3NetworkVO l3, ZoneVO zone where ipr.l3NetworkUuid = l3.uuid and l3.zoneUuid = zone.uuid and zone.uuid in (:uuids)"; + String sql = "select ipr.startIp, ipr.endIp, ipr.netmask, ipr.ipVersion, zone.uuid from IpRangeVO ipr, L3NetworkVO l3, ZoneVO zone where ipr.l3NetworkUuid = l3.uuid and l3.enableIPAM = true and l3.zoneUuid = zone.uuid and zone.uuid in (:uuids)"; TypedQuery q = dbf.getEntityManager().createQuery(sql, Tuple.class); q.setParameter("uuids", msg.getZoneUuids()); List ts = q.getResultList(); ts = IpRangeHelper.stripNetworkAndBroadcastAddress(ts); calcElementTotalIp(ts, ret); - sql = "select count(distinct uip.ip), zone.uuid, uip.ipVersion from UsedIpVO uip, L3NetworkVO l3, ZoneVO zone where uip.l3NetworkUuid = l3.uuid and l3.zoneUuid = zone.uuid and zone.uuid in (:uuids) and (uip.metaData not in (:notAccountMetaData) or uip.metaData IS NULL) group by zone.uuid, uip.ipVersion"; + sql = "select count(distinct uip.ip), zone.uuid, uip.ipVersion from UsedIpVO uip, L3NetworkVO l3, ZoneVO zone where uip.l3NetworkUuid = l3.uuid and l3.enableIPAM = true and l3.zoneUuid = zone.uuid and zone.uuid in (:uuids) and (uip.metaData not in (:notAccountMetaData) or uip.metaData IS NULL) group by zone.uuid, uip.ipVersion"; TypedQuery cq = dbf.getEntityManager().createQuery(sql, Tuple.class); cq.setParameter("uuids", msg.getZoneUuids()); cq.setParameter("notAccountMetaData", notAccountMetaDatas); diff --git a/network/src/main/java/org/zstack/network/l3/StaticIpAllocatorStrategy.java b/network/src/main/java/org/zstack/network/l3/StaticIpAllocatorStrategy.java index 86cb717240..e6d0003825 100644 --- a/network/src/main/java/org/zstack/network/l3/StaticIpAllocatorStrategy.java +++ b/network/src/main/java/org/zstack/network/l3/StaticIpAllocatorStrategy.java @@ -41,7 +41,7 @@ public UsedIpInventory allocateIp(IpAllocateMessage msg) { L3NetworkVO l3 = Q.New(L3NetworkVO.class).eq(L3NetworkVO_.uuid, amsg.getL3NetworkUuid()).find(); if (l3.enableIpAllocation()) { - throw new OperationFailureException(err(L3Errors.ALLOCATE_IP_ERROR, "l3Network[uuid:%s] is using IPAM, cannot allocate static ip", + throw new OperationFailureException(err(L3Errors.ALLOCATE_IP_ERROR, "IP allocation of l3Network[uuid:%s] enabled, cannot allocate static ip", amsg.getL3NetworkUuid())); } @@ -119,6 +119,7 @@ public UsedIpInventory allocateIp(IpAllocateMessage msg) { .eq(UsedIpVO_.l3NetworkUuid, amsg.getL3NetworkUuid()) .eq(UsedIpVO_.ipVersion, ipVersion) .eq(UsedIpVO_.ip, ip) + .eq(UsedIpVO_.netmask, amsg.getNetmask()) .find(); if (conflictIp != null) { throw new OperationFailureException(err(L3Errors.ALLOCATE_IP_ERROR, "ip[%s] has been occupied by other usedIp[uuid:%s]", ip, conflictIp.getUuid())); diff --git a/plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmBase.java b/plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmBase.java index a298c98ed8..74763eece7 100755 --- a/plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmBase.java +++ b/plugin/applianceVm/src/main/java/org/zstack/appliancevm/ApplianceVmBase.java @@ -7,13 +7,13 @@ import org.zstack.compute.vm.VmInstanceBase; import org.zstack.core.CoreGlobalProperty; import org.zstack.core.MessageCommandRecorder; +import org.zstack.core.db.Q; import org.zstack.core.db.SQLBatch; import org.zstack.core.db.SimpleQuery; import org.zstack.core.db.SimpleQuery.Op; import org.zstack.core.thread.ChainTask; import org.zstack.core.thread.SyncTaskChain; import org.zstack.core.workflow.FlowChainBuilder; -import org.zstack.header.configuration.DiskOfferingInventory; import org.zstack.header.configuration.DiskOfferingVO; import org.zstack.header.configuration.DiskOfferingVO_; import org.zstack.header.core.Completion; @@ -35,16 +35,18 @@ import org.zstack.header.vm.VmInstanceConstant.VmOperation; import org.zstack.header.vm.VmInstanceDeletionPolicyManager.VmInstanceDeletionPolicy; import org.zstack.header.volume.VolumeFormat; -import org.zstack.utils.CollectionUtils; import org.zstack.utils.RangeSet; import org.zstack.utils.RangeSet.Range; +import javax.persistence.Tuple; import java.util.*; +import java.util.stream.Collectors; import static org.zstack.core.Platform.inerr; import static org.zstack.core.Platform.operr; import static org.zstack.utils.CollectionDSL.list; import static org.zstack.utils.CollectionUtils.findOneOrNull; +import static org.zstack.utils.CollectionUtils.isEmpty; public abstract class ApplianceVmBase extends VmInstanceBase implements ApplianceVm { @Autowired @@ -916,20 +918,27 @@ protected void instantiateVmFromNewCreate(final InstantiateNewCreatedVmInstanceM spec.setL3Networks(new ArrayList(0)); } - if (msg.getDataDiskOfferingUuids() != null && !msg.getDataDiskOfferingUuids().isEmpty()) { - SimpleQuery dquery = dbf.createQuery(DiskOfferingVO.class); - dquery.add(DiskOfferingVO_.uuid, SimpleQuery.Op.IN, msg.getDataDiskOfferingUuids()); - List vos = dquery.list(); - - // allow create multiple data volume from the same disk offering - List disks = new ArrayList<>(); - for (final String duuid : msg.getDataDiskOfferingUuids()) { - DiskOfferingVO dvo = CollectionUtils.findOneOrNull(vos, arg -> duuid.equals(arg.getUuid())); - disks.add(DiskOfferingInventory.valueOf(dvo)); + if (!isEmpty(msg.getDeprecatedDataVolumeSpecs())) { + List uuidList = msg.getDeprecatedDataVolumeSpecs().stream() + .map(DiskAO::getDiskOfferingUuid) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + if (!uuidList.isEmpty()) { + List tuples = Q.New(DiskOfferingVO.class) + .in(DiskOfferingVO_.uuid, uuidList) + .select(DiskOfferingVO_.uuid, DiskOfferingVO_.diskSize) + .listTuple(); + + for (Tuple tuple : tuples) { + String uuid = tuple.get(0, String.class); + Long diskSize = tuple.get(1, Long.class); + for (DiskAO diskAO : msg.getDeprecatedDataVolumeSpecs()) { + if (diskAO.getDiskOfferingUuid().equals(uuid)) { + diskAO.setSize(diskSize); + } + } + } } - spec.setDataDiskOfferings(disks); - } else { - spec.setDataDiskOfferings(new ArrayList<>(0)); } ImageVO imvo = dbf.findByUuid(spec.getVmInventory().getImageUuid(), ImageVO.class); diff --git a/plugin/cbd/src/main/java/org/zstack/cbd/AddonInfo.java b/plugin/cbd/src/main/java/org/zstack/cbd/AddonInfo.java index dab817ba94..c08f5c37c6 100644 --- a/plugin/cbd/src/main/java/org/zstack/cbd/AddonInfo.java +++ b/plugin/cbd/src/main/java/org/zstack/cbd/AddonInfo.java @@ -8,9 +8,18 @@ * @date 2024/4/1 18:12 */ public class AddonInfo { + private ClusterInfo clusterInfo; private List mdsInfos = new ArrayList<>(); private List logicalPoolInfos = new ArrayList<>(); + public ClusterInfo getClusterInfo() { + return clusterInfo; + } + + public void setClusterInfo(ClusterInfo clusterInfo) { + this.clusterInfo = clusterInfo; + } + public List getMdsInfos() { return mdsInfos; } diff --git a/plugin/cbd/src/main/java/org/zstack/cbd/ClusterInfo.java b/plugin/cbd/src/main/java/org/zstack/cbd/ClusterInfo.java new file mode 100644 index 0000000000..6907f7e7e0 --- /dev/null +++ b/plugin/cbd/src/main/java/org/zstack/cbd/ClusterInfo.java @@ -0,0 +1,26 @@ +package org.zstack.cbd; + +/** + * @author Xingwei Yu + * @date 2025/8/8 14:03 + */ +public class ClusterInfo { + private String uuid; + private String version; + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } +} diff --git a/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageBase.java b/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageBase.java index f9d6970616..c37355c10f 100755 --- a/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageBase.java +++ b/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageBase.java @@ -2134,6 +2134,7 @@ private void doDownload(final ReturnValueCompletion completion) { String snapshotPath; long actualSize = image.getInventory().getActualSize(); String allocatedInstall; + ImageCacheVO cvo = new ImageCacheVO(); @Override public void setup() { @@ -2339,10 +2340,11 @@ public void fail(ErrorCode errorCode) { } }); - done(new FlowDoneHandler(completion) { + flow(new NoRollbackFlow() { + String __name__ = "save-db"; + @Override - public void handle(Map data) { - ImageCacheVO cvo = new ImageCacheVO(); + public void run(FlowTrigger trigger, Map data) { cvo.setMd5sum("not calculated"); cvo.setSize(image.getInventory().getActualSize()); cvo.setInstallUrl(snapshotPath); @@ -2352,11 +2354,47 @@ public void handle(Map data) { cvo.setState(ImageCacheState.ready); cvo.setSize(actualSize); cvo = dbf.persistAndRefresh(cvo); + trigger.next(); + } + }); - ImageCacheVO finalCvo = cvo; - pluginRgty.getExtensionList(AfterCreateImageCacheExtensionPoint.class) - .forEach(exp -> exp.saveEncryptAfterCreateImageCache(null, ImageCacheInventory.valueOf(finalCvo))); + flow(new NoRollbackFlow() { + String __name__ = "invoke-after-create-image-cache-extensions"; + @Override + public void run(FlowTrigger trigger, Map data) { + ImageCacheInventory inventory = ImageCacheInventory.valueOf(cvo); + new While<>(pluginRgty.getExtensionList(AfterCreateImageCacheExtensionPoint.class)).each((ext, whileCompletion) -> { + ext.saveEncryptAfterCreateImageCache(null, inventory, new Completion(whileCompletion) { + @Override + public void success() { + whileCompletion.done(); + } + + @Override + public void fail(ErrorCode errorCode) { + whileCompletion.addError(errorCode); + whileCompletion.done(); + } + }); + }).run(new WhileDoneCompletion(trigger) { + @Override + public void done(ErrorCodeList errorCodeList) { + if (!errorCodeList.getCauses().isEmpty()) { + String details = multiErr(errorCodeList.getCauses()).getReadableDetails(); + logger.warn(String.format( + "failed to invoke after create image cache extensions (but still continue): %s", + details)); + } + trigger.next(); + } + }); + } + }); + + done(new FlowDoneHandler(completion) { + @Override + public void handle(Map data) { completion.success(cvo); } }); @@ -5235,7 +5273,7 @@ private void deleteSnapshotOnPrimaryStorage(final DeleteSnapshotOnPrimaryStorage httpCall(DELETE_SNAPSHOT_PATH, cmd, DeleteSnapshotRsp.class, new ReturnValueCompletion(msg) { @Override public void success(DeleteSnapshotRsp returnValue) { - osdHelper.releaseAvailableCapWithRatio(msg.getSnapshot().getPrimaryStorageInstallPath(), msg.getSnapshot().getSize()); + osdHelper.releaseAvailableCapacity(msg.getSnapshot().getPrimaryStorageInstallPath(), msg.getSnapshot().getSize()); bus.reply(msg, reply); completion.done(); } diff --git a/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageFactory.java b/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageFactory.java index 71e9cb7515..46788a7385 100755 --- a/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageFactory.java +++ b/plugin/ceph/src/main/java/org/zstack/storage/ceph/primary/CephPrimaryStorageFactory.java @@ -82,8 +82,7 @@ import static org.zstack.storage.ceph.primary.CephRequiredUrlParser.getInstallPathFromUri; import static org.zstack.utils.CollectionDSL.e; import static org.zstack.utils.CollectionDSL.map; -import static org.zstack.utils.CollectionUtils.transform; -import static org.zstack.utils.CollectionUtils.transformAndRemoveNull; +import static org.zstack.utils.CollectionUtils.*; /** * Created by frank on 7/28/2015. @@ -743,6 +742,7 @@ public void beforeTakeLiveSnapshotsOnVolumes(CreateVolumesSnapshotOverlayInnerMs logger.info(String.format("take snapshots for volumes[%s] on %s", msg.getLockedVolumeUuids(), getClass().getCanonicalName())); + List inventories = Collections.synchronizedList(new ArrayList<>()); ErrorCodeList errList = new ErrorCodeList(); new While<>(cephStructs).all((struct, whileCompletion) -> { VolumeSnapshotVO vo = Q.New(VolumeSnapshotVO.class).eq(VolumeSnapshotVO_.uuid, struct.getResourceUuid()).find(); @@ -780,6 +780,7 @@ public void run(MessageReply reply) { dbf.update(vo); struct.getVolumeSnapshotStruct().setCurrent(treply.getInventory()); + inventories.add(treply.getInventory()); whileCompletion.done(); } }); @@ -788,6 +789,17 @@ public void run(MessageReply reply) { public void done(ErrorCodeList errorCodeList) { if (!errList.getCauses().isEmpty()) { completion.fail(errList.getCauses().get(0)); + + inventories.forEach(snapshot -> { + VolumeSnapshotDeletionMsg msg = new VolumeSnapshotDeletionMsg(); + msg.setSnapshotUuid(snapshot.getUuid()); + msg.setTreeUuid(snapshot.getTreeUuid()); + msg.setVolumeUuid(snapshot.getVolumeUuid()); + msg.setScope(DeleteVolumeSnapshotScope.Single.toString()); + msg.setDirection(DeleteVolumeSnapshotDirection.Commit.toString()); + bus.makeTargetServiceIdByResourceUuid(msg, VolumeSnapshotConstant.SERVICE_ID, snapshot.getUuid()); + bus.send(msg); + }); return; } completion.success(); @@ -891,11 +903,11 @@ private void settingRootVolume(CreateVmInstanceMsg msg) { } private void settingDataVolume(CreateVmInstanceMsg msg) { - if (msg.getDataDiskOfferingUuids() == null || msg.getDataDiskOfferingUuids().isEmpty()) { + if (isEmpty(msg.getDeprecatedDataVolumeSpecs())) { return; } - String diskOffering = msg.getDataDiskOfferingUuids().get(0); + String diskOffering = msg.getDeprecatedDataVolumeSpecs().get(0).getDiskOfferingUuid(); if (diskOffering == null) { return; } diff --git a/plugin/expon/src/main/java/org/zstack/expon/ExponStorageController.java b/plugin/expon/src/main/java/org/zstack/expon/ExponStorageController.java index 5ea973b85b..99bb3a5807 100644 --- a/plugin/expon/src/main/java/org/zstack/expon/ExponStorageController.java +++ b/plugin/expon/src/main/java/org/zstack/expon/ExponStorageController.java @@ -1323,6 +1323,11 @@ public void onFirstAdditionConfigure(Completion completion) { completion.success(); } + @Override + public long alignSize(long size) { + return size; + } + private void retry(Runnable r) { retry(r, 3); } diff --git a/plugin/externalStorage/src/main/java/org/zstack/externalStorage/primary/kvm/ExternalPrimaryStorageKvmFactory.java b/plugin/externalStorage/src/main/java/org/zstack/externalStorage/primary/kvm/ExternalPrimaryStorageKvmFactory.java index 6f494e8e0b..0ebad4c9fc 100644 --- a/plugin/externalStorage/src/main/java/org/zstack/externalStorage/primary/kvm/ExternalPrimaryStorageKvmFactory.java +++ b/plugin/externalStorage/src/main/java/org/zstack/externalStorage/primary/kvm/ExternalPrimaryStorageKvmFactory.java @@ -10,19 +10,19 @@ import org.zstack.core.db.Q; import org.zstack.core.db.SQL; import org.zstack.core.workflow.FlowChainBuilder; +import org.zstack.externalStorage.primary.ExternalStorageConstant; import org.zstack.header.core.*; import org.zstack.header.core.workflow.*; import org.zstack.header.errorcode.ErrorCode; import org.zstack.header.errorcode.ErrorCodeList; +import org.zstack.header.errorcode.OperationFailureException; import org.zstack.header.host.HostInventory; import org.zstack.header.host.HostVO; import org.zstack.header.host.HostVO_; import org.zstack.header.message.MessageReply; import org.zstack.header.storage.addon.NodeHealthy; import org.zstack.header.storage.addon.StorageHealthy; -import org.zstack.header.storage.addon.primary.BaseVolumeInfo; -import org.zstack.header.storage.addon.primary.ExternalPrimaryStorageVO; -import org.zstack.header.storage.addon.primary.PrimaryStorageNodeSvc; +import org.zstack.header.storage.addon.primary.*; import org.zstack.header.storage.primary.*; import org.zstack.header.vm.VmInstanceSpec; import org.zstack.header.vm.VmInstanceState; @@ -31,6 +31,7 @@ import org.zstack.header.volume.VolumeVO_; import org.zstack.kvm.*; import org.zstack.storage.addon.primary.ExternalPrimaryStorageFactory; +import org.zstack.utils.CollectionUtils; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; @@ -329,13 +330,19 @@ public void beforeStartVmOnKvm(KVMHostInventory host, VmInstanceSpec spec, KVMAg List vols = getManagerExclusiveVolume(spec); for (VolumeInventory vol : vols) { - PrimaryStorageNodeSvc nodeSvc = getNodeService(vol); + PrimaryStorageNodeSvc nodeSvc = extPsFactory.getNodeSvc(vol.getPrimaryStorageUuid()); if (nodeSvc == null) { continue; } - nodeSvc.getActiveClients(vol.getInstallPath(), vol.getProtocol()).forEach(client -> { + List clients = nodeSvc.getActiveClients(vol.getInstallPath(), vol.getProtocol()); + clients.forEach(client -> { if (!client.getManagerIp().equals(host.getManagementIp()) && !client.isInBlacklist()) { + // hard code for zbs, zbs not support deactive and blacklist yet + if (vol.getProtocol().equals(ExternalStorageConstant.CBD_PROTOCOL)) { + throw new OperationFailureException(operr("find active clients for volume[uuid:%s, installPath %s, client:%s]", + vol.getUuid(), vol.getInstallPath(), client.getManagerIp())); + } // TODO use async call HostVO clientHost = Q.New(HostVO.class).eq(HostVO_.managementIp, client.getManagerIp()).find(); if (clientHost != null) { @@ -388,12 +395,16 @@ private List getManagerExclusiveVolume(VmInstanceSpec spec) { vols.add(spec.getDestRootVolume()); vols.addAll(spec.getDestDataVolumes()); + List pss = Q.New(ExternalPrimaryStorageVO.class) + .in(ExternalPrimaryStorageVO_.uuid, vols.stream().map(VolumeInventory::getPrimaryStorageUuid).collect(Collectors.toList())) + .list(); + Map psIdentities = pss.stream() + .collect(Collectors.toMap(ExternalPrimaryStorageVO::getUuid, ExternalPrimaryStorageVO::getIdentity)); vols.removeIf(info -> { - if (info.getInstallPath() == null || info.isShareable()) { + if (info.getInstallPath() == null || info.isShareable() || !psIdentities.containsKey(info.getPrimaryStorageUuid())) { return true; } - String identity = info.getInstallPath().split("://")[0]; - return !extPsFactory.support(identity); + return !extPsFactory.support(psIdentities.get(info.getPrimaryStorageUuid())); }); return vols; diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java index b1b06e96cf..ed207a5416 100755 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java @@ -484,6 +484,7 @@ public static class HostFactResponse extends AgentResponse { private VirtualizerInfoTO virtualizerInfo; private String iscsiInitiatorName; private String nqn; + private String hostname; public String getOsDistribution() { return osDistribution; @@ -772,6 +773,14 @@ public String getNqn() { public void setNqn(String nqn) { this.nqn = nqn; } + + public String getHostname() { + return hostname; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } } public static class HostCapacityCmd extends AgentCommand { @@ -4397,6 +4406,52 @@ public void setSensors(List sensors) { } } + public static class DownloadFileCmd extends AgentCommand implements HasThreadContext, Serializable { + public String taskUuid; + public String installPath; + @NoLogging(type = NoLogging.Type.Uri) + public String url; + @NoLogging(type = NoLogging.Type.Uri) + public String urlScheme; + public long timeout; + @NoLogging(type = NoLogging.Type.Uri) + public String sendCommandUrl; + } + + public static class DownloadFileResponse extends AgentResponse { + public String md5sum; + public long size; + } + + public static class UploadFileCmd extends AgentCommand implements HasThreadContext, Serializable { + public String taskUuid; + public String installPath; + @NoLogging(type = NoLogging.Type.Uri) + public String url; + public long timeout; + } + + public static class UploadFileResponse extends AgentResponse { + public String directUploadPath; + } + + public static class GetDownloadFileProgressCmd extends AgentCommand { + public String taskUuid; + } + + public static class GetDownloadFileProgressResponse extends AgentResponse { + public boolean completed; + public int progress; + public long size; + public long actualSize; + public String installPath; + public String format; + public long lastOpTime; + public long downloadSize; + public String md5sum; + public boolean supportSuspend; + } + public static class TakeVmConsoleScreenshotCmd extends AgentCommand { private String vmUuid; @@ -4550,4 +4605,11 @@ public static class UpdateHostNqnCmd extends AgentCommand { public static class UpdateHostNqnRsp extends AgentResponse { } + + public static class UpdateHostnameCmd extends AgentCommand { + public String hostname; + } + + public static class UpdateHostnameRsp extends AgentResponse { + } } diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMConstant.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMConstant.java index 8b83c4640b..ad4d755c17 100755 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KVMConstant.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KVMConstant.java @@ -118,6 +118,11 @@ public interface KVMConstant { String KVM_HOST_GET_BLOCK_DEVICES_PATH = "/host/blockdevices/get"; String KVM_HOST_GET_SENSORS_PATH = "/host/sensors/get"; String KVM_UPDATE_HOST_NQN_PATH = "/host/nqn/update"; + String KVM_UPDATE_HOSTNAME_PATH = "/host/hostname/update"; + + String KVM_HOST_FILE_DOWNLOAD_PATH = "/host/file/download"; + String KVM_HOST_FILE_UPLOAD_PATH = "/host/file/upload"; + String KVM_HOST_FILE_DOWNLOAD_PROGRESS_PATH = "/host/file/progress"; String SET_HOST_PHYSICAL_MEMORY_MONITOR = "/host/physical/memory/monitor/start"; diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java index 70ec35ae33..80ced24c35 100755 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java @@ -14,6 +14,7 @@ import org.zstack.compute.vm.*; import org.zstack.core.timeout.TimeHelper; import org.zstack.header.core.*; +import org.zstack.header.image.*; import org.zstack.header.vm.devices.VirtualDeviceInfo; import org.zstack.header.vm.devices.VmInstanceResourceMetadataManager; import org.zstack.core.CoreGlobalProperty; @@ -49,11 +50,6 @@ import org.zstack.header.exception.CloudRuntimeException; import org.zstack.header.host.*; import org.zstack.header.host.MigrateVmOnHypervisorMsg.StorageMigrationPolicy; -import org.zstack.header.image.ImageArchitecture; -import org.zstack.header.image.ImageBootMode; -import org.zstack.header.image.ImageInventory; -import org.zstack.header.image.ImagePlatform; -import org.zstack.header.image.ImageVO; import org.zstack.header.message.APIMessage; import org.zstack.header.message.Message; import org.zstack.header.message.MessageReply; @@ -97,6 +93,8 @@ import javax.persistence.TypedQuery; import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; @@ -221,6 +219,9 @@ public class KVMHost extends HostBase implements Host { private String updateVmCpuQuotaPath; private String getBlockDevicesPath; private String getSensorsPath; + private String fileDownloadPath; + private String fileUploadPath; + private String fileDownloadProgressPath; public KVMHost(KVMHostVO self, KVMHostContext context) { super(self); @@ -459,6 +460,18 @@ public KVMHost(KVMHostVO self, KVMHostContext context) { ub = UriComponentsBuilder.fromHttpUrl(baseUrl); ub.path(KVMConstant.KVM_HOST_GET_SENSORS_PATH); getSensorsPath = ub.build().toString(); + + ub = UriComponentsBuilder.fromHttpUrl(baseUrl); + ub.path(KVMConstant.KVM_HOST_FILE_DOWNLOAD_PATH); + fileDownloadPath = ub.build().toString(); + + ub = UriComponentsBuilder.fromHttpUrl(baseUrl); + ub.path(KVMConstant.KVM_HOST_FILE_UPLOAD_PATH); + fileUploadPath = ub.build().toString(); + + ub = UriComponentsBuilder.fromHttpUrl(baseUrl); + ub.path(KVMConstant.KVM_HOST_FILE_DOWNLOAD_PROGRESS_PATH); + fileDownloadProgressPath = ub.build().toString(); } static { @@ -709,6 +722,12 @@ protected void handleLocalMessage(Message msg) { handle((GetHostSensorsMsg) msg); } else if (msg instanceof UpdateHostNqnMsg) { handle((UpdateHostNqnMsg) msg); + } else if (msg instanceof UpdateHostnameMsg) { + handle((UpdateHostnameMsg) msg); + } else if (msg instanceof UploadFileToHostMsg) { + handle((UploadFileToHostMsg) msg); + } else if (msg instanceof GetFileDownloadProgressMsg) { + handle((GetFileDownloadProgressMsg) msg); } else { super.handleLocalMessage(msg); } @@ -764,6 +783,61 @@ public String getName() { }); } + private void handle(UpdateHostnameMsg msg) { + UpdateHostnameReply ureply = new UpdateHostnameReply(); + thdf.chainSubmit(new ChainTask(msg) { + @Override + public String getSyncSignature() { + return id; + } + + @Override + public void run(SyncTaskChain chain) { + UpdateHostnameCmd cmd = new UpdateHostnameCmd(); + cmd.hostname = msg.getHostname(); + + KVMHostAsyncHttpCallMsg kmsg = new KVMHostAsyncHttpCallMsg(); + kmsg.setCommand(cmd); + kmsg.setPath(KVMConstant.KVM_UPDATE_HOSTNAME_PATH); + kmsg.setHostUuid(msg.getHostUuid()); + bus.makeTargetServiceIdByResourceUuid(kmsg, HostConstant.SERVICE_ID, msg.getHostUuid()); + bus.send(kmsg, new CloudBusCallBack(chain) { + @Override + public void run(MessageReply reply) { + if (!reply.isSuccess()) { + ureply.setError(operr("fail to update hostname of host[uuid:%s]", msg.getHostUuid()) + .withOpaque("response.error", reply.getError())); + + bus.reply(msg, ureply); + chain.next(); + return; + } + + KVMHostAsyncHttpCallReply r = reply.castReply(); + UpdateHostnameRsp rsp = r.toResponse(UpdateHostnameRsp.class); + if (!rsp.isSuccess()) { + ureply.setError(operr("fail to update hostname of host[uuid:%s]", msg.getHostUuid()) + .withOpaque("response.error", rsp.getError())); + bus.reply(msg, ureply); + chain.next(); + return; + } + SQL.New(HostVO.class).eq(HostVO_.uuid, msg.getHostUuid()).set(HostVO_.hostname, msg.getHostname()).update(); + self = dbf.reload(self); + ureply.setInventory(getSelfInventory()); + bus.reply(msg, ureply); + chain.next(); + } + }); + } + + @Override + public String getName() { + return String.format("update-hostname-of-host-%s", msg.getHostUuid()); + } + }); + } + private void handle(UpdateVmCpuQuotaMsg msg) { UpdateVmCpuQuotaReply reply = new UpdateVmCpuQuotaReply(); @@ -1176,17 +1250,17 @@ private void handle(GetHostWebSshUrlMsg msg) { } KVMHostVO host = dbf.findByUuid(msg.getHostUuid(), KVMHostVO.class); - HTTP.Builder hb = HTTP.post(); - hb.body(""); - try { - hb.url(String.format("http://localhost:%s?username=%s&&hostname=%s&&port=%s&&password=%s", - KVMGlobalConfig.HOST_WEBSSH_PORT.value(), - msg.getUserName(), - host.getManagementIp(), - host.getPort().toString(), - msg.getPassword())); - - Response r = hb.callWithException(); + Map formMap = new HashMap<>(); + formMap.put("username", msg.getUserName()); + formMap.put("hostname", host.getManagementIp()); + formMap.put("port", host.getPort().toString()); + formMap.put("password", msg.getPassword()); + + HTTP.Builder hb = HTTP.post() + .url(String.format("http://localhost:%s", KVMGlobalConfig.HOST_WEBSSH_PORT.value())) + .formData(formMap); + + try (Response r = hb.callWithException()) { // 1. webssh maybe is not running if (!r.isSuccessful()) { reply.setError(inerr("webssh server is unreachable for %s", r.message())); @@ -1208,7 +1282,7 @@ private void handle(GetHostWebSshUrlMsg msg) { bus.reply(msg, reply); } catch (IOException | NullPointerException e) { throw new CloudRuntimeException( - String.format("get host[%s] webssh url failed. because %s", host.getUuid(), e.getMessage()) + String.format("get host[%s] webssh url failed: %s", host.getUuid(), e.getMessage()) ); } } @@ -5702,16 +5776,16 @@ public boolean skip(Map data) { @Override public void run(FlowTrigger trigger, Map data) { String allowPorts = KVMGlobalConfig.KVMAGENT_ALLOW_PORTS_LIST.value(String.class) + ',' + HostGlobalConfig.NBD_PORT_RANGE.value(String.class); - StringBuilder builder = new StringBuilder(); + String command; if (!KVMGlobalProperty.MN_NETWORKS.isEmpty()) { - builder.append(String.format("sudo bash %s -m %s -p %s -s %s -c %s", + command = (String.format("bash %s -m %s -p %s -s %s -c %s", "/var/lib/zstack/kvm/kvmagent-iptables", KVMConstant.IPTABLES_COMMENTS, allowPorts, KVMGlobalProperty.AGENT_PORT, String.join(",", KVMGlobalProperty.MN_NETWORKS))); } else { - builder.append(String.format("sudo bash %s -m %s -p %s -s %s", + command = (String.format("bash %s -m %s -p %s -s %s", "/var/lib/zstack/kvm/kvmagent-iptables", KVMConstant.IPTABLES_COMMENTS, allowPorts, @@ -5719,11 +5793,13 @@ public void run(FlowTrigger trigger, Map data) { } try { - new Ssh().shell(builder.toString()) + new Ssh() .setUsername(getSelf().getUsername()) .setPassword(getSelf().getPassword()) .setHostname(getSelf().getManagementIp()) - .setPort(getSelf().getPort()).runErrorByExceptionAndClose(); + .setPort(getSelf().getPort()) + .sudoCommand(command) + .runErrorByExceptionAndClose(); } catch (SshException ex) { throw new OperationFailureException(operr(ex.toString())); } @@ -5994,6 +6070,9 @@ private void recordHardwareChangesAndCreateTag(PatternedSystemTag systemTag, Map private void saveGeneralHostHardwareFacts(HostFactResponse ret) { HostVO host = getSelf(); host.setNqn(ret.getNqn()); + if (StringUtils.isNotEmpty(ret.getHostname())) { + host.setHostname(ret.getHostname()); + } dbf.update(host); self = dbf.reload(self); @@ -6868,4 +6947,133 @@ public void fail(ErrorCode errorCode) { } }); } + + private void handle(UploadFileToHostMsg msg) { + RunInQueue inQueue = new RunInQueue(String.format("upload-file-to-host-%s", self.getUuid()), thdf, 10); + inQueue.name(String.format("upload-file-to-host-%s", self.getUuid())) + .asyncBackup(msg) + .run(chain -> uploadFileToHost(msg, new NoErrorCompletion(chain) { + @Override + public void done() { + chain.next(); + } + })); + } + + private void uploadFileToHost(UploadFileToHostMsg msg, NoErrorCompletion completion) { + UploadFileToHostReply reply = new UploadFileToHostReply(); + + if (msg.getUrl().startsWith("upload://")) { + UploadFileCmd cmd = new UploadFileCmd(); + cmd.url = msg.getUrl(); + cmd.installPath = msg.getInstallPath(); + cmd.timeout = timeoutManager.getTimeout(); + cmd.taskUuid = msg.getTaskUuid(); + + new Http<>(fileUploadPath, cmd, UploadFileResponse.class).call(new ReturnValueCompletion(msg) { + @Override + public void success(UploadFileResponse rsp) { + if (!rsp.isSuccess()) { + reply.setError(operr("failed to upload file, because:%s", rsp.getError())); + bus.reply(msg, reply); + completion.done(); + return; + } + + reply.setDirectUploadUrl(rsp.directUploadPath); + bus.reply(msg, reply); + completion.done(); + } + + @Override + public void fail(ErrorCode errorCode) { + reply.setError(errorCode); + bus.reply(msg, reply); + completion.done(); + } + }); + return; + } + + DownloadFileCmd cmd = new DownloadFileCmd(); + cmd.url = msg.getUrl(); + cmd.installPath = msg.getInstallPath(); + cmd.timeout = timeoutManager.getTimeout(); + cmd.taskUuid = msg.getTaskUuid(); + cmd.sendCommandUrl = restf.getSendCommandUrl(); + + String scheme; + try { + URI uri = new URI(msg.getUrl()); + scheme = uri.getScheme(); + } catch (URISyntaxException e) { + reply.setError(operr("failed to parse upload URL [%s]: %s", msg.getUrl(), e.getMessage())); + bus.reply(msg, reply); + completion.done(); + return; + } + if (scheme == null) { + reply.setError(operr("upload URL [%s] is missing a protocol prefix", msg.getUrl())); + bus.reply(msg, reply); + completion.done(); + return; + } + cmd.urlScheme = scheme; + + new Http<>(fileDownloadPath, cmd, DownloadFileResponse.class).call(new ReturnValueCompletion(msg) { + @Override + public void success(DownloadFileResponse rsp) { + if (!rsp.isSuccess()) { + reply.setError(operr("failed to download file, because:%s", rsp.getError())); + bus.reply(msg, reply); + completion.done(); + return; + } + + reply.setMd5sum(rsp.md5sum); + reply.setSize(rsp.size); + bus.reply(msg, reply); + completion.done(); + } + + @Override + public void fail(ErrorCode errorCode) { + reply.setError(errorCode); + bus.reply(msg, reply); + completion.done(); + } + }); + } + + private void handle(GetFileDownloadProgressMsg msg) { + GetFileDownloadProgressReply r = new GetFileDownloadProgressReply(); + GetDownloadFileProgressCmd cmd = new GetDownloadFileProgressCmd(); + cmd.taskUuid = msg.getTaskUuid(); + new Http<>(fileDownloadProgressPath, cmd, GetDownloadFileProgressResponse.class).call(new ReturnValueCompletion(msg) { + @Override + public void success(GetDownloadFileProgressResponse resp) { + if (!resp.isSuccess()) { + r.setError(operr("failed to query download progress for task[%s] on host[uuid:%s], because: %s", + msg.getTaskUuid(), self.getUuid(), resp.getError())); + } else { + r.setCompleted(resp.completed); + r.setProgress(resp.progress); + r.setActualSize(resp.actualSize); + r.setSize(resp.size); + r.setInstallPath(resp.installPath); + r.setDownloadSize(resp.downloadSize); + r.setLastOpTime(resp.lastOpTime); + r.setMd5sum(resp.md5sum); + r.setSupportSuspend(resp.supportSuspend); + } + bus.reply(msg, r); + } + + @Override + public void fail(ErrorCode errorCode) { + r.setError(errorCode); + bus.reply(msg, r); + } + }); + } } diff --git a/plugin/kvm/src/main/java/org/zstack/kvm/KvmHostConfigChecker.java b/plugin/kvm/src/main/java/org/zstack/kvm/KvmHostConfigChecker.java index 3f20bd13c1..6c03fd38d1 100644 --- a/plugin/kvm/src/main/java/org/zstack/kvm/KvmHostConfigChecker.java +++ b/plugin/kvm/src/main/java/org/zstack/kvm/KvmHostConfigChecker.java @@ -31,9 +31,11 @@ public boolean needDeploy() { .setPassword(password).setPort(sshPort) .setHostname(targetIp); try { - ssh.command("cat /sys/kernel/mm/ksm/run"); + ssh.sudoCommand("cat /sys/kernel/mm/ksm/run"); SshResult ret = ssh.setTimeout(60).runAndClose(); if (ret.getReturnCode() != 0) { + logger.warn(String.format("exec ssh command failed, return code: %d, stdout: %s, stderr: %s", + ret.getReturnCode(), ret.getStdout(), ret.getStderr())); return true; } diff --git a/plugin/ldap/pom.xml b/plugin/ldap/pom.xml index 16f379e36f..d65a8fdced 100755 --- a/plugin/ldap/pom.xml +++ b/plugin/ldap/pom.xml @@ -77,7 +77,7 @@ org.springframework.security spring-security-ldap - 5.7.11 + 5.7.13 org.zstack diff --git a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageDefaultAllocateCapacityFlow.java b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageDefaultAllocateCapacityFlow.java index 0cccdb9460..7a2378e38a 100644 --- a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageDefaultAllocateCapacityFlow.java +++ b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageDefaultAllocateCapacityFlow.java @@ -11,9 +11,6 @@ import org.zstack.core.db.DatabaseFacade; import org.zstack.core.db.Q; import org.zstack.core.db.SQL; -import org.zstack.core.db.SimpleQuery; -import org.zstack.core.db.SimpleQuery.Op; -import org.zstack.header.configuration.DiskOfferingInventory; import org.zstack.header.core.Completion; import org.zstack.header.core.workflow.Flow; import org.zstack.header.core.workflow.FlowRollback; @@ -26,6 +23,7 @@ import org.zstack.header.storage.backup.BackupStorageVO; import org.zstack.header.storage.backup.BackupStorageVO_; import org.zstack.header.storage.primary.*; +import org.zstack.header.vm.DiskAO; import org.zstack.header.vm.VmInstanceConstant; import org.zstack.header.vm.VmInstanceConstant.VmOperation; import org.zstack.header.vm.VmInstanceSpec; @@ -40,6 +38,7 @@ import static org.zstack.core.Platform.argerr; import static org.zstack.core.Platform.operr; +import static org.zstack.utils.CollectionUtils.isEmpty; import static org.zstack.utils.CollectionUtils.transformAndRemoveNull; /** @@ -125,57 +124,26 @@ private String getRequiredStorageUuid(String hostUuid, String psUuid){ public void run(final FlowTrigger trigger, Map data) { final VmInstanceSpec spec = (VmInstanceSpec) data.get(VmInstanceConstant.Params.VmInstanceSpec.toString()); - String localStorageUuid = getRequiredStorageUuid(spec.getDestHost().getUuid(), spec.getRequiredPrimaryStorageUuidForRootVolume()); - - - List primaryStorageTypes = null; - if (spec.getImageSpec().isNeedDownload() || spec.getImageSpec().getSelectedBackupStorage() != null) { - SimpleQuery q = dbf.createQuery(BackupStorageVO.class); - q.select(BackupStorageVO_.type); - q.add(BackupStorageVO_.uuid, Op.EQ, spec.getImageSpec().getSelectedBackupStorage().getBackupStorageUuid()); - String bsType = q.findValue(); - primaryStorageTypes = hostAllocatorMgr.getBackupStoragePrimaryStorageMetrics().get(bsType); - DebugUtils.Assert(primaryStorageTypes != null, "why primaryStorageTypes is null"); + String rootPs = spec.getRootDisk().getPrimaryStorageUuid(); + List rootPsCandidates = spec.getCandidatePrimaryStorageUuidsForRootVolume(); + if (rootPs == null && !isEmpty(rootPsCandidates) && rootPsCandidates.size() == 1) { + rootPs = rootPsCandidates.get(0); + spec.getRootDisk().setPrimaryStorageUuid(rootPs); } - List msgs = new ArrayList<>(); + String localStorageUuid = getRequiredStorageUuid(spec.getDestHost().getUuid(), rootPs); - AllocatePrimaryStorageSpaceMsg rmsg = new AllocatePrimaryStorageSpaceMsg(); - rmsg.setAllocationStrategy(LocalStorageConstants.LOCAL_STORAGE_ALLOCATOR_STRATEGY); - rmsg.setVmInstanceUuid(spec.getVmInventory().getUuid()); - if (spec.getImageSpec() != null) { - if (spec.getImageSpec().getInventory() != null) { - rmsg.setImageUuid(spec.getImageSpec().getInventory().getUuid()); - } - Optional.ofNullable(spec.getImageSpec().getSelectedBackupStorage()) - .ifPresent(it -> rmsg.setBackupStorageUuid(it.getBackupStorageUuid())); - } - rmsg.setRequiredPrimaryStorageUuid(localStorageUuid); - rmsg.setRequiredHostUuid(spec.getDestHost().getUuid()); - rmsg.setSize(spec.getRootDiskAllocateSize()); - rmsg.setSystemTags(spec.getRootVolumeSystemTags()); - if (spec.getRootDiskOffering() != null) { - rmsg.setDiskOfferingUuid(spec.getRootDiskOffering().getUuid()); - } - - if (spec.getCurrentVmOperation() == VmOperation.NewCreate) { - rmsg.setPurpose(PrimaryStorageAllocationPurpose.CreateNewVm.toString()); - } else if (spec.getCurrentVmOperation() == VmOperation.AttachVolume) { - rmsg.setPurpose(PrimaryStorageAllocationPurpose.CreateDataVolume.toString()); - } - - bus.makeLocalServiceId(rmsg, PrimaryStorageConstant.SERVICE_ID); - - rmsg.setPossiblePrimaryStorageTypes(primaryStorageTypes); + List msgs = new ArrayList<>(); + AllocatePrimaryStorageSpaceMsg rmsg = buildMessageForRootVolume(spec, localStorageUuid); msgs.add(rmsg); - if (!spec.getDataDiskOfferings().isEmpty()) { + if (!spec.getDeprecatedDisksSpecs().isEmpty()) { boolean hasOtherNonLocalStoragePrimaryStorage = isThereOtherNonLocalStoragePrimaryStorageForTheHost( spec.getDestHost().getUuid(), localStorageUuid); - for (DiskOfferingInventory dinv : spec.getDataDiskOfferings()) { + for (DiskAO dinv : spec.getDeprecatedDisksSpecs()) { AllocatePrimaryStorageSpaceMsg amsg = new AllocatePrimaryStorageSpaceMsg(); - amsg.setSize(dinv.getDiskSize()); + amsg.setSize(dinv.getSize()); amsg.setRequiredHostUuid(spec.getDestHost().getUuid()); if(spec.getRequiredPrimaryStorageUuidForDataVolume() != null && hasOtherNonLocalStoragePrimaryStorage){ @@ -193,7 +161,7 @@ public void run(final FlowTrigger trigger, Map data) { } else if (spec.getRequiredPrimaryStorageUuidForDataVolume() != null && !hasOtherNonLocalStoragePrimaryStorage){ amsg.setRequiredPrimaryStorageUuid(spec.getRequiredPrimaryStorageUuidForDataVolume()); } else if (hasOtherNonLocalStoragePrimaryStorage) { - amsg.setAllocationStrategy(dinv.getAllocatorStrategy()); + amsg.setAllocationStrategy(PrimaryStorageConstant.DEFAULT_PRIMARY_STORAGE_ALLOCATION_STRATEGY_TYPE); List localStorageUuids = getLocalStorageInCluster(spec.getDestHost().getClusterUuid()); for (String lsuuid : localStorageUuids) { @@ -208,7 +176,7 @@ public void run(final FlowTrigger trigger, Map data) { } amsg.setPurpose(PrimaryStorageAllocationPurpose.CreateDataVolume.toString()); - amsg.setDiskOfferingUuid(dinv.getUuid()); + amsg.setDiskOfferingUuid(dinv.getDiskOfferingUuid()); if (spec.getImageSpec().getInventory() != null) { rmsg.setImageUuid(spec.getImageSpec().getInventory().getUuid()); @@ -269,6 +237,54 @@ protected void error(ErrorCode errorCode) { }.start(); } + private AllocatePrimaryStorageSpaceMsg buildMessageForRootVolume(final VmInstanceSpec spec, String localStorageUuid) { + List primaryStorageTypes = null; + if (spec.getImageSpec().isNeedDownload() || spec.getImageSpec().getSelectedBackupStorage() != null) { + String bsType = Q.New(BackupStorageVO.class) + .select(BackupStorageVO_.type) + .eq(BackupStorageVO_.uuid, spec.getImageSpec().getSelectedBackupStorage().getBackupStorageUuid()) + .findValue(); + primaryStorageTypes = hostAllocatorMgr.getBackupStoragePrimaryStorageMetrics().get(bsType); + DebugUtils.Assert(primaryStorageTypes != null, "why primaryStorageTypes is null"); + } + + AllocatePrimaryStorageSpaceMsg rmsg = new AllocatePrimaryStorageSpaceMsg(); + rmsg.setAllocationStrategy(LocalStorageConstants.LOCAL_STORAGE_ALLOCATOR_STRATEGY); + rmsg.setVmInstanceUuid(spec.getVmInventory().getUuid()); + if (spec.getImageSpec() != null) { + if (spec.getImageSpec().getInventory() != null) { + rmsg.setImageUuid(spec.getImageSpec().getInventory().getUuid()); + } + Optional.ofNullable(spec.getImageSpec().getSelectedBackupStorage()) + .ifPresent(it -> rmsg.setBackupStorageUuid(it.getBackupStorageUuid())); + } + rmsg.setRequiredPrimaryStorageUuid(localStorageUuid); + rmsg.setPossiblePrimaryStorageTypes(primaryStorageTypes); + rmsg.setRequiredHostUuid(spec.getDestHost().getUuid()); + rmsg.setSize(spec.getRootDiskAllocateSize()); + if (spec.getRootDiskOffering() != null) { + rmsg.setDiskOfferingUuid(spec.getRootDiskOffering().getUuid()); + } + + if (spec.getCurrentVmOperation() == VmOperation.NewCreate) { + rmsg.setPurpose(PrimaryStorageAllocationPurpose.CreateNewVm.toString()); + } else if (spec.getCurrentVmOperation() == VmOperation.AttachVolume) { + rmsg.setPurpose(PrimaryStorageAllocationPurpose.CreateDataVolume.toString()); + } + + List tags = new ArrayList<>(); + if (!isEmpty(spec.getRootVolumeSystemTags())) { + tags.addAll(spec.getRootVolumeSystemTags()); + } + if (!isEmpty(spec.getRootDisk().getSystemTags())) { + tags.addAll(spec.getRootDisk().getSystemTags()); + } + rmsg.setSystemTags(tags); + + bus.makeLocalServiceId(rmsg, PrimaryStorageConstant.SERVICE_ID); + return rmsg; + } + private List getLocalStorageInCluster(String clusterUuid) { return SQL.New("select pri.uuid" + " from PrimaryStorageVO pri, PrimaryStorageClusterRefVO ref" + diff --git a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageDesignatedAllocateCapacityFlow.java b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageDesignatedAllocateCapacityFlow.java index 12344bfadf..3e644d6591 100644 --- a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageDesignatedAllocateCapacityFlow.java +++ b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageDesignatedAllocateCapacityFlow.java @@ -9,8 +9,6 @@ import org.zstack.core.cloudbus.CloudBusCallBack; import org.zstack.core.db.DatabaseFacade; import org.zstack.core.db.Q; -import org.zstack.core.db.SimpleQuery; -import org.zstack.header.configuration.DiskOfferingInventory; import org.zstack.header.core.Completion; import org.zstack.header.core.workflow.Flow; import org.zstack.header.core.workflow.FlowRollback; @@ -20,6 +18,7 @@ import org.zstack.header.storage.backup.BackupStorageVO; import org.zstack.header.storage.backup.BackupStorageVO_; import org.zstack.header.storage.primary.*; +import org.zstack.header.vm.DiskAO; import org.zstack.header.vm.VmInstanceConstant; import org.zstack.header.vm.VmInstanceConstant.VmOperation; import org.zstack.header.vm.VmInstanceSpec; @@ -35,6 +34,7 @@ import java.util.Map; import static org.zstack.core.Platform.operr; +import static org.zstack.utils.CollectionUtils.isEmpty; import static org.zstack.utils.CollectionUtils.transformAndRemoveNull; /** @@ -119,13 +119,19 @@ protected void error(ErrorCode errorCode) { } private ErrorCode checkIfSpecifyPrimaryStorage(VmInstanceSpec spec) { - if (spec.getRequiredPrimaryStorageUuidForRootVolume() == null) { - ErrorCode errorCode = operr("The cluster[uuid=%s] mounts multiple primary storage[LocalStorage, other non-LocalStorage primary storage], You must specify the primary storage where the root disk is located", - spec.getDestHost().getClusterUuid()); - return errorCode; + String rootPs = spec.getRootDisk().getPrimaryStorageUuid(); + List rootPsCandidates = spec.getCandidatePrimaryStorageUuidsForRootVolume(); + if (rootPs == null) { + if (!isEmpty(rootPsCandidates) && rootPsCandidates.size() == 1) { + rootPs = rootPsCandidates.get(0); + spec.getRootDisk().setPrimaryStorageUuid(rootPs); + } else { + return operr("The cluster[uuid=%s] mounts multiple primary storage[LocalStorage, other non-LocalStorage primary storage], You must specify the primary storage where the root disk is located", + spec.getDestHost().getClusterUuid()); + } } - if(spec.getDataDiskOfferings() != null && !spec.getDataDiskOfferings().isEmpty() && spec.getRequiredPrimaryStorageUuidForDataVolume() == null){ + if(!isEmpty(spec.getDeprecatedDisksSpecs()) && spec.getRequiredPrimaryStorageUuidForDataVolume() == null){ ErrorCode errorCode = operr("The cluster[uuid=%s] mounts multiple primary storage[LocalStorage, other non-LocalStorage primary storage], You must specify the primary storage where the data disk is located", spec.getDestHost().getClusterUuid()); return errorCode; @@ -136,11 +142,12 @@ private ErrorCode checkIfSpecifyPrimaryStorage(VmInstanceSpec spec) { private AllocatePrimaryStorageSpaceMsg getRootVolumeAllocationMsg(VmInstanceSpec spec){ List primaryStorageTypes = null; - if (spec.getImageSpec().isNeedDownload() || spec.getImageSpec().getSelectedBackupStorage() != null) { - SimpleQuery q = dbf.createQuery(BackupStorageVO.class); - q.select(BackupStorageVO_.type); - q.add(BackupStorageVO_.uuid, SimpleQuery.Op.EQ, spec.getImageSpec().getSelectedBackupStorage().getBackupStorageUuid()); - String bsType = q.findValue(); + if (spec.getImageSpec() != null && spec.getImageSpec().isNeedDownload() + || spec.getImageSpec().getSelectedBackupStorage() != null) { + String bsType = Q.New(BackupStorageVO.class) + .select(BackupStorageVO_.type) + .eq(BackupStorageVO_.uuid, spec.getImageSpec().getSelectedBackupStorage().getBackupStorageUuid()) + .findValue(); primaryStorageTypes = hostAllocatorMgr.getBackupStoragePrimaryStorageMetrics().get(bsType); DebugUtils.Assert(primaryStorageTypes != null, "why primaryStorageTypes is null"); } @@ -150,10 +157,15 @@ private AllocatePrimaryStorageSpaceMsg getRootVolumeAllocationMsg(VmInstanceSpec if (spec.getImageSpec() != null && spec.getImageSpec().getInventory() != null) { rmsg.setImageUuid(spec.getImageSpec().getInventory().getUuid()); } - rmsg.setRequiredPrimaryStorageUuid(spec.getRequiredPrimaryStorageUuidForRootVolume()); + + if (spec.getRootDisk().getPrimaryStorageUuid() != null) { + rmsg.setRequiredPrimaryStorageUuid(spec.getRootDisk().getPrimaryStorageUuid()); + } else { + rmsg.setCandidatePrimaryStorageUuids(spec.getCandidatePrimaryStorageUuidsForRootVolume()); + } + rmsg.setRequiredHostUuid(spec.getDestHost().getUuid()); rmsg.setSize(spec.getRootDiskAllocateSize()); - rmsg.setSystemTags(spec.getRootVolumeSystemTags()); if (spec.getRootDiskOffering() != null) { rmsg.setDiskOfferingUuid(spec.getRootDiskOffering().getUuid()); } @@ -164,30 +176,40 @@ private AllocatePrimaryStorageSpaceMsg getRootVolumeAllocationMsg(VmInstanceSpec rmsg.setPurpose(PrimaryStorageAllocationPurpose.CreateDataVolume.toString()); } - String requiredPrimaryStorageType = Q.New(PrimaryStorageVO.class) - .select(PrimaryStorageVO_.type) - .eq(PrimaryStorageVO_.uuid, spec.getRequiredPrimaryStorageUuidForRootVolume()) - .findValue(); - if(LocalStorageConstants.LOCAL_STORAGE_TYPE.equals(requiredPrimaryStorageType)){ - rmsg.setAllocationStrategy(LocalStorageConstants.LOCAL_STORAGE_ALLOCATOR_STRATEGY); + rmsg.setPossiblePrimaryStorageTypes(primaryStorageTypes); + if (spec.getRootDisk().getPrimaryStorageUuid() != null) { + String requiredPrimaryStorageType = Q.New(PrimaryStorageVO.class) + .select(PrimaryStorageVO_.type) + .eq(PrimaryStorageVO_.uuid, spec.getRootDisk().getPrimaryStorageUuid()) + .findValue(); + if (LocalStorageConstants.LOCAL_STORAGE_TYPE.equals(requiredPrimaryStorageType)){ + rmsg.setAllocationStrategy(LocalStorageConstants.LOCAL_STORAGE_ALLOCATOR_STRATEGY); + } } - bus.makeLocalServiceId(rmsg, PrimaryStorageConstant.SERVICE_ID); + List tags = new ArrayList<>(); + if (!isEmpty(spec.getRootVolumeSystemTags())) { + tags.addAll(spec.getRootVolumeSystemTags()); + } + if (!isEmpty(spec.getRootDisk().getSystemTags())) { + tags.addAll(spec.getRootDisk().getSystemTags()); + } + rmsg.setSystemTags(tags); - rmsg.setPossiblePrimaryStorageTypes(primaryStorageTypes); + bus.makeLocalServiceId(rmsg, PrimaryStorageConstant.SERVICE_ID); return rmsg; } private List getDataVolumeAllocationMsgs(VmInstanceSpec spec){ List msgs = new ArrayList<>(); - if (spec.getDataDiskOfferings() == null || spec.getDataDiskOfferings().isEmpty()) { + if (isEmpty(spec.getDeprecatedDisksSpecs())) { return msgs; } - for (DiskOfferingInventory dinv : spec.getDataDiskOfferings()) { + for (DiskAO dinv : spec.getDeprecatedDisksSpecs()) { AllocatePrimaryStorageSpaceMsg amsg = new AllocatePrimaryStorageSpaceMsg(); - amsg.setSize(dinv.getDiskSize()); + amsg.setSize(dinv.getSize()); amsg.setRequiredHostUuid(spec.getDestHost().getUuid()); amsg.setRequiredPrimaryStorageUuid(spec.getRequiredPrimaryStorageUuidForDataVolume()); amsg.setSystemTags(spec.getDataVolumeSystemTags()); @@ -201,7 +223,7 @@ private List getDataVolumeAllocationMsgs(VmInst } amsg.setPurpose(PrimaryStorageAllocationPurpose.CreateDataVolume.toString()); - amsg.setDiskOfferingUuid(dinv.getUuid()); + amsg.setDiskOfferingUuid(dinv.getDiskOfferingUuid()); if (spec.getImageSpec() != null && spec.getImageSpec().getInventory() != null) { amsg.setImageUuid(spec.getImageSpec().getInventory().getUuid()); } diff --git a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageFactory.java b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageFactory.java index e745d94c99..d755bc71aa 100755 --- a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageFactory.java +++ b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageFactory.java @@ -51,7 +51,6 @@ import org.zstack.storage.snapshot.PostMarkRootVolumeAsSnapshotExtension; import org.zstack.storage.snapshot.reference.VolumeSnapshotReferenceUtils; import org.zstack.tag.SystemTagCreator; -import org.zstack.utils.CollectionUtils; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; @@ -65,6 +64,7 @@ import static org.zstack.core.Platform.err; import static org.zstack.core.Platform.operr; import static org.zstack.utils.CollectionDSL.*; +import static org.zstack.utils.CollectionUtils.isEmpty; import static org.zstack.utils.CollectionUtils.transformAndRemoveNull; /** @@ -419,15 +419,21 @@ public void run(FlowTrigger trigger, Map data) { if (VmAllocatePrimaryStorageFlow.class.getName().equals(nextFlowName)) { if (spec.getCurrentVmOperation() == VmOperation.NewCreate) { List localStorageUuids = getAvailableLocalStorageInCluster(spec.getDestHost().getClusterUuid()); - if (CollectionUtils.isEmpty(localStorageUuids)) { + if (isEmpty(localStorageUuids)) { return null; } - boolean requireNoneLocalStorage = spec.getRequiredPrimaryStorageUuidForRootVolume() != null && Q.New(PrimaryStorageVO.class) - .eq(PrimaryStorageVO_.uuid, spec.getRequiredPrimaryStorageUuidForRootVolume()) + String rootPs = spec.getRootDisk().getPrimaryStorageUuid(); + List rootPsCandidates = spec.getCandidatePrimaryStorageUuidsForRootVolume(); + if (rootPs == null && !isEmpty(rootPsCandidates) && rootPsCandidates.size() == 1) { + rootPs = rootPsCandidates.get(0); + } + + boolean requireNoneLocalStorage = rootPs != null && Q.New(PrimaryStorageVO.class) + .eq(PrimaryStorageVO_.uuid, rootPs) .notEq(PrimaryStorageVO_.type, LocalStorageConstants.LOCAL_STORAGE_TYPE) .isExists(); - requireNoneLocalStorage = requireNoneLocalStorage && (spec.getDataDiskOfferings().isEmpty() || + requireNoneLocalStorage = requireNoneLocalStorage && (isEmpty(spec.getDeprecatedDisksSpecs()) || spec.getRequiredPrimaryStorageUuidForDataVolume() != null && Q.New(PrimaryStorageVO.class) .eq(PrimaryStorageVO_.uuid, spec.getRequiredPrimaryStorageUuidForDataVolume()) .notEq(PrimaryStorageVO_.type, LocalStorageConstants.LOCAL_STORAGE_TYPE) @@ -445,8 +451,7 @@ public void run(FlowTrigger trigger, Map data) { .param("ptype", LocalStorageConstants.LOCAL_STORAGE_TYPE) .list().isEmpty(); - if (!isOnlyLocalStorage && (spec.getRequiredPrimaryStorageUuidForRootVolume() != null || - spec.getRequiredPrimaryStorageUuidForDataVolume() != null)) { + if (!isOnlyLocalStorage && (rootPs != null || spec.getRequiredPrimaryStorageUuidForDataVolume() != null)) { return new LocalStorageDesignatedAllocateCapacityFlow(); } else { return new LocalStorageDefaultAllocateCapacityFlow(); diff --git a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmBackend.java b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmBackend.java index 471a4362fd..b18452a32c 100755 --- a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmBackend.java +++ b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmBackend.java @@ -69,6 +69,7 @@ import java.util.stream.Collectors; import static org.zstack.core.Platform.inerr; +import static org.zstack.core.Platform.multiErr; import static org.zstack.core.Platform.operr; import static org.zstack.core.progress.ProgressReportService.*; import static org.zstack.utils.CollectionDSL.list; @@ -1357,6 +1358,7 @@ private void doDownload(final SyncTaskChain chain) { String psUuid; long actualSize = image.getActualSize(); String allocatedInstallUrl; + ImageCacheVO vo; @Override public void setup() { @@ -1457,10 +1459,11 @@ public void fail(ErrorCode errorCode) { } }); - done(new FlowDoneHandler(completion, chain) { + flow(new NoRollbackFlow() { + String __name__ = "save-db"; @Override - public void handle(Map data) { - ImageCacheVO vo = new ImageCacheVO(); + public void run(FlowTrigger trigger, Map data) { + vo = new ImageCacheVO(); vo.setState(ImageCacheState.ready); vo.setMediaType(ImageMediaType.valueOf(image.getMediaType())); vo.setImageUuid(image.getUuid()); @@ -1474,15 +1477,54 @@ public void handle(Map data) { vo.setInstallUrl(path.makeFullPath()); dbf.persist(vo); - logger.debug(String.format("downloaded image[uuid:%s, name:%s] to the image cache of local primary storage[uuid: %s, installPath: %s] on host[uuid: %s]", + trigger.next(); + } + }); + + flow(new NoRollbackFlow() { + String __name__ = "invoke-after-create-image-cache-extensions"; + @Override + public void run(FlowTrigger trigger, Map data) { + logger.debug(String.format( + "downloaded image[uuid:%s, name:%s] to the image cache of local primary storage[uuid: %s, installPath: %s] on host[uuid: %s]", image.getUuid(), image.getName(), self.getUuid(), primaryStorageInstallPath, hostUuid)); ImageCacheInventory inv = ImageCacheInventory.valueOf(vo); inv.setInstallUrl(primaryStorageInstallPath); - pluginRgty.getExtensionList(AfterCreateImageCacheExtensionPoint.class) - .forEach(exp -> exp.saveEncryptAfterCreateImageCache(hostUuid, inv)); + new While<>(pluginRgty.getExtensionList(AfterCreateImageCacheExtensionPoint.class)).each((ext, whileCompletion) -> { + ext.saveEncryptAfterCreateImageCache(hostUuid, inv, new Completion(whileCompletion) { + @Override + public void success() { + whileCompletion.done(); + } + @Override + public void fail(ErrorCode errorCode) { + whileCompletion.addError(errorCode); + whileCompletion.done(); + } + }); + }).run(new WhileDoneCompletion(trigger) { + @Override + public void done(ErrorCodeList errorCodeList) { + if (!errorCodeList.getCauses().isEmpty()) { + String details = multiErr(errorCodeList.getCauses()).getReadableDetails(); + logger.warn(String.format( + "failed to invoke after create image cache extensions (but still continue): %s", + details)); + } + trigger.next(); + } + }); + } + }); + + done(new FlowDoneHandler(completion, chain) { + @Override + public void handle(Map data) { + ImageCacheInventory inv = ImageCacheInventory.valueOf(vo); + inv.setInstallUrl(primaryStorageInstallPath); completion.success(inv); chain.next(); } diff --git a/plugin/nfsPrimaryStorage/src/main/java/org/zstack/storage/primary/nfs/NfsDownloadImageToCacheJob.java b/plugin/nfsPrimaryStorage/src/main/java/org/zstack/storage/primary/nfs/NfsDownloadImageToCacheJob.java index 06938c2b24..ad9a9c275d 100755 --- a/plugin/nfsPrimaryStorage/src/main/java/org/zstack/storage/primary/nfs/NfsDownloadImageToCacheJob.java +++ b/plugin/nfsPrimaryStorage/src/main/java/org/zstack/storage/primary/nfs/NfsDownloadImageToCacheJob.java @@ -3,6 +3,7 @@ import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; +import org.zstack.core.asyncbatch.While; import org.zstack.core.cloudbus.CloudBus; import org.zstack.core.cloudbus.CloudBusCallBack; import org.zstack.core.componentloader.PluginRegistry; @@ -10,13 +11,14 @@ import org.zstack.core.db.SimpleQuery; import org.zstack.core.job.Job; import org.zstack.core.job.JobContext; -import org.zstack.core.thread.SyncTaskChain; import org.zstack.core.workflow.FlowChainBuilder; import org.zstack.core.workflow.ShareFlow; import org.zstack.header.core.Completion; import org.zstack.header.core.ReturnValueCompletion; +import org.zstack.header.core.WhileDoneCompletion; import org.zstack.header.core.workflow.*; import org.zstack.header.errorcode.ErrorCode; +import org.zstack.header.errorcode.ErrorCodeList; import org.zstack.header.image.ImageConstant.ImageMediaType; import org.zstack.header.message.MessageReply; import org.zstack.header.storage.backup.BackupStorageInventory; @@ -24,7 +26,6 @@ import org.zstack.header.storage.backup.BackupStorageVO; import org.zstack.header.storage.primary.*; import org.zstack.header.vm.VmInstanceSpec.ImageSpec; -import org.zstack.header.volume.VolumeInventory; import org.zstack.storage.primary.ImageCacheUtil; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; @@ -32,6 +33,8 @@ import java.util.List; import java.util.Map; +import static org.zstack.core.Platform.multiErr; + /** */ @Configurable(preConstruction = true, autowire = Autowire.BY_TYPE) @@ -97,9 +100,11 @@ private void download(final ReturnValueCompletion completion) { chain.then(new ShareFlow() { String cacheInstallPath = NfsPrimaryStorageKvmHelper.makeCachedImageInstallUrl(primaryStorage, image.getInventory()); long actualSize = image.getInventory().getActualSize(); + ImageCacheVO cvo = new ImageCacheVO(); @Override public void setup() { + flow(new Flow() { String __name__ = "allocate-primary-storage"; @@ -195,10 +200,11 @@ public void fail(ErrorCode errorCode) { } }); - done(new FlowDoneHandler(completion) { + flow(new NoRollbackFlow() { + String __name__ = "save-db"; + @Override - public void handle(Map data) { - ImageCacheVO cvo = new ImageCacheVO(); + public void run(FlowTrigger trigger, Map data) { cvo.setImageUuid(image.getInventory().getUuid()); cvo.setInstallUrl(cacheInstallPath); cvo.setMd5sum("no md5"); @@ -208,10 +214,48 @@ public void handle(Map data) { cvo = dbf.persistAndRefresh(cvo); logger.debug(String.format("successfully downloaded image[uuid:%s] in image cache[id:%s, path:%s]", image.getInventory().getUuid(), cvo.getId(), cvo.getInstallUrl())); + trigger.next(); + } + }); + + flow(new NoRollbackFlow() { + String __name__ = "invoke-after-create-image-cache-extensions"; + + @Override + public void run(FlowTrigger trigger, Map data) { + ImageCacheInventory inventory = ImageCacheInventory.valueOf(cvo); + + new While<>(pluginRgty.getExtensionList(AfterCreateImageCacheExtensionPoint.class)).each((ext, whileCompletion) -> { + ext.saveEncryptAfterCreateImageCache(null, inventory, new Completion(whileCompletion) { + @Override + public void success() { + whileCompletion.done(); + } - ImageCacheVO finalCvo = cvo; - pluginRgty.getExtensionList(AfterCreateImageCacheExtensionPoint.class) - .forEach(exp -> exp.saveEncryptAfterCreateImageCache(null, ImageCacheInventory.valueOf(finalCvo))); + @Override + public void fail(ErrorCode errorCode) { + whileCompletion.addError(errorCode); + whileCompletion.done(); + } + }); + }).run(new WhileDoneCompletion(trigger) { + @Override + public void done(ErrorCodeList errorCodeList) { + if (!errorCodeList.getCauses().isEmpty()) { + String details = multiErr(errorCodeList.getCauses()).getReadableDetails(); + logger.warn(String.format( + "failed to invoke after create image cache extensions (but still continue): %s", + details)); + } + trigger.next(); + } + }); + } + }); + + done(new FlowDoneHandler(completion) { + @Override + public void handle(Map data) { completion.success(ImageCacheInventory.valueOf(cvo)); } }); diff --git a/plugin/sharedMountPointPrimaryStorage/src/main/java/org/zstack/storage/primary/smp/KvmBackend.java b/plugin/sharedMountPointPrimaryStorage/src/main/java/org/zstack/storage/primary/smp/KvmBackend.java index 2bbd5717a6..36a54608cd 100755 --- a/plugin/sharedMountPointPrimaryStorage/src/main/java/org/zstack/storage/primary/smp/KvmBackend.java +++ b/plugin/sharedMountPointPrimaryStorage/src/main/java/org/zstack/storage/primary/smp/KvmBackend.java @@ -61,6 +61,7 @@ import java.util.*; import static org.zstack.core.Platform.argerr; +import static org.zstack.core.Platform.multiErr; import static org.zstack.core.Platform.operr; import static org.zstack.core.progress.ProgressReportService.*; @@ -688,6 +689,7 @@ private void doDownload(final SyncTaskChain chain) { image.getUuid(), self.getUuid())); fchain.then(new ShareFlow() { long actualSize = image.getActualSize(); + ImageCacheVO vo = new ImageCacheVO(); @Override public void setup() { @@ -779,10 +781,11 @@ public void fail(ErrorCode errorCode) { } }); - done(new FlowDoneHandler(completion, chain) { + flow(new NoRollbackFlow() { + String __name__ = "save-db"; + @Override - public void handle(Map data) { - ImageCacheVO vo = new ImageCacheVO(); + public void run(FlowTrigger trigger, Map data) { vo.setState(ImageCacheState.ready); vo.setMediaType(ImageMediaType.valueOf(image.getMediaType())); vo.setImageUuid(image.getUuid()); @@ -791,13 +794,48 @@ public void handle(Map data) { vo.setMd5sum("not calculated"); vo.setInstallUrl(primaryStorageInstallPath); dbf.persist(vo); - logger.debug(String.format("downloaded image[uuid:%s, name:%s] to the image cache of local shared mount point storage[uuid: %s, installPath: %s]", image.getUuid(), image.getName(), self.getUuid(), primaryStorageInstallPath)); + trigger.next(); + } + }); + + flow(new NoRollbackFlow() { + String __name__ = "invoke-after-create-image-cache-extensions"; + @Override + public void run(FlowTrigger trigger, Map data) { + ImageCacheInventory inventory = ImageCacheInventory.valueOf(vo); + new While<>(pluginRgty.getExtensionList(AfterCreateImageCacheExtensionPoint.class)).each((ext, whileCompletion) -> { + ext.saveEncryptAfterCreateImageCache(null, inventory, new Completion(whileCompletion) { + @Override + public void success() { + whileCompletion.done(); + } - pluginRgty.getExtensionList(AfterCreateImageCacheExtensionPoint.class) - .forEach(exp -> exp.saveEncryptAfterCreateImageCache(null, ImageCacheInventory.valueOf(vo))); + @Override + public void fail(ErrorCode errorCode) { + whileCompletion.addError(errorCode); + whileCompletion.done(); + } + }); + }).run(new WhileDoneCompletion(trigger) { + @Override + public void done(ErrorCodeList errorCodeList) { + if (!errorCodeList.getCauses().isEmpty()) { + String details = multiErr(errorCodeList.getCauses()).getReadableDetails(); + logger.warn(String.format( + "failed to invoke after create image cache extensions (but still continue): %s", + details)); + } + trigger.next(); + } + }); + } + }); + done(new FlowDoneHandler(completion, chain) { + @Override + public void handle(Map data) { completion.success(ImageCacheInventory.valueOf(vo)); chain.next(); } diff --git a/plugin/vip/src/main/java/org/zstack/network/service/vip/VipSystemTags.java b/plugin/vip/src/main/java/org/zstack/network/service/vip/VipSystemTags.java index e7968c8c8b..31e79f5dc2 100755 --- a/plugin/vip/src/main/java/org/zstack/network/service/vip/VipSystemTags.java +++ b/plugin/vip/src/main/java/org/zstack/network/service/vip/VipSystemTags.java @@ -1,12 +1,12 @@ package org.zstack.network.service.vip; import org.zstack.header.tag.TagDefinition; -import org.zstack.tag.EphemeralSystemTag; +import org.zstack.tag.SystemTag; /** * Created by xing5 on 2016/11/19. */ @TagDefinition public class VipSystemTags { - public static EphemeralSystemTag DELETE_ON_FAILURE = new EphemeralSystemTag("deleteVipOnFailure"); + public static SystemTag DELETE_ON_FAILURE = SystemTag.makeEphemeralTag("deleteVipOnFailure"); } diff --git a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsConstants.java b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsConstants.java index 3e04e2bd92..8f547cfeb2 100644 --- a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsConstants.java +++ b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsConstants.java @@ -12,8 +12,12 @@ public interface ZbsConstants { String ZBS_PS_IPTABLES_COMMENTS = "Zbsp.allow.port"; String ZBS_PS_ALLOW_PORTS = "7763"; String ZBS_HEARTBEAT_VOLUME_NAME = "zbs_zstack_heartbeat"; + long ZBS_HEARTBEAT_VOLUME_SIZE_IN_GIGABYTE = 1; String ZBS_CBD_LUN_PATH_FORMAT = "cbd:%s/%s/%s"; String ZBS_CBD_PREFIX_SCHEME = "cbd://"; Integer PRIMARY_STORAGE_MDS_MAXIMUM_PING_FAILURE = 3; String VOLUME_PHYSICAL_BLOCK_SIZE = "4096"; + String MEGABYTE_SUPPORTED_VERSION = "1.6.1"; + String MEGABYTE_UNIT = "M"; + String DEFAULT_GIGABYTE_UNIT = null; } diff --git a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsGlobalProperty.java b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsGlobalProperty.java index fbf4b3928e..d260b53113 100644 --- a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsGlobalProperty.java +++ b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsGlobalProperty.java @@ -15,7 +15,7 @@ public class ZbsGlobalProperty { public static String PRIMARY_STORAGE_MODULE_PATH; @GlobalProperty(name = "Zbs.primaryStorage.ansiblePlaybook", defaultValue = "zbsp.py") public static String PRIMARY_STORAGE_PLAYBOOK_NAME; - @GlobalProperty(name = "Zbs.primaryStorage.agentPackageName", defaultValue = "zbsprimarystorage-5.0.0.tar.gz") + @GlobalProperty(name = "Zbs.primaryStorage.agentPackageName", defaultValue = "zbsprimarystorage-4.10.0.tar.gz") public static String PRIMARY_STORAGE_PACKAGE_NAME; @GlobalProperty(name = "Zbs.primaryStorageAgent.port", defaultValue = "7763") public static int PRIMARY_STORAGE_AGENT_PORT; diff --git a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsHelper.java b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsHelper.java index 6dd1b0251a..7af981c519 100644 --- a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsHelper.java +++ b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsHelper.java @@ -4,6 +4,8 @@ import org.zstack.core.db.SQL; import org.zstack.header.storage.primary.PrimaryStorageVO; import org.zstack.header.storage.primary.PrimaryStorageVO_; +import org.zstack.utils.VersionComparator; +import org.zstack.utils.data.SizeUnit; /** * @author Xingwei Yu @@ -17,6 +19,10 @@ public static void configUrl(String psUuid) { } } + public static String buildHeartbeatVolumePath(String logicalPool) { + return String.format("cbd:%s_physical/%s/%s", logicalPool, logicalPool, ZbsConstants.ZBS_HEARTBEAT_VOLUME_NAME); + } + public static String buildVolumePath(String physicalPool, String logicalPool, String volId) { String base = volId.replace("-", ""); return String.format(ZbsConstants.ZBS_CBD_LUN_PATH_FORMAT, physicalPool, logicalPool, base); @@ -25,4 +31,16 @@ public static String buildVolumePath(String physicalPool, String logicalPool, St public static String getVolumeFromSnapshotPath(String path) { return path.split("@")[0]; } + + public static String getSizeUnit(String version) { + return new VersionComparator(version.split("-")[0]).compare(ZbsConstants.MEGABYTE_SUPPORTED_VERSION) >= 0 ? ZbsConstants.MEGABYTE_UNIT : ZbsConstants.DEFAULT_GIGABYTE_UNIT; + } + + public static long alignSizeTo(long size, String unit) { + return ZbsConstants.MEGABYTE_UNIT.equals(unit) ? (long) Math.ceil(SizeUnit.BYTE.toMegaByte((double) size)) : (long) Math.ceil(SizeUnit.BYTE.toGigaByte((double) size)); + } + + public static long convertSizeToByte(long size, String unit) { + return ZbsConstants.MEGABYTE_UNIT.equals(unit) ? SizeUnit.MEGABYTE.toByte(size) : SizeUnit.GIGABYTE.toByte(size); + } } diff --git a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsMdsBase.java b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsMdsBase.java index 3961191b71..1d4f286233 100644 --- a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsMdsBase.java +++ b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsMdsBase.java @@ -3,6 +3,7 @@ import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; +import org.zstack.cbd.ClusterInfo; import org.zstack.cbd.MdsInfo; import org.zstack.core.db.DatabaseFacade; import org.zstack.header.core.Completion; @@ -41,7 +42,7 @@ public MdsInfo getSelf() { } public abstract void connect(Completion completion); - public abstract void ping(Completion completion); + public abstract void ping(ClusterInfo clusterInfo, Completion completion); protected abstract String makeHttpPath(String ip, String path); protected void checkSshAndTools() { @@ -75,6 +76,10 @@ protected void checkStorageHealth() { } } + public T syncCall(final String path, final Object cmd, final Class retClass, TimeUnit unit, long timeout) { + return restf.syncJsonPost(makeHttpPath(self.getAddr(), path), cmd, retClass, unit, timeout); + } + public void httpCall(final String path, final Object cmd, final Class retClass, final ReturnValueCompletion completion) { httpCall(path, cmd, retClass, completion, null, 0); } @@ -111,7 +116,6 @@ public Class getReturnClass() { public static class AgentResponse { private String error; - @Deprecated private boolean success = true; public String getError() { @@ -123,7 +127,6 @@ public void setError(String error) { this.error = error; } - @Deprecated public boolean isSuccess() { return success; } diff --git a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsPrimaryStorageMdsBase.java b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsPrimaryStorageMdsBase.java index bafd6ab4f4..81309d4364 100644 --- a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsPrimaryStorageMdsBase.java +++ b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsPrimaryStorageMdsBase.java @@ -1,6 +1,7 @@ package org.zstack.storage.zbs; import org.springframework.beans.factory.annotation.Autowired; +import org.zstack.cbd.ClusterInfo; import org.zstack.cbd.MdsInfo; import org.zstack.cbd.MdsStatus; import org.zstack.compute.host.HostGlobalConfig; @@ -117,6 +118,7 @@ public void run(FlowTrigger trigger, Map data) { runner.installChecker(callBackChecker); runner.setUsername(getSelf().getUsername()); runner.setPassword(getSelf().getPassword()); + runner.setSshPort(getSelf().getPort()); runner.setTargetIp(getSelf().getAddr()); runner.setTargetUuid(getSelf().getAddr()); runner.setAgentPort(ZbsGlobalProperty.PRIMARY_STORAGE_AGENT_PORT); @@ -273,7 +275,7 @@ public String getName() { } @Override - public void ping(Completion completion) { + public void ping(ClusterInfo clusterInfo, Completion completion) { thdf.chainSubmit(new ChainTask(completion) { @Override public String getSyncSignature() { @@ -282,7 +284,7 @@ public String getSyncSignature() { @Override public void run(final SyncTaskChain chain) { - pingMds(new Completion(completion) { + pingMds(clusterInfo, new Completion(completion) { @Override public void success() { completion.success(); @@ -304,7 +306,7 @@ public String getName() { }); } - private void pingMds(final Completion completion) { + private void pingMds(ClusterInfo clusterInfo, final Completion completion) { final Integer MAX_PING_CNT = ZbsConstants.PRIMARY_STORAGE_MDS_MAXIMUM_PING_FAILURE; final List stepCount = new ArrayList<>(); for (int i = 1; i <= MAX_PING_CNT; i++) { @@ -313,6 +315,7 @@ private void pingMds(final Completion completion) { new While<>(stepCount).each((step, comp) -> { PingCmd cmd = new PingCmd(); + cmd.setClusterInfo(clusterInfo); cmd.setAddr(getSelf().getAddr()); restf.asyncJsonPost(ZbsAgentUrl.primaryStorageUrl(getSelf().getAddr(), PING_PATH), cmd, new JsonAsyncRESTCallback(completion) { @@ -367,6 +370,15 @@ public static class PingRsp extends ZbsMdsBase.AgentResponse { } public static class PingCmd extends ZbsMdsBase.AgentCommand { + private ClusterInfo clusterInfo; + + public ClusterInfo getClusterInfo() { + return clusterInfo; + } + + public void setClusterInfo(ClusterInfo clusterInfo) { + this.clusterInfo = clusterInfo; + } } public static class SyncMetadataRsp extends ZbsMdsBase.AgentResponse { diff --git a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsStorageController.java b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsStorageController.java index 0ebe643143..952f748a27 100644 --- a/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsStorageController.java +++ b/plugin/zbs/src/main/java/org/zstack/storage/zbs/ZbsStorageController.java @@ -10,8 +10,9 @@ import org.zstack.compute.host.HostGlobalConfig; import org.zstack.core.CoreGlobalProperty; import org.zstack.core.asyncbatch.While; +import org.zstack.core.cloudbus.CloudBus; +import org.zstack.core.cloudbus.CloudBusCallBack; import org.zstack.core.db.DatabaseFacade; -import org.zstack.core.db.Q; import org.zstack.core.db.SQL; import org.zstack.core.workflow.FlowChainBuilder; import org.zstack.core.workflow.ShareFlow; @@ -24,9 +25,11 @@ import org.zstack.header.errorcode.SysErrors; import org.zstack.header.exception.CloudRuntimeException; import org.zstack.header.host.HostAO_; +import org.zstack.header.host.HostConstant; import org.zstack.header.host.HostInventory; import org.zstack.header.host.HostVO; import org.zstack.header.image.ImageConstant; +import org.zstack.header.message.MessageReply; import org.zstack.header.rest.RESTFacade; import org.zstack.header.storage.addon.*; import org.zstack.header.storage.addon.primary.*; @@ -35,6 +38,8 @@ import org.zstack.header.volume.VolumeConstant; import org.zstack.header.volume.VolumeProtocol; import org.zstack.header.volume.VolumeStats; +import org.zstack.kvm.KVMHostAsyncHttpCallMsg; +import org.zstack.kvm.KVMHostAsyncHttpCallReply; import org.zstack.kvm.KVMHostVO; import org.zstack.kvm.KVMHostVO_; import org.zstack.resourceconfig.ResourceConfig; @@ -69,6 +74,8 @@ public class ZbsStorageController implements PrimaryStorageControllerSvc, Primar protected RESTFacade restf; @Autowired private ResourceConfigFacade rcf; + @Autowired + private CloudBus bus; private ExternalPrimaryStorageVO self; private AddonInfo addonInfo; @@ -76,11 +83,13 @@ public class ZbsStorageController implements PrimaryStorageControllerSvc, Primar public static final String DEPLOY_CLIENT_PATH = "/zbs/primarystorage/client/deploy"; public static final String GET_CAPACITY_PATH = "/zbs/primarystorage/capacity"; + public static final String GET_FACTS_PATH = "/zbs/primarystorage/facts"; public static final String COPY_PATH = "/zbs/primarystorage/copy"; public static final String CREATE_VOLUME_PATH = "/zbs/primarystorage/volume/create"; public static final String DELETE_VOLUME_PATH = "/zbs/primarystorage/volume/delete"; public static final String CLONE_VOLUME_PATH = "/zbs/primarystorage/volume/clone"; public static final String QUERY_VOLUME_PATH = "/zbs/primarystorage/volume/query"; + public static final String BATCH_QUERY_VOLUME_PATH = "/zbs/primarystorage/volume/query/batch"; public static final String EXPAND_VOLUME_PATH = "/zbs/primarystorage/volume/expand"; public static final String FLATTEN_VOLUME_PATH = "/zbs/primarystorage/volume/flatten"; public static final String CBD_TO_NBD_PATH = "/zbs/primarystorage/volume/cbdtonbd"; @@ -88,6 +97,8 @@ public class ZbsStorageController implements PrimaryStorageControllerSvc, Primar public static final String CREATE_SNAPSHOT_PATH = "/zbs/primarystorage/snapshot/create"; public static final String DELETE_SNAPSHOT_PATH = "/zbs/primarystorage/snapshot/delete"; public static final String ROLLBACK_SNAPSHOT_PATH = "/zbs/primarystorage/snapshot/rollback"; + public static final String CHECK_HOST_STORAGE_CONNECTION_PATH = "/zbs/primarystorage/check/host/connection"; + public static final String GET_VOLUME_CLIENTS_PATH = "/zbs/primarystorage/volume/clients"; private static final StorageCapabilities capabilities = new StorageCapabilities(); @@ -119,17 +130,18 @@ public void activate(BaseVolumeInfo v, HostInventory h, boolean shareable, Retur @Override public void deactivate(String installPath, String protocol, HostInventory h, Completion comp) { - + // not support inactive client yet + comp.success(); } @Override public void deactivate(String installPath, String protocol, ActiveVolumeClient client, Completion comp) { - + comp.success(); } @Override public void blacklist(String installPath, String protocol, HostInventory h, Completion comp) { - + comp.success(); } @Override @@ -145,7 +157,23 @@ public BaseVolumeInfo getActiveVolumeInfo(String activePath, HostInventory h, bo @Override public List getActiveClients(String installPath, String protocol) { if (VolumeProtocol.CBD.toString().equals(protocol)) { - return Collections.emptyList(); + GetVolumeClientsCmd cmd = new GetVolumeClientsCmd(); + cmd.setPath(installPath); + GetVolumeClientsRsp rsp = syncHttpCall(GET_VOLUME_CLIENTS_PATH, cmd, GetVolumeClientsRsp.class); + List clients = new ArrayList<>(); + + if (!rsp.isSuccess()) { + throw new OperationFailureException(operr(rsp.getError())); + } + + if (rsp.getClients() != null) { + for (ClientInfo clientInfo : rsp.getClients()) { + ActiveVolumeClient client = new ActiveVolumeClient(); + client.setManagerIp(clientInfo.getIp()); + clients.add(client); + } + } + return clients; } else { throw new OperationFailureException(operr("not supported protocol[%s] for active", protocol)); } @@ -158,16 +186,17 @@ public List getActiveVolumesLocation(HostInventory h) { @Override public void deployClient(HostInventory h, Completion comp) { - String clientPassword = Q.New(KVMHostVO.class).select(KVMHostVO_.password).eq(KVMHostVO_.uuid, h.getUuid()).findValue(); - if (clientPassword == null) { - comp.fail(operr("failed to get client[uuid:%s] password", h.getUuid())); + KVMHostVO host = org.zstack.core.db.Q.New(KVMHostVO.class).eq(KVMHostVO_.uuid, h.getUuid()).find(); + if (host == null) { + comp.fail(operr("cannot found kvm host[uuid:%s], unable to deploy client", h.getUuid())); return; } DeployClientCmd cmd = new DeployClientCmd(); cmd.setIp(h.getManagementIp()); - cmd.setPassword(clientPassword); - + cmd.setPort(host.getPort()); + cmd.setUsername(host.getUsername()); + cmd.setPassword(host.getPassword()); httpCall(DEPLOY_CLIENT_PATH, cmd, DeployClientRsp.class, new ReturnValueCompletion(comp) { @Override public void success(DeployClientRsp returnValue) { @@ -183,11 +212,14 @@ public void fail(ErrorCode errorCode) { @Override public synchronized void activateHeartbeatVolume(HostInventory h, ReturnValueCompletion comp) { - reloadDbInfo(); + if (config == null) { + reloadDbInfo(); + } CreateVolumeCmd cmd = new CreateVolumeCmd(); cmd.setLogicalPool(config.getLogicalPoolName()); cmd.setVolume(ZbsConstants.ZBS_HEARTBEAT_VOLUME_NAME); + cmd.setSize(ZbsConstants.ZBS_HEARTBEAT_VOLUME_SIZE_IN_GIGABYTE); cmd.setSkipIfExisting(true); httpCall(CREATE_VOLUME_PATH, cmd, CreateVolumeRsp.class, new ReturnValueCompletion(comp) { @@ -209,18 +241,20 @@ public void fail(ErrorCode errorCode) { @Override public void deactivateHeartbeatVolume(HostInventory h, Completion comp) { - + comp.success(); } @Override public HeartbeatVolumeTO getHeartbeatVolumeActiveInfo(HostInventory h) { - reloadDbInfo(); + if (config == null) { + reloadDbInfo(); + } - // FIXME: hard code for install path CbdHeartbeatVolumeTO to = new CbdHeartbeatVolumeTO(); - to.setInstallPath(String.format("cbd:%s_physical/%s/%s", config.getLogicalPoolName(), config.getLogicalPoolName(), ZbsConstants.ZBS_HEARTBEAT_VOLUME_NAME)); + to.setInstallPath(buildHeartbeatVolumePath(config.getLogicalPoolName())); to.setHeartbeatRequiredSpace(SizeUnit.MEGABYTE.toByte(1)); to.setCoveringPaths(Collections.singletonList(config.getLogicalPoolName())); + return to; } @@ -296,10 +330,33 @@ public void run(FlowTrigger trigger, Map data) { } }); + flow(new NoRollbackFlow() { + String __name__ = "get-facts"; + + @Override + public void run(FlowTrigger trigger, Map data) { + httpCall(GET_FACTS_PATH, new GetFactsCmd(), GetFactsRsp.class, new ReturnValueCompletion(trigger) { + @Override + public void success(GetFactsRsp returnValue) { + ClusterInfo info = new ClusterInfo(); + info.setUuid(returnValue.getUuid()); + info.setVersion(returnValue.getVersion()); + newAddonInfo.setClusterInfo(info); + trigger.next(); + } + + @Override + public void fail(ErrorCode errorCode) { + trigger.fail(errorCode); + } + }); + } + }); + flow(new NoRollbackFlow() { String __name__ = "deploy-client"; - List refs = Q.New(PrimaryStorageClusterRefVO.class) + List refs = org.zstack.core.db.Q.New(PrimaryStorageClusterRefVO.class) .eq(PrimaryStorageClusterRefVO_.primaryStorageUuid, self.getUuid()) .list(); @@ -314,24 +371,23 @@ public void run(FlowTrigger trigger, Map data) { .map(PrimaryStorageClusterRefVO::getClusterUuid) .collect(Collectors.toList()); - List hosts = Q.New(HostVO.class) + List hosts = org.zstack.core.db.Q.New(HostVO.class) .in(HostAO_.clusterUuid, clusterUuids) .list(); new While<>(hosts).each((h, comp) -> { - String clientPassword = Q.New(KVMHostVO.class) - .select(KVMHostVO_.password) - .eq(KVMHostVO_.uuid, h.getUuid()) - .findValue(); - - if (clientPassword == null) { - comp.addError(operr("failed to get ZBS client[uuid:%s] password.", h.getUuid())); + KVMHostVO host = org.zstack.core.db.Q.New(KVMHostVO.class).eq(KVMHostVO_.uuid, h.getUuid()).find(); + if (host == null) { + comp.addError(operr("cannot found kvm host[uuid:%s], unable to deploy client", h.getUuid())); + comp.allDone(); + return; } DeployClientCmd cmd = new DeployClientCmd(); cmd.setIp(h.getManagementIp()); - cmd.setPassword(clientPassword); - + cmd.setPort(host.getPort()); + cmd.setUsername(host.getUsername()); + cmd.setPassword(host.getPassword()); httpCall(DEPLOY_CLIENT_PATH, cmd, DeployClientRsp.class, new ReturnValueCompletion(comp) { @Override public void success(DeployClientRsp returnValue) { @@ -341,7 +397,7 @@ public void success(DeployClientRsp returnValue) { @Override public void fail(ErrorCode errorCode) { comp.addError(errorCode); - comp.done(); + comp.allDone(); } }); }).run(new WhileDoneCompletion(trigger) { @@ -380,22 +436,26 @@ public void handle(ErrorCode errCode, Map data) { @Override public void ping(Completion completion) { reloadDbInfo(); - final List mds = CollectionUtils.transformAndRemoveNull(addonInfo.getMdsInfos(), ZbsPrimaryStorageMdsBase::new); - new While<>(mds).each((m, comp) -> { - m.ping(new Completion(comp) { - @Override - public void success() { - m.getSelf().setStatus(MdsStatus.Connected); - comp.done(); - } - @Override - public void fail(ErrorCode errorCode) { - m.getSelf().setStatus(MdsStatus.Disconnected); - comp.done(); - } - }); - }).run(new WhileDoneCompletion(completion) { + if (addonInfo == null || addonInfo.getClusterInfo() == null) { + completion.fail(operr(String.format("addon info is null, primary storage[uuid:%s] is not ready, skip ping task", self.getUuid()))); + return; + } + + final List mds = CollectionUtils.transformToList(addonInfo.getMdsInfos(), ZbsPrimaryStorageMdsBase::new); + new While<>(mds).each((m, comp) -> m.ping(addonInfo.getClusterInfo(), new Completion(comp) { + @Override + public void success() { + m.getSelf().setStatus(MdsStatus.Connected); + comp.done(); + } + + @Override + public void fail(ErrorCode errorCode) { + m.getSelf().setStatus(MdsStatus.Disconnected); + comp.done(); + } + })).run(new WhileDoneCompletion(completion) { @Override public void done(ErrorCodeList errorCodeList) { SQL.New(ExternalPrimaryStorageVO.class).eq(ExternalPrimaryStorageVO_.uuid, self.getUuid()) @@ -458,14 +518,31 @@ public void reportHealthy(ReturnValueCompletion comp) { @Override public void reportNodeHealthy(HostInventory host, ReturnValueCompletion comp) { - NodeHealthy healthy = new NodeHealthy(); + CheckHostStorageConnectionCmd cmd = new CheckHostStorageConnectionCmd(); + cmd.setHostUuid(host.getUuid()); + cmd.setPath(buildHeartbeatVolumePath(config.getLogicalPoolName())); + + KVMHostAsyncHttpCallMsg msg = new KVMHostAsyncHttpCallMsg(); + msg.setCommand(cmd); + msg.setHostUuid(host.getUuid()); + msg.setPath(CHECK_HOST_STORAGE_CONNECTION_PATH); + msg.setNoStatusCheck(true); + bus.makeTargetServiceIdByResourceUuid(msg, HostConstant.SERVICE_ID, msg.getHostUuid()); + bus.send(msg, new CloudBusCallBack(comp) { + @Override + public void run(MessageReply reply) { + if (!reply.isSuccess()) { + comp.fail(reply.getError()); + return; + } - Arrays.asList(VolumeProtocol.CBD).forEach(it -> { - // TODO: CHECK_HOST_STORAGE_CONNECTION_PATH - healthy.setHealthy(it, StorageHealthy.Ok); + KVMHostAsyncHttpCallReply hreply = reply.castReply(); + CheckHostStorageConnectionRsp rsp = hreply.toResponse(CheckHostStorageConnectionRsp.class); + NodeHealthy healthy = new NodeHealthy(); + healthy.setHealthy(VolumeProtocol.CBD, rsp.isSuccess() ? StorageHealthy.Ok : StorageHealthy.Failed); + comp.success(healthy); + } }); - - comp.success(healthy); } @Override @@ -475,7 +552,9 @@ public StorageCapabilities reportCapabilities() { @Override public String allocateSpace(AllocateSpaceSpec aspec) { - reloadDbInfo(); + if (config == null) { + reloadDbInfo(); + } // TODO allocate pool LogicalPoolInfo logicalPoolInfo = allocateFreePool(aspec.getSize()); @@ -507,7 +586,8 @@ public void createVolume(CreateVolumeSpec v, ReturnValueCompletion CreateVolumeCmd cmd = new CreateVolumeCmd(); cmd.setLogicalPool(config.getLogicalPoolName()); cmd.setVolume(v.getName()); - cmd.setSize((long)Math.ceil(SizeUnit.BYTE.toGigaByte((double)v.getSize()))); + cmd.setUnit(getSizeUnit(addonInfo.getClusterInfo().getVersion())); + cmd.setSize(alignSizeTo(v.getSize(), cmd.getUnit())); cmd.setSkipIfExisting(true); httpCall(CREATE_VOLUME_PATH, cmd, CreateVolumeRsp.class, new ReturnValueCompletion(comp) { @@ -592,7 +672,8 @@ public boolean skip(Map data) { public void run(FlowTrigger trigger, Map data) { ExpandVolumeCmd cmd = new ExpandVolumeCmd(); cmd.setPath(stats.getInstallPath()); - cmd.setSize(SizeUnit.BYTE.toGigaByte(dst.getSize())); + cmd.setUnit(getSizeUnit(addonInfo.getClusterInfo().getVersion())); + cmd.setSize(alignSizeTo(dst.getSize(), cmd.getUnit())); httpCall(EXPAND_VOLUME_PATH, cmd, ExpandVolumeRsp.class, new ReturnValueCompletion(trigger) { @Override @@ -700,14 +781,36 @@ public void fail(ErrorCode errorCode) { @Override public void batchStats(Collection installPath, ReturnValueCompletion> comp) { + BatchQueryVolumeCmd cmd = new BatchQueryVolumeCmd(); + cmd.setInstallPaths(installPath); + httpCall(BATCH_QUERY_VOLUME_PATH, cmd, BatchQueryVolumeRsp.class, new ReturnValueCompletion(comp) { + @Override + public void success(BatchQueryVolumeRsp returnValue) { + List stats = returnValue.getVolumes().entrySet().stream().map(v -> { + VolumeStats s = new VolumeStats(); + s.setInstallPath(v.getKey()); + s.setSize(v.getValue().get("length")); + s.setActualSize(v.getValue().get("usedSize")); + s.setFormat(VolumeConstant.VOLUME_FORMAT_RAW); + return s; + }).collect(Collectors.toList()); + comp.success(stats); + } + + @Override + public void fail(ErrorCode errorCode) { + comp.fail(errorCode); + } + }); } @Override public void expandVolume(String installPath, long size, ReturnValueCompletion comp) { ExpandVolumeCmd cmd = new ExpandVolumeCmd(); cmd.setPath(installPath); - cmd.setSize(SizeUnit.BYTE.toGigaByte(size)); + cmd.setUnit(getSizeUnit(addonInfo.getClusterInfo().getVersion())); + cmd.setSize(alignSizeTo(size, cmd.getUnit())); httpCall(EXPAND_VOLUME_PATH, cmd, ExpandVolumeRsp.class, new ReturnValueCompletion(comp) { @Override @@ -727,12 +830,12 @@ public void fail(ErrorCode errorCode) { @Override public void setVolumeQos(BaseVolumeInfo v, Completion comp) { - + comp.success(); } @Override public void deleteVolumeQos(BaseVolumeInfo v, Completion comp) { - + comp.success(); } @Override @@ -853,7 +956,7 @@ public void fail(ErrorCode errorCode) { @Override public void expungeSnapshot(String installPath, Completion comp) { - + comp.success(); } @Override @@ -914,7 +1017,7 @@ public void validateConfig(String config) { @Override public void setTrashExpireTime(int timeInSeconds, Completion completion) { - + completion.success(); } @Override @@ -924,6 +1027,12 @@ public void onFirstAdditionConfigure(Completion completion) { completion.success(); } + @Override + public long alignSize(long size) { + String unit = getSizeUnit(addonInfo.getClusterInfo().getVersion()); + return convertSizeToByte(alignSizeTo(size, unit), unit); + } + public void doDeleteVolume(String installPath, Boolean force, Completion comp) { DeleteVolumeCmd cmd = new DeleteVolumeCmd(); cmd.setPath(installPath); @@ -960,12 +1069,20 @@ private List parseMdsInfos(List mdsUrls) { }).collect(Collectors.toList()); } + protected T syncHttpCall(final String path, final AgentCommand cmd, final Class retClass) { + return httpCall(path, cmd, retClass, null, 0, true); + } + + protected T httpCall(final String path, final AgentCommand cmd, final Class retClass, TimeUnit unit, long timeout, boolean sync) { + return new HttpCaller<>(path, cmd, retClass, null, unit, timeout, sync).syncCall(); + } + protected void httpCall(final String path, final AgentCommand cmd, final Class retClass, final ReturnValueCompletion callback) { - httpCall(path, cmd, retClass, callback, null, 0); + httpCall(path, cmd, retClass, callback, null, 0, false); } - protected void httpCall(final String path, final AgentCommand cmd, final Class retClass, final ReturnValueCompletion callback, TimeUnit unit, long timeout) { - new HttpCaller<>(path, cmd, retClass, callback, unit, timeout).call(); + protected void httpCall(final String path, final AgentCommand cmd, final Class retClass, final ReturnValueCompletion callback, TimeUnit unit, long timeout, boolean sync) { + new HttpCaller<>(path, cmd, retClass, callback, unit, timeout, sync).call(); } public class HttpCaller { @@ -979,14 +1096,15 @@ public class HttpCaller { private final ReturnValueCompletion callback; private final TimeUnit unit; private final long timeout; + private final boolean sync; private boolean tryNext = false; public HttpCaller(String path, AgentCommand cmd, Class retClass, ReturnValueCompletion callback) { - this(path, cmd, retClass, callback, null, 0); + this(path, cmd, retClass, callback, null, 0, false); } - public HttpCaller(String path, AgentCommand cmd, Class retClass, ReturnValueCompletion callback, TimeUnit unit, long timeout) { + public HttpCaller(String path, AgentCommand cmd, Class retClass, ReturnValueCompletion callback, TimeUnit unit, long timeout, boolean sync) { this.path = path; this.cmd = cmd; this.retClass = retClass; @@ -994,6 +1112,7 @@ public HttpCaller(String path, AgentCommand cmd, Class retClass, ReturnValueC this.unit = unit; this.timeout = timeout; this.mdsInfos = prepareMds(); + this.sync = sync; } public void call() { @@ -1002,6 +1121,12 @@ public void call() { doCall(); } + public T syncCall() { + prepareMdsIterator(); + prepareCmd(); + return doSyncCall(); + } + HttpCaller setTargetMds(String mdsAddr) { logger.debug(String.format("target MDS[%s]", mdsAddr)); @@ -1038,6 +1163,29 @@ private void prepareMdsIterator() { it = mdsInfos.stream().map(ZbsPrimaryStorageMdsBase::new).collect(Collectors.toList()).iterator(); } + private T doSyncCall() { + if (!it.hasNext()) { + throw new OperationFailureException(operr(errorCodes, "all MDS cannot execute http call[%s]", path)); + } + + ZbsPrimaryStorageMdsBase base = it.next(); + cmd.setAddr(base.getSelf().getAddr()); + + T ret = base.syncCall(path, cmd, retClass, unit, timeout); + if (!ret.isSuccess()) { + logger.warn(String.format("failed to execute http call[%s] on MDS[%s], error is: %s", + path, base.getSelf().getAddr(), JSONObjectUtil.toJsonString(ret.getError()))); + errorCodes.getCauses().add(operr(ret.getError())); + if (tryNext) { + return doSyncCall(); + } else { + throw new OperationFailureException(operr(errorCodes, "all MDS cannot execute http call[%s]", path)); + } + } + + return ret; + } + private void doCall() { if (!it.hasNext()) { callback.fail(operr(errorCodes, "all MDS cannot execute http call[%s]", path)); @@ -1189,6 +1337,18 @@ public static class FlattenVolumeRsp extends QueryVolumeRsp { } + public static class BatchQueryVolumeRsp extends AgentResponse { + private Map> volumes; + + public Map> getVolumes() { + return volumes; + } + + public void setVolumes(Map> volumes) { + this.volumes = volumes; + } + } + public static class CbdToNbdRsp extends AgentResponse { private String ip; private int port; @@ -1319,9 +1479,8 @@ public static class DeployClientRsp extends AgentResponse { } - public static class ExpandVolumeCmd extends AgentCommand { + public static class ExpandVolumeCmd extends SizeCmd { private String path; - private long size; public String getPath() { return path; @@ -1330,14 +1489,6 @@ public String getPath() { public void setPath(String path) { this.path = path; } - - public long getSize() { - return size; - } - - public void setSize(long size) { - this.size = size; - } } public static class CopyCmd extends AgentCommand implements HasThreadContext { @@ -1418,6 +1569,18 @@ public void setPath(String path) { } } + public static class BatchQueryVolumeCmd extends AgentCommand { + private Collection installPaths; + + public Collection getInstallPaths() { + return installPaths; + } + + public void setInstallPaths(Collection installPaths) { + this.installPaths = installPaths; + } + } + public static class CleanNbdCmd extends AgentCommand { private String nbdAddr; private int port; @@ -1532,10 +1695,80 @@ public void setForce(boolean force) { } } - public static class CreateVolumeCmd extends AgentCommand { + public static class GetVolumeClientsCmd extends AgentCommand { + private String path; + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + } + + public static class ClientInfo { + public ClientInfo(String ip, int port) { + this.ip = ip; + this.port = port; + } + + private String ip; + private int port; + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + public int getPort() { + return port; + } + + public void setPort(int port) { + this.port = port; + } + } + + public static class GetVolumeClientsRsp extends AgentResponse { + private List clients; + + public List getClients() { + return clients; + } + + public void setClients(List clients) { + this.clients = clients; + } + } + + public static class SizeCmd extends AgentCommand { + private long size; + private String unit; + + public long getSize() { + return size; + } + + public void setSize(long size) { + this.size = size; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + } + + public static class CreateVolumeCmd extends SizeCmd { private String logicalPool; private String volume; - private long size = 1L; private boolean skipIfExisting; public String getLogicalPool() { @@ -1554,14 +1787,6 @@ public void setVolume(String volume) { this.volume = volume; } - public long getSize() { - return size; - } - - public void setSize(long size) { - this.size = size; - } - public boolean isSkipIfExisting() { return skipIfExisting; } @@ -1585,6 +1810,8 @@ public void setLogicalPool(String logicalPool) { public static class DeployClientCmd extends AgentCommand { private String ip; + private Integer port; + private String username; private String password; public String getIp() { @@ -1595,6 +1822,22 @@ public void setIp(String ip) { this.ip = ip; } + public Integer getPort() { + return port; + } + + public void setPort(Integer port) { + this.port = port; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + public String getPassword() { return password; } @@ -1604,6 +1847,54 @@ public void setPassword(String password) { } } + public static class GetFactsRsp extends AgentResponse { + private String uuid; + private String version; + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + } + + public static class GetFactsCmd extends AgentCommand { + } + + public static class CheckHostStorageConnectionCmd extends AgentCommand { + public String hostUuid; + private String path; + + public String getHostUuid() { + return hostUuid; + } + + public void setHostUuid(String hostUuid) { + this.hostUuid = hostUuid; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + } + + public static class CheckHostStorageConnectionRsp extends AgentResponse { + } + public static class AgentResponse extends ZbsMdsBase.AgentResponse { } diff --git a/pom.xml b/pom.xml index 2e85d61901..8d763b2470 100755 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 3.6.1 1.8 5.2.25.RELEASE - 5.7.11 + 5.7.13 5.3.26.Final 1.8.9 1.10 diff --git a/portal/src/main/java/org/zstack/portal/apimediator/PortalSystemTags.java b/portal/src/main/java/org/zstack/portal/apimediator/PortalSystemTags.java index 1eba017e6c..d73fe785ac 100755 --- a/portal/src/main/java/org/zstack/portal/apimediator/PortalSystemTags.java +++ b/portal/src/main/java/org/zstack/portal/apimediator/PortalSystemTags.java @@ -1,14 +1,16 @@ package org.zstack.portal.apimediator; import org.zstack.header.tag.SystemTagVO; -import org.zstack.tag.EphemeralSystemTag; +import org.zstack.header.tag.TagDefinition; import org.zstack.tag.PatternedSystemTag; +import org.zstack.tag.SystemTag; /** * Created by xing5 on 2016/11/21. */ +@TagDefinition public class PortalSystemTags { - public static EphemeralSystemTag VALIDATION_ONLY = new EphemeralSystemTag("validationOnly"); + public static SystemTag VALIDATION_ONLY = SystemTag.makeEphemeralTag("validationOnly"); public static String REPLAY_ID = "replayId"; public static PatternedSystemTag FOR_REPLAY = new PatternedSystemTag(String.format("replay::{%s}", REPLAY_ID), SystemTagVO.class); diff --git a/sdk/src/main/java/SourceClassMap.java b/sdk/src/main/java/SourceClassMap.java index 9c15e90410..c52be8a059 100644 --- a/sdk/src/main/java/SourceClassMap.java +++ b/sdk/src/main/java/SourceClassMap.java @@ -7,16 +7,6 @@ public class SourceClassMap { { put("org.zstack.accessKey.AccessKeyInventory", "org.zstack.sdk.AccessKeyInventory"); put("org.zstack.accessKey.AccessKeyState", "org.zstack.sdk.AccessKeyState"); - put("org.zstack.aliyun.nas.filesystem.AliyunNasAccessGroupInventory", "org.zstack.sdk.AliyunNasAccessGroupInventory"); - put("org.zstack.aliyun.nas.filesystem.AliyunNasAccessRuleInventory", "org.zstack.sdk.AliyunNasAccessRuleInventory"); - put("org.zstack.aliyun.nas.filesystem.AliyunNasFileSystemInventory", "org.zstack.sdk.AliyunNasFileSystemInventory"); - put("org.zstack.aliyun.nas.filesystem.AliyunNasMountTargetInventory", "org.zstack.sdk.AliyunNasMountTargetInventory"); - put("org.zstack.aliyun.nas.message.AliyunNasAccessGroupProperty", "org.zstack.sdk.AliyunNasAccessGroupProperty"); - put("org.zstack.aliyun.nas.message.AliyunNasFileSystemProperty", "org.zstack.sdk.AliyunNasFileSystemProperty"); - put("org.zstack.aliyun.nas.message.AliyunNasMountTargetProperty", "org.zstack.sdk.AliyunNasMountTargetProperty"); - put("org.zstack.aliyun.pangu.AliyunPanguPartitionInventory", "org.zstack.sdk.AliyunPanguPartitionInventory"); - put("org.zstack.aliyunproxy.vpc.AliyunProxyVSwitchInventory", "org.zstack.sdk.AliyunProxyVSwitchInventory"); - put("org.zstack.aliyunproxy.vpc.AliyunProxyVpcInventory", "org.zstack.sdk.AliyunProxyVpcInventory"); put("org.zstack.appliancevm.ApplianceVmInventory", "org.zstack.sdk.ApplianceVmInventory"); put("org.zstack.autoscaling.group.AutoScalingGroupInventory", "org.zstack.sdk.AutoScalingGroupInventory"); put("org.zstack.autoscaling.group.activity.AutoScalingGroupActivityInventory", "org.zstack.sdk.AutoScalingGroupActivityInventory"); @@ -31,26 +21,12 @@ public class SourceClassMap { put("org.zstack.autoscaling.group.rule.trigger.AutoScalingRuleTriggerInventory", "org.zstack.sdk.AutoScalingRuleTriggerInventory"); put("org.zstack.autoscaling.template.AutoScalingTemplateInventory", "org.zstack.sdk.AutoScalingTemplateInventory"); put("org.zstack.autoscaling.template.AutoScalingVmTemplateInventory", "org.zstack.sdk.AutoScalingVmTemplateInventory"); - put("org.zstack.baremetal2.chassis.BareMetal2BondingInventory", "org.zstack.sdk.BareMetal2BondingInventory"); - put("org.zstack.baremetal2.chassis.BareMetal2BondingNicRefInventory", "org.zstack.sdk.BareMetal2BondingNicRefInventory"); - put("org.zstack.baremetal2.chassis.BareMetal2ChassisDiskInventory", "org.zstack.sdk.BareMetal2ChassisDiskInventory"); - put("org.zstack.baremetal2.chassis.BareMetal2ChassisInventory", "org.zstack.sdk.BareMetal2ChassisInventory"); - put("org.zstack.baremetal2.chassis.BareMetal2ChassisNicInventory", "org.zstack.sdk.BareMetal2ChassisNicInventory"); - put("org.zstack.baremetal2.chassis.ipmi.BareMetal2IpmiChassisInventory", "org.zstack.sdk.BareMetal2IpmiChassisInventory"); - put("org.zstack.baremetal2.configuration.BareMetal2ChassisOfferingInventory", "org.zstack.sdk.BareMetal2ChassisOfferingInventory"); - put("org.zstack.baremetal2.gateway.BareMetal2GatewayInventory", "org.zstack.sdk.BareMetal2GatewayInventory"); - put("org.zstack.baremetal2.gateway.BareMetal2GatewayProvisionNicInventory", "org.zstack.sdk.BareMetal2GatewayProvisionNicInventory"); - put("org.zstack.baremetal2.instance.BareMetal2InstanceInventory", "org.zstack.sdk.BareMetal2InstanceInventory"); - put("org.zstack.baremetal2.instance.BareMetal2InstanceProvisionNicInventory", "org.zstack.sdk.BareMetal2InstanceProvisionNicInventory"); - put("org.zstack.baremetal2.provisionnetwork.BareMetal2ProvisionNetworkInventory", "org.zstack.sdk.BareMetal2ProvisionNetworkInventory"); - put("org.zstack.baremetal2.provisionnetwork.BareMetal2ProvisionNetworkIpCapacity", "org.zstack.sdk.BareMetal2ProvisionNetworkIpCapacity"); put("org.zstack.billing.Pagination", "org.zstack.sdk.Pagination"); put("org.zstack.billing.PriceInventory", "org.zstack.sdk.PriceInventory"); put("org.zstack.billing.ResourceSpending", "org.zstack.sdk.ResourceSpending"); put("org.zstack.billing.Spending", "org.zstack.sdk.Spending"); put("org.zstack.billing.SpendingDetails", "org.zstack.sdk.SpendingDetails"); put("org.zstack.billing.generator.BillingInventory", "org.zstack.sdk.BillingInventory"); - put("org.zstack.billing.generator.baremetal2.BareMetal2BillingInventory", "org.zstack.sdk.BareMetal2BillingInventory"); put("org.zstack.billing.generator.pcidevice.PciDeviceBillingInventory", "org.zstack.sdk.PciDeviceBillingInventory"); put("org.zstack.billing.generator.pubip.vip.PubIpVipBandwidthInBillingInventory", "org.zstack.sdk.PubIpVipBandwidthInBillingInventory"); put("org.zstack.billing.generator.pubip.vip.PubIpVipBandwidthOutBillingInventory", "org.zstack.sdk.PubIpVipBandwidthOutBillingInventory"); @@ -60,9 +36,6 @@ public class SourceClassMap { put("org.zstack.billing.generator.vm.memory.VmMemoryBillingInventory", "org.zstack.sdk.VmMemoryBillingInventory"); put("org.zstack.billing.generator.volume.data.DataVolumeBillingInventory", "org.zstack.sdk.DataVolumeBillingInventory"); put("org.zstack.billing.generator.volume.root.RootVolumeBillingInventory", "org.zstack.sdk.RootVolumeBillingInventory"); - put("org.zstack.billing.spendingcalculator.baremetal2.BareMetal2Spending", "org.zstack.sdk.BareMetal2Spending"); - put("org.zstack.billing.spendingcalculator.baremetal2.BareMetal2SpendingDetails", "org.zstack.sdk.BareMetal2SpendingDetails"); - put("org.zstack.billing.spendingcalculator.baremetal2.PriceBareMetal2ChassisOfferingRefInventory", "org.zstack.sdk.PriceBareMetal2ChassisOfferingRefInventory"); put("org.zstack.billing.spendingcalculator.pcidevice.PciDeviceSpending", "org.zstack.sdk.PciDeviceSpending"); put("org.zstack.billing.spendingcalculator.pcidevice.PciDeviceSpendingInventory", "org.zstack.sdk.PciDeviceSpendingInventory"); put("org.zstack.billing.spendingcalculator.pcidevice.PricePciDeviceOfferingRefInventory", "org.zstack.sdk.PricePciDeviceOfferingRefInventory"); @@ -116,42 +89,19 @@ public class SourceClassMap { put("org.zstack.externalbackup.ResourceExternalBackupInfo", "org.zstack.sdk.ResourceExternalBackupInfo"); put("org.zstack.externalbackup.VmExternalBackupInfo", "org.zstack.sdk.VmExternalBackupInfo"); put("org.zstack.externalbackup.VolumeExternalBackupInfo", "org.zstack.sdk.VolumeExternalBackupInfo"); - put("org.zstack.externalbackup.zbox.ZBoxBackupInventory", "org.zstack.sdk.ZBoxBackupInventory"); - put("org.zstack.externalbackup.zbox.ZBoxBackupStorageBackupInfo", "org.zstack.sdk.ZBoxBackupStorageBackupInfo"); - put("org.zstack.externalbackup.zbox.ZBoxVmBackupInfo", "org.zstack.sdk.ZBoxVmBackupInfo"); - put("org.zstack.externalbackup.zbox.ZBoxVolumeBackupInfo", "org.zstack.sdk.ZBoxVolumeBackupInfo"); + put("org.zstack.externalbackup.zbox.ZBoxBackupInventory", "org.zstack.sdk.zbox.ZBoxBackupInventory"); + put("org.zstack.externalbackup.zbox.ZBoxBackupStorageBackupInfo", "org.zstack.sdk.zbox.ZBoxBackupStorageBackupInfo"); + put("org.zstack.externalbackup.zbox.ZBoxVmBackupInfo", "org.zstack.sdk.zbox.ZBoxVmBackupInfo"); + put("org.zstack.externalbackup.zbox.ZBoxVolumeBackupInfo", "org.zstack.sdk.zbox.ZBoxVolumeBackupInfo"); put("org.zstack.faulttolerance.entity.FaultToleranceVmGroupInventory", "org.zstack.sdk.FaultToleranceVmGroupInventory"); - put("org.zstack.guesttools.GuestToolsInventory", "org.zstack.sdk.GuestToolsInventory"); - put("org.zstack.guesttools.GuestToolsStateInventory", "org.zstack.sdk.GuestToolsStateInventory"); + put("org.zstack.guesttools.GuestToolsInventory", "org.zstack.sdk.guesttools.GuestToolsInventory"); + put("org.zstack.guesttools.GuestToolsStateInventory", "org.zstack.sdk.guesttools.GuestToolsStateInventory"); + put("org.zstack.guesttools.advanced.VmCustomSpecificationInventory", "org.zstack.sdk.guesttools.advanced.VmCustomSpecificationInventory"); put("org.zstack.ha.HaStrategyConditionInventory", "org.zstack.sdk.HaStrategyConditionInventory"); put("org.zstack.header.acl.AccessControlListEntryInventory", "org.zstack.sdk.AccessControlListEntryInventory"); put("org.zstack.header.acl.AccessControlListInventory", "org.zstack.sdk.AccessControlListInventory"); put("org.zstack.header.affinitygroup.AffinityGroupInventory", "org.zstack.sdk.AffinityGroupInventory"); put("org.zstack.header.affinitygroup.AffinityGroupUsageInventory", "org.zstack.sdk.AffinityGroupUsageInventory"); - put("org.zstack.header.aliyun.AliyunOssException", "org.zstack.sdk.AliyunOssException"); - put("org.zstack.header.aliyun.ebs.AliyunEbsBackupStorageInventory", "org.zstack.sdk.AliyunEbsBackupStorageInventory"); - put("org.zstack.header.aliyun.ebs.AliyunEbsPrimaryStorageInventory", "org.zstack.sdk.AliyunEbsPrimaryStorageInventory"); - put("org.zstack.header.aliyun.ecs.EcsInstanceInventory", "org.zstack.sdk.EcsInstanceInventory"); - put("org.zstack.header.aliyun.ecs.EcsInstanceType", "org.zstack.sdk.EcsInstanceType"); - put("org.zstack.header.aliyun.errorCode.AliyunErrorCode", "org.zstack.sdk.AliyunErrorCode"); - put("org.zstack.header.aliyun.image.EcsImageInventory", "org.zstack.sdk.EcsImageInventory"); - put("org.zstack.header.aliyun.image.ProgressProperty", "org.zstack.sdk.ProgressProperty"); - put("org.zstack.header.aliyun.network.HybridConnectionType", "org.zstack.sdk.HybridConnectionType"); - put("org.zstack.header.aliyun.network.connection.AliyunRouterInterfaceInventory", "org.zstack.sdk.AliyunRouterInterfaceInventory"); - put("org.zstack.header.aliyun.network.connection.ConnectionAccessPointInventory", "org.zstack.sdk.ConnectionAccessPointInventory"); - put("org.zstack.header.aliyun.network.connection.ConnectionRelationShipInventory", "org.zstack.sdk.ConnectionRelationShipInventory"); - put("org.zstack.header.aliyun.network.connection.ConnectionRelationShipProperty", "org.zstack.sdk.ConnectionRelationShipProperty"); - put("org.zstack.header.aliyun.network.connection.VirtualBorderRouterInventory", "org.zstack.sdk.VirtualBorderRouterInventory"); - put("org.zstack.header.aliyun.network.group.EcsSecurityGroupInventory", "org.zstack.sdk.EcsSecurityGroupInventory"); - put("org.zstack.header.aliyun.network.group.EcsSecurityGroupRuleInventory", "org.zstack.sdk.EcsSecurityGroupRuleInventory"); - put("org.zstack.header.aliyun.network.vpc.EcsVSwitchInventory", "org.zstack.sdk.EcsVSwitchInventory"); - put("org.zstack.header.aliyun.network.vpc.EcsVpcInventory", "org.zstack.sdk.EcsVpcInventory"); - put("org.zstack.header.aliyun.network.vrouter.VpcVirtualRouteEntryInventory", "org.zstack.sdk.VpcVirtualRouteEntryInventory"); - put("org.zstack.header.aliyun.network.vrouter.VpcVirtualRouterInventory", "org.zstack.sdk.VpcVirtualRouterInventory"); - put("org.zstack.header.aliyun.oss.OssBucketInventory", "org.zstack.sdk.OssBucketInventory"); - put("org.zstack.header.aliyun.oss.OssBucketProperty", "org.zstack.sdk.OssBucketProperty"); - put("org.zstack.header.aliyun.storage.disk.AliyunDiskInventory", "org.zstack.sdk.AliyunDiskInventory"); - put("org.zstack.header.aliyun.storage.snapshot.AliyunSnapshotInventory", "org.zstack.sdk.AliyunSnapshotInventory"); put("org.zstack.header.allocator.datatypes.CpuMemoryCapacityData", "org.zstack.sdk.CpuMemoryCapacityData"); put("org.zstack.header.baremetal.chassis.BaremetalChassisInventory", "org.zstack.sdk.BaremetalChassisInventory"); put("org.zstack.header.baremetal.chassis.BaremetalHardwareInfoInventory", "org.zstack.sdk.BaremetalHardwareInfoInventory"); @@ -164,6 +114,9 @@ public class SourceClassMap { put("org.zstack.header.bootstrap.MiniCandidateHostStruct", "org.zstack.sdk.MiniCandidateHostStruct"); put("org.zstack.header.bootstrap.MiniHostInfo", "org.zstack.sdk.MiniHostInfo"); put("org.zstack.header.bootstrap.MiniNetworkConfigStruct", "org.zstack.sdk.MiniNetworkConfigStruct"); + put("org.zstack.header.candidate.CandidateDecision", "org.zstack.sdk.CandidateDecision"); + put("org.zstack.header.candidate.CandidateDecisionEntry", "org.zstack.sdk.CandidateDecisionEntry"); + put("org.zstack.header.candidate.CandidateResult", "org.zstack.sdk.CandidateResult"); put("org.zstack.header.cbt.CbtTaskInventory", "org.zstack.sdk.CbtTaskInventory"); put("org.zstack.header.cbt.CbtTaskResourceRefInventory", "org.zstack.sdk.CbtTaskResourceRefInventory"); put("org.zstack.header.cbt.CbtTaskStatus", "org.zstack.sdk.CbtTaskStatus"); @@ -178,6 +131,8 @@ public class SourceClassMap { put("org.zstack.header.cluster.PowerOffHardwareResult", "org.zstack.sdk.PowerOffHardwareResult"); put("org.zstack.header.configuration.DiskOfferingInventory", "org.zstack.sdk.DiskOfferingInventory"); put("org.zstack.header.configuration.InstanceOfferingInventory", "org.zstack.sdk.InstanceOfferingInventory"); + put("org.zstack.header.configuration.VmCustomSpecificationDomainMode", "org.zstack.sdk.VmCustomSpecificationDomainMode"); + put("org.zstack.header.configuration.VmCustomSpecificationStruct", "org.zstack.sdk.VmCustomSpecificationStruct"); put("org.zstack.header.console.ConsoleInventory", "org.zstack.sdk.ConsoleInventory"); put("org.zstack.header.console.ConsoleProxyAgentInventory", "org.zstack.sdk.ConsoleProxyAgentInventory"); put("org.zstack.header.core.external.service.ExternalServiceCapabilities", "org.zstack.sdk.ExternalServiceCapabilities"); @@ -191,8 +146,6 @@ public class SourceClassMap { put("org.zstack.header.core.trash.InstallPathRecycleInventory", "org.zstack.sdk.InstallPathRecycleInventory"); put("org.zstack.header.core.trash.TrashCleanupResult", "org.zstack.sdk.TrashCleanupResult"); put("org.zstack.header.core.webhooks.WebhookInventory", "org.zstack.sdk.WebhookInventory"); - put("org.zstack.header.datacenter.DataCenterInventory", "org.zstack.sdk.DataCenterInventory"); - put("org.zstack.header.datacenter.DataCenterProperty", "org.zstack.sdk.DataCenterProperty"); put("org.zstack.header.errorcode.ErrorCode", "org.zstack.sdk.ErrorCode"); put("org.zstack.header.errorcode.ErrorCodeList", "org.zstack.sdk.ErrorCodeList"); put("org.zstack.header.flowMeter.FlowCollectorInventory", "org.zstack.sdk.FlowCollectorInventory"); @@ -213,15 +166,6 @@ public class SourceClassMap { put("org.zstack.header.host.HwMonitorStatus", "org.zstack.sdk.HwMonitorStatus"); put("org.zstack.header.host.Sensor", "org.zstack.sdk.Sensor"); put("org.zstack.header.host.ServiceTypeStatisticData", "org.zstack.sdk.ServiceTypeStatisticData"); - put("org.zstack.header.hybrid.network.eip.HybridEipAddressInventory", "org.zstack.sdk.HybridEipAddressInventory"); - put("org.zstack.header.hybrid.network.eip.HybridEipStatus", "org.zstack.sdk.HybridEipStatus"); - put("org.zstack.header.hybrid.network.vpn.VpcUserVpnGatewayInventory", "org.zstack.sdk.VpcUserVpnGatewayInventory"); - put("org.zstack.header.hybrid.network.vpn.VpcVpnConnectionInventory", "org.zstack.sdk.VpcVpnConnectionInventory"); - put("org.zstack.header.hybrid.network.vpn.VpcVpnGatewayInventory", "org.zstack.sdk.VpcVpnGatewayInventory"); - put("org.zstack.header.hybrid.network.vpn.VpcVpnIkeConfigInventory", "org.zstack.sdk.VpcVpnIkeConfigInventory"); - put("org.zstack.header.hybrid.network.vpn.VpcVpnIkeConfigStruct", "org.zstack.sdk.VpcVpnIkeConfigStruct"); - put("org.zstack.header.hybrid.network.vpn.VpcVpnIpSecConfigInventory", "org.zstack.sdk.VpcVpnIpSecConfigInventory"); - put("org.zstack.header.hybrid.network.vpn.VpcVpnIpSecConfigStruct", "org.zstack.sdk.VpcVpnIpSecConfigStruct"); put("org.zstack.header.identity.AccountInventory", "org.zstack.sdk.AccountInventory"); put("org.zstack.header.identity.AccountResourceRefInventory", "org.zstack.sdk.AccountResourceRefInventory"); put("org.zstack.header.identity.Quota$QuotaUsage", "org.zstack.sdk.QuotaUsage"); @@ -230,8 +174,6 @@ public class SourceClassMap { put("org.zstack.header.identity.login.LoginAuthenticationProcedureDesc", "org.zstack.sdk.LoginAuthenticationProcedureDesc"); put("org.zstack.header.identity.role.RoleAccountRefInventory", "org.zstack.sdk.identity.role.RoleAccountRefInventory"); put("org.zstack.header.identity.role.RoleInventory", "org.zstack.sdk.identity.role.RoleInventory"); - put("org.zstack.header.identityzone.IdentityZoneInventory", "org.zstack.sdk.IdentityZoneInventory"); - put("org.zstack.header.identityzone.IdentityZoneProperty", "org.zstack.sdk.IdentityZoneProperty"); put("org.zstack.header.image.APICreateDataVolumeTemplateFromVolumeSnapshotEvent$Failure", "org.zstack.sdk.CreateDataVolumeTemplateFromVolumeSnapshotFailure"); put("org.zstack.header.image.APICreateRootVolumeTemplateFromVolumeSnapshotEvent$Failure", "org.zstack.sdk.CreateRootVolumeTemplateFromVolumeSnapshotFailure"); put("org.zstack.header.image.APIGetUploadImageJobDetailsReply$JobDetails", "org.zstack.sdk.JobDetails"); @@ -369,8 +311,6 @@ public class SourceClassMap { put("org.zstack.header.vpc.ha.VpcHaGroupNetworkServiceRefInventory", "org.zstack.sdk.VpcHaGroupNetworkServiceRefInventory"); put("org.zstack.header.vpc.ha.VpcHaGroupVipRefInventory", "org.zstack.sdk.VpcHaGroupVipRefInventory"); put("org.zstack.header.zone.ZoneInventory", "org.zstack.sdk.ZoneInventory"); - put("org.zstack.hybrid.account.HybridAccountInventory", "org.zstack.sdk.HybridAccountInventory"); - put("org.zstack.hybrid.core.HybridType", "org.zstack.sdk.HybridType"); put("org.zstack.iam1.entity.accounts.AccountGroupInventory", "org.zstack.sdk.iam1.accounts.AccountGroupInventory"); put("org.zstack.iam1.entity.accounts.AccountGroupResourceView", "org.zstack.sdk.iam1.accounts.AccountGroupResourceView"); put("org.zstack.iam1.entity.accounts.AccountGroupRoleView", "org.zstack.sdk.iam1.accounts.AccountGroupRoleView"); @@ -416,6 +356,9 @@ public class SourceClassMap { put("org.zstack.license.entity.UpdateLicenseView", "org.zstack.sdk.license.entity.UpdateLicenseView"); put("org.zstack.loginControl.entity.AccessControlRuleInventory", "org.zstack.sdk.AccessControlRuleInventory"); put("org.zstack.loginControl.entity.ControlStrategy", "org.zstack.sdk.ControlStrategy"); + put("org.zstack.managements.entity.common.ManagementNodeStatusView", "org.zstack.sdk.managements.common.ManagementNodeStatusView"); + put("org.zstack.managements.entity.common.ManagementsStatusView", "org.zstack.sdk.managements.common.ManagementsStatusView"); + put("org.zstack.managements.entity.ha2.ZSha2StatusView", "org.zstack.sdk.managements.ha2.ZSha2StatusView"); put("org.zstack.mevoco.ShareableVolumeVmInstanceRefInventory", "org.zstack.sdk.ShareableVolumeVmInstanceRefInventory"); put("org.zstack.monitoring.AlertInventory", "org.zstack.sdk.AlertInventory"); put("org.zstack.monitoring.MonitorTriggerInventory", "org.zstack.sdk.MonitorTriggerInventory"); @@ -440,6 +383,8 @@ public class SourceClassMap { put("org.zstack.network.hostNetworkInterface.lldp.entity.HostNetworkInterfaceLldpInventory", "org.zstack.sdk.HostNetworkInterfaceLldpInventory"); put("org.zstack.network.hostNetworkInterface.lldp.entity.HostNetworkInterfaceLldpRefInventory", "org.zstack.sdk.HostNetworkInterfaceLldpRefInventory"); put("org.zstack.network.l2.virtualSwitch.header.HostKernelInterfaceInventory", "org.zstack.sdk.HostKernelInterfaceInventory"); + put("org.zstack.network.l2.virtualSwitch.header.HostKernelInterfaceResult", "org.zstack.sdk.HostKernelInterfaceResult"); + put("org.zstack.network.l2.virtualSwitch.header.HostKernelInterfaceStruct", "org.zstack.sdk.HostKernelInterfaceStruct"); put("org.zstack.network.l2.virtualSwitch.header.HostKernelInterfaceUsedIpInventory", "org.zstack.sdk.HostKernelInterfaceUsedIpInventory"); put("org.zstack.network.l2.virtualSwitch.header.L2PortGroupNetworkInventory", "org.zstack.sdk.L2PortGroupNetworkInventory"); put("org.zstack.network.l2.virtualSwitch.header.L2VirtualSwitchNetworkInventory", "org.zstack.sdk.L2VirtualSwitchNetworkInventory"); @@ -558,6 +503,8 @@ public class SourceClassMap { put("org.zstack.sns.platform.snmp.SNSSnmpPlatformInventory", "org.zstack.sdk.sns.platform.snmp.SNSSnmpPlatformInventory"); put("org.zstack.sns.platform.wecom.SNSWeComAtPersonInventory", "org.zstack.sdk.sns.platform.wecom.SNSWeComAtPersonInventory"); put("org.zstack.sns.platform.wecom.SNSWeComEndpointInventory", "org.zstack.sdk.sns.platform.wecom.SNSWeComEndpointInventory"); + put("org.zstack.softwarePackage.header.JobDetails", "org.zstack.sdk.softwarePackage.header.JobDetails"); + put("org.zstack.softwarePackage.header.SoftwarePackageInventory", "org.zstack.sdk.softwarePackage.header.SoftwarePackageInventory"); put("org.zstack.sso.header.CasClientInventory", "org.zstack.sdk.CasClientInventory"); put("org.zstack.sso.header.OAuth2ClientInventory", "org.zstack.sdk.OAuth2ClientInventory"); put("org.zstack.sso.header.OAuth2TokenInventory", "org.zstack.sdk.OAuth2TokenInventory"); @@ -604,14 +551,6 @@ public class SourceClassMap { put("org.zstack.storage.primary.block.BlockPrimaryStorageInventory", "org.zstack.sdk.BlockPrimaryStorageInventory"); put("org.zstack.storage.primary.local.APIGetLocalStorageHostDiskCapacityReply$HostDiskCapacity", "org.zstack.sdk.HostDiskCapacity"); put("org.zstack.storage.primary.local.LocalStorageResourceRefInventory", "org.zstack.sdk.LocalStorageResourceRefInventory"); - put("org.zstack.storage.primary.ministorage.MiniStorageHostRefInventory", "org.zstack.sdk.MiniStorageHostRefInventory"); - put("org.zstack.storage.primary.ministorage.MiniStorageInventory", "org.zstack.sdk.MiniStorageInventory"); - put("org.zstack.storage.primary.ministorage.MiniStorageResourceReplicationInventory", "org.zstack.sdk.MiniStorageResourceReplicationInventory"); - put("org.zstack.storage.primary.ministorage.MiniStorageType", "org.zstack.sdk.MiniStorageType"); - put("org.zstack.storage.primary.ministorage.ReplicationDiskStatus", "org.zstack.sdk.ReplicationDiskStatus"); - put("org.zstack.storage.primary.ministorage.ReplicationNetworkStatus", "org.zstack.sdk.ReplicationNetworkStatus"); - put("org.zstack.storage.primary.ministorage.ReplicationRole", "org.zstack.sdk.ReplicationRole"); - put("org.zstack.storage.primary.ministorage.ReplicationState", "org.zstack.sdk.ReplicationState"); put("org.zstack.storage.primary.sharedblock.SharedBlockCandidateStruct", "org.zstack.sdk.SharedBlockCandidateStruct"); put("org.zstack.storage.primary.sharedblock.SharedBlockGroupPrimaryStorageHostRefInventory", "org.zstack.sdk.SharedBlockGroupPrimaryStorageHostRefInventory"); put("org.zstack.storage.primary.sharedblock.SharedBlockGroupPrimaryStorageInventory", "org.zstack.sdk.SharedBlockGroupPrimaryStorageInventory"); @@ -653,10 +592,10 @@ public class SourceClassMap { put("org.zstack.vrouterRoute.VRouterRouteTableInventory", "org.zstack.sdk.VRouterRouteTableInventory"); put("org.zstack.vrouterRoute.VirtualRouterVRouterRouteTableRefInventory", "org.zstack.sdk.VirtualRouterVRouterRouteTableRefInventory"); put("org.zstack.xdragon.XDragonHostInventory", "org.zstack.sdk.XDragonHostInventory"); - put("org.zstack.zbox.ZBoxInventory", "org.zstack.sdk.ZBoxInventory"); - put("org.zstack.zbox.ZBoxLocationRefInventory", "org.zstack.sdk.ZBoxLocationRefInventory"); - put("org.zstack.zbox.ZBoxState", "org.zstack.sdk.ZBoxState"); - put("org.zstack.zbox.ZBoxStatus", "org.zstack.sdk.ZBoxStatus"); + put("org.zstack.zbox.ZBoxInventory", "org.zstack.sdk.zbox.ZBoxInventory"); + put("org.zstack.zbox.ZBoxLocationRefInventory", "org.zstack.sdk.zbox.ZBoxLocationRefInventory"); + put("org.zstack.zbox.ZBoxState", "org.zstack.sdk.zbox.ZBoxState"); + put("org.zstack.zbox.ZBoxStatus", "org.zstack.sdk.zbox.ZBoxStatus"); put("org.zstack.zcex.entity.ZceXClusterView", "org.zstack.sdk.zcex.entity.ZceXClusterView"); put("org.zstack.zcex.entity.ZceXHostSummaryView", "org.zstack.sdk.zcex.entity.ZceXHostSummaryView"); put("org.zstack.zcex.entity.ZceXInventory", "org.zstack.sdk.zcex.entity.ZceXInventory"); @@ -763,23 +702,6 @@ public class SourceClassMap { put("org.zstack.sdk.AffinityGroupUsageInventory", "org.zstack.header.affinitygroup.AffinityGroupUsageInventory"); put("org.zstack.sdk.AiSiNoSecretResourcePoolInventory", "org.zstack.crypto.securitymachine.thirdparty.aisino.AiSiNoSecretResourcePoolInventory"); put("org.zstack.sdk.AlertInventory", "org.zstack.monitoring.AlertInventory"); - put("org.zstack.sdk.AliyunDiskInventory", "org.zstack.header.aliyun.storage.disk.AliyunDiskInventory"); - put("org.zstack.sdk.AliyunEbsBackupStorageInventory", "org.zstack.header.aliyun.ebs.AliyunEbsBackupStorageInventory"); - put("org.zstack.sdk.AliyunEbsPrimaryStorageInventory", "org.zstack.header.aliyun.ebs.AliyunEbsPrimaryStorageInventory"); - put("org.zstack.sdk.AliyunErrorCode", "org.zstack.header.aliyun.errorCode.AliyunErrorCode"); - put("org.zstack.sdk.AliyunNasAccessGroupInventory", "org.zstack.aliyun.nas.filesystem.AliyunNasAccessGroupInventory"); - put("org.zstack.sdk.AliyunNasAccessGroupProperty", "org.zstack.aliyun.nas.message.AliyunNasAccessGroupProperty"); - put("org.zstack.sdk.AliyunNasAccessRuleInventory", "org.zstack.aliyun.nas.filesystem.AliyunNasAccessRuleInventory"); - put("org.zstack.sdk.AliyunNasFileSystemInventory", "org.zstack.aliyun.nas.filesystem.AliyunNasFileSystemInventory"); - put("org.zstack.sdk.AliyunNasFileSystemProperty", "org.zstack.aliyun.nas.message.AliyunNasFileSystemProperty"); - put("org.zstack.sdk.AliyunNasMountTargetInventory", "org.zstack.aliyun.nas.filesystem.AliyunNasMountTargetInventory"); - put("org.zstack.sdk.AliyunNasMountTargetProperty", "org.zstack.aliyun.nas.message.AliyunNasMountTargetProperty"); - put("org.zstack.sdk.AliyunOssException", "org.zstack.header.aliyun.AliyunOssException"); - put("org.zstack.sdk.AliyunPanguPartitionInventory", "org.zstack.aliyun.pangu.AliyunPanguPartitionInventory"); - put("org.zstack.sdk.AliyunProxyVSwitchInventory", "org.zstack.aliyunproxy.vpc.AliyunProxyVSwitchInventory"); - put("org.zstack.sdk.AliyunProxyVpcInventory", "org.zstack.aliyunproxy.vpc.AliyunProxyVpcInventory"); - put("org.zstack.sdk.AliyunRouterInterfaceInventory", "org.zstack.header.aliyun.network.connection.AliyunRouterInterfaceInventory"); - put("org.zstack.sdk.AliyunSnapshotInventory", "org.zstack.header.aliyun.storage.snapshot.AliyunSnapshotInventory"); put("org.zstack.sdk.ApplianceVmInventory", "org.zstack.appliancevm.ApplianceVmInventory"); put("org.zstack.sdk.AttachTagResult", "org.zstack.tag2.AttachTagResult"); put("org.zstack.sdk.AutoScalingGroupActivityInventory", "org.zstack.autoscaling.group.activity.AutoScalingGroupActivityInventory"); @@ -796,22 +718,6 @@ public class SourceClassMap { put("org.zstack.sdk.BackupMode", "org.zstack.header.storage.backup.BackupMode"); put("org.zstack.sdk.BackupStorageExternalBackupInfo", "org.zstack.externalbackup.BackupStorageExternalBackupInfo"); put("org.zstack.sdk.BackupStorageInventory", "org.zstack.header.storage.backup.BackupStorageInventory"); - put("org.zstack.sdk.BareMetal2BillingInventory", "org.zstack.billing.generator.baremetal2.BareMetal2BillingInventory"); - put("org.zstack.sdk.BareMetal2BondingInventory", "org.zstack.baremetal2.chassis.BareMetal2BondingInventory"); - put("org.zstack.sdk.BareMetal2BondingNicRefInventory", "org.zstack.baremetal2.chassis.BareMetal2BondingNicRefInventory"); - put("org.zstack.sdk.BareMetal2ChassisDiskInventory", "org.zstack.baremetal2.chassis.BareMetal2ChassisDiskInventory"); - put("org.zstack.sdk.BareMetal2ChassisInventory", "org.zstack.baremetal2.chassis.BareMetal2ChassisInventory"); - put("org.zstack.sdk.BareMetal2ChassisNicInventory", "org.zstack.baremetal2.chassis.BareMetal2ChassisNicInventory"); - put("org.zstack.sdk.BareMetal2ChassisOfferingInventory", "org.zstack.baremetal2.configuration.BareMetal2ChassisOfferingInventory"); - put("org.zstack.sdk.BareMetal2GatewayInventory", "org.zstack.baremetal2.gateway.BareMetal2GatewayInventory"); - put("org.zstack.sdk.BareMetal2GatewayProvisionNicInventory", "org.zstack.baremetal2.gateway.BareMetal2GatewayProvisionNicInventory"); - put("org.zstack.sdk.BareMetal2InstanceInventory", "org.zstack.baremetal2.instance.BareMetal2InstanceInventory"); - put("org.zstack.sdk.BareMetal2InstanceProvisionNicInventory", "org.zstack.baremetal2.instance.BareMetal2InstanceProvisionNicInventory"); - put("org.zstack.sdk.BareMetal2IpmiChassisInventory", "org.zstack.baremetal2.chassis.ipmi.BareMetal2IpmiChassisInventory"); - put("org.zstack.sdk.BareMetal2ProvisionNetworkInventory", "org.zstack.baremetal2.provisionnetwork.BareMetal2ProvisionNetworkInventory"); - put("org.zstack.sdk.BareMetal2ProvisionNetworkIpCapacity", "org.zstack.baremetal2.provisionnetwork.BareMetal2ProvisionNetworkIpCapacity"); - put("org.zstack.sdk.BareMetal2Spending", "org.zstack.billing.spendingcalculator.baremetal2.BareMetal2Spending"); - put("org.zstack.sdk.BareMetal2SpendingDetails", "org.zstack.billing.spendingcalculator.baremetal2.BareMetal2SpendingDetails"); put("org.zstack.sdk.BaremetalBondingInventory", "org.zstack.header.baremetal.network.BaremetalBondingInventory"); put("org.zstack.sdk.BaremetalChassisInventory", "org.zstack.header.baremetal.chassis.BaremetalChassisInventory"); put("org.zstack.sdk.BaremetalHardwareInfoInventory", "org.zstack.header.baremetal.chassis.BaremetalHardwareInfoInventory"); @@ -828,6 +734,9 @@ public class SourceClassMap { put("org.zstack.sdk.BlockVolumeInventory", "org.zstack.header.volume.block.BlockVolumeInventory"); put("org.zstack.sdk.CCSCertificateAccountRefInventory", "org.zstack.crypto.ccs.CCSCertificateAccountRefInventory"); put("org.zstack.sdk.CCSCertificateInventory", "org.zstack.crypto.ccs.CCSCertificateInventory"); + put("org.zstack.sdk.CandidateDecision", "org.zstack.header.candidate.CandidateDecision"); + put("org.zstack.sdk.CandidateDecisionEntry", "org.zstack.header.candidate.CandidateDecisionEntry"); + put("org.zstack.sdk.CandidateResult", "org.zstack.header.candidate.CandidateResult"); put("org.zstack.sdk.CasClientInventory", "org.zstack.sso.header.CasClientInventory"); put("org.zstack.sdk.CbtTaskInventory", "org.zstack.header.cbt.CbtTaskInventory"); put("org.zstack.sdk.CbtTaskResourceRefInventory", "org.zstack.header.cbt.CbtTaskResourceRefInventory"); @@ -856,9 +765,6 @@ public class SourceClassMap { put("org.zstack.sdk.CloudFormationStackEventInventory", "org.zstack.header.cloudformation.CloudFormationStackEventInventory"); put("org.zstack.sdk.ClusterDRSInventory", "org.zstack.drs.entity.ClusterDRSInventory"); put("org.zstack.sdk.ClusterInventory", "org.zstack.header.cluster.ClusterInventory"); - put("org.zstack.sdk.ConnectionAccessPointInventory", "org.zstack.header.aliyun.network.connection.ConnectionAccessPointInventory"); - put("org.zstack.sdk.ConnectionRelationShipInventory", "org.zstack.header.aliyun.network.connection.ConnectionRelationShipInventory"); - put("org.zstack.sdk.ConnectionRelationShipProperty", "org.zstack.header.aliyun.network.connection.ConnectionRelationShipProperty"); put("org.zstack.sdk.ConsoleInventory", "org.zstack.header.console.ConsoleInventory"); put("org.zstack.sdk.ConsoleProxyAgentInventory", "org.zstack.header.console.ConsoleProxyAgentInventory"); put("org.zstack.sdk.ControlStrategy", "org.zstack.loginControl.entity.ControlStrategy"); @@ -868,8 +774,6 @@ public class SourceClassMap { put("org.zstack.sdk.CreateVmInstanceFromTemplatedVmInstanceResults", "org.zstack.header.vm.CreateVmInstanceFromTemplatedVmInstanceResults"); put("org.zstack.sdk.DRSAdviceInventory", "org.zstack.drs.entity.DRSAdviceInventory"); put("org.zstack.sdk.DRSVmMigrationActivityInventory", "org.zstack.drs.entity.DRSVmMigrationActivityInventory"); - put("org.zstack.sdk.DataCenterInventory", "org.zstack.header.datacenter.DataCenterInventory"); - put("org.zstack.sdk.DataCenterProperty", "org.zstack.header.datacenter.DataCenterProperty"); put("org.zstack.sdk.DataVolumeBillingInventory", "org.zstack.billing.generator.volume.data.DataVolumeBillingInventory"); put("org.zstack.sdk.DataVolumeSpending", "org.zstack.billing.spendingcalculator.volume.data.DataVolumeSpending"); put("org.zstack.sdk.DataVolumeSpendingInventory", "org.zstack.billing.spendingcalculator.volume.data.DataVolumeSpendingInventory"); @@ -879,13 +783,6 @@ public class SourceClassMap { put("org.zstack.sdk.DirectoryInventory", "org.zstack.directory.DirectoryInventory"); put("org.zstack.sdk.DiskOfferingInventory", "org.zstack.header.configuration.DiskOfferingInventory"); put("org.zstack.sdk.ESXHostInventory", "org.zstack.vmware.ESXHostInventory"); - put("org.zstack.sdk.EcsImageInventory", "org.zstack.header.aliyun.image.EcsImageInventory"); - put("org.zstack.sdk.EcsInstanceInventory", "org.zstack.header.aliyun.ecs.EcsInstanceInventory"); - put("org.zstack.sdk.EcsInstanceType", "org.zstack.header.aliyun.ecs.EcsInstanceType"); - put("org.zstack.sdk.EcsSecurityGroupInventory", "org.zstack.header.aliyun.network.group.EcsSecurityGroupInventory"); - put("org.zstack.sdk.EcsSecurityGroupRuleInventory", "org.zstack.header.aliyun.network.group.EcsSecurityGroupRuleInventory"); - put("org.zstack.sdk.EcsVSwitchInventory", "org.zstack.header.aliyun.network.vpc.EcsVSwitchInventory"); - put("org.zstack.sdk.EcsVpcInventory", "org.zstack.header.aliyun.network.vpc.EcsVpcInventory"); put("org.zstack.sdk.EipInventory", "org.zstack.network.service.eip.EipInventory"); put("org.zstack.sdk.ElaborationCategory", "org.zstack.core.errorcode.ElaborationCategory"); put("org.zstack.sdk.ElaborationCheckResult", "org.zstack.core.errorcode.ElaborationCheckResult"); @@ -921,8 +818,6 @@ public class SourceClassMap { put("org.zstack.sdk.GlobalConfigOptions", "org.zstack.core.config.GlobalConfigOptions"); put("org.zstack.sdk.GlobalConfigTemplateInventory", "org.zstack.templateConfig.GlobalConfigTemplateInventory"); put("org.zstack.sdk.GpuDeviceInventory", "org.zstack.pciDevice.gpu.GpuDeviceInventory"); - put("org.zstack.sdk.GuestToolsInventory", "org.zstack.guesttools.GuestToolsInventory"); - put("org.zstack.sdk.GuestToolsStateInventory", "org.zstack.guesttools.GuestToolsStateInventory"); put("org.zstack.sdk.HaStrategyConditionInventory", "org.zstack.ha.HaStrategyConditionInventory"); put("org.zstack.sdk.HaiTaiSecretResourcePoolInventory", "org.zstack.crypto.securitymachine.thirdparty.haitai.HaiTaiSecretResourcePoolInventory"); put("org.zstack.sdk.HardwareL2VxlanNetworkPoolInventory", "org.zstack.sdnController.header.HardwareL2VxlanNetworkPoolInventory"); @@ -934,6 +829,8 @@ public class SourceClassMap { put("org.zstack.sdk.HostIommuStatusType", "org.zstack.pciDevice.HostIommuStatusType"); put("org.zstack.sdk.HostIpmiInventory", "org.zstack.header.host.HostIpmiInventory"); put("org.zstack.sdk.HostKernelInterfaceInventory", "org.zstack.network.l2.virtualSwitch.header.HostKernelInterfaceInventory"); + put("org.zstack.sdk.HostKernelInterfaceResult", "org.zstack.network.l2.virtualSwitch.header.HostKernelInterfaceResult"); + put("org.zstack.sdk.HostKernelInterfaceStruct", "org.zstack.network.l2.virtualSwitch.header.HostKernelInterfaceStruct"); put("org.zstack.sdk.HostKernelInterfaceUsedIpInventory", "org.zstack.network.l2.virtualSwitch.header.HostKernelInterfaceUsedIpInventory"); put("org.zstack.sdk.HostLoad", "org.zstack.drs.api.HostLoad"); put("org.zstack.sdk.HostNUMANode", "org.zstack.header.host.HostNUMANode"); @@ -949,17 +846,10 @@ public class SourceClassMap { put("org.zstack.sdk.HostPhysicalMemoryInventory", "org.zstack.header.host.HostPhysicalMemoryInventory"); put("org.zstack.sdk.HostSchedulingRuleGroupInventory", "org.zstack.header.vmscheduling.HostSchedulingRuleGroupInventory"); put("org.zstack.sdk.HwMonitorStatus", "org.zstack.header.host.HwMonitorStatus"); - put("org.zstack.sdk.HybridAccountInventory", "org.zstack.hybrid.account.HybridAccountInventory"); - put("org.zstack.sdk.HybridConnectionType", "org.zstack.header.aliyun.network.HybridConnectionType"); - put("org.zstack.sdk.HybridEipAddressInventory", "org.zstack.header.hybrid.network.eip.HybridEipAddressInventory"); - put("org.zstack.sdk.HybridEipStatus", "org.zstack.header.hybrid.network.eip.HybridEipStatus"); - put("org.zstack.sdk.HybridType", "org.zstack.hybrid.core.HybridType"); put("org.zstack.sdk.HypervisorVersionState", "org.zstack.kvm.hypervisor.datatype.HypervisorVersionState"); put("org.zstack.sdk.IPsecConnectionInventory", "org.zstack.ipsec.IPsecConnectionInventory"); put("org.zstack.sdk.IPsecL3NetworkRefInventory", "org.zstack.ipsec.IPsecL3NetworkRefInventory"); put("org.zstack.sdk.IPsecPeerCidrInventory", "org.zstack.ipsec.IPsecPeerCidrInventory"); - put("org.zstack.sdk.IdentityZoneInventory", "org.zstack.header.identityzone.IdentityZoneInventory"); - put("org.zstack.sdk.IdentityZoneProperty", "org.zstack.header.identityzone.IdentityZoneProperty"); put("org.zstack.sdk.ImageBackupStorageRefInventory", "org.zstack.header.image.ImageBackupStorageRefInventory"); put("org.zstack.sdk.ImageCacheInventory", "org.zstack.header.storage.primary.ImageCacheInventory"); put("org.zstack.sdk.ImageInventory", "org.zstack.header.image.ImageInventory"); @@ -1034,10 +924,6 @@ public class SourceClassMap { put("org.zstack.sdk.MiniCandidateHostStruct", "org.zstack.header.bootstrap.MiniCandidateHostStruct"); put("org.zstack.sdk.MiniHostInfo", "org.zstack.header.bootstrap.MiniHostInfo"); put("org.zstack.sdk.MiniNetworkConfigStruct", "org.zstack.header.bootstrap.MiniNetworkConfigStruct"); - put("org.zstack.sdk.MiniStorageHostRefInventory", "org.zstack.storage.primary.ministorage.MiniStorageHostRefInventory"); - put("org.zstack.sdk.MiniStorageInventory", "org.zstack.storage.primary.ministorage.MiniStorageInventory"); - put("org.zstack.sdk.MiniStorageResourceReplicationInventory", "org.zstack.storage.primary.ministorage.MiniStorageResourceReplicationInventory"); - put("org.zstack.sdk.MiniStorageType", "org.zstack.storage.primary.ministorage.MiniStorageType"); put("org.zstack.sdk.MirrorNetworkUsedIpInventory", "org.zstack.header.portMirror.MirrorNetworkUsedIpInventory"); put("org.zstack.sdk.MonInfo", "org.zstack.storage.ceph.primary.KVMCephVolumeTO$MonInfo"); put("org.zstack.sdk.MonInfo", "org.zstack.storage.ceph.primary.KvmCephCdRomTO$MonInfo"); @@ -1071,8 +957,6 @@ public class SourceClassMap { put("org.zstack.sdk.NvmeTargetInventory", "org.zstack.storage.device.nvme.NvmeTargetInventory"); put("org.zstack.sdk.OAuth2ClientInventory", "org.zstack.sso.header.OAuth2ClientInventory"); put("org.zstack.sdk.OAuth2TokenInventory", "org.zstack.sso.header.OAuth2TokenInventory"); - put("org.zstack.sdk.OssBucketInventory", "org.zstack.header.aliyun.oss.OssBucketInventory"); - put("org.zstack.sdk.OssBucketProperty", "org.zstack.header.aliyun.oss.OssBucketProperty"); put("org.zstack.sdk.OvfCdDriverInfo", "org.zstack.ovf.datatype.OvfCdDriverInfo"); put("org.zstack.sdk.OvfCpuInfo", "org.zstack.ovf.datatype.OvfCpuInfo"); put("org.zstack.sdk.OvfDiskInfo", "org.zstack.ovf.datatype.OvfDiskInfo"); @@ -1126,13 +1010,11 @@ public class SourceClassMap { put("org.zstack.sdk.PreconfigurationTemplateInventory", "org.zstack.header.baremetal.preconfiguration.PreconfigurationTemplateInventory"); put("org.zstack.sdk.PreviewResourceStruct", "org.zstack.header.cloudformation.PreviewResourceStruct"); put("org.zstack.sdk.Price", "org.zstack.billing.table.APICreatePriceTableMsg$Price"); - put("org.zstack.sdk.PriceBareMetal2ChassisOfferingRefInventory", "org.zstack.billing.spendingcalculator.baremetal2.PriceBareMetal2ChassisOfferingRefInventory"); put("org.zstack.sdk.PriceInventory", "org.zstack.billing.PriceInventory"); put("org.zstack.sdk.PricePciDeviceOfferingRefInventory", "org.zstack.billing.spendingcalculator.pcidevice.PricePciDeviceOfferingRefInventory"); put("org.zstack.sdk.PriceTableInventory", "org.zstack.billing.table.PriceTableInventory"); put("org.zstack.sdk.PrimaryStorageHostStatus", "org.zstack.header.storage.primary.PrimaryStorageHostStatus"); put("org.zstack.sdk.PrimaryStorageInventory", "org.zstack.header.storage.primary.PrimaryStorageInventory"); - put("org.zstack.sdk.ProgressProperty", "org.zstack.header.aliyun.image.ProgressProperty"); put("org.zstack.sdk.ProtocolType", "org.zstack.vpcfirewall.entity.ProtocolType"); put("org.zstack.sdk.PubIpVipBandwidthInBillingInventory", "org.zstack.billing.generator.pubip.vip.PubIpVipBandwidthInBillingInventory"); put("org.zstack.sdk.PubIpVipBandwidthOutBillingInventory", "org.zstack.billing.generator.pubip.vip.PubIpVipBandwidthOutBillingInventory"); @@ -1147,11 +1029,7 @@ public class SourceClassMap { put("org.zstack.sdk.RedirectUrlTemplate", "org.zstack.sso.header.RedirectUrlTemplate"); put("org.zstack.sdk.RemoteVtepInventory", "org.zstack.network.l2.vxlan.vtep.RemoteVtepInventory"); put("org.zstack.sdk.RemovalInstanceRuleInventory", "org.zstack.autoscaling.group.rule.RemovalInstanceRuleInventory"); - put("org.zstack.sdk.ReplicationDiskStatus", "org.zstack.storage.primary.ministorage.ReplicationDiskStatus"); put("org.zstack.sdk.ReplicationGroupState", "org.zstack.imagereplicator.ReplicationGroupState"); - put("org.zstack.sdk.ReplicationNetworkStatus", "org.zstack.storage.primary.ministorage.ReplicationNetworkStatus"); - put("org.zstack.sdk.ReplicationRole", "org.zstack.storage.primary.ministorage.ReplicationRole"); - put("org.zstack.sdk.ReplicationState", "org.zstack.storage.primary.ministorage.ReplicationState"); put("org.zstack.sdk.ReservedIpRangeInventory", "org.zstack.header.network.l3.ReservedIpRangeInventory"); put("org.zstack.sdk.ResourceBackupState", "org.zstack.externalbackup.ResourceBackupState"); put("org.zstack.sdk.ResourceBindableConfigStruct", "org.zstack.resourceconfig.APIGetResourceBindableConfigReply$ResourceBindableConfigStruct"); @@ -1265,7 +1143,6 @@ public class SourceClassMap { put("org.zstack.sdk.VipNetworkServicesRefInventory", "org.zstack.network.service.vip.VipNetworkServicesRefInventory"); put("org.zstack.sdk.VipPortRangeInventory", "org.zstack.network.service.virtualrouter.APIGetVipUsedPortsReply$VipPortRangeInventory"); put("org.zstack.sdk.VipQosInventory", "org.zstack.header.vipQos.VipQosInventory"); - put("org.zstack.sdk.VirtualBorderRouterInventory", "org.zstack.header.aliyun.network.connection.VirtualBorderRouterInventory"); put("org.zstack.sdk.VirtualRouterOfferingInventory", "org.zstack.network.service.virtualrouter.VirtualRouterOfferingInventory"); put("org.zstack.sdk.VirtualRouterSoftwareVersionInventory", "org.zstack.network.service.virtualrouter.VirtualRouterSoftwareVersionInventory"); put("org.zstack.sdk.VirtualRouterVRouterRouteTableRefInventory", "org.zstack.vrouterRoute.VirtualRouterVRouterRouteTableRefInventory"); @@ -1276,6 +1153,8 @@ public class SourceClassMap { put("org.zstack.sdk.VmCPUSpendingDetails", "org.zstack.billing.spendingcalculator.vm.VmCPUSpendingDetails"); put("org.zstack.sdk.VmCapabilities", "org.zstack.header.vm.VmCapabilities"); put("org.zstack.sdk.VmCdRomInventory", "org.zstack.header.vm.cdrom.VmCdRomInventory"); + put("org.zstack.sdk.VmCustomSpecificationDomainMode", "org.zstack.header.configuration.VmCustomSpecificationDomainMode"); + put("org.zstack.sdk.VmCustomSpecificationStruct", "org.zstack.header.configuration.VmCustomSpecificationStruct"); put("org.zstack.sdk.VmDnsInventory", "org.zstack.header.vm.VmDnsInventory"); put("org.zstack.sdk.VmExternalBackupInfo", "org.zstack.externalbackup.VmExternalBackupInfo"); put("org.zstack.sdk.VmInstanceInventory", "org.zstack.header.vm.VmInstanceInventory"); @@ -1330,27 +1209,10 @@ public class SourceClassMap { put("org.zstack.sdk.VpcRouterDnsInventory", "org.zstack.header.vpc.VpcRouterDnsInventory"); put("org.zstack.sdk.VpcRouterVmInventory", "org.zstack.header.vpc.VpcRouterVmInventory"); put("org.zstack.sdk.VpcSnatStateInventory", "org.zstack.header.vpc.VpcSnatStateInventory"); - put("org.zstack.sdk.VpcUserVpnGatewayInventory", "org.zstack.header.hybrid.network.vpn.VpcUserVpnGatewayInventory"); - put("org.zstack.sdk.VpcVirtualRouteEntryInventory", "org.zstack.header.aliyun.network.vrouter.VpcVirtualRouteEntryInventory"); - put("org.zstack.sdk.VpcVirtualRouterInventory", "org.zstack.header.aliyun.network.vrouter.VpcVirtualRouterInventory"); - put("org.zstack.sdk.VpcVpnConnectionInventory", "org.zstack.header.hybrid.network.vpn.VpcVpnConnectionInventory"); - put("org.zstack.sdk.VpcVpnGatewayInventory", "org.zstack.header.hybrid.network.vpn.VpcVpnGatewayInventory"); - put("org.zstack.sdk.VpcVpnIkeConfigInventory", "org.zstack.header.hybrid.network.vpn.VpcVpnIkeConfigInventory"); - put("org.zstack.sdk.VpcVpnIkeConfigStruct", "org.zstack.header.hybrid.network.vpn.VpcVpnIkeConfigStruct"); - put("org.zstack.sdk.VpcVpnIpSecConfigInventory", "org.zstack.header.hybrid.network.vpn.VpcVpnIpSecConfigInventory"); - put("org.zstack.sdk.VpcVpnIpSecConfigStruct", "org.zstack.header.hybrid.network.vpn.VpcVpnIpSecConfigStruct"); put("org.zstack.sdk.VtepInventory", "org.zstack.network.l2.vxlan.vtep.VtepInventory"); put("org.zstack.sdk.WebhookInventory", "org.zstack.header.core.webhooks.WebhookInventory"); put("org.zstack.sdk.XDragonHostInventory", "org.zstack.xdragon.XDragonHostInventory"); put("org.zstack.sdk.XskyBlockVolumeInventory", "org.zstack.header.volume.block.XskyBlockVolumeInventory"); - put("org.zstack.sdk.ZBoxBackupInventory", "org.zstack.externalbackup.zbox.ZBoxBackupInventory"); - put("org.zstack.sdk.ZBoxBackupStorageBackupInfo", "org.zstack.externalbackup.zbox.ZBoxBackupStorageBackupInfo"); - put("org.zstack.sdk.ZBoxInventory", "org.zstack.zbox.ZBoxInventory"); - put("org.zstack.sdk.ZBoxLocationRefInventory", "org.zstack.zbox.ZBoxLocationRefInventory"); - put("org.zstack.sdk.ZBoxState", "org.zstack.zbox.ZBoxState"); - put("org.zstack.sdk.ZBoxStatus", "org.zstack.zbox.ZBoxStatus"); - put("org.zstack.sdk.ZBoxVmBackupInfo", "org.zstack.externalbackup.zbox.ZBoxVmBackupInfo"); - put("org.zstack.sdk.ZBoxVolumeBackupInfo", "org.zstack.externalbackup.zbox.ZBoxVolumeBackupInfo"); put("org.zstack.sdk.ZQLQueryReturn", "org.zstack.zql.ZQLQueryReturn"); put("org.zstack.sdk.ZoneInventory", "org.zstack.header.zone.ZoneInventory"); put("org.zstack.sdk.attribute.entity.CreateResourceAttributeResult", "org.zstack.header.resourceattribute.entity.CreateResourceAttributeResult"); @@ -1361,6 +1223,9 @@ public class SourceClassMap { put("org.zstack.sdk.databasebackup.DatabaseBackupStorageRefInventory", "org.zstack.header.storage.database.backup.DatabaseBackupStorageRefInventory"); put("org.zstack.sdk.databasebackup.DatabaseBackupStruct", "org.zstack.header.storage.database.backup.DatabaseBackupStruct"); put("org.zstack.sdk.databasebackup.DatabaseType", "org.zstack.header.storage.database.backup.DatabaseType"); + put("org.zstack.sdk.guesttools.GuestToolsInventory", "org.zstack.guesttools.GuestToolsInventory"); + put("org.zstack.sdk.guesttools.GuestToolsStateInventory", "org.zstack.guesttools.GuestToolsStateInventory"); + put("org.zstack.sdk.guesttools.advanced.VmCustomSpecificationInventory", "org.zstack.guesttools.advanced.VmCustomSpecificationInventory"); put("org.zstack.sdk.iam1.accounts.AccountGroupInventory", "org.zstack.iam1.entity.accounts.AccountGroupInventory"); put("org.zstack.sdk.iam1.accounts.AccountGroupResourceView", "org.zstack.iam1.entity.accounts.AccountGroupResourceView"); put("org.zstack.sdk.iam1.accounts.AccountGroupRoleView", "org.zstack.iam1.entity.accounts.AccountGroupRoleView"); @@ -1381,6 +1246,9 @@ public class SourceClassMap { put("org.zstack.sdk.identity.role.RoleInventory", "org.zstack.header.identity.role.RoleInventory"); put("org.zstack.sdk.license.entity.LicenseUsageView", "org.zstack.license.entity.LicenseUsageView"); put("org.zstack.sdk.license.entity.UpdateLicenseView", "org.zstack.license.entity.UpdateLicenseView"); + put("org.zstack.sdk.managements.common.ManagementNodeStatusView", "org.zstack.managements.entity.common.ManagementNodeStatusView"); + put("org.zstack.sdk.managements.common.ManagementsStatusView", "org.zstack.managements.entity.common.ManagementsStatusView"); + put("org.zstack.sdk.managements.ha2.ZSha2StatusView", "org.zstack.managements.entity.ha2.ZSha2StatusView"); put("org.zstack.sdk.sns.SNSApplicationEndpointInventory", "org.zstack.sns.SNSApplicationEndpointInventory"); put("org.zstack.sdk.sns.SNSApplicationPlatformInventory", "org.zstack.sns.SNSApplicationPlatformInventory"); put("org.zstack.sdk.sns.SNSSmsEndpointInventory", "org.zstack.sns.SNSSmsEndpointInventory"); @@ -1400,6 +1268,16 @@ public class SourceClassMap { put("org.zstack.sdk.sns.platform.snmp.SNSSnmpPlatformInventory", "org.zstack.sns.platform.snmp.SNSSnmpPlatformInventory"); put("org.zstack.sdk.sns.platform.wecom.SNSWeComAtPersonInventory", "org.zstack.sns.platform.wecom.SNSWeComAtPersonInventory"); put("org.zstack.sdk.sns.platform.wecom.SNSWeComEndpointInventory", "org.zstack.sns.platform.wecom.SNSWeComEndpointInventory"); + put("org.zstack.sdk.softwarePackage.header.JobDetails", "org.zstack.softwarePackage.header.JobDetails"); + put("org.zstack.sdk.softwarePackage.header.SoftwarePackageInventory", "org.zstack.softwarePackage.header.SoftwarePackageInventory"); + put("org.zstack.sdk.zbox.ZBoxBackupInventory", "org.zstack.externalbackup.zbox.ZBoxBackupInventory"); + put("org.zstack.sdk.zbox.ZBoxBackupStorageBackupInfo", "org.zstack.externalbackup.zbox.ZBoxBackupStorageBackupInfo"); + put("org.zstack.sdk.zbox.ZBoxInventory", "org.zstack.zbox.ZBoxInventory"); + put("org.zstack.sdk.zbox.ZBoxLocationRefInventory", "org.zstack.zbox.ZBoxLocationRefInventory"); + put("org.zstack.sdk.zbox.ZBoxState", "org.zstack.zbox.ZBoxState"); + put("org.zstack.sdk.zbox.ZBoxStatus", "org.zstack.zbox.ZBoxStatus"); + put("org.zstack.sdk.zbox.ZBoxVmBackupInfo", "org.zstack.externalbackup.zbox.ZBoxVmBackupInfo"); + put("org.zstack.sdk.zbox.ZBoxVolumeBackupInfo", "org.zstack.externalbackup.zbox.ZBoxVolumeBackupInfo"); put("org.zstack.sdk.zcex.entity.ZceXClusterView", "org.zstack.zcex.entity.ZceXClusterView"); put("org.zstack.sdk.zcex.entity.ZceXHostSummaryView", "org.zstack.zcex.entity.ZceXHostSummaryView"); put("org.zstack.sdk.zcex.entity.ZceXInventory", "org.zstack.zcex.entity.ZceXInventory"); diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunEbsBackupStorageAction.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunEbsBackupStorageAction.java deleted file mode 100644 index 80bdc635df..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunEbsBackupStorageAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddAliyunEbsBackupStorageAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddBackupStorageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossBucketUuid; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String url; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String type = "AliyunEBS"; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean importImages = false; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddBackupStorageResult value = res.getResult(org.zstack.sdk.AddBackupStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.AddBackupStorageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/backup-storage/aliyun/ebs"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunKeySecretAction.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunKeySecretAction.java deleted file mode 100644 index f800338868..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunKeySecretAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddAliyunKeySecretAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddAliyunKeySecretResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String key; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String secret; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String accountUuid; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean sync = true; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddAliyunKeySecretResult value = res.getResult(org.zstack.sdk.AddAliyunKeySecretResult.class); - ret.value = value == null ? new org.zstack.sdk.AddAliyunKeySecretResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/key"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunKeySecretResult.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunKeySecretResult.java deleted file mode 100644 index fbc519859f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunKeySecretResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridAccountInventory; - -public class AddAliyunKeySecretResult { - public HybridAccountInventory inventory; - public void setInventory(HybridAccountInventory inventory) { - this.inventory = inventory; - } - public HybridAccountInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasAccessGroupAction.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunNasAccessGroupAction.java deleted file mode 100644 index aae5db2f8c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasAccessGroupAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddAliyunNasAccessGroupAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddAliyunNasAccessGroupResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String groupName; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddAliyunNasAccessGroupResult value = res.getResult(org.zstack.sdk.AddAliyunNasAccessGroupResult.class); - ret.value = value == null ? new org.zstack.sdk.AddAliyunNasAccessGroupResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/nas/aliyun/access"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "addAliyunNasAccessGroup"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasAccessGroupResult.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunNasAccessGroupResult.java deleted file mode 100644 index 9b31da168c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasAccessGroupResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunNasAccessGroupInventory; - -public class AddAliyunNasAccessGroupResult { - public AliyunNasAccessGroupInventory inventory; - public void setInventory(AliyunNasAccessGroupInventory inventory) { - this.inventory = inventory; - } - public AliyunNasAccessGroupInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasFileSystemAction.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunNasFileSystemAction.java deleted file mode 100644 index b0462f50eb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasFileSystemAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddAliyunNasFileSystemAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddAliyunNasFileSystemResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String fileSystemId; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddAliyunNasFileSystemResult value = res.getResult(org.zstack.sdk.AddAliyunNasFileSystemResult.class); - ret.value = value == null ? new org.zstack.sdk.AddAliyunNasFileSystemResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/nas/aliyun"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "addAliyunNasFileSystem"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasFileSystemResult.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunNasFileSystemResult.java deleted file mode 100644 index 01479d1327..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasFileSystemResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunNasFileSystemInventory; - -public class AddAliyunNasFileSystemResult { - public AliyunNasFileSystemInventory inventory; - public void setInventory(AliyunNasFileSystemInventory inventory) { - this.inventory = inventory; - } - public AliyunNasFileSystemInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasMountTargetAction.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunNasMountTargetAction.java deleted file mode 100644 index 5e072492fd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasMountTargetAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddAliyunNasMountTargetAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddAliyunNasMountTargetResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String nasFSUuid; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String mountDomain; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddAliyunNasMountTargetResult value = res.getResult(org.zstack.sdk.AddAliyunNasMountTargetResult.class); - ret.value = value == null ? new org.zstack.sdk.AddAliyunNasMountTargetResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/nas/aliyun/mount"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "addAliyunNasMountTarget"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasMountTargetResult.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunNasMountTargetResult.java deleted file mode 100644 index 2fa2dc036a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasMountTargetResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunNasMountTargetInventory; - -public class AddAliyunNasMountTargetResult { - public AliyunNasMountTargetInventory inventory; - public void setInventory(AliyunNasMountTargetInventory inventory) { - this.inventory = inventory; - } - public AliyunNasMountTargetInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasPrimaryStorageAction.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunNasPrimaryStorageAction.java deleted file mode 100644 index 81ee38555d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunNasPrimaryStorageAction.java +++ /dev/null @@ -1,128 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddAliyunNasPrimaryStorageAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddPrimaryStorageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String nasUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String accessGroupUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vSwitchUuid; - - @Param(required = true, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String url; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String type; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String zoneUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddPrimaryStorageResult value = res.getResult(org.zstack.sdk.AddPrimaryStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.AddPrimaryStorageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/primary-storage/aliyun/nas"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunPanguPartitionAction.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunPanguPartitionAction.java deleted file mode 100644 index 3552e1c18d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunPanguPartitionAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddAliyunPanguPartitionAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddAliyunPanguPartitionResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @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 identityZoneUuid; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String appName; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String partitionName; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddAliyunPanguPartitionResult value = res.getResult(org.zstack.sdk.AddAliyunPanguPartitionResult.class); - ret.value = value == null ? new org.zstack.sdk.AddAliyunPanguPartitionResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/aliyun/pangu"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunPanguPartitionResult.java b/sdk/src/main/java/org/zstack/sdk/AddAliyunPanguPartitionResult.java deleted file mode 100644 index 883eed5582..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunPanguPartitionResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunPanguPartitionInventory; - -public class AddAliyunPanguPartitionResult { - public AliyunPanguPartitionInventory inventory; - public void setInventory(AliyunPanguPartitionInventory inventory) { - this.inventory = inventory; - } - public AliyunPanguPartitionInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/AddBareMetal2ChassisResult.java deleted file mode 100644 index dc1e541be3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddBareMetal2ChassisResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisInventory; - -public class AddBareMetal2ChassisResult { - public BareMetal2ChassisInventory inventory; - public void setInventory(BareMetal2ChassisInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddBareMetal2IpmiChassisAction.java b/sdk/src/main/java/org/zstack/sdk/AddBareMetal2IpmiChassisAction.java deleted file mode 100644 index 894047d687..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddBareMetal2IpmiChassisAction.java +++ /dev/null @@ -1,128 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddBareMetal2IpmiChassisAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipmiAddress; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {1L,65535L}, noTrim = false) - public java.lang.Integer ipmiPort = 623; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipmiUsername; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipmiPassword; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @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 = false, validValues = {"Remote","Local","Direct"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String provisionType = "Remote"; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.AddBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.AddBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/chassis/ipmi"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddConnectionAccessPointFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/AddConnectionAccessPointFromRemoteAction.java deleted file mode 100644 index 61bb46ccfb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddConnectionAccessPointFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddConnectionAccessPointFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddConnectionAccessPointFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String accessPointId; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddConnectionAccessPointFromRemoteResult value = res.getResult(org.zstack.sdk.AddConnectionAccessPointFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.AddConnectionAccessPointFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/access-point"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddConnectionAccessPointFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/AddConnectionAccessPointFromRemoteResult.java deleted file mode 100644 index e2b6f74246..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddConnectionAccessPointFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.ConnectionAccessPointInventory; - -public class AddConnectionAccessPointFromRemoteResult { - public ConnectionAccessPointInventory inventory; - public void setInventory(ConnectionAccessPointInventory inventory) { - this.inventory = inventory; - } - public ConnectionAccessPointInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddDataCenterFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/AddDataCenterFromRemoteAction.java deleted file mode 100644 index d7b0f17706..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddDataCenterFromRemoteAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddDataCenterFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddDataCenterFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String regionId; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean syncZones = false; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String endpoint; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddDataCenterFromRemoteResult value = res.getResult(org.zstack.sdk.AddDataCenterFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.AddDataCenterFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/data-center"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddDataCenterFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/AddDataCenterFromRemoteResult.java deleted file mode 100644 index 9a199fd45f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddDataCenterFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.DataCenterInventory; - -public class AddDataCenterFromRemoteResult { - public DataCenterInventory inventory; - public void setInventory(DataCenterInventory inventory) { - this.inventory = inventory; - } - public DataCenterInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddHybridKeySecretAction.java b/sdk/src/main/java/org/zstack/sdk/AddHybridKeySecretAction.java deleted file mode 100644 index 2ff52e3974..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddHybridKeySecretAction.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddHybridKeySecretAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddHybridKeySecretResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String key; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String secret; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String accountUuid; - - @Param(required = false, maxLength = 1024, 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 type; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean sync = true; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddHybridKeySecretResult value = res.getResult(org.zstack.sdk.AddHybridKeySecretResult.class); - ret.value = value == null ? new org.zstack.sdk.AddHybridKeySecretResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/hybrid/key"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddHybridKeySecretResult.java b/sdk/src/main/java/org/zstack/sdk/AddHybridKeySecretResult.java deleted file mode 100644 index e5ba934aa1..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddHybridKeySecretResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridAccountInventory; - -public class AddHybridKeySecretResult { - public HybridAccountInventory inventory; - public void setInventory(HybridAccountInventory inventory) { - this.inventory = inventory; - } - public HybridAccountInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddIdentityZoneFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/AddIdentityZoneFromRemoteAction.java deleted file mode 100644 index 93351fca14..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddIdentityZoneFromRemoteAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddIdentityZoneFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddIdentityZoneFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String zoneId; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddIdentityZoneFromRemoteResult value = res.getResult(org.zstack.sdk.AddIdentityZoneFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.AddIdentityZoneFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/identity-zone"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddIdentityZoneFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/AddIdentityZoneFromRemoteResult.java deleted file mode 100644 index 8d5c2b2ec4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddIdentityZoneFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.IdentityZoneInventory; - -public class AddIdentityZoneFromRemoteResult { - public IdentityZoneInventory inventory; - public void setInventory(IdentityZoneInventory inventory) { - this.inventory = inventory; - } - public IdentityZoneInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddMiniStorageAction.java b/sdk/src/main/java/org/zstack/sdk/AddMiniStorageAction.java deleted file mode 100644 index 3a3daba0f3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddMiniStorageAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddMiniStorageAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddPrimaryStorageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String diskIdentifier; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String url; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String type = "MiniStorage"; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String zoneUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddPrimaryStorageResult value = res.getResult(org.zstack.sdk.AddPrimaryStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.AddPrimaryStorageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/primary-storage/mini"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddOssBucketFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/AddOssBucketFromRemoteAction.java deleted file mode 100644 index c6f45779f0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddOssBucketFromRemoteAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AddOssBucketFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AddOssBucketFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String bucketName; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossDomain; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossKey; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossSecret; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AddOssBucketFromRemoteResult value = res.getResult(org.zstack.sdk.AddOssBucketFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.AddOssBucketFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/oss-bucket"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddOssBucketFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/AddOssBucketFromRemoteResult.java deleted file mode 100644 index 644e58fc3d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddOssBucketFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.OssBucketInventory; - -public class AddOssBucketFromRemoteResult { - public OssBucketInventory inventory; - public void setInventory(OssBucketInventory inventory) { - this.inventory = inventory; - } - public OssBucketInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunDiskInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunDiskInventory.java deleted file mode 100644 index 0df6504083..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunDiskInventory.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunDiskInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String diskId; - public void setDiskId(java.lang.String diskId) { - this.diskId = diskId; - } - public java.lang.String getDiskId() { - return this.diskId; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String identityZoneUuid; - public void setIdentityZoneUuid(java.lang.String identityZoneUuid) { - this.identityZoneUuid = identityZoneUuid; - } - public java.lang.String getIdentityZoneUuid() { - return this.identityZoneUuid; - } - - public java.lang.String ecsInstanceUuid; - public void setEcsInstanceUuid(java.lang.String ecsInstanceUuid) { - this.ecsInstanceUuid = ecsInstanceUuid; - } - public java.lang.String getEcsInstanceUuid() { - return this.ecsInstanceUuid; - } - - public java.lang.String diskCategory; - public void setDiskCategory(java.lang.String diskCategory) { - this.diskCategory = diskCategory; - } - public java.lang.String getDiskCategory() { - return this.diskCategory; - } - - public java.lang.String diskType; - public void setDiskType(java.lang.String diskType) { - this.diskType = diskType; - } - public java.lang.String getDiskType() { - return this.diskType; - } - - public java.lang.String diskChargeType; - public void setDiskChargeType(java.lang.String diskChargeType) { - this.diskChargeType = diskChargeType; - } - public java.lang.String getDiskChargeType() { - return this.diskChargeType; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.Integer sizeWithGB; - public void setSizeWithGB(java.lang.Integer sizeWithGB) { - this.sizeWithGB = sizeWithGB; - } - public java.lang.Integer getSizeWithGB() { - return this.sizeWithGB; - } - - public java.lang.String deviceInfo; - public void setDeviceInfo(java.lang.String deviceInfo) { - this.deviceInfo = deviceInfo; - } - public java.lang.String getDeviceInfo() { - return this.deviceInfo; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunEbsBackupStorageInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunEbsBackupStorageInventory.java deleted file mode 100644 index dd0d05993f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunEbsBackupStorageInventory.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunEbsBackupStorageInventory extends org.zstack.sdk.BackupStorageInventory { - - public java.lang.String ossBucketUuid; - public void setOssBucketUuid(java.lang.String ossBucketUuid) { - this.ossBucketUuid = ossBucketUuid; - } - public java.lang.String getOssBucketUuid() { - return this.ossBucketUuid; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunEbsPrimaryStorageInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunEbsPrimaryStorageInventory.java deleted file mode 100644 index 5743826a12..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunEbsPrimaryStorageInventory.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunEbsPrimaryStorageInventory extends org.zstack.sdk.PrimaryStorageInventory { - - public java.lang.String panguAppName; - public void setPanguAppName(java.lang.String panguAppName) { - this.panguAppName = panguAppName; - } - public java.lang.String getPanguAppName() { - return this.panguAppName; - } - - public java.lang.String panguPartitionName; - public void setPanguPartitionName(java.lang.String panguPartitionName) { - this.panguPartitionName = panguPartitionName; - } - public java.lang.String getPanguPartitionName() { - return this.panguPartitionName; - } - - public java.lang.String identityZoneUuid; - public void setIdentityZoneUuid(java.lang.String identityZoneUuid) { - this.identityZoneUuid = identityZoneUuid; - } - public java.lang.String getIdentityZoneUuid() { - return this.identityZoneUuid; - } - - public java.lang.String defaultIoType; - public void setDefaultIoType(java.lang.String defaultIoType) { - this.defaultIoType = defaultIoType; - } - public java.lang.String getDefaultIoType() { - return this.defaultIoType; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessGroupInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessGroupInventory.java deleted file mode 100644 index d950b9c06b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessGroupInventory.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunNasAccessGroupInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.util.List rules; - public void setRules(java.util.List rules) { - this.rules = rules; - } - public java.util.List getRules() { - return this.rules; - } - - public java.lang.String type; - public void setType(java.lang.String type) { - this.type = type; - } - public java.lang.String getType() { - return this.type; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessGroupProperty.java b/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessGroupProperty.java deleted file mode 100644 index 804897b3f6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessGroupProperty.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunNasAccessGroupProperty { - - public int ruleCount; - public void setRuleCount(int ruleCount) { - this.ruleCount = ruleCount; - } - public int getRuleCount() { - return this.ruleCount; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String networkType; - public void setNetworkType(java.lang.String networkType) { - this.networkType = networkType; - } - public java.lang.String getNetworkType() { - return this.networkType; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessRuleInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessRuleInventory.java deleted file mode 100644 index ca604a6cd4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunNasAccessRuleInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunNasAccessRuleInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String accessGroupUuid; - public void setAccessGroupUuid(java.lang.String accessGroupUuid) { - this.accessGroupUuid = accessGroupUuid; - } - public java.lang.String getAccessGroupUuid() { - return this.accessGroupUuid; - } - - public java.lang.String sourceCidr; - public void setSourceCidr(java.lang.String sourceCidr) { - this.sourceCidr = sourceCidr; - } - public java.lang.String getSourceCidr() { - return this.sourceCidr; - } - - public java.lang.String rule; - public void setRule(java.lang.String rule) { - this.rule = rule; - } - public java.lang.String getRule() { - return this.rule; - } - - public java.lang.Integer priority; - public void setPriority(java.lang.Integer priority) { - this.priority = priority; - } - public java.lang.Integer getPriority() { - return this.priority; - } - - public java.lang.String userAccess; - public void setUserAccess(java.lang.String userAccess) { - this.userAccess = userAccess; - } - public java.lang.String getUserAccess() { - return this.userAccess; - } - - public java.lang.String ruleId; - public void setRuleId(java.lang.String ruleId) { - this.ruleId = ruleId; - } - public java.lang.String getRuleId() { - return this.ruleId; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunNasFileSystemInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunNasFileSystemInventory.java deleted file mode 100644 index c05843c978..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunNasFileSystemInventory.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunNasFileSystemInventory extends org.zstack.sdk.NasFileSystemInventory { - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String storageType; - public void setStorageType(java.lang.String storageType) { - this.storageType = storageType; - } - public java.lang.String getStorageType() { - return this.storageType; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunNasFileSystemProperty.java b/sdk/src/main/java/org/zstack/sdk/AliyunNasFileSystemProperty.java deleted file mode 100644 index cc6df29a36..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunNasFileSystemProperty.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunNasFileSystemProperty { - - public java.lang.String fileSystemId; - public void setFileSystemId(java.lang.String fileSystemId) { - this.fileSystemId = fileSystemId; - } - public java.lang.String getFileSystemId() { - return this.fileSystemId; - } - - public java.lang.String protocol; - public void setProtocol(java.lang.String protocol) { - this.protocol = protocol; - } - public java.lang.String getProtocol() { - return this.protocol; - } - - public java.lang.String storageType; - public void setStorageType(java.lang.String storageType) { - this.storageType = storageType; - } - public java.lang.String getStorageType() { - return this.storageType; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String createDate; - public void setCreateDate(java.lang.String createDate) { - this.createDate = createDate; - } - public java.lang.String getCreateDate() { - return this.createDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunNasMountTargetInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunNasMountTargetInventory.java deleted file mode 100644 index 584a892c9a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunNasMountTargetInventory.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunNasMountTargetInventory extends org.zstack.sdk.NasMountTargetInventory { - - public java.lang.String accessGroupUuid; - public void setAccessGroupUuid(java.lang.String accessGroupUuid) { - this.accessGroupUuid = accessGroupUuid; - } - public java.lang.String getAccessGroupUuid() { - return this.accessGroupUuid; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunNasMountTargetProperty.java b/sdk/src/main/java/org/zstack/sdk/AliyunNasMountTargetProperty.java deleted file mode 100644 index fb37725e0b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunNasMountTargetProperty.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunNasMountTargetProperty { - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String accessGroupName; - public void setAccessGroupName(java.lang.String accessGroupName) { - this.accessGroupName = accessGroupName; - } - public java.lang.String getAccessGroupName() { - return this.accessGroupName; - } - - public java.lang.String mountDomain; - public void setMountDomain(java.lang.String mountDomain) { - this.mountDomain = mountDomain; - } - public java.lang.String getMountDomain() { - return this.mountDomain; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunOssException.java b/sdk/src/main/java/org/zstack/sdk/AliyunOssException.java deleted file mode 100644 index dc25f80acd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunOssException.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunOssException extends org.zstack.sdk.ErrorCode { - - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunPanguPartitionInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunPanguPartitionInventory.java deleted file mode 100644 index 694a6c35e8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunPanguPartitionInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunPanguPartitionInventory { - - public java.lang.String accountUuid; - public void setAccountUuid(java.lang.String accountUuid) { - this.accountUuid = accountUuid; - } - public java.lang.String getAccountUuid() { - return this.accountUuid; - } - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String identityZoneUuid; - public void setIdentityZoneUuid(java.lang.String identityZoneUuid) { - this.identityZoneUuid = identityZoneUuid; - } - public java.lang.String getIdentityZoneUuid() { - return this.identityZoneUuid; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String appName; - public void setAppName(java.lang.String appName) { - this.appName = appName; - } - public java.lang.String getAppName() { - return this.appName; - } - - public java.lang.String partitionName; - public void setPartitionName(java.lang.String partitionName) { - this.partitionName = partitionName; - } - public java.lang.String getPartitionName() { - return this.partitionName; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunProxyVSwitchInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunProxyVSwitchInventory.java deleted file mode 100644 index bb7e020b2d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunProxyVSwitchInventory.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunProxyVSwitchInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String aliyunProxyVpcUuid; - public void setAliyunProxyVpcUuid(java.lang.String aliyunProxyVpcUuid) { - this.aliyunProxyVpcUuid = aliyunProxyVpcUuid; - } - public java.lang.String getAliyunProxyVpcUuid() { - return this.aliyunProxyVpcUuid; - } - - public java.lang.String vpcL3NetworkUuid; - public void setVpcL3NetworkUuid(java.lang.String vpcL3NetworkUuid) { - this.vpcL3NetworkUuid = vpcL3NetworkUuid; - } - public java.lang.String getVpcL3NetworkUuid() { - return this.vpcL3NetworkUuid; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public boolean isDefault; - public void setIsDefault(boolean isDefault) { - this.isDefault = isDefault; - } - public boolean getIsDefault() { - return this.isDefault; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunProxyVpcInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunProxyVpcInventory.java deleted file mode 100644 index 114d34e330..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunProxyVpcInventory.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunProxyVpcInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String vpcName; - public void setVpcName(java.lang.String vpcName) { - this.vpcName = vpcName; - } - public java.lang.String getVpcName() { - return this.vpcName; - } - - public java.lang.String cidrBlock; - public void setCidrBlock(java.lang.String cidrBlock) { - this.cidrBlock = cidrBlock; - } - public java.lang.String getCidrBlock() { - return this.cidrBlock; - } - - public java.lang.String vRouterUuid; - public void setVRouterUuid(java.lang.String vRouterUuid) { - this.vRouterUuid = vRouterUuid; - } - public java.lang.String getVRouterUuid() { - return this.vRouterUuid; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.util.List aliyunProxyVSwitches; - public void setAliyunProxyVSwitches(java.util.List aliyunProxyVSwitches) { - this.aliyunProxyVSwitches = aliyunProxyVSwitches; - } - public java.util.List getAliyunProxyVSwitches() { - return this.aliyunProxyVSwitches; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public boolean isDefault; - public void setIsDefault(boolean isDefault) { - this.isDefault = isDefault; - } - public boolean getIsDefault() { - return this.isDefault; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunRouterInterfaceInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunRouterInterfaceInventory.java deleted file mode 100644 index 8e60b57803..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunRouterInterfaceInventory.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunRouterInterfaceInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String routerInterfaceId; - public void setRouterInterfaceId(java.lang.String routerInterfaceId) { - this.routerInterfaceId = routerInterfaceId; - } - public java.lang.String getRouterInterfaceId() { - return this.routerInterfaceId; - } - - public java.lang.String virtualRouterUuid; - public void setVirtualRouterUuid(java.lang.String virtualRouterUuid) { - this.virtualRouterUuid = virtualRouterUuid; - } - public java.lang.String getVirtualRouterUuid() { - return this.virtualRouterUuid; - } - - public java.lang.String accessPointUuid; - public void setAccessPointUuid(java.lang.String accessPointUuid) { - this.accessPointUuid = accessPointUuid; - } - public java.lang.String getAccessPointUuid() { - return this.accessPointUuid; - } - - public java.lang.String role; - public void setRole(java.lang.String role) { - this.role = role; - } - public java.lang.String getRole() { - return this.role; - } - - public java.lang.String vRouterType; - public void setVRouterType(java.lang.String vRouterType) { - this.vRouterType = vRouterType; - } - public java.lang.String getVRouterType() { - return this.vRouterType; - } - - public java.lang.String spec; - public void setSpec(java.lang.String spec) { - this.spec = spec; - } - public java.lang.String getSpec() { - return this.spec; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String oppositeInterfaceUuid; - public void setOppositeInterfaceUuid(java.lang.String oppositeInterfaceUuid) { - this.oppositeInterfaceUuid = oppositeInterfaceUuid; - } - public java.lang.String getOppositeInterfaceUuid() { - return this.oppositeInterfaceUuid; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AliyunSnapshotInventory.java b/sdk/src/main/java/org/zstack/sdk/AliyunSnapshotInventory.java deleted file mode 100644 index 20aab27580..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AliyunSnapshotInventory.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.zstack.sdk; - - - -public class AliyunSnapshotInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String snapshotId; - public void setSnapshotId(java.lang.String snapshotId) { - this.snapshotId = snapshotId; - } - public java.lang.String getSnapshotId() { - return this.snapshotId; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String diskUuid; - public void setDiskUuid(java.lang.String diskUuid) { - this.diskUuid = diskUuid; - } - public java.lang.String getDiskUuid() { - return this.diskUuid; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String aliyunSnapshotUsage; - public void setAliyunSnapshotUsage(java.lang.String aliyunSnapshotUsage) { - this.aliyunSnapshotUsage = aliyunSnapshotUsage; - } - public java.lang.String getAliyunSnapshotUsage() { - return this.aliyunSnapshotUsage; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachAliyunDiskToEcsAction.java b/sdk/src/main/java/org/zstack/sdk/AttachAliyunDiskToEcsAction.java deleted file mode 100644 index b848263131..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachAliyunDiskToEcsAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AttachAliyunDiskToEcsAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AttachAliyunDiskToEcsResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String diskUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean deleteWithInstance = false; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AttachAliyunDiskToEcsResult value = res.getResult(org.zstack.sdk.AttachAliyunDiskToEcsResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachAliyunDiskToEcsResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/disk/{diskUuid}/attach"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachAliyunDiskToEcsResult.java b/sdk/src/main/java/org/zstack/sdk/AttachAliyunDiskToEcsResult.java deleted file mode 100644 index 0c703dee86..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachAliyunDiskToEcsResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunDiskInventory; - -public class AttachAliyunDiskToEcsResult { - public AliyunDiskInventory inventory; - public void setInventory(AliyunDiskInventory inventory) { - this.inventory = inventory; - } - public AliyunDiskInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachAliyunKeyAction.java b/sdk/src/main/java/org/zstack/sdk/AttachAliyunKeyAction.java deleted file mode 100644 index 3aba129500..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachAliyunKeyAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AttachAliyunKeyAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AttachAliyunKeyResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AttachAliyunKeyResult value = res.getResult(org.zstack.sdk.AttachAliyunKeyResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachAliyunKeyResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/key/{uuid}/attach"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "attachAliyunKey"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachAliyunKeyResult.java b/sdk/src/main/java/org/zstack/sdk/AttachAliyunKeyResult.java deleted file mode 100644 index 4931f842eb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachAliyunKeyResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class AttachAliyunKeyResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2GatewayToClusterAction.java b/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2GatewayToClusterAction.java deleted file mode 100644 index 783b1fcfb3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2GatewayToClusterAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AttachBareMetal2GatewayToClusterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AttachBareMetal2GatewayToClusterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String clusterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String gatewayUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AttachBareMetal2GatewayToClusterResult value = res.getResult(org.zstack.sdk.AttachBareMetal2GatewayToClusterResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachBareMetal2GatewayToClusterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/clusters/{clusterUuid}/gateways/{gatewayUuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2GatewayToClusterResult.java b/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2GatewayToClusterResult.java deleted file mode 100644 index 91a0474f26..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2GatewayToClusterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2GatewayInventory; - -public class AttachBareMetal2GatewayToClusterResult { - public BareMetal2GatewayInventory inventory; - public void setInventory(BareMetal2GatewayInventory inventory) { - this.inventory = inventory; - } - public BareMetal2GatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2ProvisionNetworkToClusterAction.java b/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2ProvisionNetworkToClusterAction.java deleted file mode 100644 index 0e49aceb0e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2ProvisionNetworkToClusterAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AttachBareMetal2ProvisionNetworkToClusterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AttachBareMetal2ProvisionNetworkToClusterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String clusterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String networkUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AttachBareMetal2ProvisionNetworkToClusterResult value = res.getResult(org.zstack.sdk.AttachBareMetal2ProvisionNetworkToClusterResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachBareMetal2ProvisionNetworkToClusterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/clusters/{clusterUuid}/provision-networks/{networkUuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2ProvisionNetworkToClusterResult.java b/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2ProvisionNetworkToClusterResult.java deleted file mode 100644 index a7bab6f1ed..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachBareMetal2ProvisionNetworkToClusterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ProvisionNetworkInventory; - -public class AttachBareMetal2ProvisionNetworkToClusterResult { - public BareMetal2ProvisionNetworkInventory inventory; - public void setInventory(BareMetal2ProvisionNetworkInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ProvisionNetworkInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachHybridEipToEcsAction.java b/sdk/src/main/java/org/zstack/sdk/AttachHybridEipToEcsAction.java deleted file mode 100644 index 0438797c9f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachHybridEipToEcsAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AttachHybridEipToEcsAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AttachHybridEipToEcsResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String eipUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsUuid; - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AttachHybridEipToEcsResult value = res.getResult(org.zstack.sdk.AttachHybridEipToEcsResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachHybridEipToEcsResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/eip/{eipUuid}/attach"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachHybridEipToEcsResult.java b/sdk/src/main/java/org/zstack/sdk/AttachHybridEipToEcsResult.java deleted file mode 100644 index 76dbe92e0d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachHybridEipToEcsResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridEipAddressInventory; - -public class AttachHybridEipToEcsResult { - public HybridEipAddressInventory inventory; - public void setInventory(HybridEipAddressInventory inventory) { - this.inventory = inventory; - } - public HybridEipAddressInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachHybridKeyResult.java b/sdk/src/main/java/org/zstack/sdk/AttachHybridKeyResult.java deleted file mode 100644 index 97c3b1d1f8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachHybridKeyResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class AttachHybridKeyResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachOssBucketToEcsDataCenterAction.java b/sdk/src/main/java/org/zstack/sdk/AttachOssBucketToEcsDataCenterAction.java deleted file mode 100644 index 3fb5e6cb32..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachOssBucketToEcsDataCenterAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AttachOssBucketToEcsDataCenterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AttachOssBucketToEcsDataCenterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossBucketUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AttachOssBucketToEcsDataCenterResult value = res.getResult(org.zstack.sdk.AttachOssBucketToEcsDataCenterResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachOssBucketToEcsDataCenterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/oss-bucket/{ossBucketUuid}/attach"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "attachOssBucketToEcsDataCenter"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachOssBucketToEcsDataCenterResult.java b/sdk/src/main/java/org/zstack/sdk/AttachOssBucketToEcsDataCenterResult.java deleted file mode 100644 index 0b45882e2d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachOssBucketToEcsDataCenterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.OssBucketInventory; - -public class AttachOssBucketToEcsDataCenterResult { - public OssBucketInventory inventory; - public void setInventory(OssBucketInventory inventory) { - this.inventory = inventory; - } - public OssBucketInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachProvisionNicToBondingAction.java b/sdk/src/main/java/org/zstack/sdk/AttachProvisionNicToBondingAction.java deleted file mode 100644 index ab3f6e5889..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachProvisionNicToBondingAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AttachProvisionNicToBondingAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.AttachProvisionNicToBondingResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String provisionNicUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String bondingUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String provisionIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String customMac; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.AttachProvisionNicToBondingResult value = res.getResult(org.zstack.sdk.AttachProvisionNicToBondingResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachProvisionNicToBondingResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/bm-instances/{uuid}/bm2-bondings/{bondingUuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachProvisionNicToBondingResult.java b/sdk/src/main/java/org/zstack/sdk/AttachProvisionNicToBondingResult.java deleted file mode 100644 index be6fe85455..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachProvisionNicToBondingResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2InstanceInventory; - -public class AttachProvisionNicToBondingResult { - public BareMetal2InstanceInventory inventory; - public void setInventory(BareMetal2InstanceInventory inventory) { - this.inventory = inventory; - } - public BareMetal2InstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BackupDatabaseToPublicCloudResult.java b/sdk/src/main/java/org/zstack/sdk/BackupDatabaseToPublicCloudResult.java deleted file mode 100644 index ecde2474de..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BackupDatabaseToPublicCloudResult.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.zstack.sdk; - - - -public class BackupDatabaseToPublicCloudResult { - public java.lang.String local; - public void setLocal(java.lang.String local) { - this.local = local; - } - public java.lang.String getLocal() { - return this.local; - } - - public java.lang.String remote; - public void setRemote(java.lang.String remote) { - this.remote = remote; - } - public java.lang.String getRemote() { - return this.remote; - } - - public java.lang.String regionId; - public void setRegionId(java.lang.String regionId) { - this.regionId = regionId; - } - public java.lang.String getRegionId() { - return this.regionId; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2BillingInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2BillingInventory.java deleted file mode 100644 index d1b8c73755..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2BillingInventory.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2BillingInventory extends org.zstack.sdk.BillingInventory { - - public java.lang.String bareMetal2ChassisOfferingUUid; - public void setBareMetal2ChassisOfferingUUid(java.lang.String bareMetal2ChassisOfferingUUid) { - this.bareMetal2ChassisOfferingUUid = bareMetal2ChassisOfferingUUid; - } - public java.lang.String getBareMetal2ChassisOfferingUUid() { - return this.bareMetal2ChassisOfferingUUid; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2BondingInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2BondingInventory.java deleted file mode 100644 index 72f069da3c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2BondingInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2BondingInventory { - - public java.lang.String chassisUuid; - public void setChassisUuid(java.lang.String chassisUuid) { - this.chassisUuid = chassisUuid; - } - public java.lang.String getChassisUuid() { - return this.chassisUuid; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String slaves; - public void setSlaves(java.lang.String slaves) { - this.slaves = slaves; - } - public java.lang.String getSlaves() { - return this.slaves; - } - - public java.lang.String opts; - public void setOpts(java.lang.String opts) { - this.opts = opts; - } - public java.lang.String getOpts() { - return this.opts; - } - - public java.lang.Integer mode; - public void setMode(java.lang.Integer mode) { - this.mode = mode; - } - public java.lang.Integer getMode() { - return this.mode; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public java.lang.String accountUuid; - public void setAccountUuid(java.lang.String accountUuid) { - this.accountUuid = accountUuid; - } - public java.lang.String getAccountUuid() { - return this.accountUuid; - } - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2BondingNicRefInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2BondingNicRefInventory.java deleted file mode 100644 index c7cff32117..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2BondingNicRefInventory.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VmNicInventory; -import org.zstack.sdk.BareMetal2InstanceProvisionNicInventory; -import org.zstack.sdk.BareMetal2BondingInventory; - -public class BareMetal2BondingNicRefInventory { - - public java.lang.Long id; - public void setId(java.lang.Long id) { - this.id = id; - } - public java.lang.Long getId() { - return this.id; - } - - public java.lang.String nicUuid; - public void setNicUuid(java.lang.String nicUuid) { - this.nicUuid = nicUuid; - } - public java.lang.String getNicUuid() { - return this.nicUuid; - } - - public java.lang.String instanceUuid; - public void setInstanceUuid(java.lang.String instanceUuid) { - this.instanceUuid = instanceUuid; - } - public java.lang.String getInstanceUuid() { - return this.instanceUuid; - } - - public java.lang.String bondingUuid; - public void setBondingUuid(java.lang.String bondingUuid) { - this.bondingUuid = bondingUuid; - } - public java.lang.String getBondingUuid() { - return this.bondingUuid; - } - - public java.lang.String provisionNicUuid; - public void setProvisionNicUuid(java.lang.String provisionNicUuid) { - this.provisionNicUuid = provisionNicUuid; - } - public java.lang.String getProvisionNicUuid() { - return this.provisionNicUuid; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public VmNicInventory vmNic; - public void setVmNic(VmNicInventory vmNic) { - this.vmNic = vmNic; - } - public VmNicInventory getVmNic() { - return this.vmNic; - } - - public BareMetal2InstanceProvisionNicInventory provisionNic; - public void setProvisionNic(BareMetal2InstanceProvisionNicInventory provisionNic) { - this.provisionNic = provisionNic; - } - public BareMetal2InstanceProvisionNicInventory getProvisionNic() { - return this.provisionNic; - } - - public BareMetal2BondingInventory bareMetal2Bonding; - public void setBareMetal2Bonding(BareMetal2BondingInventory bareMetal2Bonding) { - this.bareMetal2Bonding = bareMetal2Bonding; - } - public BareMetal2BondingInventory getBareMetal2Bonding() { - return this.bareMetal2Bonding; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisDiskInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisDiskInventory.java deleted file mode 100644 index bf08c49cef..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisDiskInventory.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2ChassisDiskInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String chassisUuid; - public void setChassisUuid(java.lang.String chassisUuid) { - this.chassisUuid = chassisUuid; - } - public java.lang.String getChassisUuid() { - return this.chassisUuid; - } - - public java.lang.Long diskSize; - public void setDiskSize(java.lang.Long diskSize) { - this.diskSize = diskSize; - } - public java.lang.Long getDiskSize() { - return this.diskSize; - } - - public java.lang.String type; - public void setType(java.lang.String type) { - this.type = type; - } - public java.lang.String getType() { - return this.type; - } - - public java.lang.String wwn; - public void setWwn(java.lang.String wwn) { - this.wwn = wwn; - } - public java.lang.String getWwn() { - return this.wwn; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisInventory.java deleted file mode 100644 index 420fae3dde..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisInventory.java +++ /dev/null @@ -1,135 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisOfferingInventory; - -public class BareMetal2ChassisInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String zoneUuid; - public void setZoneUuid(java.lang.String zoneUuid) { - this.zoneUuid = zoneUuid; - } - public java.lang.String getZoneUuid() { - return this.zoneUuid; - } - - 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 chassisOfferingUuid; - public void setChassisOfferingUuid(java.lang.String chassisOfferingUuid) { - this.chassisOfferingUuid = chassisOfferingUuid; - } - public java.lang.String getChassisOfferingUuid() { - return this.chassisOfferingUuid; - } - - public java.lang.String type; - public void setType(java.lang.String type) { - this.type = type; - } - public java.lang.String getType() { - return this.type; - } - - public java.lang.String state; - public void setState(java.lang.String state) { - this.state = state; - } - public java.lang.String getState() { - return this.state; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String powerStatus; - public void setPowerStatus(java.lang.String powerStatus) { - this.powerStatus = powerStatus; - } - public java.lang.String getPowerStatus() { - return this.powerStatus; - } - - public java.lang.String provisionType; - public void setProvisionType(java.lang.String provisionType) { - this.provisionType = provisionType; - } - public java.lang.String getProvisionType() { - return this.provisionType; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public java.util.List chassisNics; - public void setChassisNics(java.util.List chassisNics) { - this.chassisNics = chassisNics; - } - public java.util.List getChassisNics() { - return this.chassisNics; - } - - public java.util.List chassisDisks; - public void setChassisDisks(java.util.List chassisDisks) { - this.chassisDisks = chassisDisks; - } - public java.util.List getChassisDisks() { - return this.chassisDisks; - } - - public BareMetal2ChassisOfferingInventory chassisOffering; - public void setChassisOffering(BareMetal2ChassisOfferingInventory chassisOffering) { - this.chassisOffering = chassisOffering; - } - public BareMetal2ChassisOfferingInventory getChassisOffering() { - return this.chassisOffering; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisNicInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisNicInventory.java deleted file mode 100644 index 4586cbaa65..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisNicInventory.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2ChassisNicInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String chassisUuid; - public void setChassisUuid(java.lang.String chassisUuid) { - this.chassisUuid = chassisUuid; - } - public java.lang.String getChassisUuid() { - return this.chassisUuid; - } - - public java.lang.String mac; - public void setMac(java.lang.String mac) { - this.mac = mac; - } - public java.lang.String getMac() { - return this.mac; - } - - public java.lang.String nicName; - public void setNicName(java.lang.String nicName) { - this.nicName = nicName; - } - public java.lang.String getNicName() { - return this.nicName; - } - - public java.lang.String speed; - public void setSpeed(java.lang.String speed) { - this.speed = speed; - } - public java.lang.String getSpeed() { - return this.speed; - } - - public java.lang.Boolean isProvisionNic; - public void setIsProvisionNic(java.lang.Boolean isProvisionNic) { - this.isProvisionNic = isProvisionNic; - } - public java.lang.Boolean getIsProvisionNic() { - return this.isProvisionNic; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisOfferingInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisOfferingInventory.java deleted file mode 100644 index 4005318112..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2ChassisOfferingInventory.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2ChassisOfferingInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String architecture; - public void setArchitecture(java.lang.String architecture) { - this.architecture = architecture; - } - public java.lang.String getArchitecture() { - return this.architecture; - } - - public java.lang.String cpuModelName; - public void setCpuModelName(java.lang.String cpuModelName) { - this.cpuModelName = cpuModelName; - } - public java.lang.String getCpuModelName() { - return this.cpuModelName; - } - - public java.lang.Integer cpuNum; - public void setCpuNum(java.lang.Integer cpuNum) { - this.cpuNum = cpuNum; - } - public java.lang.Integer getCpuNum() { - return this.cpuNum; - } - - public java.lang.Long memorySize; - public void setMemorySize(java.lang.Long memorySize) { - this.memorySize = memorySize; - } - public java.lang.Long getMemorySize() { - return this.memorySize; - } - - public java.lang.String bootMode; - public void setBootMode(java.lang.String bootMode) { - this.bootMode = bootMode; - } - public java.lang.String getBootMode() { - return this.bootMode; - } - - public java.lang.String state; - public void setState(java.lang.String state) { - this.state = state; - } - public java.lang.String getState() { - return this.state; - } - - public java.lang.String provisionType; - public void setProvisionType(java.lang.String provisionType) { - this.provisionType = provisionType; - } - public java.lang.String getProvisionType() { - return this.provisionType; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2GatewayInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2GatewayInventory.java deleted file mode 100644 index ab5f2c097c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2GatewayInventory.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2GatewayProvisionNicInventory; - -public class BareMetal2GatewayInventory extends org.zstack.sdk.KVMHostInventory { - - public java.util.List attachedClusterUuids; - public void setAttachedClusterUuids(java.util.List attachedClusterUuids) { - this.attachedClusterUuids = attachedClusterUuids; - } - public java.util.List getAttachedClusterUuids() { - return this.attachedClusterUuids; - } - - public BareMetal2GatewayProvisionNicInventory provisionNic; - public void setProvisionNic(BareMetal2GatewayProvisionNicInventory provisionNic) { - this.provisionNic = provisionNic; - } - public BareMetal2GatewayProvisionNicInventory getProvisionNic() { - return this.provisionNic; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2GatewayProvisionNicInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2GatewayProvisionNicInventory.java deleted file mode 100644 index 8d363f7feb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2GatewayProvisionNicInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2GatewayProvisionNicInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String networkUuid; - public void setNetworkUuid(java.lang.String networkUuid) { - this.networkUuid = networkUuid; - } - public java.lang.String getNetworkUuid() { - return this.networkUuid; - } - - public java.lang.String interfaceName; - public void setInterfaceName(java.lang.String interfaceName) { - this.interfaceName = interfaceName; - } - public java.lang.String getInterfaceName() { - return this.interfaceName; - } - - public java.lang.String ip; - public void setIp(java.lang.String ip) { - this.ip = ip; - } - public java.lang.String getIp() { - return this.ip; - } - - public java.lang.String netmask; - public void setNetmask(java.lang.String netmask) { - this.netmask = netmask; - } - public java.lang.String getNetmask() { - return this.netmask; - } - - public java.lang.String gateway; - public void setGateway(java.lang.String gateway) { - this.gateway = gateway; - } - public java.lang.String getGateway() { - return this.gateway; - } - - public java.lang.String metadata; - public void setMetadata(java.lang.String metadata) { - this.metadata = metadata; - } - public java.lang.String getMetadata() { - return this.metadata; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2InstanceInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2InstanceInventory.java deleted file mode 100644 index d4c75d84a3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2InstanceInventory.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2InstanceProvisionNicInventory; - -public class BareMetal2InstanceInventory extends org.zstack.sdk.VmInstanceInventory { - - public java.lang.String chassisUuid; - public void setChassisUuid(java.lang.String chassisUuid) { - this.chassisUuid = chassisUuid; - } - public java.lang.String getChassisUuid() { - return this.chassisUuid; - } - - public java.lang.String lastChassisUuid; - public void setLastChassisUuid(java.lang.String lastChassisUuid) { - this.lastChassisUuid = lastChassisUuid; - } - public java.lang.String getLastChassisUuid() { - return this.lastChassisUuid; - } - - public java.lang.String gatewayUuid; - public void setGatewayUuid(java.lang.String gatewayUuid) { - this.gatewayUuid = gatewayUuid; - } - public java.lang.String getGatewayUuid() { - return this.gatewayUuid; - } - - public java.lang.String lastGatewayUuid; - public void setLastGatewayUuid(java.lang.String lastGatewayUuid) { - this.lastGatewayUuid = lastGatewayUuid; - } - public java.lang.String getLastGatewayUuid() { - return this.lastGatewayUuid; - } - - public java.lang.String chassisOfferingUuid; - public void setChassisOfferingUuid(java.lang.String chassisOfferingUuid) { - this.chassisOfferingUuid = chassisOfferingUuid; - } - public java.lang.String getChassisOfferingUuid() { - return this.chassisOfferingUuid; - } - - public java.lang.String gatewayAllocatorStrategy; - public void setGatewayAllocatorStrategy(java.lang.String gatewayAllocatorStrategy) { - this.gatewayAllocatorStrategy = gatewayAllocatorStrategy; - } - public java.lang.String getGatewayAllocatorStrategy() { - return this.gatewayAllocatorStrategy; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String provisionType; - public void setProvisionType(java.lang.String provisionType) { - this.provisionType = provisionType; - } - public java.lang.String getProvisionType() { - return this.provisionType; - } - - public java.lang.String agentVersion; - public void setAgentVersion(java.lang.String agentVersion) { - this.agentVersion = agentVersion; - } - public java.lang.String getAgentVersion() { - return this.agentVersion; - } - - public boolean isLatestAgent; - public void setIsLatestAgent(boolean isLatestAgent) { - this.isLatestAgent = isLatestAgent; - } - public boolean getIsLatestAgent() { - return this.isLatestAgent; - } - - public BareMetal2InstanceProvisionNicInventory provisionNic; - public void setProvisionNic(BareMetal2InstanceProvisionNicInventory provisionNic) { - this.provisionNic = provisionNic; - } - public BareMetal2InstanceProvisionNicInventory getProvisionNic() { - return this.provisionNic; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2InstanceProvisionNicInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2InstanceProvisionNicInventory.java deleted file mode 100644 index 50bbe75673..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2InstanceProvisionNicInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2InstanceProvisionNicInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String networkUuid; - public void setNetworkUuid(java.lang.String networkUuid) { - this.networkUuid = networkUuid; - } - public java.lang.String getNetworkUuid() { - return this.networkUuid; - } - - public java.lang.String mac; - public void setMac(java.lang.String mac) { - this.mac = mac; - } - public java.lang.String getMac() { - return this.mac; - } - - public java.lang.String ip; - public void setIp(java.lang.String ip) { - this.ip = ip; - } - public java.lang.String getIp() { - return this.ip; - } - - public java.lang.String netmask; - public void setNetmask(java.lang.String netmask) { - this.netmask = netmask; - } - public java.lang.String getNetmask() { - return this.netmask; - } - - public java.lang.String gateway; - public void setGateway(java.lang.String gateway) { - this.gateway = gateway; - } - public java.lang.String getGateway() { - return this.gateway; - } - - public java.lang.String metadata; - public void setMetadata(java.lang.String metadata) { - this.metadata = metadata; - } - public java.lang.String getMetadata() { - return this.metadata; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2IpmiChassisInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2IpmiChassisInventory.java deleted file mode 100644 index 762856258a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2IpmiChassisInventory.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2IpmiChassisInventory extends org.zstack.sdk.BareMetal2ChassisInventory { - - public java.lang.String ipmiAddress; - public void setIpmiAddress(java.lang.String ipmiAddress) { - this.ipmiAddress = ipmiAddress; - } - public java.lang.String getIpmiAddress() { - return this.ipmiAddress; - } - - public java.lang.Integer ipmiPort; - public void setIpmiPort(java.lang.Integer ipmiPort) { - this.ipmiPort = ipmiPort; - } - public java.lang.Integer getIpmiPort() { - return this.ipmiPort; - } - - public java.lang.String ipmiUsername; - public void setIpmiUsername(java.lang.String ipmiUsername) { - this.ipmiUsername = ipmiUsername; - } - public java.lang.String getIpmiUsername() { - return this.ipmiUsername; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2ProvisionNetworkInventory.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2ProvisionNetworkInventory.java deleted file mode 100644 index 7e0ac91d58..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2ProvisionNetworkInventory.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2ProvisionNetworkInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String zoneUuid; - public void setZoneUuid(java.lang.String zoneUuid) { - this.zoneUuid = zoneUuid; - } - public java.lang.String getZoneUuid() { - return this.zoneUuid; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String dhcpInterface; - public void setDhcpInterface(java.lang.String dhcpInterface) { - this.dhcpInterface = dhcpInterface; - } - public java.lang.String getDhcpInterface() { - return this.dhcpInterface; - } - - public java.lang.String dhcpRangeStartIp; - public void setDhcpRangeStartIp(java.lang.String dhcpRangeStartIp) { - this.dhcpRangeStartIp = dhcpRangeStartIp; - } - public java.lang.String getDhcpRangeStartIp() { - return this.dhcpRangeStartIp; - } - - public java.lang.String dhcpRangeEndIp; - public void setDhcpRangeEndIp(java.lang.String dhcpRangeEndIp) { - this.dhcpRangeEndIp = dhcpRangeEndIp; - } - public java.lang.String getDhcpRangeEndIp() { - return this.dhcpRangeEndIp; - } - - public java.lang.String dhcpRangeNetmask; - public void setDhcpRangeNetmask(java.lang.String dhcpRangeNetmask) { - this.dhcpRangeNetmask = dhcpRangeNetmask; - } - public java.lang.String getDhcpRangeNetmask() { - return this.dhcpRangeNetmask; - } - - public java.lang.String dhcpRangeGateway; - public void setDhcpRangeGateway(java.lang.String dhcpRangeGateway) { - this.dhcpRangeGateway = dhcpRangeGateway; - } - public java.lang.String getDhcpRangeGateway() { - return this.dhcpRangeGateway; - } - - public java.lang.String dhcpRangeNetworkCidr; - public void setDhcpRangeNetworkCidr(java.lang.String dhcpRangeNetworkCidr) { - this.dhcpRangeNetworkCidr = dhcpRangeNetworkCidr; - } - public java.lang.String getDhcpRangeNetworkCidr() { - return this.dhcpRangeNetworkCidr; - } - - public java.lang.String state; - public void setState(java.lang.String state) { - this.state = state; - } - public java.lang.String getState() { - return this.state; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public java.util.List attachedClusterUuids; - public void setAttachedClusterUuids(java.util.List attachedClusterUuids) { - this.attachedClusterUuids = attachedClusterUuids; - } - public java.util.List getAttachedClusterUuids() { - return this.attachedClusterUuids; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2ProvisionNetworkIpCapacity.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2ProvisionNetworkIpCapacity.java deleted file mode 100644 index 0458026c73..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2ProvisionNetworkIpCapacity.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2ProvisionNetworkIpCapacity { - - public java.lang.String networkUuid; - public void setNetworkUuid(java.lang.String networkUuid) { - this.networkUuid = networkUuid; - } - public java.lang.String getNetworkUuid() { - return this.networkUuid; - } - - public long totalCapacity; - public void setTotalCapacity(long totalCapacity) { - this.totalCapacity = totalCapacity; - } - public long getTotalCapacity() { - return this.totalCapacity; - } - - public long availableCapacity; - public void setAvailableCapacity(long availableCapacity) { - this.availableCapacity = availableCapacity; - } - public long getAvailableCapacity() { - return this.availableCapacity; - } - - public long gatewayUsedIpNumber; - public void setGatewayUsedIpNumber(long gatewayUsedIpNumber) { - this.gatewayUsedIpNumber = gatewayUsedIpNumber; - } - public long getGatewayUsedIpNumber() { - return this.gatewayUsedIpNumber; - } - - public long instanceUsedIpNumber; - public void setInstanceUsedIpNumber(long instanceUsedIpNumber) { - this.instanceUsedIpNumber = instanceUsedIpNumber; - } - public long getInstanceUsedIpNumber() { - return this.instanceUsedIpNumber; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2Spending.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2Spending.java deleted file mode 100644 index 1dd33046f7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2Spending.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2Spending extends org.zstack.sdk.SpendingDetails { - - public java.util.List bareMetal2Inventory; - public void setBareMetal2Inventory(java.util.List bareMetal2Inventory) { - this.bareMetal2Inventory = bareMetal2Inventory; - } - public java.util.List getBareMetal2Inventory() { - return this.bareMetal2Inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BareMetal2SpendingDetails.java b/sdk/src/main/java/org/zstack/sdk/BareMetal2SpendingDetails.java deleted file mode 100644 index 1cfff9c847..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BareMetal2SpendingDetails.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.zstack.sdk; - - - -public class BareMetal2SpendingDetails { - - public long startTime; - public void setStartTime(long startTime) { - this.startTime = startTime; - } - public long getStartTime() { - return this.startTime; - } - - public long endTime; - public void setEndTime(long endTime) { - this.endTime = endTime; - } - public long getEndTime() { - return this.endTime; - } - - public double spending; - public void setSpending(double spending) { - this.spending = spending; - } - public double getSpending() { - return this.spending; - } - - public java.lang.String bareMetal2OfferingUUid; - public void setBareMetal2OfferingUUid(java.lang.String bareMetal2OfferingUUid) { - this.bareMetal2OfferingUUid = bareMetal2OfferingUUid; - } - public java.lang.String getBareMetal2OfferingUUid() { - return this.bareMetal2OfferingUUid; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BatchAddBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/BatchAddBareMetal2ChassisResult.java deleted file mode 100644 index d51cd11eee..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BatchAddBareMetal2ChassisResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.LongJobInventory; - -public class BatchAddBareMetal2ChassisResult { - public LongJobInventory inventory; - public void setInventory(LongJobInventory inventory) { - this.inventory = inventory; - } - public LongJobInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BatchAddBareMetal2IpmiChassisAction.java b/sdk/src/main/java/org/zstack/sdk/BatchAddBareMetal2IpmiChassisAction.java deleted file mode 100644 index 0883d2294e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/BatchAddBareMetal2IpmiChassisAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class BatchAddBareMetal2IpmiChassisAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.BatchAddBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisInfo; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String longJobName; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String longJobDescription; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.BatchAddBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.BatchAddBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.BatchAddBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/chassis/ipmi/from-file"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/BackupDatabaseToPublicCloudAction.java b/sdk/src/main/java/org/zstack/sdk/BatchCreateHostKernelInterfaceAction.java similarity index 73% rename from sdk/src/main/java/org/zstack/sdk/BackupDatabaseToPublicCloudAction.java rename to sdk/src/main/java/org/zstack/sdk/BatchCreateHostKernelInterfaceAction.java index ab6244dfcd..094c2d2027 100644 --- a/sdk/src/main/java/org/zstack/sdk/BackupDatabaseToPublicCloudAction.java +++ b/sdk/src/main/java/org/zstack/sdk/BatchCreateHostKernelInterfaceAction.java @@ -4,7 +4,7 @@ import java.util.Map; import org.zstack.sdk.*; -public class BackupDatabaseToPublicCloudAction extends AbstractAction { +public class BatchCreateHostKernelInterfaceAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class BackupDatabaseToPublicCloudAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.BackupDatabaseToPublicCloudResult value; + public org.zstack.sdk.BatchCreateHostKernelInterfaceResult value; public Result throwExceptionIfError() { if (error != null) { @@ -25,14 +25,14 @@ public Result throwExceptionIfError() { } } - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; + @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) + public java.util.List structs; @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String regionId; + public java.lang.String l3NetworkUuid; - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean local = false; + @Param(required = false, validValues = {"Management","Storage"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.util.List trafficTypes; @Param(required = false) public java.util.List systemTags; @@ -66,8 +66,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.BackupDatabaseToPublicCloudResult value = res.getResult(org.zstack.sdk.BackupDatabaseToPublicCloudResult.class); - ret.value = value == null ? new org.zstack.sdk.BackupDatabaseToPublicCloudResult() : value; + org.zstack.sdk.BatchCreateHostKernelInterfaceResult value = res.getResult(org.zstack.sdk.BatchCreateHostKernelInterfaceResult.class); + ret.value = value == null ? new org.zstack.sdk.BatchCreateHostKernelInterfaceResult() : value; return ret; } @@ -97,7 +97,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "POST"; - info.path = "/hybrid/backup-mysql"; + info.path = "/l3-networks/{l3NetworkUuid}/kernel-interfaces"; info.needSession = true; info.needPoll = true; info.parameterName = "params"; diff --git a/sdk/src/main/java/org/zstack/sdk/BatchCreateHostKernelInterfaceResult.java b/sdk/src/main/java/org/zstack/sdk/BatchCreateHostKernelInterfaceResult.java new file mode 100644 index 0000000000..d1d89fe699 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/BatchCreateHostKernelInterfaceResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk; + + + +public class BatchCreateHostKernelInterfaceResult { + public java.util.List results; + public void setResults(java.util.List results) { + this.results = results; + } + public java.util.List getResults() { + return this.results; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/CandidateDecision.java b/sdk/src/main/java/org/zstack/sdk/CandidateDecision.java new file mode 100644 index 0000000000..03f95fa65b --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/CandidateDecision.java @@ -0,0 +1,8 @@ +package org.zstack.sdk; + +public enum CandidateDecision { + ACCEPTED, + REJECTED, + RECOMMENDED, + NOT_RECOMMENDED, +} diff --git a/sdk/src/main/java/org/zstack/sdk/CandidateDecisionEntry.java b/sdk/src/main/java/org/zstack/sdk/CandidateDecisionEntry.java new file mode 100644 index 0000000000..2ec57b53e1 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/CandidateDecisionEntry.java @@ -0,0 +1,31 @@ +package org.zstack.sdk; + +import org.zstack.sdk.CandidateDecision; + +public class CandidateDecisionEntry { + + public CandidateDecision decision; + public void setDecision(CandidateDecision decision) { + this.decision = decision; + } + public CandidateDecision getDecision() { + return this.decision; + } + + public java.lang.String decisionMaker; + public void setDecisionMaker(java.lang.String decisionMaker) { + this.decisionMaker = decisionMaker; + } + public java.lang.String getDecisionMaker() { + return this.decisionMaker; + } + + public java.lang.String reason; + public void setReason(java.lang.String reason) { + this.reason = reason; + } + public java.lang.String getReason() { + return this.reason; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/CandidateResult.java b/sdk/src/main/java/org/zstack/sdk/CandidateResult.java new file mode 100644 index 0000000000..fbc6d390d7 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/CandidateResult.java @@ -0,0 +1,31 @@ +package org.zstack.sdk; + +import org.zstack.sdk.CandidateDecision; + +public class CandidateResult { + + public java.lang.Object candidate; + public void setCandidate(java.lang.Object candidate) { + this.candidate = candidate; + } + public java.lang.Object getCandidate() { + return this.candidate; + } + + public CandidateDecision finalDecision; + public void setFinalDecision(CandidateDecision finalDecision) { + this.finalDecision = finalDecision; + } + public CandidateDecision getFinalDecision() { + return this.finalDecision; + } + + public java.util.List decisions; + public void setDecisions(java.util.List decisions) { + this.decisions = decisions; + } + public java.util.List getDecisions() { + return this.decisions; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisOfferingStateAction.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisOfferingStateAction.java deleted file mode 100644 index 80b734938b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisOfferingStateAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ChangeBareMetal2ChassisOfferingStateAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.ChangeBareMetal2ChassisOfferingStateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String stateEvent; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.ChangeBareMetal2ChassisOfferingStateResult value = res.getResult(org.zstack.sdk.ChangeBareMetal2ChassisOfferingStateResult.class); - ret.value = value == null ? new org.zstack.sdk.ChangeBareMetal2ChassisOfferingStateResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/offerings/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "changeBareMetal2ChassisOfferingState"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisOfferingStateResult.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisOfferingStateResult.java deleted file mode 100644 index 999f1040c8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisOfferingStateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisOfferingInventory; - -public class ChangeBareMetal2ChassisOfferingStateResult { - public BareMetal2ChassisOfferingInventory inventory; - public void setInventory(BareMetal2ChassisOfferingInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisOfferingInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisStateAction.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisStateAction.java deleted file mode 100644 index 723daa68d1..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisStateAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ChangeBareMetal2ChassisStateAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.ChangeBareMetal2ChassisStateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String stateEvent; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.ChangeBareMetal2ChassisStateResult value = res.getResult(org.zstack.sdk.ChangeBareMetal2ChassisStateResult.class); - ret.value = value == null ? new org.zstack.sdk.ChangeBareMetal2ChassisStateResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "changeBareMetal2ChassisState"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisStateResult.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisStateResult.java deleted file mode 100644 index b2b31623b3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ChassisStateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisInventory; - -public class ChangeBareMetal2ChassisStateResult { - public BareMetal2ChassisInventory inventory; - public void setInventory(BareMetal2ChassisInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayClusterAction.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayClusterAction.java deleted file mode 100644 index 53ea7d402a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayClusterAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ChangeBareMetal2GatewayClusterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.ChangeBareMetal2GatewayClusterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String gatewayUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String clusterUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.ChangeBareMetal2GatewayClusterResult value = res.getResult(org.zstack.sdk.ChangeBareMetal2GatewayClusterResult.class); - ret.value = value == null ? new org.zstack.sdk.ChangeBareMetal2GatewayClusterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/gateways/{gatewayUuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "changeBareMetal2GatewayCluster"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayClusterResult.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayClusterResult.java deleted file mode 100644 index fb2fd08ca0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayClusterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2GatewayInventory; - -public class ChangeBareMetal2GatewayClusterResult { - public BareMetal2GatewayInventory inventory; - public void setInventory(BareMetal2GatewayInventory inventory) { - this.inventory = inventory; - } - public BareMetal2GatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayStateAction.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayStateAction.java deleted file mode 100644 index 0a550516cf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayStateAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ChangeBareMetal2GatewayStateAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.ChangeBareMetal2GatewayStateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String stateEvent; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.ChangeBareMetal2GatewayStateResult value = res.getResult(org.zstack.sdk.ChangeBareMetal2GatewayStateResult.class); - ret.value = value == null ? new org.zstack.sdk.ChangeBareMetal2GatewayStateResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/gateways/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "changeBareMetal2GatewayState"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayStateResult.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayStateResult.java deleted file mode 100644 index 94f2591cdc..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2GatewayStateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2GatewayInventory; - -public class ChangeBareMetal2GatewayStateResult { - public BareMetal2GatewayInventory inventory; - public void setInventory(BareMetal2GatewayInventory inventory) { - this.inventory = inventory; - } - public BareMetal2GatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2InstancePasswordAction.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2InstancePasswordAction.java deleted file mode 100644 index 1e8f623499..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2InstancePasswordAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ChangeBareMetal2InstancePasswordAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.ChangeBareMetal2InstancePasswordResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = true) - public java.lang.String username; - - @Param(required = true, validRegexValues = "[\\da-zA-Z-`=\\\\\\[\\];',./~!@#$%^&*()_+|{}:\"<>?]{1,}", maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = true) - public java.lang.String password; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.ChangeBareMetal2InstancePasswordResult value = res.getResult(org.zstack.sdk.ChangeBareMetal2InstancePasswordResult.class); - ret.value = value == null ? new org.zstack.sdk.ChangeBareMetal2InstancePasswordResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/bm-instances/{uuid}/action"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "changeBareMetal2InstancePassword"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2InstancePasswordResult.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2InstancePasswordResult.java deleted file mode 100644 index dc170a92f8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2InstancePasswordResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2InstanceInventory; - -public class ChangeBareMetal2InstancePasswordResult { - public BareMetal2InstanceInventory inventory; - public void setInventory(BareMetal2InstanceInventory inventory) { - this.inventory = inventory; - } - public BareMetal2InstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ProvisionNetworkStateAction.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ProvisionNetworkStateAction.java deleted file mode 100644 index 57a23fdc64..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ProvisionNetworkStateAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ChangeBareMetal2ProvisionNetworkStateAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.ChangeBareMetal2ProvisionNetworkStateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String stateEvent; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.ChangeBareMetal2ProvisionNetworkStateResult value = res.getResult(org.zstack.sdk.ChangeBareMetal2ProvisionNetworkStateResult.class); - ret.value = value == null ? new org.zstack.sdk.ChangeBareMetal2ProvisionNetworkStateResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/provision-networks/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "changeBareMetal2ProvisionNetworkState"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ProvisionNetworkStateResult.java b/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ProvisionNetworkStateResult.java deleted file mode 100644 index 1ca6df4d82..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeBareMetal2ProvisionNetworkStateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ProvisionNetworkInventory; - -public class ChangeBareMetal2ProvisionNetworkStateResult { - public BareMetal2ProvisionNetworkInventory inventory; - public void setInventory(BareMetal2ProvisionNetworkInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ProvisionNetworkInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeVmPasswordAction.java b/sdk/src/main/java/org/zstack/sdk/ChangeVmPasswordAction.java index 58a39283dd..e87e63e8c0 100644 --- a/sdk/src/main/java/org/zstack/sdk/ChangeVmPasswordAction.java +++ b/sdk/src/main/java/org/zstack/sdk/ChangeVmPasswordAction.java @@ -28,7 +28,7 @@ public Result throwExceptionIfError() { @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String uuid; - @Param(required = true, validRegexValues = "[\\da-zA-Z-`=\\\\\\[\\];',./~!@#$%^&*()_+|{}:\"<>?]{1,}", maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = true) + @Param(required = true, validRegexValues = "[\\da-zA-Z-`=\\\\\\[\\];',./~!@#$%^&*()_+|{}:\"<>?]{0,}", maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = true) public java.lang.String password; @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = true) diff --git a/sdk/src/main/java/org/zstack/sdk/CheckBareMetal2ChassisConfigFileResult.java b/sdk/src/main/java/org/zstack/sdk/CheckBareMetal2ChassisConfigFileResult.java deleted file mode 100644 index 16233f6cf3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CheckBareMetal2ChassisConfigFileResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class CheckBareMetal2ChassisConfigFileResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CheckBareMetal2IpmiChassisConfigFileAction.java b/sdk/src/main/java/org/zstack/sdk/CheckBareMetal2IpmiChassisConfigFileAction.java deleted file mode 100644 index 9b8def068a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CheckBareMetal2IpmiChassisConfigFileAction.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CheckBareMetal2IpmiChassisConfigFileAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CheckBareMetal2ChassisConfigFileResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisInfo; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CheckBareMetal2ChassisConfigFileResult value = res.getResult(org.zstack.sdk.CheckBareMetal2ChassisConfigFileResult.class); - ret.value = value == null ? new org.zstack.sdk.CheckBareMetal2ChassisConfigFileResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/chassis/ipmi/from-file/check"; - info.needSession = true; - info.needPoll = false; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CleanUpBareMetal2BondingAction.java b/sdk/src/main/java/org/zstack/sdk/CleanUpBareMetal2BondingAction.java deleted file mode 100644 index bf7d3b1982..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CleanUpBareMetal2BondingAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CleanUpBareMetal2BondingAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CleanUpBaremetal2BondingResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CleanUpBaremetal2BondingResult value = res.getResult(org.zstack.sdk.CleanUpBaremetal2BondingResult.class); - ret.value = value == null ? new org.zstack.sdk.CleanUpBaremetal2BondingResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/{chassisUuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "cleanUpBareMetal2Bonding"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CleanUpBaremetal2BondingResult.java b/sdk/src/main/java/org/zstack/sdk/CleanUpBaremetal2BondingResult.java deleted file mode 100644 index a89961fb92..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CleanUpBaremetal2BondingResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class CleanUpBaremetal2BondingResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CloneVmInstanceAction.java b/sdk/src/main/java/org/zstack/sdk/CloneVmInstanceAction.java index 5a0a66af1d..23ebc2033c 100644 --- a/sdk/src/main/java/org/zstack/sdk/CloneVmInstanceAction.java +++ b/sdk/src/main/java/org/zstack/sdk/CloneVmInstanceAction.java @@ -64,6 +64,9 @@ public Result throwExceptionIfError() { @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String description; + @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public org.zstack.sdk.VmCustomSpecificationStruct vmCustomSpecification; + @Param(required = false) public java.util.List systemTags; diff --git a/sdk/src/main/java/org/zstack/sdk/ConnectionAccessPointInventory.java b/sdk/src/main/java/org/zstack/sdk/ConnectionAccessPointInventory.java deleted file mode 100644 index 9375ffe860..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ConnectionAccessPointInventory.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.zstack.sdk; - - - -public class ConnectionAccessPointInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String accessPointId; - public void setAccessPointId(java.lang.String accessPointId) { - this.accessPointId = accessPointId; - } - public java.lang.String getAccessPointId() { - return this.accessPointId; - } - - public java.lang.String type; - public void setType(java.lang.String type) { - this.type = type; - } - public java.lang.String getType() { - return this.type; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String hostOperator; - public void setHostOperator(java.lang.String hostOperator) { - this.hostOperator = hostOperator; - } - public java.lang.String getHostOperator() { - return this.hostOperator; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ConnectionRelationShipInventory.java b/sdk/src/main/java/org/zstack/sdk/ConnectionRelationShipInventory.java deleted file mode 100644 index 62280895cc..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ConnectionRelationShipInventory.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.zstack.sdk; - - - -public class ConnectionRelationShipInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String relationShips; - public void setRelationShips(java.lang.String relationShips) { - this.relationShips = relationShips; - } - public java.lang.String getRelationShips() { - return this.relationShips; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ConnectionRelationShipProperty.java b/sdk/src/main/java/org/zstack/sdk/ConnectionRelationShipProperty.java deleted file mode 100644 index 9d74286bcd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ConnectionRelationShipProperty.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridConnectionType; - -public class ConnectionRelationShipProperty { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String resourceType; - public void setResourceType(java.lang.String resourceType) { - this.resourceType = resourceType; - } - public java.lang.String getResourceType() { - return this.resourceType; - } - - public java.lang.String accountUuid; - public void setAccountUuid(java.lang.String accountUuid) { - this.accountUuid = accountUuid; - } - public java.lang.String getAccountUuid() { - return this.accountUuid; - } - - public HybridConnectionType connectionType; - public void setConnectionType(HybridConnectionType connectionType) { - this.connectionType = connectionType; - } - public HybridConnectionType getConnectionType() { - return this.connectionType; - } - - public java.lang.String direction; - public void setDirection(java.lang.String direction) { - this.direction = direction; - } - public java.lang.String getDirection() { - return this.direction; - } - - public java.lang.String relationShips; - public void setRelationShips(java.lang.String relationShips) { - this.relationShips = relationShips; - } - public java.lang.String getRelationShips() { - return this.relationShips; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunDiskFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunDiskFromRemoteAction.java deleted file mode 100644 index 0dfa98ec04..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunDiskFromRemoteAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunDiskFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateAliyunDiskFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String identityUuid; - - @Param(required = true, validRegexValues = "^[\\u4e00-\\u9fa5a-zA-Z][\\u4e00-\\u9fa5_a-zA-Z0-9.-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {20L,32768L}, noTrim = false) - public java.lang.Integer sizeWithGB; - - @Param(required = false, maxLength = 1024, minLength = 2, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, validValues = {"cloud_efficiency","cloud_ssd"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String diskCategory; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String snapshotUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateAliyunDiskFromRemoteResult value = res.getResult(org.zstack.sdk.CreateAliyunDiskFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateAliyunDiskFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/disk"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunDiskFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunDiskFromRemoteResult.java deleted file mode 100644 index 4847ba5ddb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunDiskFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunDiskInventory; - -public class CreateAliyunDiskFromRemoteResult { - public AliyunDiskInventory inventory; - public void setInventory(AliyunDiskInventory inventory) { - this.inventory = inventory; - } - public AliyunDiskInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupAction.java deleted file mode 100644 index bd18cba3fb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunNasAccessGroupAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateAliyunNasAccessGroupResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, validValues = {"classic","vpc"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String networkType; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateAliyunNasAccessGroupResult value = res.getResult(org.zstack.sdk.CreateAliyunNasAccessGroupResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateAliyunNasAccessGroupResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/nas/aliyun/access"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupResult.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupResult.java deleted file mode 100644 index 60dcc7af40..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunNasAccessGroupInventory; - -public class CreateAliyunNasAccessGroupResult { - public AliyunNasAccessGroupInventory inventory; - public void setInventory(AliyunNasAccessGroupInventory inventory) { - this.inventory = inventory; - } - public AliyunNasAccessGroupInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupRuleAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupRuleAction.java deleted file mode 100644 index 72ceaae46f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupRuleAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunNasAccessGroupRuleAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateAliyunNasAccessGroupRuleResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String accessGroupUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourceCidrIp; - - @Param(required = false, validValues = {"RDWR","RDONLY"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String rwAccessType = "RDWR"; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {1L,100L}, noTrim = false) - public java.lang.Integer priority = 1; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateAliyunNasAccessGroupRuleResult value = res.getResult(org.zstack.sdk.CreateAliyunNasAccessGroupRuleResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateAliyunNasAccessGroupRuleResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/nas/aliyun/rule"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupRuleResult.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupRuleResult.java deleted file mode 100644 index c3fee19154..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasAccessGroupRuleResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunNasAccessRuleInventory; - -public class CreateAliyunNasAccessGroupRuleResult { - public AliyunNasAccessRuleInventory inventory; - public void setInventory(AliyunNasAccessRuleInventory inventory) { - this.inventory = inventory; - } - public AliyunNasAccessRuleInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasFileSystemAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasFileSystemAction.java deleted file mode 100644 index 8c52729f2d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasFileSystemAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunNasFileSystemAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateNasFileSystemResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, validValues = {"Performance","Capacity"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String storageType; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, validValues = {"NFS","SMB"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String protocol; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateNasFileSystemResult value = res.getResult(org.zstack.sdk.CreateNasFileSystemResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateNasFileSystemResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/nas/aliyun"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasMountTargetAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasMountTargetAction.java deleted file mode 100644 index 5796b622df..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunNasMountTargetAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunNasMountTargetAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateNasMountTargetResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String nasAccessGroupUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vSwitchUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String nasFSUuid; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateNasMountTargetResult value = res.getResult(org.zstack.sdk.CreateNasMountTargetResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateNasMountTargetResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/nas/aliyun/mount"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVSwitchAction.java deleted file mode 100644 index 488bfbb64a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVSwitchAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunProxyVSwitchAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateAliyunProxyVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String aliyunProxyVpcUuid; - - @Param(required = true, maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpcL3NetworkUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean isDefault = false; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateAliyunProxyVSwitchResult value = res.getResult(org.zstack.sdk.CreateAliyunProxyVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateAliyunProxyVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/aliyun-proxy/vpcs/vswitches"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVSwitchResult.java deleted file mode 100644 index 2ec875aebe..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVSwitchResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunProxyVSwitchInventory; - -public class CreateAliyunProxyVSwitchResult { - public AliyunProxyVSwitchInventory inventory; - public void setInventory(AliyunProxyVSwitchInventory inventory) { - this.inventory = inventory; - } - public AliyunProxyVSwitchInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVpcAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVpcAction.java deleted file mode 100644 index 6a59d4e9a3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVpcAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunProxyVpcAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateAliyunProxyVpcResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String cidrBlock; - - @Param(required = true, maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vRouterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean isDefault = false; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateAliyunProxyVpcResult value = res.getResult(org.zstack.sdk.CreateAliyunProxyVpcResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateAliyunProxyVpcResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/aliyun-proxy/vpcs"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVpcResult.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVpcResult.java deleted file mode 100644 index 7db8a5e086..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunProxyVpcResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunProxyVpcInventory; - -public class CreateAliyunProxyVpcResult { - public AliyunProxyVpcInventory inventory; - public void setInventory(AliyunProxyVpcInventory inventory) { - this.inventory = inventory; - } - public AliyunProxyVpcInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunRouterInterfaceRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunRouterInterfaceRemoteAction.java deleted file mode 100644 index 4066160f9d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunRouterInterfaceRemoteAction.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunRouterInterfaceRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateAliyunRouterInterfaceRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String accessPointUuid; - - @Param(required = false, validRegexValues = "[XxlL]{1}arge.(\\d+)", nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String spec; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vRouterUuid; - - @Param(required = true, validValues = {"VBR","VRouter"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String routerType; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateAliyunRouterInterfaceRemoteResult value = res.getResult(org.zstack.sdk.CreateAliyunRouterInterfaceRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateAliyunRouterInterfaceRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/router-interface"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunRouterInterfaceRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunRouterInterfaceRemoteResult.java deleted file mode 100644 index de65c6dcd9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunRouterInterfaceRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunRouterInterfaceInventory; - -public class CreateAliyunRouterInterfaceRemoteResult { - public AliyunRouterInterfaceInventory inventory; - public void setInventory(AliyunRouterInterfaceInventory inventory) { - this.inventory = inventory; - } - public AliyunRouterInterfaceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunSnapshotRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunSnapshotRemoteAction.java deleted file mode 100644 index c438637007..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunSnapshotRemoteAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunSnapshotRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateAliyunSnapshotRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String diskUuid; - - @Param(required = true, validRegexValues = "^[\\u4e00-\\u9fa5a-zA-Z][\\u4e00-\\u9fa5_a-zA-Z0-9.-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, minLength = 2, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateAliyunSnapshotRemoteResult value = res.getResult(org.zstack.sdk.CreateAliyunSnapshotRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateAliyunSnapshotRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/snapshot"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunSnapshotRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunSnapshotRemoteResult.java deleted file mode 100644 index e94e58a2f7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunSnapshotRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunSnapshotInventory; - -public class CreateAliyunSnapshotRemoteResult { - public AliyunSnapshotInventory inventory; - public void setInventory(AliyunSnapshotInventory inventory) { - this.inventory = inventory; - } - public AliyunSnapshotInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunVpcVirtualRouterEntryRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunVpcVirtualRouterEntryRemoteAction.java deleted file mode 100644 index a28807fe44..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunVpcVirtualRouterEntryRemoteAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateAliyunVpcVirtualRouterEntryRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateAliyunVpcVirtualRouterEntryRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String vRouterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String dstCidrBlock; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String nextHopUuid; - - @Param(required = true, validValues = {"Instance","RouterInterface","VpnGateway"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String nextHopType; - - @Param(required = true, validValues = {"vbr","vrouter"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vRouterType; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateAliyunVpcVirtualRouterEntryRemoteResult value = res.getResult(org.zstack.sdk.CreateAliyunVpcVirtualRouterEntryRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateAliyunVpcVirtualRouterEntryRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/route-entry"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateAliyunVpcVirtualRouterEntryRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateAliyunVpcVirtualRouterEntryRemoteResult.java deleted file mode 100644 index 9a2963b9ca..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateAliyunVpcVirtualRouterEntryRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcVirtualRouteEntryInventory; - -public class CreateAliyunVpcVirtualRouterEntryRemoteResult { - public VpcVirtualRouteEntryInventory inventory; - public void setInventory(VpcVirtualRouteEntryInventory inventory) { - this.inventory = inventory; - } - public VpcVirtualRouteEntryInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2BondingAction.java b/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2BondingAction.java deleted file mode 100644 index c67c2dd83c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2BondingAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateBareMetal2BondingAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateBareMetal2BondingResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisUuid; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, numberRange = {0L,6L}, noTrim = false) - public java.lang.Integer mode; - - @Param(required = true, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String slaves; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String opts; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateBareMetal2BondingResult value = res.getResult(org.zstack.sdk.CreateBareMetal2BondingResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateBareMetal2BondingResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/chassis/bond"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2BondingResult.java b/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2BondingResult.java deleted file mode 100644 index ff90fb3c10..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2BondingResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2BondingInventory; - -public class CreateBareMetal2BondingResult { - public BareMetal2BondingInventory inventory; - public void setInventory(BareMetal2BondingInventory inventory) { - this.inventory = inventory; - } - public BareMetal2BondingInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ChassisHardwareResult.java b/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ChassisHardwareResult.java deleted file mode 100644 index 217d421578..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ChassisHardwareResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class CreateBareMetal2ChassisHardwareResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2InstanceAction.java b/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2InstanceAction.java deleted file mode 100644 index bb817dd411..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2InstanceAction.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateBareMetal2InstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateBareMetal2InstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String zoneUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String clusterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String gatewayUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisOfferingUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String imageUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisDiskUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String primaryStorageUuidForRootVolume; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String primaryStorageUuidForDataVolume; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List dataDiskOfferingUuids; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List rootVolumeSystemTags; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List dataVolumeSystemTags; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String gatewayAllocatorStrategy; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateBareMetal2InstanceResult value = res.getResult(org.zstack.sdk.CreateBareMetal2InstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateBareMetal2InstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/bm-instances"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2InstanceResult.java b/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2InstanceResult.java deleted file mode 100644 index 9582bb786a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2InstanceResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2InstanceInventory; - -public class CreateBareMetal2InstanceResult { - public BareMetal2InstanceInventory inventory; - public void setInventory(BareMetal2InstanceInventory inventory) { - this.inventory = inventory; - } - public BareMetal2InstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2IpmiChassisHardwareInfoAction.java b/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2IpmiChassisHardwareInfoAction.java deleted file mode 100644 index d45a12ac4b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2IpmiChassisHardwareInfoAction.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateBareMetal2IpmiChassisHardwareInfoAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateBareMetal2ChassisHardwareResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipmiAddress; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, numberRange = {1L,65535L}, noTrim = false) - public java.lang.Integer ipmiPort; - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String hardwareInfo; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String convertInfo; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @NonAPIParam - public boolean isSuppressCredentialCheck = true; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateBareMetal2ChassisHardwareResult value = res.getResult(org.zstack.sdk.CreateBareMetal2ChassisHardwareResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateBareMetal2ChassisHardwareResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/chassis/ipmi/hardwareinfos"; - info.needSession = false; - info.needPoll = false; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ProvisionNetworkAction.java b/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ProvisionNetworkAction.java deleted file mode 100644 index 5d6ebd801e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ProvisionNetworkAction.java +++ /dev/null @@ -1,128 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateBareMetal2ProvisionNetworkAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateBareMetal2ProvisionNetworkResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @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 zoneUuid; - - @Param(required = true, maxLength = 128, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpInterface; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpRangeStartIp; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpRangeEndIp; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpRangeNetmask; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpRangeGateway; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateBareMetal2ProvisionNetworkResult value = res.getResult(org.zstack.sdk.CreateBareMetal2ProvisionNetworkResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateBareMetal2ProvisionNetworkResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/baremetal2/provision-networks"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ProvisionNetworkResult.java b/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ProvisionNetworkResult.java deleted file mode 100644 index 817d96445f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateBareMetal2ProvisionNetworkResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ProvisionNetworkInventory; - -public class CreateBareMetal2ProvisionNetworkResult { - public BareMetal2ProvisionNetworkInventory inventory; - public void setInventory(BareMetal2ProvisionNetworkInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ProvisionNetworkInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateConnectionBetweenL3NetworkAndAliyunVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/CreateConnectionBetweenL3NetworkAndAliyunVSwitchAction.java deleted file mode 100644 index 77a03c809b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateConnectionBetweenL3NetworkAndAliyunVSwitchAction.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateConnectionBetweenL3NetworkAndAliyunVSwitchAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateConnectionBetweenL3NetworkAndAliyunVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String l3networkUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpcUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vbrUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String cpeIp; - - @Param(required = true, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = true, validValues = {"in","out","both"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String direction; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateConnectionBetweenL3NetworkAndAliyunVSwitchResult value = res.getResult(org.zstack.sdk.CreateConnectionBetweenL3NetworkAndAliyunVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateConnectionBetweenL3NetworkAndAliyunVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/connections"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateConnectionBetweenL3NetworkAndAliyunVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/CreateConnectionBetweenL3NetworkAndAliyunVSwitchResult.java deleted file mode 100644 index 8f6e5b54ce..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateConnectionBetweenL3NetworkAndAliyunVSwitchResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.ConnectionRelationShipInventory; - -public class CreateConnectionBetweenL3NetworkAndAliyunVSwitchResult { - public ConnectionRelationShipInventory inventory; - public void setInventory(ConnectionRelationShipInventory inventory) { - this.inventory = inventory; - } - public ConnectionRelationShipInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromEcsSnapshotAction.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromEcsSnapshotAction.java deleted file mode 100644 index 0ec8f00752..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromEcsSnapshotAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateEcsImageFromEcsSnapshotAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateEcsImageFromEcsSnapshotResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String snapshotUuid; - - @Param(required = true, validRegexValues = "^[\\u4e00-\\u9fa5a-zA-Z][\\u4e00-\\u9fa5_a-zA-Z0-9.-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, minLength = 2, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateEcsImageFromEcsSnapshotResult value = res.getResult(org.zstack.sdk.CreateEcsImageFromEcsSnapshotResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateEcsImageFromEcsSnapshotResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/image/snapshot"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromEcsSnapshotResult.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromEcsSnapshotResult.java deleted file mode 100644 index e3dea29e3d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromEcsSnapshotResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsImageInventory; - -public class CreateEcsImageFromEcsSnapshotResult { - public EcsImageInventory inventory; - public void setInventory(EcsImageInventory inventory) { - this.inventory = inventory; - } - public EcsImageInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromLocalImageAction.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromLocalImageAction.java deleted file mode 100644 index 317f404e75..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromLocalImageAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateEcsImageFromLocalImageAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateEcsImageFromLocalImageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String imageUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String backupStorageUuid; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = true, validRegexValues = "[A-Za-z\\u4e00-\\u9fa5]{1}[A-Za-z0-9-_\\u4e00-\\u9fa5]{1,127}", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateEcsImageFromLocalImageResult value = res.getResult(org.zstack.sdk.CreateEcsImageFromLocalImageResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateEcsImageFromLocalImageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/image"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromLocalImageResult.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromLocalImageResult.java deleted file mode 100644 index 9198853823..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsImageFromLocalImageResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsImageInventory; - -public class CreateEcsImageFromLocalImageResult { - public EcsImageInventory inventory; - public void setInventory(EcsImageInventory inventory) { - this.inventory = inventory; - } - public EcsImageInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsInstanceFromEcsImageAction.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsInstanceFromEcsImageAction.java deleted file mode 100644 index 49fc5994db..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsInstanceFromEcsImageAction.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateEcsInstanceFromEcsImageAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateEcsInstanceFromEcsImageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsRootVolumeType; - - @Param(required = false, maxLength = 1024, minLength = 2, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {40L,500L}, noTrim = false) - public java.lang.Long ecsRootVolumeGBSize; - - @Param(required = false, validValues = {"atomic","permissive"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String createMode; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String privateIpAddress; - - @Param(required = false, validValues = {"true","false"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String allocatePublicIp; - - @Param(required = false, validRegexValues = "[A-Za-z0-9]{6}", maxLength = 6, minLength = 6, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsConsolePassword; - - @Param(required = true, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsImageUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String instanceOfferingUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String instanceType; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsVSwitchUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsSecurityGroupUuid; - - @Param(required = true, maxLength = 30, minLength = 8, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsRootPassword; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {1L,200L}, noTrim = false) - public java.lang.Long ecsBandWidth; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateEcsInstanceFromEcsImageResult value = res.getResult(org.zstack.sdk.CreateEcsInstanceFromEcsImageResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateEcsInstanceFromEcsImageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/ecs"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsInstanceFromEcsImageResult.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsInstanceFromEcsImageResult.java deleted file mode 100644 index 4ab73b5b63..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsInstanceFromEcsImageResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsInstanceInventory; - -public class CreateEcsInstanceFromEcsImageResult { - public EcsInstanceInventory inventory; - public void setInventory(EcsInstanceInventory inventory) { - this.inventory = inventory; - } - public EcsInstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRemoteAction.java deleted file mode 100644 index 48b152f17f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRemoteAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateEcsSecurityGroupRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateEcsSecurityGroupRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpcUuid; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = true, maxLength = 64, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, validValues = {"all","security","basic"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String strategy; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateEcsSecurityGroupRemoteResult value = res.getResult(org.zstack.sdk.CreateEcsSecurityGroupRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateEcsSecurityGroupRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/security-group/remote"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRemoteResult.java deleted file mode 100644 index fcd75dbc9e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsSecurityGroupInventory; - -public class CreateEcsSecurityGroupRemoteResult { - public EcsSecurityGroupInventory inventory; - public void setInventory(EcsSecurityGroupInventory inventory) { - this.inventory = inventory; - } - public EcsSecurityGroupInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRuleRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRuleRemoteAction.java deleted file mode 100644 index ae100a6c19..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRuleRemoteAction.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateEcsSecurityGroupRuleRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateEcsSecurityGroupRuleRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String groupUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String direction; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String protocol; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String portRange; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String cidr; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String policy = "accept"; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String nictype = "intranet"; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {1L,100L}, noTrim = false) - public java.lang.Integer priority = 1; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateEcsSecurityGroupRuleRemoteResult value = res.getResult(org.zstack.sdk.CreateEcsSecurityGroupRuleRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateEcsSecurityGroupRuleRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/security-group-rule"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRuleRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRuleRemoteResult.java deleted file mode 100644 index 7ee1e26d7d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsSecurityGroupRuleRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsSecurityGroupRuleInventory; - -public class CreateEcsSecurityGroupRuleRemoteResult { - public EcsSecurityGroupRuleInventory inventory; - public void setInventory(EcsSecurityGroupRuleInventory inventory) { - this.inventory = inventory; - } - public EcsSecurityGroupRuleInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsVSwitchRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsVSwitchRemoteAction.java deleted file mode 100644 index 3c72f9aa74..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsVSwitchRemoteAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateEcsVSwitchRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateEcsVSwitchRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpcUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String identityZoneUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String cidrBlock; - - @Param(required = true, validRegexValues = "^[\\u4e00-\\u9fa5a-zA-Z][\\u4e00-\\u9fa5_a-zA-Z0-9-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateEcsVSwitchRemoteResult value = res.getResult(org.zstack.sdk.CreateEcsVSwitchRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateEcsVSwitchRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/vswitch"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsVSwitchRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsVSwitchRemoteResult.java deleted file mode 100644 index 00df3255b1..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsVSwitchRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsVSwitchInventory; - -public class CreateEcsVSwitchRemoteResult { - public EcsVSwitchInventory inventory; - public void setInventory(EcsVSwitchInventory inventory) { - this.inventory = inventory; - } - public EcsVSwitchInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsVpcRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsVpcRemoteAction.java deleted file mode 100644 index 001d457ebc..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsVpcRemoteAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateEcsVpcRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateEcsVpcRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String cidrBlock; - - @Param(required = true, maxLength = 64, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = true, validRegexValues = "[A-Za-z]{1}[A-Za-z0-9-_]{1,127}", nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vRouterName; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateEcsVpcRemoteResult value = res.getResult(org.zstack.sdk.CreateEcsVpcRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateEcsVpcRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/vpc"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateEcsVpcRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateEcsVpcRemoteResult.java deleted file mode 100644 index c5cf3ff4b4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateEcsVpcRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsVpcInventory; - -public class CreateEcsVpcRemoteResult { - public EcsVpcInventory inventory; - public void setInventory(EcsVpcInventory inventory) { - this.inventory = inventory; - } - public EcsVpcInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateHostKernelInterfaceAction.java b/sdk/src/main/java/org/zstack/sdk/CreateHostKernelInterfaceAction.java index e2428935fc..439045ffd0 100644 --- a/sdk/src/main/java/org/zstack/sdk/CreateHostKernelInterfaceAction.java +++ b/sdk/src/main/java/org/zstack/sdk/CreateHostKernelInterfaceAction.java @@ -25,19 +25,16 @@ public Result throwExceptionIfError() { } } - @Param(required = true, maxLength = 255, nonempty = true, nullElements = false, emptyString = true, noTrim = false) + @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String name; @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String description; - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) + @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String hostUuid; - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String l2NetworkUuid; - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) + @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String l3NetworkUuid; @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) @@ -46,7 +43,7 @@ public Result throwExceptionIfError() { @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String netmask; - @Param(required = false, validValues = {"Management"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + @Param(required = false, validValues = {"Management","Storage"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.util.List trafficTypes; @Param(required = false) @@ -118,7 +115,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "POST"; - info.path = "/l2-networks/kernel-interfaces"; + info.path = "/l3-networks/kernel-interfaces"; info.needSession = true; info.needPoll = true; info.parameterName = "params"; diff --git a/sdk/src/main/java/org/zstack/sdk/CreateHybridEipAction.java b/sdk/src/main/java/org/zstack/sdk/CreateHybridEipAction.java deleted file mode 100644 index dddabeafb0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateHybridEipAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateHybridEipAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateHybridEipResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @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, numberRange = {1L,200L}, noTrim = false) - public long bandWidthMb = 0L; - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = true, validValues = {"PayByTraffic"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chargeType; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateHybridEipResult value = res.getResult(org.zstack.sdk.CreateHybridEipResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateHybridEipResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/eip"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateHybridEipResult.java b/sdk/src/main/java/org/zstack/sdk/CreateHybridEipResult.java deleted file mode 100644 index 06bef7e008..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateHybridEipResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridEipAddressInventory; - -public class CreateHybridEipResult { - public HybridEipAddressInventory inventory; - public void setInventory(HybridEipAddressInventory inventory) { - this.inventory = inventory; - } - public HybridEipAddressInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateOssBackupBucketRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateOssBackupBucketRemoteAction.java deleted file mode 100644 index 1885cec9df..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateOssBackupBucketRemoteAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateOssBackupBucketRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateOssBackupBucketRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String regionId; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossDomain; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossKey; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossSecret; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateOssBackupBucketRemoteResult value = res.getResult(org.zstack.sdk.CreateOssBackupBucketRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateOssBackupBucketRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/backup-mysql/oss"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateOssBackupBucketRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateOssBackupBucketRemoteResult.java deleted file mode 100644 index f186001208..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateOssBackupBucketRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class CreateOssBackupBucketRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateOssBucketRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateOssBucketRemoteAction.java deleted file mode 100644 index f5a5bd4556..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateOssBucketRemoteAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateOssBucketRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateOssBucketRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = true, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String bucketName; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossDomain; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossKey; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossSecret; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateOssBucketRemoteResult value = res.getResult(org.zstack.sdk.CreateOssBucketRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateOssBucketRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/oss-bucket/remote"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateOssBucketRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateOssBucketRemoteResult.java deleted file mode 100644 index 4c2d01e27f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateOssBucketRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.OssBucketInventory; - -public class CreateOssBucketRemoteResult { - public OssBucketInventory inventory; - public void setInventory(OssBucketInventory inventory) { - this.inventory = inventory; - } - public OssBucketInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVmInstanceFromTemplatedVmInstanceAction.java b/sdk/src/main/java/org/zstack/sdk/CreateVmInstanceFromTemplatedVmInstanceAction.java index ecd72c9c01..8994903a45 100644 --- a/sdk/src/main/java/org/zstack/sdk/CreateVmInstanceFromTemplatedVmInstanceAction.java +++ b/sdk/src/main/java/org/zstack/sdk/CreateVmInstanceFromTemplatedVmInstanceAction.java @@ -73,6 +73,9 @@ public Result throwExceptionIfError() { @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String type; + @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public org.zstack.sdk.VmCustomSpecificationStruct vmCustomSpecification; + @Param(required = false) public java.util.List systemTags; diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpcUserVpnGatewayRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateVpcUserVpnGatewayRemoteAction.java deleted file mode 100644 index c00ff0db31..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpcUserVpnGatewayRemoteAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateVpcUserVpnGatewayRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateVpcUserVpnGatewayRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String ip; - - @Param(required = true, validRegexValues = "^[\\u4e00-\\u9fa5a-zA-Z][\\u4e00-\\u9fa5_a-zA-Z0-9-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateVpcUserVpnGatewayRemoteResult value = res.getResult(org.zstack.sdk.CreateVpcUserVpnGatewayRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateVpcUserVpnGatewayRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/user-vpn"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpcUserVpnGatewayRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateVpcUserVpnGatewayRemoteResult.java deleted file mode 100644 index 0b84c0d6e8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpcUserVpnGatewayRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcUserVpnGatewayInventory; - -public class CreateVpcUserVpnGatewayRemoteResult { - public VpcUserVpnGatewayInventory inventory; - public void setInventory(VpcUserVpnGatewayInventory inventory) { - this.inventory = inventory; - } - public VpcUserVpnGatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpcVpnConnectionRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/CreateVpcVpnConnectionRemoteAction.java deleted file mode 100644 index 5739e688c5..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpcVpnConnectionRemoteAction.java +++ /dev/null @@ -1,128 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateVpcVpnConnectionRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateVpcVpnConnectionRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String userGatewayUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpnGatewayUuid; - - @Param(required = true, maxLength = 64, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String localCidr; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String remoteCidr; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean active = false; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ikeConfUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipsecConfUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateVpcVpnConnectionRemoteResult value = res.getResult(org.zstack.sdk.CreateVpcVpnConnectionRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateVpcVpnConnectionRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/vpn-connection"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpcVpnConnectionRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/CreateVpcVpnConnectionRemoteResult.java deleted file mode 100644 index d8a95d6909..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpcVpnConnectionRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcVpnConnectionInventory; - -public class CreateVpcVpnConnectionRemoteResult { - public VpcVpnConnectionInventory inventory; - public void setInventory(VpcVpnConnectionInventory inventory) { - this.inventory = inventory; - } - public VpcVpnConnectionInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpnIkeConfigAction.java b/sdk/src/main/java/org/zstack/sdk/CreateVpnIkeConfigAction.java deleted file mode 100644 index 3486f075a5..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpnIkeConfigAction.java +++ /dev/null @@ -1,137 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateVpnIkeConfigAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateVpnIkeConfigResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 64, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = true, maxLength = 32, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String psk; - - @Param(required = false, validValues = {"disabled","group1","group2","group5","group14","group24"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String pfs = "group1"; - - @Param(required = false, validValues = {"ikev1","ikev2"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String version = "ikev1"; - - @Param(required = false, validValues = {"main","aggressive"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String mode = "main"; - - @Param(required = false, validValues = {"3des","aes-128","aes-192","aes-256","des"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String encAlg = "3des"; - - @Param(required = false, validValues = {"md5","sha1"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String authAlg = "sha1"; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {60L,86400L}, noTrim = false) - public java.lang.Integer lifetime = 86400; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String localIp; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String remoteIp; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateVpnIkeConfigResult value = res.getResult(org.zstack.sdk.CreateVpnIkeConfigResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateVpnIkeConfigResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/vpn-connection/ike"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpnIkeConfigResult.java b/sdk/src/main/java/org/zstack/sdk/CreateVpnIkeConfigResult.java deleted file mode 100644 index 530e336cec..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpnIkeConfigResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcVpnIkeConfigInventory; - -public class CreateVpnIkeConfigResult { - public VpcVpnIkeConfigInventory inventory; - public void setInventory(VpcVpnIkeConfigInventory inventory) { - this.inventory = inventory; - } - public VpcVpnIkeConfigInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpnIpsecConfigAction.java b/sdk/src/main/java/org/zstack/sdk/CreateVpnIpsecConfigAction.java deleted file mode 100644 index 0adcd55ca8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpnIpsecConfigAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateVpnIpsecConfigAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.CreateVpnIpsecConfigResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 64, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, validValues = {"disabled","group1","group2","group5","group14","group24"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String pfs = "group1"; - - @Param(required = false, validValues = {"3des","aes-128","aes-192","aes-256","des"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String encAlg = "3des"; - - @Param(required = false, validValues = {"md5","sha1"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String authAlg = "sha1"; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {60L,86400L}, noTrim = false) - public java.lang.Integer lifetime = 86400; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateVpnIpsecConfigResult value = res.getResult(org.zstack.sdk.CreateVpnIpsecConfigResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateVpnIpsecConfigResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/vpn-connection/ipsec"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpnIpsecConfigResult.java b/sdk/src/main/java/org/zstack/sdk/CreateVpnIpsecConfigResult.java deleted file mode 100644 index 7384d19100..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpnIpsecConfigResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcVpnIpSecConfigInventory; - -public class CreateVpnIpsecConfigResult { - public VpcVpnIpSecConfigInventory inventory; - public void setInventory(VpcVpnIpSecConfigInventory inventory) { - this.inventory = inventory; - } - public VpcVpnIpSecConfigInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DataCenterInventory.java b/sdk/src/main/java/org/zstack/sdk/DataCenterInventory.java deleted file mode 100644 index a44c568ef0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DataCenterInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridType; - -public class DataCenterInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String deleted; - public void setDeleted(java.lang.String deleted) { - this.deleted = deleted; - } - public java.lang.String getDeleted() { - return this.deleted; - } - - public java.lang.String regionName; - public void setRegionName(java.lang.String regionName) { - this.regionName = regionName; - } - public java.lang.String getRegionName() { - return this.regionName; - } - - public HybridType dcType; - public void setDcType(HybridType dcType) { - this.dcType = dcType; - } - public HybridType getDcType() { - return this.dcType; - } - - public java.lang.String regionId; - public void setRegionId(java.lang.String regionId) { - this.regionId = regionId; - } - public java.lang.String getRegionId() { - return this.regionId; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String endpoint; - public void setEndpoint(java.lang.String endpoint) { - this.endpoint = endpoint; - } - public java.lang.String getEndpoint() { - return this.endpoint; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DataCenterProperty.java b/sdk/src/main/java/org/zstack/sdk/DataCenterProperty.java deleted file mode 100644 index cb8ef1e0b1..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DataCenterProperty.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - - - -public class DataCenterProperty { - - public java.lang.String regionId; - public void setRegionId(java.lang.String regionId) { - this.regionId = regionId; - } - public java.lang.String getRegionId() { - return this.regionId; - } - - public java.lang.String regionName; - public void setRegionName(java.lang.String regionName) { - this.regionName = regionName; - } - public java.lang.String getRegionName() { - return this.regionName; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromLocalAction.java deleted file mode 100644 index 71c9a88821..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunDiskFromLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunDiskFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunDiskFromLocalResult value = res.getResult(org.zstack.sdk.DeleteAliyunDiskFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunDiskFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/disk/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromLocalResult.java deleted file mode 100644 index 44dc365eea..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunDiskFromLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromRemoteAction.java deleted file mode 100644 index 32b9968583..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunDiskFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunDiskFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunDiskFromRemoteResult value = res.getResult(org.zstack.sdk.DeleteAliyunDiskFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunDiskFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/disk/{uuid}/remote"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromRemoteResult.java deleted file mode 100644 index 676593452c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunDiskFromRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunDiskFromRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunKeySecretResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunKeySecretResult.java deleted file mode 100644 index 8495549fcc..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunKeySecretResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunKeySecretResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupAction.java deleted file mode 100644 index c7d5990474..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunNasAccessGroupAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunNasAccessGroupResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunNasAccessGroupResult value = res.getResult(org.zstack.sdk.DeleteAliyunNasAccessGroupResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunNasAccessGroupResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/nas/access/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupResult.java deleted file mode 100644 index eecaeef71d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunNasAccessGroupResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupRuleAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupRuleAction.java deleted file mode 100644 index 6232cfd987..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupRuleAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunNasAccessGroupRuleAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunNasAccessGroupRuleResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunNasAccessGroupRuleResult value = res.getResult(org.zstack.sdk.DeleteAliyunNasAccessGroupRuleResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunNasAccessGroupRuleResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/nas/access/rule/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupRuleResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupRuleResult.java deleted file mode 100644 index 0a6ce2883e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunNasAccessGroupRuleResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunNasAccessGroupRuleResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunPanguPartitionAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunPanguPartitionAction.java deleted file mode 100644 index a9f024f228..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunPanguPartitionAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunPanguPartitionAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunPanguPartitionResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunPanguPartitionResult value = res.getResult(org.zstack.sdk.DeleteAliyunPanguPartitionResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunPanguPartitionResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/aliyun/pangu/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunPanguPartitionResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunPanguPartitionResult.java deleted file mode 100644 index 91da99e1a9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunPanguPartitionResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunPanguPartitionResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVSwitchAction.java deleted file mode 100644 index 3dc93f1cd8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVSwitchAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunProxyVSwitchAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunProxyVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunProxyVSwitchResult value = res.getResult(org.zstack.sdk.DeleteAliyunProxyVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunProxyVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/aliyun-proxy/vpcs/vswitches/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVSwitchResult.java deleted file mode 100644 index 94d76c6156..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVSwitchResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunProxyVSwitchResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVpcAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVpcAction.java deleted file mode 100644 index 516c2f9493..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVpcAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunProxyVpcAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunProxyVpcResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunProxyVpcResult value = res.getResult(org.zstack.sdk.DeleteAliyunProxyVpcResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunProxyVpcResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/aliyun-proxy/vpcs/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVpcResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVpcResult.java deleted file mode 100644 index e91dc9d767..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunProxyVpcResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunProxyVpcResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouteEntryRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouteEntryRemoteAction.java deleted file mode 100644 index 2d21c799f9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouteEntryRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunRouteEntryRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunRouteEntryRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunRouteEntryRemoteResult value = res.getResult(org.zstack.sdk.DeleteAliyunRouteEntryRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunRouteEntryRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/route-entry/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouteEntryRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouteEntryRemoteResult.java deleted file mode 100644 index f5077f1053..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouteEntryRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunRouteEntryRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceLocalAction.java deleted file mode 100644 index 6f28178ac9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunRouterInterfaceLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunRouterInterfaceLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunRouterInterfaceLocalResult value = res.getResult(org.zstack.sdk.DeleteAliyunRouterInterfaceLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunRouterInterfaceLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/router-interface/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceLocalResult.java deleted file mode 100644 index 3547a1537b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunRouterInterfaceLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceRemoteAction.java deleted file mode 100644 index fc994a41b8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunRouterInterfaceRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunRouterInterfaceRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"vrouter","vbr"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vRouterType; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunRouterInterfaceRemoteResult value = res.getResult(org.zstack.sdk.DeleteAliyunRouterInterfaceRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunRouterInterfaceRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/router-interface/remote/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceRemoteResult.java deleted file mode 100644 index 261c88fba7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunRouterInterfaceRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunRouterInterfaceRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromLocalAction.java deleted file mode 100644 index 77ebbb92ad..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunSnapshotFromLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunSnapshotFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunSnapshotFromLocalResult value = res.getResult(org.zstack.sdk.DeleteAliyunSnapshotFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunSnapshotFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/snapshot/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromLocalResult.java deleted file mode 100644 index 448aa5a586..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunSnapshotFromLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromRemoteAction.java deleted file mode 100644 index 9135e47f4c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAliyunSnapshotFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAliyunSnapshotFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAliyunSnapshotFromRemoteResult value = res.getResult(org.zstack.sdk.DeleteAliyunSnapshotFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunSnapshotFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/snapshot/{uuid}/remote"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromRemoteResult.java deleted file mode 100644 index 54c8855c0f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunSnapshotFromRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAliyunSnapshotFromRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAllEcsInstancesFromDataCenterAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteAllEcsInstancesFromDataCenterAction.java deleted file mode 100644 index c0d6e0e44f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAllEcsInstancesFromDataCenterAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteAllEcsInstancesFromDataCenterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteAllEcsInstancesFromDataCenterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteAllEcsInstancesFromDataCenterResult value = res.getResult(org.zstack.sdk.DeleteAllEcsInstancesFromDataCenterResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAllEcsInstancesFromDataCenterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/dc-ecs/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAllEcsInstancesFromDataCenterResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteAllEcsInstancesFromDataCenterResult.java deleted file mode 100644 index 58e6a8cac0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAllEcsInstancesFromDataCenterResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteAllEcsInstancesFromDataCenterResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteBackupDatabaseInPublicResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteBackupDatabaseInPublicResult.java deleted file mode 100644 index 428b40c412..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteBackupDatabaseInPublicResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteBackupDatabaseInPublicResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteBackupFileInPublicAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteBackupFileInPublicAction.java deleted file mode 100644 index db094f0d4e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteBackupFileInPublicAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteBackupFileInPublicAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteBackupDatabaseInPublicResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String regionId; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String file; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteBackupDatabaseInPublicResult value = res.getResult(org.zstack.sdk.DeleteBackupDatabaseInPublicResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteBackupDatabaseInPublicResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/backup-mysql"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ChassisAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ChassisAction.java deleted file mode 100644 index e2606fa9d7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ChassisAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteBareMetal2ChassisAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.DeleteBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/baremetal2/chassis/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ChassisResult.java deleted file mode 100644 index 5f0ebe8288..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ChassisResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteBareMetal2ChassisResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2GatewayAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2GatewayAction.java deleted file mode 100644 index ae3edb0538..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2GatewayAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteBareMetal2GatewayAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteBareMetal2GatewayResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteBareMetal2GatewayResult value = res.getResult(org.zstack.sdk.DeleteBareMetal2GatewayResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteBareMetal2GatewayResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/baremetal2/gateways/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2GatewayResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2GatewayResult.java deleted file mode 100644 index 849564e54e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2GatewayResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteBareMetal2GatewayResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ProvisionNetworkAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ProvisionNetworkAction.java deleted file mode 100644 index d5731081c8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ProvisionNetworkAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteBareMetal2ProvisionNetworkAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteBareMetal2ProvisionNetworkResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteBareMetal2ProvisionNetworkResult value = res.getResult(org.zstack.sdk.DeleteBareMetal2ProvisionNetworkResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteBareMetal2ProvisionNetworkResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/baremetal2/provision-networks/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ProvisionNetworkResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ProvisionNetworkResult.java deleted file mode 100644 index 6c66ed105d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteBareMetal2ProvisionNetworkResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteBareMetal2ProvisionNetworkResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteConnectionAccessPointLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteConnectionAccessPointLocalAction.java deleted file mode 100644 index 53ce73f364..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteConnectionAccessPointLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteConnectionAccessPointLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteConnectionAccessPointLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteConnectionAccessPointLocalResult value = res.getResult(org.zstack.sdk.DeleteConnectionAccessPointLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteConnectionAccessPointLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/access-point/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteConnectionAccessPointLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteConnectionAccessPointLocalResult.java deleted file mode 100644 index d2accd05f8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteConnectionAccessPointLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteConnectionAccessPointLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchAction.java deleted file mode 100644 index 81d4b3d243..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchResult value = res.getResult(org.zstack.sdk.DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/connections/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchResult.java deleted file mode 100644 index 0823042155..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteDataCenterInLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteDataCenterInLocalAction.java deleted file mode 100644 index 4fc05fe824..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteDataCenterInLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteDataCenterInLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteDataCenterInLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteDataCenterInLocalResult value = res.getResult(org.zstack.sdk.DeleteDataCenterInLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteDataCenterInLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/data-center/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteDataCenterInLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteDataCenterInLocalResult.java deleted file mode 100644 index 596edca48e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteDataCenterInLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteDataCenterInLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageLocalAction.java deleted file mode 100644 index 39b101f2ff..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsImageLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsImageLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsImageLocalResult value = res.getResult(org.zstack.sdk.DeleteEcsImageLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsImageLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/image/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageLocalResult.java deleted file mode 100644 index 28b9b25b7d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsImageLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageRemoteAction.java deleted file mode 100644 index f738ffc596..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsImageRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsImageRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsImageRemoteResult value = res.getResult(org.zstack.sdk.DeleteEcsImageRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsImageRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/image/remote/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageRemoteResult.java deleted file mode 100644 index ec3821132d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsImageRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsImageRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceAction.java deleted file mode 100644 index 379507ddae..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsInstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsInstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsInstanceResult value = res.getResult(org.zstack.sdk.DeleteEcsInstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsInstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/ecs/{uuid}/remote"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceLocalAction.java deleted file mode 100644 index 980a38fc2b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsInstanceLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsInstanceLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsInstanceLocalResult value = res.getResult(org.zstack.sdk.DeleteEcsInstanceLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsInstanceLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/ecs/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceLocalResult.java deleted file mode 100644 index f003ed7547..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsInstanceLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceResult.java deleted file mode 100644 index 65509f1135..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsInstanceResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsInstanceResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupInLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupInLocalAction.java deleted file mode 100644 index 973081d508..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupInLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsSecurityGroupInLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsSecurityGroupInLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsSecurityGroupInLocalResult value = res.getResult(org.zstack.sdk.DeleteEcsSecurityGroupInLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsSecurityGroupInLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/security-group/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupInLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupInLocalResult.java deleted file mode 100644 index ddddf5a3fa..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupInLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsSecurityGroupInLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRemoteAction.java deleted file mode 100644 index 0bf1e9e553..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsSecurityGroupRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsSecurityGroupRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsSecurityGroupRemoteResult value = res.getResult(org.zstack.sdk.DeleteEcsSecurityGroupRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsSecurityGroupRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/security-group/remote/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRemoteResult.java deleted file mode 100644 index a043bcb080..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsSecurityGroupRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRuleRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRuleRemoteAction.java deleted file mode 100644 index 032fc4a9b7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRuleRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsSecurityGroupRuleRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsSecurityGroupRuleRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsSecurityGroupRuleRemoteResult value = res.getResult(org.zstack.sdk.DeleteEcsSecurityGroupRuleRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsSecurityGroupRuleRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/security-group-rule/remote/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRuleRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRuleRemoteResult.java deleted file mode 100644 index 1fde15f9e2..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsSecurityGroupRuleRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsSecurityGroupRuleRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchInLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchInLocalAction.java deleted file mode 100644 index d6aa36afa5..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchInLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsVSwitchInLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsVSwitchInLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsVSwitchInLocalResult value = res.getResult(org.zstack.sdk.DeleteEcsVSwitchInLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsVSwitchInLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/vswitch/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchInLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchInLocalResult.java deleted file mode 100644 index fd6707438a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchInLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsVSwitchInLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchRemoteAction.java deleted file mode 100644 index 1375daa91f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsVSwitchRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsVSwitchRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsVSwitchRemoteResult value = res.getResult(org.zstack.sdk.DeleteEcsVSwitchRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsVSwitchRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/vswitch/remote/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchRemoteResult.java deleted file mode 100644 index c2f8349558..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVSwitchRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsVSwitchRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcInLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcInLocalAction.java deleted file mode 100644 index 78288a9521..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcInLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsVpcInLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsVpcInLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsVpcInLocalResult value = res.getResult(org.zstack.sdk.DeleteEcsVpcInLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsVpcInLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/vpc/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcInLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcInLocalResult.java deleted file mode 100644 index 4ba675b050..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcInLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsVpcInLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcRemoteAction.java deleted file mode 100644 index 4d6f1720c0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteEcsVpcRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteEcsVpcRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteEcsVpcRemoteResult value = res.getResult(org.zstack.sdk.DeleteEcsVpcRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteEcsVpcRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/vpc/remote/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcRemoteResult.java deleted file mode 100644 index 7e4877b2c4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteEcsVpcRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteEcsVpcRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteHostKernelInterfaceAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteHostKernelInterfaceAction.java index 94399d558d..7cc3e4a739 100644 --- a/sdk/src/main/java/org/zstack/sdk/DeleteHostKernelInterfaceAction.java +++ b/sdk/src/main/java/org/zstack/sdk/DeleteHostKernelInterfaceAction.java @@ -25,7 +25,7 @@ public Result throwExceptionIfError() { } } - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) + @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String uuid; @Param(required = false) @@ -94,7 +94,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "DELETE"; - info.path = "/l2-networks/kernel-interfaces/{uuid}"; + info.path = "/l3-networks/kernel-interfaces/{uuid}"; info.needSession = true; info.needPoll = true; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipFromLocalAction.java deleted file mode 100644 index af5604e9fe..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipFromLocalAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteHybridEipFromLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteHybridEipFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteHybridEipFromLocalResult value = res.getResult(org.zstack.sdk.DeleteHybridEipFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteHybridEipFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/eip/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipFromLocalResult.java deleted file mode 100644 index b4fd1ac661..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipFromLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteHybridEipFromLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipRemoteAction.java deleted file mode 100644 index 30decd8cec..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteHybridEipRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteHybridEipRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteHybridEipRemoteResult value = res.getResult(org.zstack.sdk.DeleteHybridEipRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteHybridEipRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/eip/{uuid}/remote"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipRemoteResult.java deleted file mode 100644 index 27400ddb5d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteHybridEipRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteHybridEipRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteHybridKeySecretAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteHybridKeySecretAction.java deleted file mode 100644 index c5a2de8cb4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteHybridKeySecretAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteHybridKeySecretAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteHybridKeySecretResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteHybridKeySecretResult value = res.getResult(org.zstack.sdk.DeleteHybridKeySecretResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteHybridKeySecretResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/hybrid/key/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteHybridKeySecretResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteHybridKeySecretResult.java deleted file mode 100644 index 3b0d5798d2..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteHybridKeySecretResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteHybridKeySecretResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteIdentityZoneInLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteIdentityZoneInLocalAction.java deleted file mode 100644 index b2fe8bc50e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteIdentityZoneInLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteIdentityZoneInLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteIdentityZoneInLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteIdentityZoneInLocalResult value = res.getResult(org.zstack.sdk.DeleteIdentityZoneInLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteIdentityZoneInLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/identity-zone/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteIdentityZoneInLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteIdentityZoneInLocalResult.java deleted file mode 100644 index 79b8051fe7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteIdentityZoneInLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteIdentityZoneInLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketFileRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketFileRemoteAction.java deleted file mode 100644 index 2c3b00195b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketFileRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteOssBucketFileRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteOssBucketFileRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String fileName; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteOssBucketFileRemoteResult value = res.getResult(org.zstack.sdk.DeleteOssBucketFileRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteOssBucketFileRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/oss-bucket-file/remote/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketFileRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketFileRemoteResult.java deleted file mode 100644 index 073fce78f6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketFileRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteOssBucketFileRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketNameLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketNameLocalAction.java deleted file mode 100644 index 7ed41c909d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketNameLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteOssBucketNameLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteOssBucketNameLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteOssBucketNameLocalResult value = res.getResult(org.zstack.sdk.DeleteOssBucketNameLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteOssBucketNameLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/oss-bucket/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketNameLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketNameLocalResult.java deleted file mode 100644 index 1d3fa6d68d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketNameLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteOssBucketNameLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketRemoteAction.java deleted file mode 100644 index f1ea1c37fd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteOssBucketRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteOssBucketRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteOssBucketRemoteResult value = res.getResult(org.zstack.sdk.DeleteOssBucketRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteOssBucketRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/oss-bucket/remote/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketRemoteResult.java deleted file mode 100644 index c2df41c9f5..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteOssBucketRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteOssBucketRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVirtualBorderRouterLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVirtualBorderRouterLocalAction.java deleted file mode 100644 index 293cb4221a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVirtualBorderRouterLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteVirtualBorderRouterLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteVirtualBorderRouterLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteVirtualBorderRouterLocalResult value = res.getResult(org.zstack.sdk.DeleteVirtualBorderRouterLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVirtualBorderRouterLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/border-router/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVirtualBorderRouterLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVirtualBorderRouterLocalResult.java deleted file mode 100644 index ac373eee91..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVirtualBorderRouterLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVirtualBorderRouterLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVirtualRouterLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVirtualRouterLocalAction.java deleted file mode 100644 index 3794d92271..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVirtualRouterLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteVirtualRouterLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteVirtualRouterLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteVirtualRouterLocalResult value = res.getResult(org.zstack.sdk.DeleteVirtualRouterLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVirtualRouterLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/vrouter/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVirtualRouterLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVirtualRouterLocalResult.java deleted file mode 100644 index da9f1fcf52..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVirtualRouterLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVirtualRouterLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcIkeConfigLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcIkeConfigLocalAction.java deleted file mode 100644 index 05c705f6c2..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcIkeConfigLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteVpcIkeConfigLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteVpcIkeConfigLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteVpcIkeConfigLocalResult value = res.getResult(org.zstack.sdk.DeleteVpcIkeConfigLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVpcIkeConfigLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/vpn-connection/ike/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcIkeConfigLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcIkeConfigLocalResult.java deleted file mode 100644 index 61f59d5b7a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcIkeConfigLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVpcIkeConfigLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcIpSecConfigLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcIpSecConfigLocalAction.java deleted file mode 100644 index 185aad7de9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcIpSecConfigLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteVpcIpSecConfigLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteVpcIpSecConfigLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteVpcIpSecConfigLocalResult value = res.getResult(org.zstack.sdk.DeleteVpcIpSecConfigLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVpcIpSecConfigLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/vpn-connection/ipsec/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcIpSecConfigLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcIpSecConfigLocalResult.java deleted file mode 100644 index b249034dca..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcIpSecConfigLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVpcIpSecConfigLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayLocalAction.java deleted file mode 100644 index f0b6877744..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteVpcUserVpnGatewayLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteVpcUserVpnGatewayLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteVpcUserVpnGatewayLocalResult value = res.getResult(org.zstack.sdk.DeleteVpcUserVpnGatewayLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVpcUserVpnGatewayLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/user-gateway/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayLocalResult.java deleted file mode 100644 index a5e649077e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVpcUserVpnGatewayLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayRemoteAction.java deleted file mode 100644 index 5b3ee797bf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteVpcUserVpnGatewayRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteVpcUserVpnGatewayRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteVpcUserVpnGatewayRemoteResult value = res.getResult(org.zstack.sdk.DeleteVpcUserVpnGatewayRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVpcUserVpnGatewayRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/user-gateway/{uuid}/remote"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayRemoteResult.java deleted file mode 100644 index d8d2f43613..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcUserVpnGatewayRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVpcUserVpnGatewayRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionLocalResult.java deleted file mode 100644 index 83a73d2125..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVpcVpnConnectionLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionRemoteAction.java deleted file mode 100644 index 004f39febf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteVpcVpnConnectionRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteVpcVpnConnectionRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteVpcVpnConnectionRemoteResult value = res.getResult(org.zstack.sdk.DeleteVpcVpnConnectionRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVpcVpnConnectionRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/vpn-connection/{uuid}/remote"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionRemoteResult.java deleted file mode 100644 index fda7c2e0bf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVpcVpnConnectionRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnGatewayLocalAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnGatewayLocalAction.java deleted file mode 100644 index 97593f5ec0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnGatewayLocalAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DeleteVpcVpnGatewayLocalAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DeleteVpcVpnGatewayLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DeleteVpcVpnGatewayLocalResult value = res.getResult(org.zstack.sdk.DeleteVpcVpnGatewayLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVpcVpnGatewayLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/hybrid/vpn-gateway/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnGatewayLocalResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnGatewayLocalResult.java deleted file mode 100644 index d63d313136..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnGatewayLocalResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVpcVpnGatewayLocalResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachAliyunDiskFromEcsAction.java b/sdk/src/main/java/org/zstack/sdk/DetachAliyunDiskFromEcsAction.java deleted file mode 100644 index cd83be09be..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachAliyunDiskFromEcsAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DetachAliyunDiskFromEcsAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DetachAliyunDiskFromEcsResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DetachAliyunDiskFromEcsResult value = res.getResult(org.zstack.sdk.DetachAliyunDiskFromEcsResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachAliyunDiskFromEcsResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/disk/{uuid}/detach"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachAliyunDiskFromEcsResult.java b/sdk/src/main/java/org/zstack/sdk/DetachAliyunDiskFromEcsResult.java deleted file mode 100644 index c3e4fa625c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachAliyunDiskFromEcsResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DetachAliyunDiskFromEcsResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachAliyunKeyResult.java b/sdk/src/main/java/org/zstack/sdk/DetachAliyunKeyResult.java deleted file mode 100644 index 34c3bc71cd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachAliyunKeyResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DetachAliyunKeyResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2GatewayFromClusterAction.java b/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2GatewayFromClusterAction.java deleted file mode 100644 index 228160d107..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2GatewayFromClusterAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DetachBareMetal2GatewayFromClusterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DetachBareMetal2GatewayFromClusterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String clusterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String gatewayUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DetachBareMetal2GatewayFromClusterResult value = res.getResult(org.zstack.sdk.DetachBareMetal2GatewayFromClusterResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachBareMetal2GatewayFromClusterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/baremetal2/clusters/{clusterUuid}/gateways/{gatewayUuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2GatewayFromClusterResult.java b/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2GatewayFromClusterResult.java deleted file mode 100644 index 6db15900f7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2GatewayFromClusterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2GatewayInventory; - -public class DetachBareMetal2GatewayFromClusterResult { - public BareMetal2GatewayInventory inventory; - public void setInventory(BareMetal2GatewayInventory inventory) { - this.inventory = inventory; - } - public BareMetal2GatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2ProvisionNetworkFromClusterAction.java b/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2ProvisionNetworkFromClusterAction.java deleted file mode 100644 index 7e131fcfeb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2ProvisionNetworkFromClusterAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DetachBareMetal2ProvisionNetworkFromClusterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DetachBareMetal2ProvisionNetworkFromClusterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String clusterUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String networkUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DetachBareMetal2ProvisionNetworkFromClusterResult value = res.getResult(org.zstack.sdk.DetachBareMetal2ProvisionNetworkFromClusterResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachBareMetal2ProvisionNetworkFromClusterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/baremetal2/clusters/{clusterUuid}/provision-networks/{networkUuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2ProvisionNetworkFromClusterResult.java b/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2ProvisionNetworkFromClusterResult.java deleted file mode 100644 index 00507b6ca1..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachBareMetal2ProvisionNetworkFromClusterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ProvisionNetworkInventory; - -public class DetachBareMetal2ProvisionNetworkFromClusterResult { - public BareMetal2ProvisionNetworkInventory inventory; - public void setInventory(BareMetal2ProvisionNetworkInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ProvisionNetworkInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachHybridEipFromEcsAction.java b/sdk/src/main/java/org/zstack/sdk/DetachHybridEipFromEcsAction.java deleted file mode 100644 index f07c224f19..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachHybridEipFromEcsAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DetachHybridEipFromEcsAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DetachHybridEipFromEcsResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String eipUuid; - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DetachHybridEipFromEcsResult value = res.getResult(org.zstack.sdk.DetachHybridEipFromEcsResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachHybridEipFromEcsResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/eip/{eipUuid}/detach"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachHybridEipFromEcsResult.java b/sdk/src/main/java/org/zstack/sdk/DetachHybridEipFromEcsResult.java deleted file mode 100644 index 8cdb1bec22..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachHybridEipFromEcsResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DetachHybridEipFromEcsResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachHybridKeyAction.java b/sdk/src/main/java/org/zstack/sdk/DetachHybridKeyAction.java deleted file mode 100644 index 4a4aadf430..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachHybridKeyAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DetachHybridKeyAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DetachHybridKeyResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DetachHybridKeyResult value = res.getResult(org.zstack.sdk.DetachHybridKeyResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachHybridKeyResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/hybrid/key/{uuid}/detach"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "detachHybridKey"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachHybridKeyResult.java b/sdk/src/main/java/org/zstack/sdk/DetachHybridKeyResult.java deleted file mode 100644 index 3d309a0901..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachHybridKeyResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DetachHybridKeyResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachOssBucketFromEcsDataCenterAction.java b/sdk/src/main/java/org/zstack/sdk/DetachOssBucketFromEcsDataCenterAction.java deleted file mode 100644 index 1c42e8ab3e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachOssBucketFromEcsDataCenterAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DetachOssBucketFromEcsDataCenterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DetachOssBucketFromEcsDataCenterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossBucketUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DetachOssBucketFromEcsDataCenterResult value = res.getResult(org.zstack.sdk.DetachOssBucketFromEcsDataCenterResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachOssBucketFromEcsDataCenterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/oss-bucket/{ossBucketUuid}/detach"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "detachOssBucketFromEcsDataCenter"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachOssBucketFromEcsDataCenterResult.java b/sdk/src/main/java/org/zstack/sdk/DetachOssBucketFromEcsDataCenterResult.java deleted file mode 100644 index 9489ded607..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachOssBucketFromEcsDataCenterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.OssBucketInventory; - -public class DetachOssBucketFromEcsDataCenterResult { - public OssBucketInventory inventory; - public void setInventory(OssBucketInventory inventory) { - this.inventory = inventory; - } - public OssBucketInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachProvisionNicFromBondingAction.java b/sdk/src/main/java/org/zstack/sdk/DetachProvisionNicFromBondingAction.java deleted file mode 100644 index af2c52389a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachProvisionNicFromBondingAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DetachProvisionNicFromBondingAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DetachProvisionNicFromBondingResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String provisionNicUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DetachProvisionNicFromBondingResult value = res.getResult(org.zstack.sdk.DetachProvisionNicFromBondingResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachProvisionNicFromBondingResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "DELETE"; - info.path = "/baremetal2/bm-instances/bm2-bondings/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachProvisionNicFromBondingResult.java b/sdk/src/main/java/org/zstack/sdk/DetachProvisionNicFromBondingResult.java deleted file mode 100644 index 629ea947ca..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachProvisionNicFromBondingResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2InstanceInventory; - -public class DetachProvisionNicFromBondingResult { - public BareMetal2InstanceInventory inventory; - public void setInventory(BareMetal2InstanceInventory inventory) { - this.inventory = inventory; - } - public BareMetal2InstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DownloadBackupFileFromPublicCloudAction.java b/sdk/src/main/java/org/zstack/sdk/DownloadBackupFileFromPublicCloudAction.java deleted file mode 100644 index cbc9c9e4c7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DownloadBackupFileFromPublicCloudAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DownloadBackupFileFromPublicCloudAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.DownloadBackupFileFromPublicCloudResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String regionId; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String file; - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.DownloadBackupFileFromPublicCloudResult value = res.getResult(org.zstack.sdk.DownloadBackupFileFromPublicCloudResult.class); - ret.value = value == null ? new org.zstack.sdk.DownloadBackupFileFromPublicCloudResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/backup-mysql/download"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DownloadBackupFileFromPublicCloudResult.java b/sdk/src/main/java/org/zstack/sdk/DownloadBackupFileFromPublicCloudResult.java deleted file mode 100644 index 2535fb60d7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/DownloadBackupFileFromPublicCloudResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class DownloadBackupFileFromPublicCloudResult { - public java.lang.String local; - public void setLocal(java.lang.String local) { - this.local = local; - } - public java.lang.String getLocal() { - return this.local; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/EcsImageInventory.java b/sdk/src/main/java/org/zstack/sdk/EcsImageInventory.java deleted file mode 100644 index de1f540a7d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/EcsImageInventory.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - - - -public class EcsImageInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String localImageUuid; - public void setLocalImageUuid(java.lang.String localImageUuid) { - this.localImageUuid = localImageUuid; - } - public java.lang.String getLocalImageUuid() { - return this.localImageUuid; - } - - public java.lang.String ecsImageId; - public void setEcsImageId(java.lang.String ecsImageId) { - this.ecsImageId = ecsImageId; - } - public java.lang.String getEcsImageId() { - return this.ecsImageId; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.Long ecsImageSize; - public void setEcsImageSize(java.lang.Long ecsImageSize) { - this.ecsImageSize = ecsImageSize; - } - public java.lang.Long getEcsImageSize() { - return this.ecsImageSize; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String platform; - public void setPlatform(java.lang.String platform) { - this.platform = platform; - } - public java.lang.String getPlatform() { - return this.platform; - } - - public java.lang.String type; - public void setType(java.lang.String type) { - this.type = type; - } - public java.lang.String getType() { - return this.type; - } - - public java.lang.String ossMd5Sum; - public void setOssMd5Sum(java.lang.String ossMd5Sum) { - this.ossMd5Sum = ossMd5Sum; - } - public java.lang.String getOssMd5Sum() { - return this.ossMd5Sum; - } - - public java.lang.String format; - public void setFormat(java.lang.String format) { - this.format = format; - } - public java.lang.String getFormat() { - return this.format; - } - - public java.lang.String osName; - public void setOsName(java.lang.String osName) { - this.osName = osName; - } - public java.lang.String getOsName() { - return this.osName; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/EcsInstanceInventory.java b/sdk/src/main/java/org/zstack/sdk/EcsInstanceInventory.java deleted file mode 100644 index 0b8475a25a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/EcsInstanceInventory.java +++ /dev/null @@ -1,191 +0,0 @@ -package org.zstack.sdk; - - - -public class EcsInstanceInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String localVmInstanceUuid; - public void setLocalVmInstanceUuid(java.lang.String localVmInstanceUuid) { - this.localVmInstanceUuid = localVmInstanceUuid; - } - public java.lang.String getLocalVmInstanceUuid() { - return this.localVmInstanceUuid; - } - - public java.lang.String ecsInstanceId; - public void setEcsInstanceId(java.lang.String ecsInstanceId) { - this.ecsInstanceId = ecsInstanceId; - } - public java.lang.String getEcsInstanceId() { - return this.ecsInstanceId; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String ecsStatus; - public void setEcsStatus(java.lang.String ecsStatus) { - this.ecsStatus = ecsStatus; - } - public java.lang.String getEcsStatus() { - return this.ecsStatus; - } - - public java.lang.Long cpuCores; - public void setCpuCores(java.lang.Long cpuCores) { - this.cpuCores = cpuCores; - } - public java.lang.Long getCpuCores() { - return this.cpuCores; - } - - public java.lang.Long memorySize; - public void setMemorySize(java.lang.Long memorySize) { - this.memorySize = memorySize; - } - public java.lang.Long getMemorySize() { - return this.memorySize; - } - - public java.lang.String ecsInstanceType; - public void setEcsInstanceType(java.lang.String ecsInstanceType) { - this.ecsInstanceType = ecsInstanceType; - } - public java.lang.String getEcsInstanceType() { - return this.ecsInstanceType; - } - - public java.lang.Long ecsBandWidth; - public void setEcsBandWidth(java.lang.Long ecsBandWidth) { - this.ecsBandWidth = ecsBandWidth; - } - public java.lang.Long getEcsBandWidth() { - return this.ecsBandWidth; - } - - public java.lang.String ecsRootVolumeId; - public void setEcsRootVolumeId(java.lang.String ecsRootVolumeId) { - this.ecsRootVolumeId = ecsRootVolumeId; - } - public java.lang.String getEcsRootVolumeId() { - return this.ecsRootVolumeId; - } - - public java.lang.String ecsRootVolumeCategory; - public void setEcsRootVolumeCategory(java.lang.String ecsRootVolumeCategory) { - this.ecsRootVolumeCategory = ecsRootVolumeCategory; - } - public java.lang.String getEcsRootVolumeCategory() { - return this.ecsRootVolumeCategory; - } - - public java.lang.Long ecsRootVolumeSize; - public void setEcsRootVolumeSize(java.lang.Long ecsRootVolumeSize) { - this.ecsRootVolumeSize = ecsRootVolumeSize; - } - public java.lang.Long getEcsRootVolumeSize() { - return this.ecsRootVolumeSize; - } - - public java.lang.String privateIpAddress; - public void setPrivateIpAddress(java.lang.String privateIpAddress) { - this.privateIpAddress = privateIpAddress; - } - public java.lang.String getPrivateIpAddress() { - return this.privateIpAddress; - } - - public java.lang.String publicIpAddress; - public void setPublicIpAddress(java.lang.String publicIpAddress) { - this.publicIpAddress = publicIpAddress; - } - public java.lang.String getPublicIpAddress() { - return this.publicIpAddress; - } - - public java.lang.String ecsVSwitchUuid; - public void setEcsVSwitchUuid(java.lang.String ecsVSwitchUuid) { - this.ecsVSwitchUuid = ecsVSwitchUuid; - } - public java.lang.String getEcsVSwitchUuid() { - return this.ecsVSwitchUuid; - } - - public java.lang.String ecsImageUuid; - public void setEcsImageUuid(java.lang.String ecsImageUuid) { - this.ecsImageUuid = ecsImageUuid; - } - public java.lang.String getEcsImageUuid() { - return this.ecsImageUuid; - } - - public java.lang.String ecsSecurityGroupUuid; - public void setEcsSecurityGroupUuid(java.lang.String ecsSecurityGroupUuid) { - this.ecsSecurityGroupUuid = ecsSecurityGroupUuid; - } - public java.lang.String getEcsSecurityGroupUuid() { - return this.ecsSecurityGroupUuid; - } - - public java.lang.String identityZoneUuid; - public void setIdentityZoneUuid(java.lang.String identityZoneUuid) { - this.identityZoneUuid = identityZoneUuid; - } - public java.lang.String getIdentityZoneUuid() { - return this.identityZoneUuid; - } - - public java.lang.String chargeType; - public void setChargeType(java.lang.String chargeType) { - this.chargeType = chargeType; - } - public java.lang.String getChargeType() { - return this.chargeType; - } - - public java.sql.Timestamp expireDate; - public void setExpireDate(java.sql.Timestamp expireDate) { - this.expireDate = expireDate; - } - public java.sql.Timestamp getExpireDate() { - return this.expireDate; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/EcsInstanceType.java b/sdk/src/main/java/org/zstack/sdk/EcsInstanceType.java deleted file mode 100644 index dceb697202..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/EcsInstanceType.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zstack.sdk; - - - -public class EcsInstanceType { - - public java.lang.String typeId; - public void setTypeId(java.lang.String typeId) { - this.typeId = typeId; - } - public java.lang.String getTypeId() { - return this.typeId; - } - - public int cpu; - public void setCpu(int cpu) { - this.cpu = cpu; - } - public int getCpu() { - return this.cpu; - } - - public long memory; - public void setMemory(long memory) { - this.memory = memory; - } - public long getMemory() { - return this.memory; - } - - public java.lang.String typeFamily; - public void setTypeFamily(java.lang.String typeFamily) { - this.typeFamily = typeFamily; - } - public java.lang.String getTypeFamily() { - return this.typeFamily; - } - - public java.lang.String generation; - public void setGeneration(java.lang.String generation) { - this.generation = generation; - } - public java.lang.String getGeneration() { - return this.generation; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/EcsSecurityGroupInventory.java b/sdk/src/main/java/org/zstack/sdk/EcsSecurityGroupInventory.java deleted file mode 100644 index 28c44ee10c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/EcsSecurityGroupInventory.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.zstack.sdk; - - - -public class EcsSecurityGroupInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String ecsVpcUuid; - public void setEcsVpcUuid(java.lang.String ecsVpcUuid) { - this.ecsVpcUuid = ecsVpcUuid; - } - public java.lang.String getEcsVpcUuid() { - return this.ecsVpcUuid; - } - - public java.lang.String securityGroupId; - public void setSecurityGroupId(java.lang.String securityGroupId) { - this.securityGroupId = securityGroupId; - } - public java.lang.String getSecurityGroupId() { - return this.securityGroupId; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/EcsSecurityGroupRuleInventory.java b/sdk/src/main/java/org/zstack/sdk/EcsSecurityGroupRuleInventory.java deleted file mode 100644 index fe671e5af9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/EcsSecurityGroupRuleInventory.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.zstack.sdk; - - - -public class EcsSecurityGroupRuleInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String ecsSecurityGroupUuid; - public void setEcsSecurityGroupUuid(java.lang.String ecsSecurityGroupUuid) { - this.ecsSecurityGroupUuid = ecsSecurityGroupUuid; - } - public java.lang.String getEcsSecurityGroupUuid() { - return this.ecsSecurityGroupUuid; - } - - public java.lang.String protocol; - public void setProtocol(java.lang.String protocol) { - this.protocol = protocol; - } - public java.lang.String getProtocol() { - return this.protocol; - } - - public java.lang.String portRange; - public void setPortRange(java.lang.String portRange) { - this.portRange = portRange; - } - public java.lang.String getPortRange() { - return this.portRange; - } - - public java.lang.String cidrIp; - public void setCidrIp(java.lang.String cidrIp) { - this.cidrIp = cidrIp; - } - public java.lang.String getCidrIp() { - return this.cidrIp; - } - - public java.lang.String priority; - public void setPriority(java.lang.String priority) { - this.priority = priority; - } - public java.lang.String getPriority() { - return this.priority; - } - - public java.lang.String direction; - public void setDirection(java.lang.String direction) { - this.direction = direction; - } - public java.lang.String getDirection() { - return this.direction; - } - - public java.lang.String nicType; - public void setNicType(java.lang.String nicType) { - this.nicType = nicType; - } - public java.lang.String getNicType() { - return this.nicType; - } - - public java.lang.String policy; - public void setPolicy(java.lang.String policy) { - this.policy = policy; - } - public java.lang.String getPolicy() { - return this.policy; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/EcsVSwitchInventory.java b/sdk/src/main/java/org/zstack/sdk/EcsVSwitchInventory.java deleted file mode 100644 index 0d01ade32e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/EcsVSwitchInventory.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - - - -public class EcsVSwitchInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String vSwitchId; - public void setVSwitchId(java.lang.String vSwitchId) { - this.vSwitchId = vSwitchId; - } - public java.lang.String getVSwitchId() { - return this.vSwitchId; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String cidrBlock; - public void setCidrBlock(java.lang.String cidrBlock) { - this.cidrBlock = cidrBlock; - } - public java.lang.String getCidrBlock() { - return this.cidrBlock; - } - - public java.lang.Integer availableIpAddressCount; - public void setAvailableIpAddressCount(java.lang.Integer availableIpAddressCount) { - this.availableIpAddressCount = availableIpAddressCount; - } - public java.lang.Integer getAvailableIpAddressCount() { - return this.availableIpAddressCount; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String ecsVpcUuid; - public void setEcsVpcUuid(java.lang.String ecsVpcUuid) { - this.ecsVpcUuid = ecsVpcUuid; - } - public java.lang.String getEcsVpcUuid() { - return this.ecsVpcUuid; - } - - public java.lang.String identityZoneUuid; - public void setIdentityZoneUuid(java.lang.String identityZoneUuid) { - this.identityZoneUuid = identityZoneUuid; - } - public java.lang.String getIdentityZoneUuid() { - return this.identityZoneUuid; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/EcsVpcInventory.java b/sdk/src/main/java/org/zstack/sdk/EcsVpcInventory.java deleted file mode 100644 index b2a82de049..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/EcsVpcInventory.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - - - -public class EcsVpcInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String ecsVpcId; - public void setEcsVpcId(java.lang.String ecsVpcId) { - this.ecsVpcId = ecsVpcId; - } - public java.lang.String getEcsVpcId() { - return this.ecsVpcId; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String deleted; - public void setDeleted(java.lang.String deleted) { - this.deleted = deleted; - } - public java.lang.String getDeleted() { - return this.deleted; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String cidrBlock; - public void setCidrBlock(java.lang.String cidrBlock) { - this.cidrBlock = cidrBlock; - } - public java.lang.String getCidrBlock() { - return this.cidrBlock; - } - - public java.lang.String vRouterId; - public void setVRouterId(java.lang.String vRouterId) { - this.vRouterId = vRouterId; - } - public java.lang.String getVRouterId() { - return this.vRouterId; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GCAliyunSnapshotRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/GCAliyunSnapshotRemoteAction.java deleted file mode 100644 index 6774a7d513..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GCAliyunSnapshotRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GCAliyunSnapshotRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GCAliyunSnapshotRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.lang.String deleteMode = "Permissive"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GCAliyunSnapshotRemoteResult value = res.getResult(org.zstack.sdk.GCAliyunSnapshotRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GCAliyunSnapshotRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/snapshot/{dataCenterUuid}/gc"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GCAliyunSnapshotRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GCAliyunSnapshotRemoteResult.java deleted file mode 100644 index 5f75bab404..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GCAliyunSnapshotRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class GCAliyunSnapshotRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasAccessGroupRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetAliyunNasAccessGroupRemoteResult.java deleted file mode 100644 index 009bfcd628..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasAccessGroupRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetAliyunNasAccessGroupRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasFileSystemRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/GetAliyunNasFileSystemRemoteAction.java deleted file mode 100644 index 6c19bff5a2..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasFileSystemRemoteAction.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetAliyunNasFileSystemRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetAliyunNasFileSystemRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String fileSystemId; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetAliyunNasFileSystemRemoteResult value = res.getResult(org.zstack.sdk.GetAliyunNasFileSystemRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetAliyunNasFileSystemRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/nas/aliyun/remote"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasFileSystemRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetAliyunNasFileSystemRemoteResult.java deleted file mode 100644 index faad7de67d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasFileSystemRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetAliyunNasFileSystemRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasMountTargetRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/GetAliyunNasMountTargetRemoteAction.java deleted file mode 100644 index b32697cb44..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasMountTargetRemoteAction.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetAliyunNasMountTargetRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetAliyunNasMountTargetRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String nasFSUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String mountDomain; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetAliyunNasMountTargetRemoteResult value = res.getResult(org.zstack.sdk.GetAliyunNasMountTargetRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetAliyunNasMountTargetRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/nas/aliyun/mount/remote"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasMountTargetRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetAliyunNasMountTargetRemoteResult.java deleted file mode 100644 index cde6414ffe..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasMountTargetRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetAliyunNasMountTargetRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ChassisPowerStatusAction.java b/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ChassisPowerStatusAction.java deleted file mode 100644 index adba01d5b1..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ChassisPowerStatusAction.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetBareMetal2ChassisPowerStatusAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetBareMetal2ChassisPowerStatusResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetBareMetal2ChassisPowerStatusResult value = res.getResult(org.zstack.sdk.GetBareMetal2ChassisPowerStatusResult.class); - ret.value = value == null ? new org.zstack.sdk.GetBareMetal2ChassisPowerStatusResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/chassis/{uuid}/powerstatus"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ChassisPowerStatusResult.java b/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ChassisPowerStatusResult.java deleted file mode 100644 index 7dd1aff142..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ChassisPowerStatusResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetBareMetal2ChassisPowerStatusResult { - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2GatewayAllocatorStrategiesAction.java b/sdk/src/main/java/org/zstack/sdk/GetBareMetal2GatewayAllocatorStrategiesAction.java deleted file mode 100644 index 097ae476f1..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2GatewayAllocatorStrategiesAction.java +++ /dev/null @@ -1,92 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetBareMetal2GatewayAllocatorStrategiesAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetBareMetal2GatewayAllocatorStrategiesResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetBareMetal2GatewayAllocatorStrategiesResult value = res.getResult(org.zstack.sdk.GetBareMetal2GatewayAllocatorStrategiesResult.class); - ret.value = value == null ? new org.zstack.sdk.GetBareMetal2GatewayAllocatorStrategiesResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/gateways/allocators/strategies"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2GatewayAllocatorStrategiesResult.java b/sdk/src/main/java/org/zstack/sdk/GetBareMetal2GatewayAllocatorStrategiesResult.java deleted file mode 100644 index 6221ce7465..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2GatewayAllocatorStrategiesResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetBareMetal2GatewayAllocatorStrategiesResult { - public java.util.List strategies; - public void setStrategies(java.util.List strategies) { - this.strategies = strategies; - } - public java.util.List getStrategies() { - return this.strategies; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ProvisionNetworkIpAddressCapacityAction.java b/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ProvisionNetworkIpAddressCapacityAction.java deleted file mode 100644 index b123bc9dd8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ProvisionNetworkIpAddressCapacityAction.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetBareMetal2ProvisionNetworkIpAddressCapacityAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetBareMetal2ProvisionNetworkIpAddressCapacityResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.util.List networkUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetBareMetal2ProvisionNetworkIpAddressCapacityResult value = res.getResult(org.zstack.sdk.GetBareMetal2ProvisionNetworkIpAddressCapacityResult.class); - ret.value = value == null ? new org.zstack.sdk.GetBareMetal2ProvisionNetworkIpAddressCapacityResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/provision-networks/ip-capacity"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ProvisionNetworkIpAddressCapacityResult.java b/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ProvisionNetworkIpAddressCapacityResult.java deleted file mode 100644 index b9eee2ea3d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2ProvisionNetworkIpAddressCapacityResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetBareMetal2ProvisionNetworkIpAddressCapacityResult { - public java.util.List capacityData; - public void setCapacityData(java.util.List capacityData) { - this.capacityData = capacityData; - } - public java.util.List getCapacityData() { - return this.capacityData; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2SupportedBootModeResult.java b/sdk/src/main/java/org/zstack/sdk/GetBareMetal2SupportedBootModeResult.java deleted file mode 100644 index 37e9a62ecd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2SupportedBootModeResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetBareMetal2SupportedBootModeResult { - public java.lang.String supportedBootMode; - public void setSupportedBootMode(java.lang.String supportedBootMode) { - this.supportedBootMode = supportedBootMode; - } - public java.lang.String getSupportedBootMode() { - return this.supportedBootMode; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetIdentityZoneFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/GetCandidateHostKernelInterfacesAction.java similarity index 68% rename from sdk/src/main/java/org/zstack/sdk/GetIdentityZoneFromRemoteAction.java rename to sdk/src/main/java/org/zstack/sdk/GetCandidateHostKernelInterfacesAction.java index 4622485d55..d988ef4b2a 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetIdentityZoneFromRemoteAction.java +++ b/sdk/src/main/java/org/zstack/sdk/GetCandidateHostKernelInterfacesAction.java @@ -4,7 +4,7 @@ import java.util.Map; import org.zstack.sdk.*; -public class GetIdentityZoneFromRemoteAction extends AbstractAction { +public class GetCandidateHostKernelInterfacesAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class GetIdentityZoneFromRemoteAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.GetIdentityZoneFromRemoteResult value; + public org.zstack.sdk.GetCandidateHostKernelInterfacesResult value; public Result throwExceptionIfError() { if (error != null) { @@ -25,14 +25,23 @@ public Result throwExceptionIfError() { } } - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; + @Param(required = true, nonempty = true, nullElements = false, emptyString = false, noTrim = false) + public java.util.List hostUuids; + + @Param(required = false, nonempty = false, nullElements = false, emptyString = false, noTrim = false) + public java.lang.String cidr; - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; + @Param(required = false, validValues = {"Management","Storage"}, nonempty = true, nullElements = false, emptyString = true, noTrim = false) + public java.util.List trafficTypes; @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String regionId; + public boolean containsRejected = true; + + @Param(required = false) + public java.lang.Integer limit = 1000; + + @Param(required = false) + public java.lang.Integer start = 0; @Param(required = false) public java.util.List systemTags; @@ -60,8 +69,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.GetIdentityZoneFromRemoteResult value = res.getResult(org.zstack.sdk.GetIdentityZoneFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetIdentityZoneFromRemoteResult() : value; + org.zstack.sdk.GetCandidateHostKernelInterfacesResult value = res.getResult(org.zstack.sdk.GetCandidateHostKernelInterfacesResult.class); + ret.value = value == null ? new org.zstack.sdk.GetCandidateHostKernelInterfacesResult() : value; return ret; } @@ -91,7 +100,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "GET"; - info.path = "/hybrid/identity-zone/remote"; + info.path = "/hosts/kernel-interfaces"; info.needSession = true; info.needPoll = false; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/GetCandidateHostKernelInterfacesResult.java b/sdk/src/main/java/org/zstack/sdk/GetCandidateHostKernelInterfacesResult.java new file mode 100644 index 0000000000..ed5036517f --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/GetCandidateHostKernelInterfacesResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk; + + + +public class GetCandidateHostKernelInterfacesResult { + public java.util.List results; + public void setResults(java.util.List results) { + this.results = results; + } + public java.util.List getResults() { + return this.results; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/GetConnectionAccessPointFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetConnectionAccessPointFromRemoteResult.java deleted file mode 100644 index 959f5dc9b3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetConnectionAccessPointFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetConnectionAccessPointFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetConnectionBetweenL3NetworkAndAliyunVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/GetConnectionBetweenL3NetworkAndAliyunVSwitchAction.java deleted file mode 100644 index 132b5d62cf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetConnectionBetweenL3NetworkAndAliyunVSwitchAction.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetConnectionBetweenL3NetworkAndAliyunVSwitchAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetConnectionBetweenL3NetworkAndAliyunVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"l3network","vroutervm","vbr","vpc"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String resourceType; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetConnectionBetweenL3NetworkAndAliyunVSwitchResult value = res.getResult(org.zstack.sdk.GetConnectionBetweenL3NetworkAndAliyunVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.GetConnectionBetweenL3NetworkAndAliyunVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/relationships"; - info.needSession = true; - info.needPoll = false; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetCreateEcsImageProgressAction.java b/sdk/src/main/java/org/zstack/sdk/GetCreateEcsImageProgressAction.java deleted file mode 100644 index 6357e0737c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetCreateEcsImageProgressAction.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetCreateEcsImageProgressAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetCreateEcsImageProgressResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String imageUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetCreateEcsImageProgressResult value = res.getResult(org.zstack.sdk.GetCreateEcsImageProgressResult.class); - ret.value = value == null ? new org.zstack.sdk.GetCreateEcsImageProgressResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/image/{dataCenterUuid}/{imageUuid}/progress"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetCreateEcsImageProgressResult.java b/sdk/src/main/java/org/zstack/sdk/GetCreateEcsImageProgressResult.java deleted file mode 100644 index a7b6a4db37..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetCreateEcsImageProgressResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.ProgressProperty; - -public class GetCreateEcsImageProgressResult { - public ProgressProperty progress; - public void setProgress(ProgressProperty progress) { - this.progress = progress; - } - public ProgressProperty getProgress() { - return this.progress; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetDataCenterFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/GetDataCenterFromRemoteAction.java deleted file mode 100644 index 260b40e61a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetDataCenterFromRemoteAction.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetDataCenterFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetDataCenterFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String endpoint; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetDataCenterFromRemoteResult value = res.getResult(org.zstack.sdk.GetDataCenterFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetDataCenterFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/data-center/remote"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetDataCenterFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetDataCenterFromRemoteResult.java deleted file mode 100644 index da0af9ec79..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetDataCenterFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetDataCenterFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceTypeAction.java b/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceTypeAction.java deleted file mode 100644 index b370d0de85..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceTypeAction.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetEcsInstanceTypeAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetEcsInstanceTypeResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String identityZoneUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsImageUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetEcsInstanceTypeResult value = res.getResult(org.zstack.sdk.GetEcsInstanceTypeResult.class); - ret.value = value == null ? new org.zstack.sdk.GetEcsInstanceTypeResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/ecs/type"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceTypeResult.java b/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceTypeResult.java deleted file mode 100644 index 15eb7540bd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceTypeResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetEcsInstanceTypeResult { - public java.util.List types; - public void setTypes(java.util.List types) { - this.types = types; - } - public java.util.List getTypes() { - return this.types; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceVncUrlAction.java b/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceVncUrlAction.java deleted file mode 100644 index 1881de55a3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceVncUrlAction.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetEcsInstanceVncUrlAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetEcsInstanceVncUrlResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetEcsInstanceVncUrlResult value = res.getResult(org.zstack.sdk.GetEcsInstanceVncUrlResult.class); - ret.value = value == null ? new org.zstack.sdk.GetEcsInstanceVncUrlResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/ecs-vnc/{uuid}"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceVncUrlResult.java b/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceVncUrlResult.java deleted file mode 100644 index ba9df0a1b4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetEcsInstanceVncUrlResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class GetEcsInstanceVncUrlResult { - public java.lang.String ecsId; - public void setEcsId(java.lang.String ecsId) { - this.ecsId = ecsId; - } - public java.lang.String getEcsId() { - return this.ecsId; - } - - public java.lang.String vncUrl; - public void setVncUrl(java.lang.String vncUrl) { - this.vncUrl = vncUrl; - } - public java.lang.String getVncUrl() { - return this.vncUrl; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetIdentityZoneFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetIdentityZoneFromRemoteResult.java deleted file mode 100644 index 4be8328bad..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetIdentityZoneFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetIdentityZoneFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetOssBackupBucketFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetOssBackupBucketFromRemoteResult.java deleted file mode 100644 index 3259faa24c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetOssBackupBucketFromRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class GetOssBackupBucketFromRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetOssBucketFileFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/GetOssBucketFileFromRemoteAction.java deleted file mode 100644 index a68cfb4919..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetOssBucketFileFromRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetOssBucketFileFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetOssBucketFileFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossDomain; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossKey; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossSecret; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetOssBucketFileFromRemoteResult value = res.getResult(org.zstack.sdk.GetOssBucketFileFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetOssBucketFileFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/oss/file/remote"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetOssBucketFileFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetOssBucketFileFromRemoteResult.java deleted file mode 100644 index 9a86199ecd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetOssBucketFileFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetOssBucketFileFromRemoteResult { - public java.util.List files; - public void setFiles(java.util.List files) { - this.files = files; - } - public java.util.List getFiles() { - return this.files; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetOssBucketNameFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/GetOssBucketNameFromRemoteAction.java deleted file mode 100644 index 8fbe0c919e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetOssBucketNameFromRemoteAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetOssBucketNameFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetOssBucketNameFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossDomain; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossKey; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossSecret; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetOssBucketNameFromRemoteResult value = res.getResult(org.zstack.sdk.GetOssBucketNameFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetOssBucketNameFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/oss/{dataCenterUuid}/remote"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetOssBucketNameFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetOssBucketNameFromRemoteResult.java deleted file mode 100644 index 01f974691a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetOssBucketNameFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetOssBucketNameFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetVpcVpnConfigurationFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/GetVpcVpnConfigurationFromRemoteAction.java deleted file mode 100644 index e947735208..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetVpcVpnConfigurationFromRemoteAction.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class GetVpcVpnConfigurationFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.GetVpcVpnConfigurationFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetVpcVpnConfigurationFromRemoteResult value = res.getResult(org.zstack.sdk.GetVpcVpnConfigurationFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetVpcVpnConfigurationFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/vpn-conf/{uuid}/remote"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetVpcVpnConfigurationFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/GetVpcVpnConfigurationFromRemoteResult.java deleted file mode 100644 index e73dc4e4f6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetVpcVpnConfigurationFromRemoteResult.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcVpnIkeConfigStruct; -import org.zstack.sdk.VpcVpnIpSecConfigStruct; - -public class GetVpcVpnConfigurationFromRemoteResult { - public VpcVpnIkeConfigStruct ikeConf; - public void setIkeConf(VpcVpnIkeConfigStruct ikeConf) { - this.ikeConf = ikeConf; - } - public VpcVpnIkeConfigStruct getIkeConf() { - return this.ikeConf; - } - - public VpcVpnIpSecConfigStruct ipSecConf; - public void setIpSecConf(VpcVpnIpSecConfigStruct ipSecConf) { - this.ipSecConf = ipSecConf; - } - public VpcVpnIpSecConfigStruct getIpSecConf() { - return this.ipSecConf; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/HostInventory.java b/sdk/src/main/java/org/zstack/sdk/HostInventory.java index f1cb08e9bd..1ef160b898 100644 --- a/sdk/src/main/java/org/zstack/sdk/HostInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/HostInventory.java @@ -252,6 +252,14 @@ public java.lang.String getNqn() { return this.nqn; } + public java.lang.String hostname; + public void setHostname(java.lang.String hostname) { + this.hostname = hostname; + } + public java.lang.String getHostname() { + return this.hostname; + } + public java.sql.Timestamp createDate; public void setCreateDate(java.sql.Timestamp createDate) { this.createDate = createDate; diff --git a/sdk/src/main/java/org/zstack/sdk/HostKernelInterfaceResult.java b/sdk/src/main/java/org/zstack/sdk/HostKernelInterfaceResult.java new file mode 100644 index 0000000000..3e4cac4c01 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/HostKernelInterfaceResult.java @@ -0,0 +1,24 @@ +package org.zstack.sdk; + +import org.zstack.sdk.ErrorCode; +import org.zstack.sdk.HostKernelInterfaceInventory; + +public class HostKernelInterfaceResult { + + public ErrorCode error; + public void setError(ErrorCode error) { + this.error = error; + } + public ErrorCode getError() { + return this.error; + } + + public HostKernelInterfaceInventory inventory; + public void setInventory(HostKernelInterfaceInventory inventory) { + this.inventory = inventory; + } + public HostKernelInterfaceInventory getInventory() { + return this.inventory; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/HostKernelInterfaceStruct.java b/sdk/src/main/java/org/zstack/sdk/HostKernelInterfaceStruct.java new file mode 100644 index 0000000000..cc04540b04 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/HostKernelInterfaceStruct.java @@ -0,0 +1,63 @@ +package org.zstack.sdk; + + + +public class HostKernelInterfaceStruct { + + public java.lang.String name; + public void setName(java.lang.String name) { + this.name = name; + } + public java.lang.String getName() { + return this.name; + } + + public java.lang.String description; + public void setDescription(java.lang.String description) { + this.description = description; + } + public java.lang.String getDescription() { + return this.description; + } + + public java.lang.String hostUuid; + public void setHostUuid(java.lang.String hostUuid) { + this.hostUuid = hostUuid; + } + public java.lang.String getHostUuid() { + return this.hostUuid; + } + + public java.lang.String ip; + public void setIp(java.lang.String ip) { + this.ip = ip; + } + public java.lang.String getIp() { + return this.ip; + } + + public java.lang.String netmask; + public void setNetmask(java.lang.String netmask) { + this.netmask = netmask; + } + public java.lang.String getNetmask() { + return this.netmask; + } + + public java.lang.String ip6; + public void setIp6(java.lang.String ip6) { + this.ip6 = ip6; + } + public java.lang.String getIp6() { + return this.ip6; + } + + public java.lang.Integer ipv6Prefix; + public void setIpv6Prefix(java.lang.Integer ipv6Prefix) { + this.ipv6Prefix = ipv6Prefix; + } + public java.lang.Integer getIpv6Prefix() { + return this.ipv6Prefix; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/HybridAccountInventory.java b/sdk/src/main/java/org/zstack/sdk/HybridAccountInventory.java deleted file mode 100644 index bd539528c4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/HybridAccountInventory.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridType; - -public class HybridAccountInventory { - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String accountUuid; - public void setAccountUuid(java.lang.String accountUuid) { - this.accountUuid = accountUuid; - } - public java.lang.String getAccountUuid() { - return this.accountUuid; - } - - public java.lang.String userUuid; - public void setUserUuid(java.lang.String userUuid) { - this.userUuid = userUuid; - } - public java.lang.String getUserUuid() { - return this.userUuid; - } - - public HybridType type; - public void setType(HybridType type) { - this.type = type; - } - public HybridType getType() { - return this.type; - } - - public java.lang.String akey; - public void setAkey(java.lang.String akey) { - this.akey = akey; - } - public java.lang.String getAkey() { - return this.akey; - } - - public java.lang.String hybridAccountId; - public void setHybridAccountId(java.lang.String hybridAccountId) { - this.hybridAccountId = hybridAccountId; - } - public java.lang.String getHybridAccountId() { - return this.hybridAccountId; - } - - public java.lang.String hybridUserId; - public void setHybridUserId(java.lang.String hybridUserId) { - this.hybridUserId = hybridUserId; - } - public java.lang.String getHybridUserId() { - return this.hybridUserId; - } - - public java.lang.String hybridUserName; - public void setHybridUserName(java.lang.String hybridUserName) { - this.hybridUserName = hybridUserName; - } - public java.lang.String getHybridUserName() { - return this.hybridUserName; - } - - public java.lang.String current; - public void setCurrent(java.lang.String current) { - this.current = current; - } - public java.lang.String getCurrent() { - return this.current; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/HybridConnectionType.java b/sdk/src/main/java/org/zstack/sdk/HybridConnectionType.java deleted file mode 100644 index 5cd42c6480..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/HybridConnectionType.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.zstack.sdk; - -public enum HybridConnectionType { - aliyunConnection, - aliyunVpn, -} diff --git a/sdk/src/main/java/org/zstack/sdk/HybridEipAddressInventory.java b/sdk/src/main/java/org/zstack/sdk/HybridEipAddressInventory.java deleted file mode 100644 index 2cbbf88c71..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/HybridEipAddressInventory.java +++ /dev/null @@ -1,128 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridEipStatus; -import org.zstack.sdk.HybridType; - -public class HybridEipAddressInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String eipId; - public void setEipId(java.lang.String eipId) { - this.eipId = eipId; - } - public java.lang.String getEipId() { - return this.eipId; - } - - public java.lang.String bandWidth; - public void setBandWidth(java.lang.String bandWidth) { - this.bandWidth = bandWidth; - } - public java.lang.String getBandWidth() { - return this.bandWidth; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String allocateResourceUuid; - public void setAllocateResourceUuid(java.lang.String allocateResourceUuid) { - this.allocateResourceUuid = allocateResourceUuid; - } - public java.lang.String getAllocateResourceUuid() { - return this.allocateResourceUuid; - } - - public java.lang.String allocateResourceType; - public void setAllocateResourceType(java.lang.String allocateResourceType) { - this.allocateResourceType = allocateResourceType; - } - public java.lang.String getAllocateResourceType() { - return this.allocateResourceType; - } - - public HybridEipStatus status; - public void setStatus(HybridEipStatus status) { - this.status = status; - } - public HybridEipStatus getStatus() { - return this.status; - } - - public java.lang.String eipAddress; - public void setEipAddress(java.lang.String eipAddress) { - this.eipAddress = eipAddress; - } - public java.lang.String getEipAddress() { - return this.eipAddress; - } - - public HybridType eipType; - public void setEipType(HybridType eipType) { - this.eipType = eipType; - } - public HybridType getEipType() { - return this.eipType; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String chargeType; - public void setChargeType(java.lang.String chargeType) { - this.chargeType = chargeType; - } - public java.lang.String getChargeType() { - return this.chargeType; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp allocateTime; - public void setAllocateTime(java.sql.Timestamp allocateTime) { - this.allocateTime = allocateTime; - } - public java.sql.Timestamp getAllocateTime() { - return this.allocateTime; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/HybridEipStatus.java b/sdk/src/main/java/org/zstack/sdk/HybridEipStatus.java deleted file mode 100644 index 4a31bc3f9e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/HybridEipStatus.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.zstack.sdk; - -public enum HybridEipStatus { - Available, - InUse, - Associating, - Unassociating, -} diff --git a/sdk/src/main/java/org/zstack/sdk/HybridType.java b/sdk/src/main/java/org/zstack/sdk/HybridType.java deleted file mode 100644 index 573d66068b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/HybridType.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.zstack.sdk; - -public enum HybridType { - aliyun, - privateAliyun, - daho, - AliyunNAS, - AliyunEBS, - AliyunSms, -} diff --git a/sdk/src/main/java/org/zstack/sdk/IdentityZoneInventory.java b/sdk/src/main/java/org/zstack/sdk/IdentityZoneInventory.java deleted file mode 100644 index 263becec3f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/IdentityZoneInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridType; - -public class IdentityZoneInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String closed; - public void setClosed(java.lang.String closed) { - this.closed = closed; - } - public java.lang.String getClosed() { - return this.closed; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String zoneId; - public void setZoneId(java.lang.String zoneId) { - this.zoneId = zoneId; - } - public java.lang.String getZoneId() { - return this.zoneId; - } - - public HybridType type; - public void setType(HybridType type) { - this.type = type; - } - public HybridType getType() { - return this.type; - } - - public java.lang.String zoneName; - public void setZoneName(java.lang.String zoneName) { - this.zoneName = zoneName; - } - public java.lang.String getZoneName() { - return this.zoneName; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/IdentityZoneProperty.java b/sdk/src/main/java/org/zstack/sdk/IdentityZoneProperty.java deleted file mode 100644 index 3c441364cd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/IdentityZoneProperty.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zstack.sdk; - - - -public class IdentityZoneProperty { - - public java.lang.String zoneId; - public void setZoneId(java.lang.String zoneId) { - this.zoneId = zoneId; - } - public java.lang.String getZoneId() { - return this.zoneId; - } - - public java.lang.String localName; - public void setLocalName(java.lang.String localName) { - this.localName = localName; - } - public java.lang.String getLocalName() { - return this.localName; - } - - public java.util.List availableInstanceTypes; - public void setAvailableInstanceTypes(java.util.List availableInstanceTypes) { - this.availableInstanceTypes = availableInstanceTypes; - } - public java.util.List getAvailableInstanceTypes() { - return this.availableInstanceTypes; - } - - public java.util.List availableResourceCreation; - public void setAvailableResourceCreation(java.util.List availableResourceCreation) { - this.availableResourceCreation = availableResourceCreation; - } - public java.util.List getAvailableResourceCreation() { - return this.availableResourceCreation; - } - - public java.util.List availableDiskCategories; - public void setAvailableDiskCategories(java.util.List availableDiskCategories) { - this.availableDiskCategories = availableDiskCategories; - } - public java.util.List getAvailableDiskCategories() { - return this.availableDiskCategories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/InspectBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/InspectBareMetal2ChassisResult.java deleted file mode 100644 index 48bc72d713..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/InspectBareMetal2ChassisResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisInventory; - -public class InspectBareMetal2ChassisResult { - public BareMetal2ChassisInventory inventory; - public void setInventory(BareMetal2ChassisInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/MiniStorageHostRefInventory.java b/sdk/src/main/java/org/zstack/sdk/MiniStorageHostRefInventory.java deleted file mode 100644 index 967e54f935..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/MiniStorageHostRefInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.PrimaryStorageHostStatus; - -public class MiniStorageHostRefInventory { - - public java.lang.String primaryStorageUuid; - public void setPrimaryStorageUuid(java.lang.String primaryStorageUuid) { - this.primaryStorageUuid = primaryStorageUuid; - } - public java.lang.String getPrimaryStorageUuid() { - return this.primaryStorageUuid; - } - - public java.lang.String hostUuid; - public void setHostUuid(java.lang.String hostUuid) { - this.hostUuid = hostUuid; - } - public java.lang.String getHostUuid() { - return this.hostUuid; - } - - public java.lang.Long totalCapacity; - public void setTotalCapacity(java.lang.Long totalCapacity) { - this.totalCapacity = totalCapacity; - } - public java.lang.Long getTotalCapacity() { - return this.totalCapacity; - } - - public java.lang.Long availableCapacity; - public void setAvailableCapacity(java.lang.Long availableCapacity) { - this.availableCapacity = availableCapacity; - } - public java.lang.Long getAvailableCapacity() { - return this.availableCapacity; - } - - public java.lang.Long totalPhysicalCapacity; - public void setTotalPhysicalCapacity(java.lang.Long totalPhysicalCapacity) { - this.totalPhysicalCapacity = totalPhysicalCapacity; - } - public java.lang.Long getTotalPhysicalCapacity() { - return this.totalPhysicalCapacity; - } - - public java.lang.Long availablePhysicalCapacity; - public void setAvailablePhysicalCapacity(java.lang.Long availablePhysicalCapacity) { - this.availablePhysicalCapacity = availablePhysicalCapacity; - } - public java.lang.Long getAvailablePhysicalCapacity() { - return this.availablePhysicalCapacity; - } - - public PrimaryStorageHostStatus status; - public void setStatus(PrimaryStorageHostStatus status) { - this.status = status; - } - public PrimaryStorageHostStatus getStatus() { - return this.status; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/MiniStorageInventory.java b/sdk/src/main/java/org/zstack/sdk/MiniStorageInventory.java deleted file mode 100644 index 28da96fa22..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/MiniStorageInventory.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.MiniStorageType; - -public class MiniStorageInventory extends org.zstack.sdk.PrimaryStorageInventory { - - public MiniStorageType miniStorageType; - public void setMiniStorageType(MiniStorageType miniStorageType) { - this.miniStorageType = miniStorageType; - } - public MiniStorageType getMiniStorageType() { - return this.miniStorageType; - } - - public java.lang.String diskIdentifier; - public void setDiskIdentifier(java.lang.String diskIdentifier) { - this.diskIdentifier = diskIdentifier; - } - public java.lang.String getDiskIdentifier() { - return this.diskIdentifier; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/MiniStorageResourceReplicationInventory.java b/sdk/src/main/java/org/zstack/sdk/MiniStorageResourceReplicationInventory.java deleted file mode 100644 index f00c9c6c2b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/MiniStorageResourceReplicationInventory.java +++ /dev/null @@ -1,106 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.ReplicationState; -import org.zstack.sdk.ReplicationRole; -import org.zstack.sdk.ReplicationNetworkStatus; -import org.zstack.sdk.ReplicationDiskStatus; - -public class MiniStorageResourceReplicationInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String resourceUuid; - public void setResourceUuid(java.lang.String resourceUuid) { - this.resourceUuid = resourceUuid; - } - public java.lang.String getResourceUuid() { - return this.resourceUuid; - } - - public java.lang.String hostUuid; - public void setHostUuid(java.lang.String hostUuid) { - this.hostUuid = hostUuid; - } - public java.lang.String getHostUuid() { - return this.hostUuid; - } - - public java.lang.String primaryStorageUuid; - public void setPrimaryStorageUuid(java.lang.String primaryStorageUuid) { - this.primaryStorageUuid = primaryStorageUuid; - } - public java.lang.String getPrimaryStorageUuid() { - return this.primaryStorageUuid; - } - - public ReplicationState state; - public void setState(ReplicationState state) { - this.state = state; - } - public ReplicationState getState() { - return this.state; - } - - public java.lang.String type; - public void setType(java.lang.String type) { - this.type = type; - } - public java.lang.String getType() { - return this.type; - } - - public ReplicationRole role; - public void setRole(ReplicationRole role) { - this.role = role; - } - public ReplicationRole getRole() { - return this.role; - } - - public ReplicationNetworkStatus networkStatus; - public void setNetworkStatus(ReplicationNetworkStatus networkStatus) { - this.networkStatus = networkStatus; - } - public ReplicationNetworkStatus getNetworkStatus() { - return this.networkStatus; - } - - public ReplicationDiskStatus diskStatus; - public void setDiskStatus(ReplicationDiskStatus diskStatus) { - this.diskStatus = diskStatus; - } - public ReplicationDiskStatus getDiskStatus() { - return this.diskStatus; - } - - public long size; - public void setSize(long size) { - this.size = size; - } - public long getSize() { - return this.size; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/MiniStorageType.java b/sdk/src/main/java/org/zstack/sdk/MiniStorageType.java deleted file mode 100644 index b30f2d24c4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/MiniStorageType.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.zstack.sdk; - -public enum MiniStorageType { - Basic, -} diff --git a/sdk/src/main/java/org/zstack/sdk/OssBucketInventory.java b/sdk/src/main/java/org/zstack/sdk/OssBucketInventory.java deleted file mode 100644 index f96fe72bee..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/OssBucketInventory.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.zstack.sdk; - - - -public class OssBucketInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String bucketName; - public void setBucketName(java.lang.String bucketName) { - this.bucketName = bucketName; - } - public java.lang.String getBucketName() { - return this.bucketName; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String current; - public void setCurrent(java.lang.String current) { - this.current = current; - } - public java.lang.String getCurrent() { - return this.current; - } - - public java.lang.String regionName; - public void setRegionName(java.lang.String regionName) { - this.regionName = regionName; - } - public java.lang.String getRegionName() { - return this.regionName; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/OssBucketProperty.java b/sdk/src/main/java/org/zstack/sdk/OssBucketProperty.java deleted file mode 100644 index d3d36c0487..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/OssBucketProperty.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - - - -public class OssBucketProperty { - - public java.lang.String bucketName; - public void setBucketName(java.lang.String bucketName) { - this.bucketName = bucketName; - } - public java.lang.String getBucketName() { - return this.bucketName; - } - - public java.lang.String regionId; - public void setRegionId(java.lang.String regionId) { - this.regionId = regionId; - } - public java.lang.String getRegionId() { - return this.regionId; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PowerOffBareMetal2ChassisAction.java b/sdk/src/main/java/org/zstack/sdk/PowerOffBareMetal2ChassisAction.java deleted file mode 100644 index 97d630b0dd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/PowerOffBareMetal2ChassisAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class PowerOffBareMetal2ChassisAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.PowerOffBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.PowerOffBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.PowerOffBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.PowerOffBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "powerOffBareMetal2Chassis"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PowerOffBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/PowerOffBareMetal2ChassisResult.java deleted file mode 100644 index f93c788efb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/PowerOffBareMetal2ChassisResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisInventory; - -public class PowerOffBareMetal2ChassisResult { - public BareMetal2ChassisInventory inventory; - public void setInventory(BareMetal2ChassisInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PowerOnBareMetal2ChassisAction.java b/sdk/src/main/java/org/zstack/sdk/PowerOnBareMetal2ChassisAction.java deleted file mode 100644 index 2f4fb9a91a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/PowerOnBareMetal2ChassisAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class PowerOnBareMetal2ChassisAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.PowerOnBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, validValues = {"disk","ipxe"}, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String bootDev = "ipxe"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.PowerOnBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.PowerOnBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.PowerOnBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "powerOnBareMetal2Chassis"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PowerOnBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/PowerOnBareMetal2ChassisResult.java deleted file mode 100644 index ef6fa20cae..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/PowerOnBareMetal2ChassisResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisInventory; - -public class PowerOnBareMetal2ChassisResult { - public BareMetal2ChassisInventory inventory; - public void setInventory(BareMetal2ChassisInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PowerResetBareMetal2ChassisAction.java b/sdk/src/main/java/org/zstack/sdk/PowerResetBareMetal2ChassisAction.java deleted file mode 100644 index b94038a1fa..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/PowerResetBareMetal2ChassisAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class PowerResetBareMetal2ChassisAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.PowerResetBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, validValues = {"disk","ipxe"}, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String bootDev = "ipxe"; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.PowerResetBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.PowerResetBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.PowerResetBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "powerResetBareMetal2Chassis"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PowerResetBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/PowerResetBareMetal2ChassisResult.java deleted file mode 100644 index 7d6ff48a2b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/PowerResetBareMetal2ChassisResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisInventory; - -public class PowerResetBareMetal2ChassisResult { - public BareMetal2ChassisInventory inventory; - public void setInventory(BareMetal2ChassisInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PriceBareMetal2ChassisOfferingRefInventory.java b/sdk/src/main/java/org/zstack/sdk/PriceBareMetal2ChassisOfferingRefInventory.java deleted file mode 100644 index e6eb955b54..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/PriceBareMetal2ChassisOfferingRefInventory.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.zstack.sdk; - - - -public class PriceBareMetal2ChassisOfferingRefInventory { - - public java.lang.String priceUuid; - public void setPriceUuid(java.lang.String priceUuid) { - this.priceUuid = priceUuid; - } - public java.lang.String getPriceUuid() { - return this.priceUuid; - } - - public java.lang.String bareMetal2ChassisOfferingUuid; - public void setBareMetal2ChassisOfferingUuid(java.lang.String bareMetal2ChassisOfferingUuid) { - this.bareMetal2ChassisOfferingUuid = bareMetal2ChassisOfferingUuid; - } - public java.lang.String getBareMetal2ChassisOfferingUuid() { - return this.bareMetal2ChassisOfferingUuid; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PriceInventory.java b/sdk/src/main/java/org/zstack/sdk/PriceInventory.java index 35e991bf47..311ecd5d7e 100644 --- a/sdk/src/main/java/org/zstack/sdk/PriceInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/PriceInventory.java @@ -92,12 +92,4 @@ public java.util.List getPciDeviceOfferings() { return this.pciDeviceOfferings; } - public java.util.List bareMetal2VmOfferings; - public void setBareMetal2VmOfferings(java.util.List bareMetal2VmOfferings) { - this.bareMetal2VmOfferings = bareMetal2VmOfferings; - } - public java.util.List getBareMetal2VmOfferings() { - return this.bareMetal2VmOfferings; - } - } diff --git a/sdk/src/main/java/org/zstack/sdk/ProgressProperty.java b/sdk/src/main/java/org/zstack/sdk/ProgressProperty.java deleted file mode 100644 index 083dc7057f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ProgressProperty.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - - - -public class ProgressProperty { - - public java.lang.String progress; - public void setProgress(java.lang.String progress) { - this.progress = progress; - } - public java.lang.String getProgress() { - return this.progress; - } - - public java.lang.String stage; - public void setStage(java.lang.String stage) { - this.stage = stage; - } - public java.lang.String getStage() { - return this.stage; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunDiskFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunDiskFromLocalAction.java deleted file mode 100644 index db6029eced..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunDiskFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunDiskFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunDiskFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunDiskFromLocalResult value = res.getResult(org.zstack.sdk.QueryAliyunDiskFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunDiskFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/disk"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunDiskFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunDiskFromLocalResult.java deleted file mode 100644 index 266c430379..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunDiskFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryAliyunDiskFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunEbsPrimaryStorageAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunEbsPrimaryStorageAction.java deleted file mode 100644 index 8c141b538f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunEbsPrimaryStorageAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunEbsPrimaryStorageAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryPrimaryStorageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryPrimaryStorageResult value = res.getResult(org.zstack.sdk.QueryPrimaryStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryPrimaryStorageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/primary-storage/aliyun/ebs"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunNasAccessGroupAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunNasAccessGroupAction.java deleted file mode 100644 index 29fc49160f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunNasAccessGroupAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunNasAccessGroupAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunNasAccessGroupResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunNasAccessGroupResult value = res.getResult(org.zstack.sdk.QueryAliyunNasAccessGroupResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunNasAccessGroupResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/nas/aliyun/access"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunNasAccessGroupResult.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunNasAccessGroupResult.java deleted file mode 100644 index 30ee357a7f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunNasAccessGroupResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryAliyunNasAccessGroupResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunPanguPartitionAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunPanguPartitionAction.java deleted file mode 100644 index 08cd5c90d9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunPanguPartitionAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunPanguPartitionAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunPanguPartitionResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunPanguPartitionResult value = res.getResult(org.zstack.sdk.QueryAliyunPanguPartitionResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunPanguPartitionResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/aliyun/pangu"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunPanguPartitionResult.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunPanguPartitionResult.java deleted file mode 100644 index 4367491ca6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunPanguPartitionResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryAliyunPanguPartitionResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVSwitchAction.java deleted file mode 100644 index a693ee1f07..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVSwitchAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunProxyVSwitchAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunProxyVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunProxyVSwitchResult value = res.getResult(org.zstack.sdk.QueryAliyunProxyVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunProxyVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/aliyun-proxy/vpcs/vswitches"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVpcAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVpcAction.java deleted file mode 100644 index f94c6adf6c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVpcAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunProxyVpcAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunProxyVpcResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunProxyVpcResult value = res.getResult(org.zstack.sdk.QueryAliyunProxyVpcResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunProxyVpcResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/aliyun-proxy/vpcs"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVpcResult.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVpcResult.java deleted file mode 100644 index bbdf80cce3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVpcResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryAliyunProxyVpcResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouteEntryFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouteEntryFromLocalAction.java deleted file mode 100644 index 05707092a5..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouteEntryFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunRouteEntryFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunRouteEntryFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunRouteEntryFromLocalResult value = res.getResult(org.zstack.sdk.QueryAliyunRouteEntryFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunRouteEntryFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/route-entry"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouteEntryFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouteEntryFromLocalResult.java deleted file mode 100644 index b7a8edccef..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouteEntryFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryAliyunRouteEntryFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouterInterfaceFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouterInterfaceFromLocalAction.java deleted file mode 100644 index 47c077627f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouterInterfaceFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunRouterInterfaceFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunRouterInterfaceFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunRouterInterfaceFromLocalResult value = res.getResult(org.zstack.sdk.QueryAliyunRouterInterfaceFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunRouterInterfaceFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/router-interface"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouterInterfaceFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouterInterfaceFromLocalResult.java deleted file mode 100644 index 595149133a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunRouterInterfaceFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryAliyunRouterInterfaceFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunSnapshotFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunSnapshotFromLocalAction.java deleted file mode 100644 index 544069019c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunSnapshotFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunSnapshotFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunSnapshotFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunSnapshotFromLocalResult value = res.getResult(org.zstack.sdk.QueryAliyunSnapshotFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunSnapshotFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/snapshot"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunSnapshotFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunSnapshotFromLocalResult.java deleted file mode 100644 index 670fcc0a9e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunSnapshotFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryAliyunSnapshotFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunVirtualRouterFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunVirtualRouterFromLocalAction.java deleted file mode 100644 index 0bdcecbd4d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunVirtualRouterFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryAliyunVirtualRouterFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryAliyunVirtualRouterFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryAliyunVirtualRouterFromLocalResult value = res.getResult(org.zstack.sdk.QueryAliyunVirtualRouterFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryAliyunVirtualRouterFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/vrouter"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunVirtualRouterFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryAliyunVirtualRouterFromLocalResult.java deleted file mode 100644 index 490bc86f8c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunVirtualRouterFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryAliyunVirtualRouterFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingAction.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingAction.java deleted file mode 100644 index 6a142c8939..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryBareMetal2BondingAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryBareMetal2BondingResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryBareMetal2BondingResult value = res.getResult(org.zstack.sdk.QueryBareMetal2BondingResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryBareMetal2BondingResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/bonding"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingNicRefAction.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingNicRefAction.java deleted file mode 100644 index 98ad06d624..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingNicRefAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryBareMetal2BondingNicRefAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.QueryBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/bonding/nic/refs"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingNicRefResult.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingNicRefResult.java deleted file mode 100644 index 9aef62dce7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingNicRefResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryBareMetal2BondingNicRefResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingResult.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingResult.java deleted file mode 100644 index 4045df7c6b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2BondingResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryBareMetal2BondingResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisAction.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisAction.java deleted file mode 100644 index cdf8267a2d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryBareMetal2ChassisAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.QueryBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/chassis"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisOfferingAction.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisOfferingAction.java deleted file mode 100644 index f034c68c9e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisOfferingAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryBareMetal2ChassisOfferingAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryBareMetal2ChassisOfferingResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryBareMetal2ChassisOfferingResult value = res.getResult(org.zstack.sdk.QueryBareMetal2ChassisOfferingResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryBareMetal2ChassisOfferingResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/chassis/offerings"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisOfferingResult.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisOfferingResult.java deleted file mode 100644 index 2a86fbf166..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisOfferingResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryBareMetal2ChassisOfferingResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisResult.java deleted file mode 100644 index 5bb3fe3e8f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ChassisResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryBareMetal2ChassisResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2GatewayAction.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2GatewayAction.java deleted file mode 100644 index a8c29bf980..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2GatewayAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryBareMetal2GatewayAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryBareMetal2GatewayResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryBareMetal2GatewayResult value = res.getResult(org.zstack.sdk.QueryBareMetal2GatewayResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryBareMetal2GatewayResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/gateways"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2GatewayResult.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2GatewayResult.java deleted file mode 100644 index ff6715bda7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2GatewayResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryBareMetal2GatewayResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2InstanceAction.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2InstanceAction.java deleted file mode 100644 index 4097b91f95..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2InstanceAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryBareMetal2InstanceAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryBareMetal2InstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryBareMetal2InstanceResult value = res.getResult(org.zstack.sdk.QueryBareMetal2InstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryBareMetal2InstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/bm-instances"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2InstanceResult.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2InstanceResult.java deleted file mode 100644 index 88819ac7a4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2InstanceResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryBareMetal2InstanceResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ProvisionNetworkAction.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ProvisionNetworkAction.java deleted file mode 100644 index 45a26dff17..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ProvisionNetworkAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryBareMetal2ProvisionNetworkAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryBareMetal2ProvisionNetworkResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryBareMetal2ProvisionNetworkResult value = res.getResult(org.zstack.sdk.QueryBareMetal2ProvisionNetworkResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryBareMetal2ProvisionNetworkResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/baremetal2/provision-networks"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ProvisionNetworkResult.java b/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ProvisionNetworkResult.java deleted file mode 100644 index bf890b8e84..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryBareMetal2ProvisionNetworkResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryBareMetal2ProvisionNetworkResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryConnectionAccessPointFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryConnectionAccessPointFromLocalAction.java deleted file mode 100644 index 36988a11d3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryConnectionAccessPointFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryConnectionAccessPointFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryConnectionAccessPointFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryConnectionAccessPointFromLocalResult value = res.getResult(org.zstack.sdk.QueryConnectionAccessPointFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryConnectionAccessPointFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/access-point"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryConnectionAccessPointFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryConnectionAccessPointFromLocalResult.java deleted file mode 100644 index 42c9a42779..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryConnectionAccessPointFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryConnectionAccessPointFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryConnectionBetweenL3NetworkAndAliyunVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/QueryConnectionBetweenL3NetworkAndAliyunVSwitchAction.java deleted file mode 100644 index d937d2f5cf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryConnectionBetweenL3NetworkAndAliyunVSwitchAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryConnectionBetweenL3NetworkAndAliyunVSwitchAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryConnectionBetweenL3NetworkAndAliyunVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryConnectionBetweenL3NetworkAndAliyunVSwitchResult value = res.getResult(org.zstack.sdk.QueryConnectionBetweenL3NetworkAndAliyunVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryConnectionBetweenL3NetworkAndAliyunVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/relationships"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryConnectionBetweenL3NetworkAndAliyunVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/QueryConnectionBetweenL3NetworkAndAliyunVSwitchResult.java deleted file mode 100644 index e819ca9708..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryConnectionBetweenL3NetworkAndAliyunVSwitchResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryConnectionBetweenL3NetworkAndAliyunVSwitchResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryDataCenterFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryDataCenterFromLocalAction.java deleted file mode 100644 index 31fdc0622e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryDataCenterFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryDataCenterFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryDataCenterFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryDataCenterFromLocalResult value = res.getResult(org.zstack.sdk.QueryDataCenterFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryDataCenterFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/data-center"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryDataCenterFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryDataCenterFromLocalResult.java deleted file mode 100644 index 97acb891d9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryDataCenterFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryDataCenterFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsImageFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsImageFromLocalAction.java deleted file mode 100644 index 7aff336730..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsImageFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryEcsImageFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryEcsImageFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryEcsImageFromLocalResult value = res.getResult(org.zstack.sdk.QueryEcsImageFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryEcsImageFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/image"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsImageFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsImageFromLocalResult.java deleted file mode 100644 index b8098a74a0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsImageFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryEcsImageFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsInstanceFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsInstanceFromLocalAction.java deleted file mode 100644 index 43c69a3562..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsInstanceFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryEcsInstanceFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryEcsInstanceFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryEcsInstanceFromLocalResult value = res.getResult(org.zstack.sdk.QueryEcsInstanceFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryEcsInstanceFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/ecs"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsInstanceFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsInstanceFromLocalResult.java deleted file mode 100644 index ae25a43794..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsInstanceFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryEcsInstanceFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupFromLocalAction.java deleted file mode 100644 index 8b9d7cd87a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryEcsSecurityGroupFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryEcsSecurityGroupFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryEcsSecurityGroupFromLocalResult value = res.getResult(org.zstack.sdk.QueryEcsSecurityGroupFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryEcsSecurityGroupFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/security-group"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupFromLocalResult.java deleted file mode 100644 index 0e7ff377b3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryEcsSecurityGroupFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupRuleFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupRuleFromLocalAction.java deleted file mode 100644 index c1c2283685..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupRuleFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryEcsSecurityGroupRuleFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryEcsSecurityGroupRuleFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryEcsSecurityGroupRuleFromLocalResult value = res.getResult(org.zstack.sdk.QueryEcsSecurityGroupRuleFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryEcsSecurityGroupRuleFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/security-group-rule"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupRuleFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupRuleFromLocalResult.java deleted file mode 100644 index de9d34c459..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsSecurityGroupRuleFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryEcsSecurityGroupRuleFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsVSwitchFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsVSwitchFromLocalAction.java deleted file mode 100644 index 21a623a6ce..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsVSwitchFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryEcsVSwitchFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryEcsVSwitchFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryEcsVSwitchFromLocalResult value = res.getResult(org.zstack.sdk.QueryEcsVSwitchFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryEcsVSwitchFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/vswitch"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsVSwitchFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsVSwitchFromLocalResult.java deleted file mode 100644 index 4df52757b7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsVSwitchFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryEcsVSwitchFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsVpcFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsVpcFromLocalAction.java deleted file mode 100644 index 16cfaade1d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsVpcFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryEcsVpcFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryEcsVpcFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryEcsVpcFromLocalResult value = res.getResult(org.zstack.sdk.QueryEcsVpcFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryEcsVpcFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/vpc"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryEcsVpcFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryEcsVpcFromLocalResult.java deleted file mode 100644 index e8b133b38b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryEcsVpcFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryEcsVpcFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryHostKernelInterfaceAction.java b/sdk/src/main/java/org/zstack/sdk/QueryHostKernelInterfaceAction.java index 0b8ec678d9..7bd42fbc71 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryHostKernelInterfaceAction.java +++ b/sdk/src/main/java/org/zstack/sdk/QueryHostKernelInterfaceAction.java @@ -65,7 +65,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "GET"; - info.path = "/l2-networks/kernel-interfaces"; + info.path = "/l3-networks/kernel-interfaces"; info.needSession = true; info.needPoll = false; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/QueryHybridEipFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryHybridEipFromLocalAction.java deleted file mode 100644 index b08d28cb65..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryHybridEipFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryHybridEipFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryHybridEipFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryHybridEipFromLocalResult value = res.getResult(org.zstack.sdk.QueryHybridEipFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryHybridEipFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/eip"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryHybridEipFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryHybridEipFromLocalResult.java deleted file mode 100644 index 8492a7c1d7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryHybridEipFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryHybridEipFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryHybridKeySecretAction.java b/sdk/src/main/java/org/zstack/sdk/QueryHybridKeySecretAction.java deleted file mode 100644 index 43ec2fce02..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryHybridKeySecretAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryHybridKeySecretAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryHybridKeySecretResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryHybridKeySecretResult value = res.getResult(org.zstack.sdk.QueryHybridKeySecretResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryHybridKeySecretResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/hybrid/key"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryHybridKeySecretResult.java b/sdk/src/main/java/org/zstack/sdk/QueryHybridKeySecretResult.java deleted file mode 100644 index d51a8610c8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryHybridKeySecretResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryHybridKeySecretResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryIdentityZoneFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryIdentityZoneFromLocalResult.java deleted file mode 100644 index 4a8f3d71f6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryIdentityZoneFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryIdentityZoneFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageAction.java b/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageAction.java deleted file mode 100644 index 800523d9c6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryMiniStorageAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryMiniStorageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryMiniStorageResult value = res.getResult(org.zstack.sdk.QueryMiniStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryMiniStorageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/primary-storage/mini"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageHostRefAction.java b/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageHostRefAction.java deleted file mode 100644 index a7404a8ad2..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageHostRefAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryMiniStorageHostRefAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryMiniStorageHostRefResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryMiniStorageHostRefResult value = res.getResult(org.zstack.sdk.QueryMiniStorageHostRefResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryMiniStorageHostRefResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/primary-storage/mini/host-refs"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageHostRefResult.java b/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageHostRefResult.java deleted file mode 100644 index bec6296721..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageHostRefResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryMiniStorageHostRefResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResourceReplicationAction.java b/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResourceReplicationAction.java deleted file mode 100644 index 81082e7a64..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResourceReplicationAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryMiniStorageResourceReplicationAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryMiniStorageResourceReplicationResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryMiniStorageResourceReplicationResult value = res.getResult(org.zstack.sdk.QueryMiniStorageResourceReplicationResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryMiniStorageResourceReplicationResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/primary-storage/mini/replications"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResourceReplicationResult.java b/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResourceReplicationResult.java deleted file mode 100644 index 81b5c8ea3b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResourceReplicationResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryMiniStorageResourceReplicationResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResult.java b/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResult.java deleted file mode 100644 index 37b80614b9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryMiniStorageResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryMiniStorageResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryOssBucketFileNameAction.java b/sdk/src/main/java/org/zstack/sdk/QueryOssBucketFileNameAction.java deleted file mode 100644 index faa583adaa..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryOssBucketFileNameAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryOssBucketFileNameAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryOssBucketFileNameResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryOssBucketFileNameResult value = res.getResult(org.zstack.sdk.QueryOssBucketFileNameResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryOssBucketFileNameResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/oss-bucket"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryOssBucketFileNameResult.java b/sdk/src/main/java/org/zstack/sdk/QueryOssBucketFileNameResult.java deleted file mode 100644 index 9915f0fa78..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryOssBucketFileNameResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryOssBucketFileNameResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVirtualBorderRouterFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVirtualBorderRouterFromLocalAction.java deleted file mode 100644 index 557c11bc2a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVirtualBorderRouterFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryVirtualBorderRouterFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryVirtualBorderRouterFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryVirtualBorderRouterFromLocalResult value = res.getResult(org.zstack.sdk.QueryVirtualBorderRouterFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVirtualBorderRouterFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/border-router"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVirtualBorderRouterFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVirtualBorderRouterFromLocalResult.java deleted file mode 100644 index bd086a6a56..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVirtualBorderRouterFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVirtualBorderRouterFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcIkeConfigFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcIkeConfigFromLocalAction.java deleted file mode 100644 index d9bf309bd4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcIkeConfigFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryVpcIkeConfigFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryVpcIkeConfigFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryVpcIkeConfigFromLocalResult value = res.getResult(org.zstack.sdk.QueryVpcIkeConfigFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVpcIkeConfigFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/vpn-connection/ike"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcIkeConfigFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcIkeConfigFromLocalResult.java deleted file mode 100644 index 9051f44db0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcIkeConfigFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVpcIkeConfigFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcIpSecConfigFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcIpSecConfigFromLocalAction.java deleted file mode 100644 index d8de3965cf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcIpSecConfigFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryVpcIpSecConfigFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryVpcIpSecConfigFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryVpcIpSecConfigFromLocalResult value = res.getResult(org.zstack.sdk.QueryVpcIpSecConfigFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVpcIpSecConfigFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/vpn-connection/ipsec"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcIpSecConfigFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcIpSecConfigFromLocalResult.java deleted file mode 100644 index 80c6b7657c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcIpSecConfigFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVpcIpSecConfigFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcUserVpnGatewayFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcUserVpnGatewayFromLocalAction.java deleted file mode 100644 index 6f265e48cc..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcUserVpnGatewayFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryVpcUserVpnGatewayFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryVpcUserVpnGatewayFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryVpcUserVpnGatewayFromLocalResult value = res.getResult(org.zstack.sdk.QueryVpcUserVpnGatewayFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVpcUserVpnGatewayFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/user-vpn"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcUserVpnGatewayFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcUserVpnGatewayFromLocalResult.java deleted file mode 100644 index 5e9884a151..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcUserVpnGatewayFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVpcUserVpnGatewayFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnConnectionFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnConnectionFromLocalAction.java deleted file mode 100644 index 5da411a550..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnConnectionFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryVpcVpnConnectionFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryVpcVpnConnectionFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryVpcVpnConnectionFromLocalResult value = res.getResult(org.zstack.sdk.QueryVpcVpnConnectionFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVpcVpnConnectionFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/vpn-connection"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnConnectionFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnConnectionFromLocalResult.java deleted file mode 100644 index d201350b17..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnConnectionFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVpcVpnConnectionFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnGatewayFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnGatewayFromLocalAction.java deleted file mode 100644 index 79e5e7716b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnGatewayFromLocalAction.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class QueryVpcVpnGatewayFromLocalAction extends QueryAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.QueryVpcVpnGatewayFromLocalResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.QueryVpcVpnGatewayFromLocalResult value = res.getResult(org.zstack.sdk.QueryVpcVpnGatewayFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVpcVpnGatewayFromLocalResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/vpc-vpn"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnGatewayFromLocalResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnGatewayFromLocalResult.java deleted file mode 100644 index d77df80332..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcVpnGatewayFromLocalResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVpcVpnGatewayFromLocalResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - - public java.lang.Long total; - public void setTotal(java.lang.Long total) { - this.total = total; - } - public java.lang.Long getTotal() { - return this.total; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/RebootEcsInstanceAction.java b/sdk/src/main/java/org/zstack/sdk/RebootEcsInstanceAction.java deleted file mode 100644 index 739321e6d3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/RebootEcsInstanceAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class RebootEcsInstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.RebootEcsInstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.RebootEcsInstanceResult value = res.getResult(org.zstack.sdk.RebootEcsInstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.RebootEcsInstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/ecs/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "rebootEcsInstance"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/RebootEcsInstanceResult.java b/sdk/src/main/java/org/zstack/sdk/RebootEcsInstanceResult.java deleted file mode 100644 index 55ecb87470..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/RebootEcsInstanceResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class RebootEcsInstanceResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2GatewayAction.java b/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2GatewayAction.java deleted file mode 100644 index 9768c5b150..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2GatewayAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ReconnectBareMetal2GatewayAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.ReconnectBareMetal2GatewayResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.ReconnectBareMetal2GatewayResult value = res.getResult(org.zstack.sdk.ReconnectBareMetal2GatewayResult.class); - ret.value = value == null ? new org.zstack.sdk.ReconnectBareMetal2GatewayResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/gateways/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "reconnectBareMetal2Gateway"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2GatewayResult.java b/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2GatewayResult.java deleted file mode 100644 index ee5478df7a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2GatewayResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2GatewayInventory; - -public class ReconnectBareMetal2GatewayResult { - public BareMetal2GatewayInventory inventory; - public void setInventory(BareMetal2GatewayInventory inventory) { - this.inventory = inventory; - } - public BareMetal2GatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2InstanceAction.java b/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2InstanceAction.java deleted file mode 100644 index b775ce60de..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2InstanceAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ReconnectBareMetal2InstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.ReconnectBareMetal2InstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.ReconnectBareMetal2InstanceResult value = res.getResult(org.zstack.sdk.ReconnectBareMetal2InstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.ReconnectBareMetal2InstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/bm-instances/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "reconnectBareMetal2Instance"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2InstanceResult.java b/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2InstanceResult.java deleted file mode 100644 index dd4fb23246..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ReconnectBareMetal2InstanceResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2InstanceInventory; - -public class ReconnectBareMetal2InstanceResult { - public BareMetal2InstanceInventory inventory; - public void setInventory(BareMetal2InstanceInventory inventory) { - this.inventory = inventory; - } - public BareMetal2InstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/RecoverResourceSplitBrainAction.java b/sdk/src/main/java/org/zstack/sdk/RecoverResourceSplitBrainAction.java deleted file mode 100644 index fb20eeef3a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/RecoverResourceSplitBrainAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class RecoverResourceSplitBrainAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.RecoverResourceSplitBrainResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String resourceUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String hostUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String primaryStorageUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean forceRecover = false; - - @Param(required = false) - public java.lang.String resourceType; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.RecoverResourceSplitBrainResult value = res.getResult(org.zstack.sdk.RecoverResourceSplitBrainResult.class); - ret.value = value == null ? new org.zstack.sdk.RecoverResourceSplitBrainResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/primary-storage/mini/{resourceUuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "recoverResourceSplitBrain"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/RecoverResourceSplitBrainResult.java b/sdk/src/main/java/org/zstack/sdk/RecoverResourceSplitBrainResult.java deleted file mode 100644 index 31fdbec54a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/RecoverResourceSplitBrainResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class RecoverResourceSplitBrainResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/RecoveryVirtualBorderRouterRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/RecoveryVirtualBorderRouterRemoteAction.java deleted file mode 100644 index 2462802173..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/RecoveryVirtualBorderRouterRemoteAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class RecoveryVirtualBorderRouterRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.RecoveryVirtualBorderRouterRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.RecoveryVirtualBorderRouterRemoteResult value = res.getResult(org.zstack.sdk.RecoveryVirtualBorderRouterRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.RecoveryVirtualBorderRouterRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/border-router/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "recoveryVirtualBorderRouterRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/RecoveryVirtualBorderRouterRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/RecoveryVirtualBorderRouterRemoteResult.java deleted file mode 100644 index e7dc5f148e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/RecoveryVirtualBorderRouterRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class RecoveryVirtualBorderRouterRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ReplicationDiskStatus.java b/sdk/src/main/java/org/zstack/sdk/ReplicationDiskStatus.java deleted file mode 100644 index a3b041cdf6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ReplicationDiskStatus.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.zstack.sdk; - -public enum ReplicationDiskStatus { - Diskless, - Attaching, - Failed, - Negotiating, - Inconsistent, - Outdated, - DUnknown, - Consistent, - UpToDate, - Ready, - Unknown, -} diff --git a/sdk/src/main/java/org/zstack/sdk/ReplicationNetworkStatus.java b/sdk/src/main/java/org/zstack/sdk/ReplicationNetworkStatus.java deleted file mode 100644 index dfe4590a00..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ReplicationNetworkStatus.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.zstack.sdk; - -public enum ReplicationNetworkStatus { - Disconnecting, - Unconnected, - Timeout, - BrokenPipe, - NetworkFailure, - ProtocolError, - TearDown, - WFConnection, - WFReportParams, - Connected, - StartingSyncS, - StartingSyncT, - WFBitMapS, - WFBitMapT, - WFSyncUUID, - SyncSource, - SyncTarget, - PausedSyncS, - PausedSyncT, - VerifyS, - VerifyT, - StandAlone, - Ready, - Unknown, -} diff --git a/sdk/src/main/java/org/zstack/sdk/ReplicationRole.java b/sdk/src/main/java/org/zstack/sdk/ReplicationRole.java deleted file mode 100644 index 4d72dee258..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ReplicationRole.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - -public enum ReplicationRole { - Primary, - Secondary, - Unknown, -} diff --git a/sdk/src/main/java/org/zstack/sdk/ReplicationState.java b/sdk/src/main/java/org/zstack/sdk/ReplicationState.java deleted file mode 100644 index a5f6951647..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/ReplicationState.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.zstack.sdk; - -public enum ReplicationState { - Enabled, - Disabled, -} diff --git a/sdk/src/main/java/org/zstack/sdk/StartBareMetal2InstanceAction.java b/sdk/src/main/java/org/zstack/sdk/StartBareMetal2InstanceAction.java deleted file mode 100644 index a7971ac8ef..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/StartBareMetal2InstanceAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class StartBareMetal2InstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.StartBareMetal2InstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String clusterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String gatewayUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisOfferingUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.StartBareMetal2InstanceResult value = res.getResult(org.zstack.sdk.StartBareMetal2InstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.StartBareMetal2InstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/bm-instances/{uuid}/action"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "startBareMetal2Instance"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/StartBareMetal2InstanceResult.java b/sdk/src/main/java/org/zstack/sdk/StartBareMetal2InstanceResult.java deleted file mode 100644 index cfeda094ff..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/StartBareMetal2InstanceResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2InstanceInventory; - -public class StartBareMetal2InstanceResult { - public BareMetal2InstanceInventory inventory; - public void setInventory(BareMetal2InstanceInventory inventory) { - this.inventory = inventory; - } - public BareMetal2InstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/StartConnectionBetweenAliyunRouterInterfaceAction.java b/sdk/src/main/java/org/zstack/sdk/StartConnectionBetweenAliyunRouterInterfaceAction.java deleted file mode 100644 index a62cf14a21..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/StartConnectionBetweenAliyunRouterInterfaceAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class StartConnectionBetweenAliyunRouterInterfaceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.StartConnectionBetweenAliyunRouterInterfaceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vrouterInterfaceUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vbrInterfaceUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.StartConnectionBetweenAliyunRouterInterfaceResult value = res.getResult(org.zstack.sdk.StartConnectionBetweenAliyunRouterInterfaceResult.class); - ret.value = value == null ? new org.zstack.sdk.StartConnectionBetweenAliyunRouterInterfaceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/router-interface/{vbrInterfaceUuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "startConnectionBetweenAliyunRouterInterface"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/StartConnectionBetweenAliyunRouterInterfaceResult.java b/sdk/src/main/java/org/zstack/sdk/StartConnectionBetweenAliyunRouterInterfaceResult.java deleted file mode 100644 index 40f96a08da..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/StartConnectionBetweenAliyunRouterInterfaceResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunRouterInterfaceInventory; - -public class StartConnectionBetweenAliyunRouterInterfaceResult { - public AliyunRouterInterfaceInventory inventory; - public void setInventory(AliyunRouterInterfaceInventory inventory) { - this.inventory = inventory; - } - public AliyunRouterInterfaceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/StartEcsInstanceAction.java b/sdk/src/main/java/org/zstack/sdk/StartEcsInstanceAction.java deleted file mode 100644 index 16d7613d2c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/StartEcsInstanceAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class StartEcsInstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.StartEcsInstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.StartEcsInstanceResult value = res.getResult(org.zstack.sdk.StartEcsInstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.StartEcsInstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/ecs/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "startEcsInstance"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/StartEcsInstanceResult.java b/sdk/src/main/java/org/zstack/sdk/StartEcsInstanceResult.java deleted file mode 100644 index 72f42d401b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/StartEcsInstanceResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class StartEcsInstanceResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/StopEcsInstanceAction.java b/sdk/src/main/java/org/zstack/sdk/StopEcsInstanceAction.java deleted file mode 100644 index bbb81a4b23..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/StopEcsInstanceAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class StopEcsInstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.StopEcsInstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.StopEcsInstanceResult value = res.getResult(org.zstack.sdk.StopEcsInstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.StopEcsInstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/ecs/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "stopEcsInstance"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/StopEcsInstanceResult.java b/sdk/src/main/java/org/zstack/sdk/StopEcsInstanceResult.java deleted file mode 100644 index 33fa455628..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/StopEcsInstanceResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class StopEcsInstanceResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouteEntryFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouteEntryFromRemoteAction.java deleted file mode 100644 index 97a616e3b6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouteEntryFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncAliyunRouteEntryFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncAliyunRouteEntryFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vRouterUuid; - - @Param(required = true, validValues = {"vbr","vrouter"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vRouterType; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncAliyunRouteEntryFromRemoteResult value = res.getResult(org.zstack.sdk.SyncAliyunRouteEntryFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncAliyunRouteEntryFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/route-entry/{vRouterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncAliyunRouteEntryFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouteEntryFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouteEntryFromRemoteResult.java deleted file mode 100644 index 164502a320..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouteEntryFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncAliyunRouteEntryFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouterInterfaceFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouterInterfaceFromRemoteAction.java deleted file mode 100644 index bee59ee205..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouterInterfaceFromRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncAliyunRouterInterfaceFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncAliyunRouterInterfaceFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncAliyunRouterInterfaceFromRemoteResult value = res.getResult(org.zstack.sdk.SyncAliyunRouterInterfaceFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncAliyunRouterInterfaceFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/router-interface/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncAliyunRouterInterfaceFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouterInterfaceFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouterInterfaceFromRemoteResult.java deleted file mode 100644 index 3187d43dcd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncAliyunRouterInterfaceFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncAliyunRouterInterfaceFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncAliyunSnapshotRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncAliyunSnapshotRemoteAction.java deleted file mode 100644 index 3e63bb06c8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncAliyunSnapshotRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncAliyunSnapshotRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncAliyunSnapshotRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String snapshotId; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncAliyunSnapshotRemoteResult value = res.getResult(org.zstack.sdk.SyncAliyunSnapshotRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncAliyunSnapshotRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/snapshot/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncAliyunSnapshotRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncAliyunSnapshotRemoteResult.java deleted file mode 100644 index 6d2ef6ac16..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncAliyunSnapshotRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncAliyunSnapshotRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncAliyunVirtualRouterFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncAliyunVirtualRouterFromRemoteAction.java deleted file mode 100644 index 81017d66bf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncAliyunVirtualRouterFromRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncAliyunVirtualRouterFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncAliyunVirtualRouterFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpcUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncAliyunVirtualRouterFromRemoteResult value = res.getResult(org.zstack.sdk.SyncAliyunVirtualRouterFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncAliyunVirtualRouterFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/vrouter/{vpcUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncAliyunVirtualRouterFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncAliyunVirtualRouterFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncAliyunVirtualRouterFromRemoteResult.java deleted file mode 100644 index 7ea632f389..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncAliyunVirtualRouterFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncAliyunVirtualRouterFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncConnectionAccessPointFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncConnectionAccessPointFromRemoteAction.java deleted file mode 100644 index 51cda9dd0b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncConnectionAccessPointFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncConnectionAccessPointFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncConnectionAccessPointFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String accessPointId; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncConnectionAccessPointFromRemoteResult value = res.getResult(org.zstack.sdk.SyncConnectionAccessPointFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncConnectionAccessPointFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/access-point/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncConnectionAccessPointFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncConnectionAccessPointFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncConnectionAccessPointFromRemoteResult.java deleted file mode 100644 index 1b8a8135e7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncConnectionAccessPointFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncConnectionAccessPointFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncDataCenterFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncDataCenterFromRemoteAction.java deleted file mode 100644 index 9e9d96d54c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncDataCenterFromRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncDataCenterFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncDataCenterFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncDataCenterFromRemoteResult value = res.getResult(org.zstack.sdk.SyncDataCenterFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncDataCenterFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/data-center/{uuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncDataCenterFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncDataCenterFromRemoteResult.java deleted file mode 100644 index 99b5c27088..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncDataCenterFromRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncDataCenterFromRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncDiskFromAliyunFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncDiskFromAliyunFromRemoteAction.java deleted file mode 100644 index a3dc85af75..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncDiskFromAliyunFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncDiskFromAliyunFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncDiskFromAliyunFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String identityUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String diskId; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncDiskFromAliyunFromRemoteResult value = res.getResult(org.zstack.sdk.SyncDiskFromAliyunFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncDiskFromAliyunFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/disk/{identityUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncDiskFromAliyunFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncDiskFromAliyunFromRemoteResult.java deleted file mode 100644 index 88b00103ae..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncDiskFromAliyunFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncDiskFromAliyunFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsImageFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsImageFromRemoteAction.java deleted file mode 100644 index 3b026eb780..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsImageFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncEcsImageFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncEcsImageFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, validValues = {"system","self"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncEcsImageFromRemoteResult value = res.getResult(org.zstack.sdk.SyncEcsImageFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncEcsImageFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/image/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsImageFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsImageFromRemoteResult.java deleted file mode 100644 index 46a95b55e6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsImageFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncEcsImageFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsInstanceFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsInstanceFromRemoteAction.java deleted file mode 100644 index dc71b86878..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsInstanceFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncEcsInstanceFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncEcsInstanceFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean onlyZstack = true; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncEcsInstanceFromRemoteResult value = res.getResult(org.zstack.sdk.SyncEcsInstanceFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncEcsInstanceFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/ecs/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsInstanceFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsInstanceFromRemoteResult.java deleted file mode 100644 index 2646ef6c8e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsInstanceFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncEcsInstanceFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupFromRemoteAction.java deleted file mode 100644 index 06ef4a2d05..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncEcsSecurityGroupFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncEcsSecurityGroupFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsVpcUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String securityGroupId; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncEcsSecurityGroupFromRemoteResult value = res.getResult(org.zstack.sdk.SyncEcsSecurityGroupFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncEcsSecurityGroupFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/security-group/{ecsVpcUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncEcsSecurityGroupFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupFromRemoteResult.java deleted file mode 100644 index 12b8fd8392..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncEcsSecurityGroupFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupRuleFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupRuleFromRemoteResult.java deleted file mode 100644 index 70bc52b19f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupRuleFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncEcsSecurityGroupRuleFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsVSwitchFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsVSwitchFromRemoteAction.java deleted file mode 100644 index 25f9c5bbf8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsVSwitchFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncEcsVSwitchFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncEcsVSwitchFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vSwitchId; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncEcsVSwitchFromRemoteResult value = res.getResult(org.zstack.sdk.SyncEcsVSwitchFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncEcsVSwitchFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/vswitch/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsVSwitchFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsVSwitchFromRemoteResult.java deleted file mode 100644 index 9ef650423d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsVSwitchFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncEcsVSwitchFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsVpcFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsVpcFromRemoteAction.java deleted file mode 100644 index e84e7fab09..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsVpcFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncEcsVpcFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncEcsVpcFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ecsVpcId; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncEcsVpcFromRemoteResult value = res.getResult(org.zstack.sdk.SyncEcsVpcFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncEcsVpcFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/vpc/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsVpcFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncEcsVpcFromRemoteResult.java deleted file mode 100644 index f7e7b4158b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsVpcFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncEcsVpcFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncHybridEipFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncHybridEipFromRemoteAction.java deleted file mode 100644 index 54ed7ec23e..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncHybridEipFromRemoteAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncHybridEipFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncHybridEipFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncHybridEipFromRemoteResult value = res.getResult(org.zstack.sdk.SyncHybridEipFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncHybridEipFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/eip/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncHybridEipFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncHybridEipFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncHybridEipFromRemoteResult.java deleted file mode 100644 index d64c8cf62c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncHybridEipFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncHybridEipFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncIdentityFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncIdentityFromRemoteAction.java deleted file mode 100644 index aeabcbef43..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncIdentityFromRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncIdentityFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncIdentityFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncIdentityFromRemoteResult value = res.getResult(org.zstack.sdk.SyncIdentityFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncIdentityFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "GET"; - info.path = "/hybrid/identity-zone/{uuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncIdentityFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncIdentityFromRemoteResult.java deleted file mode 100644 index a04ab70411..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncIdentityFromRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncIdentityFromRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVirtualBorderRouterFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncVirtualBorderRouterFromRemoteAction.java deleted file mode 100644 index 8ed39fbb32..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVirtualBorderRouterFromRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncVirtualBorderRouterFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncVirtualBorderRouterFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncVirtualBorderRouterFromRemoteResult value = res.getResult(org.zstack.sdk.SyncVirtualBorderRouterFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncVirtualBorderRouterFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/border-router/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncVirtualBorderRouterFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVirtualBorderRouterFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncVirtualBorderRouterFromRemoteResult.java deleted file mode 100644 index f3d2d70765..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVirtualBorderRouterFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncVirtualBorderRouterFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVpcUserVpnGatewayFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncVpcUserVpnGatewayFromRemoteAction.java deleted file mode 100644 index 6e54ad4a95..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVpcUserVpnGatewayFromRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncVpcUserVpnGatewayFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncVpcUserVpnGatewayFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncVpcUserVpnGatewayFromRemoteResult value = res.getResult(org.zstack.sdk.SyncVpcUserVpnGatewayFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncVpcUserVpnGatewayFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/user-vpn/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncVpcUserVpnGatewayFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVpcUserVpnGatewayFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncVpcUserVpnGatewayFromRemoteResult.java deleted file mode 100644 index 855060f828..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVpcUserVpnGatewayFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncVpcUserVpnGatewayFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnConnectionFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnConnectionFromRemoteAction.java deleted file mode 100644 index 3dd08637af..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnConnectionFromRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncVpcVpnConnectionFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncVpcVpnConnectionFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncVpcVpnConnectionFromRemoteResult value = res.getResult(org.zstack.sdk.SyncVpcVpnConnectionFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncVpcVpnConnectionFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/vpn-connection/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncVpcVpnConnectionFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnConnectionFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnConnectionFromRemoteResult.java deleted file mode 100644 index 445ab95514..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnConnectionFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncVpcVpnConnectionFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnGatewayFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnGatewayFromRemoteAction.java deleted file mode 100644 index 9e6f274771..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnGatewayFromRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class SyncVpcVpnGatewayFromRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.SyncVpcVpnGatewayFromRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.SyncVpcVpnGatewayFromRemoteResult value = res.getResult(org.zstack.sdk.SyncVpcVpnGatewayFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncVpcVpnGatewayFromRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/vpc-vpn/{dataCenterUuid}/sync"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncVpcVpnGatewayFromRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnGatewayFromRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnGatewayFromRemoteResult.java deleted file mode 100644 index ef8327bd79..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVpcVpnGatewayFromRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class SyncVpcVpnGatewayFromRemoteResult { - public java.util.List inventories; - public void setInventories(java.util.List inventories) { - this.inventories = inventories; - } - public java.util.List getInventories() { - return this.inventories; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/TerminateVirtualBorderRouterRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/TerminateVirtualBorderRouterRemoteAction.java deleted file mode 100644 index 71629387f6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/TerminateVirtualBorderRouterRemoteAction.java +++ /dev/null @@ -1,101 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class TerminateVirtualBorderRouterRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.TerminateVirtualBorderRouterRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.TerminateVirtualBorderRouterRemoteResult value = res.getResult(org.zstack.sdk.TerminateVirtualBorderRouterRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.TerminateVirtualBorderRouterRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/border-router/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "terminateVirtualBorderRouterRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/TerminateVirtualBorderRouterRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/TerminateVirtualBorderRouterRemoteResult.java deleted file mode 100644 index cd81ae8408..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/TerminateVirtualBorderRouterRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class TerminateVirtualBorderRouterRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunDiskAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunDiskAction.java deleted file mode 100644 index a216f96a84..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunDiskAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunDiskAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunDiskResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, validRegexValues = "^[\\u4e00-\\u9fa5a-zA-Z][\\u4e00-\\u9fa5_a-zA-Z0-9.-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, minLength = 2, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean deleteWithInstance; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean deleteAutoSnapshot; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean enableAutoSnapshot; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunDiskResult value = res.getResult(org.zstack.sdk.UpdateAliyunDiskResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunDiskResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/disk/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunDisk"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunDiskResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunDiskResult.java deleted file mode 100644 index b86a5c9921..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunDiskResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunDiskInventory; - -public class UpdateAliyunDiskResult { - public AliyunDiskInventory inventory; - public void setInventory(AliyunDiskInventory inventory) { - this.inventory = inventory; - } - public AliyunDiskInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunEbsBackupStorageAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunEbsBackupStorageAction.java deleted file mode 100644 index 796d513688..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunEbsBackupStorageAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunEbsBackupStorageAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateBackupStorageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossBucketUuid; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String url; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateBackupStorageResult value = res.getResult(org.zstack.sdk.UpdateBackupStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateBackupStorageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/backup-storage/aliyun/ebs/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunEbsBackupStorage"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunEbsPrimaryStorageAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunEbsPrimaryStorageAction.java deleted file mode 100644 index 04d119ec8b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunEbsPrimaryStorageAction.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunEbsPrimaryStorageAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdatePrimaryStorageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String panguAppName; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String panguPartitionName; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String url; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdatePrimaryStorageResult value = res.getResult(org.zstack.sdk.UpdatePrimaryStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdatePrimaryStorageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/primary-storage/aliyun/ebs/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunEbsPrimaryStorage"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunKeySecretAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunKeySecretAction.java deleted file mode 100644 index 1761d7a02b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunKeySecretAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunKeySecretAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunKeySecretResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunKeySecretResult value = res.getResult(org.zstack.sdk.UpdateAliyunKeySecretResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunKeySecretResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/{uuid}/key"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunKeySecretResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunKeySecretResult.java deleted file mode 100644 index 7a122f878a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunKeySecretResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridAccountInventory; - -public class UpdateAliyunKeySecretResult { - public HybridAccountInventory inventory; - public void setInventory(HybridAccountInventory inventory) { - this.inventory = inventory; - } - public HybridAccountInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunMountTargetAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunMountTargetAction.java deleted file mode 100644 index 24e119e1c7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunMountTargetAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunMountTargetAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateNasMountTargetResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String accessGroupUuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateNasMountTargetResult value = res.getResult(org.zstack.sdk.UpdateNasMountTargetResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateNasMountTargetResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/nas/aliyun/mount"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunMountTarget"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunNasAccessGroupAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunNasAccessGroupAction.java deleted file mode 100644 index 77245dd77d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunNasAccessGroupAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunNasAccessGroupAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunNasAccessGroupResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunNasAccessGroupResult value = res.getResult(org.zstack.sdk.UpdateAliyunNasAccessGroupResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunNasAccessGroupResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/nas/aliyun/access"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunNasAccessGroup"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunNasAccessGroupResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunNasAccessGroupResult.java deleted file mode 100644 index b950304954..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunNasAccessGroupResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunNasAccessGroupInventory; - -public class UpdateAliyunNasAccessGroupResult { - public AliyunNasAccessGroupInventory inventory; - public void setInventory(AliyunNasAccessGroupInventory inventory) { - this.inventory = inventory; - } - public AliyunNasAccessGroupInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunPanguPartitionAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunPanguPartitionAction.java deleted file mode 100644 index 8d3345cd64..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunPanguPartitionAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunPanguPartitionAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunPanguPartitionResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String appName; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String partitionName; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunPanguPartitionResult value = res.getResult(org.zstack.sdk.UpdateAliyunPanguPartitionResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunPanguPartitionResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/aliyun/pangu/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunPanguPartition"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunPanguPartitionResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunPanguPartitionResult.java deleted file mode 100644 index eb564dc9ee..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunPanguPartitionResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunPanguPartitionInventory; - -public class UpdateAliyunPanguPartitionResult { - public AliyunPanguPartitionInventory inventory; - public void setInventory(AliyunPanguPartitionInventory inventory) { - this.inventory = inventory; - } - public AliyunPanguPartitionInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVSwitchAction.java deleted file mode 100644 index 4f1714faaa..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVSwitchAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunProxyVSwitchAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunProxyVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, validValues = {"Available","Pending"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String status; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean isDefault; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunProxyVSwitchResult value = res.getResult(org.zstack.sdk.UpdateAliyunProxyVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunProxyVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/aliyun-proxy/vswitches/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunProxyVSwitch"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVSwitchResult.java deleted file mode 100644 index b7eefc2637..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVSwitchResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunProxyVSwitchInventory; - -public class UpdateAliyunProxyVSwitchResult { - public AliyunProxyVSwitchInventory inventory; - public void setInventory(AliyunProxyVSwitchInventory inventory) { - this.inventory = inventory; - } - public AliyunProxyVSwitchInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVpcAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVpcAction.java deleted file mode 100644 index a4b94ef2ad..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVpcAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunProxyVpcAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunProxyVpcResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean isDefault; - - @Param(required = false, validValues = {"Available","Pending"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String status; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunProxyVpcResult value = res.getResult(org.zstack.sdk.UpdateAliyunProxyVpcResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunProxyVpcResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/aliyun-proxy/vpcs/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunProxyVpc"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVpcResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVpcResult.java deleted file mode 100644 index cadc74bcc8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunProxyVpcResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunProxyVpcInventory; - -public class UpdateAliyunProxyVpcResult { - public AliyunProxyVpcInventory inventory; - public void setInventory(AliyunProxyVpcInventory inventory) { - this.inventory = inventory; - } - public AliyunProxyVpcInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunRouteInterfaceRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunRouteInterfaceRemoteAction.java deleted file mode 100644 index 830951aec6..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunRouteInterfaceRemoteAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunRouteInterfaceRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunRouteInterfaceRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"active","inactive"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String op; - - @Param(required = true, validValues = {"vbr","vrouter"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vRouterType; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunRouteInterfaceRemoteResult value = res.getResult(org.zstack.sdk.UpdateAliyunRouteInterfaceRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunRouteInterfaceRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/router-interface/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunRouteInterfaceRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunRouteInterfaceRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunRouteInterfaceRemoteResult.java deleted file mode 100644 index e0edd3153c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunRouteInterfaceRemoteResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class UpdateAliyunRouteInterfaceRemoteResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunSnapshotAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunSnapshotAction.java deleted file mode 100644 index 1a5354ae23..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunSnapshotAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunSnapshotAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunSnapshotResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, validRegexValues = "^[\\u4e00-\\u9fa5a-zA-Z][\\u4e00-\\u9fa5_a-zA-Z0-9.-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, minLength = 2, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunSnapshotResult value = res.getResult(org.zstack.sdk.UpdateAliyunSnapshotResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunSnapshotResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/snapshot/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunSnapshot"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunSnapshotResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunSnapshotResult.java deleted file mode 100644 index 32a5e2fedf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunSnapshotResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.AliyunSnapshotInventory; - -public class UpdateAliyunSnapshotResult { - public AliyunSnapshotInventory inventory; - public void setInventory(AliyunSnapshotInventory inventory) { - this.inventory = inventory; - } - public AliyunSnapshotInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunVirtualRouterAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunVirtualRouterAction.java deleted file mode 100644 index 6d721a97ea..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunVirtualRouterAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateAliyunVirtualRouterAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateAliyunVirtualRouterResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, validRegexValues = "^[\\\\u4e00-\\\\u9fa5a-zA-Z][\\\\u4e00-\\\\u9fa5_a-zA-Z0-9-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateAliyunVirtualRouterResult value = res.getResult(org.zstack.sdk.UpdateAliyunVirtualRouterResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateAliyunVirtualRouterResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/vrouter/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateAliyunVirtualRouter"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunVirtualRouterResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateAliyunVirtualRouterResult.java deleted file mode 100644 index aabf8298cb..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateAliyunVirtualRouterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcVirtualRouterInventory; - -public class UpdateAliyunVirtualRouterResult { - public VpcVirtualRouterInventory inventory; - public void setInventory(VpcVirtualRouterInventory inventory) { - this.inventory = inventory; - } - public VpcVirtualRouterInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisAction.java deleted file mode 100644 index 205a4c9e45..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateBareMetal2ChassisAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateBareMetal2ChassisResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.UpdateBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateBareMetal2ChassisResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateBareMetal2Chassis"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisOfferingAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisOfferingAction.java deleted file mode 100644 index e5eb3a0523..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisOfferingAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateBareMetal2ChassisOfferingAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateBareMetal2ChassisOfferingResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateBareMetal2ChassisOfferingResult value = res.getResult(org.zstack.sdk.UpdateBareMetal2ChassisOfferingResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateBareMetal2ChassisOfferingResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/offerings/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateBareMetal2ChassisOffering"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisOfferingResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisOfferingResult.java deleted file mode 100644 index aacd962f83..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisOfferingResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisOfferingInventory; - -public class UpdateBareMetal2ChassisOfferingResult { - public BareMetal2ChassisOfferingInventory inventory; - public void setInventory(BareMetal2ChassisOfferingInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisOfferingInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisResult.java deleted file mode 100644 index 904c376ebf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ChassisResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ChassisInventory; - -public class UpdateBareMetal2ChassisResult { - public BareMetal2ChassisInventory inventory; - public void setInventory(BareMetal2ChassisInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ChassisInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2GatewayAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2GatewayAction.java deleted file mode 100644 index 7496a80065..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2GatewayAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateBareMetal2GatewayAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateBareMetal2GatewayResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {1L,65535L}, noTrim = false) - public java.lang.Integer sshPort; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String username; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String password; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String managementIp; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateBareMetal2GatewayResult value = res.getResult(org.zstack.sdk.UpdateBareMetal2GatewayResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateBareMetal2GatewayResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/gateways/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateBareMetal2Gateway"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2GatewayResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2GatewayResult.java deleted file mode 100644 index fab04ef126..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2GatewayResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2GatewayInventory; - -public class UpdateBareMetal2GatewayResult { - public BareMetal2GatewayInventory inventory; - public void setInventory(BareMetal2GatewayInventory inventory) { - this.inventory = inventory; - } - public BareMetal2GatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2InstanceAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2InstanceAction.java deleted file mode 100644 index d8a17f0f98..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2InstanceAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateBareMetal2InstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateBareMetal2InstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, validValues = {"Stopped","Running"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String state; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String chassisOfferingUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String defaultL3NetworkUuid; - - @Param(required = false, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String autoReleaseChassisEvent; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateBareMetal2InstanceResult value = res.getResult(org.zstack.sdk.UpdateBareMetal2InstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateBareMetal2InstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/bm-instances/{uuid}/action"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateBareMetal2Instance"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2InstanceResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2InstanceResult.java deleted file mode 100644 index 995f1510e1..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2InstanceResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2InstanceInventory; - -public class UpdateBareMetal2InstanceResult { - public BareMetal2InstanceInventory inventory; - public void setInventory(BareMetal2InstanceInventory inventory) { - this.inventory = inventory; - } - public BareMetal2InstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ProvisionNetworkAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ProvisionNetworkAction.java deleted file mode 100644 index cd2877c8bd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ProvisionNetworkAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateBareMetal2ProvisionNetworkAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateBareMetal2ProvisionNetworkResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 128, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpInterface; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpRangeStartIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpRangeEndIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpRangeNetmask; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dhcpRangeGateway; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateBareMetal2ProvisionNetworkResult value = res.getResult(org.zstack.sdk.UpdateBareMetal2ProvisionNetworkResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateBareMetal2ProvisionNetworkResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/baremetal2/provision-networks/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateBareMetal2ProvisionNetwork"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ProvisionNetworkResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ProvisionNetworkResult.java deleted file mode 100644 index 2092d1f492..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2ProvisionNetworkResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.BareMetal2ProvisionNetworkInventory; - -public class UpdateBareMetal2ProvisionNetworkResult { - public BareMetal2ProvisionNetworkInventory inventory; - public void setInventory(BareMetal2ProvisionNetworkInventory inventory) { - this.inventory = inventory; - } - public BareMetal2ProvisionNetworkInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchAction.java deleted file mode 100644 index 549732c244..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 64, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchResult value = res.getResult(org.zstack.sdk.UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/connections/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateConnectionBetweenL3NetWorkAndAliyunVSwitch"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchResult.java deleted file mode 100644 index 21716290ba..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.ConnectionRelationShipInventory; - -public class UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchResult { - public ConnectionRelationShipInventory inventory; - public void setInventory(ConnectionRelationShipInventory inventory) { - this.inventory = inventory; - } - public ConnectionRelationShipInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsImageAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsImageAction.java deleted file mode 100644 index 1f3c6797dc..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsImageAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateEcsImageAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateEcsImageResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String description; - - @Param(required = false, validRegexValues = "[A-Za-z\\u4e00-\\u9fa5]{1}[A-Za-z0-9-_\\u4e00-\\u9fa5]{1,127}", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateEcsImageResult value = res.getResult(org.zstack.sdk.UpdateEcsImageResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateEcsImageResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/image/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateEcsImage"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsImageResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsImageResult.java deleted file mode 100644 index d1bf55d917..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsImageResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsImageInventory; - -public class UpdateEcsImageResult { - public EcsImageInventory inventory; - public void setInventory(EcsImageInventory inventory) { - this.inventory = inventory; - } - public EcsImageInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceAction.java deleted file mode 100644 index db946f4b21..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateEcsInstanceAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateEcsInstanceResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, minLength = 2, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 30, minLength = 8, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String password; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateEcsInstanceResult value = res.getResult(org.zstack.sdk.UpdateEcsInstanceResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateEcsInstanceResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/{uuid}/ecs"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceResult.java deleted file mode 100644 index cfa91cb6a4..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsInstanceInventory; - -public class UpdateEcsInstanceResult { - public EcsInstanceInventory inventory; - public void setInventory(EcsInstanceInventory inventory) { - this.inventory = inventory; - } - public EcsInstanceInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceVncPasswordAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceVncPasswordAction.java deleted file mode 100644 index cf0187f5b2..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceVncPasswordAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateEcsInstanceVncPasswordAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateEcsInstanceVncPasswordResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validRegexValues = "[A-Za-z0-9]{6}", maxLength = 6, minLength = 6, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String password; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateEcsInstanceVncPasswordResult value = res.getResult(org.zstack.sdk.UpdateEcsInstanceVncPasswordResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateEcsInstanceVncPasswordResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/aliyun/{uuid}/ecs-vnc"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceVncPasswordResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceVncPasswordResult.java deleted file mode 100644 index 5e310764bd..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsInstanceVncPasswordResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class UpdateEcsInstanceVncPasswordResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsSecurityGroupAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsSecurityGroupAction.java deleted file mode 100644 index 28c147a796..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsSecurityGroupAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateEcsSecurityGroupAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateEcsSecurityGroupResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 64, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateEcsSecurityGroupResult value = res.getResult(org.zstack.sdk.UpdateEcsSecurityGroupResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateEcsSecurityGroupResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/security-group/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateEcsSecurityGroup"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsSecurityGroupResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsSecurityGroupResult.java deleted file mode 100644 index e1772fb0f3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsSecurityGroupResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsSecurityGroupInventory; - -public class UpdateEcsSecurityGroupResult { - public EcsSecurityGroupInventory inventory; - public void setInventory(EcsSecurityGroupInventory inventory) { - this.inventory = inventory; - } - public EcsSecurityGroupInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsVSwitchAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsVSwitchAction.java deleted file mode 100644 index be914692e3..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsVSwitchAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateEcsVSwitchAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateEcsVSwitchResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, validRegexValues = "^[\\u4e00-\\u9fa5a-zA-Z][\\u4e00-\\u9fa5_a-zA-Z0-9-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateEcsVSwitchResult value = res.getResult(org.zstack.sdk.UpdateEcsVSwitchResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateEcsVSwitchResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/vswitch/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateEcsVSwitch"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsVSwitchResult.java deleted file mode 100644 index 8aba53e7b7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsVSwitchResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsVSwitchInventory; - -public class UpdateEcsVSwitchResult { - public EcsVSwitchInventory inventory; - public void setInventory(EcsVSwitchInventory inventory) { - this.inventory = inventory; - } - public EcsVSwitchInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsVpcAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsVpcAction.java deleted file mode 100644 index 1e54843e9d..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsVpcAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateEcsVpcAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateEcsVpcResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 64, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateEcsVpcResult value = res.getResult(org.zstack.sdk.UpdateEcsVpcResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateEcsVpcResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/vpc/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateEcsVpc"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateEcsVpcResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateEcsVpcResult.java deleted file mode 100644 index 92be7a7c4b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateEcsVpcResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.EcsVpcInventory; - -public class UpdateEcsVpcResult { - public EcsVpcInventory inventory; - public void setInventory(EcsVpcInventory inventory) { - this.inventory = inventory; - } - public EcsVpcInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateHostKernelInterfaceAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateHostKernelInterfaceAction.java index d29e843c0f..2de13dc752 100644 --- a/sdk/src/main/java/org/zstack/sdk/UpdateHostKernelInterfaceAction.java +++ b/sdk/src/main/java/org/zstack/sdk/UpdateHostKernelInterfaceAction.java @@ -25,22 +25,22 @@ public Result throwExceptionIfError() { } } - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String uuid; - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String name; @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String description; - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + @Param(required = false, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String requiredIp; - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + @Param(required = false, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String netmask; - @Param(required = false, validValues = {"Management"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + @Param(required = false, validValues = {"Management","Storage"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.util.List trafficTypes; @Param(required = false) @@ -106,7 +106,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "PUT"; - info.path = "/l2-networks/kernel-interfaces/{uuid}/actions"; + info.path = "/l3-networks/kernel-interfaces/{uuid}/actions"; info.needSession = true; info.needPoll = true; info.parameterName = "updateHostKernelInterface"; diff --git a/sdk/src/main/java/org/zstack/sdk/AttachHybridKeyAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateHostnameAction.java similarity index 80% rename from sdk/src/main/java/org/zstack/sdk/AttachHybridKeyAction.java rename to sdk/src/main/java/org/zstack/sdk/UpdateHostnameAction.java index 067c8dcb8f..85e998167c 100644 --- a/sdk/src/main/java/org/zstack/sdk/AttachHybridKeyAction.java +++ b/sdk/src/main/java/org/zstack/sdk/UpdateHostnameAction.java @@ -4,7 +4,7 @@ import java.util.Map; import org.zstack.sdk.*; -public class AttachHybridKeyAction extends AbstractAction { +public class UpdateHostnameAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class AttachHybridKeyAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.AttachHybridKeyResult value; + public org.zstack.sdk.UpdateHostnameResult value; public Result throwExceptionIfError() { if (error != null) { @@ -28,6 +28,9 @@ public Result throwExceptionIfError() { @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String uuid; + @Param(required = true, nonempty = true, nullElements = false, emptyString = false, noTrim = false) + public java.lang.String hostname; + @Param(required = false) public java.util.List systemTags; @@ -60,8 +63,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.AttachHybridKeyResult value = res.getResult(org.zstack.sdk.AttachHybridKeyResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachHybridKeyResult() : value; + org.zstack.sdk.UpdateHostnameResult value = res.getResult(org.zstack.sdk.UpdateHostnameResult.class); + ret.value = value == null ? new org.zstack.sdk.UpdateHostnameResult() : value; return ret; } @@ -91,10 +94,10 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "PUT"; - info.path = "/hybrid/hybrid/key/{uuid}/attach"; + info.path = "/hosts/hostname/{uuid}/actions"; info.needSession = true; info.needPoll = true; - info.parameterName = "attachHybridKey"; + info.parameterName = "updateHostname"; return info; } diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateHostnameResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateHostnameResult.java new file mode 100644 index 0000000000..52c06e956a --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/UpdateHostnameResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk; + +import org.zstack.sdk.HostInventory; + +public class UpdateHostnameResult { + public HostInventory inventory; + public void setInventory(HostInventory inventory) { + this.inventory = inventory; + } + public HostInventory getInventory() { + return this.inventory; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateHybridEipAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateHybridEipAction.java deleted file mode 100644 index 176a5d60ce..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateHybridEipAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateHybridEipAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateHybridEipResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = true, validValues = {"aliyun"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String type; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateHybridEipResult value = res.getResult(org.zstack.sdk.UpdateHybridEipResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateHybridEipResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/eip/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateHybridEip"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateHybridEipResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateHybridEipResult.java deleted file mode 100644 index 5303486c4a..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateHybridEipResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridEipAddressInventory; - -public class UpdateHybridEipResult { - public HybridEipAddressInventory inventory; - public void setInventory(HybridEipAddressInventory inventory) { - this.inventory = inventory; - } - public HybridEipAddressInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateHybridKeySecretAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateHybridKeySecretAction.java deleted file mode 100644 index 339e4654ce..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateHybridKeySecretAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateHybridKeySecretAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateHybridKeySecretResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateHybridKeySecretResult value = res.getResult(org.zstack.sdk.UpdateHybridKeySecretResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateHybridKeySecretResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/hybrid/hybrid/{uuid}/key"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateHybridKeySecretResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateHybridKeySecretResult.java deleted file mode 100644 index 4e2a927924..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateHybridKeySecretResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridAccountInventory; - -public class UpdateHybridKeySecretResult { - public HybridAccountInventory inventory; - public void setInventory(HybridAccountInventory inventory) { - this.inventory = inventory; - } - public HybridAccountInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateOssBucketAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateOssBucketAction.java deleted file mode 100644 index 1be7702d81..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateOssBucketAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateOssBucketAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateOssBucketResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 256, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossDomain; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossKey; - - @Param(required = false, maxLength = 127, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ossSecret; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateOssBucketResult value = res.getResult(org.zstack.sdk.UpdateOssBucketResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateOssBucketResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/oss-bucket/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateOssBucket"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateOssBucketResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateOssBucketResult.java deleted file mode 100644 index 805af5e4f7..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateOssBucketResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.OssBucketInventory; - -public class UpdateOssBucketResult { - public OssBucketInventory inventory; - public void setInventory(OssBucketInventory inventory) { - this.inventory = inventory; - } - public OssBucketInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVirtualBorderRouterRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateVirtualBorderRouterRemoteAction.java deleted file mode 100644 index 43bc8e720b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVirtualBorderRouterRemoteAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateVirtualBorderRouterRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateVirtualBorderRouterRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String localGatewayIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String peerGatewayIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String peeringSubnetMask; - - @Param(required = false, maxLength = 64, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vlanId; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String circuitCode; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateVirtualBorderRouterRemoteResult value = res.getResult(org.zstack.sdk.UpdateVirtualBorderRouterRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateVirtualBorderRouterRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/border-router/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateVirtualBorderRouterRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVirtualBorderRouterRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateVirtualBorderRouterRemoteResult.java deleted file mode 100644 index 9847c02d93..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVirtualBorderRouterRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VirtualBorderRouterInventory; - -public class UpdateVirtualBorderRouterRemoteResult { - public VirtualBorderRouterInventory inventory; - public void setInventory(VirtualBorderRouterInventory inventory) { - this.inventory = inventory; - } - public VirtualBorderRouterInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVpcUserVpnGatewayAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateVpcUserVpnGatewayAction.java deleted file mode 100644 index b17a44ac91..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVpcUserVpnGatewayAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateVpcUserVpnGatewayAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateVpcUserVpnGatewayResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, validRegexValues = "^[\\\\u4e00-\\\\u9fa5a-zA-Z][\\\\u4e00-\\\\u9fa5_a-zA-Z0-9-]+$", maxLength = 128, minLength = 2, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateVpcUserVpnGatewayResult value = res.getResult(org.zstack.sdk.UpdateVpcUserVpnGatewayResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateVpcUserVpnGatewayResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/user-vpn/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateVpcUserVpnGateway"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVpcUserVpnGatewayResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateVpcUserVpnGatewayResult.java deleted file mode 100644 index b945d4445b..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVpcUserVpnGatewayResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcUserVpnGatewayInventory; - -public class UpdateVpcUserVpnGatewayResult { - public VpcUserVpnGatewayInventory inventory; - public void setInventory(VpcUserVpnGatewayInventory inventory) { - this.inventory = inventory; - } - public VpcUserVpnGatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnConnectionRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnConnectionRemoteAction.java deleted file mode 100644 index ba48c88c42..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnConnectionRemoteAction.java +++ /dev/null @@ -1,122 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateVpcVpnConnectionRemoteAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateVpcVpnConnectionRemoteResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 64, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String localCidr; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String remoteCidr; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Boolean active; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ikeConfUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipsecConfUuid; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateVpcVpnConnectionRemoteResult value = res.getResult(org.zstack.sdk.UpdateVpcVpnConnectionRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateVpcVpnConnectionRemoteResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/vpn-connection/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateVpcVpnConnectionRemote"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnConnectionRemoteResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnConnectionRemoteResult.java deleted file mode 100644 index 660bef62a2..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnConnectionRemoteResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcVpnConnectionInventory; - -public class UpdateVpcVpnConnectionRemoteResult { - public VpcVpnConnectionInventory inventory; - public void setInventory(VpcVpnConnectionInventory inventory) { - this.inventory = inventory; - } - public VpcVpnConnectionInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnGatewayAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnGatewayAction.java deleted file mode 100644 index 1cd12890b8..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnGatewayAction.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateVpcVpnGatewayAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.UpdateVpcVpnGatewayResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateVpcVpnGatewayResult value = res.getResult(org.zstack.sdk.UpdateVpcVpnGatewayResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateVpcVpnGatewayResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/hybrid/vpc-vpn/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateVpcVpnGateway"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnGatewayResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnGatewayResult.java deleted file mode 100644 index c391c755bc..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVpcVpnGatewayResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcVpnGatewayInventory; - -public class UpdateVpcVpnGatewayResult { - public VpcVpnGatewayInventory inventory; - public void setInventory(VpcVpnGatewayInventory inventory) { - this.inventory = inventory; - } - public VpcVpnGatewayInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UsedIpInventory.java b/sdk/src/main/java/org/zstack/sdk/UsedIpInventory.java index baa239e29f..35b883c3b5 100644 --- a/sdk/src/main/java/org/zstack/sdk/UsedIpInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/UsedIpInventory.java @@ -76,14 +76,6 @@ public java.lang.Long getIpInLong() { return this.ipInLong; } - public byte[] ipInBinary; - public void setIpInBinary(byte[] ipInBinary) { - this.ipInBinary = ipInBinary; - } - public byte[] getIpInBinary() { - return this.ipInBinary; - } - public java.lang.String vmNicUuid; public void setVmNicUuid(java.lang.String vmNicUuid) { this.vmNicUuid = vmNicUuid; diff --git a/sdk/src/main/java/org/zstack/sdk/VirtualBorderRouterInventory.java b/sdk/src/main/java/org/zstack/sdk/VirtualBorderRouterInventory.java deleted file mode 100644 index 193da277cf..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VirtualBorderRouterInventory.java +++ /dev/null @@ -1,143 +0,0 @@ -package org.zstack.sdk; - - - -public class VirtualBorderRouterInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String vbrId; - public void setVbrId(java.lang.String vbrId) { - this.vbrId = vbrId; - } - public java.lang.String getVbrId() { - return this.vbrId; - } - - public java.lang.String vlanInterfaceId; - public void setVlanInterfaceId(java.lang.String vlanInterfaceId) { - this.vlanInterfaceId = vlanInterfaceId; - } - public java.lang.String getVlanInterfaceId() { - return this.vlanInterfaceId; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public java.lang.String vlanId; - public void setVlanId(java.lang.String vlanId) { - this.vlanId = vlanId; - } - public java.lang.String getVlanId() { - return this.vlanId; - } - - public java.lang.String physicalConnectionStatus; - public void setPhysicalConnectionStatus(java.lang.String physicalConnectionStatus) { - this.physicalConnectionStatus = physicalConnectionStatus; - } - public java.lang.String getPhysicalConnectionStatus() { - return this.physicalConnectionStatus; - } - - public java.lang.String circuitCode; - public void setCircuitCode(java.lang.String circuitCode) { - this.circuitCode = circuitCode; - } - public java.lang.String getCircuitCode() { - return this.circuitCode; - } - - public java.lang.String localGatewayIp; - public void setLocalGatewayIp(java.lang.String localGatewayIp) { - this.localGatewayIp = localGatewayIp; - } - public java.lang.String getLocalGatewayIp() { - return this.localGatewayIp; - } - - public java.lang.String peerGatewayIp; - public void setPeerGatewayIp(java.lang.String peerGatewayIp) { - this.peerGatewayIp = peerGatewayIp; - } - public java.lang.String getPeerGatewayIp() { - return this.peerGatewayIp; - } - - public java.lang.String peeringSubnetMask; - public void setPeeringSubnetMask(java.lang.String peeringSubnetMask) { - this.peeringSubnetMask = peeringSubnetMask; - } - public java.lang.String getPeeringSubnetMask() { - return this.peeringSubnetMask; - } - - public java.lang.String physicalConnectionId; - public void setPhysicalConnectionId(java.lang.String physicalConnectionId) { - this.physicalConnectionId = physicalConnectionId; - } - public java.lang.String getPhysicalConnectionId() { - return this.physicalConnectionId; - } - - public java.lang.String accessPointUuid; - public void setAccessPointUuid(java.lang.String accessPointUuid) { - this.accessPointUuid = accessPointUuid; - } - public java.lang.String getAccessPointUuid() { - return this.accessPointUuid; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VmCustomSpecificationDomainMode.java b/sdk/src/main/java/org/zstack/sdk/VmCustomSpecificationDomainMode.java new file mode 100644 index 0000000000..a8e7e2356c --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/VmCustomSpecificationDomainMode.java @@ -0,0 +1,6 @@ +package org.zstack.sdk; + +public enum VmCustomSpecificationDomainMode { + WorkGroup, + Domain, +} diff --git a/sdk/src/main/java/org/zstack/sdk/VmCustomSpecificationStruct.java b/sdk/src/main/java/org/zstack/sdk/VmCustomSpecificationStruct.java new file mode 100644 index 0000000000..d7138df1b1 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/VmCustomSpecificationStruct.java @@ -0,0 +1,87 @@ +package org.zstack.sdk; + +import org.zstack.sdk.VmCustomSpecificationDomainMode; + +public class VmCustomSpecificationStruct { + + public java.lang.String uuid; + public void setUuid(java.lang.String uuid) { + this.uuid = uuid; + } + public java.lang.String getUuid() { + return this.uuid; + } + + public java.lang.String platform; + public void setPlatform(java.lang.String platform) { + this.platform = platform; + } + public java.lang.String getPlatform() { + return this.platform; + } + + public java.lang.String hostname; + public void setHostname(java.lang.String hostname) { + this.hostname = hostname; + } + public java.lang.String getHostname() { + return this.hostname; + } + + public java.lang.String rootPassword; + public void setRootPassword(java.lang.String rootPassword) { + this.rootPassword = rootPassword; + } + public java.lang.String getRootPassword() { + return this.rootPassword; + } + + public java.lang.Boolean generateSID; + public void setGenerateSID(java.lang.Boolean generateSID) { + this.generateSID = generateSID; + } + public java.lang.Boolean getGenerateSID() { + return this.generateSID; + } + + public VmCustomSpecificationDomainMode domainMode; + public void setDomainMode(VmCustomSpecificationDomainMode domainMode) { + this.domainMode = domainMode; + } + public VmCustomSpecificationDomainMode getDomainMode() { + return this.domainMode; + } + + public java.lang.String domainName; + public void setDomainName(java.lang.String domainName) { + this.domainName = domainName; + } + public java.lang.String getDomainName() { + return this.domainName; + } + + public java.lang.String domainUsername; + public void setDomainUsername(java.lang.String domainUsername) { + this.domainUsername = domainUsername; + } + public java.lang.String getDomainUsername() { + return this.domainUsername; + } + + public java.lang.String domainPassword; + public void setDomainPassword(java.lang.String domainPassword) { + this.domainPassword = domainPassword; + } + public java.lang.String getDomainPassword() { + return this.domainPassword; + } + + public java.lang.String organization; + public void setOrganization(java.lang.String organization) { + this.organization = organization; + } + public java.lang.String getOrganization() { + return this.organization; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcUserVpnGatewayInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcUserVpnGatewayInventory.java deleted file mode 100644 index 8f24b62c02..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcUserVpnGatewayInventory.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridType; - -public class VpcUserVpnGatewayInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String accountName; - public void setAccountName(java.lang.String accountName) { - this.accountName = accountName; - } - public java.lang.String getAccountName() { - return this.accountName; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - - public HybridType type; - public void setType(HybridType type) { - this.type = type; - } - public HybridType getType() { - return this.type; - } - - public java.lang.String gatewayId; - public void setGatewayId(java.lang.String gatewayId) { - this.gatewayId = gatewayId; - } - public java.lang.String getGatewayId() { - return this.gatewayId; - } - - public java.lang.String ip; - public void setIp(java.lang.String ip) { - this.ip = ip; - } - public java.lang.String getIp() { - return this.ip; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcVirtualRouteEntryInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcVirtualRouteEntryInventory.java deleted file mode 100644 index e379ab0c01..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcVirtualRouteEntryInventory.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcVirtualRouteEntryInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String type; - public void setType(java.lang.String type) { - this.type = type; - } - public java.lang.String getType() { - return this.type; - } - - public java.lang.String vRouterType; - public void setVRouterType(java.lang.String vRouterType) { - this.vRouterType = vRouterType; - } - public java.lang.String getVRouterType() { - return this.vRouterType; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String destinationCidrBlock; - public void setDestinationCidrBlock(java.lang.String destinationCidrBlock) { - this.destinationCidrBlock = destinationCidrBlock; - } - public java.lang.String getDestinationCidrBlock() { - return this.destinationCidrBlock; - } - - public java.lang.String nextHopId; - public void setNextHopId(java.lang.String nextHopId) { - this.nextHopId = nextHopId; - } - public java.lang.String getNextHopId() { - return this.nextHopId; - } - - public java.lang.String virtualRouterUuid; - public void setVirtualRouterUuid(java.lang.String virtualRouterUuid) { - this.virtualRouterUuid = virtualRouterUuid; - } - public java.lang.String getVirtualRouterUuid() { - return this.virtualRouterUuid; - } - - public java.lang.String nextHopType; - public void setNextHopType(java.lang.String nextHopType) { - this.nextHopType = nextHopType; - } - public java.lang.String getNextHopType() { - return this.nextHopType; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcVirtualRouterInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcVirtualRouterInventory.java deleted file mode 100644 index 0b2ca778d0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcVirtualRouterInventory.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcVirtualRouterInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String vrId; - public void setVrId(java.lang.String vrId) { - this.vrId = vrId; - } - public java.lang.String getVrId() { - return this.vrId; - } - - public java.lang.String vpcUuid; - public void setVpcUuid(java.lang.String vpcUuid) { - this.vpcUuid = vpcUuid; - } - public java.lang.String getVpcUuid() { - return this.vpcUuid; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcVpnConnectionInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcVpnConnectionInventory.java deleted file mode 100644 index 2c40e364be..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcVpnConnectionInventory.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridType; - -public class VpcVpnConnectionInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String accountName; - public void setAccountName(java.lang.String accountName) { - this.accountName = accountName; - } - public java.lang.String getAccountName() { - return this.accountName; - } - - public HybridType type; - public void setType(HybridType type) { - this.type = type; - } - public HybridType getType() { - return this.type; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String connectionId; - public void setConnectionId(java.lang.String connectionId) { - this.connectionId = connectionId; - } - public java.lang.String getConnectionId() { - return this.connectionId; - } - - public java.lang.String userGatewayUuid; - public void setUserGatewayUuid(java.lang.String userGatewayUuid) { - this.userGatewayUuid = userGatewayUuid; - } - public java.lang.String getUserGatewayUuid() { - return this.userGatewayUuid; - } - - public java.lang.String vpnGatewayUuid; - public void setVpnGatewayUuid(java.lang.String vpnGatewayUuid) { - this.vpnGatewayUuid = vpnGatewayUuid; - } - public java.lang.String getVpnGatewayUuid() { - return this.vpnGatewayUuid; - } - - public java.lang.String localSubnet; - public void setLocalSubnet(java.lang.String localSubnet) { - this.localSubnet = localSubnet; - } - public java.lang.String getLocalSubnet() { - return this.localSubnet; - } - - public java.lang.String remoteSubnet; - public void setRemoteSubnet(java.lang.String remoteSubnet) { - this.remoteSubnet = remoteSubnet; - } - public java.lang.String getRemoteSubnet() { - return this.remoteSubnet; - } - - public java.lang.String ikeConfigUuid; - public void setIkeConfigUuid(java.lang.String ikeConfigUuid) { - this.ikeConfigUuid = ikeConfigUuid; - } - public java.lang.String getIkeConfigUuid() { - return this.ikeConfigUuid; - } - - public java.lang.String ipsecConfigUuid; - public void setIpsecConfigUuid(java.lang.String ipsecConfigUuid) { - this.ipsecConfigUuid = ipsecConfigUuid; - } - public java.lang.String getIpsecConfigUuid() { - return this.ipsecConfigUuid; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcVpnGatewayInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcVpnGatewayInventory.java deleted file mode 100644 index 1cfdaa89e9..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcVpnGatewayInventory.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.HybridType; - -public class VpcVpnGatewayInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String accountName; - public void setAccountName(java.lang.String accountName) { - this.accountName = accountName; - } - public java.lang.String getAccountName() { - return this.accountName; - } - - public HybridType type; - public void setType(HybridType type) { - this.type = type; - } - public HybridType getType() { - return this.type; - } - - public java.lang.String gatewayId; - public void setGatewayId(java.lang.String gatewayId) { - this.gatewayId = gatewayId; - } - public java.lang.String getGatewayId() { - return this.gatewayId; - } - - public java.lang.String vSwitchUuid; - public void setVSwitchUuid(java.lang.String vSwitchUuid) { - this.vSwitchUuid = vSwitchUuid; - } - public java.lang.String getVSwitchUuid() { - return this.vSwitchUuid; - } - - public java.lang.String publicIp; - public void setPublicIp(java.lang.String publicIp) { - this.publicIp = publicIp; - } - public java.lang.String getPublicIp() { - return this.publicIp; - } - - public java.lang.String spec; - public void setSpec(java.lang.String spec) { - this.spec = spec; - } - public java.lang.String getSpec() { - return this.spec; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.lang.String status; - public void setStatus(java.lang.String status) { - this.status = status; - } - public java.lang.String getStatus() { - return this.status; - } - - public java.lang.String businessStatus; - public void setBusinessStatus(java.lang.String businessStatus) { - this.businessStatus = businessStatus; - } - public java.lang.String getBusinessStatus() { - return this.businessStatus; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp endDate; - public void setEndDate(java.sql.Timestamp endDate) { - this.endDate = endDate; - } - public java.sql.Timestamp getEndDate() { - return this.endDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcVpnIkeConfigInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcVpnIkeConfigInventory.java deleted file mode 100644 index 30d99772f5..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcVpnIkeConfigInventory.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcVpnIkeConfigInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String accountName; - public void setAccountName(java.lang.String accountName) { - this.accountName = accountName; - } - public java.lang.String getAccountName() { - return this.accountName; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String psk; - public void setPsk(java.lang.String psk) { - this.psk = psk; - } - public java.lang.String getPsk() { - return this.psk; - } - - public java.lang.String version; - public void setVersion(java.lang.String version) { - this.version = version; - } - public java.lang.String getVersion() { - return this.version; - } - - public java.lang.String mode; - public void setMode(java.lang.String mode) { - this.mode = mode; - } - public java.lang.String getMode() { - return this.mode; - } - - public java.lang.String encodeAlgorithm; - public void setEncodeAlgorithm(java.lang.String encodeAlgorithm) { - this.encodeAlgorithm = encodeAlgorithm; - } - public java.lang.String getEncodeAlgorithm() { - return this.encodeAlgorithm; - } - - public java.lang.String authAlgorithm; - public void setAuthAlgorithm(java.lang.String authAlgorithm) { - this.authAlgorithm = authAlgorithm; - } - public java.lang.String getAuthAlgorithm() { - return this.authAlgorithm; - } - - public java.lang.String pfs; - public void setPfs(java.lang.String pfs) { - this.pfs = pfs; - } - public java.lang.String getPfs() { - return this.pfs; - } - - public java.lang.Integer lifetime; - public void setLifetime(java.lang.Integer lifetime) { - this.lifetime = lifetime; - } - public java.lang.Integer getLifetime() { - return this.lifetime; - } - - public java.lang.String localIp; - public void setLocalIp(java.lang.String localIp) { - this.localIp = localIp; - } - public java.lang.String getLocalIp() { - return this.localIp; - } - - public java.lang.String remoteIp; - public void setRemoteIp(java.lang.String remoteIp) { - this.remoteIp = remoteIp; - } - public java.lang.String getRemoteIp() { - return this.remoteIp; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcVpnIkeConfigStruct.java b/sdk/src/main/java/org/zstack/sdk/VpcVpnIkeConfigStruct.java deleted file mode 100644 index dab569c98c..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcVpnIkeConfigStruct.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcVpnIkeConfigStruct { - - public java.lang.String Psk; - public void setPsk(java.lang.String Psk) { - this.Psk = Psk; - } - public java.lang.String getPsk() { - return this.Psk; - } - - public java.lang.String IkeVersion; - public void setIkeVersion(java.lang.String IkeVersion) { - this.IkeVersion = IkeVersion; - } - public java.lang.String getIkeVersion() { - return this.IkeVersion; - } - - public java.lang.String IkeMode; - public void setIkeMode(java.lang.String IkeMode) { - this.IkeMode = IkeMode; - } - public java.lang.String getIkeMode() { - return this.IkeMode; - } - - public java.lang.String IkeEncAlg; - public void setIkeEncAlg(java.lang.String IkeEncAlg) { - this.IkeEncAlg = IkeEncAlg; - } - public java.lang.String getIkeEncAlg() { - return this.IkeEncAlg; - } - - public java.lang.String IkeAuthAlg; - public void setIkeAuthAlg(java.lang.String IkeAuthAlg) { - this.IkeAuthAlg = IkeAuthAlg; - } - public java.lang.String getIkeAuthAlg() { - return this.IkeAuthAlg; - } - - public java.lang.String IkePfs; - public void setIkePfs(java.lang.String IkePfs) { - this.IkePfs = IkePfs; - } - public java.lang.String getIkePfs() { - return this.IkePfs; - } - - public java.lang.Integer IkeLifetime; - public void setIkeLifetime(java.lang.Integer IkeLifetime) { - this.IkeLifetime = IkeLifetime; - } - public java.lang.Integer getIkeLifetime() { - return this.IkeLifetime; - } - - public java.lang.String LocalId; - public void setLocalId(java.lang.String LocalId) { - this.LocalId = LocalId; - } - public java.lang.String getLocalId() { - return this.LocalId; - } - - public java.lang.String RemoteId; - public void setRemoteId(java.lang.String RemoteId) { - this.RemoteId = RemoteId; - } - public java.lang.String getRemoteId() { - return this.RemoteId; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcVpnIpSecConfigInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcVpnIpSecConfigInventory.java deleted file mode 100644 index 9943dfd29f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcVpnIpSecConfigInventory.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcVpnIpSecConfigInventory { - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - - public java.lang.String accountName; - public void setAccountName(java.lang.String accountName) { - this.accountName = accountName; - } - public java.lang.String getAccountName() { - return this.accountName; - } - - public java.lang.String name; - public void setName(java.lang.String name) { - this.name = name; - } - public java.lang.String getName() { - return this.name; - } - - public java.lang.String encodeAlgorithm; - public void setEncodeAlgorithm(java.lang.String encodeAlgorithm) { - this.encodeAlgorithm = encodeAlgorithm; - } - public java.lang.String getEncodeAlgorithm() { - return this.encodeAlgorithm; - } - - public java.lang.String authAlgorithm; - public void setAuthAlgorithm(java.lang.String authAlgorithm) { - this.authAlgorithm = authAlgorithm; - } - public java.lang.String getAuthAlgorithm() { - return this.authAlgorithm; - } - - public java.lang.String pfs; - public void setPfs(java.lang.String pfs) { - this.pfs = pfs; - } - public java.lang.String getPfs() { - return this.pfs; - } - - public java.lang.Integer lifetime; - public void setLifetime(java.lang.Integer lifetime) { - this.lifetime = lifetime; - } - public java.lang.Integer getLifetime() { - return this.lifetime; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcVpnIpSecConfigStruct.java b/sdk/src/main/java/org/zstack/sdk/VpcVpnIpSecConfigStruct.java deleted file mode 100644 index d51fc92dc0..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcVpnIpSecConfigStruct.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcVpnIpSecConfigStruct { - - public java.lang.String IpsecEncAlg; - public void setIpsecEncAlg(java.lang.String IpsecEncAlg) { - this.IpsecEncAlg = IpsecEncAlg; - } - public java.lang.String getIpsecEncAlg() { - return this.IpsecEncAlg; - } - - public java.lang.String IpsecAuthAlg; - public void setIpsecAuthAlg(java.lang.String IpsecAuthAlg) { - this.IpsecAuthAlg = IpsecAuthAlg; - } - public java.lang.String getIpsecAuthAlg() { - return this.IpsecAuthAlg; - } - - public java.lang.String IpsecPfs; - public void setIpsecPfs(java.lang.String IpsecPfs) { - this.IpsecPfs = IpsecPfs; - } - public java.lang.String getIpsecPfs() { - return this.IpsecPfs; - } - - public java.lang.Integer IpsecLifetime; - public void setIpsecLifetime(java.lang.Integer IpsecLifetime) { - this.IpsecLifetime = IpsecLifetime; - } - public java.lang.Integer getIpsecLifetime() { - return this.IpsecLifetime; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ZSClient.java b/sdk/src/main/java/org/zstack/sdk/ZSClient.java index 51488d0349..2021953d8f 100755 --- a/sdk/src/main/java/org/zstack/sdk/ZSClient.java +++ b/sdk/src/main/java/org/zstack/sdk/ZSClient.java @@ -9,6 +9,7 @@ import com.google.gson.JsonParseException; import okhttp3.*; import org.apache.commons.codec.binary.Base64; +import org.springframework.lang.NonNull; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; @@ -120,19 +121,18 @@ public static ZSConfig getConfig() { public static void configure(ZSConfig c) { config = c; + http = buildHttpClient(c); + } - if (c.readTimeout != null || c.writeTimeout != null) { - OkHttpClient.Builder b = new OkHttpClient.Builder(); - - if (c.readTimeout != null) { - b.readTimeout(c.readTimeout, TimeUnit.MILLISECONDS); - } - if (c.writeTimeout != null) { - b.writeTimeout(c.writeTimeout, TimeUnit.MILLISECONDS); - } - - http = b.build(); + private static OkHttpClient buildHttpClient(ZSConfig c) { + OkHttpClient.Builder b = new OkHttpClient.Builder(); + if (c.readTimeout != null) { + b.readTimeout(c.readTimeout, TimeUnit.MILLISECONDS); } + if (c.writeTimeout != null) { + b.writeTimeout(c.writeTimeout, TimeUnit.MILLISECONDS); + } + return b.build(); } public static void webHookCallback(HttpServletRequest req, HttpServletResponse rsp) { @@ -205,15 +205,28 @@ static class Api { RestInfo info; InternalCompletion completion; String jobUuid = UUID.randomUUID().toString().replaceAll("-", ""); + ZSConfig config; + OkHttpClient http; private ApiResult resultFromWebHook; Api(AbstractAction action) { + this(action, ZSClient.config); + } + + Api(AbstractAction action, ZSConfig config) { this.action = action; info = action.getRestInfo(); if (action.apiId != null) { jobUuid = action.apiId; } + + this.config = config != null ? config : ZSClient.config; + if (this.config == ZSClient.config) { + this.http = ZSClient.http; + } else { + this.http = buildHttpClient(this.config); + } } void wakeUpFromWebHook(ApiResult res) { @@ -309,9 +322,9 @@ ApiResult doCall() { } if (response.code() == 200 || response.code() == 204) { + waittingApis.remove(jobUuid); return writeApiResult(response); } else if (response.code() == 202) { - if (config.webHook != null) { return webHookResult(); } else { @@ -577,7 +590,7 @@ private ApiResult pollResult(Response response) throws IOException { String configHost = String.format("%s:%s", config.getHostname(), config.getPort()); if (!pollingUrl.contains(configHost)) { - String splitRegex = "/zstack/v1/api-jobs"; + String splitRegex = Boolean.parseBoolean(System.getProperty("unitTestOn")) ? "/v1/api-jobs" : "/zstack/v1/api-jobs"; pollingUrl = String.format("http://%s%s%s", configHost, splitRegex ,pollingUrl.split(splitRegex)[1]); } @@ -598,6 +611,9 @@ private void asyncPollResult(final String url) { final long i = this.getInterval(); final Object sessionId = action.getParameterValue(Constants.SESSION_ID); + final Object accessKeyId = action.getParameterValue(Constants.ACCESS_KEY_KEYID); + final Object accessKeySecret = action.getParameterValue(Constants.ACCESS_KEY_KEY_SECRET); + final Object requestIp = action.getParameterValue(Constants.REQUEST_IP); final Timer timer = new Timer(); @@ -781,6 +797,14 @@ public static void call(AbstractAction action, InternalCompletion completion) { new Api(action).call(completion); } + public static void callWithConfig(AbstractAction action, @NonNull ZSConfig config, InternalCompletion completion) { + new Api(action, config).call(completion); + } + + public static ApiResult callWithConfig(AbstractAction action, @NonNull ZSConfig config) { + return new Api(action, config).call(); + } + public static ApiResult call(AbstractAction action) { errorIfNotConfigured(); return new Api(action).call(); diff --git a/sdk/src/main/java/org/zstack/sdk/AttachGuestToolsIsoToVmAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/AttachGuestToolsIsoToVmAction.java similarity index 86% rename from sdk/src/main/java/org/zstack/sdk/AttachGuestToolsIsoToVmAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/AttachGuestToolsIsoToVmAction.java index 9828ceaa94..3fde0f7d91 100644 --- a/sdk/src/main/java/org/zstack/sdk/AttachGuestToolsIsoToVmAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/AttachGuestToolsIsoToVmAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class AttachGuestToolsIsoToVmAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.AttachGuestToolsIsoToVmResult value; + public org.zstack.sdk.guesttools.AttachGuestToolsIsoToVmResult value; public Result throwExceptionIfError() { if (error != null) { @@ -60,8 +60,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.AttachGuestToolsIsoToVmResult value = res.getResult(org.zstack.sdk.AttachGuestToolsIsoToVmResult.class); - ret.value = value == null ? new org.zstack.sdk.AttachGuestToolsIsoToVmResult() : value; + org.zstack.sdk.guesttools.AttachGuestToolsIsoToVmResult value = res.getResult(org.zstack.sdk.guesttools.AttachGuestToolsIsoToVmResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.AttachGuestToolsIsoToVmResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/AttachGuestToolsIsoToVmResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/AttachGuestToolsIsoToVmResult.java similarity index 59% rename from sdk/src/main/java/org/zstack/sdk/AttachGuestToolsIsoToVmResult.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/AttachGuestToolsIsoToVmResult.java index 48a9cffc42..040f914495 100644 --- a/sdk/src/main/java/org/zstack/sdk/AttachGuestToolsIsoToVmResult.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/AttachGuestToolsIsoToVmResult.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; diff --git a/sdk/src/main/java/org/zstack/sdk/DetachGuestToolsIsoFromVmAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/DetachGuestToolsIsoFromVmAction.java similarity index 86% rename from sdk/src/main/java/org/zstack/sdk/DetachGuestToolsIsoFromVmAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/DetachGuestToolsIsoFromVmAction.java index b2a5baf3ef..8e47740c3a 100644 --- a/sdk/src/main/java/org/zstack/sdk/DetachGuestToolsIsoFromVmAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/DetachGuestToolsIsoFromVmAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class DetachGuestToolsIsoFromVmAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.DetachGuestToolsIsoFromVmResult value; + public org.zstack.sdk.guesttools.DetachGuestToolsIsoFromVmResult value; public Result throwExceptionIfError() { if (error != null) { @@ -60,8 +60,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.DetachGuestToolsIsoFromVmResult value = res.getResult(org.zstack.sdk.DetachGuestToolsIsoFromVmResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachGuestToolsIsoFromVmResult() : value; + org.zstack.sdk.guesttools.DetachGuestToolsIsoFromVmResult value = res.getResult(org.zstack.sdk.guesttools.DetachGuestToolsIsoFromVmResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.DetachGuestToolsIsoFromVmResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/DetachGuestToolsIsoFromVmResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/DetachGuestToolsIsoFromVmResult.java similarity index 60% rename from sdk/src/main/java/org/zstack/sdk/DetachGuestToolsIsoFromVmResult.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/DetachGuestToolsIsoFromVmResult.java index 4470ddcde2..267cc90198 100644 --- a/sdk/src/main/java/org/zstack/sdk/DetachGuestToolsIsoFromVmResult.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/DetachGuestToolsIsoFromVmResult.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; diff --git a/sdk/src/main/java/org/zstack/sdk/GetLatestGuestToolsForVmAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/GetLatestGuestToolsForVmAction.java similarity index 86% rename from sdk/src/main/java/org/zstack/sdk/GetLatestGuestToolsForVmAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/GetLatestGuestToolsForVmAction.java index 7df90bf0d0..fe4f3373bb 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetLatestGuestToolsForVmAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/GetLatestGuestToolsForVmAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class GetLatestGuestToolsForVmAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.GetLatestGuestToolsForVmResult value; + public org.zstack.sdk.guesttools.GetLatestGuestToolsForVmResult value; public Result throwExceptionIfError() { if (error != null) { @@ -54,8 +54,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.GetLatestGuestToolsForVmResult value = res.getResult(org.zstack.sdk.GetLatestGuestToolsForVmResult.class); - ret.value = value == null ? new org.zstack.sdk.GetLatestGuestToolsForVmResult() : value; + org.zstack.sdk.guesttools.GetLatestGuestToolsForVmResult value = res.getResult(org.zstack.sdk.guesttools.GetLatestGuestToolsForVmResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.GetLatestGuestToolsForVmResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/GetLatestGuestToolsForVmResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/GetLatestGuestToolsForVmResult.java similarity index 76% rename from sdk/src/main/java/org/zstack/sdk/GetLatestGuestToolsForVmResult.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/GetLatestGuestToolsForVmResult.java index 509c405ba0..6152493aaa 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetLatestGuestToolsForVmResult.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/GetLatestGuestToolsForVmResult.java @@ -1,6 +1,6 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; -import org.zstack.sdk.GuestToolsInventory; +import org.zstack.sdk.guesttools.GuestToolsInventory; public class GetLatestGuestToolsForVmResult { public GuestToolsInventory inventory; diff --git a/sdk/src/main/java/org/zstack/sdk/GetVmGuestToolsInfoAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/GetVmGuestToolsInfoAction.java similarity index 87% rename from sdk/src/main/java/org/zstack/sdk/GetVmGuestToolsInfoAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/GetVmGuestToolsInfoAction.java index 80c20ba8d9..64357150b5 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetVmGuestToolsInfoAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/GetVmGuestToolsInfoAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class GetVmGuestToolsInfoAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.GetVmGuestToolsInfoResult value; + public org.zstack.sdk.guesttools.GetVmGuestToolsInfoResult value; public Result throwExceptionIfError() { if (error != null) { @@ -57,8 +57,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.GetVmGuestToolsInfoResult value = res.getResult(org.zstack.sdk.GetVmGuestToolsInfoResult.class); - ret.value = value == null ? new org.zstack.sdk.GetVmGuestToolsInfoResult() : value; + org.zstack.sdk.guesttools.GetVmGuestToolsInfoResult value = res.getResult(org.zstack.sdk.guesttools.GetVmGuestToolsInfoResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.GetVmGuestToolsInfoResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/GetVmGuestToolsInfoResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/GetVmGuestToolsInfoResult.java similarity index 94% rename from sdk/src/main/java/org/zstack/sdk/GetVmGuestToolsInfoResult.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/GetVmGuestToolsInfoResult.java index 1c6be5d4f3..070d14f90e 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetVmGuestToolsInfoResult.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/GetVmGuestToolsInfoResult.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; diff --git a/sdk/src/main/java/org/zstack/sdk/GuestToolsInventory.java b/sdk/src/main/java/org/zstack/sdk/guesttools/GuestToolsInventory.java similarity index 98% rename from sdk/src/main/java/org/zstack/sdk/GuestToolsInventory.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/GuestToolsInventory.java index 47d771701f..cab53c9c63 100644 --- a/sdk/src/main/java/org/zstack/sdk/GuestToolsInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/GuestToolsInventory.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; diff --git a/sdk/src/main/java/org/zstack/sdk/GuestToolsStateInventory.java b/sdk/src/main/java/org/zstack/sdk/guesttools/GuestToolsStateInventory.java similarity index 98% rename from sdk/src/main/java/org/zstack/sdk/GuestToolsStateInventory.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/GuestToolsStateInventory.java index ddcdbbe6ea..3f665439d2 100644 --- a/sdk/src/main/java/org/zstack/sdk/GuestToolsStateInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/GuestToolsStateInventory.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; diff --git a/sdk/src/main/java/org/zstack/sdk/QueryGuestToolsStateAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/QueryGuestToolsStateAction.java similarity index 83% rename from sdk/src/main/java/org/zstack/sdk/QueryGuestToolsStateAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/QueryGuestToolsStateAction.java index 6ea5d1a5d4..d8e753e055 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryGuestToolsStateAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/QueryGuestToolsStateAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class QueryGuestToolsStateAction extends QueryAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.QueryGuestToolsStateResult value; + public org.zstack.sdk.guesttools.QueryGuestToolsStateResult value; public Result throwExceptionIfError() { if (error != null) { @@ -34,8 +34,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.QueryGuestToolsStateResult value = res.getResult(org.zstack.sdk.QueryGuestToolsStateResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryGuestToolsStateResult() : value; + org.zstack.sdk.guesttools.QueryGuestToolsStateResult value = res.getResult(org.zstack.sdk.guesttools.QueryGuestToolsStateResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.QueryGuestToolsStateResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/QueryGuestToolsStateResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/QueryGuestToolsStateResult.java similarity index 93% rename from sdk/src/main/java/org/zstack/sdk/QueryGuestToolsStateResult.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/QueryGuestToolsStateResult.java index 60f8299098..97868d6759 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryGuestToolsStateResult.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/QueryGuestToolsStateResult.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateGuestToolsStateAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/UpdateGuestToolsStateAction.java similarity index 86% rename from sdk/src/main/java/org/zstack/sdk/UpdateGuestToolsStateAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/UpdateGuestToolsStateAction.java index fc119a1454..6163c513b9 100644 --- a/sdk/src/main/java/org/zstack/sdk/UpdateGuestToolsStateAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/UpdateGuestToolsStateAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class UpdateGuestToolsStateAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.UpdateGuestToolsStateResult value; + public org.zstack.sdk.guesttools.UpdateGuestToolsStateResult value; public Result throwExceptionIfError() { if (error != null) { @@ -54,8 +54,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.UpdateGuestToolsStateResult value = res.getResult(org.zstack.sdk.UpdateGuestToolsStateResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateGuestToolsStateResult() : value; + org.zstack.sdk.guesttools.UpdateGuestToolsStateResult value = res.getResult(org.zstack.sdk.guesttools.UpdateGuestToolsStateResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.UpdateGuestToolsStateResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateGuestToolsStateResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/UpdateGuestToolsStateResult.java similarity index 75% rename from sdk/src/main/java/org/zstack/sdk/UpdateGuestToolsStateResult.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/UpdateGuestToolsStateResult.java index 8460155213..3efdfda5ed 100644 --- a/sdk/src/main/java/org/zstack/sdk/UpdateGuestToolsStateResult.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/UpdateGuestToolsStateResult.java @@ -1,6 +1,6 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; -import org.zstack.sdk.GuestToolsStateInventory; +import org.zstack.sdk.guesttools.GuestToolsStateInventory; public class UpdateGuestToolsStateResult { public GuestToolsStateInventory inventory; diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVmNetworkConfigAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/UpdateVmNetworkConfigAction.java similarity index 87% rename from sdk/src/main/java/org/zstack/sdk/UpdateVmNetworkConfigAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/UpdateVmNetworkConfigAction.java index 3a9542063d..56bd9415a9 100644 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVmNetworkConfigAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/UpdateVmNetworkConfigAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class UpdateVmNetworkConfigAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.UpdateVmNetworkConfigResult value; + public org.zstack.sdk.guesttools.UpdateVmNetworkConfigResult value; public Result throwExceptionIfError() { if (error != null) { @@ -63,8 +63,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.UpdateVmNetworkConfigResult value = res.getResult(org.zstack.sdk.UpdateVmNetworkConfigResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateVmNetworkConfigResult() : value; + org.zstack.sdk.guesttools.UpdateVmNetworkConfigResult value = res.getResult(org.zstack.sdk.guesttools.UpdateVmNetworkConfigResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.UpdateVmNetworkConfigResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVmNetworkConfigResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/UpdateVmNetworkConfigResult.java similarity index 58% rename from sdk/src/main/java/org/zstack/sdk/UpdateVmNetworkConfigResult.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/UpdateVmNetworkConfigResult.java index 2903aea5d9..d91fa7396c 100644 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVmNetworkConfigResult.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/UpdateVmNetworkConfigResult.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools; diff --git a/sdk/src/main/java/org/zstack/sdk/AddAliyunEbsPrimaryStorageAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/CreateVmCustomSpecificationAction.java similarity index 57% rename from sdk/src/main/java/org/zstack/sdk/AddAliyunEbsPrimaryStorageAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/advanced/CreateVmCustomSpecificationAction.java index 74b2d6076e..1cbc53bfa5 100644 --- a/sdk/src/main/java/org/zstack/sdk/AddAliyunEbsPrimaryStorageAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/CreateVmCustomSpecificationAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools.advanced; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class AddAliyunEbsPrimaryStorageAction extends AbstractAction { +public class CreateVmCustomSpecificationAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class AddAliyunEbsPrimaryStorageAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.AddPrimaryStorageResult value; + public org.zstack.sdk.guesttools.advanced.CreateVmCustomSpecificationResult value; public Result throwExceptionIfError() { if (error != null) { @@ -25,32 +25,38 @@ public Result throwExceptionIfError() { } } - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String panguPartitionUuid; + @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) + public java.lang.String name; - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String identityZoneUuid; + @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String description; - @Param(required = false, validValues = {"io7","io8"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String defaultIoType; + @Param(required = true, validValues = {"Linux","Windows","WindowsVirtio","Other","Paravirtualization"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String platform; - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String tdcConfigContent; + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String hostname; - @Param(required = true, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String url; + @Param(required = false, validRegexValues = "[\\da-zA-Z-`=\\\\\\[\\];',./~!@#$%^&*()_+|{}:\"<>?]{0,}", maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = true) + public java.lang.String rootPassword; - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; + @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.Boolean generateSID; - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; + @Param(required = false, validValues = {"WorkGroup","Domain"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String domainMode; - @Param(required = false) - public java.lang.String type = "AliyunEBS"; + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String domainName; + + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String domainUsername; + + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = true) + public java.lang.String domainPassword; - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String zoneUuid; + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String organization; @Param(required = false) public java.lang.String resourceUuid; @@ -90,8 +96,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.AddPrimaryStorageResult value = res.getResult(org.zstack.sdk.AddPrimaryStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.AddPrimaryStorageResult() : value; + org.zstack.sdk.guesttools.advanced.CreateVmCustomSpecificationResult value = res.getResult(org.zstack.sdk.guesttools.advanced.CreateVmCustomSpecificationResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.advanced.CreateVmCustomSpecificationResult() : value; return ret; } @@ -121,7 +127,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "POST"; - info.path = "/primary-storage/aliyun/ebs"; + info.path = "/vm-custom-specifications"; info.needSession = true; info.needPoll = true; info.parameterName = "params"; diff --git a/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/CreateVmCustomSpecificationResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/CreateVmCustomSpecificationResult.java new file mode 100644 index 0000000000..7d15119a4c --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/CreateVmCustomSpecificationResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk.guesttools.advanced; + +import org.zstack.sdk.guesttools.advanced.VmCustomSpecificationInventory; + +public class CreateVmCustomSpecificationResult { + public VmCustomSpecificationInventory inventory; + public void setInventory(VmCustomSpecificationInventory inventory) { + this.inventory = inventory; + } + public VmCustomSpecificationInventory getInventory() { + return this.inventory; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionLocalAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/DeleteVmCustomSpecificationAction.java similarity index 81% rename from sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionLocalAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/advanced/DeleteVmCustomSpecificationAction.java index a99809d411..16a2f8af13 100644 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVpcVpnConnectionLocalAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/DeleteVmCustomSpecificationAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools.advanced; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class DeleteVpcVpnConnectionLocalAction extends AbstractAction { +public class DeleteVmCustomSpecificationAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class DeleteVpcVpnConnectionLocalAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.DeleteVpcVpnConnectionLocalResult value; + public org.zstack.sdk.guesttools.advanced.DeleteVmCustomSpecificationResult value; public Result throwExceptionIfError() { if (error != null) { @@ -63,8 +63,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.DeleteVpcVpnConnectionLocalResult value = res.getResult(org.zstack.sdk.DeleteVpcVpnConnectionLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVpcVpnConnectionLocalResult() : value; + org.zstack.sdk.guesttools.advanced.DeleteVmCustomSpecificationResult value = res.getResult(org.zstack.sdk.guesttools.advanced.DeleteVmCustomSpecificationResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.advanced.DeleteVmCustomSpecificationResult() : value; return ret; } @@ -94,7 +94,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "DELETE"; - info.path = "/hybrid/vpn-connection/{uuid}"; + info.path = "/vm-custom-specifications/{uuid}"; info.needSession = true; info.needPoll = true; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/DeleteVmCustomSpecificationResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/DeleteVmCustomSpecificationResult.java new file mode 100644 index 0000000000..481903c754 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/DeleteVmCustomSpecificationResult.java @@ -0,0 +1,7 @@ +package org.zstack.sdk.guesttools.advanced; + + + +public class DeleteVmCustomSpecificationResult { + +} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryIdentityZoneFromLocalAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/QueryVmCustomSpecificationAction.java similarity index 75% rename from sdk/src/main/java/org/zstack/sdk/QueryIdentityZoneFromLocalAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/advanced/QueryVmCustomSpecificationAction.java index 9f4fda9fd2..950b7bf876 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryIdentityZoneFromLocalAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/QueryVmCustomSpecificationAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools.advanced; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class QueryIdentityZoneFromLocalAction extends QueryAction { +public class QueryVmCustomSpecificationAction extends QueryAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class QueryIdentityZoneFromLocalAction extends QueryAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.QueryIdentityZoneFromLocalResult value; + public org.zstack.sdk.guesttools.advanced.QueryVmCustomSpecificationResult value; public Result throwExceptionIfError() { if (error != null) { @@ -34,8 +34,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.QueryIdentityZoneFromLocalResult value = res.getResult(org.zstack.sdk.QueryIdentityZoneFromLocalResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryIdentityZoneFromLocalResult() : value; + org.zstack.sdk.guesttools.advanced.QueryVmCustomSpecificationResult value = res.getResult(org.zstack.sdk.guesttools.advanced.QueryVmCustomSpecificationResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.advanced.QueryVmCustomSpecificationResult() : value; return ret; } @@ -65,7 +65,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "GET"; - info.path = "/hybrid/identity-zone"; + info.path = "/vm-custom-specifications"; info.needSession = true; info.needPoll = false; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/GetConnectionBetweenL3NetworkAndAliyunVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/QueryVmCustomSpecificationResult.java similarity index 82% rename from sdk/src/main/java/org/zstack/sdk/GetConnectionBetweenL3NetworkAndAliyunVSwitchResult.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/advanced/QueryVmCustomSpecificationResult.java index 9eb7f19ee8..f7a033b216 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetConnectionBetweenL3NetworkAndAliyunVSwitchResult.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/QueryVmCustomSpecificationResult.java @@ -1,8 +1,8 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools.advanced; -public class GetConnectionBetweenL3NetworkAndAliyunVSwitchResult { +public class QueryVmCustomSpecificationResult { public java.util.List inventories; public void setInventories(java.util.List inventories) { this.inventories = inventories; diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2IpmiChassisAction.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/UpdateVmCustomSpecificationAction.java similarity index 61% rename from sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2IpmiChassisAction.java rename to sdk/src/main/java/org/zstack/sdk/guesttools/advanced/UpdateVmCustomSpecificationAction.java index fc65555cd6..ce3fff8b19 100644 --- a/sdk/src/main/java/org/zstack/sdk/UpdateBareMetal2IpmiChassisAction.java +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/UpdateVmCustomSpecificationAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.guesttools.advanced; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class UpdateBareMetal2IpmiChassisAction extends AbstractAction { +public class UpdateVmCustomSpecificationAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class UpdateBareMetal2IpmiChassisAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.UpdateBareMetal2ChassisResult value; + public org.zstack.sdk.guesttools.advanced.UpdateVmCustomSpecificationResult value; public Result throwExceptionIfError() { if (error != null) { @@ -25,26 +25,38 @@ public Result throwExceptionIfError() { } } - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipmiAddress; + @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) + public java.lang.String uuid; - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {1L,65535L}, noTrim = false) - public java.lang.Integer ipmiPort; + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String name; + + @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String description; @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipmiUsername; + public java.lang.String hostname; + + @Param(required = false, validRegexValues = "[\\da-zA-Z-`=\\\\\\[\\];',./~!@#$%^&*()_+|{}:\"<>?]{0,}", maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = true) + public java.lang.String rootPassword; + + @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.Boolean generateSID; + + @Param(required = false, validValues = {"WorkGroup","Domain"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String domainMode; @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ipmiPassword; + public java.lang.String domainName; - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String domainUsername; - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = true) + public java.lang.String domainPassword; - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; + @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String organization; @Param(required = false) public java.util.List systemTags; @@ -78,8 +90,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.UpdateBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.UpdateBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateBareMetal2ChassisResult() : value; + org.zstack.sdk.guesttools.advanced.UpdateVmCustomSpecificationResult value = res.getResult(org.zstack.sdk.guesttools.advanced.UpdateVmCustomSpecificationResult.class); + ret.value = value == null ? new org.zstack.sdk.guesttools.advanced.UpdateVmCustomSpecificationResult() : value; return ret; } @@ -109,10 +121,10 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/ipmi/{uuid}/actions"; + info.path = "/vm-custom-specifications/{uuid}/actions"; info.needSession = true; info.needPoll = true; - info.parameterName = "updateBareMetal2IpmiChassis"; + info.parameterName = "updateVmCustomSpecification"; return info; } diff --git a/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/UpdateVmCustomSpecificationResult.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/UpdateVmCustomSpecificationResult.java new file mode 100644 index 0000000000..ba1ed50da7 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/UpdateVmCustomSpecificationResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk.guesttools.advanced; + +import org.zstack.sdk.guesttools.advanced.VmCustomSpecificationInventory; + +public class UpdateVmCustomSpecificationResult { + public VmCustomSpecificationInventory inventory; + public void setInventory(VmCustomSpecificationInventory inventory) { + this.inventory = inventory; + } + public VmCustomSpecificationInventory getInventory() { + return this.inventory; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/VmCustomSpecificationInventory.java b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/VmCustomSpecificationInventory.java new file mode 100644 index 0000000000..d451f291aa --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/guesttools/advanced/VmCustomSpecificationInventory.java @@ -0,0 +1,111 @@ +package org.zstack.sdk.guesttools.advanced; + +import org.zstack.sdk.VmCustomSpecificationDomainMode; + +public class VmCustomSpecificationInventory { + + public java.lang.String uuid; + public void setUuid(java.lang.String uuid) { + this.uuid = uuid; + } + public java.lang.String getUuid() { + return this.uuid; + } + + public java.lang.String vmInstanceUuid; + public void setVmInstanceUuid(java.lang.String vmInstanceUuid) { + this.vmInstanceUuid = vmInstanceUuid; + } + public java.lang.String getVmInstanceUuid() { + return this.vmInstanceUuid; + } + + public java.lang.String name; + public void setName(java.lang.String name) { + this.name = name; + } + public java.lang.String getName() { + return this.name; + } + + public java.lang.String description; + public void setDescription(java.lang.String description) { + this.description = description; + } + public java.lang.String getDescription() { + return this.description; + } + + public java.lang.String platform; + public void setPlatform(java.lang.String platform) { + this.platform = platform; + } + public java.lang.String getPlatform() { + return this.platform; + } + + public java.lang.String hostname; + public void setHostname(java.lang.String hostname) { + this.hostname = hostname; + } + public java.lang.String getHostname() { + return this.hostname; + } + + public java.lang.Boolean generateSID; + public void setGenerateSID(java.lang.Boolean generateSID) { + this.generateSID = generateSID; + } + public java.lang.Boolean getGenerateSID() { + return this.generateSID; + } + + public VmCustomSpecificationDomainMode domainMode; + public void setDomainMode(VmCustomSpecificationDomainMode domainMode) { + this.domainMode = domainMode; + } + public VmCustomSpecificationDomainMode getDomainMode() { + return this.domainMode; + } + + public java.lang.String domainName; + public void setDomainName(java.lang.String domainName) { + this.domainName = domainName; + } + public java.lang.String getDomainName() { + return this.domainName; + } + + public java.lang.String domainUsername; + public void setDomainUsername(java.lang.String domainUsername) { + this.domainUsername = domainUsername; + } + public java.lang.String getDomainUsername() { + return this.domainUsername; + } + + public java.lang.String organization; + public void setOrganization(java.lang.String organization) { + this.organization = organization; + } + public java.lang.String getOrganization() { + return this.organization; + } + + public java.sql.Timestamp createDate; + public void setCreateDate(java.sql.Timestamp createDate) { + this.createDate = createDate; + } + public java.sql.Timestamp getCreateDate() { + return this.createDate; + } + + public java.sql.Timestamp lastOpDate; + public void setLastOpDate(java.sql.Timestamp lastOpDate) { + this.lastOpDate = lastOpDate; + } + public java.sql.Timestamp getLastOpDate() { + return this.lastOpDate; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/GetOssBackupBucketFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/managements/common/GetManagementNodesStatusAction.java similarity index 79% rename from sdk/src/main/java/org/zstack/sdk/GetOssBackupBucketFromRemoteAction.java rename to sdk/src/main/java/org/zstack/sdk/managements/common/GetManagementNodesStatusAction.java index 75d5184f9a..04368e6c32 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetOssBackupBucketFromRemoteAction.java +++ b/sdk/src/main/java/org/zstack/sdk/managements/common/GetManagementNodesStatusAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.managements.common; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class GetOssBackupBucketFromRemoteAction extends AbstractAction { +public class GetManagementNodesStatusAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class GetOssBackupBucketFromRemoteAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.GetOssBackupBucketFromRemoteResult value; + public org.zstack.sdk.managements.common.GetManagementNodesStatusResult value; public Result throwExceptionIfError() { if (error != null) { @@ -51,8 +51,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.GetOssBackupBucketFromRemoteResult value = res.getResult(org.zstack.sdk.GetOssBackupBucketFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetOssBackupBucketFromRemoteResult() : value; + org.zstack.sdk.managements.common.GetManagementNodesStatusResult value = res.getResult(org.zstack.sdk.managements.common.GetManagementNodesStatusResult.class); + ret.value = value == null ? new org.zstack.sdk.managements.common.GetManagementNodesStatusResult() : value; return ret; } @@ -82,7 +82,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "GET"; - info.path = "/hybrid/backup-mysql/oss"; + info.path = "/management-nodes/status"; info.needSession = true; info.needPoll = false; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/managements/common/GetManagementNodesStatusResult.java b/sdk/src/main/java/org/zstack/sdk/managements/common/GetManagementNodesStatusResult.java new file mode 100644 index 0000000000..50b9dc4c6d --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/managements/common/GetManagementNodesStatusResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk.managements.common; + +import org.zstack.sdk.managements.common.ManagementsStatusView; + +public class GetManagementNodesStatusResult { + public ManagementsStatusView inventory; + public void setInventory(ManagementsStatusView inventory) { + this.inventory = inventory; + } + public ManagementsStatusView getInventory() { + return this.inventory; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/managements/common/ManagementNodeStatusView.java b/sdk/src/main/java/org/zstack/sdk/managements/common/ManagementNodeStatusView.java new file mode 100644 index 0000000000..2cb11c9e4c --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/managements/common/ManagementNodeStatusView.java @@ -0,0 +1,119 @@ +package org.zstack.sdk.managements.common; + +import org.zstack.sdk.ErrorCode; + +public class ManagementNodeStatusView { + + public java.lang.String ip; + public void setIp(java.lang.String ip) { + this.ip = ip; + } + public java.lang.String getIp() { + return this.ip; + } + + public java.lang.String gatewayIp; + public void setGatewayIp(java.lang.String gatewayIp) { + this.gatewayIp = gatewayIp; + } + public java.lang.String getGatewayIp() { + return this.gatewayIp; + } + + public boolean ownsVip; + public void setOwnsVip(boolean ownsVip) { + this.ownsVip = ownsVip; + } + public boolean getOwnsVip() { + return this.ownsVip; + } + + public boolean peerReachable; + public void setPeerReachable(boolean peerReachable) { + this.peerReachable = peerReachable; + } + public boolean getPeerReachable() { + return this.peerReachable; + } + + public boolean gatewayReachable; + public void setGatewayReachable(boolean gatewayReachable) { + this.gatewayReachable = gatewayReachable; + } + public boolean getGatewayReachable() { + return this.gatewayReachable; + } + + public boolean vipReachable; + public void setVipReachable(boolean vipReachable) { + this.vipReachable = vipReachable; + } + public boolean getVipReachable() { + return this.vipReachable; + } + + public java.lang.String keepalivedStatus; + public void setKeepalivedStatus(java.lang.String keepalivedStatus) { + this.keepalivedStatus = keepalivedStatus; + } + public java.lang.String getKeepalivedStatus() { + return this.keepalivedStatus; + } + + public java.lang.String haMonitorStatus; + public void setHaMonitorStatus(java.lang.String haMonitorStatus) { + this.haMonitorStatus = haMonitorStatus; + } + public java.lang.String getHaMonitorStatus() { + return this.haMonitorStatus; + } + + public java.lang.String databaseStatus; + public void setDatabaseStatus(java.lang.String databaseStatus) { + this.databaseStatus = databaseStatus; + } + public java.lang.String getDatabaseStatus() { + return this.databaseStatus; + } + + public java.lang.String uiStatus; + public void setUiStatus(java.lang.String uiStatus) { + this.uiStatus = uiStatus; + } + public java.lang.String getUiStatus() { + return this.uiStatus; + } + + public java.lang.String managementsNodeStatus; + public void setManagementsNodeStatus(java.lang.String managementsNodeStatus) { + this.managementsNodeStatus = managementsNodeStatus; + } + public java.lang.String getManagementsNodeStatus() { + return this.managementsNodeStatus; + } + + public boolean slaveIoRunning; + public void setSlaveIoRunning(boolean slaveIoRunning) { + this.slaveIoRunning = slaveIoRunning; + } + public boolean getSlaveIoRunning() { + return this.slaveIoRunning; + } + + public boolean slaveSqlRunning; + public void setSlaveSqlRunning(boolean slaveSqlRunning) { + this.slaveSqlRunning = slaveSqlRunning; + } + public boolean getSlaveSqlRunning() { + return this.slaveSqlRunning; + } + + public ErrorCode error; + public void setError(ErrorCode error) { + this.error = error; + } + public ErrorCode getError() { + return this.error; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/managements/common/ManagementsStatusView.java b/sdk/src/main/java/org/zstack/sdk/managements/common/ManagementsStatusView.java new file mode 100644 index 0000000000..ee69cea265 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/managements/common/ManagementsStatusView.java @@ -0,0 +1,31 @@ +package org.zstack.sdk.managements.common; + + + +public class ManagementsStatusView { + + public java.lang.String vip; + public void setVip(java.lang.String vip) { + this.vip = vip; + } + public java.lang.String getVip() { + return this.vip; + } + + public java.lang.String uiHttpPath; + public void setUiHttpPath(java.lang.String uiHttpPath) { + this.uiHttpPath = uiHttpPath; + } + public java.lang.String getUiHttpPath() { + return this.uiHttpPath; + } + + public java.util.List nodes; + public void setNodes(java.util.List nodes) { + this.nodes = nodes; + } + public java.util.List getNodes() { + return this.nodes; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2SupportedBootModeAction.java b/sdk/src/main/java/org/zstack/sdk/managements/ha2/GetZSha2StatusAction.java similarity index 82% rename from sdk/src/main/java/org/zstack/sdk/GetBareMetal2SupportedBootModeAction.java rename to sdk/src/main/java/org/zstack/sdk/managements/ha2/GetZSha2StatusAction.java index 76438a9620..dbb552382a 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetBareMetal2SupportedBootModeAction.java +++ b/sdk/src/main/java/org/zstack/sdk/managements/ha2/GetZSha2StatusAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.managements.ha2; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class GetBareMetal2SupportedBootModeAction extends AbstractAction { +public class GetZSha2StatusAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class GetBareMetal2SupportedBootModeAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.GetBareMetal2SupportedBootModeResult value; + public org.zstack.sdk.managements.ha2.GetZSha2StatusResult value; public Result throwExceptionIfError() { if (error != null) { @@ -51,8 +51,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.GetBareMetal2SupportedBootModeResult value = res.getResult(org.zstack.sdk.GetBareMetal2SupportedBootModeResult.class); - ret.value = value == null ? new org.zstack.sdk.GetBareMetal2SupportedBootModeResult() : value; + org.zstack.sdk.managements.ha2.GetZSha2StatusResult value = res.getResult(org.zstack.sdk.managements.ha2.GetZSha2StatusResult.class); + ret.value = value == null ? new org.zstack.sdk.managements.ha2.GetZSha2StatusResult() : value; return ret; } @@ -82,7 +82,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "GET"; - info.path = "/baremetal2/chassis/supported-boot-modes"; + info.path = "/management-nodes/zsha2/status"; info.needSession = true; info.needPoll = false; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/managements/ha2/GetZSha2StatusResult.java b/sdk/src/main/java/org/zstack/sdk/managements/ha2/GetZSha2StatusResult.java new file mode 100644 index 0000000000..dd47ce25aa --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/managements/ha2/GetZSha2StatusResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk.managements.ha2; + +import org.zstack.sdk.managements.ha2.ZSha2StatusView; + +public class GetZSha2StatusResult { + public ZSha2StatusView inventory; + public void setInventory(ZSha2StatusView inventory) { + this.inventory = inventory; + } + public ZSha2StatusView getInventory() { + return this.inventory; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachAliyunKeyAction.java b/sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2DemoteAction.java similarity index 78% rename from sdk/src/main/java/org/zstack/sdk/DetachAliyunKeyAction.java rename to sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2DemoteAction.java index d76c9d7732..2134fbf5cc 100644 --- a/sdk/src/main/java/org/zstack/sdk/DetachAliyunKeyAction.java +++ b/sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2DemoteAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.managements.ha2; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class DetachAliyunKeyAction extends AbstractAction { +public class ZSha2DemoteAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class DetachAliyunKeyAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.DetachAliyunKeyResult value; + public org.zstack.sdk.managements.ha2.ZSha2DemoteResult value; public Result throwExceptionIfError() { if (error != null) { @@ -25,9 +25,6 @@ public Result throwExceptionIfError() { } } - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - @Param(required = false) public java.util.List systemTags; @@ -60,8 +57,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.DetachAliyunKeyResult value = res.getResult(org.zstack.sdk.DetachAliyunKeyResult.class); - ret.value = value == null ? new org.zstack.sdk.DetachAliyunKeyResult() : value; + org.zstack.sdk.managements.ha2.ZSha2DemoteResult value = res.getResult(org.zstack.sdk.managements.ha2.ZSha2DemoteResult.class); + ret.value = value == null ? new org.zstack.sdk.managements.ha2.ZSha2DemoteResult() : value; return ret; } @@ -91,10 +88,10 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/key/{uuid}/detach"; + info.path = "/management-nodes/zsha2/demote"; info.needSession = true; info.needPoll = true; - info.parameterName = "detachAliyunKey"; + info.parameterName = "zSha2Demote"; return info; } diff --git a/sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2DemoteResult.java b/sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2DemoteResult.java new file mode 100644 index 0000000000..304f0f48cc --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2DemoteResult.java @@ -0,0 +1,7 @@ +package org.zstack.sdk.managements.ha2; + + + +public class ZSha2DemoteResult { + +} diff --git a/sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2StatusView.java b/sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2StatusView.java new file mode 100644 index 0000000000..a7ab522ac1 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/managements/ha2/ZSha2StatusView.java @@ -0,0 +1,31 @@ +package org.zstack.sdk.managements.ha2; + + + +public class ZSha2StatusView { + + public java.lang.String vip; + public void setVip(java.lang.String vip) { + this.vip = vip; + } + public java.lang.String getVip() { + return this.vip; + } + + public java.lang.String uiHttpPath; + public void setUiHttpPath(java.lang.String uiHttpPath) { + this.uiHttpPath = uiHttpPath; + } + public java.lang.String getUiHttpPath() { + return this.uiHttpPath; + } + + public java.util.List nodes; + public void setNodes(java.util.List nodes) { + this.nodes = nodes; + } + public java.util.List getNodes() { + return this.nodes; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/CreateSNSAliyunSmsEndpointAction.java b/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/CreateSNSAliyunSmsEndpointAction.java deleted file mode 100644 index 0c0fdc8988..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/CreateSNSAliyunSmsEndpointAction.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.zstack.sdk.sns.platform.aliyunsms; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateSNSAliyunSmsEndpointAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.sns.platform.aliyunsms.CreateSNSAliyunSmsEndpointResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String accessKeyUuid; - - @Param(required = false, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.util.List receivers; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String platformUuid; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.sns.platform.aliyunsms.CreateSNSAliyunSmsEndpointResult value = res.getResult(org.zstack.sdk.sns.platform.aliyunsms.CreateSNSAliyunSmsEndpointResult.class); - ret.value = value == null ? new org.zstack.sdk.sns.platform.aliyunsms.CreateSNSAliyunSmsEndpointResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "POST"; - info.path = "/sns/sms-endpoints/aliyunsms"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/CreateSNSAliyunSmsEndpointResult.java b/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/CreateSNSAliyunSmsEndpointResult.java deleted file mode 100644 index 8ca562e448..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/CreateSNSAliyunSmsEndpointResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk.sns.platform.aliyunsms; - -import org.zstack.sdk.sns.SNSSmsEndpointInventory; - -public class CreateSNSAliyunSmsEndpointResult { - public SNSSmsEndpointInventory inventory; - public void setInventory(SNSSmsEndpointInventory inventory) { - this.inventory = inventory; - } - public SNSSmsEndpointInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/ValidateSNSAliyunSmsEndpointAction.java b/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/ValidateSNSAliyunSmsEndpointAction.java deleted file mode 100644 index 1c570b67a5..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/ValidateSNSAliyunSmsEndpointAction.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.zstack.sdk.sns.platform.aliyunsms; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class ValidateSNSAliyunSmsEndpointAction extends AbstractAction { - - private static final HashMap parameterMap = new HashMap<>(); - - private static final HashMap nonAPIParameterMap = new HashMap<>(); - - public static class Result { - public ErrorCode error; - public org.zstack.sdk.sns.platform.aliyunsms.ValidateSNSAliyunSmsEndpointResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List phoneNumbers; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.sns.platform.aliyunsms.ValidateSNSAliyunSmsEndpointResult value = res.getResult(org.zstack.sdk.sns.platform.aliyunsms.ValidateSNSAliyunSmsEndpointResult.class); - ret.value = value == null ? new org.zstack.sdk.sns.platform.aliyunsms.ValidateSNSAliyunSmsEndpointResult() : value; - - return ret; - } - - public Result call() { - ApiResult res = ZSClient.call(this); - return makeResult(res); - } - - public void call(final Completion completion) { - ZSClient.call(this, new InternalCompletion() { - @Override - public void complete(ApiResult res) { - completion.complete(makeResult(res)); - } - }); - } - - protected Map getParameterMap() { - return parameterMap; - } - - protected Map getNonAPIParameterMap() { - return nonAPIParameterMap; - } - - protected RestInfo getRestInfo() { - RestInfo info = new RestInfo(); - info.httpMethod = "PUT"; - info.path = "/sns/sms-endpoints/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "validateSNSAliyunSmsEndpoint"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/ValidateSNSAliyunSmsEndpointResult.java b/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/ValidateSNSAliyunSmsEndpointResult.java deleted file mode 100644 index 71f6d07a7f..0000000000 --- a/sdk/src/main/java/org/zstack/sdk/sns/platform/aliyunsms/ValidateSNSAliyunSmsEndpointResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk.sns.platform.aliyunsms; - - - -public class ValidateSNSAliyunSmsEndpointResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunKeySecretAction.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/CleanSoftwarePackageAction.java similarity index 81% rename from sdk/src/main/java/org/zstack/sdk/DeleteAliyunKeySecretAction.java rename to sdk/src/main/java/org/zstack/sdk/softwarePackage/header/CleanSoftwarePackageAction.java index c9340f3a22..cca49b5b60 100644 --- a/sdk/src/main/java/org/zstack/sdk/DeleteAliyunKeySecretAction.java +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/CleanSoftwarePackageAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.softwarePackage.header; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class DeleteAliyunKeySecretAction extends AbstractAction { +public class CleanSoftwarePackageAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class DeleteAliyunKeySecretAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.DeleteAliyunKeySecretResult value; + public org.zstack.sdk.softwarePackage.header.CleanSoftwarePackageResult value; public Result throwExceptionIfError() { if (error != null) { @@ -63,8 +63,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.DeleteAliyunKeySecretResult value = res.getResult(org.zstack.sdk.DeleteAliyunKeySecretResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteAliyunKeySecretResult() : value; + org.zstack.sdk.softwarePackage.header.CleanSoftwarePackageResult value = res.getResult(org.zstack.sdk.softwarePackage.header.CleanSoftwarePackageResult.class); + ret.value = value == null ? new org.zstack.sdk.softwarePackage.header.CleanSoftwarePackageResult() : value; return ret; } @@ -94,7 +94,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "DELETE"; - info.path = "/hybrid/aliyun/key/{uuid}"; + info.path = "/software-package/{uuid}"; info.needSession = true; info.needPoll = true; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/CleanSoftwarePackageResult.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/CleanSoftwarePackageResult.java new file mode 100644 index 0000000000..da5271a3ad --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/CleanSoftwarePackageResult.java @@ -0,0 +1,7 @@ +package org.zstack.sdk.softwarePackage.header; + + + +public class CleanSoftwarePackageResult { + +} diff --git a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasAccessGroupRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetDirectoryUsageAction.java similarity index 74% rename from sdk/src/main/java/org/zstack/sdk/GetAliyunNasAccessGroupRemoteAction.java rename to sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetDirectoryUsageAction.java index f235e6363e..8de3d68519 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetAliyunNasAccessGroupRemoteAction.java +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetDirectoryUsageAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.softwarePackage.header; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class GetAliyunNasAccessGroupRemoteAction extends AbstractAction { +public class GetDirectoryUsageAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class GetAliyunNasAccessGroupRemoteAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.GetAliyunNasAccessGroupRemoteResult value; + public org.zstack.sdk.softwarePackage.header.GetDirectoryUsageResult value; public Result throwExceptionIfError() { if (error != null) { @@ -26,10 +26,10 @@ public Result throwExceptionIfError() { } @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; + public java.lang.String managementNodeUuid; - @Param(required = false, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String groupName; + @Param(required = true, maxLength = 1024, nonempty = false, nullElements = false, emptyString = false, noTrim = false) + public java.lang.String directoryPath; @Param(required = false) public java.util.List systemTags; @@ -57,8 +57,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.GetAliyunNasAccessGroupRemoteResult value = res.getResult(org.zstack.sdk.GetAliyunNasAccessGroupRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetAliyunNasAccessGroupRemoteResult() : value; + org.zstack.sdk.softwarePackage.header.GetDirectoryUsageResult value = res.getResult(org.zstack.sdk.softwarePackage.header.GetDirectoryUsageResult.class); + ret.value = value == null ? new org.zstack.sdk.softwarePackage.header.GetDirectoryUsageResult() : value; return ret; } @@ -88,7 +88,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "GET"; - info.path = "/nas/aliyun/access/remote"; + info.path = "/software-package/directory/usage"; info.needSession = true; info.needPoll = false; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetDirectoryUsageResult.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetDirectoryUsageResult.java new file mode 100644 index 0000000000..6aeceee792 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetDirectoryUsageResult.java @@ -0,0 +1,22 @@ +package org.zstack.sdk.softwarePackage.header; + + + +public class GetDirectoryUsageResult { + public long totalCapacity; + public void setTotalCapacity(long totalCapacity) { + this.totalCapacity = totalCapacity; + } + public long getTotalCapacity() { + return this.totalCapacity; + } + + public long availableCapacity; + public void setAvailableCapacity(long availableCapacity) { + this.availableCapacity = availableCapacity; + } + public long getAvailableCapacity() { + return this.availableCapacity; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/GetConnectionAccessPointFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetUploadSoftwarePackageJobDetailsAction.java similarity index 76% rename from sdk/src/main/java/org/zstack/sdk/GetConnectionAccessPointFromRemoteAction.java rename to sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetUploadSoftwarePackageJobDetailsAction.java index 47af5688e1..2c5b3244e3 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetConnectionAccessPointFromRemoteAction.java +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetUploadSoftwarePackageJobDetailsAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.softwarePackage.header; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class GetConnectionAccessPointFromRemoteAction extends AbstractAction { +public class GetUploadSoftwarePackageJobDetailsAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class GetConnectionAccessPointFromRemoteAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.GetConnectionAccessPointFromRemoteResult value; + public org.zstack.sdk.softwarePackage.header.GetUploadSoftwarePackageJobDetailsResult value; public Result throwExceptionIfError() { if (error != null) { @@ -26,7 +26,7 @@ public Result throwExceptionIfError() { } @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dataCenterUuid; + public java.lang.String softwarePackageId; @Param(required = false) public java.util.List systemTags; @@ -54,8 +54,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.GetConnectionAccessPointFromRemoteResult value = res.getResult(org.zstack.sdk.GetConnectionAccessPointFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.GetConnectionAccessPointFromRemoteResult() : value; + org.zstack.sdk.softwarePackage.header.GetUploadSoftwarePackageJobDetailsResult value = res.getResult(org.zstack.sdk.softwarePackage.header.GetUploadSoftwarePackageJobDetailsResult.class); + ret.value = value == null ? new org.zstack.sdk.softwarePackage.header.GetUploadSoftwarePackageJobDetailsResult() : value; return ret; } @@ -85,7 +85,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "GET"; - info.path = "/hybrid/aliyun/access-point{dataCenterUuid}/remote"; + info.path = "/software-package/upload-jobs/details/{softwarePackageId}"; info.needSession = true; info.needPoll = false; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetUploadSoftwarePackageJobDetailsResult.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetUploadSoftwarePackageJobDetailsResult.java new file mode 100644 index 0000000000..858c6b056e --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/GetUploadSoftwarePackageJobDetailsResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk.softwarePackage.header; + + + +public class GetUploadSoftwarePackageJobDetailsResult { + public java.util.List existingJobDetails; + public void setExistingJobDetails(java.util.List existingJobDetails) { + this.existingJobDetails = existingJobDetails; + } + public java.util.List getExistingJobDetails() { + return this.existingJobDetails; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupRuleFromRemoteAction.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/InstallSoftwarePackageAction.java similarity index 74% rename from sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupRuleFromRemoteAction.java rename to sdk/src/main/java/org/zstack/sdk/softwarePackage/header/InstallSoftwarePackageAction.java index c1f890ff5a..d584753f30 100644 --- a/sdk/src/main/java/org/zstack/sdk/SyncEcsSecurityGroupRuleFromRemoteAction.java +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/InstallSoftwarePackageAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.softwarePackage.header; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class SyncEcsSecurityGroupRuleFromRemoteAction extends AbstractAction { +public class InstallSoftwarePackageAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class SyncEcsSecurityGroupRuleFromRemoteAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.SyncEcsSecurityGroupRuleFromRemoteResult value; + public org.zstack.sdk.softwarePackage.header.InstallSoftwarePackageResult value; public Result throwExceptionIfError() { if (error != null) { @@ -25,14 +25,11 @@ public Result throwExceptionIfError() { } } - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String uuid; - @Param(required = false) - public java.lang.String resourceUuid; - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; + public java.lang.String config; @Param(required = false) public java.util.List systemTags; @@ -66,8 +63,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.SyncEcsSecurityGroupRuleFromRemoteResult value = res.getResult(org.zstack.sdk.SyncEcsSecurityGroupRuleFromRemoteResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncEcsSecurityGroupRuleFromRemoteResult() : value; + org.zstack.sdk.softwarePackage.header.InstallSoftwarePackageResult value = res.getResult(org.zstack.sdk.softwarePackage.header.InstallSoftwarePackageResult.class); + ret.value = value == null ? new org.zstack.sdk.softwarePackage.header.InstallSoftwarePackageResult() : value; return ret; } @@ -97,10 +94,10 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "PUT"; - info.path = "/hybrid/aliyun/security-group-rule/{uuid}/sync"; + info.path = "/software-package/install/{uuid}/actions"; info.needSession = true; info.needPoll = true; - info.parameterName = "syncEcsSecurityGroupRuleFromRemote"; + info.parameterName = "installSoftwarePackage"; return info; } diff --git a/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/InstallSoftwarePackageResult.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/InstallSoftwarePackageResult.java new file mode 100644 index 0000000000..2849bf44fb --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/InstallSoftwarePackageResult.java @@ -0,0 +1,7 @@ +package org.zstack.sdk.softwarePackage.header; + + + +public class InstallSoftwarePackageResult { + +} diff --git a/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/JobDetails.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/JobDetails.java new file mode 100644 index 0000000000..9cfc9e2b79 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/JobDetails.java @@ -0,0 +1,47 @@ +package org.zstack.sdk.softwarePackage.header; + + + +public class JobDetails { + + public java.lang.String longJobUuid; + public void setLongJobUuid(java.lang.String longJobUuid) { + this.longJobUuid = longJobUuid; + } + public java.lang.String getLongJobUuid() { + return this.longJobUuid; + } + + public java.lang.String longJobState; + public void setLongJobState(java.lang.String longJobState) { + this.longJobState = longJobState; + } + public java.lang.String getLongJobState() { + return this.longJobState; + } + + public java.lang.String softwarePackageUuid; + public void setSoftwarePackageUuid(java.lang.String softwarePackageUuid) { + this.softwarePackageUuid = softwarePackageUuid; + } + public java.lang.String getSoftwarePackageUuid() { + return this.softwarePackageUuid; + } + + public java.lang.String softwarePackageUploadUrl; + public void setSoftwarePackageUploadUrl(java.lang.String softwarePackageUploadUrl) { + this.softwarePackageUploadUrl = softwarePackageUploadUrl; + } + public java.lang.String getSoftwarePackageUploadUrl() { + return this.softwarePackageUploadUrl; + } + + public long offset; + public void setOffset(long offset) { + this.offset = offset; + } + public long getOffset() { + return this.offset; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunEbsBackupStorageAction.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/QuerySoftwarePackageAction.java similarity index 76% rename from sdk/src/main/java/org/zstack/sdk/QueryAliyunEbsBackupStorageAction.java rename to sdk/src/main/java/org/zstack/sdk/softwarePackage/header/QuerySoftwarePackageAction.java index 374841344a..e9cc7563c5 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunEbsBackupStorageAction.java +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/QuerySoftwarePackageAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.softwarePackage.header; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class QueryAliyunEbsBackupStorageAction extends QueryAction { +public class QuerySoftwarePackageAction extends QueryAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class QueryAliyunEbsBackupStorageAction extends QueryAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.QueryBackupStorageResult value; + public org.zstack.sdk.softwarePackage.header.QuerySoftwarePackageResult value; public Result throwExceptionIfError() { if (error != null) { @@ -34,8 +34,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.QueryBackupStorageResult value = res.getResult(org.zstack.sdk.QueryBackupStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryBackupStorageResult() : value; + org.zstack.sdk.softwarePackage.header.QuerySoftwarePackageResult value = res.getResult(org.zstack.sdk.softwarePackage.header.QuerySoftwarePackageResult.class); + ret.value = value == null ? new org.zstack.sdk.softwarePackage.header.QuerySoftwarePackageResult() : value; return ret; } @@ -65,7 +65,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "GET"; - info.path = "/backup-storage/aliyun/ebs"; + info.path = "/software-package"; info.needSession = true; info.needPoll = false; info.parameterName = ""; diff --git a/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVSwitchResult.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/QuerySoftwarePackageResult.java similarity index 82% rename from sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVSwitchResult.java rename to sdk/src/main/java/org/zstack/sdk/softwarePackage/header/QuerySoftwarePackageResult.java index df0f4a0e7f..5667b9b9f6 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryAliyunProxyVSwitchResult.java +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/QuerySoftwarePackageResult.java @@ -1,8 +1,8 @@ -package org.zstack.sdk; +package org.zstack.sdk.softwarePackage.header; -public class QueryAliyunProxyVSwitchResult { +public class QuerySoftwarePackageResult { public java.util.List inventories; public void setInventories(java.util.List inventories) { this.inventories = inventories; diff --git a/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/SoftwarePackageInventory.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/SoftwarePackageInventory.java new file mode 100644 index 0000000000..dce18a9a28 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/SoftwarePackageInventory.java @@ -0,0 +1,103 @@ +package org.zstack.sdk.softwarePackage.header; + + + +public class SoftwarePackageInventory { + + public java.lang.String uuid; + public void setUuid(java.lang.String uuid) { + this.uuid = uuid; + } + public java.lang.String getUuid() { + return this.uuid; + } + + public java.lang.String name; + public void setName(java.lang.String name) { + this.name = name; + } + public java.lang.String getName() { + return this.name; + } + + public java.lang.String hostUuid; + public void setHostUuid(java.lang.String hostUuid) { + this.hostUuid = hostUuid; + } + public java.lang.String getHostUuid() { + return this.hostUuid; + } + + public java.lang.String managementNodeUuid; + public void setManagementNodeUuid(java.lang.String managementNodeUuid) { + this.managementNodeUuid = managementNodeUuid; + } + public java.lang.String getManagementNodeUuid() { + return this.managementNodeUuid; + } + + public java.lang.String installPath; + public void setInstallPath(java.lang.String installPath) { + this.installPath = installPath; + } + public java.lang.String getInstallPath() { + return this.installPath; + } + + public java.lang.String unzipInstallPath; + public void setUnzipInstallPath(java.lang.String unzipInstallPath) { + this.unzipInstallPath = unzipInstallPath; + } + public java.lang.String getUnzipInstallPath() { + return this.unzipInstallPath; + } + + public java.lang.String type; + public void setType(java.lang.String type) { + this.type = type; + } + public java.lang.String getType() { + return this.type; + } + + public java.lang.String md5sum; + public void setMd5sum(java.lang.String md5sum) { + this.md5sum = md5sum; + } + public java.lang.String getMd5sum() { + return this.md5sum; + } + + public java.lang.String status; + public void setStatus(java.lang.String status) { + this.status = status; + } + public java.lang.String getStatus() { + return this.status; + } + + public long size; + public void setSize(long size) { + this.size = size; + } + public long getSize() { + return this.size; + } + + public java.sql.Timestamp createDate; + public void setCreateDate(java.sql.Timestamp createDate) { + this.createDate = createDate; + } + public java.sql.Timestamp getCreateDate() { + return this.createDate; + } + + public java.sql.Timestamp lastOpDate; + public void setLastOpDate(java.sql.Timestamp lastOpDate) { + this.lastOpDate = lastOpDate; + } + public java.sql.Timestamp getLastOpDate() { + return this.lastOpDate; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/InspectBareMetal2ChassisAction.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UninstallSoftwarePackageAction.java similarity index 78% rename from sdk/src/main/java/org/zstack/sdk/InspectBareMetal2ChassisAction.java rename to sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UninstallSoftwarePackageAction.java index 33860678c3..ffaf41e1d2 100644 --- a/sdk/src/main/java/org/zstack/sdk/InspectBareMetal2ChassisAction.java +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UninstallSoftwarePackageAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.softwarePackage.header; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class InspectBareMetal2ChassisAction extends AbstractAction { +public class UninstallSoftwarePackageAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class InspectBareMetal2ChassisAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.InspectBareMetal2ChassisResult value; + public org.zstack.sdk.softwarePackage.header.UninstallSoftwarePackageResult value; public Result throwExceptionIfError() { if (error != null) { @@ -60,8 +60,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.InspectBareMetal2ChassisResult value = res.getResult(org.zstack.sdk.InspectBareMetal2ChassisResult.class); - ret.value = value == null ? new org.zstack.sdk.InspectBareMetal2ChassisResult() : value; + org.zstack.sdk.softwarePackage.header.UninstallSoftwarePackageResult value = res.getResult(org.zstack.sdk.softwarePackage.header.UninstallSoftwarePackageResult.class); + ret.value = value == null ? new org.zstack.sdk.softwarePackage.header.UninstallSoftwarePackageResult() : value; return ret; } @@ -91,10 +91,10 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "PUT"; - info.path = "/baremetal2/chassis/{uuid}/actions"; + info.path = "/software-package/{uuid}/actions"; info.needSession = true; info.needPoll = true; - info.parameterName = "inspectBareMetal2Chassis"; + info.parameterName = "uninstallSoftwarePackage"; return info; } diff --git a/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UninstallSoftwarePackageResult.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UninstallSoftwarePackageResult.java new file mode 100644 index 0000000000..b135fb1d74 --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UninstallSoftwarePackageResult.java @@ -0,0 +1,7 @@ +package org.zstack.sdk.softwarePackage.header; + + + +public class UninstallSoftwarePackageResult { + +} diff --git a/sdk/src/main/java/org/zstack/sdk/AddBareMetal2GatewayAction.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UploadSoftwarePackageAction.java similarity index 73% rename from sdk/src/main/java/org/zstack/sdk/AddBareMetal2GatewayAction.java rename to sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UploadSoftwarePackageAction.java index 403bc4a49f..48fa2285e5 100644 --- a/sdk/src/main/java/org/zstack/sdk/AddBareMetal2GatewayAction.java +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UploadSoftwarePackageAction.java @@ -1,10 +1,10 @@ -package org.zstack.sdk; +package org.zstack.sdk.softwarePackage.header; import java.util.HashMap; import java.util.Map; import org.zstack.sdk.*; -public class AddBareMetal2GatewayAction extends AbstractAction { +public class UploadSoftwarePackageAction extends AbstractAction { private static final HashMap parameterMap = new HashMap<>(); @@ -12,7 +12,7 @@ public class AddBareMetal2GatewayAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.AddHostResult value; + public org.zstack.sdk.softwarePackage.header.UploadSoftwarePackageResult value; public Result throwExceptionIfError() { if (error != null) { @@ -26,25 +26,22 @@ public Result throwExceptionIfError() { } @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String username; + public java.lang.String name; @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String password; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, numberRange = {1L,65535L}, noTrim = false) - public int sshPort = 22; + public java.lang.String type; - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; + @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String managementNodeUuid; - @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 hostUuid; - @Param(required = true, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String managementIp; + @Param(required = true, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String url; - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String clusterUuid; + @Param(required = true, maxLength = 1024, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String installPath; @Param(required = false) public java.lang.String resourceUuid; @@ -84,8 +81,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.AddHostResult value = res.getResult(org.zstack.sdk.AddHostResult.class); - ret.value = value == null ? new org.zstack.sdk.AddHostResult() : value; + org.zstack.sdk.softwarePackage.header.UploadSoftwarePackageResult value = res.getResult(org.zstack.sdk.softwarePackage.header.UploadSoftwarePackageResult.class); + ret.value = value == null ? new org.zstack.sdk.softwarePackage.header.UploadSoftwarePackageResult() : value; return ret; } @@ -115,7 +112,7 @@ protected Map getNonAPIParameterMap() { protected RestInfo getRestInfo() { RestInfo info = new RestInfo(); info.httpMethod = "POST"; - info.path = "/baremetal2/gateways"; + info.path = "/software-packages/upload"; info.needSession = true; info.needPoll = true; info.parameterName = "params"; diff --git a/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UploadSoftwarePackageResult.java b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UploadSoftwarePackageResult.java new file mode 100644 index 0000000000..931f7c053e --- /dev/null +++ b/sdk/src/main/java/org/zstack/sdk/softwarePackage/header/UploadSoftwarePackageResult.java @@ -0,0 +1,14 @@ +package org.zstack.sdk.softwarePackage.header; + +import org.zstack.sdk.softwarePackage.header.SoftwarePackageInventory; + +public class UploadSoftwarePackageResult { + public SoftwarePackageInventory inventory; + public void setInventory(SoftwarePackageInventory inventory) { + this.inventory = inventory; + } + public SoftwarePackageInventory getInventory() { + return this.inventory; + } + +} diff --git a/sdk/src/main/java/org/zstack/sdk/AddZBoxAction.java b/sdk/src/main/java/org/zstack/sdk/zbox/AddZBoxAction.java similarity index 90% rename from sdk/src/main/java/org/zstack/sdk/AddZBoxAction.java rename to sdk/src/main/java/org/zstack/sdk/zbox/AddZBoxAction.java index 6580b1d19b..848a80fa91 100644 --- a/sdk/src/main/java/org/zstack/sdk/AddZBoxAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/AddZBoxAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class AddZBoxAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.AddZBoxResult value; + public org.zstack.sdk.zbox.AddZBoxResult value; public Result throwExceptionIfError() { if (error != null) { @@ -66,8 +66,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.AddZBoxResult value = res.getResult(org.zstack.sdk.AddZBoxResult.class); - ret.value = value == null ? new org.zstack.sdk.AddZBoxResult() : value; + org.zstack.sdk.zbox.AddZBoxResult value = res.getResult(org.zstack.sdk.zbox.AddZBoxResult.class); + ret.value = value == null ? new org.zstack.sdk.zbox.AddZBoxResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/AddZBoxResult.java b/sdk/src/main/java/org/zstack/sdk/zbox/AddZBoxResult.java similarity index 77% rename from sdk/src/main/java/org/zstack/sdk/AddZBoxResult.java rename to sdk/src/main/java/org/zstack/sdk/zbox/AddZBoxResult.java index 236be65f25..dae4c97c9c 100644 --- a/sdk/src/main/java/org/zstack/sdk/AddZBoxResult.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/AddZBoxResult.java @@ -1,6 +1,6 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; -import org.zstack.sdk.ZBoxInventory; +import org.zstack.sdk.zbox.ZBoxInventory; public class AddZBoxResult { public ZBoxInventory inventory; diff --git a/sdk/src/main/java/org/zstack/sdk/CreateZBoxBackupAction.java b/sdk/src/main/java/org/zstack/sdk/zbox/CreateZBoxBackupAction.java similarity index 99% rename from sdk/src/main/java/org/zstack/sdk/CreateZBoxBackupAction.java rename to sdk/src/main/java/org/zstack/sdk/zbox/CreateZBoxBackupAction.java index d39f208f38..9fe3511753 100644 --- a/sdk/src/main/java/org/zstack/sdk/CreateZBoxBackupAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/CreateZBoxBackupAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; import java.util.HashMap; import java.util.Map; diff --git a/sdk/src/main/java/org/zstack/sdk/EjectZBoxAction.java b/sdk/src/main/java/org/zstack/sdk/zbox/EjectZBoxAction.java similarity index 89% rename from sdk/src/main/java/org/zstack/sdk/EjectZBoxAction.java rename to sdk/src/main/java/org/zstack/sdk/zbox/EjectZBoxAction.java index 483730e0df..6a1b55e9f8 100644 --- a/sdk/src/main/java/org/zstack/sdk/EjectZBoxAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/EjectZBoxAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class EjectZBoxAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.EjectZBoxResult value; + public org.zstack.sdk.zbox.EjectZBoxResult value; public Result throwExceptionIfError() { if (error != null) { @@ -60,8 +60,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.EjectZBoxResult value = res.getResult(org.zstack.sdk.EjectZBoxResult.class); - ret.value = value == null ? new org.zstack.sdk.EjectZBoxResult() : value; + org.zstack.sdk.zbox.EjectZBoxResult value = res.getResult(org.zstack.sdk.zbox.EjectZBoxResult.class); + ret.value = value == null ? new org.zstack.sdk.zbox.EjectZBoxResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/EjectZBoxResult.java b/sdk/src/main/java/org/zstack/sdk/zbox/EjectZBoxResult.java similarity index 77% rename from sdk/src/main/java/org/zstack/sdk/EjectZBoxResult.java rename to sdk/src/main/java/org/zstack/sdk/zbox/EjectZBoxResult.java index c47a9e58fa..a8a855ccf3 100644 --- a/sdk/src/main/java/org/zstack/sdk/EjectZBoxResult.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/EjectZBoxResult.java @@ -1,6 +1,6 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; -import org.zstack.sdk.ZBoxInventory; +import org.zstack.sdk.zbox.ZBoxInventory; public class EjectZBoxResult { public ZBoxInventory inventory; diff --git a/sdk/src/main/java/org/zstack/sdk/GetZBoxBackupDetailsAction.java b/sdk/src/main/java/org/zstack/sdk/zbox/GetZBoxBackupDetailsAction.java similarity index 87% rename from sdk/src/main/java/org/zstack/sdk/GetZBoxBackupDetailsAction.java rename to sdk/src/main/java/org/zstack/sdk/zbox/GetZBoxBackupDetailsAction.java index a906667c38..6348f0b379 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetZBoxBackupDetailsAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/GetZBoxBackupDetailsAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class GetZBoxBackupDetailsAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.GetZBoxBackupDetailsResult value; + public org.zstack.sdk.zbox.GetZBoxBackupDetailsResult value; public Result throwExceptionIfError() { if (error != null) { @@ -54,8 +54,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.GetZBoxBackupDetailsResult value = res.getResult(org.zstack.sdk.GetZBoxBackupDetailsResult.class); - ret.value = value == null ? new org.zstack.sdk.GetZBoxBackupDetailsResult() : value; + org.zstack.sdk.zbox.GetZBoxBackupDetailsResult value = res.getResult(org.zstack.sdk.zbox.GetZBoxBackupDetailsResult.class); + ret.value = value == null ? new org.zstack.sdk.zbox.GetZBoxBackupDetailsResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/GetZBoxBackupDetailsResult.java b/sdk/src/main/java/org/zstack/sdk/zbox/GetZBoxBackupDetailsResult.java similarity index 62% rename from sdk/src/main/java/org/zstack/sdk/GetZBoxBackupDetailsResult.java rename to sdk/src/main/java/org/zstack/sdk/zbox/GetZBoxBackupDetailsResult.java index 9a63e878ff..06af916507 100644 --- a/sdk/src/main/java/org/zstack/sdk/GetZBoxBackupDetailsResult.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/GetZBoxBackupDetailsResult.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; diff --git a/sdk/src/main/java/org/zstack/sdk/QueryZBoxAction.java b/sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxAction.java similarity index 86% rename from sdk/src/main/java/org/zstack/sdk/QueryZBoxAction.java rename to sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxAction.java index ffe296337d..05b0fe3230 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryZBoxAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class QueryZBoxAction extends QueryAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.QueryZBoxResult value; + public org.zstack.sdk.zbox.QueryZBoxResult value; public Result throwExceptionIfError() { if (error != null) { @@ -34,8 +34,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.QueryZBoxResult value = res.getResult(org.zstack.sdk.QueryZBoxResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryZBoxResult() : value; + org.zstack.sdk.zbox.QueryZBoxResult value = res.getResult(org.zstack.sdk.zbox.QueryZBoxResult.class); + ret.value = value == null ? new org.zstack.sdk.zbox.QueryZBoxResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/QueryZBoxBackupAction.java b/sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxBackupAction.java similarity index 85% rename from sdk/src/main/java/org/zstack/sdk/QueryZBoxBackupAction.java rename to sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxBackupAction.java index ccbb624b57..1500d31d86 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryZBoxBackupAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxBackupAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class QueryZBoxBackupAction extends QueryAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.QueryZBoxBackupResult value; + public org.zstack.sdk.zbox.QueryZBoxBackupResult value; public Result throwExceptionIfError() { if (error != null) { @@ -34,8 +34,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.QueryZBoxBackupResult value = res.getResult(org.zstack.sdk.QueryZBoxBackupResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryZBoxBackupResult() : value; + org.zstack.sdk.zbox.QueryZBoxBackupResult value = res.getResult(org.zstack.sdk.zbox.QueryZBoxBackupResult.class); + ret.value = value == null ? new org.zstack.sdk.zbox.QueryZBoxBackupResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/QueryZBoxBackupResult.java b/sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxBackupResult.java similarity index 94% rename from sdk/src/main/java/org/zstack/sdk/QueryZBoxBackupResult.java rename to sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxBackupResult.java index 5f411adca0..aa8e7ffc43 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryZBoxBackupResult.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxBackupResult.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; diff --git a/sdk/src/main/java/org/zstack/sdk/QueryZBoxResult.java b/sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxResult.java similarity index 94% rename from sdk/src/main/java/org/zstack/sdk/QueryZBoxResult.java rename to sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxResult.java index c91dc483be..2c9823dcf2 100644 --- a/sdk/src/main/java/org/zstack/sdk/QueryZBoxResult.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/QueryZBoxResult.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; diff --git a/sdk/src/main/java/org/zstack/sdk/SyncZBoxCapacityAction.java b/sdk/src/main/java/org/zstack/sdk/zbox/SyncZBoxCapacityAction.java similarity index 88% rename from sdk/src/main/java/org/zstack/sdk/SyncZBoxCapacityAction.java rename to sdk/src/main/java/org/zstack/sdk/zbox/SyncZBoxCapacityAction.java index ff83029615..88fc81da90 100644 --- a/sdk/src/main/java/org/zstack/sdk/SyncZBoxCapacityAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/SyncZBoxCapacityAction.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; import java.util.HashMap; import java.util.Map; @@ -12,7 +12,7 @@ public class SyncZBoxCapacityAction extends AbstractAction { public static class Result { public ErrorCode error; - public org.zstack.sdk.SyncZBoxCapacityResult value; + public org.zstack.sdk.zbox.SyncZBoxCapacityResult value; public Result throwExceptionIfError() { if (error != null) { @@ -60,8 +60,8 @@ private Result makeResult(ApiResult res) { return ret; } - org.zstack.sdk.SyncZBoxCapacityResult value = res.getResult(org.zstack.sdk.SyncZBoxCapacityResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncZBoxCapacityResult() : value; + org.zstack.sdk.zbox.SyncZBoxCapacityResult value = res.getResult(org.zstack.sdk.zbox.SyncZBoxCapacityResult.class); + ret.value = value == null ? new org.zstack.sdk.zbox.SyncZBoxCapacityResult() : value; return ret; } diff --git a/sdk/src/main/java/org/zstack/sdk/SyncZBoxCapacityResult.java b/sdk/src/main/java/org/zstack/sdk/zbox/SyncZBoxCapacityResult.java similarity index 78% rename from sdk/src/main/java/org/zstack/sdk/SyncZBoxCapacityResult.java rename to sdk/src/main/java/org/zstack/sdk/zbox/SyncZBoxCapacityResult.java index e9687bcace..ba9d08f812 100644 --- a/sdk/src/main/java/org/zstack/sdk/SyncZBoxCapacityResult.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/SyncZBoxCapacityResult.java @@ -1,6 +1,6 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; -import org.zstack.sdk.ZBoxInventory; +import org.zstack.sdk.zbox.ZBoxInventory; public class SyncZBoxCapacityResult { public ZBoxInventory inventory; diff --git a/sdk/src/main/java/org/zstack/sdk/ZBoxBackupInventory.java b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxBackupInventory.java similarity index 91% rename from sdk/src/main/java/org/zstack/sdk/ZBoxBackupInventory.java rename to sdk/src/main/java/org/zstack/sdk/zbox/ZBoxBackupInventory.java index 96b18ef8a5..f46c0932be 100644 --- a/sdk/src/main/java/org/zstack/sdk/ZBoxBackupInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxBackupInventory.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; diff --git a/sdk/src/main/java/org/zstack/sdk/ZBoxBackupStorageBackupInfo.java b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxBackupStorageBackupInfo.java similarity index 78% rename from sdk/src/main/java/org/zstack/sdk/ZBoxBackupStorageBackupInfo.java rename to sdk/src/main/java/org/zstack/sdk/zbox/ZBoxBackupStorageBackupInfo.java index 55131a5340..42e4cc7f3e 100644 --- a/sdk/src/main/java/org/zstack/sdk/ZBoxBackupStorageBackupInfo.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxBackupStorageBackupInfo.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; diff --git a/sdk/src/main/java/org/zstack/sdk/ZBoxInventory.java b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxInventory.java similarity index 95% rename from sdk/src/main/java/org/zstack/sdk/ZBoxInventory.java rename to sdk/src/main/java/org/zstack/sdk/zbox/ZBoxInventory.java index 62de9cd911..506cbb52fe 100644 --- a/sdk/src/main/java/org/zstack/sdk/ZBoxInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxInventory.java @@ -1,7 +1,7 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; -import org.zstack.sdk.ZBoxState; -import org.zstack.sdk.ZBoxStatus; +import org.zstack.sdk.zbox.ZBoxState; +import org.zstack.sdk.zbox.ZBoxStatus; public class ZBoxInventory { diff --git a/sdk/src/main/java/org/zstack/sdk/ZBoxLocationRefInventory.java b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxLocationRefInventory.java similarity index 96% rename from sdk/src/main/java/org/zstack/sdk/ZBoxLocationRefInventory.java rename to sdk/src/main/java/org/zstack/sdk/zbox/ZBoxLocationRefInventory.java index d68528c2c4..bc83fb8dff 100644 --- a/sdk/src/main/java/org/zstack/sdk/ZBoxLocationRefInventory.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxLocationRefInventory.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; diff --git a/sdk/src/main/java/org/zstack/sdk/ZBoxState.java b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxState.java similarity index 65% rename from sdk/src/main/java/org/zstack/sdk/ZBoxState.java rename to sdk/src/main/java/org/zstack/sdk/zbox/ZBoxState.java index b3878ee86e..76d953fe19 100644 --- a/sdk/src/main/java/org/zstack/sdk/ZBoxState.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxState.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; public enum ZBoxState { Enabled, diff --git a/sdk/src/main/java/org/zstack/sdk/ZBoxStatus.java b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxStatus.java similarity index 68% rename from sdk/src/main/java/org/zstack/sdk/ZBoxStatus.java rename to sdk/src/main/java/org/zstack/sdk/zbox/ZBoxStatus.java index 74b0929249..0e57dc21ae 100644 --- a/sdk/src/main/java/org/zstack/sdk/ZBoxStatus.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxStatus.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; public enum ZBoxStatus { Ready, diff --git a/sdk/src/main/java/org/zstack/sdk/ZBoxVmBackupInfo.java b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxVmBackupInfo.java similarity index 74% rename from sdk/src/main/java/org/zstack/sdk/ZBoxVmBackupInfo.java rename to sdk/src/main/java/org/zstack/sdk/zbox/ZBoxVmBackupInfo.java index b3a146ed42..2ce2628064 100644 --- a/sdk/src/main/java/org/zstack/sdk/ZBoxVmBackupInfo.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxVmBackupInfo.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; diff --git a/sdk/src/main/java/org/zstack/sdk/ZBoxVolumeBackupInfo.java b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxVolumeBackupInfo.java similarity index 75% rename from sdk/src/main/java/org/zstack/sdk/ZBoxVolumeBackupInfo.java rename to sdk/src/main/java/org/zstack/sdk/zbox/ZBoxVolumeBackupInfo.java index 6fd58e6e45..3728820d01 100644 --- a/sdk/src/main/java/org/zstack/sdk/ZBoxVolumeBackupInfo.java +++ b/sdk/src/main/java/org/zstack/sdk/zbox/ZBoxVolumeBackupInfo.java @@ -1,4 +1,4 @@ -package org.zstack.sdk; +package org.zstack.sdk.zbox; diff --git a/sdk/src/main/java/org/zstack/sdk/zcex/api/UpdateZceXClusterConfigAction.java b/sdk/src/main/java/org/zstack/sdk/zcex/api/UpdateZceXClusterConfigAction.java index 3011d3248a..ffbd4b6458 100644 --- a/sdk/src/main/java/org/zstack/sdk/zcex/api/UpdateZceXClusterConfigAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zcex/api/UpdateZceXClusterConfigAction.java @@ -28,6 +28,9 @@ public Result throwExceptionIfError() { @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String uuid; + @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String softwarePackageUuid; + @Param(required = false, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String managementIp; diff --git a/sdk/src/main/java/org/zstack/sdk/zstone/api/UpdateZStoneClusterConfigAction.java b/sdk/src/main/java/org/zstack/sdk/zstone/api/UpdateZStoneClusterConfigAction.java index 217437d4f8..340ead5c63 100644 --- a/sdk/src/main/java/org/zstack/sdk/zstone/api/UpdateZStoneClusterConfigAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zstone/api/UpdateZStoneClusterConfigAction.java @@ -28,6 +28,9 @@ public Result throwExceptionIfError() { @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.lang.String uuid; + @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.lang.String softwarePackageUuid; + @Param(required = true, maxLength = 128, nonempty = false, nullElements = false, emptyString = false, noTrim = false) public java.lang.String clusterName; diff --git a/sdk/src/main/java/org/zstack/sdk/zsv/storage/api/CheckCephPluginAction.java b/sdk/src/main/java/org/zstack/sdk/zsv/storage/api/CheckCephPluginAction.java index 5b7e4fca76..61418b214b 100644 --- a/sdk/src/main/java/org/zstack/sdk/zsv/storage/api/CheckCephPluginAction.java +++ b/sdk/src/main/java/org/zstack/sdk/zsv/storage/api/CheckCephPluginAction.java @@ -31,9 +31,13 @@ public Result throwExceptionIfError() { @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.util.List hostUuidList; + @Deprecated @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) public java.util.List ipList; + @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) + public java.util.List externalHosts; + @Param(required = false) public java.util.List systemTags; diff --git a/storage/src/main/java/org/zstack/storage/addon/primary/ExternalPrimaryStorageFactory.java b/storage/src/main/java/org/zstack/storage/addon/primary/ExternalPrimaryStorageFactory.java index 11a8225e2d..2505811250 100644 --- a/storage/src/main/java/org/zstack/storage/addon/primary/ExternalPrimaryStorageFactory.java +++ b/storage/src/main/java/org/zstack/storage/addon/primary/ExternalPrimaryStorageFactory.java @@ -21,7 +21,9 @@ import org.zstack.header.errorcode.OperationFailureException; import org.zstack.header.exception.CloudRuntimeException; import org.zstack.header.host.HostInventory; +import org.zstack.header.host.HostResizeVolumeExtensionPoint; import org.zstack.header.host.HostVO; +import org.zstack.header.host.HostResizeVolumeStruct; import org.zstack.header.managementnode.ManagementNodeChangeListener; import org.zstack.header.managementnode.ManagementNodeInventory; import org.zstack.header.message.AbstractBeforeDeliveryMessageInterceptor; @@ -55,7 +57,7 @@ public class ExternalPrimaryStorageFactory implements PrimaryStorageFactory, Com PreVmInstantiateResourceExtensionPoint, VmReleaseResourceExtensionPoint, VmAttachVolumeExtensionPoint, VmDetachVolumeExtensionPoint, BeforeTakeLiveSnapshotsOnVolumes, CreateTemplateFromVolumeSnapshotExtensionPoint, MarkRootVolumeAsSnapshotExtension, VmInstanceMigrateExtensionPoint, - ManagementNodeChangeListener, PrimaryStorageFeatureAllocatorExtensionPoint { + ManagementNodeChangeListener, PrimaryStorageFeatureAllocatorExtensionPoint, HostResizeVolumeExtensionPoint { private static final CLogger logger = Utils.getLogger(ExternalBackupStorageFactory.class); public static PrimaryStorageType type = new PrimaryStorageType(PrimaryStorageConstant.EXTERNAL_PRIMARY_STORAGE_TYPE); @@ -535,6 +537,7 @@ public void beforeTakeLiveSnapshotsOnVolumes(CreateVolumesSnapshotOverlayInnerMs logger.info(String.format("take snapshots for volumes[%s] on %s", msg.getLockedVolumeUuids(), getClass().getCanonicalName())); + List inventories = Collections.synchronizedList(new ArrayList<>()); ErrorCodeList errList = new ErrorCodeList(); new While<>(storageSnapshots).all((struct, whileCompletion) -> { VolumeSnapshotVO vo = Q.New(VolumeSnapshotVO.class).eq(VolumeSnapshotVO_.uuid, struct.getResourceUuid()).find(); @@ -572,6 +575,7 @@ public void run(MessageReply reply) { dbf.update(vo); struct.getVolumeSnapshotStruct().setCurrent(treply.getInventory()); + inventories.add(treply.getInventory()); whileCompletion.done(); } }); @@ -580,6 +584,18 @@ public void run(MessageReply reply) { public void done(ErrorCodeList errorCodeList) { if (!errList.getCauses().isEmpty()) { completion.fail(errList.getCauses().get(0)); + + inventories.forEach(snapshot -> { + VolumeSnapshotDeletionMsg msg = new VolumeSnapshotDeletionMsg(); + msg.setSnapshotUuid(snapshot.getUuid()); + msg.setTreeUuid(snapshot.getTreeUuid()); + msg.setVolumeUuid(snapshot.getVolumeUuid()); + msg.setScope(DeleteVolumeSnapshotScope.Single.toString()); + msg.setDirection(DeleteVolumeSnapshotDirection.Commit.toString()); + bus.makeTargetServiceIdByResourceUuid(msg, VolumeSnapshotConstant.SERVICE_ID, snapshot.getUuid()); + bus.send(msg); + }); + return; } completion.success(); @@ -969,4 +985,14 @@ public List allocatePrimaryStorage(Set return candidates; } + + public HostResizeVolumeStruct beforeKvmHostResizeVolume(HostResizeVolumeStruct struct, VolumeInventory vol, String hostUuid) { + PrimaryStorageControllerSvc controller = controllers.get(vol.getPrimaryStorageUuid()); + if (controller == null) { + return struct; + } + + struct.setSize(controller.alignSize(struct.getSize())); + return struct; + } } diff --git a/storage/src/main/java/org/zstack/storage/primary/PrimaryStorageBase.java b/storage/src/main/java/org/zstack/storage/primary/PrimaryStorageBase.java index 7a86ad546b..c56a0c9ba1 100755 --- a/storage/src/main/java/org/zstack/storage/primary/PrimaryStorageBase.java +++ b/storage/src/main/java/org/zstack/storage/primary/PrimaryStorageBase.java @@ -761,6 +761,7 @@ public void run(MessageReply reply) { r2.getVolume().getInstallPath(), msg.getBackupStorageRef().getInstallPath()) ); + r.setProtocol(r2.getVolume().getProtocol()); } bus.reply(msg, r); } diff --git a/storage/src/main/java/org/zstack/storage/primary/PrimaryStorageManagerImpl.java b/storage/src/main/java/org/zstack/storage/primary/PrimaryStorageManagerImpl.java index c4c09e16a2..a84ed42f7b 100755 --- a/storage/src/main/java/org/zstack/storage/primary/PrimaryStorageManagerImpl.java +++ b/storage/src/main/java/org/zstack/storage/primary/PrimaryStorageManagerImpl.java @@ -72,6 +72,7 @@ import java.util.stream.Collectors; import static org.zstack.core.Platform.*; +import static org.zstack.utils.CollectionUtils.isEmpty; import static org.zstack.utils.CollectionUtils.transformAndRemoveNull; public class PrimaryStorageManagerImpl extends AbstractService implements PrimaryStorageManager, @@ -1369,11 +1370,11 @@ private void settingRootVolume(CreateVmInstanceMsg msg) { } private void settingDataVolume(CreateVmInstanceMsg msg) { - if (msg.getDataDiskOfferingUuids() == null || msg.getDataDiskOfferingUuids().isEmpty()) { + if (isEmpty(msg.getDeprecatedDataVolumeSpecs())) { return; } - String diskOffering = msg.getDataDiskOfferingUuids().get(0); + String diskOffering = msg.getDeprecatedDataVolumeSpecs().get(0).getDiskOfferingUuid(); if (diskOffering == null || !DiskOfferingSystemTags.DISK_OFFERING_USER_CONFIG.hasTag(diskOffering)) { return; } diff --git a/storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotApiInterceptor.java b/storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotApiInterceptor.java index 1da009fc2d..9f7945d30f 100755 --- a/storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotApiInterceptor.java +++ b/storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotApiInterceptor.java @@ -31,6 +31,7 @@ import javax.persistence.Tuple; import java.util.Arrays; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; @@ -74,6 +75,8 @@ public APIMessage intercept(APIMessage msg) throws ApiMessageInterceptionExcepti validate((APIBatchDeleteVolumeSnapshotMsg) msg); } else if (msg instanceof APIRevertVmFromSnapshotGroupMsg) { validate((APIRevertVmFromSnapshotGroupMsg) msg); + } else if (msg instanceof APIDeleteVolumeSnapshotGroupMsg) { + validate((APIDeleteVolumeSnapshotGroupMsg) msg); } setServiceId(msg); @@ -217,4 +220,29 @@ private void validate(APIBatchDeleteVolumeSnapshotMsg msg) { throw new ApiMessageInterceptionException(operr("can not find volume uuid for snapshosts[uuid: %s]", msg.getUuids())); } } + + private void validate(APIDeleteVolumeSnapshotGroupMsg msg) { + VolumeSnapshotGroupVO groupVO = dbf.findByUuid(msg.getUuid(), VolumeSnapshotGroupVO.class); + // 获取当前虚拟机所有内存快照 + // 检测内存快照是否完整 + // 1 完整 允许删除 + // 2 不完整 不允许删除 + List groups = Q.New(VolumeSnapshotGroupVO.class) + .eq(VolumeSnapshotGroupVO_.vmInstanceUuid, groupVO.getVmInstanceUuid()) + .orderByAsc(VolumeSnapshotGroupVO_.createDate) + .list(); + + final String[] ungroupUuid = new String[1]; + groups.forEach(group -> { + Set volumeSnapshotRefs = group.getVolumeSnapshotRefs(); + volumeSnapshotRefs.forEach(ref -> { + if (ref.isSnapshotDeleted()) { + ungroupUuid[0] = group.getUuid(); + } + }); + }); + if (ungroupUuid[0] != null) { + throw new ApiMessageInterceptionException(argerr("volume snapshot group[uuid:%s] is not complete, cannot delete volume snapshot group", ungroupUuid[0])); + } + } } diff --git a/storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotTreeBase.java b/storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotTreeBase.java index b75126f03f..106db983d7 100755 --- a/storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotTreeBase.java +++ b/storage/src/main/java/org/zstack/storage/snapshot/VolumeSnapshotTreeBase.java @@ -2088,21 +2088,37 @@ private void ungroupAfterDeleted(List snapshots) { List uuids = snapshots.stream().map(VolumeSnapshotInventory::getUuid).collect(Collectors.toList()); SQL.New(VolumeSnapshotGroupRefVO.class).in(VolumeSnapshotGroupRefVO_.volumeSnapshotUuid, uuids) .set(VolumeSnapshotGroupRefVO_.snapshotDeleted, true).update(); - if (currentRoot.getVolumeType().equals(VolumeType.Root.toString())) { - List groupUuids = new ArrayList<>(); - for (VolumeSnapshotInventory snapshot : snapshots) { - String groupUuid = snapshot.getGroupUuid(); - if (groupUuid != null) { - logger.debug(String.format("root volume snapshot[uuid:%s, name:%s] has been deleted, " + - "ungroup snapshot group[uuid:%s]", snapshot.getUuid(), snapshot.getName(), groupUuid)); - groupUuids.add(groupUuid); - } - } + List groupUuids = snapshots.stream().map(VolumeSnapshotInventory::getGroupUuid).filter(Objects::nonNull).collect(Collectors.toList()); + if (groupUuids.isEmpty()) { + return; + } + + List groupVOs = Q.New(VolumeSnapshotGroupVO.class).in(VolumeSnapshotGroupVO_.uuid, groupUuids).list(); + groupVOs.forEach(groupVO -> { + new RunInQueue(String.format("ungroup-volumeSnapshotGroup-%s", groupVO.getUuid()), thdf, 1) + .name("ungroup-volumeSnapshotGroup-in-queue").asyncBackup(null) + .run(chain -> ungroupAfterDeleted(groupVO, new NoErrorCompletion(chain) { + @Override + public void done() { + chain.next(); + } + }) + ); + }); + } - groupUuids.forEach(groupUuid -> vidm.deleteArchiveVmInstanceResourceMetadataGroup(groupUuid)); - dbf.removeByPrimaryKeys(groupUuids, VolumeSnapshotGroupVO.class); + private void ungroupAfterDeleted(VolumeSnapshotGroupVO groupVO, NoErrorCompletion completion) { + if (!groupVO.getVolumeSnapshotRefs().stream().allMatch(VolumeSnapshotGroupRefVO::isSnapshotDeleted)) { + logger.debug(String.format("skipping ungroup operation for snapshot group[uuid:%s]: " + + "no group meet deletion criteria (due to remaining volume snapshots).", groupVO.getUuid())); + completion.done(); + return; } + logger.debug(String.format("snapshot group[uuid:%s] all volume snapshot has been deleted, delete snapshot group", groupVO.getUuid())); + vidm.deleteArchiveVmInstanceResourceMetadataGroup(groupVO.getUuid()); + dbf.removeByPrimaryKey(groupVO.getUuid(), VolumeSnapshotGroupVO.class); + completion.done(); } private List makeVolumeSnapshotBackupStorageDeletionMsg(List bsUuids) { diff --git a/storage/src/main/java/org/zstack/storage/volume/InstantiateVolumeForNewCreatedVmExtension.java b/storage/src/main/java/org/zstack/storage/volume/InstantiateVolumeForNewCreatedVmExtension.java index 926063df1e..dc5409936b 100755 --- a/storage/src/main/java/org/zstack/storage/volume/InstantiateVolumeForNewCreatedVmExtension.java +++ b/storage/src/main/java/org/zstack/storage/volume/InstantiateVolumeForNewCreatedVmExtension.java @@ -201,16 +201,29 @@ public void preInstantiateVmResource(VmInstanceSpec spec, Completion completion) recovering = image.getSelectedBackupStorage().getInstallPath().startsWith("nbd://"); } catch (NullPointerException ignored) { } + + LinkedHashSet systemTags = new LinkedHashSet<>(); + if (spec.getRootVolumeSystemTags() != null) { + systemTags.addAll(spec.getRootVolumeSystemTags()); + } + if (spec.getRootDisk().getSystemTags() != null) { + systemTags.addAll(spec.getRootDisk().getSystemTags()); + } + if (recovering) { InstantiateVolumeMsg cmsg = fillMsg(new InstantiateRootVolumeForRecoveryMsg(), spec.getDestRootVolume(), spec); ((InstantiateRootVolumeForRecoveryMsg) cmsg).setSelectedBackupStorage(image.getSelectedBackupStorage()); + cmsg.setSystemTags(new ArrayList<>(systemTags)); msgs.add(cmsg); } else if (image.getInventory() != null && ImageMediaType.RootVolumeTemplate.toString().equals(image.getInventory().getMediaType())) { InstantiateVolumeMsg rmsg = fillMsg(new InstantiateRootVolumeMsg(), spec.getDestRootVolume(), spec); ((InstantiateRootVolumeMsg) rmsg).setTemplateSpec(image); + rmsg.setSystemTags(new ArrayList<>(systemTags)); msgs.add(rmsg); } else { - msgs.add(fillMsg(new InstantiateVolumeMsg(), spec.getDestRootVolume(), spec)); + InstantiateVolumeMsg rmsg = fillMsg(new InstantiateVolumeMsg(), spec.getDestRootVolume(), spec); + rmsg.setSystemTags(new ArrayList<>(systemTags)); + msgs.add(rmsg); } if (spec.getDataVolumeTemplateUuids() != null) { diff --git a/storage/src/main/java/org/zstack/storage/volume/VolumeBase.java b/storage/src/main/java/org/zstack/storage/volume/VolumeBase.java index 08a303c739..1b44b7ef5e 100755 --- a/storage/src/main/java/org/zstack/storage/volume/VolumeBase.java +++ b/storage/src/main/java/org/zstack/storage/volume/VolumeBase.java @@ -50,8 +50,8 @@ import org.zstack.storage.primary.EstimateVolumeTemplateSizeOnPrimaryStorageMsg; import org.zstack.storage.primary.EstimateVolumeTemplateSizeOnPrimaryStorageReply; import org.zstack.storage.primary.PrimaryStorageGlobalConfig; -import org.zstack.storage.snapshot.reference.VolumeSnapshotReferenceUtils; import org.zstack.storage.snapshot.group.VolumeSnapshotGroupOperationValidator; +import org.zstack.storage.snapshot.reference.VolumeSnapshotReferenceUtils; import org.zstack.tag.SystemTagCreator; import org.zstack.tag.TagManager; import org.zstack.utils.CollectionUtils; @@ -59,6 +59,7 @@ import org.zstack.utils.Utils; import org.zstack.utils.function.ForEachFunction; import org.zstack.utils.logging.CLogger; +import org.zstack.utils.path.PathUtil; import javax.persistence.TypedQuery; import java.util.*; @@ -1225,6 +1226,7 @@ public void run(MessageReply reply) { if (deletionPolicy == VolumeDeletionPolicy.Direct) { flow(new NoRollbackFlow() { + final List allowedStatuses = Arrays.asList(VolumeStatus.Ready, VolumeStatus.Migrating); String __name__ = "delete-volume-from-primary-storage"; @Override @@ -1235,8 +1237,11 @@ public boolean skip(Map data) { @Override public void run(final FlowTrigger trigger, Map data) { - if (self.getStatus() == VolumeStatus.Ready && - self.getPrimaryStorageUuid() != null) { + if (allowedStatuses.contains(self.getStatus()) && self.getPrimaryStorageUuid() != null) { + if (self.getStatus() == VolumeStatus.Migrating) { + self.setInstallPath(PathUtil.normalizePathWithoutQuery(self.getInstallPath())); + } + DeleteVolumeOnPrimaryStorageMsg dmsg = new DeleteVolumeOnPrimaryStorageMsg(); dmsg.setVolume(getSelfInventory()); dmsg.setUuid(self.getPrimaryStorageUuid()); diff --git a/storage/src/main/java/org/zstack/storage/volume/VolumeSystemTags.java b/storage/src/main/java/org/zstack/storage/volume/VolumeSystemTags.java index 1cbd13ff46..996dfec92b 100644 --- a/storage/src/main/java/org/zstack/storage/volume/VolumeSystemTags.java +++ b/storage/src/main/java/org/zstack/storage/volume/VolumeSystemTags.java @@ -3,17 +3,16 @@ import org.zstack.header.core.NonCloneable; import org.zstack.header.storage.primary.PrimaryStorageVO; import org.zstack.header.tag.TagDefinition; -import org.zstack.header.vm.VmInstanceVO; import org.zstack.header.volume.VolumeVO; -import org.zstack.tag.EphemeralSystemTag; import org.zstack.tag.PatternedSystemTag; +import org.zstack.tag.SystemTag; /** * Created by miao on 12/23/16. */ @TagDefinition public class VolumeSystemTags { - public static EphemeralSystemTag SHAREABLE = new EphemeralSystemTag("shareable"); + public static SystemTag SHAREABLE = SystemTag.makeEphemeralTag("shareable"); public static String VOLUME_MAX_INCREMENTAL_SNAPSHOT_NUM_TOKEN = "volumeSnapshotMaxNum"; public static PatternedSystemTag VOLUME_MAX_INCREMENTAL_SNAPSHOT_NUM = new PatternedSystemTag(String.format("volumeMaxIncrementalSnapshotNum::{%s}", VOLUME_MAX_INCREMENTAL_SNAPSHOT_NUM_TOKEN), VolumeVO.class); @@ -37,16 +36,16 @@ public class VolumeSystemTags { public static PatternedSystemTag PACKER_BUILD = new PatternedSystemTag("packer", VolumeVO.class); @NonCloneable - public static EphemeralSystemTag FAST_CREATE = new EphemeralSystemTag("volume::fastCreate"); + public static SystemTag FAST_CREATE = SystemTag.makeEphemeralTag("volume::fastCreate"); @NonCloneable - public static EphemeralSystemTag FLATTEN = new EphemeralSystemTag("volume::flatten"); + public static SystemTag FLATTEN = SystemTag.makeEphemeralTag("volume::flatten"); @NonCloneable - public static EphemeralSystemTag FORMAT_QCOW2 = new EphemeralSystemTag("volume::format::qcow2"); + public static SystemTag FORMAT_QCOW2 = SystemTag.makeEphemeralTag("volume::format::qcow2"); @NonCloneable - public static EphemeralSystemTag NO_ZERO_FILLED_VOLUME = new EphemeralSystemTag("volume::noZeroFilled"); + public static SystemTag NO_ZERO_FILLED_VOLUME = SystemTag.makeEphemeralTag("volume::noZeroFilled"); public static String VOLUME_QOS_TOKEN = "qos"; public static PatternedSystemTag VOLUME_QOS = new PatternedSystemTag(String.format("%s::{%s}", VOLUME_QOS_TOKEN, VOLUME_QOS_TOKEN), VolumeVO.class); diff --git a/tag/src/main/java/org/zstack/tag/EphemeralSystemTag.java b/tag/src/main/java/org/zstack/tag/EphemeralSystemTag.java deleted file mode 100755 index f013d96d12..0000000000 --- a/tag/src/main/java/org/zstack/tag/EphemeralSystemTag.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.zstack.tag; - -import org.zstack.header.tag.SystemTagVO; -import org.zstack.header.tag.TagConstant; - -/** - * Created by xing5 on 2016/11/19. - */ -public class EphemeralSystemTag extends SystemTag { - public EphemeralSystemTag(String tagFormat) { - super(String.format("%s::%s", TagConstant.EPHEMERAL_TAG_PREFIX, tagFormat), SystemTagVO.class); - } -} diff --git a/tag/src/main/java/org/zstack/tag/PatternedSystemTag.java b/tag/src/main/java/org/zstack/tag/PatternedSystemTag.java index 275bfcff3a..c252489b08 100755 --- a/tag/src/main/java/org/zstack/tag/PatternedSystemTag.java +++ b/tag/src/main/java/org/zstack/tag/PatternedSystemTag.java @@ -7,6 +7,7 @@ import org.zstack.header.tag.SystemTagInventory; import org.zstack.header.tag.SystemTagVO; import org.zstack.header.tag.SystemTagVO_; +import org.zstack.header.tag.TagConstant; import org.zstack.utils.TagUtils; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; @@ -28,6 +29,13 @@ public PatternedSystemTag(String tagFormat, Class resourceClass) { super(tagFormat, resourceClass); } + public static PatternedSystemTag makeEphemeralTag(String tagFormatWithoutPrefix) { + String tagFormat = String.format("%s::%s", TagConstant.EPHEMERAL_TAG_PREFIX, tagFormatWithoutPrefix); + PatternedSystemTag tag = new PatternedSystemTag(tagFormat, SystemTagVO.class); + tag.markAsEphemeral(); + return tag; + } + @Override protected String useTagFormat() { return TagUtils.tagPatternToSqlPattern(tagFormat); diff --git a/tag/src/main/java/org/zstack/tag/ResourceConfigSystemTag.java b/tag/src/main/java/org/zstack/tag/ResourceConfigSystemTag.java index 89606cd66d..51adc0eeda 100644 --- a/tag/src/main/java/org/zstack/tag/ResourceConfigSystemTag.java +++ b/tag/src/main/java/org/zstack/tag/ResourceConfigSystemTag.java @@ -23,6 +23,7 @@ public ResourceConfigSystemTag() { TagConstant.RESOURCE_CONFIG_CATEGORY_TOKEN, TagConstant.RESOURCE_CONFIG_NAME_TOKEN, TagConstant.RESOURCE_CONFIG_VALUE_TOKEN), SystemTagVO.class); + this.markAsEphemeral(); } @Override diff --git a/tag/src/main/java/org/zstack/tag/SystemTag.java b/tag/src/main/java/org/zstack/tag/SystemTag.java index 9a660b8c23..54a85f9bb4 100755 --- a/tag/src/main/java/org/zstack/tag/SystemTag.java +++ b/tag/src/main/java/org/zstack/tag/SystemTag.java @@ -2,7 +2,6 @@ import java.sql.SQLIntegrityConstraintViolationException; import org.hibernate.TransactionException; -import org.hibernate.exception.ConstraintViolationException; import org.springframework.beans.factory.annotation.Autowire; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Configurable; @@ -15,13 +14,13 @@ import org.zstack.core.db.Q; import org.zstack.core.db.SimpleQuery; import org.zstack.core.db.SimpleQuery.Op; +import org.zstack.header.errorcode.OperationFailureException; import org.zstack.header.exception.CloudRuntimeException; import org.zstack.header.tag.*; import org.zstack.utils.DebugUtils; import org.zstack.utils.ExceptionDSL; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; -import org.zstack.utils.network.NetworkUtils; import javax.persistence.PersistenceException; import javax.persistence.Tuple; @@ -29,6 +28,7 @@ import java.util.*; import static java.util.Arrays.asList; +import static org.zstack.core.Platform.inerr; @Configurable(preConstruction = true, autowire = Autowire.BY_TYPE) public class SystemTag { @@ -46,11 +46,21 @@ public class SystemTag { protected List lifeCycleListeners = new ArrayList<>(); protected List judgers = new ArrayList<>(); + private boolean ephemeral = false; + private boolean adminOnly = false; + private boolean cloneable = true; + private boolean sensitive = false; + public SystemTag(String tagFormat, Class resourceClass) { this.tagFormat = tagFormat; this.resourceClass = resourceClass; } + public static SystemTag makeEphemeralTag(String tagScript) { + String tagFormat = String.format("%s::%s", TagConstant.EPHEMERAL_TAG_PREFIX, tagScript); + return new SystemTag(tagFormat, SystemTagVO.class).markAsEphemeral(); + } + public enum SystemTagOperation { CREATE, UPDATE, @@ -244,6 +254,12 @@ public String instantiateTag(Map tokens) { } public SystemTagCreator newSystemTagCreator(String resUuid) { + if (ephemeral) { + throw new OperationFailureException(inerr("ephemeral tag cannot be persisted") + .withOpaque("resource.uuid", resUuid) + .withOpaque("tag.format", tagFormat)); + } + SystemTag self = this; return new SystemTagCreator() { @@ -461,4 +477,40 @@ public List getValidators() { public void setValidators(List validators) { this.validators = validators; } + + public SystemTag markAsEphemeral() { + this.ephemeral = true; + return this; + } + + public SystemTag markAsAdminOnly() { + this.adminOnly = true; + return this; + } + + public SystemTag disableClone() { + this.cloneable = false; + return this; + } + + public SystemTag markAsSensitive() { + this.sensitive = true; + return this; + } + + public boolean isEphemeral() { + return ephemeral; + } + + public boolean isAdminOnly() { + return adminOnly; + } + + public boolean isCloneable() { + return cloneable; + } + + public boolean isSensitive() { + return sensitive; + } } diff --git a/tag/src/main/java/org/zstack/tag/TagManagerImpl.java b/tag/src/main/java/org/zstack/tag/TagManagerImpl.java index e7c8a49e3c..3772fc7d11 100755 --- a/tag/src/main/java/org/zstack/tag/TagManagerImpl.java +++ b/tag/src/main/java/org/zstack/tag/TagManagerImpl.java @@ -1,6 +1,7 @@ package org.zstack.tag; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.lang.NonNull; import org.springframework.transaction.annotation.Transactional; import org.zstack.core.Platform; import org.zstack.core.cloudbus.CloudBus; @@ -41,6 +42,7 @@ import static org.zstack.core.Platform.*; import static org.zstack.utils.CollectionDSL.list; +import static org.zstack.utils.CollectionUtils.isEmpty; import static org.zstack.utils.CollectionUtils.removeDuplicateFromList; import static org.zstack.utils.CollectionUtils.transformAndRemoveNull; @@ -60,10 +62,13 @@ public class TagManagerImpl extends AbstractService implements TagManager, @Autowired private PluginRegistry pluginRgty; - private List systemTags = new ArrayList<>(); - private List adminOnlySystemTags = new ArrayList<>(); - private List sensitiveTags = new ArrayList<>(); - private List nonCloneableTags = new ArrayList<>(); + /** + * tag "a::b::c" will save in systemTagsMap with tag "a", + * tag "a::b::\{token}" will save in systemTagsMap with tag "a". + *
+ * systemTagsMap["a"] = [SystemTag: "a::b::c", PatternSystemTag: "a::b::\{token}"] + */ + private Map> systemTagsMap = new HashMap<>(); private Map> resourceTypeSystemTagMap = new HashMap<>(); private ResourceConfigSystemTag resourceConfigSystemTag; private Map resourceTypeClassMap = new HashMap<>(); @@ -95,43 +100,44 @@ private void initSystemTags() throws IllegalAccessException { f.getDeclaringClass(), f.getName())); } - if (PatternedSystemTag.class.isAssignableFrom(f.getType())) { + boolean ephemeral = stag.isEphemeral(); + + // re-create system tag to autowired components by spring framework + if (stag instanceof PatternedSystemTag) { PatternedSystemTag ptag = new PatternedSystemTag(stag.getTagFormat(), stag.getResourceClass()); ptag.setValidators(stag.getValidators()); - f.set(null, ptag); - systemTags.add(ptag); stag = ptag; - } else if (EphemeralSystemTag.class.isAssignableFrom(f.getType())) { - // pass - // ephemeral tag is not needed to inject and validate - systemTags.add(stag); } else { SystemTag sstag = new SystemTag(stag.getTagFormat(), stag.getResourceClass()); sstag.setValidators(stag.getValidators()); - f.set(null, sstag); - systemTags.add(sstag); stag = sstag; } + String head = findHeadForSystemTag(stag.getTagFormat()); + List list = systemTagsMap.computeIfAbsent(head, k -> new ArrayList<>()); + list.add(stag); + f.set(null, stag); + + if (ephemeral) { + stag.markAsEphemeral(); + } + if (f.isAnnotationPresent(AdminOnlyTag.class)) { - adminOnlySystemTags.add(stag); + stag.markAsAdminOnly(); } if (f.isAnnotationPresent(NonCloneable.class)) { - nonCloneableTags.add(stag); + stag.disableClone(); } if (f.isAnnotationPresent(SensitiveTag.class) && stag instanceof PatternedSystemTag) { - sensitiveTags.add((PatternedSystemTag) stag); + stag.markAsSensitive(); ((PatternedSystemTag) stag).annotation = f.getAnnotation(SensitiveTag.class); } stag.setTagMgr(this); - List lst = resourceTypeSystemTagMap.get(stag.getResourceClass().getSimpleName()); - if (lst == null) { - lst = new ArrayList<>(); - resourceTypeSystemTagMap.put(stag.getResourceClass().getSimpleName(), lst); - } + List lst = resourceTypeSystemTagMap.computeIfAbsent( + stag.getResourceClass().getSimpleName(), k -> new ArrayList<>()); lst.add(stag); } } @@ -162,7 +168,7 @@ void init() { for (Class cmsgClz : createMessageClass) { TagResourceType at = (TagResourceType) cmsgClz.getAnnotation(TagResourceType.class); Class resType = at.value(); - if (!resourceTypeClassMap.values().contains(resType)) { + if (!resourceTypeClassMap.containsValue(resType)) { throw new CloudRuntimeException(String.format( "tag resource type[%s] defined in @TagResourceType of class[%s] is not a VO entity", resType.getName(), cmsgClz.getName())); @@ -181,10 +187,9 @@ private void registrySensitiveTagHider() { } private String hideSensitiveInfoInTag(String tag) { - for (PatternedSystemTag sensitiveTag : sensitiveTags) { - if (sensitiveTag.isMatch(tag)) { - return sensitiveTag.hideSensitiveInfo(tag); - } + final SystemTag systemTag = findMatchingSystemTag(tag); + if (systemTag instanceof PatternedSystemTag && systemTag.isSensitive()) { + return ((PatternedSystemTag) systemTag).hideSensitiveInfo(tag); } return tag; @@ -198,12 +203,7 @@ private void populateExtensions() { ext.getClass(), resType)); } - List lst = lifeCycleExtensions.get(resType); - if (lst == null) { - lst = new ArrayList<>(); - lifeCycleExtensions.put(resType, lst); - } - + List lst = lifeCycleExtensions.computeIfAbsent(resType, k -> new ArrayList<>()); lst.add(ext); } } @@ -227,7 +227,7 @@ private boolean isTagExisting(String resourceUuid, String tag, TagType type, Str @Transactional private TagInventory createTag(String resourceUuid, String tag, TagType type, String resourceType) { - if (!resourceTypeClassMap.keySet().contains(resourceType)) { + if (!resourceTypeClassMap.containsKey(resourceType)) { throw new IllegalArgumentException(String.format("no resource type[%s] found for tag", resourceType)); } @@ -272,8 +272,8 @@ private SystemTagInventory createResourceConfigFromTag(String resourceUuid, Stri try { resourceConfigSystemTag.newResourceConfig(resourceUuid, tag); } catch (GlobalConfigException e) { - logger.debug(String.format("Failed to create resource config, because %s", e.getMessage())); - throw new ApiMessageInterceptionException(argerr(e.getMessage())); + throw new ApiMessageInterceptionException(argerr("failed to create resource config") + .withOpaque("exception", e.getMessage())); } return null; @@ -352,7 +352,7 @@ public void createInherentSystemTags(List sysTags, String resourceUuid, @Override public void createNonInherentSystemTags(List sysTags, String resourceUuid, String resourceType) { for (String tag : sysTags) { - if (TagConstant.isEphemeralTag(tag)) { + if (isEphemeralTag(tag)) { continue; } createNonInherentSystemTag(resourceUuid, tag, resourceType); @@ -500,9 +500,30 @@ public boolean hasSystemTag(String resourceUuid, Enum tag) { return hasTag(resourceUuid, tag.toString(), TagType.System); } + private String findHeadForSystemTag(@NonNull String tag) { + return tag.split("::")[0]; + } + @Override public SystemTag findMatchingSystemTag(String tag) { - return systemTags.parallelStream().filter(t -> t.isMatch(tag)).findFirst().orElse(null); + if (tag == null) { + return null; + } + String head = findHeadForSystemTag(tag); + List list = systemTagsMap.get(head); + return list == null ? null : list.stream().filter(t -> t.isMatch(tag)).findFirst().orElse(null); + } + + public SystemTag findMatchingSystemTag(String tag, String resourceType) { + if (tag == null) { + return null; + } + String head = findHeadForSystemTag(tag); + List list = systemTagsMap.get(head); + return list == null ? null : list.stream() + .filter(t -> t.isMatch(tag) && resourceType.equals(t.resourceClass.getSimpleName())) + .findFirst() + .orElse(null); } @Override @@ -652,7 +673,9 @@ private void handle(APICreateSystemTagsMsg msg) { if (resourceConfigSystemTag.isMatch(tag)) { throw new ApiMessageInterceptionException( - argerr("no system tag matches[%s] for resourceType[%s]", tag, msg.getResourceType())); + argerr("no system tag matches[%s] for resourceType[%s]", tag, msg.getResourceType()) + .withOpaque("tag", tag) + .withOpaque("resource.type", msg.getResourceType())); } } @@ -690,7 +713,9 @@ private void handle(APICreateSystemTagMsg msg) { if (resourceConfigSystemTag.isMatch(msg.getTag())) { throw new ApiMessageInterceptionException( - argerr("no system tag matches[%s] for resourceType[%s]", msg.getTag(), msg.getResourceType())); + argerr("no system tag matches[%s] for resourceType[%s]", msg.getTag(), msg.getResourceType()) + .withOpaque("tag", msg.getTag()) + .withOpaque("resource.type", msg.getResourceType())); } SystemTagInventory inv = createNonInherentSystemTag(msg.getResourceUuid(), msg.getTag(), msg.getResourceType()); @@ -777,13 +802,17 @@ private boolean isValidSystemTag(String resourceUuid, String resourceType, Strin public void validateSystemTag(String resourceUuid, String resourceType, String tag) { if (!isValidSystemTag(resourceUuid, resourceType, tag)) { throw new ApiMessageInterceptionException( - argerr("no system tag matches[%s] for resourceType[%s]", tag, resourceType)); + argerr("no system tag matches[%s] for resourceType[%s]", tag, resourceType) + .withOpaque("tag", tag) + .withOpaque("resource.type", resourceType)); } for (ValidateSystemTagExtensionPoint exp: pluginRgty.getExtensionList(ValidateSystemTagExtensionPoint.class)) { if (!exp.validateSystemTag(resourceUuid, resourceType, tag)) { throw new ApiMessageInterceptionException( - argerr("validate system tag [%s] for resourceType[%s] failed", tag, resourceType)); + argerr("validate system tag [%s] for resourceType[%s] failed", tag, resourceType) + .withOpaque("tag", tag) + .withOpaque("resource.type", resourceType)); } } } @@ -799,11 +828,8 @@ public void installAfterResourceDeletionOperator(String resourceType, SystemTagR throw new CloudRuntimeException(String.format("cannot find resource type[%s] in tag system ", resourceType)); } - List operators = resourceDeletionOperators.get(resourceType); - if (operators == null) { - operators = new ArrayList<>(); - resourceDeletionOperators.put(resourceType, operators); - } + List operators = + resourceDeletionOperators.computeIfAbsent(resourceType, k -> new ArrayList<>()); operators.add(operator); } @@ -816,8 +842,8 @@ public List filterSystemTags(List systemTags, String resourceTyp @Override public boolean isCloneable(String tag, String resourceType) { - return nonCloneableTags.stream().noneMatch(it -> resourceType.equals(it.resourceClass.getSimpleName()) - && it.isMatch(tag)); + final SystemTag systemTag = findMatchingSystemTag(tag, resourceType); + return systemTag == null ? false : systemTag.isCloneable(); } @Override @@ -826,11 +852,8 @@ public void installCreateMessageValidator(String resourceType, SystemTagCreateMe throw new CloudRuntimeException(String.format("cannot find resource type[%s] in tag system ", resourceType)); } - List validators = createMessageValidators.get(resourceType); - if (validators == null) { - validators = new ArrayList(); - createMessageValidators.put(resourceType, validators); - } + List validators = + createMessageValidators.computeIfAbsent(resourceType, k -> new ArrayList<>()); validators.add(validator); } @@ -838,7 +861,7 @@ public void installCreateMessageValidator(String resourceType, SystemTagCreateMe public void createTags(List systemTags, List userTags, String resourceUuid, String resourceType) { if (systemTags != null && !systemTags.isEmpty()) { for (String sysTag : systemTags) { - if (TagConstant.isEphemeralTag(sysTag)) { + if (isEphemeralTag(sysTag)) { continue; } @@ -920,7 +943,7 @@ public void postSoftDelete(Collection entityIds, Class entityClass) { @Override public List getMessageClassToIntercept() { - return list((Class) APICreateMessage.class); + return list(APICreateMessage.class); } @Override @@ -928,67 +951,49 @@ public InterceptorPosition getPosition() { return InterceptorPosition.END; } - private boolean isCheckSystemTags(APIMessage msg) { - if (msg.getSystemTags() == null) { - return false; - } - - if (msg.getSystemTags().isEmpty()) { - return false; - } - - for (String s : msg.getSystemTags()) { - if (!TagConstant.isEphemeralTag(s)) { - return true; - } - } - - return false; - } - private boolean isMatchedSystemTag(String tag) { - return systemTags.parallelStream().anyMatch(stag -> stag.isMatch(tag)); + return findMatchingSystemTag(tag) != null; } @Override public APIMessage intercept(APIMessage msg) throws ApiMessageInterceptionException { - APICreateMessage cmsg = (APICreateMessage) msg; - if (isCheckSystemTags(msg)) { - cmsg.setSystemTags(removeDuplicateFromList(cmsg.getSystemTags())); - - for (String tag : cmsg.getSystemTags()) { - boolean matchSystemTag = isMatchedSystemTag(tag); - boolean matchResourceTag = isResourceConfigSystemTag(tag); + List systemTags = msg.getSystemTags(); + if (isEmpty(systemTags)) { + return msg; + } - ErrorCode err = checkPemission(tag, msg.getSession()); - if (err != null) { - throw new ApiMessageInterceptionException(err); - } + msg.setSystemTags(removeDuplicateFromList(systemTags)); + for (String tag : msg.getSystemTags()) { + boolean matchSystemTag = isMatchedSystemTag(tag); + boolean matchResourceTag = isResourceConfigSystemTag(tag); - if (!matchSystemTag && !matchResourceTag) { - throw new ApiMessageInterceptionException(argerr("no system tag matches %s", tag)); - } + ErrorCode err = checkPemission(tag, msg.getSession()); + if (err != null) { + throw new ApiMessageInterceptionException(err); + } - // resource config system tag will create new resource config - // so need a early validate for api message - if (matchResourceTag) { - resourceConfigSystemTag.validateResourceConfig(tag); - } + if (!matchSystemTag && !matchResourceTag) { + throw new ApiMessageInterceptionException(argerr("no system tag matches %s", tag)); } - Class resourceType = resourceTypeCreateMessageMap.get(cmsg.getClass()); - if (resourceType == null) { - throw new ApiMessageInterceptionException(inerr( - "API message[%s] doesn't define resource type by @TagResourceType", - cmsg.getClass().getName() - )); + // resource config system tag will create new resource config + // so need an early validate for api message + if (matchResourceTag) { + resourceConfigSystemTag.validateResourceConfig(tag); } + } - List validators = createMessageValidators.get(resourceType.getSimpleName()); - if (validators != null && !validators.isEmpty()) { - for (SystemTagCreateMessageValidator validator : validators) { - validator.validateSystemTagInCreateMessage(cmsg); - } + Class resourceType = resourceTypeCreateMessageMap.get(msg.getClass()); + if (resourceType == null) { + logger.warn(msg.getClass().getName() + + " doesn't define resource type by @TagResourceType, skip validate resource config system tag"); + return msg; + } + + List validators = createMessageValidators.get(resourceType.getSimpleName()); + if (validators != null && !validators.isEmpty()) { + for (SystemTagCreateMessageValidator validator : validators) { + validator.validateSystemTagInCreateMessage((APICreateMessage) msg); } } @@ -1000,7 +1005,8 @@ private ErrorCode checkPemission(String tag, SessionInventory session){ return null; } - if (adminOnlySystemTags.stream().anyMatch(it -> it.isMatch(tag))) { + final SystemTag systemTag = findMatchingSystemTag(tag); + if (systemTag != null && systemTag.isAdminOnly()) { return operr("tag[%s] is only for admin", tag); } return null; @@ -1095,4 +1101,9 @@ public List getEntityClassForHardDeleteEntityExtension() { public void postHardDelete(Collection entityIds, Class entityClass) { postDelete(entityIds, entityClass); } + + public boolean isEphemeralTag(String tag) { + final SystemTag systemTag = findMatchingSystemTag(tag); + return systemTag != null && systemTag.isEphemeral(); + } } diff --git a/test/src/test/groovy/org/zstack/test/integration/configuration/instanceoffering/InstanceOfferingUserConfigCase.groovy b/test/src/test/groovy/org/zstack/test/integration/configuration/instanceoffering/InstanceOfferingUserConfigCase.groovy deleted file mode 100644 index 068c3e6897..0000000000 --- a/test/src/test/groovy/org/zstack/test/integration/configuration/instanceoffering/InstanceOfferingUserConfigCase.groovy +++ /dev/null @@ -1,194 +0,0 @@ -package org.zstack.test.integration.configuration.instanceoffering - -import org.zstack.configuration.InstanceOfferingSystemTags -import org.zstack.header.configuration.userconfig.InstanceOfferingAllocateConfig -import org.zstack.header.configuration.userconfig.InstanceOfferingUserConfig -import org.zstack.header.network.service.NetworkServiceType -import org.zstack.header.vm.VmCreationStrategy -import org.zstack.network.service.flat.FlatNetworkServiceConstant -import org.zstack.sdk.ClusterInventory -import org.zstack.sdk.CreateInstanceOfferingAction -import org.zstack.sdk.ImageInventory -import org.zstack.sdk.InstanceOfferingInventory -import org.zstack.sdk.L3NetworkInventory -import org.zstack.sdk.PrimaryStorageInventory -import org.zstack.sdk.ValidateInstanceOfferingUserConfigAction -import org.zstack.sdk.VmInstanceInventory -import org.zstack.test.integration.storage.StorageTest -import org.zstack.testlib.EnvSpec -import org.zstack.testlib.SubCase -import org.zstack.utils.data.SizeUnit -import org.zstack.utils.gson.JSONObjectUtil - -import static org.zstack.utils.CollectionDSL.e -import static org.zstack.utils.CollectionDSL.map - -/** - * Created by lining on 2020/8/24. - */ -class InstanceOfferingUserConfigCase extends SubCase{ - - EnvSpec env - InstanceOfferingInventory instanceOfferingCluster1; - - @Override - void clean() { - env.delete() - } - - @Override - void setup() { - useSpring(StorageTest.springSpec) - } - - @Override - void environment() { - env = env { - sftpBackupStorage { - name = "sftp" - url = "/sftp" - username = "root" - password = "password" - hostname = "localhost" - - image { - name = "image" - url = "http://zstack.org/download/test.qcow2" - } - - image { - name = "vr" - url = "http://zstack.org/download/vr.qcow2" - } - } - - zone { - name = "zone" - description = "test" - - cluster { - name = "cluster1" - hypervisorType = "KVM" - - kvm { - name = "kvm1" - managementIp = "localhost" - username = "root" - password = "password" - } - - attachPrimaryStorage("nfs") - attachL2Network("l2") - } - - cluster { - name = "cluster2" - hypervisorType = "KVM" - - kvm { - name = "kvm2" - managementIp = "127.0.0.2" - username = "root" - password = "password" - } - - attachPrimaryStorage("nfs") - attachL2Network("l2") - } - - l2NoVlanNetwork { - name = "l2" - physicalInterface = "eth0" - - l3Network { - name = "pubL3" - - service { - provider = provider = FlatNetworkServiceConstant.FLAT_NETWORK_SERVICE_TYPE_STRING - types = [NetworkServiceType.DHCP.toString()] - } - - ip { - startIp = "12.16.10.10" - endIp = "12.16.10.100" - netmask = "255.255.255.0" - gateway = "12.16.10.1" - } - } - } - - nfsPrimaryStorage { - name = "nfs" - url = "localhost:/nfs" - } - - attachBackupStorage("sftp") - } - } - } - - @Override - void test() { - env.create { - testCreateInstanceOffering() - testCreateVm() - } - } - - void testCreateInstanceOffering() { - PrimaryStorageInventory ps = env.inventoryByName("nfs") - ClusterInventory cluster1 = env.inventoryByName("cluster1") - ClusterInventory cluster2 = env.inventoryByName("cluster2") - - InstanceOfferingUserConfig userConfig = new InstanceOfferingUserConfig( - allocate : new InstanceOfferingAllocateConfig( - clusterUuid: "errorUuid" - ) - ) - String configStr = JSONObjectUtil.toJsonString(userConfig) - - expectError { - createInstanceOffering { - name = "instanceOffering" - cpuNum = 1 - memorySize = SizeUnit.GIGABYTE.toByte(1) - systemTags = [ - InstanceOfferingSystemTags.INSTANCE_OFFERING_USER_CONFIG.instantiateTag(map( - e(InstanceOfferingSystemTags.INSTANCE_OFFERING_USER_CONFIG_TOKEN, configStr) - )) - ] - } - } - - userConfig = new InstanceOfferingUserConfig( - allocate : new InstanceOfferingAllocateConfig( - clusterUuid: cluster1.uuid - ) - ) - configStr = JSONObjectUtil.toJsonString(userConfig) - instanceOfferingCluster1 = createInstanceOffering { - name = "instanceOffering" - cpuNum = 1 - memorySize = SizeUnit.GIGABYTE.toByte(1) - systemTags = [ - InstanceOfferingSystemTags.INSTANCE_OFFERING_USER_CONFIG.instantiateTag(map( - e(InstanceOfferingSystemTags.INSTANCE_OFFERING_USER_CONFIG_TOKEN, configStr) - )) - ] - } - } - - void testCreateVm() { - ImageInventory image = env.inventoryByName("image") - L3NetworkInventory l3 = env.inventoryByName("pubL3") - ClusterInventory cluster1 = env.inventoryByName("cluster1") - - VmInstanceInventory vmInstanceInventory = createVmInstance { - name = "newVm1" - instanceOfferingUuid = instanceOfferingCluster1.uuid - imageUuid = image.uuid - l3NetworkUuids = [l3.uuid] - } - assert cluster1.uuid == vmInstanceInventory.clusterUuid - } -} \ No newline at end of file diff --git a/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/BootModeCase.groovy b/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/BootModeCase.groovy index 4f82489096..9c743bdab3 100644 --- a/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/BootModeCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/BootModeCase.groovy @@ -9,6 +9,7 @@ import org.zstack.test.integration.kvm.KvmTest import org.zstack.testlib.EnvSpec import org.zstack.testlib.SubCase import org.zstack.utils.data.SizeUnit + /** * Created by GuoYi on 17/08/2018. */ @@ -72,15 +73,10 @@ class BootModeCase extends SubCase { } } - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - vm { name = "vm" - useInstanceOffering("instanceOffering") + cpu = 4 + memoryGB(8) useImage("image1") useL3Networks("l3") useHost("host1") @@ -106,7 +102,7 @@ class BootModeCase extends SubCase { } void testBootModeSystemTag() { - // create bootMode tag for exiting image + logger.info("Test-001: create bootMode tag for exiting image") def img = env.inventoryByName("image1") as ImageInventory def _tag = createSystemTag { resourceUuid = img.uuid @@ -127,7 +123,7 @@ class BootModeCase extends SubCase { } as List assert tags.size() == 1 - // create new image with bootMode + logger.info("Test-002: create new image with bootMode") BackupStorageInventory bs = env.inventoryByName("sftp") as BackupStorageInventory img = addImage { name = "image2" @@ -163,7 +159,7 @@ class BootModeCase extends SubCase { } as List assert tags.size() == 1 - // create bootMode tag for exiting vm instance + logger.info("Test-003: create bootMode tag for exiting vm instance") def vm = env.inventoryByName("vm") as VmInstanceInventory _tag = createSystemTag { resourceUuid = vm.uuid @@ -184,12 +180,12 @@ class BootModeCase extends SubCase { } as List assert tags.size() == 1 - // create new vm instance using image with bootMode - InstanceOfferingInventory offering = env.inventoryByName("instanceOffering") as InstanceOfferingInventory + logger.info("Test-004: create new vm instance using image with bootMode") L3NetworkInventory l3 = env.inventoryByName("l3") as L3NetworkInventory vm = createVmInstance { name = "New-VM" - instanceOfferingUuid = offering.uuid + cpuNum = 4 + memorySize = SizeUnit.GIGABYTE.toByte(8) imageUuid = img.uuid l3NetworkUuids = [l3.uuid] } @@ -217,7 +213,7 @@ class BootModeCase extends SubCase { uuid = vm.uuid } - // commit vm instance to image + logger.info("Test-005: commit vm instance to image") img = createRootVolumeTemplateFromRootVolume { name = "template" rootVolumeUuid = vm.getRootVolumeUuid() diff --git a/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/SystemTagCase.groovy b/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/SystemTagCase.groovy index 8798384577..230b3462a6 100644 --- a/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/SystemTagCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/SystemTagCase.groovy @@ -1,7 +1,8 @@ package org.zstack.test.integration.configuration.systemTag -import org.zstack.header.configuration.DiskOfferingVO +import org.zstack.header.identity.AccountVO import org.zstack.header.zone.ZoneVO +import org.zstack.sdk.AccountInventory import org.zstack.sdk.CreateSystemTagAction import org.zstack.testlib.* import org.zstack.utils.data.SizeUnit @@ -19,13 +20,14 @@ class SystemTagCase extends SubCase{ @Override void environment() { env = env{ - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } zone{ name = "zone" } + + account { + name = "test-account" + password = "password" + } } } @@ -72,18 +74,21 @@ class SystemTagCase extends SubCase{ } void testCreateSystemTagForTypeNotMatchedResource() { - DiskOfferingSpec diskOfferingSpec = env.specByName('diskOffering') - - CreateSystemTagAction a = new CreateSystemTagAction( - resourceType: DiskOfferingVO.getSimpleName(), - resourceUuid: diskOfferingSpec.inventory.uuid, - tag: "host::reservedCpu::{capacity}", - sessionId: Test.currentEnvSpec.session.uuid - ) - - CreateSystemTagAction.Result res = a.call() - - assert res.error != null + logger.info("Test-011: host::reservedCpu:: is cluster system tag, expect fail if attach tag to account") + def account = env.inventoryByName("test-account") as AccountInventory + + expectApiFailure({ + createSystemTag { + delegate.resourceType = AccountVO.getSimpleName() + delegate.resourceUuid = account.uuid + delegate.tag = "host::reservedCpu::${SizeUnit.GIGABYTE.toByte(8)}".toString() + } + }) { + assert delegate.code == "SYS.1007" + assert delegate.opaque + assert delegate.opaque["resource.type"] == AccountVO.getSimpleName() + assert delegate.opaque["tag"] == "host::reservedCpu::${SizeUnit.GIGABYTE.toByte(8)}".toString() + } } @Override diff --git a/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/businessProperties/BusinessPropertiesCase.groovy b/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/businessProperties/BusinessPropertiesCase.groovy deleted file mode 100644 index 5a4e6bd60f..0000000000 --- a/test/src/test/groovy/org/zstack/test/integration/configuration/systemTag/businessProperties/BusinessPropertiesCase.groovy +++ /dev/null @@ -1,44 +0,0 @@ -package org.zstack.test.integration.configuration.systemTag.businessProperties - -import org.zstack.configuration.BusinessProperties -import org.zstack.kvm.KVMGlobalProperty -import org.zstack.testlib.EnvSpec -import org.zstack.testlib.SpringSpec -import org.zstack.testlib.SubCase - -/** - * Created by mingjian.deng on 2020/1/19.*/ -class BusinessPropertiesCase extends SubCase { - EnvSpec env - - @Override - void clean() { - env.delete() - } - - static SpringSpec springSpec = makeSpring { - include("ConfigurationManager.xml") - } - - @Override - void setup() { - useSpring(springSpec) - } - - @Override - void environment() { - env = env{ - - } - } - - @Override - void test() { - env.create { - //testBusinessProperties() - } - } - - void testBusinessProperties() { - } -} diff --git a/test/src/test/groovy/org/zstack/test/integration/console/ConsoleProxyCase.groovy b/test/src/test/groovy/org/zstack/test/integration/console/ConsoleProxyCase.groovy index a02602cc64..38d68e53de 100644 --- a/test/src/test/groovy/org/zstack/test/integration/console/ConsoleProxyCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/console/ConsoleProxyCase.groovy @@ -20,7 +20,6 @@ import org.zstack.test.integration.ZStackTest import org.zstack.testlib.EnvSpec import org.zstack.testlib.HttpError import org.zstack.testlib.SubCase -import org.zstack.utils.data.SizeUnit class ConsoleProxyCase extends SubCase { EnvSpec env @@ -40,17 +39,6 @@ class ConsoleProxyCase extends SubCase { password = "password" } - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(1) - cpu = 1 - } - - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - sftpBackupStorage { name = "sftp" url = "/sftp" @@ -109,7 +97,8 @@ class ConsoleProxyCase extends SubCase { vm { name = "vm" - useInstanceOffering("instanceOffering") + cpu = 1 + memoryGB(1) useImage("image1") useL3Networks("l3") } diff --git a/test/src/test/groovy/org/zstack/test/integration/core/config/GlobalConfigCase.groovy b/test/src/test/groovy/org/zstack/test/integration/core/config/GlobalConfigCase.groovy index e9e7497e28..c37d592ca1 100755 --- a/test/src/test/groovy/org/zstack/test/integration/core/config/GlobalConfigCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/core/config/GlobalConfigCase.groovy @@ -1,11 +1,10 @@ package org.zstack.test.integration.core.config -import org.zstack.core.config.GlobalConfigException import org.zstack.compute.vm.VmGlobalConfig import org.zstack.core.Platform import org.zstack.core.cloudbus.EventFacade -import org.zstack.core.config.GlobalConfig import org.zstack.core.config.GlobalConfigCanonicalEvents +import org.zstack.core.config.GlobalConfigException import org.zstack.core.config.GlobalConfigFacadeImpl import org.zstack.core.config.GlobalConfigVO import org.zstack.core.config.GlobalConfigVO_ @@ -17,16 +16,17 @@ import org.zstack.core.db.UpdateQuery import org.zstack.header.vm.APICreateVmNicMsg import org.zstack.image.ImageGlobalConfig import org.zstack.kvm.KVMGlobalConfig -import org.zstack.sdk.GlobalConfigInventory -import org.zstack.sdk.UpdateGlobalConfigAction -import org.zstack.sdk.GetGlobalConfigOptionsResult +import org.zstack.sdk.* import org.zstack.test.integration.kvm.KvmTest import org.zstack.testlib.EnvSpec import org.zstack.testlib.SubCase +import java.util.concurrent.TimeUnit + import static org.zstack.utils.CollectionDSL.e import static org.zstack.utils.CollectionDSL.map import static org.zstack.utils.StringDSL.s + /** * Created by miao on 17-5-4. */ @@ -55,6 +55,7 @@ class GlobalConfigCase extends SubCase { @Override void test() { env.create { + testSdk() testTolerateDatabaseDirtyData() testUpdateIntegerConfigWithFloatValue() testFloatPointNumberTolerance() @@ -70,6 +71,47 @@ class GlobalConfigCase extends SubCase { } } + void testSdk() { + def zone = env.inventoryByName("zone") as ZoneInventory + + int port = 8989 + String WEB_HOOK_PATH = "http://127.0.0.1:$port/sdk/webook" + + def config = new ZSConfig.Builder() + .setHostname("127.0.0.1") + .setPort(port) + .setDefaultPollingInterval(100, TimeUnit.MILLISECONDS) + .setDefaultPollingTimeout(300000, TimeUnit.MILLISECONDS) + .setReadTimeout(10, TimeUnit.MINUTES) + .setWriteTimeout(10, TimeUnit.MINUTES) + .build() + + LogInByAccountAction a = new LogInByAccountAction(); + a.accountName = "admin" + a.password = "password" + a.call(); + + a = new LogInByAccountAction(); + a.accountName = "admin" + a.password = "password" + a.call(); + + ApiResult r = ZSClient.callWithConfig(a, config) + a = new LogInByAccountAction(); + a.accountName = "admin" + a.password = "password" + a.call(); + ZSClient.callWithConfig(a, ZSClient.getConfig()) + + CreateClusterAction ca = new CreateClusterAction(); + ca.name = "cluster" + ca.zoneUuid = zone.getUuid() + ca.hypervisorType = "KVM" + ca.sessionId = adminSession() + + ZSClient.callWithConfig(ca, config) + } + void testGetConfigOptions() { testGetValidValue() testGetNumberRange() @@ -202,7 +244,7 @@ class GlobalConfigCase extends SubCase { conditions = ["category=${KVMGlobalConfig.RESERVED_MEMORY_CAPACITY.category}","name=${KVMGlobalConfig.RESERVED_MEMORY_CAPACITY.name}"] }[0] assert KVMGlobalConfig.RESERVED_MEMORY_CAPACITY.value(int.class) == 10 - + resetGlobalConfig {} diff --git a/test/src/test/groovy/org/zstack/test/integration/core/database/DatabaseWrapperCase.groovy b/test/src/test/groovy/org/zstack/test/integration/core/database/DatabaseWrapperCase.groovy index 804bcf6ba3..35fea6e2f8 100755 --- a/test/src/test/groovy/org/zstack/test/integration/core/database/DatabaseWrapperCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/core/database/DatabaseWrapperCase.groovy @@ -4,22 +4,22 @@ import org.hibernate.exception.ConstraintViolationException import org.zstack.core.Platform import org.zstack.core.db.DatabaseFacade import org.zstack.core.db.Q +import org.zstack.core.db.SQL import org.zstack.core.db.SQLBatch -import org.zstack.header.configuration.InstanceOfferingVO -import org.zstack.header.configuration.InstanceOfferingVO_ -import org.zstack.header.identity.AccountConstant import org.zstack.core.db.DBSourceUtils import org.zstack.header.vo.ResourceVO import org.zstack.header.vo.ResourceVO_ +import org.zstack.header.zone.ZoneVO +import org.zstack.header.zone.ZoneVO_ import org.zstack.testlib.SubCase import java.sql.SQLException +import java.sql.Timestamp /** * Created by david on 7/13/17. */ class DatabaseWrapperCase extends SubCase { - @Override void setup() { } @@ -37,55 +37,50 @@ class DatabaseWrapperCase extends SubCase { } void testQ() { - def offerings = Q.New(InstanceOfferingVO.class) - .eq(InstanceOfferingVO_.memorySize, 1234) + def zoneList1 = Q.New(ZoneVO.class) + .eq(ZoneVO_.uuid, "1234") .list() - assert offerings != null : "list should always return non-null" - assert offerings.isEmpty() : "expect no offerings found" + assert zoneList1 != null : "list should always return non-null" + assert zoneList1.isEmpty() : "expect no zone found" - offerings = Q.New(InstanceOfferingVO.class) - .eq(InstanceOfferingVO_.memorySize, 1234) - .select(InstanceOfferingVO_.cpuNum) + def zoneList2 = Q.New(ZoneVO.class) + .eq(ZoneVO_.uuid, "1234") + .select(ZoneVO_.@name) .listValues() - assert offerings != null : "listValues should always return non-null" - assert offerings.isEmpty() : "expect no values found" + assert zoneList2 != null : "listValues should always return non-null" + assert zoneList2.isEmpty() : "expect no values found" - offerings = Q.New(InstanceOfferingVO.class) - .eq(InstanceOfferingVO_.memorySize, 1234) - .select(InstanceOfferingVO_.cpuNum) - .select(InstanceOfferingVO_.memorySize) + def zoneList3 = Q.New(ZoneVO.class) + .eq(ZoneVO_.uuid, "1234") + .select(ZoneVO_.@name) + .select(ZoneVO_.description) .listTuple() - assert offerings != null : "listTuples should always return non-null" - assert offerings.isEmpty() : "expect no tuples found" + assert zoneList3 != null : "listTuples should always return non-null" + assert zoneList3.isEmpty() : "expect no tuples found" - List offeringUuids = Collections.emptyList() try { - Q.New(InstanceOfferingVO.class) - .in(InstanceOfferingVO_.uuid, offeringUuids) - .list(); + Q.New(ZoneVO.class) + .in(ZoneVO_.uuid, ["1234"]) + .list() } catch (RuntimeException e) { assert e.getMessage() == "Op.IN value cannot be null or empty" } } void testSQLBatch() { - def offeringUuid = Platform.uuid + def zoneUuid = Platform.uuid DatabaseFacade dbf = bean(DatabaseFacade.class) - InstanceOfferingVO v2 = new InstanceOfferingVO() - def offeringUuid2 = Platform.uuid - v2.memorySize = 22345 - v2.cpuNum = 5 - v2.cpuSpeed = 0 - v2.uuid = offeringUuid2 - v2.duration = "Permanent" - v2.name = "offeringA" - v2.state = "Enabled" - v2.sortKey = 0 - v2.type = "UserVm" - v2.setAccountUuid(AccountConstant.INITIAL_SYSTEM_ADMIN_UUID) + ZoneVO v2 = new ZoneVO() + def zoneUuid2 = Platform.uuid + v2.name = "22222" + v2.type = "zstack" + v2.uuid = zoneUuid2 + v2.description = "Permanent" + v2.setDefault(true) + v2.createDate = new Timestamp(System.currentTimeMillis()) dbf.persist(v2) try { @@ -93,14 +88,14 @@ class DatabaseWrapperCase extends SubCase { @Override protected void scripts() { - InstanceOfferingVO v = new InstanceOfferingVO() - v.memorySize = 12345 - v.cpuNum = 5 - v.uuid = offeringUuid - - sql(InstanceOfferingVO.class) - .eq(InstanceOfferingVO_.uuid, offeringUuid2) - .set(InstanceOfferingVO_.memorySize, 1122) + ZoneVO v = new ZoneVO() + v2.name = "33333" + v2.type = "zstack" + v2.uuid = zoneUuid + + sql(ZoneVO.class) + .eq(ZoneVO_.uuid, zoneUuid) + .set(ZoneVO_.description, "wrong desc") .update() dbf.getEntityManager().persist(v) @@ -111,12 +106,14 @@ class DatabaseWrapperCase extends SubCase { } catch (Throwable ignored) { } - assert !dbf.isExist(offeringUuid, InstanceOfferingVO.class) - def v3 = dbf.findByUuid(offeringUuid2, InstanceOfferingVO.class) + assert !dbf.isExist(zoneUuid, ZoneVO.class) + def v3 = dbf.findByUuid(zoneUuid2, ZoneVO.class) assert v3 != null - assert v3.memorySize == v2.memorySize + assert v3.description == v2.description - dbf.remove(v2) + SQL.New(ZoneVO) + .eq(ZoneVO_.uuid, zoneUuid2) + .delete() String uuid = Platform.getUuid() try { diff --git a/test/src/test/groovy/org/zstack/test/integration/identity/Env.groovy b/test/src/test/groovy/org/zstack/test/integration/identity/Env.groovy index ffb4a9c0e8..da4ddb52a3 100644 --- a/test/src/test/groovy/org/zstack/test/integration/identity/Env.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/identity/Env.groovy @@ -22,17 +22,6 @@ use: static EnvSpec oneVmBasicEnv() { return Test.makeEnv { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - sftpBackupStorage { name = "sftp" url = "/sftp" @@ -126,7 +115,8 @@ use: vm { name = "vm" - useInstanceOffering("instanceOffering") + cpu = 4 + memoryGB(8) useImage("image1") useL3Networks("l3") } diff --git a/test/src/test/groovy/org/zstack/test/integration/identity/InvalidDeleteResourceCase.groovy b/test/src/test/groovy/org/zstack/test/integration/identity/InvalidDeleteResourceCase.groovy index 0590fa8786..d8f36cbdce 100644 --- a/test/src/test/groovy/org/zstack/test/integration/identity/InvalidDeleteResourceCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/identity/InvalidDeleteResourceCase.groovy @@ -1,7 +1,6 @@ package org.zstack.test.integration.identity import org.zstack.header.network.l3.L3NetworkConstant -import org.zstack.sdk.DiskOfferingInventory import org.zstack.sdk.L2NetworkInventory import org.zstack.sdk.L3NetworkInventory import org.zstack.sdk.PortForwardingRuleInventory @@ -53,7 +52,6 @@ class InvalidDeleteResourceCase extends SubCase{ } as SessionInventory testL3Network() - testDiskOffering() testVolumeSnapshot() testDataVolume() testPortForwardingRule() @@ -78,20 +76,6 @@ class InvalidDeleteResourceCase extends SubCase{ } } - void testDiskOffering(){ - DiskOfferingInventory diskOfferingInventory = createDiskOffering { - name = "testDiskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - - expect([AssertionError.class]){ - deleteDiskOffering { - uuid = diskOfferingInventory.uuid - sessionId = testSessionInventory.uuid - } - } - } - void testVolumeSnapshot(){ VmInstanceInventory vmInstanceInventory = env.inventoryByName("vm") @@ -108,11 +92,12 @@ class InvalidDeleteResourceCase extends SubCase{ } } - void testDataVolume(){ - VolumeInventory volumeInventory = createDataVolume { + void testDataVolume() { + logger.info("Test-031: volume is owner by admin, can not deleted by other account") + def volumeInventory = createDataVolume { name = 'testDataVolume' - diskOfferingUuid = env.inventoryByName("diskOffering").uuid - } + diskSize = SizeUnit.GIGABYTE.toByte(20) + } as VolumeInventory expect([AssertionError.class]){ deleteDataVolume { diff --git a/test/src/test/groovy/org/zstack/test/integration/identity/account/AccountCase.groovy b/test/src/test/groovy/org/zstack/test/integration/identity/account/AccountCase.groovy index 0629a859bb..bbdf723cdd 100755 --- a/test/src/test/groovy/org/zstack/test/integration/identity/account/AccountCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/identity/account/AccountCase.groovy @@ -16,7 +16,6 @@ import org.zstack.identity.QuotaGlobalConfig import org.zstack.kvm.KVMConstant import org.zstack.sdk.AccountInventory import org.zstack.sdk.ImageInventory -import org.zstack.sdk.InstanceOfferingInventory import org.zstack.sdk.L3NetworkInventory import org.zstack.sdk.SessionInventory import org.zstack.sdk.UpdateAccountAction @@ -25,6 +24,7 @@ import org.zstack.test.integration.ZStackTest import org.zstack.test.integration.identity.Env import org.zstack.testlib.EnvSpec import org.zstack.testlib.SubCase +import org.zstack.utils.data.SizeUnit import java.lang.reflect.Field import java.lang.reflect.Modifier @@ -84,7 +84,6 @@ class AccountCase extends SubCase { value = 3 } - def instanceOffering = env.inventoryByName("instanceOffering") as InstanceOfferingInventory def image = env.inventoryByName("image1" ) as ImageInventory def l3 = env.inventoryByName("pubL3") as L3NetworkInventory @@ -98,7 +97,8 @@ class AccountCase extends SubCase { createVmInstance { name = "vm" imageUuid = image.uuid - instanceOfferingUuid = instanceOffering.uuid + cpuNum = 4 + memorySize = SizeUnit.GIGABYTE.toByte(8) l3NetworkUuids = [l3.uuid] sessionId = s2.uuid } @@ -106,7 +106,8 @@ class AccountCase extends SubCase { createVmInstance { name = "vm-2" imageUuid = image.uuid - instanceOfferingUuid = instanceOffering.uuid + cpuNum = 4 + memorySize = SizeUnit.GIGABYTE.toByte(8) l3NetworkUuids = [l3.uuid] sessionId = s2.uuid } diff --git a/test/src/test/groovy/org/zstack/test/integration/identity/account/DelayDeleteResourceCase.groovy b/test/src/test/groovy/org/zstack/test/integration/identity/account/DelayDeleteResourceCase.groovy index ee5daed331..48fa77a7ad 100644 --- a/test/src/test/groovy/org/zstack/test/integration/identity/account/DelayDeleteResourceCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/identity/account/DelayDeleteResourceCase.groovy @@ -39,17 +39,6 @@ class DelayDeleteResourceCase extends SubCase { void environment() { // one base vm, with a data volume env = makeEnv { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - sftpBackupStorage { name = "sftp" url = "/sftp" @@ -143,10 +132,16 @@ class DelayDeleteResourceCase extends SubCase { vm { name = "vm" - useInstanceOffering("instanceOffering") + cpu = 4 + memoryGB(8) useImage("image1") useL3Networks("l3") - useDiskOfferings("diskOffering") + disk { + boot = true + } + disk { + sizeGB(20) + } } } } diff --git a/test/src/test/groovy/org/zstack/test/integration/identity/account/DeleteNormalAccountCase.groovy b/test/src/test/groovy/org/zstack/test/integration/identity/account/DeleteNormalAccountCase.groovy index ecdff0cb34..e2290f5c24 100644 --- a/test/src/test/groovy/org/zstack/test/integration/identity/account/DeleteNormalAccountCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/identity/account/DeleteNormalAccountCase.groovy @@ -13,7 +13,6 @@ import org.zstack.network.securitygroup.SecurityGroupConstant import org.zstack.network.service.virtualrouter.VirtualRouterConstant import org.zstack.sdk.AccountInventory import org.zstack.sdk.VmInstanceInventory -import org.zstack.sdk.VolumeInventory import org.zstack.test.integration.ZStackTest import org.zstack.testlib.EnvSpec import org.zstack.testlib.SubCase @@ -49,17 +48,6 @@ class DeleteNormalAccountCase extends SubCase { void environment() { // one base vm, with a data volume env = makeEnv { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - sftpBackupStorage { name = "sftp" url = "/sftp" @@ -153,10 +141,16 @@ class DeleteNormalAccountCase extends SubCase { vm { name = "vm" - useInstanceOffering("instanceOffering") + cpu = 4 + memoryGB(8) useImage("image1") useL3Networks("l3") - useDiskOfferings("diskOffering") + disk { + boot = true + } + disk { + sizeGB(20) + } } } } @@ -182,7 +176,6 @@ class DeleteNormalAccountCase extends SubCase { void testAdminAdoptOrphanedResourceAfterDeletedNormalAccount() { VmInstanceInventory vm = env.inventoryByName("vm") as VmInstanceInventory - VolumeInventory vol = vm.getAllVolumes().find { i -> i.getUuid() != vm.getRootVolumeUuid() } // gather resources which should be referenced in AccountResourceRefVO and belong to admin // these should later belong to admin again diff --git a/test/src/test/groovy/org/zstack/test/integration/identity/resource/OperationResourceCase.groovy b/test/src/test/groovy/org/zstack/test/integration/identity/resource/OperationResourceCase.groovy index 67bb59deed..e4cd97a0ac 100644 --- a/test/src/test/groovy/org/zstack/test/integration/identity/resource/OperationResourceCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/identity/resource/OperationResourceCase.groovy @@ -2,18 +2,21 @@ package org.zstack.test.integration.identity.resource import org.zstack.core.db.DatabaseFacade import org.zstack.header.identity.AccountConstant +import org.zstack.header.image.ImageConstant import org.zstack.header.vm.VmInstanceState import org.zstack.header.vm.VmInstanceVO import org.zstack.sdk.AccountInventory +import org.zstack.sdk.BackupStorageInventory import org.zstack.sdk.ImageInventory -import org.zstack.sdk.InstanceOfferingInventory -import org.zstack.sdk.SessionInventory -import org.zstack.sdk.UpdateInstanceOfferingAction import org.zstack.sdk.VmInstanceInventory +import org.zstack.sdk.identity.role.RoleInventory import org.zstack.test.integration.ZStackTest import org.zstack.test.integration.identity.Env import org.zstack.testlib.EnvSpec import org.zstack.testlib.SubCase + +import static org.zstack.header.errorcode.SysErrors.RESOURCE_NOT_ACCESSIBLE + /** * Created by camile on 2017/6/11. */ @@ -66,43 +69,112 @@ class OperationResourceCase extends SubCase { } void testShareResourceAgain(){ + logger.info("Test 011: share resource admin will not raise error") logInByAccount { accountName = AccountConstant.INITIAL_SYSTEM_ADMIN_NAME password = AccountConstant.INITIAL_SYSTEM_ADMIN_PASSWORD } - InstanceOfferingInventory instanceOfferingInventory = envSpec.inventoryByName("instanceOffering") + def bs = envSpec.inventoryByName("sftp") as BackupStorageInventory + def image11 = addImage { + name = "image11" + url = "http://my-site/foo.qcow2" + backupStorageUuids = [bs.uuid] + format = ImageConstant.QCOW2_FORMAT_STRING + } as ImageInventory + + shareResource { + resourceUuids = [image11.uuid] + accountUuids = [accountInventory.uuid] + } + + // again shareResource { - resourceUuids = [instanceOfferingInventory.uuid] + resourceUuids = [image11.uuid] + accountUuids = [accountInventory.uuid] + } + + // to public first, then share to account + shareResource { + resourceUuids = [image11.uuid] + toPublic = true + } + + shareResource { + resourceUuids = [image11.uuid] + accountUuids = [accountInventory.uuid] + } + + revokeResourceSharing{ + resourceUuids = [image11.uuid] accountUuids = [accountInventory.uuid] } + // revoke again revokeResourceSharing{ - resourceUuids = [instanceOfferingInventory.uuid] + resourceUuids = [image11.uuid] accountUuids = [accountInventory.uuid] } } void testSharedResourceOperator() { - def instanceOfferingInventory = envSpec.inventoryByName("instanceOffering") as InstanceOfferingInventory + def accountTestUuid = (queryAccount { + delegate.conditions = [ + "name=test" + ] + } as List)[0] + assert accountTestUuid != null + + def accountTest2Uuid = (queryAccount { + delegate.conditions = [ + "name=test2" + ] + } as List)[0] + assert accountTest2Uuid != null + + def role1 = createRole { + delegate.name = "role1" + delegate.policies = [ + ".header.image.APIUpdateImageMsg", + ] + } as RoleInventory + + attachRoleToAccount { + delegate.roleUuid = role1.uuid + delegate.accountUuid = accountTestUuid.uuid + } + + attachRoleToAccount { + delegate.roleUuid = role1.uuid + delegate.accountUuid = accountTest2Uuid.uuid + } + + logger.info("Test 021: share resource to account: test2, not account: test") + def image = envSpec.inventoryByName("image1") as ImageInventory shareResource { - resourceUuids = [instanceOfferingInventory.uuid, image.uuid] - accountUuids = [accountInventory.uuid] + resourceUuids = [image.uuid] + accountUuids = [accountTest2Uuid.uuid] } - logOut { - sessionUuid = adminSession() + + withAccountSession("test", "password") { + expectApiFailure({ + updateImage { + delegate.uuid = image.uuid + delegate.name = "updated" + } + }) { + assert delegate.code == "SYS.1018" + assert RESOURCE_NOT_ACCESSIBLE.toString() == "SYS.1018" + } } - def session = logInByAccount { - accountName = "test" - password = "password" - } as SessionInventory - def action = new UpdateInstanceOfferingAction() - action.sessionId = session.uuid - action.uuid = instanceOfferingInventory.uuid - action.name = "updated" - assert action.call().error != null + withAccountSession("test2", "password") { + updateImage { + delegate.uuid = image.uuid + delegate.name = "updated2" + } + } } @Override diff --git a/test/src/test/groovy/org/zstack/test/integration/image/DeleteIsoCase.groovy b/test/src/test/groovy/org/zstack/test/integration/image/DeleteIsoCase.groovy index 7e26ba7edb..322f9d82ae 100644 --- a/test/src/test/groovy/org/zstack/test/integration/image/DeleteIsoCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/image/DeleteIsoCase.groovy @@ -28,17 +28,6 @@ class DeleteIsoCase extends SubCase { @Override void environment() { env = env { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - sftpBackupStorage { name = "sftp" url = "/sftp" @@ -120,10 +109,14 @@ class DeleteIsoCase extends SubCase { vm { name = "vm" + cpu = 4 + memoryGB(8) useL3Networks("l3") - useInstanceOffering("instanceOffering") - useRootDiskOffering("diskOffering") useImage("iso_1") + disk { + boot = true + sizeGB(20) + } } } @@ -139,28 +132,38 @@ class DeleteIsoCase extends SubCase { void testDeleteIso() { VmGlobalConfig.VM_DEFAULT_CD_ROM_NUM.updateValue(3) - ImageInventory image = env.inventoryByName("image") - ImageInventory iso1 = env.inventoryByName("iso_1") - ImageInventory iso2 = env.inventoryByName("iso_2") - DiskOfferingInventory diskOffering = env.inventoryByName("diskOffering") - InstanceOfferingInventory instanceOffering = env.inventoryByName("instanceOffering") - L3NetworkInventory l3 = env.inventoryByName("l3") + def image = env.inventoryByName("image") as ImageInventory + def iso1 = env.inventoryByName("iso_1") as ImageInventory + def iso2 = env.inventoryByName("iso_2") as ImageInventory + def l3 = env.inventoryByName("l3") as L3NetworkInventory - VmInstanceInventory newVm = createVmInstance { + def newVm = createVmInstance { name = "new-vm" - instanceOfferingUuid = instanceOffering.uuid + cpuNum = 4 + memorySize = SizeUnit.GIGABYTE.toByte(8) imageUuid = image.uuid l3NetworkUuids = [l3.uuid] - rootDiskOfferingUuid = diskOffering.uuid - } - - VmInstanceInventory newVm2 = createVmInstance { + diskAOs = [ + [ + boot: true, + size: SizeUnit.GIGABYTE.toByte(20) + ] + ] + } as VmInstanceInventory + + def newVm2 = createVmInstance { name = "new-vm" - instanceOfferingUuid = instanceOffering.uuid + cpuNum = 4 + memorySize = SizeUnit.GIGABYTE.toByte(8) imageUuid = image.uuid l3NetworkUuids = [l3.uuid] - rootDiskOfferingUuid = diskOffering.uuid - } + diskAOs = [ + [ + boot: true, + size: SizeUnit.GIGABYTE.toByte(20) + ] + ] + } as VmInstanceInventory attachIsoToVmInstance { vmInstanceUuid = newVm.uuid diff --git a/test/src/test/groovy/org/zstack/test/integration/image/ImageOperationsCase.groovy b/test/src/test/groovy/org/zstack/test/integration/image/ImageOperationsCase.groovy index 3ca81d233b..79b4fac51f 100755 --- a/test/src/test/groovy/org/zstack/test/integration/image/ImageOperationsCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/image/ImageOperationsCase.groovy @@ -18,7 +18,6 @@ import org.zstack.header.volume.CreateDataVolumeTemplateFromDataVolumeReply import org.zstack.header.volume.SyncVolumeSizeMsg import org.zstack.header.volume.SyncVolumeSizeReply import org.zstack.sdk.CreateRootVolumeTemplateFromRootVolumeAction -import org.zstack.sdk.DiskOfferingInventory import org.zstack.sdk.VmInstanceInventory import org.zstack.sdk.VolumeInventory import org.zstack.storage.backup.sftp.SftpBackupStorageConstant @@ -38,7 +37,6 @@ class ImageOperationsCase extends SubCase { DatabaseFacade dbf VmInstanceInventory vm org.zstack.sdk.BackupStorageInventory bs - DiskOfferingInventory disk @Override void setup() { @@ -48,15 +46,6 @@ class ImageOperationsCase extends SubCase { @Override void environment() { env = env { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } sftpBackupStorage { name = "sftp" url = "/sftp" @@ -120,7 +109,8 @@ class ImageOperationsCase extends SubCase { vm { name = "vm" - useInstanceOffering("instanceOffering") + cpu = 4 + memoryGB(8) useImage("image1") useL3Networks("l3") } @@ -341,12 +331,10 @@ class ImageOperationsCase extends SubCase { return rsp } - disk = env.inventoryByName("diskOffering") as DiskOfferingInventory - - VolumeInventory volume = createDataVolume { + def volume = createDataVolume { name = "test-data-volume" - diskOfferingUuid = disk.uuid - } + diskSize = SizeUnit.GIGABYTE.toByte(20) + } as VolumeInventory attachDataVolumeToVm { vmInstanceUuid = vm.uuid @@ -377,10 +365,10 @@ class ImageOperationsCase extends SubCase { bus.reply(msg, reply) } - VolumeInventory volume = createDataVolume { + def volume = createDataVolume { name = "test-data-volume2" - diskOfferingUuid = disk.uuid - } + diskSize = SizeUnit.GIGABYTE.toByte(20) + } as VolumeInventory attachDataVolumeToVm { vmInstanceUuid = vm.uuid diff --git a/test/src/test/groovy/org/zstack/test/integration/image/LinuxImagePlatformOtherHotPluginVolumeCase.groovy b/test/src/test/groovy/org/zstack/test/integration/image/LinuxImagePlatformOtherHotPluginVolumeCase.groovy index 36b71feb45..e1114e20a8 100644 --- a/test/src/test/groovy/org/zstack/test/integration/image/LinuxImagePlatformOtherHotPluginVolumeCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/image/LinuxImagePlatformOtherHotPluginVolumeCase.groovy @@ -14,7 +14,6 @@ import org.zstack.kvm.KVMConstant import org.zstack.network.service.eip.EipConstant import org.zstack.network.service.flat.FlatNetworkServiceConstant import org.zstack.network.service.userdata.UserdataConstant -import org.zstack.sdk.DiskOfferingInventory import org.zstack.sdk.VmInstanceInventory import org.zstack.sdk.VolumeInventory import org.zstack.test.integration.ZStackTest @@ -40,17 +39,6 @@ The vm doesn't support to attach vm, which use image-1 that platform type is oth @Override void environment() { env = env { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(10) - } - sftpBackupStorage { name = "sftp" url = "/sftp" @@ -135,17 +123,19 @@ The vm doesn't support to attach vm, which use image-1 that platform type is oth } vm { + cpu = 4 + memoryGB(8) name = "vm-other" useImage("image-1") useL3Networks("l3") - useInstanceOffering("instanceOffering") } vm { + cpu = 4 + memoryGB(8) name = "vm-2" useImage("image-2") useL3Networks("l3") - useInstanceOffering("instanceOffering") } } @@ -161,12 +151,11 @@ The vm doesn't support to attach vm, which use image-1 that platform type is oth } void testGetCandidateVmForAttaching(){ - def offering = env.inventoryByName("diskOffering") as DiskOfferingInventory def vm = env.inventoryByName("vm-other") as VmInstanceInventory def vm2 = env.inventoryByName("vm-2") as VmInstanceInventory def volume = createDataVolume { name = "test-1" - diskOfferingUuid = offering.uuid + diskSize = SizeUnit.GIGABYTE.toByte(10) } as VolumeInventory //vms are runing @@ -193,11 +182,10 @@ The vm doesn't support to attach vm, which use image-1 that platform type is oth } void testAttachVolumeToVm(){ - def offering = env.inventoryByName("diskOffering") as DiskOfferingInventory def vm = env.inventoryByName("vm-2") as VmInstanceInventory def volume = createDataVolume { name = "test-2" - diskOfferingUuid = offering.uuid + diskSize = SizeUnit.GIGABYTE.toByte(10) } as VolumeInventory KVMAgentCommands.AttachDataVolumeCmd cmd = null @@ -217,10 +205,9 @@ The vm doesn't support to attach vm, which use image-1 that platform type is oth void testAttachVolumeToVmImageOther(){ def vm = env.inventoryByName("vm-other") as VmInstanceInventory - def offering = env.inventoryByName("diskOffering") as DiskOfferingInventory def volume = createDataVolume { name = "test-3" - diskOfferingUuid = offering.uuid + diskSize = SizeUnit.GIGABYTE.toByte(10) } as VolumeInventory UpdateQuery.New(VmInstanceVO.class) diff --git a/test/src/test/groovy/org/zstack/test/integration/image/platform/AddImageToCephBackStorageCase.groovy b/test/src/test/groovy/org/zstack/test/integration/image/platform/AddImageToCephBackStorageCase.groovy index f7c48b5669..e3923898f2 100644 --- a/test/src/test/groovy/org/zstack/test/integration/image/platform/AddImageToCephBackStorageCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/image/platform/AddImageToCephBackStorageCase.groovy @@ -30,16 +30,6 @@ class AddImageToCephBackStorageCase extends SubCase { @Override void environment() { env = env { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - zone { name = "zone" description = "test" diff --git a/test/src/test/groovy/org/zstack/test/integration/image/platform/AddImageToSftpBackStorageCase.groovy b/test/src/test/groovy/org/zstack/test/integration/image/platform/AddImageToSftpBackStorageCase.groovy index 2568f55470..b16e4ac457 100644 --- a/test/src/test/groovy/org/zstack/test/integration/image/platform/AddImageToSftpBackStorageCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/image/platform/AddImageToSftpBackStorageCase.groovy @@ -9,11 +9,9 @@ import org.zstack.sdk.VmInstanceInventory import org.zstack.storage.backup.sftp.SftpBackupStorageCommands import org.zstack.storage.backup.sftp.SftpBackupStorageConstant import org.zstack.test.integration.ZStackTest -import org.zstack.testlib.BackupStorageSpec import org.zstack.testlib.EnvSpec import org.zstack.testlib.SubCase import org.zstack.utils.data.SizeUnit -import org.zstack.utils.gson.JSONObjectUtil /** * Created by shixin on 2018/03/21. @@ -31,16 +29,6 @@ class AddImageToSftpBackStorageCase extends SubCase { @Override void environment() { env = env { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - zone { name = "zone" description = "test" diff --git a/test/src/test/groovy/org/zstack/test/integration/image/platform/CreateRootVolumeTemplateFromVolumeSnapshotCase.groovy b/test/src/test/groovy/org/zstack/test/integration/image/platform/CreateRootVolumeTemplateFromVolumeSnapshotCase.groovy index db2ab7dbc1..e4f294143e 100644 --- a/test/src/test/groovy/org/zstack/test/integration/image/platform/CreateRootVolumeTemplateFromVolumeSnapshotCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/image/platform/CreateRootVolumeTemplateFromVolumeSnapshotCase.groovy @@ -30,15 +30,6 @@ class CreateRootVolumeTemplateFromVolumeSnapshotCase extends SubCase { @Override void environment() { env = env { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } sftpBackupStorage { name = "sftp" url = "/sftp" @@ -103,10 +94,14 @@ class CreateRootVolumeTemplateFromVolumeSnapshotCase extends SubCase { vm { name = "vm" - useInstanceOffering("instanceOffering") + cpu = 4 + memoryGB(8) useImage("image") useL3Networks("l3") - useDiskOfferings("diskOffering") + disk { + boot = true + sizeGB(20) + } } } } @@ -152,12 +147,13 @@ class CreateRootVolumeTemplateFromVolumeSnapshotCase extends SubCase { assert osType == image.guestOsType assert archType == image.architecture - VmInstanceInventory newVm = createVmInstance { + def newVm = createVmInstance { name = "new-image-vm" l3NetworkUuids = [vm.getDefaultL3NetworkUuid()] - instanceOfferingUuid = vm.instanceOfferingUuid + cpuNum = 4 + memorySize = SizeUnit.GIGABYTE.toByte(8) imageUuid = vm.imageUuid - } + } as VmInstanceInventory assert vm.platform == newVm.platform diff --git a/test/src/test/groovy/org/zstack/test/integration/kvm/vm/CreateVmWithVolumeTagsCase.groovy b/test/src/test/groovy/org/zstack/test/integration/kvm/vm/CreateVmWithVolumeTagsCase.groovy index c90357812a..eaee4a03c7 100644 --- a/test/src/test/groovy/org/zstack/test/integration/kvm/vm/CreateVmWithVolumeTagsCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/kvm/vm/CreateVmWithVolumeTagsCase.groovy @@ -1,11 +1,10 @@ package org.zstack.test.integration.kvm.vm -import org.zstack.sdk.CreateVmInstanceAction import org.zstack.sdk.ImageInventory -import org.zstack.sdk.InstanceOfferingInventory import org.zstack.sdk.L3NetworkInventory import org.zstack.sdk.TagInventory +import org.zstack.sdk.VmInstanceInventory import org.zstack.test.integration.kvm.KvmTest import org.zstack.testlib.EnvSpec import org.zstack.testlib.SubCase @@ -27,17 +26,6 @@ class CreateVmWithVolumeTagsCase extends SubCase { @Override void environment() { env = env { - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(20) - } - sftpBackupStorage { name = "sftp" url = "/sftp" @@ -118,21 +106,28 @@ class CreateVmWithVolumeTagsCase extends SubCase { } void createVmWithVolumeTags() { - InstanceOfferingInventory instanceOffering = env.inventoryByName("instanceOffering") - ImageInventory image = env.inventoryByName("image1") - L3NetworkInventory pubL3 = env.inventoryByName("pubL3") - - CreateVmInstanceAction action = new CreateVmInstanceAction() - action.name = "vm" - action.instanceOfferingUuid = instanceOffering.uuid - action.imageUuid = image.uuid - action.l3NetworkUuids = [pubL3.uuid] - action.rootVolumeSystemTags = ["volumeMaxIncrementalSnapshotNum::10"] - action.dataVolumeSystemTags = ["volumeMaxIncrementalSnapshotNum::10"] - action.sessionId = adminSession() - CreateVmInstanceAction.Result result = action.call() - - List tags = querySystemTag {conditions=["resourceUuid=${result.value.inventory.rootVolumeUuid}".toString()]} + def image = env.inventoryByName("image1") as ImageInventory + def pubL3 = env.inventoryByName("pubL3") as L3NetworkInventory + + def result = createVmInstance { + delegate.name = "vm" + delegate.cpuNum = 4 + delegate.memorySize = SizeUnit.GIGABYTE.toByte(8) + delegate.l3NetworkUuids = [pubL3.uuid] + delegate.imageUuid = image.uuid + delegate.diskAOs = [ + [ + boot : true, + systemTags : [ + "volumeMaxIncrementalSnapshotNum::10" + ] + ], + ] + } as VmInstanceInventory + + def tags = querySystemTag { + conditions=["resourceUuid=${result.rootVolumeUuid}".toString()] + } as List assert tags.tag.contains("volumeMaxIncrementalSnapshotNum::10") } } diff --git a/test/src/test/groovy/org/zstack/test/integration/kvm/vm/DiskAOCase.groovy b/test/src/test/groovy/org/zstack/test/integration/kvm/vm/DiskAOCase.groovy new file mode 100644 index 0000000000..a330080570 --- /dev/null +++ b/test/src/test/groovy/org/zstack/test/integration/kvm/vm/DiskAOCase.groovy @@ -0,0 +1,123 @@ +package org.zstack.test.integration.kvm.vm + +import org.zstack.sdk.VmInstanceInventory +import org.zstack.sdk.VolumeInventory +import org.zstack.test.integration.kvm.KvmTest +import org.zstack.testlib.EnvSpec +import org.zstack.testlib.SubCase +import org.zstack.utils.data.SizeUnit + +/** + * Created by lining on 2018/01/24. + */ +class DiskAOCase extends SubCase { + EnvSpec env + + @Override + void setup() { + useSpring(KvmTest.springSpec) + } + + @Override + void environment() { + env = env { + sftpBackupStorage { + name = "sftp" + url = "/sftp" + username = "root" + password = "password" + hostname = "localhost" + + image { + name = "image" + url = "http://zstack.org/download/test.qcow2" + } + } + + zone { + name = "zone" + description = "test" + + cluster { + name = "cluster" + hypervisorType = "KVM" + + kvm { + name = "kvm" + managementIp = "localhost" + username = "root" + password = "password" + } + + attachPrimaryStorage("local") + attachL2Network("l2") + } + + localPrimaryStorage { + name = "local" + url = "/local_ps" + } + + l2NoVlanNetwork { + name = "l2" + physicalInterface = "eth0" + + l3Network { + name = "l3" + + ip { + startIp = "192.168.100.10" + endIp = "192.168.100.100" + netmask = "255.255.255.0" + gateway = "192.168.100.1" + } + } + } + + attachBackupStorage("sftp") + } + + vm { + name = "vm1" + memoryGB(8) + cpu = 4 + disk { + sizeGB(20) + platform = "Linux" + guestOsType = "Linux" + architecture = "x86_64" + } + disk { + sizeGB(30) + } + useL3Networks("l3") + } + } + } + + @Override + void test() { + env.create { + testCheckVm1() + } + } + + void testCheckVm1() { + logger.info("Test 001: test check VM 1") + def vm = env.inventoryByName("vm1") as VmInstanceInventory + assert vm.allVolumes.size() == 2 + + def rootVolume = (vm.allVolumes as List).find { it.type == "Root"} + assert rootVolume != null + assert rootVolume.size == SizeUnit.GIGABYTE.toByte(20) + + def dataVolume1 = (vm.allVolumes as List).find { it.type == "Data"} + assert dataVolume1 != null + assert dataVolume1.size == SizeUnit.GIGABYTE.toByte(30) + } + + @Override + void clean() { + env.delete() + } +} diff --git a/test/src/test/groovy/org/zstack/test/integration/storage/primary/addon/zbs/ZbsPrimaryStorageCase.groovy b/test/src/test/groovy/org/zstack/test/integration/storage/primary/addon/zbs/ZbsPrimaryStorageCase.groovy index e7a8ba5b6c..5fc8f14aa9 100644 --- a/test/src/test/groovy/org/zstack/test/integration/storage/primary/addon/zbs/ZbsPrimaryStorageCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/storage/primary/addon/zbs/ZbsPrimaryStorageCase.groovy @@ -4,10 +4,14 @@ import org.springframework.http.HttpEntity import org.zstack.core.db.Q import org.zstack.header.storage.addon.primary.ExternalPrimaryStorageVO import org.zstack.header.storage.addon.primary.ExternalPrimaryStorageVO_ +import org.zstack.header.storage.primary.PrimaryStorageHostRefVO +import org.zstack.header.storage.primary.PrimaryStorageHostRefVO_ import org.zstack.header.storage.primary.PrimaryStorageStatus import org.zstack.cbd.MdsUri +import org.zstack.kvm.KVMAgentCommands import org.zstack.sdk.* import org.zstack.storage.primary.PrimaryStorageGlobalConfig +import org.zstack.header.storage.primary.PrimaryStorageHostStatus import org.zstack.storage.volume.VolumeGlobalConfig import org.zstack.storage.zbs.ZbsConstants import org.zstack.storage.zbs.ZbsPrimaryStorageMdsBase @@ -30,6 +34,7 @@ class ZbsPrimaryStorageCase extends SubCase { PrimaryStorageInventory ps DiskOfferingInventory diskOffering VolumeInventory vol, vol2 + KVMHostInventory kvm @Override void clean() { @@ -146,18 +151,58 @@ class ZbsPrimaryStorageCase extends SubCase { cluster = env.inventoryByName("cluster") as ClusterInventory ps = env.inventoryByName("zbs-1") as PrimaryStorageInventory diskOffering = env.inventoryByName("diskOffering") as DiskOfferingInventory + kvm = env.inventoryByName("kvm-1") as KVMHostInventory testDefaultConfig() testUpdateExternalPrimaryStorage() testLifecycle() testDataVolumeLifecycle() testMdsPing() + testCheckHostStorageConnection() testNegativeScenario() testDataVolumeNegativeScenario() testDecodeMdsUriWithSpecialPassword() } } + void testCheckHostStorageConnection() { + attachPrimaryStorageToCluster { + primaryStorageUuid = ps.uuid + clusterUuid = cluster.uuid + } + + env.afterSimulator(ZbsStorageController.CHECK_HOST_STORAGE_CONNECTION_PATH) { rsp, HttpEntity e -> + ZbsStorageController.CheckHostStorageConnectionCmd cmd = JSONObjectUtil.toObject(e.body, ZbsStorageController.CheckHostStorageConnectionCmd) + + ZbsStorageController.CheckHostStorageConnectionRsp checkHostStorageConnectionRsp = new ZbsStorageController.CheckHostStorageConnectionRsp() + checkHostStorageConnectionRsp.error = "fake error" + checkHostStorageConnectionRsp.success = false + + return checkHostStorageConnectionRsp + } + + expect(AssertionError.class) { + reconnectHost { + uuid = kvm.getUuid() + } + } + + retryInSecs { + assert Q.New(PrimaryStorageHostRefVO.class) + .eq(PrimaryStorageHostRefVO_.primaryStorageUuid, ps.uuid) + .eq(PrimaryStorageHostRefVO_.hostUuid, kvm.getUuid()) + .eq(PrimaryStorageHostRefVO_.status, PrimaryStorageHostStatus.Disconnected) + .count() == 1 + } + + env.cleanSimulatorAndMessageHandlers() + + detachPrimaryStorageFromCluster { + primaryStorageUuid = ps.uuid + clusterUuid = cluster.uuid + } + } + void testUpdateExternalPrimaryStorage() { expect(AssertionError.class) { updateExternalPrimaryStorage { @@ -184,6 +229,17 @@ class ZbsPrimaryStorageCase extends SubCase { .findValue() assert !addonInfo.contains("127.0.1.3") + updateExternalPrimaryStorage { + uuid = ps.uuid + config = "{\"mdsUrls\":[\"root:password@127.0.1.1:33\",\"root:password@127.0.1.2\"],\"logicalPoolName\":\"lpool1\"}" + } + + addonInfo = Q.New(ExternalPrimaryStorageVO.class) + .select(ExternalPrimaryStorageVO_.addonInfo) + .eq(ExternalPrimaryStorageVO_.uuid, ps.uuid) + .findValue() + assert addonInfo.contains("\"port\":33,\"addr\":\"127.0.1.1\"") + updateExternalPrimaryStorage { uuid = ps.uuid config = "{\"mdsUrls\":[\"root:password@127.0.1.1\",\"root:password@127.0.1.2\",\"root:password@127.0.1.3\"],\"logicalPoolName\":\"lpool1\"}" @@ -265,7 +321,7 @@ class ZbsPrimaryStorageCase extends SubCase { def addonInfo = Q.New(ExternalPrimaryStorageVO.class).select(ExternalPrimaryStorageVO_.addonInfo).eq(ExternalPrimaryStorageVO_.uuid, ps.uuid).findValue() - assert addonInfo == "{\"mdsInfos\":[{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.1\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.2\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.3\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"}],\"logicalPoolInfos\":[{\"physicalPoolID\":1,\"redundanceAndPlaceMentPolicy\":{\"copysetNum\":300,\"replicaNum\":3,\"zoneNum\":3},\"logicalPoolID\":1,\"usedSize\":322961408,\"quota\":0,\"createTime\":1735875794,\"type\":0,\"rawWalUsedSize\":0,\"allocateStatus\":0,\"rawUsedSize\":968884224,\"physicalPoolName\":\"pool1\",\"capacity\":579933831168,\"logicalPoolName\":\"lpool1\",\"userPolicy\":\"eyJwb2xpY3kiIDogMX0=\",\"allocatedSize\":3221225472}]}" + assert addonInfo == "{\"clusterInfo\":{\"uuid\":\"123456789\",\"version\":\"1.6.1-for-test\"},\"mdsInfos\":[{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.1\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.2\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.3\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"}],\"logicalPoolInfos\":[{\"physicalPoolID\":1,\"redundanceAndPlaceMentPolicy\":{\"copysetNum\":300,\"replicaNum\":3,\"zoneNum\":3},\"logicalPoolID\":1,\"usedSize\":322961408,\"quota\":0,\"createTime\":1735875794,\"type\":0,\"rawWalUsedSize\":0,\"allocateStatus\":0,\"rawUsedSize\":968884224,\"physicalPoolName\":\"pool1\",\"capacity\":579933831168,\"logicalPoolName\":\"lpool1\",\"userPolicy\":\"eyJwb2xpY3kiIDogMX0=\",\"allocatedSize\":3221225472}]}" env.afterSimulator(ZbsPrimaryStorageMdsBase.PING_PATH) { rsp, HttpEntity e -> def cmd = JSONObjectUtil.toObject(e.body, ZbsPrimaryStorageMdsBase.PingCmd.class) @@ -282,7 +338,7 @@ class ZbsPrimaryStorageCase extends SubCase { addonInfo = Q.New(ExternalPrimaryStorageVO.class).select(ExternalPrimaryStorageVO_.addonInfo).eq(ExternalPrimaryStorageVO_.uuid, ps.uuid).findValue() - assert addonInfo == "{\"mdsInfos\":[{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.1\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Disconnected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.2\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.3\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"}],\"logicalPoolInfos\":[{\"physicalPoolID\":1,\"redundanceAndPlaceMentPolicy\":{\"copysetNum\":300,\"replicaNum\":3,\"zoneNum\":3},\"logicalPoolID\":1,\"usedSize\":322961408,\"quota\":0,\"createTime\":1735875794,\"type\":0,\"rawWalUsedSize\":0,\"allocateStatus\":0,\"rawUsedSize\":968884224,\"physicalPoolName\":\"pool1\",\"capacity\":579933831168,\"logicalPoolName\":\"lpool1\",\"userPolicy\":\"eyJwb2xpY3kiIDogMX0=\",\"allocatedSize\":3221225472}]}" + assert addonInfo == "{\"clusterInfo\":{\"uuid\":\"123456789\",\"version\":\"1.6.1-for-test\"},\"mdsInfos\":[{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.1\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Disconnected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.2\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.3\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Connected\"}],\"logicalPoolInfos\":[{\"physicalPoolID\":1,\"redundanceAndPlaceMentPolicy\":{\"copysetNum\":300,\"replicaNum\":3,\"zoneNum\":3},\"logicalPoolID\":1,\"usedSize\":322961408,\"quota\":0,\"createTime\":1735875794,\"type\":0,\"rawWalUsedSize\":0,\"allocateStatus\":0,\"rawUsedSize\":968884224,\"physicalPoolName\":\"pool1\",\"capacity\":579933831168,\"logicalPoolName\":\"lpool1\",\"userPolicy\":\"eyJwb2xpY3kiIDogMX0=\",\"allocatedSize\":3221225472}]}" assert Q.New(ExternalPrimaryStorageVO.class).select(ExternalPrimaryStorageVO_.status).eq(ExternalPrimaryStorageVO_.uuid, ps.uuid).findValue() == PrimaryStorageStatus.Connected @@ -307,15 +363,13 @@ class ZbsPrimaryStorageCase extends SubCase { addonInfo = Q.New(ExternalPrimaryStorageVO.class).select(ExternalPrimaryStorageVO_.addonInfo).eq(ExternalPrimaryStorageVO_.uuid, ps.uuid).findValue() - assert addonInfo == "{\"mdsInfos\":[{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.1\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Disconnected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.2\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Disconnected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.3\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Disconnected\"}],\"logicalPoolInfos\":[{\"physicalPoolID\":1,\"redundanceAndPlaceMentPolicy\":{\"copysetNum\":300,\"replicaNum\":3,\"zoneNum\":3},\"logicalPoolID\":1,\"usedSize\":322961408,\"quota\":0,\"createTime\":1735875794,\"type\":0,\"rawWalUsedSize\":0,\"allocateStatus\":0,\"rawUsedSize\":968884224,\"physicalPoolName\":\"pool1\",\"capacity\":579933831168,\"logicalPoolName\":\"lpool1\",\"userPolicy\":\"eyJwb2xpY3kiIDogMX0=\",\"allocatedSize\":3221225472}]}" + assert addonInfo == "{\"clusterInfo\":{\"uuid\":\"123456789\",\"version\":\"1.6.1-for-test\"},\"mdsInfos\":[{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.1\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Disconnected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.2\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Disconnected\"},{\"username\":\"root\",\"password\":\"password\",\"port\":22,\"addr\":\"127.0.1.3\",\"externalAddr\":\"127.0.0.1\",\"status\":\"Disconnected\"}],\"logicalPoolInfos\":[{\"physicalPoolID\":1,\"redundanceAndPlaceMentPolicy\":{\"copysetNum\":300,\"replicaNum\":3,\"zoneNum\":3},\"logicalPoolID\":1,\"usedSize\":322961408,\"quota\":0,\"createTime\":1735875794,\"type\":0,\"rawWalUsedSize\":0,\"allocateStatus\":0,\"rawUsedSize\":968884224,\"physicalPoolName\":\"pool1\",\"capacity\":579933831168,\"logicalPoolName\":\"lpool1\",\"userPolicy\":\"eyJwb2xpY3kiIDogMX0=\",\"allocatedSize\":3221225472}]}" assert Q.New(ExternalPrimaryStorageVO.class).select(ExternalPrimaryStorageVO_.status).eq(ExternalPrimaryStorageVO_.uuid, ps.uuid).findValue() == PrimaryStorageStatus.Disconnected env.cleanAfterSimulatorHandlers() - reconnectPrimaryStorage { - uuid = ps.uuid - } + sleep(2000) Q.New(ExternalPrimaryStorageVO.class).select(ExternalPrimaryStorageVO_.status).eq(ExternalPrimaryStorageVO_.uuid, ps.uuid).findValue() == PrimaryStorageStatus.Connected diff --git a/test/src/test/groovy/org/zstack/test/integration/storage/primary/ceph/CephPrimaryStorageVolumePoolsCase.groovy b/test/src/test/groovy/org/zstack/test/integration/storage/primary/ceph/CephPrimaryStorageVolumePoolsCase.groovy index 6f95c49e3e..75afaea92e 100755 --- a/test/src/test/groovy/org/zstack/test/integration/storage/primary/ceph/CephPrimaryStorageVolumePoolsCase.groovy +++ b/test/src/test/groovy/org/zstack/test/integration/storage/primary/ceph/CephPrimaryStorageVolumePoolsCase.groovy @@ -105,26 +105,10 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { } } - diskOffering { - name = "diskOffering" - diskSize = SizeUnit.GIGABYTE.toByte(10) - } - - instanceOffering { - name = "instanceOffering" - memory = SizeUnit.GIGABYTE.toByte(8) - cpu = 4 - } - - instanceOffering { - name = "instanceOffering2" - memory = SizeUnit.GIGABYTE.toByte(1) - cpu = 1 - } - vm { name = "vm" - useInstanceOffering("instanceOffering") + cpu = 4 + memoryGB(8) useImage("image") useL3Networks("l3") } @@ -134,10 +118,8 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { VmInstanceInventory vm VmInstanceInventory root_pool_vm - DiskOfferingInventory diskOffering CephPrimaryStorageInventory primaryStorage L3NetworkInventory l3 - InstanceOfferingInventory instanceOffering2 ImageInventory image void testCreateDataVolumeInPool() { @@ -151,7 +133,7 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { VolumeInventory vol = createDataVolume { name = "data" primaryStorageUuid = primaryStorage.uuid - diskOfferingUuid = diskOffering.uuid + diskSize = SizeUnit.GIGABYTE.toByte(10) systemTags = [CephSystemTags.USE_CEPH_PRIMARY_STORAGE_POOL.instantiateTag([(CephSystemTags.USE_CEPH_PRIMARY_STORAGE_POOL_TOKEN) : HIGH_POOL_NAME])] } @@ -173,7 +155,7 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { VolumeInventory vol = createDataVolume { name = "data" primaryStorageUuid = primaryStorage.uuid - diskOfferingUuid = diskOffering.uuid + diskSize = SizeUnit.GIGABYTE.toByte(10) } String dataVolumePoolName = CephSystemTags.DEFAULT_CEPH_PRIMARY_STORAGE_DATA_VOLUME_POOL.getTokenByResourceUuid(primaryStorage.uuid, CephSystemTags.DEFAULT_CEPH_PRIMARY_STORAGE_DATA_VOLUME_POOL_TOKEN) @@ -182,22 +164,6 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { assert cmd.installPath.contains(dataVolumePoolName) } - void testVmRootAndDataVolumeUseDesignatedPool() { - String rootVolumePoolName = CephSystemTags.USE_CEPH_ROOT_POOL.getTokenByResourceUuid(root_pool_vm.rootVolumeUuid,CephSystemTags.USE_CEPH_ROOT_POOL_TOKEN) - VolumeInventory rootVolume = root_pool_vm.allVolumes.find { it.uuid == root_pool_vm.rootVolumeUuid } - - String defaultDataVolumePoolName = CephSystemTags.DEFAULT_CEPH_PRIMARY_STORAGE_DATA_VOLUME_POOL.getTokenByResourceUuid(primaryStorage.uuid, CephSystemTags.DEFAULT_CEPH_PRIMARY_STORAGE_DATA_VOLUME_POOL_TOKEN) - VolumeInventory dataVolume = root_pool_vm.allVolumes.find { it.type == DATA_POOL_TYPE } - - assert rootVolumePoolName != null - assert rootVolume != null - assert rootVolume.installPath.contains(rootVolumePoolName) - - assert defaultDataVolumePoolName != null - assert dataVolume != null - assert !dataVolume.installPath.contains(defaultDataVolumePoolName) - } - void testVmRootVolumeUseDefaultPool() { String rootVolumePoolName = CephSystemTags.DEFAULT_CEPH_PRIMARY_STORAGE_ROOT_VOLUME_POOL.getTokenByResourceUuid(primaryStorage.uuid, CephSystemTags.DEFAULT_CEPH_PRIMARY_STORAGE_ROOT_VOLUME_POOL_TOKEN) VolumeInventory rootVolume = vm.allVolumes.find { it.uuid == vm.rootVolumeUuid } @@ -318,27 +284,66 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { L3NetworkSpec l3Spec = env.specByName("l3") root_pool_vm = createVmInstance { name = "new_root_pool_vm" - instanceOfferingUuid = vm.instanceOfferingUuid + cpuNum = 4 + memorySize = SizeUnit.GIGABYTE.toByte(8) imageUuid = vm.imageUuid l3NetworkUuids = asList((l3Spec.inventory.uuid)) - dataDiskOfferingUuids = [diskOffering.uuid] sessionId = adminSession() - rootVolumeSystemTags = [CephSystemTags.USE_CEPH_ROOT_POOL.instantiateTag([(CephSystemTags.USE_CEPH_ROOT_POOL_TOKEN) : NEW_ROOT_POOL_NAME])] - dataVolumeSystemTags = [CephSystemTags.USE_CEPH_PRIMARY_STORAGE_POOL.instantiateTag([(CephSystemTags.USE_CEPH_PRIMARY_STORAGE_POOL_TOKEN) : HIGH_POOL_NAME])] systemTags = ["primaryStorageUuidForDataVolume::${primaryStorage.uuid}".toString()] + diskAOs = [ + [ + boot : true, + systemTags : [ + CephSystemTags.USE_CEPH_ROOT_POOL.instantiateTag([(CephSystemTags.USE_CEPH_ROOT_POOL_TOKEN) : NEW_ROOT_POOL_NAME]), + ] + ], + [ + size : SizeUnit.GIGABYTE.toByte(10), + systemTags : [ + CephSystemTags.USE_CEPH_PRIMARY_STORAGE_POOL.instantiateTag([(CephSystemTags.USE_CEPH_PRIMARY_STORAGE_POOL_TOKEN) : HIGH_POOL_NAME]), + ] + ], + ] } as VmInstanceInventory + + logger.info("Test 001: testVmRootAndDataVolumeUseDesignatedPool") + String rootVolumePoolName = CephSystemTags.USE_CEPH_ROOT_POOL.getTokenByResourceUuid(root_pool_vm.rootVolumeUuid,CephSystemTags.USE_CEPH_ROOT_POOL_TOKEN) + VolumeInventory rootVolume = root_pool_vm.allVolumes.find { it.uuid == root_pool_vm.rootVolumeUuid } + + String defaultDataVolumePoolName = CephSystemTags.DEFAULT_CEPH_PRIMARY_STORAGE_DATA_VOLUME_POOL.getTokenByResourceUuid(primaryStorage.uuid, CephSystemTags.DEFAULT_CEPH_PRIMARY_STORAGE_DATA_VOLUME_POOL_TOKEN) + VolumeInventory dataVolume = root_pool_vm.allVolumes.find { it.type == DATA_POOL_TYPE } + + assert rootVolumePoolName != null + assert rootVolume != null + assert rootVolume.installPath.contains(rootVolumePoolName) + + assert defaultDataVolumePoolName != null + assert dataVolume != null + assert !dataVolume.installPath.contains(defaultDataVolumePoolName) } void testReimageVmAndAllocatePool() { + env.cleanSimulatorHandlers() + L3NetworkSpec l3Spec = env.specByName("l3") as L3NetworkSpec VmInstanceInventory new_root_pool_vm = createVmInstance { name = "new_root_pool_vm" - instanceOfferingUuid = vm.instanceOfferingUuid + cpuNum = 4 + memorySize = SizeUnit.GIGABYTE.toByte(8) imageUuid = vm.imageUuid l3NetworkUuids = asList((l3Spec.inventory.uuid)) - dataDiskOfferingUuids = [diskOffering.uuid] sessionId = adminSession() - rootVolumeSystemTags = [CephSystemTags.USE_CEPH_ROOT_POOL.instantiateTag([(CephSystemTags.USE_CEPH_ROOT_POOL_TOKEN): NEW_ROOT_POOL_NAME])] + diskAOs = [ + [ + boot : true, + systemTags : [ + CephSystemTags.USE_CEPH_ROOT_POOL.instantiateTag([(CephSystemTags.USE_CEPH_ROOT_POOL_TOKEN): NEW_ROOT_POOL_NAME]), + ] + ], + [ + size : SizeUnit.GIGABYTE.toByte(10), + ], + ] } as VmInstanceInventory stopVmInstance { @@ -359,12 +364,24 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { description = "use one dataDiskSize and check volume install path" l3NetworkUuids = [l3.uuid] imageUuid = image.uuid - instanceOfferingUuid = instanceOffering2.uuid + cpuNum = 1 + memorySize = SizeUnit.GIGABYTE.toByte(1) primaryStorageUuidForRootVolume = primaryStorage.uuid - dataDiskSizes = [SizeUnit.GIGABYTE.toByte(1)] systemTags = [VmSystemTags.PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME.instantiateTag([(VmSystemTags.PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME_TOKEN): primaryStorage.uuid])] - rootVolumeSystemTags = ["ceph::rootPoolName::new_root_pool"] - dataVolumeSystemTags = ["ceph::pool::new_data_pool"] + diskAOs = [ + [ + boot : true, + systemTags : [ + "ceph::rootPoolName::new_root_pool", + ] + ], + [ + size : SizeUnit.GIGABYTE.toByte(1), + systemTags : [ + "ceph::pool::new_data_pool", + ] + ], + ] } as VmInstanceInventory String rootVolumeInstallPath = Q.New(VolumeVO.class).select(VolumeVO_.installPath).eq(VolumeVO_.uuid, vm1.rootVolumeUuid).findValue() @@ -375,25 +392,7 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { deleteVm(vm1.uuid) deleteVolume(dataVolumeUuid) - VmInstanceInventory vm2 = createVmInstance { - name = "vm2" - description = "use diskOffering and dataDiskSize and check the nums of volume" - l3NetworkUuids = [l3.uuid] - imageUuid = image.uuid - instanceOfferingUuid = instanceOffering2.uuid - primaryStorageUuidForRootVolume = primaryStorage.uuid - dataDiskOfferingUuids = [diskOffering.uuid] - dataDiskSizes = [SizeUnit.GIGABYTE.toByte(1), SizeUnit.GIGABYTE.toByte(1), SizeUnit.GIGABYTE.toByte(2)] - systemTags = [VmSystemTags.PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME.instantiateTag([(VmSystemTags.PRIMARY_STORAGE_UUID_FOR_DATA_VOLUME_TOKEN): primaryStorage.uuid])] - rootVolumeSystemTags = ["ceph::rootPoolName::new_root_pool"] - dataVolumeSystemTags = ["ceph::pool::new_data_pool"] - } as VmInstanceInventory - assert vm2.allVolumes.size() == 5 - List dataVolumeUuids = vm2.allVolumes.stream().map({ it -> it.uuid }).filter { uuid -> uuid != vm2.rootVolumeUuid }.collect() - List dataVolumeInstallPaths = Q.New(VolumeVO.class).select(VolumeVO_.installPath).in(VolumeVO_.uuid, dataVolumeUuids).listValues() - dataVolumeInstallPaths.forEach({ path -> assert path.contains("new_data_pool") }) - deleteVm(vm2.uuid) - vm2.allVolumes.stream().filter { uuid -> uuid != vm2.rootVolumeUuid }.forEach { it -> deleteVolume(it.uuid) } + // disk offering is deprecated soon } void deleteVm(String vmUuid) { @@ -418,15 +417,12 @@ class CephPrimaryStorageVolumePoolsCase extends SubCase { void test() { env.create { vm = (env.specByName("vm") as VmSpec).inventory - diskOffering = (env.specByName("diskOffering") as DiskOfferingSpec).inventory primaryStorage = (env.specByName("ceph-pri") as CephPrimaryStorageSpec).inventory l3 = env.inventoryByName("l3") as L3NetworkInventory - instanceOffering2 = env.inventoryByName("instanceOffering2") as InstanceOfferingInventory image = env.inventoryByName("image") as ImageInventory createRootPoolVm() testVmRootVolumeUseDefaultPool() - testVmRootAndDataVolumeUseDesignatedPool() testCreateDataVolumeInPool() testCreateDataVolumeInDefaultPool() testAddAndDeletePool() diff --git a/test/src/test/java/org/zstack/test/TestScriptRunner.java b/test/src/test/java/org/zstack/test/TestScriptRunner.java index 3bdc9f8c86..4f1d7eb82e 100755 --- a/test/src/test/java/org/zstack/test/TestScriptRunner.java +++ b/test/src/test/java/org/zstack/test/TestScriptRunner.java @@ -1,21 +1,31 @@ package org.zstack.test; +import org.apache.commons.io.FileUtils; import org.junit.Test; +import org.zstack.utils.path.PathUtil; import org.zstack.utils.ssh.Ssh; import org.zstack.utils.ssh.SshResult; +import java.io.File; +import java.nio.charset.StandardCharsets; + import static org.zstack.utils.CollectionDSL.e; import static org.zstack.utils.CollectionDSL.map; +import static org.zstack.utils.StringDSL.s; /** * Created by frank on 4/22/2015. */ public class TestScriptRunner { @Test - public void test() { + public void test() throws Exception { + String scriptPath = PathUtil.findFileOnClassPath("scripts/check-public-dns-name.sh", true).getAbsolutePath(); + String contents = FileUtils.readFileToString(new File(scriptPath), StandardCharsets.UTF_8); + String scriptContent = s(contents).formatByMap(map(e("dnsCheckList", "google.com"))); + SshResult ret = new Ssh().setHostname("localhost") .setUsername("root").setPassword("password") - .script("scripts/check-public-dns-name.sh", map(e("dnsCheckList", "google.com"))).runAndClose(); + .shell(scriptContent).runAndClose(); ret.raiseExceptionIfFailed(); } } diff --git a/testlib/pom.xml b/testlib/pom.xml index b083ad35df..a0063ff1a5 100644 --- a/testlib/pom.xml +++ b/testlib/pom.xml @@ -202,6 +202,11 @@ ldap ${project.version} + + org.zstack + external-service + ${project.version} + com.google.jimfs jimfs diff --git a/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy b/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy index 7ba07fffc1..9d09babcce 100644 --- a/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy +++ b/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy @@ -1,7 +1,5 @@ package org.zstack.testlib -import org.zstack.sdk.QueryVmInstanceResourceMetadataArchiveAction -import org.zstack.sdk.QueryVmInstanceResourceMetadataGroupAction import org.zstack.utils.gson.JSONObjectUtil import org.zstack.core.Platform @@ -613,89 +611,8 @@ abstract class ApiHelper { } - def addAliyunEbsBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddAliyunEbsBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddAliyunEbsBackupStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def addAliyunEbsPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddAliyunEbsPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddAliyunEbsPrimaryStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def addAliyunKeySecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddAliyunKeySecretAction.class) Closure c) { - def a = new org.zstack.sdk.AddAliyunKeySecretAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def addAliyunNasAccessGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddAliyunNasAccessGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddAliyunNasAccessGroupAction() + def addBackendServerToServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBackendServerToServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AddBackendServerToServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -721,8 +638,8 @@ abstract class ApiHelper { } - def addAliyunNasFileSystem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddAliyunNasFileSystemAction.class) Closure c) { - def a = new org.zstack.sdk.AddAliyunNasFileSystemAction() + def addBackupStoragesToReplicationGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBackupStoragesToReplicationGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AddBackupStoragesToReplicationGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -748,8 +665,8 @@ abstract class ApiHelper { } - def addAliyunNasMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddAliyunNasMountTargetAction.class) Closure c) { - def a = new org.zstack.sdk.AddAliyunNasMountTargetAction() + def addBlockPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBlockPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddBlockPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -775,8 +692,8 @@ abstract class ApiHelper { } - def addAliyunNasPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddAliyunNasPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddAliyunNasPrimaryStorageAction() + def addCCSCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCCSCertificateAction.class) Closure c) { + def a = new org.zstack.sdk.AddCCSCertificateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -802,8 +719,8 @@ abstract class ApiHelper { } - def addAliyunPanguPartition(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddAliyunPanguPartitionAction.class) Closure c) { - def a = new org.zstack.sdk.AddAliyunPanguPartitionAction() + def addCephBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCephBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddCephBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -829,8 +746,8 @@ abstract class ApiHelper { } - def addBackendServerToServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBackendServerToServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddBackendServerToServerGroupAction() + def addCephPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCephPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddCephPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -856,8 +773,8 @@ abstract class ApiHelper { } - def addBackupStoragesToReplicationGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBackupStoragesToReplicationGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddBackupStoragesToReplicationGroupAction() + def addCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCephPrimaryStoragePoolAction.class) Closure c) { + def a = new org.zstack.sdk.AddCephPrimaryStoragePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -883,8 +800,8 @@ abstract class ApiHelper { } - def addBareMetal2Gateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBareMetal2GatewayAction.class) Closure c) { - def a = new org.zstack.sdk.AddBareMetal2GatewayAction() + def addCertificateToLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCertificateToLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.AddCertificateToLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -910,8 +827,8 @@ abstract class ApiHelper { } - def addBareMetal2IpmiChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBareMetal2IpmiChassisAction.class) Closure c) { - def a = new org.zstack.sdk.AddBareMetal2IpmiChassisAction() + def addDisasterImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddDisasterImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddDisasterImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -937,8 +854,8 @@ abstract class ApiHelper { } - def addBlockPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddBlockPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddBlockPrimaryStorageAction() + def addDnsToL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddDnsToL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.AddDnsToL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -964,8 +881,8 @@ abstract class ApiHelper { } - def addCCSCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCCSCertificateAction.class) Closure c) { - def a = new org.zstack.sdk.AddCCSCertificateAction() + def addDnsToVpcRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddDnsToVpcRouterAction.class) Closure c) { + def a = new org.zstack.sdk.AddDnsToVpcRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -991,8 +908,8 @@ abstract class ApiHelper { } - def addCephBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCephBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddCephBackupStorageAction() + def addExternalBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddExternalBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddExternalBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1018,8 +935,8 @@ abstract class ApiHelper { } - def addCephPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCephPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddCephPrimaryStorageAction() + def addExternalPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddExternalPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddExternalPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1045,8 +962,8 @@ abstract class ApiHelper { } - def addCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCephPrimaryStoragePoolAction.class) Closure c) { - def a = new org.zstack.sdk.AddCephPrimaryStoragePoolAction() + def addFlkSecSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddFlkSecSecurityMachineAction.class) Closure c) { + def a = new org.zstack.sdk.AddFlkSecSecurityMachineAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1072,8 +989,8 @@ abstract class ApiHelper { } - def addCertificateToLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddCertificateToLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.AddCertificateToLoadBalancerListenerAction() + def addHostRouteToL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddHostRouteToL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.AddHostRouteToL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1099,8 +1016,8 @@ abstract class ApiHelper { } - def addConnectionAccessPointFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddConnectionAccessPointFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.AddConnectionAccessPointFromRemoteAction() + def addHostToHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddHostToHostSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AddHostToHostSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1126,8 +1043,8 @@ abstract class ApiHelper { } - def addDataCenterFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddDataCenterFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.AddDataCenterFromRemoteAction() + def addImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddImageAction.class) Closure c) { + def a = new org.zstack.sdk.AddImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1153,8 +1070,8 @@ abstract class ApiHelper { } - def addDisasterImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddDisasterImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddDisasterImageStoreBackupStorageAction() + def addImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1180,8 +1097,8 @@ abstract class ApiHelper { } - def addDnsToL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddDnsToL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.AddDnsToL3NetworkAction() + def addInfoSecSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddInfoSecSecurityMachineAction.class) Closure c) { + def a = new org.zstack.sdk.AddInfoSecSecurityMachineAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1207,8 +1124,8 @@ abstract class ApiHelper { } - def addDnsToVpcRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddDnsToVpcRouterAction.class) Closure c) { - def a = new org.zstack.sdk.AddDnsToVpcRouterAction() + def addIntegrityResource(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIntegrityResourceAction.class) Closure c) { + def a = new org.zstack.sdk.AddIntegrityResourceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1234,8 +1151,8 @@ abstract class ApiHelper { } - def addExternalBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddExternalBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddExternalBackupStorageAction() + def addIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIpRangeAction.class) Closure c) { + def a = new org.zstack.sdk.AddIpRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1261,8 +1178,8 @@ abstract class ApiHelper { } - def addExternalPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddExternalPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddExternalPrimaryStorageAction() + def addIpRangeByNetworkCidr(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIpRangeByNetworkCidrAction.class) Closure c) { + def a = new org.zstack.sdk.AddIpRangeByNetworkCidrAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1288,8 +1205,8 @@ abstract class ApiHelper { } - def addFlkSecSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddFlkSecSecurityMachineAction.class) Closure c) { - def a = new org.zstack.sdk.AddFlkSecSecurityMachineAction() + def addIpv6Range(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIpv6RangeAction.class) Closure c) { + def a = new org.zstack.sdk.AddIpv6RangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1315,8 +1232,8 @@ abstract class ApiHelper { } - def addHostRouteToL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddHostRouteToL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.AddHostRouteToL3NetworkAction() + def addIpv6RangeByNetworkCidr(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIpv6RangeByNetworkCidrAction.class) Closure c) { + def a = new org.zstack.sdk.AddIpv6RangeByNetworkCidrAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1342,8 +1259,8 @@ abstract class ApiHelper { } - def addHostToHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddHostToHostSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddHostToHostSchedulingRuleGroupAction() + def addIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIscsiServerAction.class) Closure c) { + def a = new org.zstack.sdk.AddIscsiServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1369,8 +1286,8 @@ abstract class ApiHelper { } - def addHybridKeySecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddHybridKeySecretAction.class) Closure c) { - def a = new org.zstack.sdk.AddHybridKeySecretAction() + def addKVMHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddKVMHostAction.class) Closure c) { + def a = new org.zstack.sdk.AddKVMHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1396,8 +1313,8 @@ abstract class ApiHelper { } - def addIdentityZoneFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIdentityZoneFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.AddIdentityZoneFromRemoteAction() + def addKVMHostFromConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddKVMHostFromConfigFileAction.class) Closure c) { + def a = new org.zstack.sdk.AddKVMHostFromConfigFileAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1423,8 +1340,8 @@ abstract class ApiHelper { } - def addImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddImageAction.class) Closure c) { - def a = new org.zstack.sdk.AddImageAction() + def addLocalPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddLocalPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddLocalPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1450,8 +1367,8 @@ abstract class ApiHelper { } - def addImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddImageStoreBackupStorageAction() + def addLogConfiguration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddLogConfigurationAction.class) Closure c) { + def a = new org.zstack.sdk.AddLogConfigurationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1477,8 +1394,8 @@ abstract class ApiHelper { } - def addInfoSecSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddInfoSecSecurityMachineAction.class) Closure c) { - def a = new org.zstack.sdk.AddInfoSecSecurityMachineAction() + def addMdevDeviceSpecToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddMdevDeviceSpecToVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.AddMdevDeviceSpecToVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1504,8 +1421,8 @@ abstract class ApiHelper { } - def addIntegrityResource(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIntegrityResourceAction.class) Closure c) { - def a = new org.zstack.sdk.AddIntegrityResourceAction() + def addMonToCephBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddMonToCephBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddMonToCephBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1531,8 +1448,8 @@ abstract class ApiHelper { } - def addIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIpRangeAction.class) Closure c) { - def a = new org.zstack.sdk.AddIpRangeAction() + def addMonToCephPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddMonToCephPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddMonToCephPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1558,8 +1475,8 @@ abstract class ApiHelper { } - def addIpRangeByNetworkCidr(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIpRangeByNetworkCidrAction.class) Closure c) { - def a = new org.zstack.sdk.AddIpRangeByNetworkCidrAction() + def addNfsPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddNfsPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddNfsPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1585,8 +1502,8 @@ abstract class ApiHelper { } - def addIpv6Range(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIpv6RangeAction.class) Closure c) { - def a = new org.zstack.sdk.AddIpv6RangeAction() + def addNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddNvmeServerAction.class) Closure c) { + def a = new org.zstack.sdk.AddNvmeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1612,8 +1529,8 @@ abstract class ApiHelper { } - def addIpv6RangeByNetworkCidr(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIpv6RangeByNetworkCidrAction.class) Closure c) { - def a = new org.zstack.sdk.AddIpv6RangeByNetworkCidrAction() + def addPciDeviceSpecToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddPciDeviceSpecToVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.AddPciDeviceSpecToVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1639,8 +1556,8 @@ abstract class ApiHelper { } - def addIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddIscsiServerAction.class) Closure c) { - def a = new org.zstack.sdk.AddIscsiServerAction() + def addPreconfigurationTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddPreconfigurationTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.AddPreconfigurationTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1666,8 +1583,8 @@ abstract class ApiHelper { } - def addKVMHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddKVMHostAction.class) Closure c) { - def a = new org.zstack.sdk.AddKVMHostAction() + def addRemoteCidrsToIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddRemoteCidrsToIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.AddRemoteCidrsToIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1693,8 +1610,8 @@ abstract class ApiHelper { } - def addKVMHostFromConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddKVMHostFromConfigFileAction.class) Closure c) { - def a = new org.zstack.sdk.AddKVMHostFromConfigFileAction() + def addRendezvousPointToMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddRendezvousPointToMulticastRouterAction.class) Closure c) { + def a = new org.zstack.sdk.AddRendezvousPointToMulticastRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1720,8 +1637,8 @@ abstract class ApiHelper { } - def addLocalPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddLocalPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddLocalPrimaryStorageAction() + def addReservedIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddReservedIpRangeAction.class) Closure c) { + def a = new org.zstack.sdk.AddReservedIpRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1747,8 +1664,8 @@ abstract class ApiHelper { } - def addLogConfiguration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddLogConfigurationAction.class) Closure c) { - def a = new org.zstack.sdk.AddLogConfigurationAction() + def addResourceStackVmPortMonitor(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddResourceStackVmPortMonitorAction.class) Closure c) { + def a = new org.zstack.sdk.AddResourceStackVmPortMonitorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1774,8 +1691,8 @@ abstract class ApiHelper { } - def addMdevDeviceSpecToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddMdevDeviceSpecToVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.AddMdevDeviceSpecToVmInstanceAction() + def addResourcesToDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddResourcesToDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.AddResourcesToDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1801,8 +1718,8 @@ abstract class ApiHelper { } - def addMiniStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddMiniStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddMiniStorageAction() + def addSchedulerJobGroupToSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSchedulerJobGroupToSchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.AddSchedulerJobGroupToSchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1828,8 +1745,8 @@ abstract class ApiHelper { } - def addMonToCephBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddMonToCephBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddMonToCephBackupStorageAction() + def addSchedulerJobToSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSchedulerJobToSchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.AddSchedulerJobToSchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1855,8 +1772,8 @@ abstract class ApiHelper { } - def addMonToCephPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddMonToCephPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddMonToCephPrimaryStorageAction() + def addSchedulerJobsToSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSchedulerJobsToSchedulerJobGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AddSchedulerJobsToSchedulerJobGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1882,8 +1799,8 @@ abstract class ApiHelper { } - def addNfsPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddNfsPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddNfsPrimaryStorageAction() + def addSdnController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSdnControllerAction.class) Closure c) { + def a = new org.zstack.sdk.AddSdnControllerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1909,8 +1826,8 @@ abstract class ApiHelper { } - def addNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddNvmeServerAction.class) Closure c) { - def a = new org.zstack.sdk.AddNvmeServerAction() + def addSecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSecurityGroupRuleAction.class) Closure c) { + def a = new org.zstack.sdk.AddSecurityGroupRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1936,8 +1853,8 @@ abstract class ApiHelper { } - def addOssBucketFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddOssBucketFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.AddOssBucketFromRemoteAction() + def addServerGroupToLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddServerGroupToLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.AddServerGroupToLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1963,8 +1880,8 @@ abstract class ApiHelper { } - def addPciDeviceSpecToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddPciDeviceSpecToVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.AddPciDeviceSpecToVmInstanceAction() + def addSftpBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSftpBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddSftpBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -1990,8 +1907,8 @@ abstract class ApiHelper { } - def addPreconfigurationTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddPreconfigurationTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.AddPreconfigurationTemplateAction() + def addSharedBlockGroupPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSharedBlockGroupPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddSharedBlockGroupPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2017,8 +1934,8 @@ abstract class ApiHelper { } - def addRemoteCidrsToIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddRemoteCidrsToIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.AddRemoteCidrsToIPsecConnectionAction() + def addSharedBlockToSharedBlockGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSharedBlockToSharedBlockGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AddSharedBlockToSharedBlockGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2044,8 +1961,8 @@ abstract class ApiHelper { } - def addRendezvousPointToMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddRendezvousPointToMulticastRouterAction.class) Closure c) { - def a = new org.zstack.sdk.AddRendezvousPointToMulticastRouterAction() + def addSharedMountPointPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSharedMountPointPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddSharedMountPointPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2071,8 +1988,8 @@ abstract class ApiHelper { } - def addReservedIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddReservedIpRangeAction.class) Closure c) { - def a = new org.zstack.sdk.AddReservedIpRangeAction() + def addSimulatorBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSimulatorBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddSimulatorBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2098,89 +2015,8 @@ abstract class ApiHelper { } - def addResourceStackVmPortMonitor(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddResourceStackVmPortMonitorAction.class) Closure c) { - def a = new org.zstack.sdk.AddResourceStackVmPortMonitorAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def addResourcesToDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddResourcesToDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.AddResourcesToDirectoryAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def addSchedulerJobGroupToSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSchedulerJobGroupToSchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.AddSchedulerJobGroupToSchedulerTriggerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def addSchedulerJobToSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSchedulerJobToSchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.AddSchedulerJobToSchedulerTriggerAction() + def addSimulatorHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSimulatorHostAction.class) Closure c) { + def a = new org.zstack.sdk.AddSimulatorHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2206,8 +2042,8 @@ abstract class ApiHelper { } - def addSchedulerJobsToSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSchedulerJobsToSchedulerJobGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddSchedulerJobsToSchedulerJobGroupAction() + def addSimulatorPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSimulatorPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.AddSimulatorPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2233,8 +2069,8 @@ abstract class ApiHelper { } - def addSdnController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSdnControllerAction.class) Closure c) { - def a = new org.zstack.sdk.AddSdnControllerAction() + def addStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddStackTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.AddStackTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2260,8 +2096,8 @@ abstract class ApiHelper { } - def addSecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSecurityGroupRuleAction.class) Closure c) { - def a = new org.zstack.sdk.AddSecurityGroupRuleAction() + def addStorageProtocol(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddStorageProtocolAction.class) Closure c) { + def a = new org.zstack.sdk.AddStorageProtocolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2287,8 +2123,8 @@ abstract class ApiHelper { } - def addServerGroupToLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddServerGroupToLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.AddServerGroupToLoadBalancerListenerAction() + def addVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVCenterAction.class) Closure c) { + def a = new org.zstack.sdk.AddVCenterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2314,8 +2150,8 @@ abstract class ApiHelper { } - def addSftpBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSftpBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddSftpBackupStorageAction() + def addVRouterNetworksToFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVRouterNetworksToFlowMeterAction.class) Closure c) { + def a = new org.zstack.sdk.AddVRouterNetworksToFlowMeterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2341,8 +2177,8 @@ abstract class ApiHelper { } - def addSharedBlockGroupPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSharedBlockGroupPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddSharedBlockGroupPrimaryStorageAction() + def addVRouterNetworksToOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVRouterNetworksToOspfAreaAction.class) Closure c) { + def a = new org.zstack.sdk.AddVRouterNetworksToOspfAreaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2368,8 +2204,8 @@ abstract class ApiHelper { } - def addSharedBlockToSharedBlockGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSharedBlockToSharedBlockGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddSharedBlockToSharedBlockGroupAction() + def addVRouterRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVRouterRouteEntryAction.class) Closure c) { + def a = new org.zstack.sdk.AddVRouterRouteEntryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2395,8 +2231,8 @@ abstract class ApiHelper { } - def addSharedMountPointPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSharedMountPointPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddSharedMountPointPrimaryStorageAction() + def addVmNicToLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVmNicToLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.AddVmNicToLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2422,8 +2258,8 @@ abstract class ApiHelper { } - def addSimulatorBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSimulatorBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddSimulatorBackupStorageAction() + def addVmNicToSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVmNicToSecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AddVmNicToSecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2449,8 +2285,8 @@ abstract class ApiHelper { } - def addSimulatorHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSimulatorHostAction.class) Closure c) { - def a = new org.zstack.sdk.AddSimulatorHostAction() + def addVmToAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVmToAffinityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AddVmToAffinityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2476,8 +2312,8 @@ abstract class ApiHelper { } - def addSimulatorPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddSimulatorPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.AddSimulatorPrimaryStorageAction() + def addVmToVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVmToVmSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AddVmToVmSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2503,8 +2339,8 @@ abstract class ApiHelper { } - def addStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddStackTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.AddStackTemplateAction() + def addXDragonHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddXDragonHostAction.class) Closure c) { + def a = new org.zstack.sdk.AddXDragonHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2530,8 +2366,8 @@ abstract class ApiHelper { } - def addStorageProtocol(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddStorageProtocolAction.class) Closure c) { - def a = new org.zstack.sdk.AddStorageProtocolAction() + def allocateHostResource(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AllocateHostResourceAction.class) Closure c) { + def a = new org.zstack.sdk.AllocateHostResourceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2557,8 +2393,8 @@ abstract class ApiHelper { } - def addVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVCenterAction.class) Closure c) { - def a = new org.zstack.sdk.AddVCenterAction() + def applyDRSAdvice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ApplyDRSAdviceAction.class) Closure c) { + def a = new org.zstack.sdk.ApplyDRSAdviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2584,8 +2420,8 @@ abstract class ApiHelper { } - def addVRouterNetworksToFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVRouterNetworksToFlowMeterAction.class) Closure c) { - def a = new org.zstack.sdk.AddVRouterNetworksToFlowMeterAction() + def applyRuleSetChanges(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ApplyRuleSetChangesAction.class) Closure c) { + def a = new org.zstack.sdk.ApplyRuleSetChangesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2611,8 +2447,8 @@ abstract class ApiHelper { } - def addVRouterNetworksToOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVRouterNetworksToOspfAreaAction.class) Closure c) { - def a = new org.zstack.sdk.AddVRouterNetworksToOspfAreaAction() + def applyTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ApplyTemplateConfigAction.class) Closure c) { + def a = new org.zstack.sdk.ApplyTemplateConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2638,8 +2474,8 @@ abstract class ApiHelper { } - def addVRouterRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVRouterRouteEntryAction.class) Closure c) { - def a = new org.zstack.sdk.AddVRouterRouteEntryAction() + def attachAutoScalingTemplateToGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachAutoScalingTemplateToGroupAction.class) Closure c) { + def a = new org.zstack.sdk.AttachAutoScalingTemplateToGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2665,8 +2501,8 @@ abstract class ApiHelper { } - def addVmNicToLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVmNicToLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.AddVmNicToLoadBalancerAction() + def attachBackupStorageToZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachBackupStorageToZoneAction.class) Closure c) { + def a = new org.zstack.sdk.AttachBackupStorageToZoneAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2692,8 +2528,8 @@ abstract class ApiHelper { } - def addVmNicToSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVmNicToSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddVmNicToSecurityGroupAction() + def attachBaremetalPxeServerToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachBaremetalPxeServerToClusterAction.class) Closure c) { + def a = new org.zstack.sdk.AttachBaremetalPxeServerToClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2719,8 +2555,8 @@ abstract class ApiHelper { } - def addVmToAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVmToAffinityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddVmToAffinityGroupAction() + def attachCCSCertificateToAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachCCSCertificateToAccountAction.class) Closure c) { + def a = new org.zstack.sdk.AttachCCSCertificateToAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2746,8 +2582,8 @@ abstract class ApiHelper { } - def addVmToVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddVmToVmSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AddVmToVmSchedulingRuleGroupAction() + def attachDataVolumeToHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachDataVolumeToHostAction.class) Closure c) { + def a = new org.zstack.sdk.AttachDataVolumeToHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2773,8 +2609,8 @@ abstract class ApiHelper { } - def addXDragonHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddXDragonHostAction.class) Closure c) { - def a = new org.zstack.sdk.AddXDragonHostAction() + def attachDataVolumeToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachDataVolumeToVmAction.class) Closure c) { + def a = new org.zstack.sdk.AttachDataVolumeToVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2800,8 +2636,8 @@ abstract class ApiHelper { } - def addZBox(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AddZBoxAction.class) Closure c) { - def a = new org.zstack.sdk.AddZBoxAction() + def attachEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachEipAction.class) Closure c) { + def a = new org.zstack.sdk.AttachEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2827,8 +2663,8 @@ abstract class ApiHelper { } - def allocateHostResource(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AllocateHostResourceAction.class) Closure c) { - def a = new org.zstack.sdk.AllocateHostResourceAction() + def attachFirewallRuleSetToL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachFirewallRuleSetToL3Action.class) Closure c) { + def a = new org.zstack.sdk.AttachFirewallRuleSetToL3Action() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2854,8 +2690,8 @@ abstract class ApiHelper { } - def applyDRSAdvice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ApplyDRSAdviceAction.class) Closure c) { - def a = new org.zstack.sdk.ApplyDRSAdviceAction() + def attachIscsiServerToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachIscsiServerToClusterAction.class) Closure c) { + def a = new org.zstack.sdk.AttachIscsiServerToClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2881,8 +2717,8 @@ abstract class ApiHelper { } - def applyRuleSetChanges(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ApplyRuleSetChangesAction.class) Closure c) { - def a = new org.zstack.sdk.ApplyRuleSetChangesAction() + def attachIsoToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachIsoToVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.AttachIsoToVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2908,8 +2744,8 @@ abstract class ApiHelper { } - def applyTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ApplyTemplateConfigAction.class) Closure c) { - def a = new org.zstack.sdk.ApplyTemplateConfigAction() + def attachL2NetworkToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL2NetworkToClusterAction.class) Closure c) { + def a = new org.zstack.sdk.AttachL2NetworkToClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2935,8 +2771,8 @@ abstract class ApiHelper { } - def attachAliyunDiskToEcs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachAliyunDiskToEcsAction.class) Closure c) { - def a = new org.zstack.sdk.AttachAliyunDiskToEcsAction() + def attachL2NetworkToHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL2NetworkToHostAction.class) Closure c) { + def a = new org.zstack.sdk.AttachL2NetworkToHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2962,8 +2798,8 @@ abstract class ApiHelper { } - def attachAliyunKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachAliyunKeyAction.class) Closure c) { - def a = new org.zstack.sdk.AttachAliyunKeyAction() + def attachL3NetworkToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL3NetworkToVmAction.class) Closure c) { + def a = new org.zstack.sdk.AttachL3NetworkToVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -2989,8 +2825,8 @@ abstract class ApiHelper { } - def attachAutoScalingTemplateToGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachAutoScalingTemplateToGroupAction.class) Closure c) { - def a = new org.zstack.sdk.AttachAutoScalingTemplateToGroupAction() + def attachL3NetworkToVmNic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL3NetworkToVmNicAction.class) Closure c) { + def a = new org.zstack.sdk.AttachL3NetworkToVmNicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3016,8 +2852,8 @@ abstract class ApiHelper { } - def attachBackupStorageToZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachBackupStorageToZoneAction.class) Closure c) { - def a = new org.zstack.sdk.AttachBackupStorageToZoneAction() + def attachL3NetworksToIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL3NetworksToIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.AttachL3NetworksToIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3043,8 +2879,8 @@ abstract class ApiHelper { } - def attachBareMetal2GatewayToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachBareMetal2GatewayToClusterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachBareMetal2GatewayToClusterAction() + def attachMdevDeviceToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachMdevDeviceToVmAction.class) Closure c) { + def a = new org.zstack.sdk.AttachMdevDeviceToVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3070,8 +2906,8 @@ abstract class ApiHelper { } - def attachBareMetal2ProvisionNetworkToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachBareMetal2ProvisionNetworkToClusterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachBareMetal2ProvisionNetworkToClusterAction() + def attachMonitorTriggerToTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachMonitorTriggerActionToTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.AttachMonitorTriggerActionToTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3097,8 +2933,8 @@ abstract class ApiHelper { } - def attachBaremetalPxeServerToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachBaremetalPxeServerToClusterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachBaremetalPxeServerToClusterAction() + def attachNetworkServiceToL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachNetworkServiceToL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.AttachNetworkServiceToL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3124,8 +2960,8 @@ abstract class ApiHelper { } - def attachCCSCertificateToAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachCCSCertificateToAccountAction.class) Closure c) { - def a = new org.zstack.sdk.AttachCCSCertificateToAccountAction() + def attachNicToBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachNicToBondingAction.class) Closure c) { + def a = new org.zstack.sdk.AttachNicToBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3151,8 +2987,8 @@ abstract class ApiHelper { } - def attachDataVolumeToHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachDataVolumeToHostAction.class) Closure c) { - def a = new org.zstack.sdk.AttachDataVolumeToHostAction() + def attachNvmeServerToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachNvmeServerToClusterAction.class) Closure c) { + def a = new org.zstack.sdk.AttachNvmeServerToClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3178,8 +3014,8 @@ abstract class ApiHelper { } - def attachDataVolumeToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachDataVolumeToVmAction.class) Closure c) { - def a = new org.zstack.sdk.AttachDataVolumeToVmAction() + def attachPciDeviceToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPciDeviceToVmAction.class) Closure c) { + def a = new org.zstack.sdk.AttachPciDeviceToVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3205,8 +3041,8 @@ abstract class ApiHelper { } - def attachEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachEipAction.class) Closure c) { - def a = new org.zstack.sdk.AttachEipAction() + def attachPolicyRouteRuleSetToL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPolicyRouteRuleSetToL3Action.class) Closure c) { + def a = new org.zstack.sdk.AttachPolicyRouteRuleSetToL3Action() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3232,8 +3068,8 @@ abstract class ApiHelper { } - def attachFirewallRuleSetToL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachFirewallRuleSetToL3Action.class) Closure c) { - def a = new org.zstack.sdk.AttachFirewallRuleSetToL3Action() + def attachPortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPortForwardingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.AttachPortForwardingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3259,8 +3095,8 @@ abstract class ApiHelper { } - def attachGuestToolsIsoToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachGuestToolsIsoToVmAction.class) Closure c) { - def a = new org.zstack.sdk.AttachGuestToolsIsoToVmAction() + def attachPriceTableToAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPriceTableToAccountAction.class) Closure c) { + def a = new org.zstack.sdk.AttachPriceTableToAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3286,8 +3122,8 @@ abstract class ApiHelper { } - def attachHybridEipToEcs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachHybridEipToEcsAction.class) Closure c) { - def a = new org.zstack.sdk.AttachHybridEipToEcsAction() + def attachPrimaryStorageToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPrimaryStorageToClusterAction.class) Closure c) { + def a = new org.zstack.sdk.AttachPrimaryStorageToClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3313,8 +3149,8 @@ abstract class ApiHelper { } - def attachHybridKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachHybridKeyAction.class) Closure c) { - def a = new org.zstack.sdk.AttachHybridKeyAction() + def attachScsiLunToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachScsiLunToVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.AttachScsiLunToVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3340,8 +3176,8 @@ abstract class ApiHelper { } - def attachIscsiServerToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachIscsiServerToClusterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachIscsiServerToClusterAction() + def attachSecurityGroupToL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachSecurityGroupToL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.AttachSecurityGroupToL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3367,8 +3203,8 @@ abstract class ApiHelper { } - def attachIsoToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachIsoToVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.AttachIsoToVmInstanceAction() + def attachSshKeyPairToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachSshKeyPairToVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.AttachSshKeyPairToVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3394,8 +3230,8 @@ abstract class ApiHelper { } - def attachL2NetworkToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL2NetworkToClusterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachL2NetworkToClusterAction() + def attachTagToResources(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachTagToResourcesAction.class) Closure c) { + def a = new org.zstack.sdk.AttachTagToResourcesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3421,8 +3257,8 @@ abstract class ApiHelper { } - def attachL2NetworkToHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL2NetworkToHostAction.class) Closure c) { - def a = new org.zstack.sdk.AttachL2NetworkToHostAction() + def attachUsbDeviceToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachUsbDeviceToVmAction.class) Closure c) { + def a = new org.zstack.sdk.AttachUsbDeviceToVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3448,8 +3284,8 @@ abstract class ApiHelper { } - def attachL3NetworkToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL3NetworkToVmAction.class) Closure c) { - def a = new org.zstack.sdk.AttachL3NetworkToVmAction() + def attachVRouterRouteTableToVRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachVRouterRouteTableToVRouterAction.class) Closure c) { + def a = new org.zstack.sdk.AttachVRouterRouteTableToVRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3475,35 +3311,8 @@ abstract class ApiHelper { } - def attachL3NetworkToVmNic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL3NetworkToVmNicAction.class) Closure c) { - def a = new org.zstack.sdk.AttachL3NetworkToVmNicAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def attachL3NetworksToIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachL3NetworksToIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.AttachL3NetworksToIPsecConnectionAction() + def attachVmNicToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachVmNicToVmAction.class) Closure c) { + def a = new org.zstack.sdk.AttachVmNicToVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3529,8 +3338,8 @@ abstract class ApiHelper { } - def attachMdevDeviceToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachMdevDeviceToVmAction.class) Closure c) { - def a = new org.zstack.sdk.AttachMdevDeviceToVmAction() + def backupStorageMigrateImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BackupStorageMigrateImageAction.class) Closure c) { + def a = new org.zstack.sdk.BackupStorageMigrateImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3556,8 +3365,8 @@ abstract class ApiHelper { } - def attachMonitorTriggerToTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachMonitorTriggerActionToTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.AttachMonitorTriggerActionToTriggerAction() + def batchCreateBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchCreateBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.BatchCreateBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3583,8 +3392,8 @@ abstract class ApiHelper { } - def attachNetworkServiceToL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachNetworkServiceToL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.AttachNetworkServiceToL3NetworkAction() + def batchCreateHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchCreateHostKernelInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.BatchCreateHostKernelInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3610,8 +3419,8 @@ abstract class ApiHelper { } - def attachNicToBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachNicToBondingAction.class) Closure c) { - def a = new org.zstack.sdk.AttachNicToBondingAction() + def batchDeleteVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchDeleteVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.BatchDeleteVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3637,8 +3446,8 @@ abstract class ApiHelper { } - def attachNvmeServerToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachNvmeServerToClusterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachNvmeServerToClusterAction() + def batchQuery(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchQueryAction.class) Closure c) { + def a = new org.zstack.sdk.BatchQueryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3664,8 +3473,8 @@ abstract class ApiHelper { } - def attachOssBucketToEcsDataCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachOssBucketToEcsDataCenterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachOssBucketToEcsDataCenterAction() + def batchSyncVolumeSize(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchSyncVolumeSizeAction.class) Closure c) { + def a = new org.zstack.sdk.BatchSyncVolumeSizeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3691,8 +3500,8 @@ abstract class ApiHelper { } - def attachPciDeviceToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPciDeviceToVmAction.class) Closure c) { - def a = new org.zstack.sdk.AttachPciDeviceToVmAction() + def bootstrapMiniHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BootstrapMiniHostAction.class) Closure c) { + def a = new org.zstack.sdk.BootstrapMiniHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3718,8 +3527,8 @@ abstract class ApiHelper { } - def attachPolicyRouteRuleSetToL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPolicyRouteRuleSetToL3Action.class) Closure c) { - def a = new org.zstack.sdk.AttachPolicyRouteRuleSetToL3Action() + def calculateAccountBillingSpending(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CalculateAccountBillingSpendingAction.class) Closure c) { + def a = new org.zstack.sdk.CalculateAccountBillingSpendingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3745,8 +3554,8 @@ abstract class ApiHelper { } - def attachPortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPortForwardingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.AttachPortForwardingRuleAction() + def calculateAccountSpending(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CalculateAccountSpendingAction.class) Closure c) { + def a = new org.zstack.sdk.CalculateAccountSpendingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3772,8 +3581,8 @@ abstract class ApiHelper { } - def attachPriceTableToAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPriceTableToAccountAction.class) Closure c) { - def a = new org.zstack.sdk.AttachPriceTableToAccountAction() + def calculateImageHash(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CalculateImageHashAction.class) Closure c) { + def a = new org.zstack.sdk.CalculateImageHashAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3799,8 +3608,8 @@ abstract class ApiHelper { } - def attachPrimaryStorageToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachPrimaryStorageToClusterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachPrimaryStorageToClusterAction() + def calculateResourceSpending(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CalculateResourceSpendingAction.class) Closure c) { + def a = new org.zstack.sdk.CalculateResourceSpendingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3826,8 +3635,8 @@ abstract class ApiHelper { } - def attachProvisionNicToBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachProvisionNicToBondingAction.class) Closure c) { - def a = new org.zstack.sdk.AttachProvisionNicToBondingAction() + def cancelLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CancelLongJobAction.class) Closure c) { + def a = new org.zstack.sdk.CancelLongJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3853,8 +3662,8 @@ abstract class ApiHelper { } - def attachScsiLunToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachScsiLunToVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.AttachScsiLunToVmInstanceAction() + def changeAccessControlListRedirectRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAccessControlListRedirectRuleAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeAccessControlListRedirectRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3880,8 +3689,8 @@ abstract class ApiHelper { } - def attachSecurityGroupToL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachSecurityGroupToL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.AttachSecurityGroupToL3NetworkAction() + def changeAccessControlListServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAccessControlListServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeAccessControlListServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3907,8 +3716,8 @@ abstract class ApiHelper { } - def attachSshKeyPairToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachSshKeyPairToVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.AttachSshKeyPairToVmInstanceAction() + def changeAccessKeyState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAccessKeyStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeAccessKeyStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3934,8 +3743,8 @@ abstract class ApiHelper { } - def attachTagToResources(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachTagToResourcesAction.class) Closure c) { - def a = new org.zstack.sdk.AttachTagToResourcesAction() + def changeAccountPriceTableBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAccountPriceTableBindingAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeAccountPriceTableBindingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3961,8 +3770,8 @@ abstract class ApiHelper { } - def attachUsbDeviceToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachUsbDeviceToVmAction.class) Closure c) { - def a = new org.zstack.sdk.AttachUsbDeviceToVmAction() + def changeAffinityGroupState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAffinityGroupStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeAffinityGroupStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -3988,8 +3797,8 @@ abstract class ApiHelper { } - def attachVRouterRouteTableToVRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachVRouterRouteTableToVRouterAction.class) Closure c) { - def a = new org.zstack.sdk.AttachVRouterRouteTableToVRouterAction() + def changeAutoScalingGroupState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAutoScalingGroupStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeAutoScalingGroupStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4015,8 +3824,8 @@ abstract class ApiHelper { } - def attachVmNicToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachVmNicToVmAction.class) Closure c) { - def a = new org.zstack.sdk.AttachVmNicToVmAction() + def changeBackupStorageState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBackupStorageStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeBackupStorageStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4042,8 +3851,8 @@ abstract class ApiHelper { } - def backupDatabaseToPublicCloud(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BackupDatabaseToPublicCloudAction.class) Closure c) { - def a = new org.zstack.sdk.BackupDatabaseToPublicCloudAction() + def changeBaremetalChassisState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBaremetalChassisStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeBaremetalChassisStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4069,8 +3878,8 @@ abstract class ApiHelper { } - def backupStorageMigrateImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BackupStorageMigrateImageAction.class) Closure c) { - def a = new org.zstack.sdk.BackupStorageMigrateImageAction() + def changeClusterState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeClusterStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeClusterStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4096,8 +3905,8 @@ abstract class ApiHelper { } - def batchAddBareMetal2IpmiChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchAddBareMetal2IpmiChassisAction.class) Closure c) { - def a = new org.zstack.sdk.BatchAddBareMetal2IpmiChassisAction() + def changeDiskOfferingState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeDiskOfferingStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeDiskOfferingStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4123,8 +3932,8 @@ abstract class ApiHelper { } - def batchCreateBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchCreateBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.BatchCreateBaremetalChassisAction() + def changeEipState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeEipStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeEipStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4150,8 +3959,8 @@ abstract class ApiHelper { } - def batchDeleteVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchDeleteVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.BatchDeleteVolumeSnapshotAction() + def changeFirewallRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeFirewallRuleStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeFirewallRuleStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4177,8 +3986,8 @@ abstract class ApiHelper { } - def batchQuery(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchQueryAction.class) Closure c) { - def a = new org.zstack.sdk.BatchQueryAction() + def changeHostNetworkInterfaceLldpMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeHostNetworkInterfaceLldpModeAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeHostNetworkInterfaceLldpModeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4204,8 +4013,8 @@ abstract class ApiHelper { } - def batchSyncVolumeSize(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BatchSyncVolumeSizeAction.class) Closure c) { - def a = new org.zstack.sdk.BatchSyncVolumeSizeAction() + def changeHostPassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeHostPasswordAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeHostPasswordAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4231,8 +4040,8 @@ abstract class ApiHelper { } - def bootstrapMiniHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.BootstrapMiniHostAction.class) Closure c) { - def a = new org.zstack.sdk.BootstrapMiniHostAction() + def changeHostState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeHostStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeHostStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4258,8 +4067,8 @@ abstract class ApiHelper { } - def calculateAccountBillingSpending(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CalculateAccountBillingSpendingAction.class) Closure c) { - def a = new org.zstack.sdk.CalculateAccountBillingSpendingAction() + def changeIPSecConnectionState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeIPSecConnectionStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeIPSecConnectionStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4285,8 +4094,8 @@ abstract class ApiHelper { } - def calculateAccountSpending(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CalculateAccountSpendingAction.class) Closure c) { - def a = new org.zstack.sdk.CalculateAccountSpendingAction() + def changeIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4312,8 +4121,8 @@ abstract class ApiHelper { } - def calculateImageHash(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CalculateImageHashAction.class) Closure c) { - def a = new org.zstack.sdk.CalculateImageHashAction() + def changeImageState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeImageStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeImageStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4339,8 +4148,8 @@ abstract class ApiHelper { } - def calculateResourceSpending(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CalculateResourceSpendingAction.class) Closure c) { - def a = new org.zstack.sdk.CalculateResourceSpendingAction() + def changeInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeInstanceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeInstanceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4366,8 +4175,8 @@ abstract class ApiHelper { } - def cancelLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CancelLongJobAction.class) Closure c) { - def a = new org.zstack.sdk.CancelLongJobAction() + def changeInstanceOfferingState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeInstanceOfferingStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeInstanceOfferingStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4393,8 +4202,8 @@ abstract class ApiHelper { } - def changeAccessControlListRedirectRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAccessControlListRedirectRuleAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeAccessControlListRedirectRuleAction() + def changeL3NetworkDhcpIpAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeL3NetworkDhcpIpAddressAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeL3NetworkDhcpIpAddressAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4420,8 +4229,8 @@ abstract class ApiHelper { } - def changeAccessControlListServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAccessControlListServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeAccessControlListServerGroupAction() + def changeL3NetworkState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeL3NetworkStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeL3NetworkStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4447,8 +4256,8 @@ abstract class ApiHelper { } - def changeAccessKeyState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAccessKeyStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeAccessKeyStateAction() + def changeLoadBalancerBackendServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeLoadBalancerBackendServerAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeLoadBalancerBackendServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4474,8 +4283,8 @@ abstract class ApiHelper { } - def changeAccountPriceTableBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAccountPriceTableBindingAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeAccountPriceTableBindingAction() + def changeLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4501,8 +4310,8 @@ abstract class ApiHelper { } - def changeAffinityGroupState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAffinityGroupStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeAffinityGroupStateAction() + def changeMediaState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeMediaStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeMediaStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4528,8 +4337,8 @@ abstract class ApiHelper { } - def changeAutoScalingGroupState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeAutoScalingGroupStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeAutoScalingGroupStateAction() + def changeMonitorTriggerStateAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeMonitorTriggerActionStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeMonitorTriggerActionStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4555,8 +4364,8 @@ abstract class ApiHelper { } - def changeBackupStorageState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBackupStorageStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeBackupStorageStateAction() + def changeMonitorTriggerState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeMonitorTriggerStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeMonitorTriggerStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4582,8 +4391,8 @@ abstract class ApiHelper { } - def changeBareMetal2ChassisOfferingState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBareMetal2ChassisOfferingStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeBareMetal2ChassisOfferingStateAction() + def changeMulticastRouterState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeMulticastRouterStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeMulticastRouterStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4609,8 +4418,8 @@ abstract class ApiHelper { } - def changeBareMetal2ChassisState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBareMetal2ChassisStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeBareMetal2ChassisStateAction() + def changePortForwardingRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangePortForwardingRuleStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangePortForwardingRuleStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4636,8 +4445,8 @@ abstract class ApiHelper { } - def changeBareMetal2GatewayCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBareMetal2GatewayClusterAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeBareMetal2GatewayClusterAction() + def changePortMirrorState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangePortMirrorStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangePortMirrorStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4663,8 +4472,8 @@ abstract class ApiHelper { } - def changeBareMetal2GatewayState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBareMetal2GatewayStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeBareMetal2GatewayStateAction() + def changePreconfigurationTemplateState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangePreconfigurationTemplateStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangePreconfigurationTemplateStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4690,8 +4499,8 @@ abstract class ApiHelper { } - def changeBareMetal2InstancePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBareMetal2InstancePasswordAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeBareMetal2InstancePasswordAction() + def changePrimaryStorageState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangePrimaryStorageStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangePrimaryStorageStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4717,8 +4526,8 @@ abstract class ApiHelper { } - def changeBareMetal2ProvisionNetworkState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBareMetal2ProvisionNetworkStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeBareMetal2ProvisionNetworkStateAction() + def changeResourceOwner(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeResourceOwnerAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeResourceOwnerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4744,8 +4553,8 @@ abstract class ApiHelper { } - def changeBaremetalChassisState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeBaremetalChassisStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeBaremetalChassisStateAction() + def changeSchedulerState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSchedulerStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeSchedulerStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4771,8 +4580,8 @@ abstract class ApiHelper { } - def changeClusterState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeClusterStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeClusterStateAction() + def changeSecretResourcePoolState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecretResourcePoolStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeSecretResourcePoolStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4798,8 +4607,8 @@ abstract class ApiHelper { } - def changeDiskOfferingState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeDiskOfferingStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeDiskOfferingStateAction() + def changeSecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecurityGroupRuleAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeSecurityGroupRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4825,8 +4634,8 @@ abstract class ApiHelper { } - def changeEipState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeEipStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeEipStateAction() + def changeSecurityGroupRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecurityGroupRuleStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeSecurityGroupRuleStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4852,8 +4661,8 @@ abstract class ApiHelper { } - def changeFirewallRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeFirewallRuleStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeFirewallRuleStateAction() + def changeSecurityGroupState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecurityGroupStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeSecurityGroupStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4879,8 +4688,8 @@ abstract class ApiHelper { } - def changeHostNetworkInterfaceLldpMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeHostNetworkInterfaceLldpModeAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeHostNetworkInterfaceLldpModeAction() + def changeSecurityMachineState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecurityMachineStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeSecurityMachineStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4906,8 +4715,8 @@ abstract class ApiHelper { } - def changeHostPassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeHostPasswordAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeHostPasswordAction() + def changeVfNicHaState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVfNicHaStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVfNicHaStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4933,8 +4742,8 @@ abstract class ApiHelper { } - def changeHostState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeHostStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeHostStateAction() + def changeVipState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVipStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVipStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4960,8 +4769,8 @@ abstract class ApiHelper { } - def changeIPSecConnectionState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeIPSecConnectionStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeIPSecConnectionStateAction() + def changeVmImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmImageAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVmImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -4987,8 +4796,8 @@ abstract class ApiHelper { } - def changeIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeIPsecConnectionAction() + def changeVmNicNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmNicNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVmNicNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5014,8 +4823,8 @@ abstract class ApiHelper { } - def changeImageState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeImageStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeImageStateAction() + def changeVmNicSecurityPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmNicSecurityPolicyAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVmNicSecurityPolicyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5041,8 +4850,8 @@ abstract class ApiHelper { } - def changeInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeInstanceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeInstanceOfferingAction() + def changeVmNicState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmNicStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVmNicStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5068,8 +4877,8 @@ abstract class ApiHelper { } - def changeInstanceOfferingState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeInstanceOfferingStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeInstanceOfferingStateAction() + def changeVmNicType(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmNicTypeAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVmNicTypeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5095,8 +4904,8 @@ abstract class ApiHelper { } - def changeL3NetworkDhcpIpAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeL3NetworkDhcpIpAddressAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeL3NetworkDhcpIpAddressAction() + def changeVmPassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmPasswordAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVmPasswordAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5122,8 +4931,8 @@ abstract class ApiHelper { } - def changeL3NetworkState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeL3NetworkStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeL3NetworkStateAction() + def changeVmSchedulingRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmSchedulingRuleStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVmSchedulingRuleStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5149,8 +4958,8 @@ abstract class ApiHelper { } - def changeLoadBalancerBackendServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeLoadBalancerBackendServerAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeLoadBalancerBackendServerAction() + def changeVolumeState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVolumeStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVolumeStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5176,8 +4985,8 @@ abstract class ApiHelper { } - def changeLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeLoadBalancerListenerAction() + def changeVpcHaGroupMonitorIps(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVpcHaGroupMonitorIpsAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeVpcHaGroupMonitorIpsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5203,35 +5012,8 @@ abstract class ApiHelper { } - def changeMediaState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeMediaStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeMediaStateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def changeMonitorTriggerStateAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeMonitorTriggerActionStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeMonitorTriggerActionStateAction() + def changeZoneState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeZoneStateAction.class) Closure c) { + def a = new org.zstack.sdk.ChangeZoneStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5257,8 +5039,8 @@ abstract class ApiHelper { } - def changeMonitorTriggerState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeMonitorTriggerStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeMonitorTriggerStateAction() + def checkBaremetalChassisConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckBaremetalChassisConfigFileAction.class) Closure c) { + def a = new org.zstack.sdk.CheckBaremetalChassisConfigFileAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5284,8 +5066,8 @@ abstract class ApiHelper { } - def changeMulticastRouterState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeMulticastRouterStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeMulticastRouterStateAction() + def checkBatchDataIntegrity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckBatchDataIntegrityAction.class) Closure c) { + def a = new org.zstack.sdk.CheckBatchDataIntegrityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5311,8 +5093,8 @@ abstract class ApiHelper { } - def changePortForwardingRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangePortForwardingRuleStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangePortForwardingRuleStateAction() + def checkCephHealthStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckCephHealthStatusAction.class) Closure c) { + def a = new org.zstack.sdk.CheckCephHealthStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5338,8 +5120,8 @@ abstract class ApiHelper { } - def changePortMirrorState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangePortMirrorStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangePortMirrorStateAction() + def checkElaborationContent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckElaborationContentAction.class) Closure c) { + def a = new org.zstack.sdk.CheckElaborationContentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5365,8 +5147,8 @@ abstract class ApiHelper { } - def changePreconfigurationTemplateState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangePreconfigurationTemplateStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangePreconfigurationTemplateStateAction() + def checkFirewallRuleConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckFirewallRuleConfigFileAction.class) Closure c) { + def a = new org.zstack.sdk.CheckFirewallRuleConfigFileAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5392,8 +5174,8 @@ abstract class ApiHelper { } - def changePrimaryStorageState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangePrimaryStorageStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangePrimaryStorageStateAction() + def checkIpAvailability(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckIpAvailabilityAction.class) Closure c) { + def a = new org.zstack.sdk.CheckIpAvailabilityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5419,8 +5201,8 @@ abstract class ApiHelper { } - def changeResourceOwner(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeResourceOwnerAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeResourceOwnerAction() + def checkKVMHostConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckKVMHostConfigFileAction.class) Closure c) { + def a = new org.zstack.sdk.CheckKVMHostConfigFileAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5446,8 +5228,8 @@ abstract class ApiHelper { } - def changeSchedulerState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSchedulerStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeSchedulerStateAction() + def checkMemorySnapshotGroupConflict(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckMemorySnapshotGroupConflictAction.class) Closure c) { + def a = new org.zstack.sdk.CheckMemorySnapshotGroupConflictAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5473,8 +5255,8 @@ abstract class ApiHelper { } - def changeSecretResourcePoolState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecretResourcePoolStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeSecretResourcePoolStateAction() + def checkNetworkReachable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckNetworkReachableAction.class) Closure c) { + def a = new org.zstack.sdk.CheckNetworkReachableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5500,8 +5282,8 @@ abstract class ApiHelper { } - def changeSecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecurityGroupRuleAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeSecurityGroupRuleAction() + def checkScsiLunClusterStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckScsiLunClusterStatusAction.class) Closure c) { + def a = new org.zstack.sdk.CheckScsiLunClusterStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5527,8 +5309,8 @@ abstract class ApiHelper { } - def changeSecurityGroupRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecurityGroupRuleStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeSecurityGroupRuleStateAction() + def checkStackTemplateParameters(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckStackTemplateParametersAction.class) Closure c) { + def a = new org.zstack.sdk.CheckStackTemplateParametersAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5554,8 +5336,8 @@ abstract class ApiHelper { } - def changeSecurityGroupState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecurityGroupStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeSecurityGroupStateAction() + def checkVipPortAvailability(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckVipPortAvailabilityAction.class) Closure c) { + def a = new org.zstack.sdk.CheckVipPortAvailabilityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5581,8 +5363,8 @@ abstract class ApiHelper { } - def changeSecurityMachineState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeSecurityMachineStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeSecurityMachineStateAction() + def checkVolumeSnapshotGroupAvailability(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckVolumeSnapshotGroupAvailabilityAction.class) Closure c) { + def a = new org.zstack.sdk.CheckVolumeSnapshotGroupAvailabilityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5608,8 +5390,8 @@ abstract class ApiHelper { } - def changeVfNicHaState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVfNicHaStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVfNicHaStateAction() + def cleanLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanLongJobAction.class) Closure c) { + def a = new org.zstack.sdk.CleanLongJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5635,8 +5417,8 @@ abstract class ApiHelper { } - def changeVipState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVipStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVipStateAction() + def cleanQueue(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanQueueAction.class) Closure c) { + def a = new org.zstack.sdk.CleanQueueAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5662,8 +5444,8 @@ abstract class ApiHelper { } - def changeVmImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmImageAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVmImageAction() + def cleanUpBaremetalChassisBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpBaremetalChassisBondingAction.class) Closure c) { + def a = new org.zstack.sdk.CleanUpBaremetalChassisBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5689,8 +5471,8 @@ abstract class ApiHelper { } - def changeVmNicNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmNicNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVmNicNetworkAction() + def cleanUpImageCacheOnPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpImageCacheOnPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.CleanUpImageCacheOnPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5716,8 +5498,8 @@ abstract class ApiHelper { } - def changeVmNicSecurityPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmNicSecurityPolicyAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVmNicSecurityPolicyAction() + def cleanUpStorageTrashOnPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpStorageTrashOnPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.CleanUpStorageTrashOnPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5743,8 +5525,8 @@ abstract class ApiHelper { } - def changeVmNicState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmNicStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVmNicStateAction() + def cleanUpTrashOnBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpTrashOnBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.CleanUpTrashOnBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5770,8 +5552,8 @@ abstract class ApiHelper { } - def changeVmNicType(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmNicTypeAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVmNicTypeAction() + def cleanUpTrashOnPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpTrashOnPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.CleanUpTrashOnPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5797,8 +5579,8 @@ abstract class ApiHelper { } - def changeVmPassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmPasswordAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVmPasswordAction() + def cleanupBillingUsage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanupBillingUsageAction.class) Closure c) { + def a = new org.zstack.sdk.CleanupBillingUsageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5824,8 +5606,8 @@ abstract class ApiHelper { } - def changeVmSchedulingRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVmSchedulingRuleStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVmSchedulingRuleStateAction() + def cloneVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CloneVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.CloneVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5851,8 +5633,8 @@ abstract class ApiHelper { } - def changeVolumeState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVolumeStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVolumeStateAction() + def convertTemplatedVmInstanceToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ConvertTemplatedVmInstanceToVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.ConvertTemplatedVmInstanceToVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5878,8 +5660,8 @@ abstract class ApiHelper { } - def changeVpcHaGroupMonitorIps(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeVpcHaGroupMonitorIpsAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeVpcHaGroupMonitorIpsAction() + def convertVmInstanceToTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ConvertVmInstanceToTemplatedVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.ConvertVmInstanceToTemplatedVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5905,8 +5687,8 @@ abstract class ApiHelper { } - def changeZoneState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeZoneStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeZoneStateAction() + def createAccessControlList(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAccessControlListAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAccessControlListAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5932,8 +5714,8 @@ abstract class ApiHelper { } - def checkBareMetal2IpmiChassisConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckBareMetal2IpmiChassisConfigFileAction.class) Closure c) { - def a = new org.zstack.sdk.CheckBareMetal2IpmiChassisConfigFileAction() + def createAccessKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAccessKeyAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAccessKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5959,8 +5741,8 @@ abstract class ApiHelper { } - def checkBaremetalChassisConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckBaremetalChassisConfigFileAction.class) Closure c) { - def a = new org.zstack.sdk.CheckBaremetalChassisConfigFileAction() + def createAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAccountAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -5986,8 +5768,8 @@ abstract class ApiHelper { } - def checkBatchDataIntegrity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckBatchDataIntegrityAction.class) Closure c) { - def a = new org.zstack.sdk.CheckBatchDataIntegrityAction() + def createAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAffinityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAffinityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6013,8 +5795,8 @@ abstract class ApiHelper { } - def checkCephHealthStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckCephHealthStatusAction.class) Closure c) { - def a = new org.zstack.sdk.CheckCephHealthStatusAction() + def createAiSiNoSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAiSiNoSecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAiSiNoSecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6040,8 +5822,8 @@ abstract class ApiHelper { } - def checkElaborationContent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckElaborationContentAction.class) Closure c) { - def a = new org.zstack.sdk.CheckElaborationContentAction() + def createAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAutoScalingGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6067,8 +5849,8 @@ abstract class ApiHelper { } - def checkFirewallRuleConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckFirewallRuleConfigFileAction.class) Closure c) { - def a = new org.zstack.sdk.CheckFirewallRuleConfigFileAction() + def createAutoScalingGroupAddingNewInstanceRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingGroupAddingNewInstanceRuleAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAutoScalingGroupAddingNewInstanceRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6094,8 +5876,8 @@ abstract class ApiHelper { } - def checkIpAvailability(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckIpAvailabilityAction.class) Closure c) { - def a = new org.zstack.sdk.CheckIpAvailabilityAction() + def createAutoScalingGroupRemovalInstanceRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingGroupRemovalInstanceRuleAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAutoScalingGroupRemovalInstanceRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6121,8 +5903,8 @@ abstract class ApiHelper { } - def checkKVMHostConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckKVMHostConfigFileAction.class) Closure c) { - def a = new org.zstack.sdk.CheckKVMHostConfigFileAction() + def createAutoScalingRuleAlarmTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingRuleAlarmTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAutoScalingRuleAlarmTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6147,35 +5929,9 @@ abstract class ApiHelper { } } - def checkMemorySnapshotGroupConflict(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckMemorySnapshotGroupConflictAction.class) Closure c) { - def a = new org.zstack.sdk.CheckMemorySnapshotGroupConflictAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - def checkNetworkReachable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckNetworkReachableAction.class) Closure c) { - def a = new org.zstack.sdk.CheckNetworkReachableAction() + def createAutoScalingRuleSchedulerJobTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingRuleSchedulerJobTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAutoScalingRuleSchedulerJobTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6201,8 +5957,8 @@ abstract class ApiHelper { } - def checkScsiLunClusterStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckScsiLunClusterStatusAction.class) Closure c) { - def a = new org.zstack.sdk.CheckScsiLunClusterStatusAction() + def createAutoScalingVmTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingVmTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.CreateAutoScalingVmTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6228,8 +5984,8 @@ abstract class ApiHelper { } - def checkStackTemplateParameters(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckStackTemplateParametersAction.class) Closure c) { - def a = new org.zstack.sdk.CheckStackTemplateParametersAction() + def createBaremetalBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBaremetalBondingAction.class) Closure c) { + def a = new org.zstack.sdk.CreateBaremetalBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6255,8 +6011,8 @@ abstract class ApiHelper { } - def checkVipPortAvailability(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckVipPortAvailabilityAction.class) Closure c) { - def a = new org.zstack.sdk.CheckVipPortAvailabilityAction() + def createBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.CreateBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6282,8 +6038,8 @@ abstract class ApiHelper { } - def checkVolumeSnapshotGroupAvailability(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckVolumeSnapshotGroupAvailabilityAction.class) Closure c) { - def a = new org.zstack.sdk.CheckVolumeSnapshotGroupAvailabilityAction() + def createBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.CreateBaremetalInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6309,8 +6065,8 @@ abstract class ApiHelper { } - def cleanLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanLongJobAction.class) Closure c) { - def a = new org.zstack.sdk.CleanLongJobAction() + def createBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBaremetalPxeServerAction.class) Closure c) { + def a = new org.zstack.sdk.CreateBaremetalPxeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6336,8 +6092,8 @@ abstract class ApiHelper { } - def cleanQueue(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanQueueAction.class) Closure c) { - def a = new org.zstack.sdk.CleanQueueAction() + def createBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBlockVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.CreateBlockVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6363,8 +6119,8 @@ abstract class ApiHelper { } - def cleanUpBareMetal2Bonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpBareMetal2BondingAction.class) Closure c) { - def a = new org.zstack.sdk.CleanUpBareMetal2BondingAction() + def createBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBondingAction.class) Closure c) { + def a = new org.zstack.sdk.CreateBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6390,8 +6146,8 @@ abstract class ApiHelper { } - def cleanUpBaremetalChassisBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpBaremetalChassisBondingAction.class) Closure c) { - def a = new org.zstack.sdk.CleanUpBaremetalChassisBondingAction() + def createCasClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCasClientAction.class) Closure c) { + def a = new org.zstack.sdk.CreateCasClientAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6417,8 +6173,8 @@ abstract class ApiHelper { } - def cleanUpImageCacheOnPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpImageCacheOnPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.CleanUpImageCacheOnPrimaryStorageAction() + def createCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCbtTaskAction.class) Closure c) { + def a = new org.zstack.sdk.CreateCbtTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6444,8 +6200,8 @@ abstract class ApiHelper { } - def cleanUpStorageTrashOnPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpStorageTrashOnPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.CleanUpStorageTrashOnPrimaryStorageAction() + def createCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCdpPolicyAction.class) Closure c) { + def a = new org.zstack.sdk.CreateCdpPolicyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6471,8 +6227,8 @@ abstract class ApiHelper { } - def cleanUpTrashOnBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpTrashOnBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.CleanUpTrashOnBackupStorageAction() + def createCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCdpTaskAction.class) Closure c) { + def a = new org.zstack.sdk.CreateCdpTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6498,8 +6254,8 @@ abstract class ApiHelper { } - def cleanUpTrashOnPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanUpTrashOnPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.CleanUpTrashOnPrimaryStorageAction() + def createCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCertificateAction.class) Closure c) { + def a = new org.zstack.sdk.CreateCertificateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6525,8 +6281,8 @@ abstract class ApiHelper { } - def cleanupBillingUsage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CleanupBillingUsageAction.class) Closure c) { - def a = new org.zstack.sdk.CleanupBillingUsageAction() + def createCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateClusterAction.class) Closure c) { + def a = new org.zstack.sdk.CreateClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6552,8 +6308,8 @@ abstract class ApiHelper { } - def cloneVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CloneVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.CloneVmInstanceAction() + def createClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateClusterDRSAction.class) Closure c) { + def a = new org.zstack.sdk.CreateClusterDRSAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6579,8 +6335,8 @@ abstract class ApiHelper { } - def convertTemplatedVmInstanceToVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ConvertTemplatedVmInstanceToVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.ConvertTemplatedVmInstanceToVmInstanceAction() + def createDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.CreateDataVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6606,8 +6362,8 @@ abstract class ApiHelper { } - def convertVmInstanceToTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ConvertVmInstanceToTemplatedVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.ConvertVmInstanceToTemplatedVmInstanceAction() + def createDataVolumeFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeFromVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.CreateDataVolumeFromVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6633,8 +6389,8 @@ abstract class ApiHelper { } - def createAccessControlList(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAccessControlListAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAccessControlListAction() + def createDataVolumeFromVolumeTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeFromVolumeTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.CreateDataVolumeFromVolumeTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6660,8 +6416,8 @@ abstract class ApiHelper { } - def createAccessKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAccessKeyAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAccessKeyAction() + def createDataVolumeTemplateFromVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeTemplateFromVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.CreateDataVolumeTemplateFromVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6687,8 +6443,8 @@ abstract class ApiHelper { } - def createAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAccountAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAccountAction() + def createDataVolumeTemplateFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeTemplateFromVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.CreateDataVolumeTemplateFromVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6714,8 +6470,8 @@ abstract class ApiHelper { } - def createAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAffinityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAffinityGroupAction() + def createDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.CreateDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6741,8 +6497,8 @@ abstract class ApiHelper { } - def createAiSiNoSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAiSiNoSecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAiSiNoSecretResourcePoolAction() + def createDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDiskOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.CreateDiskOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6768,8 +6524,8 @@ abstract class ApiHelper { } - def createAliyunDiskFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunDiskFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunDiskFromRemoteAction() + def createEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEipAction.class) Closure c) { + def a = new org.zstack.sdk.CreateEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6795,8 +6551,8 @@ abstract class ApiHelper { } - def createAliyunNasAccessGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunNasAccessGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunNasAccessGroupAction() + def createEmailMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEmailMediaAction.class) Closure c) { + def a = new org.zstack.sdk.CreateEmailMediaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6822,8 +6578,8 @@ abstract class ApiHelper { } - def createAliyunNasAccessGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunNasAccessGroupRuleAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunNasAccessGroupRuleAction() + def createEmailMonitorTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEmailMonitorTriggerActionAction.class) Closure c) { + def a = new org.zstack.sdk.CreateEmailMonitorTriggerActionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6849,8 +6605,8 @@ abstract class ApiHelper { } - def createAliyunNasFileSystem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunNasFileSystemAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunNasFileSystemAction() + def createFaultToleranceVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFaultToleranceVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFaultToleranceVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6876,8 +6632,8 @@ abstract class ApiHelper { } - def createAliyunNasMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunNasMountTargetAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunNasMountTargetAction() + def createFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallIpSetTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFirewallIpSetTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6903,8 +6659,8 @@ abstract class ApiHelper { } - def createAliyunProxyVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunProxyVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunProxyVSwitchAction() + def createFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFirewallRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6930,8 +6686,8 @@ abstract class ApiHelper { } - def createAliyunProxyVpc(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunProxyVpcAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunProxyVpcAction() + def createFirewallRuleFromConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleFromConfigFileAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFirewallRuleFromConfigFileAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6957,8 +6713,8 @@ abstract class ApiHelper { } - def createAliyunRouterInterfaceRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunRouterInterfaceRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunRouterInterfaceRemoteAction() + def createFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleSetAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFirewallRuleSetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -6984,8 +6740,8 @@ abstract class ApiHelper { } - def createAliyunSnapshotRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunSnapshotRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunSnapshotRemoteAction() + def createFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFirewallRuleTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7011,8 +6767,8 @@ abstract class ApiHelper { } - def createAliyunVpcVirtualRouterEntryRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAliyunVpcVirtualRouterEntryRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAliyunVpcVirtualRouterEntryRemoteAction() + def createFlkSecSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFlkSecSecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFlkSecSecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7038,8 +6794,8 @@ abstract class ApiHelper { } - def createAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAutoScalingGroupAction() + def createFlowCollector(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFlowCollectorAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFlowCollectorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7065,8 +6821,8 @@ abstract class ApiHelper { } - def createAutoScalingGroupAddingNewInstanceRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingGroupAddingNewInstanceRuleAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAutoScalingGroupAddingNewInstanceRuleAction() + def createFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFlowMeterAction.class) Closure c) { + def a = new org.zstack.sdk.CreateFlowMeterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7092,8 +6848,8 @@ abstract class ApiHelper { } - def createAutoScalingGroupRemovalInstanceRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingGroupRemovalInstanceRuleAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAutoScalingGroupRemovalInstanceRuleAction() + def createHaiTaiSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateHaiTaiSecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.CreateHaiTaiSecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7119,8 +6875,8 @@ abstract class ApiHelper { } - def createAutoScalingRuleAlarmTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingRuleAlarmTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAutoScalingRuleAlarmTriggerAction() + def createHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateHostKernelInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.CreateHostKernelInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7146,8 +6902,8 @@ abstract class ApiHelper { } - def createAutoScalingRuleSchedulerJobTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingRuleSchedulerJobTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAutoScalingRuleSchedulerJobTriggerAction() + def createHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateHostSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateHostSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7173,53 +6929,26 @@ abstract class ApiHelper { } - def createAutoScalingVmTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateAutoScalingVmTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.CreateAutoScalingVmTemplateAction() + def updateHostname(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostnameAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostnameAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def createBareMetal2Bonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBareMetal2BondingAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBareMetal2BondingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid } - + def tracker = new ApiPathTracker(a.apiId) def out = errorOut(a.call()) def path = tracker.getApiPath() if (!path.isEmpty()) { Test.apiPaths[a.class.name] = path.join(" --->\n") } - + return out } else { return errorOut(a.call()) @@ -7227,8 +6956,8 @@ abstract class ApiHelper { } - def createBareMetal2Instance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBareMetal2InstanceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBareMetal2InstanceAction() + def createIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.CreateIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7254,9 +6983,9 @@ abstract class ApiHelper { } - def createBareMetal2IpmiChassisHardwareInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBareMetal2IpmiChassisHardwareInfoAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBareMetal2IpmiChassisHardwareInfoAction() - + def createImageReplicationGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateImageReplicationGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateImageReplicationGroupAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -7281,8 +7010,8 @@ abstract class ApiHelper { } - def createBareMetal2ProvisionNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBareMetal2ProvisionNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBareMetal2ProvisionNetworkAction() + def createInfoSecSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateInfoSecSecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.CreateInfoSecSecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7308,8 +7037,8 @@ abstract class ApiHelper { } - def createBaremetalBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBaremetalBondingAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBaremetalBondingAction() + def createInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateInstanceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.CreateInstanceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7335,8 +7064,8 @@ abstract class ApiHelper { } - def createBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBaremetalChassisAction() + def createL2HardwareVxlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2HardwareVxlanNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2HardwareVxlanNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7362,8 +7091,8 @@ abstract class ApiHelper { } - def createBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBaremetalInstanceAction() + def createL2HardwareVxlanNetworkPool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2HardwareVxlanNetworkPoolAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2HardwareVxlanNetworkPoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7389,8 +7118,8 @@ abstract class ApiHelper { } - def createBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBaremetalPxeServerAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBaremetalPxeServerAction() + def createL2NoVlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2NoVlanNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2NoVlanNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7416,8 +7145,8 @@ abstract class ApiHelper { } - def createBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBlockVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBlockVolumeAction() + def createL2PortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2PortGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2PortGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7443,8 +7172,8 @@ abstract class ApiHelper { } - def createBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateBondingAction.class) Closure c) { - def a = new org.zstack.sdk.CreateBondingAction() + def createL2TfNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2TfNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2TfNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7470,8 +7199,8 @@ abstract class ApiHelper { } - def createCasClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCasClientAction.class) Closure c) { - def a = new org.zstack.sdk.CreateCasClientAction() + def createL2VirtualSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2VirtualSwitchAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2VirtualSwitchAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7497,8 +7226,8 @@ abstract class ApiHelper { } - def createCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCbtTaskAction.class) Closure c) { - def a = new org.zstack.sdk.CreateCbtTaskAction() + def createL2VlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2VlanNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2VlanNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7524,8 +7253,8 @@ abstract class ApiHelper { } - def createCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCdpPolicyAction.class) Closure c) { - def a = new org.zstack.sdk.CreateCdpPolicyAction() + def createL2VxlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2VxlanNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2VxlanNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7551,8 +7280,8 @@ abstract class ApiHelper { } - def createCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCdpTaskAction.class) Closure c) { - def a = new org.zstack.sdk.CreateCdpTaskAction() + def createL2VxlanNetworkPool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2VxlanNetworkPoolAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL2VxlanNetworkPoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7578,8 +7307,8 @@ abstract class ApiHelper { } - def createCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateCertificateAction.class) Closure c) { - def a = new org.zstack.sdk.CreateCertificateAction() + def createL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.CreateL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7605,8 +7334,8 @@ abstract class ApiHelper { } - def createCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateClusterAction.class) Closure c) { - def a = new org.zstack.sdk.CreateClusterAction() + def createLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.CreateLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7632,8 +7361,8 @@ abstract class ApiHelper { } - def createClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateClusterDRSAction.class) Closure c) { - def a = new org.zstack.sdk.CreateClusterDRSAction() + def createLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.CreateLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7659,8 +7388,8 @@ abstract class ApiHelper { } - def createConnectionBetweenL3NetworkAndAliyunVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateConnectionBetweenL3NetworkAndAliyunVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.CreateConnectionBetweenL3NetworkAndAliyunVSwitchAction() + def createLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateLoadBalancerServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateLoadBalancerServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7686,8 +7415,8 @@ abstract class ApiHelper { } - def createDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.CreateDataVolumeAction() + def createMiniCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateMiniClusterAction.class) Closure c) { + def a = new org.zstack.sdk.CreateMiniClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7713,8 +7442,8 @@ abstract class ApiHelper { } - def createDataVolumeFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeFromVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.CreateDataVolumeFromVolumeSnapshotAction() + def createMonitorTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateMonitorTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.CreateMonitorTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7740,8 +7469,8 @@ abstract class ApiHelper { } - def createDataVolumeFromVolumeTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeFromVolumeTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.CreateDataVolumeFromVolumeTemplateAction() + def createMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateMulticastRouterAction.class) Closure c) { + def a = new org.zstack.sdk.CreateMulticastRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7767,8 +7496,8 @@ abstract class ApiHelper { } - def createDataVolumeTemplateFromVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeTemplateFromVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.CreateDataVolumeTemplateFromVolumeAction() + def createOAuthClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateOAuthClientAction.class) Closure c) { + def a = new org.zstack.sdk.CreateOAuthClientAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7794,8 +7523,8 @@ abstract class ApiHelper { } - def createDataVolumeTemplateFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDataVolumeTemplateFromVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.CreateDataVolumeTemplateFromVolumeSnapshotAction() + def createPciDeviceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePciDeviceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePciDeviceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7821,8 +7550,8 @@ abstract class ApiHelper { } - def createDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.CreateDirectoryAction() + def createPolicyRouteRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePolicyRouteRuleAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePolicyRouteRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7848,8 +7577,8 @@ abstract class ApiHelper { } - def createDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateDiskOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.CreateDiskOfferingAction() + def createPolicyRouteRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePolicyRouteRuleSetAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePolicyRouteRuleSetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7875,8 +7604,8 @@ abstract class ApiHelper { } - def createEcsImageFromEcsSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEcsImageFromEcsSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEcsImageFromEcsSnapshotAction() + def createPolicyRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePolicyRouteTableAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePolicyRouteTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7902,8 +7631,8 @@ abstract class ApiHelper { } - def createEcsImageFromLocalImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEcsImageFromLocalImageAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEcsImageFromLocalImageAction() + def createPolicyRouteTableRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePolicyRouteTableRouteEntryAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePolicyRouteTableRouteEntryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7929,8 +7658,8 @@ abstract class ApiHelper { } - def createEcsInstanceFromEcsImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEcsInstanceFromEcsImageAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEcsInstanceFromEcsImageAction() + def createPortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePortForwardingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePortForwardingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7956,8 +7685,8 @@ abstract class ApiHelper { } - def createEcsSecurityGroupRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEcsSecurityGroupRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEcsSecurityGroupRemoteAction() + def createPortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePortGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePortGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7983,8 +7712,8 @@ abstract class ApiHelper { } - def createEcsSecurityGroupRuleRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEcsSecurityGroupRuleRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEcsSecurityGroupRuleRemoteAction() + def createPortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePortMirrorAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePortMirrorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8010,8 +7739,8 @@ abstract class ApiHelper { } - def createEcsVSwitchRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEcsVSwitchRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEcsVSwitchRemoteAction() + def createPortMirrorSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePortMirrorSessionAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePortMirrorSessionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8037,8 +7766,8 @@ abstract class ApiHelper { } - def createEcsVpcRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEcsVpcRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEcsVpcRemoteAction() + def createPriceTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePriceTableAction.class) Closure c) { + def a = new org.zstack.sdk.CreatePriceTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8064,8 +7793,8 @@ abstract class ApiHelper { } - def createEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEipAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEipAction() + def createResourcePrice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateResourcePriceAction.class) Closure c) { + def a = new org.zstack.sdk.CreateResourcePriceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8091,8 +7820,8 @@ abstract class ApiHelper { } - def createEmailMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEmailMediaAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEmailMediaAction() + def createResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.CreateResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8118,8 +7847,8 @@ abstract class ApiHelper { } - def createEmailMonitorTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateEmailMonitorTriggerActionAction.class) Closure c) { - def a = new org.zstack.sdk.CreateEmailMonitorTriggerActionAction() + def createRootVolumeTemplateFromRootVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateRootVolumeTemplateFromRootVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.CreateRootVolumeTemplateFromRootVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8145,8 +7874,8 @@ abstract class ApiHelper { } - def createFaultToleranceVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFaultToleranceVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFaultToleranceVmInstanceAction() + def createRootVolumeTemplateFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateRootVolumeTemplateFromVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.CreateRootVolumeTemplateFromVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8172,8 +7901,8 @@ abstract class ApiHelper { } - def createFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallIpSetTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallIpSetTemplateAction() + def createSSORedirectTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSSORedirectTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSSORedirectTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8199,8 +7928,8 @@ abstract class ApiHelper { } - def createFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallRuleAction() + def createSchedulerJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSchedulerJobAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSchedulerJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8226,8 +7955,8 @@ abstract class ApiHelper { } - def createFirewallRuleFromConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleFromConfigFileAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallRuleFromConfigFileAction() + def createSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSchedulerJobGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSchedulerJobGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8253,8 +7982,8 @@ abstract class ApiHelper { } - def createFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallRuleSetAction() + def createSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8280,8 +8009,8 @@ abstract class ApiHelper { } - def createFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallRuleTemplateAction() + def createSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8307,8 +8036,8 @@ abstract class ApiHelper { } - def createFlkSecSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFlkSecSecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFlkSecSecretResourcePoolAction() + def createSlbGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSlbGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSlbGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8334,8 +8063,8 @@ abstract class ApiHelper { } - def createFlowCollector(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFlowCollectorAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFlowCollectorAction() + def createSlbInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSlbInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSlbInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8361,8 +8090,8 @@ abstract class ApiHelper { } - def createFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFlowMeterAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFlowMeterAction() + def createSlbOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSlbOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSlbOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8388,8 +8117,8 @@ abstract class ApiHelper { } - def createHaiTaiSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateHaiTaiSecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.CreateHaiTaiSecretResourcePoolAction() + def createSnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSnmpAgentAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSnmpAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8415,8 +8144,8 @@ abstract class ApiHelper { } - def createHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateHostKernelInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateHostKernelInterfaceAction() + def createSshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSshKeyPairAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSshKeyPairAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8442,8 +8171,8 @@ abstract class ApiHelper { } - def createHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateHostSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateHostSchedulingRuleGroupAction() + def createSystemTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSystemTagAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSystemTagAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8469,8 +8198,8 @@ abstract class ApiHelper { } - def createHybridEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateHybridEipAction.class) Closure c) { - def a = new org.zstack.sdk.CreateHybridEipAction() + def createSystemTags(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSystemTagsAction.class) Closure c) { + def a = new org.zstack.sdk.CreateSystemTagsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8496,8 +8225,8 @@ abstract class ApiHelper { } - def createIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.CreateIPsecConnectionAction() + def createTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateTagAction.class) Closure c) { + def a = new org.zstack.sdk.CreateTagAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8523,89 +8252,8 @@ abstract class ApiHelper { } - def createImageReplicationGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateImageReplicationGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateImageReplicationGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def createInfoSecSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateInfoSecSecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.CreateInfoSecSecretResourcePoolAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def createInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateInstanceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.CreateInstanceOfferingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def createL2HardwareVxlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2HardwareVxlanNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2HardwareVxlanNetworkAction() + def createTemplatedVmInstanceFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateTemplatedVmInstanceFromVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.CreateTemplatedVmInstanceFromVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8631,8 +8279,8 @@ abstract class ApiHelper { } - def createL2HardwareVxlanNetworkPool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2HardwareVxlanNetworkPoolAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2HardwareVxlanNetworkPoolAction() + def createVRouterOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVRouterOspfAreaAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVRouterOspfAreaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8658,8 +8306,8 @@ abstract class ApiHelper { } - def createL2NoVlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2NoVlanNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2NoVlanNetworkAction() + def createVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVRouterRouteTableAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVRouterRouteTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8685,8 +8333,8 @@ abstract class ApiHelper { } - def createL2PortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2PortGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2PortGroupAction() + def createVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVipAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8712,8 +8360,8 @@ abstract class ApiHelper { } - def createL2TfNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2TfNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2TfNetworkAction() + def createVirtualRouterOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVirtualRouterOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVirtualRouterOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8739,8 +8387,8 @@ abstract class ApiHelper { } - def createL2VirtualSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2VirtualSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2VirtualSwitchAction() + def createVmCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmCdRomAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmCdRomAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8766,8 +8414,8 @@ abstract class ApiHelper { } - def createL2VlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2VlanNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2VlanNetworkAction() + def createVmFromCdpBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmFromCdpBackupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmFromCdpBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8793,8 +8441,8 @@ abstract class ApiHelper { } - def createL2VxlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2VxlanNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2VxlanNetworkAction() + def createVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8820,8 +8468,8 @@ abstract class ApiHelper { } - def createL2VxlanNetworkPool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL2VxlanNetworkPoolAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL2VxlanNetworkPoolAction() + def createVmInstanceFromOvf(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromOvfAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmInstanceFromOvfAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8847,8 +8495,8 @@ abstract class ApiHelper { } - def createL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.CreateL3NetworkAction() + def createVmInstanceFromTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromTemplatedVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmInstanceFromTemplatedVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8874,8 +8522,8 @@ abstract class ApiHelper { } - def createLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.CreateLoadBalancerAction() + def createVmInstanceFromVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmInstanceFromVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8901,8 +8549,8 @@ abstract class ApiHelper { } - def createLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.CreateLoadBalancerListenerAction() + def createVmInstanceFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmInstanceFromVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8928,8 +8576,8 @@ abstract class ApiHelper { } - def createLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateLoadBalancerServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateLoadBalancerServerGroupAction() + def createVmInstanceFromVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromVolumeSnapshotGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmInstanceFromVolumeSnapshotGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8955,8 +8603,8 @@ abstract class ApiHelper { } - def createMiniCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateMiniClusterAction.class) Closure c) { - def a = new org.zstack.sdk.CreateMiniClusterAction() + def createVmNic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmNicAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmNicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8982,8 +8630,8 @@ abstract class ApiHelper { } - def createMonitorTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateMonitorTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.CreateMonitorTriggerAction() + def createVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmSchedulingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmSchedulingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9009,8 +8657,8 @@ abstract class ApiHelper { } - def createMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateMulticastRouterAction.class) Closure c) { - def a = new org.zstack.sdk.CreateMulticastRouterAction() + def createVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVmSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9036,8 +8684,8 @@ abstract class ApiHelper { } - def createOAuthClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateOAuthClientAction.class) Closure c) { - def a = new org.zstack.sdk.CreateOAuthClientAction() + def createVniRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVniRangeAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVniRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9063,8 +8711,8 @@ abstract class ApiHelper { } - def createOssBackupBucketRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateOssBackupBucketRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateOssBackupBucketRemoteAction() + def createVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9090,8 +8738,8 @@ abstract class ApiHelper { } - def createOssBucketRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateOssBucketRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateOssBucketRemoteAction() + def createVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVolumeSnapshotGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVolumeSnapshotGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9117,8 +8765,8 @@ abstract class ApiHelper { } - def createPciDeviceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePciDeviceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePciDeviceOfferingAction() + def createVolumesSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVolumesSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVolumesSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9144,8 +8792,8 @@ abstract class ApiHelper { } - def createPolicyRouteRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePolicyRouteRuleAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePolicyRouteRuleAction() + def createVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcFirewallAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVpcFirewallAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9171,8 +8819,8 @@ abstract class ApiHelper { } - def createPolicyRouteRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePolicyRouteRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePolicyRouteRuleSetAction() + def createVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcHaGroupAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVpcHaGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9198,8 +8846,8 @@ abstract class ApiHelper { } - def createPolicyRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePolicyRouteTableAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePolicyRouteTableAction() + def createVpcVRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcVRouterAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVpcVRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9225,8 +8873,8 @@ abstract class ApiHelper { } - def createPolicyRouteTableRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePolicyRouteTableRouteEntryAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePolicyRouteTableRouteEntryAction() + def createVxlanPoolRemoteVtep(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVxlanPoolRemoteVtepAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVxlanPoolRemoteVtepAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9252,8 +8900,8 @@ abstract class ApiHelper { } - def createPortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePortForwardingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePortForwardingRuleAction() + def createVxlanVtep(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVxlanVtepAction.class) Closure c) { + def a = new org.zstack.sdk.CreateVxlanVtepAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9279,8 +8927,8 @@ abstract class ApiHelper { } - def createPortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePortGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePortGroupAction() + def createWebhook(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateWebhookAction.class) Closure c) { + def a = new org.zstack.sdk.CreateWebhookAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9306,8 +8954,8 @@ abstract class ApiHelper { } - def createPortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePortMirrorAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePortMirrorAction() + def createZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateZoneAction.class) Closure c) { + def a = new org.zstack.sdk.CreateZoneAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9333,8 +8981,8 @@ abstract class ApiHelper { } - def createPortMirrorSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePortMirrorSessionAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePortMirrorSessionAction() + def debugSignal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DebugSignalAction.class) Closure c) { + def a = new org.zstack.sdk.DebugSignalAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9360,8 +9008,8 @@ abstract class ApiHelper { } - def createPriceTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreatePriceTableAction.class) Closure c) { - def a = new org.zstack.sdk.CreatePriceTableAction() + def decodeStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DecodeStackTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.DecodeStackTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9387,8 +9035,8 @@ abstract class ApiHelper { } - def createResourcePrice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateResourcePriceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateResourcePriceAction() + def deleteAccessControlList(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAccessControlListAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAccessControlListAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9414,8 +9062,8 @@ abstract class ApiHelper { } - def createResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.CreateResourceStackAction() + def deleteAccessControlRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAccessControlRuleAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAccessControlRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9441,8 +9089,8 @@ abstract class ApiHelper { } - def createRootVolumeTemplateFromRootVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateRootVolumeTemplateFromRootVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.CreateRootVolumeTemplateFromRootVolumeAction() + def deleteAccessKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAccessKeyAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAccessKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9468,8 +9116,8 @@ abstract class ApiHelper { } - def createRootVolumeTemplateFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateRootVolumeTemplateFromVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.CreateRootVolumeTemplateFromVolumeSnapshotAction() + def deleteAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAccountAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9495,8 +9143,8 @@ abstract class ApiHelper { } - def createSSORedirectTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSSORedirectTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSSORedirectTemplateAction() + def deleteAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAffinityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAffinityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9522,8 +9170,8 @@ abstract class ApiHelper { } - def createSchedulerJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSchedulerJobAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSchedulerJobAction() + def deleteAlert(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAlertAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAlertAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9549,8 +9197,8 @@ abstract class ApiHelper { } - def createSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSchedulerJobGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSchedulerJobGroupAction() + def deleteAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9576,8 +9224,8 @@ abstract class ApiHelper { } - def createSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSchedulerTriggerAction() + def deleteAutoScalingGroupInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingGroupInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingGroupInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9603,8 +9251,8 @@ abstract class ApiHelper { } - def createSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSecurityGroupAction() + def deleteAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9630,8 +9278,8 @@ abstract class ApiHelper { } - def createSlbGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSlbGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSlbGroupAction() + def deleteAutoScalingRuleTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingRuleTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingRuleTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9657,8 +9305,8 @@ abstract class ApiHelper { } - def createSlbInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSlbInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSlbInstanceAction() + def deleteAutoScalingTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9684,8 +9332,8 @@ abstract class ApiHelper { } - def createSlbOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSlbOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSlbOfferingAction() + def deleteBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9711,8 +9359,8 @@ abstract class ApiHelper { } - def createSnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSnmpAgentAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSnmpAgentAction() + def deleteBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9738,8 +9386,8 @@ abstract class ApiHelper { } - def createSshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSshKeyPairAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSshKeyPairAction() + def deleteBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBaremetalPxeServerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBaremetalPxeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9765,8 +9413,8 @@ abstract class ApiHelper { } - def createSystemTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSystemTagAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSystemTagAction() + def deleteBilling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBillingAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBillingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9792,8 +9440,8 @@ abstract class ApiHelper { } - def createSystemTags(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateSystemTagsAction.class) Closure c) { - def a = new org.zstack.sdk.CreateSystemTagsAction() + def deleteBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBondingAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9819,35 +9467,8 @@ abstract class ApiHelper { } - def createTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateTagAction.class) Closure c) { - def a = new org.zstack.sdk.CreateTagAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def createTemplatedVmInstanceFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateTemplatedVmInstanceFromVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateTemplatedVmInstanceFromVmInstanceAction() + def deleteCCSCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCCSCertificateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCCSCertificateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9873,8 +9494,8 @@ abstract class ApiHelper { } - def createVRouterOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVRouterOspfAreaAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVRouterOspfAreaAction() + def deleteCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCbtTaskAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCbtTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9900,8 +9521,8 @@ abstract class ApiHelper { } - def createVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVRouterRouteTableAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVRouterRouteTableAction() + def deleteCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpPolicyAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCdpPolicyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9927,8 +9548,8 @@ abstract class ApiHelper { } - def createVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVipAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVipAction() + def deleteCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpTaskAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCdpTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9954,8 +9575,8 @@ abstract class ApiHelper { } - def createVirtualRouterOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVirtualRouterOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVirtualRouterOfferingAction() + def deleteCdpTaskData(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpTaskDataAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCdpTaskDataAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -9981,8 +9602,8 @@ abstract class ApiHelper { } - def createVmCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmCdRomAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmCdRomAction() + def deleteCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCephPrimaryStoragePoolAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCephPrimaryStoragePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10008,8 +9629,8 @@ abstract class ApiHelper { } - def createVmFromCdpBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmFromCdpBackupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmFromCdpBackupAction() + def deleteCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCertificateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCertificateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10035,8 +9656,8 @@ abstract class ApiHelper { } - def createVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmInstanceAction() + def deleteCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteClusterAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10062,8 +9683,8 @@ abstract class ApiHelper { } - def createVmInstanceFromOvf(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromOvfAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmInstanceFromOvfAction() + def deleteClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteClusterDRSAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteClusterDRSAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10089,8 +9710,8 @@ abstract class ApiHelper { } - def createVmInstanceFromTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromTemplatedVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmInstanceFromTemplatedVmInstanceAction() + def deleteDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDataVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteDataVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10116,8 +9737,8 @@ abstract class ApiHelper { } - def createVmInstanceFromVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmInstanceFromVolumeAction() + def deleteDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10143,8 +9764,8 @@ abstract class ApiHelper { } - def createVmInstanceFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmInstanceFromVolumeSnapshotAction() + def deleteDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDiskOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteDiskOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10170,8 +9791,8 @@ abstract class ApiHelper { } - def createVmInstanceFromVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmInstanceFromVolumeSnapshotGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmInstanceFromVolumeSnapshotGroupAction() + def deleteEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEipAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10197,8 +9818,8 @@ abstract class ApiHelper { } - def createVmNic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmNicAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmNicAction() + def deleteExportedImageFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteExportedImageFromBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteExportedImageFromBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10224,8 +9845,8 @@ abstract class ApiHelper { } - def createVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmSchedulingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmSchedulingRuleAction() + def deleteExternalBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteExternalBackupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteExternalBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10251,8 +9872,8 @@ abstract class ApiHelper { } - def createVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVmSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVmSchedulingRuleGroupAction() + def deleteFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteFirewallAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10278,8 +9899,8 @@ abstract class ApiHelper { } - def createVniRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVniRangeAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVniRangeAction() + def deleteFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallIpSetTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteFirewallIpSetTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10305,8 +9926,8 @@ abstract class ApiHelper { } - def createVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVolumeSnapshotAction() + def deleteFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteFirewallRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10332,8 +9953,8 @@ abstract class ApiHelper { } - def createVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVolumeSnapshotGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVolumeSnapshotGroupAction() + def deleteFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleSetAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteFirewallRuleSetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10359,8 +9980,8 @@ abstract class ApiHelper { } - def createVolumesSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVolumesSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVolumesSnapshotAction() + def deleteFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteFirewallRuleTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10386,8 +10007,8 @@ abstract class ApiHelper { } - def createVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVpcFirewallAction() + def deleteFlowCollector(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFlowCollectorAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteFlowCollectorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10413,8 +10034,8 @@ abstract class ApiHelper { } - def createVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcHaGroupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVpcHaGroupAction() + def deleteFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFlowMeterAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteFlowMeterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10440,8 +10061,8 @@ abstract class ApiHelper { } - def createVpcUserVpnGatewayRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcUserVpnGatewayRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVpcUserVpnGatewayRemoteAction() + def deleteGCJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteGCJobAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteGCJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10467,8 +10088,8 @@ abstract class ApiHelper { } - def createVpcVRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcVRouterAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVpcVRouterAction() + def deleteHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHostAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10494,8 +10115,8 @@ abstract class ApiHelper { } - def createVpcVpnConnectionRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcVpnConnectionRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVpcVpnConnectionRemoteAction() + def deleteHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHostKernelInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteHostKernelInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10521,8 +10142,8 @@ abstract class ApiHelper { } - def createVpnIkeConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpnIkeConfigAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVpnIkeConfigAction() + def deleteHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHostSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteHostSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10548,8 +10169,8 @@ abstract class ApiHelper { } - def createVpnIpsecConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpnIpsecConfigAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVpnIpsecConfigAction() + def deleteIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10575,8 +10196,8 @@ abstract class ApiHelper { } - def createVxlanPoolRemoteVtep(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVxlanPoolRemoteVtepAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVxlanPoolRemoteVtepAction() + def deleteImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteImageAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10602,8 +10223,8 @@ abstract class ApiHelper { } - def createVxlanVtep(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVxlanVtepAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVxlanVtepAction() + def deleteImagePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteImagePackageAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteImagePackageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10629,8 +10250,8 @@ abstract class ApiHelper { } - def createWebhook(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateWebhookAction.class) Closure c) { - def a = new org.zstack.sdk.CreateWebhookAction() + def deleteImageReplicationGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteImageReplicationGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteImageReplicationGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10656,8 +10277,8 @@ abstract class ApiHelper { } - def createZBoxBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateZBoxBackupAction.class) Closure c) { - def a = new org.zstack.sdk.CreateZBoxBackupAction() + def deleteInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteInstanceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteInstanceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10683,8 +10304,8 @@ abstract class ApiHelper { } - def createZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateZoneAction.class) Closure c) { - def a = new org.zstack.sdk.CreateZoneAction() + def deleteIpAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIpAddressAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteIpAddressAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10710,8 +10331,8 @@ abstract class ApiHelper { } - def debugSignal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DebugSignalAction.class) Closure c) { - def a = new org.zstack.sdk.DebugSignalAction() + def deleteIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIpRangeAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteIpRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10737,8 +10358,8 @@ abstract class ApiHelper { } - def decodeStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DecodeStackTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DecodeStackTemplateAction() + def deleteIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIscsiServerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteIscsiServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10764,8 +10385,8 @@ abstract class ApiHelper { } - def deleteAccessControlList(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAccessControlListAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAccessControlListAction() + def deleteL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteL2NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteL2NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10791,8 +10412,8 @@ abstract class ApiHelper { } - def deleteAccessControlRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAccessControlRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAccessControlRuleAction() + def deleteL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10818,8 +10439,8 @@ abstract class ApiHelper { } - def deleteAccessKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAccessKeyAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAccessKeyAction() + def deleteLicense(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLicenseAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteLicenseAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10845,8 +10466,8 @@ abstract class ApiHelper { } - def deleteAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAccountAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAccountAction() + def deleteLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10872,8 +10493,8 @@ abstract class ApiHelper { } - def deleteAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAffinityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAffinityGroupAction() + def deleteLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10899,8 +10520,8 @@ abstract class ApiHelper { } - def deleteAlert(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAlertAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAlertAction() + def deleteLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLoadBalancerServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteLoadBalancerServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10926,8 +10547,8 @@ abstract class ApiHelper { } - def deleteAliyunDiskFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunDiskFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunDiskFromLocalAction() + def deleteLogConfiguration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLogConfigurationAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteLogConfigurationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10953,8 +10574,8 @@ abstract class ApiHelper { } - def deleteAliyunDiskFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunDiskFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunDiskFromRemoteAction() + def deleteLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLongJobAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteLongJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10980,8 +10601,8 @@ abstract class ApiHelper { } - def deleteAliyunKeySecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunKeySecretAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunKeySecretAction() + def deleteMdevDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMdevDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteMdevDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11007,8 +10628,8 @@ abstract class ApiHelper { } - def deleteAliyunNasAccessGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunNasAccessGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunNasAccessGroupAction() + def deleteMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMediaAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteMediaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11034,8 +10655,8 @@ abstract class ApiHelper { } - def deleteAliyunNasAccessGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunNasAccessGroupRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunNasAccessGroupRuleAction() + def deleteMonitorTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMonitorTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteMonitorTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11061,8 +10682,8 @@ abstract class ApiHelper { } - def deleteAliyunPanguPartition(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunPanguPartitionAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunPanguPartitionAction() + def deleteMonitorTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMonitorTriggerActionAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteMonitorTriggerActionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11088,8 +10709,8 @@ abstract class ApiHelper { } - def deleteAliyunProxyVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunProxyVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunProxyVSwitchAction() + def deleteMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMulticastRouterAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteMulticastRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11115,8 +10736,8 @@ abstract class ApiHelper { } - def deleteAliyunProxyVpc(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunProxyVpcAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunProxyVpcAction() + def deleteNasFileSystem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteNasFileSystemAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteNasFileSystemAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11142,8 +10763,8 @@ abstract class ApiHelper { } - def deleteAliyunRouteEntryRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunRouteEntryRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunRouteEntryRemoteAction() + def deleteNasMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteNasMountTargetAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteNasMountTargetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11169,8 +10790,8 @@ abstract class ApiHelper { } - def deleteAliyunRouterInterfaceLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunRouterInterfaceLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunRouterInterfaceLocalAction() + def deleteNicQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteNicQosAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteNicQosAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11196,8 +10817,8 @@ abstract class ApiHelper { } - def deleteAliyunRouterInterfaceRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunRouterInterfaceRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunRouterInterfaceRemoteAction() + def deleteNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteNvmeServerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteNvmeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11223,8 +10844,8 @@ abstract class ApiHelper { } - def deleteAliyunSnapshotFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunSnapshotFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunSnapshotFromLocalAction() + def deletePciDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePciDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePciDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11250,8 +10871,8 @@ abstract class ApiHelper { } - def deleteAliyunSnapshotFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAliyunSnapshotFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAliyunSnapshotFromRemoteAction() + def deletePciDeviceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePciDeviceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePciDeviceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11277,8 +10898,8 @@ abstract class ApiHelper { } - def deleteAllEcsInstancesFromDataCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAllEcsInstancesFromDataCenterAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAllEcsInstancesFromDataCenterAction() + def deletePolicyRouteRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePolicyRouteRuleAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePolicyRouteRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11304,8 +10925,8 @@ abstract class ApiHelper { } - def deleteAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingGroupAction() + def deletePolicyRouteRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePolicyRouteRuleSetAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePolicyRouteRuleSetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11331,8 +10952,8 @@ abstract class ApiHelper { } - def deleteAutoScalingGroupInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingGroupInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingGroupInstanceAction() + def deletePolicyRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePolicyRouteTableAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePolicyRouteTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11358,8 +10979,8 @@ abstract class ApiHelper { } - def deleteAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingRuleAction() + def deletePolicyRouteTableRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePolicyRouteTableRouteEntryAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePolicyRouteTableRouteEntryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11385,8 +11006,8 @@ abstract class ApiHelper { } - def deleteAutoScalingRuleTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingRuleTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingRuleTriggerAction() + def deletePortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePortForwardingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePortForwardingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11412,8 +11033,8 @@ abstract class ApiHelper { } - def deleteAutoScalingTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingTemplateAction() + def deletePortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePortGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePortGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11439,8 +11060,8 @@ abstract class ApiHelper { } - def deleteBackupFileInPublic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBackupFileInPublicAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBackupFileInPublicAction() + def deletePortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePortMirrorAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePortMirrorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11466,8 +11087,8 @@ abstract class ApiHelper { } - def deleteBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBackupStorageAction() + def deletePortMirrorSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePortMirrorSessionAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePortMirrorSessionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11493,8 +11114,8 @@ abstract class ApiHelper { } - def deleteBareMetal2Chassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBareMetal2ChassisAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBareMetal2ChassisAction() + def deletePreconfigurationTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePreconfigurationTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePreconfigurationTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11520,8 +11141,8 @@ abstract class ApiHelper { } - def deleteBareMetal2Gateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBareMetal2GatewayAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBareMetal2GatewayAction() + def deletePriceTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePriceTableAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePriceTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11547,8 +11168,8 @@ abstract class ApiHelper { } - def deleteBareMetal2ProvisionNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBareMetal2ProvisionNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBareMetal2ProvisionNetworkAction() + def deletePrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.DeletePrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11574,8 +11195,8 @@ abstract class ApiHelper { } - def deleteBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBaremetalChassisAction() + def deleteReservedIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteReservedIpRangeAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteReservedIpRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11601,8 +11222,8 @@ abstract class ApiHelper { } - def deleteBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBaremetalPxeServerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBaremetalPxeServerAction() + def deleteResourceConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteResourceConfigAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteResourceConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11628,8 +11249,8 @@ abstract class ApiHelper { } - def deleteBilling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBillingAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBillingAction() + def deleteResourcePrice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteResourcePriceAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteResourcePriceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11655,8 +11276,8 @@ abstract class ApiHelper { } - def deleteBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBondingAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBondingAction() + def deleteResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11682,8 +11303,8 @@ abstract class ApiHelper { } - def deleteCCSCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCCSCertificateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCCSCertificateAction() + def deleteResourceStackVmPortMonitor(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteResourceStackVmPortMonitorAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteResourceStackVmPortMonitorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11709,89 +11330,8 @@ abstract class ApiHelper { } - def deleteCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCbtTaskAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCbtTaskAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpPolicyAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCdpPolicyAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpTaskAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCdpTaskAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteCdpTaskData(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpTaskDataAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCdpTaskDataAction() + def deleteSSOClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSSOClientAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSSOClientAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11817,8 +11357,8 @@ abstract class ApiHelper { } - def deleteCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCephPrimaryStoragePoolAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCephPrimaryStoragePoolAction() + def deleteSSORedirectTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSSORedirectTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSSORedirectTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11844,8 +11384,8 @@ abstract class ApiHelper { } - def deleteCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCertificateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCertificateAction() + def deleteSchedulerJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSchedulerJobAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSchedulerJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11871,8 +11411,8 @@ abstract class ApiHelper { } - def deleteCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteClusterAction() + def deleteSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSchedulerJobGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSchedulerJobGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11898,8 +11438,8 @@ abstract class ApiHelper { } - def deleteClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteClusterDRSAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteClusterDRSAction() + def deleteSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11925,8 +11465,8 @@ abstract class ApiHelper { } - def deleteConnectionAccessPointLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteConnectionAccessPointLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteConnectionAccessPointLocalAction() + def deleteSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11952,8 +11492,8 @@ abstract class ApiHelper { } - def deleteConnectionBetweenL3NetWorkAndAliyunVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteConnectionBetweenL3NetWorkAndAliyunVSwitchAction() + def deleteSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -11979,8 +11519,8 @@ abstract class ApiHelper { } - def deleteDataCenterInLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDataCenterInLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteDataCenterInLocalAction() + def deleteSecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSecurityGroupRuleAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSecurityGroupRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12006,8 +11546,8 @@ abstract class ApiHelper { } - def deleteDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDataVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteDataVolumeAction() + def deleteSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSecurityMachineAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSecurityMachineAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12033,8 +11573,8 @@ abstract class ApiHelper { } - def deleteDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteDirectoryAction() + def deleteSlbGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSlbGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSlbGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12060,8 +11600,8 @@ abstract class ApiHelper { } - def deleteDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDiskOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteDiskOfferingAction() + def deleteSshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSshKeyPairAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteSshKeyPairAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12087,8 +11627,8 @@ abstract class ApiHelper { } - def deleteEcsImageLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsImageLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsImageLocalAction() + def deleteStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteStackTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteStackTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12114,8 +11654,8 @@ abstract class ApiHelper { } - def deleteEcsImageRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsImageRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsImageRemoteAction() + def deleteTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteTagAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteTagAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12141,8 +11681,8 @@ abstract class ApiHelper { } - def deleteEcsInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsInstanceAction() + def deleteTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteTemplatedVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteTemplatedVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12168,8 +11708,8 @@ abstract class ApiHelper { } - def deleteEcsInstanceLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsInstanceLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsInstanceLocalAction() + def deleteVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVCenterAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVCenterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12195,8 +11735,8 @@ abstract class ApiHelper { } - def deleteEcsSecurityGroupInLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsSecurityGroupInLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsSecurityGroupInLocalAction() + def deleteVRouterOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVRouterOspfAreaAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVRouterOspfAreaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12222,8 +11762,8 @@ abstract class ApiHelper { } - def deleteEcsSecurityGroupRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsSecurityGroupRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsSecurityGroupRemoteAction() + def deleteVRouterRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVRouterRouteEntryAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVRouterRouteEntryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12249,8 +11789,8 @@ abstract class ApiHelper { } - def deleteEcsSecurityGroupRuleRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsSecurityGroupRuleRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsSecurityGroupRuleRemoteAction() + def deleteVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVRouterRouteTableAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVRouterRouteTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12276,8 +11816,8 @@ abstract class ApiHelper { } - def deleteEcsVSwitchInLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsVSwitchInLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsVSwitchInLocalAction() + def deleteVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVipAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12303,8 +11843,8 @@ abstract class ApiHelper { } - def deleteEcsVSwitchRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsVSwitchRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsVSwitchRemoteAction() + def deleteVipQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVipQosAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVipQosAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12330,8 +11870,8 @@ abstract class ApiHelper { } - def deleteEcsVpcInLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsVpcInLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsVpcInLocalAction() + def deleteVmBootMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmBootModeAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmBootModeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12357,8 +11897,8 @@ abstract class ApiHelper { } - def deleteEcsVpcRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEcsVpcRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEcsVpcRemoteAction() + def deleteVmCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmCdRomAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmCdRomAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12384,8 +11924,8 @@ abstract class ApiHelper { } - def deleteEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEipAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEipAction() + def deleteVmConsolePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmConsolePasswordAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmConsolePasswordAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12411,8 +11951,8 @@ abstract class ApiHelper { } - def deleteExportedImageFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteExportedImageFromBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteExportedImageFromBackupStorageAction() + def deleteVmHostname(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmHostnameAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmHostnameAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12438,8 +11978,8 @@ abstract class ApiHelper { } - def deleteExternalBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteExternalBackupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteExternalBackupAction() + def deleteVmInstanceHaLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmInstanceHaLevelAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmInstanceHaLevelAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12465,8 +12005,8 @@ abstract class ApiHelper { } - def deleteFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallAction() + def deleteVmNic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmNicAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmNicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12492,8 +12032,8 @@ abstract class ApiHelper { } - def deleteFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallIpSetTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallIpSetTemplateAction() + def deleteVmNicFromSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmNicFromSecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmNicFromSecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12519,8 +12059,8 @@ abstract class ApiHelper { } - def deleteFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallRuleAction() + def deleteVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12546,8 +12086,8 @@ abstract class ApiHelper { } - def deleteFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallRuleSetAction() + def deleteVmSshKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmSshKeyAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmSshKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12573,8 +12113,8 @@ abstract class ApiHelper { } - def deleteFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallRuleTemplateAction() + def deleteVmStaticIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmStaticIpAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmStaticIpAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12600,8 +12140,8 @@ abstract class ApiHelper { } - def deleteFlowCollector(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFlowCollectorAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFlowCollectorAction() + def deleteVmUserDefinedXml(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmUserDefinedXmlAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmUserDefinedXmlAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12627,8 +12167,8 @@ abstract class ApiHelper { } - def deleteFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFlowMeterAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFlowMeterAction() + def deleteVmUserDefinedXmlHookScript(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmUserDefinedXmlHookScriptAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVmUserDefinedXmlHookScriptAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12654,8 +12194,8 @@ abstract class ApiHelper { } - def deleteGCJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteGCJobAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteGCJobAction() + def deleteVniRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVniRangeAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVniRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12681,8 +12221,8 @@ abstract class ApiHelper { } - def deleteHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHostAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteHostAction() + def deleteVolumeQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVolumeQosAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVolumeQosAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12708,8 +12248,8 @@ abstract class ApiHelper { } - def deleteHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHostKernelInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteHostKernelInterfaceAction() + def deleteVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12735,8 +12275,8 @@ abstract class ApiHelper { } - def deleteHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHostSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteHostSchedulingRuleGroupAction() + def deleteVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVolumeSnapshotGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVolumeSnapshotGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12762,8 +12302,8 @@ abstract class ApiHelper { } - def deleteHybridEipFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHybridEipFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteHybridEipFromLocalAction() + def deleteVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcHaGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVpcHaGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12789,8 +12329,8 @@ abstract class ApiHelper { } - def deleteHybridEipRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHybridEipRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteHybridEipRemoteAction() + def deleteVxlanL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVxlanL2NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVxlanL2NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12816,8 +12356,8 @@ abstract class ApiHelper { } - def deleteHybridKeySecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteHybridKeySecretAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteHybridKeySecretAction() + def deleteVxlanPoolRemoteVtep(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVxlanPoolRemoteVtepAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteVxlanPoolRemoteVtepAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12843,8 +12383,8 @@ abstract class ApiHelper { } - def deleteIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteIPsecConnectionAction() + def deleteWebhook(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteWebhookAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteWebhookAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12870,8 +12410,8 @@ abstract class ApiHelper { } - def deleteIdentityZoneInLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIdentityZoneInLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteIdentityZoneInLocalAction() + def deleteZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteZoneAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteZoneAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12897,8 +12437,8 @@ abstract class ApiHelper { } - def deleteImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteImageAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteImageAction() + def describeVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DescribeVmInstanceRecoveryPointAction.class) Closure c) { + def a = new org.zstack.sdk.DescribeVmInstanceRecoveryPointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12924,8 +12464,8 @@ abstract class ApiHelper { } - def deleteImagePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteImagePackageAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteImagePackageAction() + def destroyBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DestroyBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.DestroyBaremetalInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12951,8 +12491,8 @@ abstract class ApiHelper { } - def deleteImageReplicationGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteImageReplicationGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteImageReplicationGroupAction() + def destroyVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DestroyVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.DestroyVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -12978,8 +12518,8 @@ abstract class ApiHelper { } - def deleteInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteInstanceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteInstanceOfferingAction() + def detachAutoScalingTemplateFromGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachAutoScalingTemplateFromGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DetachAutoScalingTemplateFromGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13005,8 +12545,8 @@ abstract class ApiHelper { } - def deleteIpAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIpAddressAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteIpAddressAction() + def detachBackupStorageFromZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachBackupStorageFromZoneAction.class) Closure c) { + def a = new org.zstack.sdk.DetachBackupStorageFromZoneAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13032,8 +12572,8 @@ abstract class ApiHelper { } - def deleteIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIpRangeAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteIpRangeAction() + def detachBaremetalPxeServerFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachBaremetalPxeServerFromClusterAction.class) Closure c) { + def a = new org.zstack.sdk.DetachBaremetalPxeServerFromClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13059,8 +12599,8 @@ abstract class ApiHelper { } - def deleteIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteIscsiServerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteIscsiServerAction() + def detachCCSCertificateFromAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachCCSCertificateFromAccountAction.class) Closure c) { + def a = new org.zstack.sdk.DetachCCSCertificateFromAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13086,8 +12626,8 @@ abstract class ApiHelper { } - def deleteL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteL2NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteL2NetworkAction() + def detachDataVolumeFromHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachDataVolumeFromHostAction.class) Closure c) { + def a = new org.zstack.sdk.DetachDataVolumeFromHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13113,8 +12653,8 @@ abstract class ApiHelper { } - def deleteL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteL3NetworkAction() + def detachDataVolumeFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachDataVolumeFromVmAction.class) Closure c) { + def a = new org.zstack.sdk.DetachDataVolumeFromVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13140,8 +12680,8 @@ abstract class ApiHelper { } - def deleteLicense(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLicenseAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteLicenseAction() + def detachEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachEipAction.class) Closure c) { + def a = new org.zstack.sdk.DetachEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13167,8 +12707,8 @@ abstract class ApiHelper { } - def deleteLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteLoadBalancerAction() + def detachFirewallRuleSetFromL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachFirewallRuleSetFromL3Action.class) Closure c) { + def a = new org.zstack.sdk.DetachFirewallRuleSetFromL3Action() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13194,8 +12734,8 @@ abstract class ApiHelper { } - def deleteLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteLoadBalancerListenerAction() + def detachHostFromHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachHostFromHostSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DetachHostFromHostSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13221,35 +12761,8 @@ abstract class ApiHelper { } - def deleteLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLoadBalancerServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteLoadBalancerServerGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteLogConfiguration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLogConfigurationAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteLogConfigurationAction() + def detachIscsiServerFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachIscsiServerFromClusterAction.class) Closure c) { + def a = new org.zstack.sdk.DetachIscsiServerFromClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13275,8 +12788,8 @@ abstract class ApiHelper { } - def deleteLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteLongJobAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteLongJobAction() + def detachIsoFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachIsoFromVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.DetachIsoFromVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13302,8 +12815,8 @@ abstract class ApiHelper { } - def deleteMdevDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMdevDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteMdevDeviceAction() + def detachL2NetworkFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachL2NetworkFromClusterAction.class) Closure c) { + def a = new org.zstack.sdk.DetachL2NetworkFromClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13329,8 +12842,8 @@ abstract class ApiHelper { } - def deleteMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMediaAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteMediaAction() + def detachL2NetworkFromHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachL2NetworkFromHostAction.class) Closure c) { + def a = new org.zstack.sdk.DetachL2NetworkFromHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13356,8 +12869,8 @@ abstract class ApiHelper { } - def deleteMonitorTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMonitorTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteMonitorTriggerAction() + def detachL3NetworkFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachL3NetworkFromVmAction.class) Closure c) { + def a = new org.zstack.sdk.DetachL3NetworkFromVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13383,8 +12896,8 @@ abstract class ApiHelper { } - def deleteMonitorTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMonitorTriggerActionAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteMonitorTriggerActionAction() + def detachL3NetworksFromIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachL3NetworksFromIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.DetachL3NetworksFromIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13410,8 +12923,8 @@ abstract class ApiHelper { } - def deleteMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteMulticastRouterAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteMulticastRouterAction() + def detachMdevDeviceFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachMdevDeviceFromVmAction.class) Closure c) { + def a = new org.zstack.sdk.DetachMdevDeviceFromVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13437,8 +12950,8 @@ abstract class ApiHelper { } - def deleteNasFileSystem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteNasFileSystemAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteNasFileSystemAction() + def detachMonitorTriggerFromTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachMonitorTriggerActionFromTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.DetachMonitorTriggerActionFromTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13464,8 +12977,8 @@ abstract class ApiHelper { } - def deleteNasMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteNasMountTargetAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteNasMountTargetAction() + def detachNetworkServiceFromL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachNetworkServiceFromL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.DetachNetworkServiceFromL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13491,8 +13004,8 @@ abstract class ApiHelper { } - def deleteNicQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteNicQosAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteNicQosAction() + def detachNicFromBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachNicFromBondingAction.class) Closure c) { + def a = new org.zstack.sdk.DetachNicFromBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13518,8 +13031,8 @@ abstract class ApiHelper { } - def deleteNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteNvmeServerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteNvmeServerAction() + def detachNvmeServerFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachNvmeServerFromClusterAction.class) Closure c) { + def a = new org.zstack.sdk.DetachNvmeServerFromClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13545,8 +13058,8 @@ abstract class ApiHelper { } - def deleteOssBucketFileRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteOssBucketFileRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteOssBucketFileRemoteAction() + def detachPciDeviceFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPciDeviceFromVmAction.class) Closure c) { + def a = new org.zstack.sdk.DetachPciDeviceFromVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13572,8 +13085,8 @@ abstract class ApiHelper { } - def deleteOssBucketNameLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteOssBucketNameLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteOssBucketNameLocalAction() + def detachPolicyRouteRuleSetFromL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPolicyRouteRuleSetFromL3Action.class) Closure c) { + def a = new org.zstack.sdk.DetachPolicyRouteRuleSetFromL3Action() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13599,8 +13112,8 @@ abstract class ApiHelper { } - def deleteOssBucketRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteOssBucketRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteOssBucketRemoteAction() + def detachPortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPortForwardingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.DetachPortForwardingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13626,8 +13139,8 @@ abstract class ApiHelper { } - def deletePciDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePciDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePciDeviceAction() + def detachPriceTableFromAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPriceTableFromAccountAction.class) Closure c) { + def a = new org.zstack.sdk.DetachPriceTableFromAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13653,8 +13166,8 @@ abstract class ApiHelper { } - def deletePciDeviceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePciDeviceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePciDeviceOfferingAction() + def detachPrimaryStorageFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPrimaryStorageFromClusterAction.class) Closure c) { + def a = new org.zstack.sdk.DetachPrimaryStorageFromClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13680,8 +13193,8 @@ abstract class ApiHelper { } - def deletePolicyRouteRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePolicyRouteRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePolicyRouteRuleAction() + def detachScsiLunFromHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachScsiLunFromHostAction.class) Closure c) { + def a = new org.zstack.sdk.DetachScsiLunFromHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13707,8 +13220,8 @@ abstract class ApiHelper { } - def deletePolicyRouteRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePolicyRouteRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePolicyRouteRuleSetAction() + def detachScsiLunFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachScsiLunFromVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.DetachScsiLunFromVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13734,8 +13247,8 @@ abstract class ApiHelper { } - def deletePolicyRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePolicyRouteTableAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePolicyRouteTableAction() + def detachSecurityGroupFromL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachSecurityGroupFromL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.DetachSecurityGroupFromL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13761,8 +13274,8 @@ abstract class ApiHelper { } - def deletePolicyRouteTableRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePolicyRouteTableRouteEntryAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePolicyRouteTableRouteEntryAction() + def detachSshKeyPairFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachSshKeyPairFromVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.DetachSshKeyPairFromVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13788,8 +13301,8 @@ abstract class ApiHelper { } - def deletePortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePortForwardingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePortForwardingRuleAction() + def detachTagFromResources(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachTagFromResourcesAction.class) Closure c) { + def a = new org.zstack.sdk.DetachTagFromResourcesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13815,8 +13328,8 @@ abstract class ApiHelper { } - def deletePortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePortGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePortGroupAction() + def detachUsbDeviceFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachUsbDeviceFromVmAction.class) Closure c) { + def a = new org.zstack.sdk.DetachUsbDeviceFromVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13842,8 +13355,8 @@ abstract class ApiHelper { } - def deletePortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePortMirrorAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePortMirrorAction() + def detachVRouterRouteTableFromVRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachVRouterRouteTableFromVRouterAction.class) Closure c) { + def a = new org.zstack.sdk.DetachVRouterRouteTableFromVRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13869,8 +13382,8 @@ abstract class ApiHelper { } - def deletePortMirrorSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePortMirrorSessionAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePortMirrorSessionAction() + def detachVmFromVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachVmFromVmSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DetachVmFromVmSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13896,8 +13409,8 @@ abstract class ApiHelper { } - def deletePreconfigurationTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePreconfigurationTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePreconfigurationTemplateAction() + def disableCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DisableCbtTaskAction.class) Closure c) { + def a = new org.zstack.sdk.DisableCbtTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13923,8 +13436,8 @@ abstract class ApiHelper { } - def deletePriceTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePriceTableAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePriceTableAction() + def disableCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DisableCdpTaskAction.class) Closure c) { + def a = new org.zstack.sdk.DisableCdpTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13950,8 +13463,8 @@ abstract class ApiHelper { } - def deletePrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeletePrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.DeletePrimaryStorageAction() + def discoverExternalPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DiscoverExternalPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.DiscoverExternalPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -13977,8 +13490,8 @@ abstract class ApiHelper { } - def deleteReservedIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteReservedIpRangeAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteReservedIpRangeAction() + def enableCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.EnableCbtTaskAction.class) Closure c) { + def a = new org.zstack.sdk.EnableCbtTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14004,8 +13517,8 @@ abstract class ApiHelper { } - def deleteResourceConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteResourceConfigAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteResourceConfigAction() + def enableCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.EnableCdpTaskAction.class) Closure c) { + def a = new org.zstack.sdk.EnableCdpTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14031,8 +13544,8 @@ abstract class ApiHelper { } - def deleteResourcePrice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteResourcePriceAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteResourcePriceAction() + def executeAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExecuteAutoScalingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.ExecuteAutoScalingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14058,8 +13571,8 @@ abstract class ApiHelper { } - def deleteResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteResourceStackAction() + def executeDRSScheduling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExecuteDRSSchedulingAction.class) Closure c) { + def a = new org.zstack.sdk.ExecuteDRSSchedulingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14085,8 +13598,8 @@ abstract class ApiHelper { } - def deleteResourceStackVmPortMonitor(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteResourceStackVmPortMonitorAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteResourceStackVmPortMonitorAction() + def exportImageFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExportImageFromBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.ExportImageFromBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14112,8 +13625,8 @@ abstract class ApiHelper { } - def deleteSSOClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSSOClientAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSSOClientAction() + def exportNbdVolumes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExportNbdVolumesAction.class) Closure c) { + def a = new org.zstack.sdk.ExportNbdVolumesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14139,8 +13652,8 @@ abstract class ApiHelper { } - def deleteSSORedirectTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSSORedirectTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSSORedirectTemplateAction() + def exportVmOvaPackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExportVmOvaPackageAction.class) Closure c) { + def a = new org.zstack.sdk.ExportVmOvaPackageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14166,8 +13679,8 @@ abstract class ApiHelper { } - def deleteSchedulerJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSchedulerJobAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSchedulerJobAction() + def expungeBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExpungeBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.ExpungeBaremetalInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14193,8 +13706,8 @@ abstract class ApiHelper { } - def deleteSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSchedulerJobGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSchedulerJobGroupAction() + def expungeDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExpungeDataVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.ExpungeDataVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14220,8 +13733,8 @@ abstract class ApiHelper { } - def deleteSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSchedulerTriggerAction() + def expungeImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExpungeImageAction.class) Closure c) { + def a = new org.zstack.sdk.ExpungeImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14247,8 +13760,8 @@ abstract class ApiHelper { } - def deleteSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSecretResourcePoolAction() + def expungeVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExpungeVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.ExpungeVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14274,8 +13787,8 @@ abstract class ApiHelper { } - def deleteSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSecurityGroupAction() + def failoverFaultToleranceVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.FailoverFaultToleranceVmAction.class) Closure c) { + def a = new org.zstack.sdk.FailoverFaultToleranceVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14301,8 +13814,8 @@ abstract class ApiHelper { } - def deleteSecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSecurityGroupRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSecurityGroupRuleAction() + def flattenVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.FlattenVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.FlattenVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14328,8 +13841,8 @@ abstract class ApiHelper { } - def deleteSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSecurityMachineAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSecurityMachineAction() + def flattenVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.FlattenVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.FlattenVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14355,8 +13868,8 @@ abstract class ApiHelper { } - def deleteSlbGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSlbGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSlbGroupAction() + def fstrimVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.FstrimVmAction.class) Closure c) { + def a = new org.zstack.sdk.FstrimVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14382,8 +13895,8 @@ abstract class ApiHelper { } - def deleteSshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteSshKeyPairAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteSshKeyPairAction() + def generateAccountBilling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateAccountBillingAction.class) Closure c) { + def a = new org.zstack.sdk.GenerateAccountBillingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14409,8 +13922,8 @@ abstract class ApiHelper { } - def deleteStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteStackTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteStackTemplateAction() + def generateMdevDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateMdevDevicesAction.class) Closure c) { + def a = new org.zstack.sdk.GenerateMdevDevicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14436,8 +13949,8 @@ abstract class ApiHelper { } - def deleteTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteTagAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteTagAction() + def generateSeMdevDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateSeMdevDevicesAction.class) Closure c) { + def a = new org.zstack.sdk.GenerateSeMdevDevicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14463,8 +13976,8 @@ abstract class ApiHelper { } - def deleteTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteTemplatedVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteTemplatedVmInstanceAction() + def generateSriovPciDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateSriovPciDevicesAction.class) Closure c) { + def a = new org.zstack.sdk.GenerateSriovPciDevicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14490,8 +14003,8 @@ abstract class ApiHelper { } - def deleteVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVCenterAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVCenterAction() + def generateSshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateSshKeyPairAction.class) Closure c) { + def a = new org.zstack.sdk.GenerateSshKeyPairAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14517,8 +14030,8 @@ abstract class ApiHelper { } - def deleteVRouterOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVRouterOspfAreaAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVRouterOspfAreaAction() + def getAccessPath(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAccessPathAction.class) Closure c) { + def a = new org.zstack.sdk.GetAccessPathAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14544,8 +14057,8 @@ abstract class ApiHelper { } - def deleteVRouterRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVRouterRouteEntryAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVRouterRouteEntryAction() + def getAccountPriceTableRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAccountPriceTableRefAction.class) Closure c) { + def a = new org.zstack.sdk.GetAccountPriceTableRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14571,8 +14084,8 @@ abstract class ApiHelper { } - def deleteVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVRouterRouteTableAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVRouterRouteTableAction() + def getAccountQuotaUsage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAccountQuotaUsageAction.class) Closure c) { + def a = new org.zstack.sdk.GetAccountQuotaUsageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14598,8 +14111,8 @@ abstract class ApiHelper { } - def deleteVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVipAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVipAction() + def getAttachablePublicL3ForVRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAttachablePublicL3ForVRouterAction.class) Closure c) { + def a = new org.zstack.sdk.GetAttachablePublicL3ForVRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14625,8 +14138,8 @@ abstract class ApiHelper { } - def deleteVipQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVipQosAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVipQosAction() + def getAttachableVpcL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAttachableVpcL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.GetAttachableVpcL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14652,8 +14165,8 @@ abstract class ApiHelper { } - def deleteVirtualBorderRouterLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVirtualBorderRouterLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVirtualBorderRouterLocalAction() + def getAvailableTriggers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAvailableTriggersAction.class) Closure c) { + def a = new org.zstack.sdk.GetAvailableTriggersAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14679,8 +14192,8 @@ abstract class ApiHelper { } - def deleteVirtualRouterLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVirtualRouterLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVirtualRouterLocalAction() + def getBackupStorageCandidatesForImageMigration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageCandidatesForImageMigrationAction.class) Closure c) { + def a = new org.zstack.sdk.GetBackupStorageCandidatesForImageMigrationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14706,8 +14219,8 @@ abstract class ApiHelper { } - def deleteVmBootMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmBootModeAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmBootModeAction() + def getBackupStorageCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageCapacityAction.class) Closure c) { + def a = new org.zstack.sdk.GetBackupStorageCapacityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14733,8 +14246,8 @@ abstract class ApiHelper { } - def deleteVmCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmCdRomAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmCdRomAction() + def getBackupStorageForCreatingImageFromVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageForCreatingImageFromVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.GetBackupStorageForCreatingImageFromVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14760,8 +14273,8 @@ abstract class ApiHelper { } - def deleteVmConsolePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmConsolePasswordAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmConsolePasswordAction() + def getBackupStorageForCreatingImageFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageForCreatingImageFromVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.GetBackupStorageForCreatingImageFromVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14787,8 +14300,8 @@ abstract class ApiHelper { } - def deleteVmHostname(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmHostnameAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmHostnameAction() + def getBackupStorageTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageTypesAction.class) Closure c) { + def a = new org.zstack.sdk.GetBackupStorageTypesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14814,8 +14327,8 @@ abstract class ApiHelper { } - def deleteVmInstanceHaLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmInstanceHaLevelAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmInstanceHaLevelAction() + def getBaremetalChassisPowerStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBaremetalChassisPowerStatusAction.class) Closure c) { + def a = new org.zstack.sdk.GetBaremetalChassisPowerStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14841,8 +14354,8 @@ abstract class ApiHelper { } - def deleteVmNic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmNicAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmNicAction() + def getBlockPrimaryStorageMetadata(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBlockPrimaryStorageMetadataAction.class) Closure c) { + def a = new org.zstack.sdk.GetBlockPrimaryStorageMetadataAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14868,35 +14381,8 @@ abstract class ApiHelper { } - def deleteVmNicFromSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmNicFromSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmNicFromSecurityGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmSchedulingRuleGroupAction() + def getCandidateAffinityGroupForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateAffinityGroupForAttachingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateAffinityGroupForAttachingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14922,8 +14408,8 @@ abstract class ApiHelper { } - def deleteVmSshKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmSshKeyAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmSshKeyAction() + def getCandidateAffinityGroupForCreatingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateAffinityGroupForCreatingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateAffinityGroupForCreatingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14949,8 +14435,8 @@ abstract class ApiHelper { } - def deleteVmStaticIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmStaticIpAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmStaticIpAction() + def getCandidateBackupStorageForCreatingImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateBackupStorageForCreatingImageAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateBackupStorageForCreatingImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -14976,8 +14462,8 @@ abstract class ApiHelper { } - def deleteVmUserDefinedXml(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmUserDefinedXmlAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmUserDefinedXmlAction() + def getCandidateClustersForAttachingL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateClustersForAttachingL2NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateClustersForAttachingL2NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15003,8 +14489,8 @@ abstract class ApiHelper { } - def deleteVmUserDefinedXmlHookScript(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVmUserDefinedXmlHookScriptAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVmUserDefinedXmlHookScriptAction() + def getCandidateHostKernelInterfaces(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateHostKernelInterfacesAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateHostKernelInterfacesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15030,8 +14516,8 @@ abstract class ApiHelper { } - def deleteVniRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVniRangeAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVniRangeAction() + def getCandidateImagesForCreatingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateImagesForCreatingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateImagesForCreatingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15057,8 +14543,8 @@ abstract class ApiHelper { } - def deleteVolumeQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVolumeQosAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVolumeQosAction() + def getCandidateInterfaceVlanIds(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateInterfaceVlanIdsAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateInterfaceVlanIdsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15084,8 +14570,8 @@ abstract class ApiHelper { } - def deleteVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVolumeSnapshotAction() + def getCandidateIsoForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateIsoForAttachingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateIsoForAttachingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15111,8 +14597,8 @@ abstract class ApiHelper { } - def deleteVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVolumeSnapshotGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVolumeSnapshotGroupAction() + def getCandidateL2NetworksForAttachingCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL2NetworksForAttachingClusterAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateL2NetworksForAttachingClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15138,8 +14624,8 @@ abstract class ApiHelper { } - def deleteVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcHaGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVpcHaGroupAction() + def getCandidateL3NetworksForChangeVmNicNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL3NetworksForChangeVmNicNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateL3NetworksForChangeVmNicNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15165,8 +14651,8 @@ abstract class ApiHelper { } - def deleteVpcIkeConfigLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcIkeConfigLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVpcIkeConfigLocalAction() + def getCandidateL3NetworksForIpSecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL3NetworksForIpSecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateL3NetworksForIpSecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15192,8 +14678,8 @@ abstract class ApiHelper { } - def deleteVpcIpSecConfigLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcIpSecConfigLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVpcIpSecConfigLocalAction() + def getCandidateL3NetworksForLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL3NetworksForLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateL3NetworksForLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15219,8 +14705,8 @@ abstract class ApiHelper { } - def deleteVpcUserVpnGatewayLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcUserVpnGatewayLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVpcUserVpnGatewayLocalAction() + def getCandidateL3NetworksForServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL3NetworksForServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateL3NetworksForServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15246,8 +14732,8 @@ abstract class ApiHelper { } - def deleteVpcUserVpnGatewayRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcUserVpnGatewayRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVpcUserVpnGatewayRemoteAction() + def getCandidateMiniHosts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateMiniHostsAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateMiniHostsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15273,8 +14759,8 @@ abstract class ApiHelper { } - def deleteVpcVpnConnectionLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcVpnConnectionLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVpcVpnConnectionLocalAction() + def getCandidateNetworkBondings(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateNetworkBondingsAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateNetworkBondingsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15300,8 +14786,8 @@ abstract class ApiHelper { } - def deleteVpcVpnConnectionRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcVpnConnectionRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVpcVpnConnectionRemoteAction() + def getCandidateNetworkInterfaces(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateNetworkInterfacesAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateNetworkInterfacesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15327,8 +14813,8 @@ abstract class ApiHelper { } - def deleteVpcVpnGatewayLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVpcVpnGatewayLocalAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVpcVpnGatewayLocalAction() + def getCandidatePrimaryStoragesForCreatingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidatePrimaryStoragesForCreatingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidatePrimaryStoragesForCreatingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15354,8 +14840,8 @@ abstract class ApiHelper { } - def deleteVxlanL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVxlanL2NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVxlanL2NetworkAction() + def getCandidateVMForAttachingAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVMForAttachingAffinityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateVMForAttachingAffinityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15381,8 +14867,8 @@ abstract class ApiHelper { } - def deleteVxlanPoolRemoteVtep(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteVxlanPoolRemoteVtepAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteVxlanPoolRemoteVtepAction() + def getCandidateVmForAttachingIso(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmForAttachingIsoAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateVmForAttachingIsoAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15408,8 +14894,8 @@ abstract class ApiHelper { } - def deleteWebhook(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteWebhookAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteWebhookAction() + def getCandidateVmNicForSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmNicForSecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateVmNicForSecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15435,8 +14921,8 @@ abstract class ApiHelper { } - def deleteZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteZoneAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteZoneAction() + def getCandidateVmNicsForLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmNicsForLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateVmNicsForLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15462,8 +14948,8 @@ abstract class ApiHelper { } - def describeVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DescribeVmInstanceRecoveryPointAction.class) Closure c) { - def a = new org.zstack.sdk.DescribeVmInstanceRecoveryPointAction() + def getCandidateVmNicsForLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmNicsForLoadBalancerServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateVmNicsForLoadBalancerServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15489,8 +14975,8 @@ abstract class ApiHelper { } - def destroyBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DestroyBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DestroyBaremetalInstanceAction() + def getCandidateVmNicsForPortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmNicsForPortMirrorAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateVmNicsForPortMirrorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15516,8 +15002,8 @@ abstract class ApiHelper { } - def destroyVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DestroyVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DestroyVmInstanceAction() + def getCandidateZonesClustersHostsForCreatingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateZonesClustersHostsForCreatingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetCandidateZonesClustersHostsForCreatingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15543,8 +15029,8 @@ abstract class ApiHelper { } - def detachAliyunDiskFromEcs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachAliyunDiskFromEcsAction.class) Closure c) { - def a = new org.zstack.sdk.DetachAliyunDiskFromEcsAction() + def getChainTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetChainTaskAction.class) Closure c) { + def a = new org.zstack.sdk.GetChainTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15570,8 +15056,8 @@ abstract class ApiHelper { } - def detachAliyunKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachAliyunKeyAction.class) Closure c) { - def a = new org.zstack.sdk.DetachAliyunKeyAction() + def getChronyServers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetChronyServersAction.class) Closure c) { + def a = new org.zstack.sdk.GetChronyServersAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15597,8 +15083,8 @@ abstract class ApiHelper { } - def detachAutoScalingTemplateFromGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachAutoScalingTemplateFromGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DetachAutoScalingTemplateFromGroupAction() + def getClusterDRSStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetClusterDRSStatusAction.class) Closure c) { + def a = new org.zstack.sdk.GetClusterDRSStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15624,8 +15110,8 @@ abstract class ApiHelper { } - def detachBackupStorageFromZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachBackupStorageFromZoneAction.class) Closure c) { - def a = new org.zstack.sdk.DetachBackupStorageFromZoneAction() + def getClusterHostNetworkFacts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetClusterHostNetworkFactsAction.class) Closure c) { + def a = new org.zstack.sdk.GetClusterHostNetworkFactsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15651,8 +15137,8 @@ abstract class ApiHelper { } - def detachBareMetal2GatewayFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachBareMetal2GatewayFromClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachBareMetal2GatewayFromClusterAction() + def getCpuMemoryCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCpuMemoryCapacityAction.class) Closure c) { + def a = new org.zstack.sdk.GetCpuMemoryCapacityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15678,36 +15164,9 @@ abstract class ApiHelper { } - def detachBareMetal2ProvisionNetworkFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachBareMetal2ProvisionNetworkFromClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachBareMetal2ProvisionNetworkFromClusterAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } + def getCurrentTime(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCurrentTimeAction.class) Closure c) { + def a = new org.zstack.sdk.GetCurrentTimeAction() - return out - } else { - return errorOut(a.call()) - } - } - - - def detachBaremetalPxeServerFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachBaremetalPxeServerFromClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachBaremetalPxeServerFromClusterAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -15732,8 +15191,8 @@ abstract class ApiHelper { } - def detachCCSCertificateFromAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachCCSCertificateFromAccountAction.class) Closure c) { - def a = new org.zstack.sdk.DetachCCSCertificateFromAccountAction() + def getDataVolumeAttachableVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetDataVolumeAttachableVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetDataVolumeAttachableVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15759,8 +15218,8 @@ abstract class ApiHelper { } - def detachDataVolumeFromHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachDataVolumeFromHostAction.class) Closure c) { - def a = new org.zstack.sdk.DetachDataVolumeFromHostAction() + def getDebugSignal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetDebugSignalAction.class) Closure c) { + def a = new org.zstack.sdk.GetDebugSignalAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15786,8 +15245,8 @@ abstract class ApiHelper { } - def detachDataVolumeFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachDataVolumeFromVmAction.class) Closure c) { - def a = new org.zstack.sdk.DetachDataVolumeFromVmAction() + def getEipAttachableVmNics(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetEipAttachableVmNicsAction.class) Closure c) { + def a = new org.zstack.sdk.GetEipAttachableVmNicsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15813,8 +15272,8 @@ abstract class ApiHelper { } - def detachEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachEipAction.class) Closure c) { - def a = new org.zstack.sdk.DetachEipAction() + def getElaborationCategories(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetElaborationCategoriesAction.class) Closure c) { + def a = new org.zstack.sdk.GetElaborationCategoriesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15840,8 +15299,8 @@ abstract class ApiHelper { } - def detachFirewallRuleSetFromL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachFirewallRuleSetFromL3Action.class) Closure c) { - def a = new org.zstack.sdk.DetachFirewallRuleSetFromL3Action() + def getElaborations(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetElaborationsAction.class) Closure c) { + def a = new org.zstack.sdk.GetElaborationsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15867,35 +15326,8 @@ abstract class ApiHelper { } - def detachGuestToolsIsoFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachGuestToolsIsoFromVmAction.class) Closure c) { - def a = new org.zstack.sdk.DetachGuestToolsIsoFromVmAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def detachHostFromHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachHostFromHostSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DetachHostFromHostSchedulingRuleGroupAction() + def getEncryptedField(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetEncryptedFieldAction.class) Closure c) { + def a = new org.zstack.sdk.GetEncryptedFieldAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15921,8 +15353,8 @@ abstract class ApiHelper { } - def detachHybridEipFromEcs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachHybridEipFromEcsAction.class) Closure c) { - def a = new org.zstack.sdk.DetachHybridEipFromEcsAction() + def getExternalServices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetExternalServicesAction.class) Closure c) { + def a = new org.zstack.sdk.GetExternalServicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15948,8 +15380,8 @@ abstract class ApiHelper { } - def detachHybridKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachHybridKeyAction.class) Closure c) { - def a = new org.zstack.sdk.DetachHybridKeyAction() + def getFactoryModeState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFactoryModeStateAction.class) Closure c) { + def a = new org.zstack.sdk.GetFactoryModeStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -15975,8 +15407,8 @@ abstract class ApiHelper { } - def detachIscsiServerFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachIscsiServerFromClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachIscsiServerFromClusterAction() + def getFaultToleranceVms(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFaultToleranceVmsAction.class) Closure c) { + def a = new org.zstack.sdk.GetFaultToleranceVmsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16002,8 +15434,8 @@ abstract class ApiHelper { } - def detachIsoFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachIsoFromVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DetachIsoFromVmInstanceAction() + def getFlowMeterRouterId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFlowMeterRouterIdAction.class) Closure c) { + def a = new org.zstack.sdk.GetFlowMeterRouterIdAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16029,8 +15461,8 @@ abstract class ApiHelper { } - def detachL2NetworkFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachL2NetworkFromClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachL2NetworkFromClusterAction() + def getFreeIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFreeIpAction.class) Closure c) { + def a = new org.zstack.sdk.GetFreeIpAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16056,8 +15488,8 @@ abstract class ApiHelper { } - def detachL2NetworkFromHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachL2NetworkFromHostAction.class) Closure c) { - def a = new org.zstack.sdk.DetachL2NetworkFromHostAction() + def getFreeIpOfIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFreeIpOfIpRangeAction.class) Closure c) { + def a = new org.zstack.sdk.GetFreeIpOfIpRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16083,8 +15515,8 @@ abstract class ApiHelper { } - def detachL3NetworkFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachL3NetworkFromVmAction.class) Closure c) { - def a = new org.zstack.sdk.DetachL3NetworkFromVmAction() + def getFreeIpOfL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFreeIpOfL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.GetFreeIpOfL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16110,8 +15542,8 @@ abstract class ApiHelper { } - def detachL3NetworksFromIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachL3NetworksFromIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.DetachL3NetworksFromIPsecConnectionAction() + def getGlobalConfigOptions(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetGlobalConfigOptionsAction.class) Closure c) { + def a = new org.zstack.sdk.GetGlobalConfigOptionsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16137,8 +15569,8 @@ abstract class ApiHelper { } - def detachMdevDeviceFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachMdevDeviceFromVmAction.class) Closure c) { - def a = new org.zstack.sdk.DetachMdevDeviceFromVmAction() + def getHostAllocatorStrategies(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostAllocatorStrategiesAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostAllocatorStrategiesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16164,8 +15596,8 @@ abstract class ApiHelper { } - def detachMonitorTriggerFromTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachMonitorTriggerActionFromTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.DetachMonitorTriggerActionFromTriggerAction() + def getHostBlockDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostBlockDevicesAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostBlockDevicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16191,8 +15623,8 @@ abstract class ApiHelper { } - def detachNetworkServiceFromL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachNetworkServiceFromL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.DetachNetworkServiceFromL3NetworkAction() + def getHostCandidatesForVmMigration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostCandidatesForVmMigrationAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostCandidatesForVmMigrationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16218,8 +15650,8 @@ abstract class ApiHelper { } - def detachNicFromBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachNicFromBondingAction.class) Closure c) { - def a = new org.zstack.sdk.DetachNicFromBondingAction() + def getHostIommuState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostIommuStateAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostIommuStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16245,8 +15677,8 @@ abstract class ApiHelper { } - def detachNvmeServerFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachNvmeServerFromClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachNvmeServerFromClusterAction() + def getHostIommuStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostIommuStatusAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostIommuStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16272,8 +15704,8 @@ abstract class ApiHelper { } - def detachOssBucketFromEcsDataCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachOssBucketFromEcsDataCenterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachOssBucketFromEcsDataCenterAction() + def getHostMultipathTopology(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostMultipathTopologyAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostMultipathTopologyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16299,8 +15731,8 @@ abstract class ApiHelper { } - def detachPciDeviceFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPciDeviceFromVmAction.class) Closure c) { - def a = new org.zstack.sdk.DetachPciDeviceFromVmAction() + def getHostNUMATopology(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostNUMATopologyAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostNUMATopologyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16326,8 +15758,8 @@ abstract class ApiHelper { } - def detachPolicyRouteRuleSetFromL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPolicyRouteRuleSetFromL3Action.class) Closure c) { - def a = new org.zstack.sdk.DetachPolicyRouteRuleSetFromL3Action() + def getHostNetworkFacts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostNetworkFactsAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostNetworkFactsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16353,8 +15785,8 @@ abstract class ApiHelper { } - def detachPortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPortForwardingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DetachPortForwardingRuleAction() + def getHostNetworkInterfaceLldp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostNetworkInterfaceLldpAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostNetworkInterfaceLldpAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16380,8 +15812,8 @@ abstract class ApiHelper { } - def detachPriceTableFromAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPriceTableFromAccountAction.class) Closure c) { - def a = new org.zstack.sdk.DetachPriceTableFromAccountAction() + def getHostPhysicalMemoryFacts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostPhysicalMemoryFactsAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostPhysicalMemoryFactsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16407,8 +15839,8 @@ abstract class ApiHelper { } - def detachPrimaryStorageFromCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachPrimaryStorageFromClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachPrimaryStorageFromClusterAction() + def getHostPowerStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostPowerStatusAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostPowerStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16434,8 +15866,8 @@ abstract class ApiHelper { } - def detachProvisionNicFromBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachProvisionNicFromBondingAction.class) Closure c) { - def a = new org.zstack.sdk.DetachProvisionNicFromBondingAction() + def getHostResourceAllocation(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostResourceAllocationAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostResourceAllocationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16461,8 +15893,8 @@ abstract class ApiHelper { } - def detachScsiLunFromHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachScsiLunFromHostAction.class) Closure c) { - def a = new org.zstack.sdk.DetachScsiLunFromHostAction() + def getHostSensors(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostSensorsAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostSensorsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16488,8 +15920,8 @@ abstract class ApiHelper { } - def detachScsiLunFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachScsiLunFromVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DetachScsiLunFromVmInstanceAction() + def getHostTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostTaskAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16515,8 +15947,8 @@ abstract class ApiHelper { } - def detachSecurityGroupFromL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachSecurityGroupFromL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.DetachSecurityGroupFromL3NetworkAction() + def getHostWebSshUrl(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostWebSshUrlAction.class) Closure c) { + def a = new org.zstack.sdk.GetHostWebSshUrlAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16542,8 +15974,8 @@ abstract class ApiHelper { } - def detachSshKeyPairFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachSshKeyPairFromVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DetachSshKeyPairFromVmInstanceAction() + def getHypervisorTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHypervisorTypesAction.class) Closure c) { + def a = new org.zstack.sdk.GetHypervisorTypesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16569,8 +16001,8 @@ abstract class ApiHelper { } - def detachTagFromResources(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachTagFromResourcesAction.class) Closure c) { - def a = new org.zstack.sdk.DetachTagFromResourcesAction() + def getImageCandidatesForVmToChange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetImageCandidatesForVmToChangeAction.class) Closure c) { + def a = new org.zstack.sdk.GetImageCandidatesForVmToChangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16596,8 +16028,8 @@ abstract class ApiHelper { } - def detachUsbDeviceFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachUsbDeviceFromVmAction.class) Closure c) { - def a = new org.zstack.sdk.DetachUsbDeviceFromVmAction() + def getImageQga(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetImageQgaAction.class) Closure c) { + def a = new org.zstack.sdk.GetImageQgaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16623,8 +16055,8 @@ abstract class ApiHelper { } - def detachVRouterRouteTableFromVRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachVRouterRouteTableFromVRouterAction.class) Closure c) { - def a = new org.zstack.sdk.DetachVRouterRouteTableFromVRouterAction() + def getImagesFromImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetImagesFromImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.GetImagesFromImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16650,8 +16082,8 @@ abstract class ApiHelper { } - def detachVmFromVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachVmFromVmSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DetachVmFromVmSchedulingRuleGroupAction() + def getInterdependentL3NetworksBackupStorages(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetInterdependentL3NetworksBackupStoragesAction.class) Closure c) { + def a = new org.zstack.sdk.GetInterdependentL3NetworksBackupStoragesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16677,8 +16109,8 @@ abstract class ApiHelper { } - def disableCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DisableCbtTaskAction.class) Closure c) { - def a = new org.zstack.sdk.DisableCbtTaskAction() + def getInterdependentL3NetworksImages(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetInterdependentL3NetworksImagesAction.class) Closure c) { + def a = new org.zstack.sdk.GetInterdependentL3NetworksImagesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16704,8 +16136,8 @@ abstract class ApiHelper { } - def disableCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DisableCdpTaskAction.class) Closure c) { - def a = new org.zstack.sdk.DisableCdpTaskAction() + def getInterfaceServiceTypeStatistic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetInterfaceServiceTypeStatisticAction.class) Closure c) { + def a = new org.zstack.sdk.GetInterfaceServiceTypeStatisticAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16731,8 +16163,8 @@ abstract class ApiHelper { } - def discoverExternalPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DiscoverExternalPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.DiscoverExternalPrimaryStorageAction() + def getIpAddressCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetIpAddressCapacityAction.class) Closure c) { + def a = new org.zstack.sdk.GetIpAddressCapacityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16758,8 +16190,8 @@ abstract class ApiHelper { } - def downloadBackupFileFromPublicCloud(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DownloadBackupFileFromPublicCloudAction.class) Closure c) { - def a = new org.zstack.sdk.DownloadBackupFileFromPublicCloudAction() + def getL2NetworkTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL2NetworkTypesAction.class) Closure c) { + def a = new org.zstack.sdk.GetL2NetworkTypesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16785,8 +16217,8 @@ abstract class ApiHelper { } - def ejectZBox(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.EjectZBoxAction.class) Closure c) { - def a = new org.zstack.sdk.EjectZBoxAction() + def getL3NetworkDhcpIpAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkDhcpIpAddressAction.class) Closure c) { + def a = new org.zstack.sdk.GetL3NetworkDhcpIpAddressAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16812,8 +16244,8 @@ abstract class ApiHelper { } - def enableCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.EnableCbtTaskAction.class) Closure c) { - def a = new org.zstack.sdk.EnableCbtTaskAction() + def getL3NetworkIpStatistic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkIpStatisticAction.class) Closure c) { + def a = new org.zstack.sdk.GetL3NetworkIpStatisticAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16839,8 +16271,8 @@ abstract class ApiHelper { } - def enableCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.EnableCdpTaskAction.class) Closure c) { - def a = new org.zstack.sdk.EnableCdpTaskAction() + def getL3NetworkMtu(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkMtuAction.class) Closure c) { + def a = new org.zstack.sdk.GetL3NetworkMtuAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16866,8 +16298,8 @@ abstract class ApiHelper { } - def executeAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExecuteAutoScalingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.ExecuteAutoScalingRuleAction() + def getL3NetworkRouterInterfaceIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkRouterInterfaceIpAction.class) Closure c) { + def a = new org.zstack.sdk.GetL3NetworkRouterInterfaceIpAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16893,8 +16325,8 @@ abstract class ApiHelper { } - def executeDRSScheduling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExecuteDRSSchedulingAction.class) Closure c) { - def a = new org.zstack.sdk.ExecuteDRSSchedulingAction() + def getL3NetworkTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkTypesAction.class) Closure c) { + def a = new org.zstack.sdk.GetL3NetworkTypesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -16920,36 +16352,9 @@ abstract class ApiHelper { } - def exportImageFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExportImageFromBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.ExportImageFromBackupStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } + def getLicenseAddOns(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseAddOnsAction.class) Closure c) { + def a = new org.zstack.sdk.GetLicenseAddOnsAction() - return out - } else { - return errorOut(a.call()) - } - } - - - def exportNbdVolumes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExportNbdVolumesAction.class) Closure c) { - def a = new org.zstack.sdk.ExportNbdVolumesAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -16974,8 +16379,8 @@ abstract class ApiHelper { } - def exportVmOvaPackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExportVmOvaPackageAction.class) Closure c) { - def a = new org.zstack.sdk.ExportVmOvaPackageAction() + def getLicenseCapabilities(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseCapabilitiesAction.class) Closure c) { + def a = new org.zstack.sdk.GetLicenseCapabilitiesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17001,9 +16406,9 @@ abstract class ApiHelper { } - def expungeBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExpungeBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.ExpungeBaremetalInstanceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def getLicenseInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseInfoAction.class) Closure c) { + def a = new org.zstack.sdk.GetLicenseInfoAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -17028,9 +16433,9 @@ abstract class ApiHelper { } - def expungeDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExpungeDataVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.ExpungeDataVolumeAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def getLicenseRecords(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseRecordsAction.class) Closure c) { + def a = new org.zstack.sdk.GetLicenseRecordsAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -17055,8 +16460,8 @@ abstract class ApiHelper { } - def expungeImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExpungeImageAction.class) Closure c) { - def a = new org.zstack.sdk.ExpungeImageAction() + def getLicenseUKeyStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseUKeyStatusAction.class) Closure c) { + def a = new org.zstack.sdk.GetLicenseUKeyStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17082,8 +16487,8 @@ abstract class ApiHelper { } - def expungeVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ExpungeVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.ExpungeVmInstanceAction() + def getLoadBalancerListenerACLEntries(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLoadBalancerListenerACLEntriesAction.class) Closure c) { + def a = new org.zstack.sdk.GetLoadBalancerListenerACLEntriesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17109,8 +16514,8 @@ abstract class ApiHelper { } - def failoverFaultToleranceVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.FailoverFaultToleranceVmAction.class) Closure c) { - def a = new org.zstack.sdk.FailoverFaultToleranceVmAction() + def getLocalRaidPhysicalDriveSmart(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLocalRaidPhysicalDriveSmartAction.class) Closure c) { + def a = new org.zstack.sdk.GetLocalRaidPhysicalDriveSmartAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17136,8 +16541,8 @@ abstract class ApiHelper { } - def flattenVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.FlattenVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.FlattenVmInstanceAction() + def getLocalStorageHostDiskCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLocalStorageHostDiskCapacityAction.class) Closure c) { + def a = new org.zstack.sdk.GetLocalStorageHostDiskCapacityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17163,8 +16568,8 @@ abstract class ApiHelper { } - def flattenVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.FlattenVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.FlattenVolumeAction() + def getLogConfiguration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLogConfigurationAction.class) Closure c) { + def a = new org.zstack.sdk.GetLogConfigurationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17190,9 +16595,9 @@ abstract class ApiHelper { } - def fstrimVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.FstrimVmAction.class) Closure c) { - def a = new org.zstack.sdk.FstrimVmAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def getLoginCaptcha(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLoginCaptchaAction.class) Closure c) { + def a = new org.zstack.sdk.GetLoginCaptchaAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -17217,9 +16622,9 @@ abstract class ApiHelper { } - def gCAliyunSnapshotRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GCAliyunSnapshotRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GCAliyunSnapshotRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def getLoginProcedures(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLoginProceduresAction.class) Closure c) { + def a = new org.zstack.sdk.GetLoginProceduresAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -17244,9 +16649,9 @@ abstract class ApiHelper { } - def generateAccountBilling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateAccountBillingAction.class) Closure c) { - def a = new org.zstack.sdk.GenerateAccountBillingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def getManagementNodeArch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetManagementNodeArchAction.class) Closure c) { + def a = new org.zstack.sdk.GetManagementNodeArchAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -17271,9 +16676,9 @@ abstract class ApiHelper { } - def generateMdevDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateMdevDevicesAction.class) Closure c) { - def a = new org.zstack.sdk.GenerateMdevDevicesAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def getManagementNodeOS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetManagementNodeOSAction.class) Closure c) { + def a = new org.zstack.sdk.GetManagementNodeOSAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -17298,8 +16703,8 @@ abstract class ApiHelper { } - def generateSeMdevDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateSeMdevDevicesAction.class) Closure c) { - def a = new org.zstack.sdk.GenerateSeMdevDevicesAction() + def getMdevDeviceCandidates(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetMdevDeviceCandidatesAction.class) Closure c) { + def a = new org.zstack.sdk.GetMdevDeviceCandidatesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17325,8 +16730,8 @@ abstract class ApiHelper { } - def generateSriovPciDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateSriovPciDevicesAction.class) Closure c) { - def a = new org.zstack.sdk.GenerateSriovPciDevicesAction() + def getMdevDeviceSpecCandidates(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetMdevDeviceSpecCandidatesAction.class) Closure c) { + def a = new org.zstack.sdk.GetMdevDeviceSpecCandidatesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17352,8 +16757,8 @@ abstract class ApiHelper { } - def generateSshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GenerateSshKeyPairAction.class) Closure c) { - def a = new org.zstack.sdk.GenerateSshKeyPairAction() + def getMemorySnapshotGroupReference(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetMemorySnapshotGroupReferenceAction.class) Closure c) { + def a = new org.zstack.sdk.GetMemorySnapshotGroupReferenceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17379,8 +16784,8 @@ abstract class ApiHelper { } - def getAccessPath(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAccessPathAction.class) Closure c) { - def a = new org.zstack.sdk.GetAccessPathAction() + def getMonitorItem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetMonitorItemAction.class) Closure c) { + def a = new org.zstack.sdk.GetMonitorItemAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17406,8 +16811,8 @@ abstract class ApiHelper { } - def getAccountPriceTableRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAccountPriceTableRefAction.class) Closure c) { - def a = new org.zstack.sdk.GetAccountPriceTableRefAction() + def getNetworkServiceTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetNetworkServiceTypesAction.class) Closure c) { + def a = new org.zstack.sdk.GetNetworkServiceTypesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17433,8 +16838,8 @@ abstract class ApiHelper { } - def getAccountQuotaUsage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAccountQuotaUsageAction.class) Closure c) { - def a = new org.zstack.sdk.GetAccountQuotaUsageAction() + def getNicQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetNicQosAction.class) Closure c) { + def a = new org.zstack.sdk.GetNicQosAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17460,8 +16865,8 @@ abstract class ApiHelper { } - def getAliyunNasAccessGroupRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAliyunNasAccessGroupRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetAliyunNasAccessGroupRemoteAction() + def getNoTriggerSchedulerJobs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetNoTriggerSchedulerJobsAction.class) Closure c) { + def a = new org.zstack.sdk.GetNoTriggerSchedulerJobsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17487,8 +16892,8 @@ abstract class ApiHelper { } - def getAliyunNasFileSystemRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAliyunNasFileSystemRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetAliyunNasFileSystemRemoteAction() + def getOAuth2Token(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetOAuth2TokenAction.class) Closure c) { + def a = new org.zstack.sdk.GetOAuth2TokenAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17514,8 +16919,8 @@ abstract class ApiHelper { } - def getAliyunNasMountTargetRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAliyunNasMountTargetRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetAliyunNasMountTargetRemoteAction() + def getPciDeviceCandidatesForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPciDeviceCandidatesForAttachingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetPciDeviceCandidatesForAttachingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17541,8 +16946,8 @@ abstract class ApiHelper { } - def getAttachablePublicL3ForVRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAttachablePublicL3ForVRouterAction.class) Closure c) { - def a = new org.zstack.sdk.GetAttachablePublicL3ForVRouterAction() + def getPciDeviceCandidatesForNewCreateVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPciDeviceCandidatesForNewCreateVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetPciDeviceCandidatesForNewCreateVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17568,8 +16973,8 @@ abstract class ApiHelper { } - def getAttachableVpcL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAttachableVpcL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.GetAttachableVpcL3NetworkAction() + def getPciDeviceSpecCandidates(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPciDeviceSpecCandidatesAction.class) Closure c) { + def a = new org.zstack.sdk.GetPciDeviceSpecCandidatesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17595,8 +17000,8 @@ abstract class ApiHelper { } - def getAvailableTriggers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetAvailableTriggersAction.class) Closure c) { - def a = new org.zstack.sdk.GetAvailableTriggersAction() + def getPhysicalMachineBlockDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPhysicalMachineBlockDevicesAction.class) Closure c) { + def a = new org.zstack.sdk.GetPhysicalMachineBlockDevicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17622,8 +17027,8 @@ abstract class ApiHelper { } - def getBackupStorageCandidatesForImageMigration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageCandidatesForImageMigrationAction.class) Closure c) { - def a = new org.zstack.sdk.GetBackupStorageCandidatesForImageMigrationAction() + def getPlatformTimeZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPlatformTimeZoneAction.class) Closure c) { + def a = new org.zstack.sdk.GetPlatformTimeZoneAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17649,8 +17054,8 @@ abstract class ApiHelper { } - def getBackupStorageCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.GetBackupStorageCapacityAction() + def getPolicyRouteRuleSetFromVirtualRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPolicyRouteRuleSetFromVirtualRouterAction.class) Closure c) { + def a = new org.zstack.sdk.GetPolicyRouteRuleSetFromVirtualRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17676,8 +17081,8 @@ abstract class ApiHelper { } - def getBackupStorageForCreatingImageFromVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageForCreatingImageFromVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.GetBackupStorageForCreatingImageFromVolumeAction() + def getPortForwardingAttachableVmNics(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPortForwardingAttachableVmNicsAction.class) Closure c) { + def a = new org.zstack.sdk.GetPortForwardingAttachableVmNicsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17703,8 +17108,8 @@ abstract class ApiHelper { } - def getBackupStorageForCreatingImageFromVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageForCreatingImageFromVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.GetBackupStorageForCreatingImageFromVolumeSnapshotAction() + def getPrimaryStorageAllocatorStrategies(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageAllocatorStrategiesAction.class) Closure c) { + def a = new org.zstack.sdk.GetPrimaryStorageAllocatorStrategiesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17730,8 +17135,8 @@ abstract class ApiHelper { } - def getBackupStorageTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBackupStorageTypesAction.class) Closure c) { - def a = new org.zstack.sdk.GetBackupStorageTypesAction() + def getPrimaryStorageCandidatesForVmMigration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageCandidatesForVmMigrationAction.class) Closure c) { + def a = new org.zstack.sdk.GetPrimaryStorageCandidatesForVmMigrationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17757,8 +17162,8 @@ abstract class ApiHelper { } - def getBareMetal2ChassisPowerStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBareMetal2ChassisPowerStatusAction.class) Closure c) { - def a = new org.zstack.sdk.GetBareMetal2ChassisPowerStatusAction() + def getPrimaryStorageCandidatesForVolumeMigration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageCandidatesForVolumeMigrationAction.class) Closure c) { + def a = new org.zstack.sdk.GetPrimaryStorageCandidatesForVolumeMigrationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17784,8 +17189,8 @@ abstract class ApiHelper { } - def getBareMetal2GatewayAllocatorStrategies(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBareMetal2GatewayAllocatorStrategiesAction.class) Closure c) { - def a = new org.zstack.sdk.GetBareMetal2GatewayAllocatorStrategiesAction() + def getPrimaryStorageCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageCapacityAction.class) Closure c) { + def a = new org.zstack.sdk.GetPrimaryStorageCapacityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17811,8 +17216,8 @@ abstract class ApiHelper { } - def getBareMetal2ProvisionNetworkIpAddressCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBareMetal2ProvisionNetworkIpAddressCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.GetBareMetal2ProvisionNetworkIpAddressCapacityAction() + def getPrimaryStorageLicenseInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageLicenseInfoAction.class) Closure c) { + def a = new org.zstack.sdk.GetPrimaryStorageLicenseInfoAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17838,8 +17243,8 @@ abstract class ApiHelper { } - def getBareMetal2SupportedBootMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBareMetal2SupportedBootModeAction.class) Closure c) { - def a = new org.zstack.sdk.GetBareMetal2SupportedBootModeAction() + def getPrimaryStorageTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageTypesAction.class) Closure c) { + def a = new org.zstack.sdk.GetPrimaryStorageTypesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17865,8 +17270,8 @@ abstract class ApiHelper { } - def getBaremetalChassisPowerStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBaremetalChassisPowerStatusAction.class) Closure c) { - def a = new org.zstack.sdk.GetBaremetalChassisPowerStatusAction() + def getPrimaryStorageUsageReport(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageUsageReportAction.class) Closure c) { + def a = new org.zstack.sdk.GetPrimaryStorageUsageReportAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17892,8 +17297,8 @@ abstract class ApiHelper { } - def getBlockPrimaryStorageMetadata(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetBlockPrimaryStorageMetadataAction.class) Closure c) { - def a = new org.zstack.sdk.GetBlockPrimaryStorageMetadataAction() + def getResourceAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceAccountAction.class) Closure c) { + def a = new org.zstack.sdk.GetResourceAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17919,8 +17324,8 @@ abstract class ApiHelper { } - def getCandidateAffinityGroupForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateAffinityGroupForAttachingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateAffinityGroupForAttachingVmAction() + def getResourceBindableConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceBindableConfigAction.class) Closure c) { + def a = new org.zstack.sdk.GetResourceBindableConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17946,8 +17351,8 @@ abstract class ApiHelper { } - def getCandidateAffinityGroupForCreatingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateAffinityGroupForCreatingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateAffinityGroupForCreatingVmAction() + def getResourceConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceConfigAction.class) Closure c) { + def a = new org.zstack.sdk.GetResourceConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -17973,8 +17378,8 @@ abstract class ApiHelper { } - def getCandidateBackupStorageForCreatingImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateBackupStorageForCreatingImageAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateBackupStorageForCreatingImageAction() + def getResourceConfigs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceConfigsAction.class) Closure c) { + def a = new org.zstack.sdk.GetResourceConfigsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18000,8 +17405,8 @@ abstract class ApiHelper { } - def getCandidateClustersForAttachingL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateClustersForAttachingL2NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateClustersForAttachingL2NetworkAction() + def getResourceFromResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceFromResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.GetResourceFromResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18027,8 +17432,8 @@ abstract class ApiHelper { } - def getCandidateImagesForCreatingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateImagesForCreatingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateImagesForCreatingVmAction() + def getResourceNames(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceNamesAction.class) Closure c) { + def a = new org.zstack.sdk.GetResourceNamesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18054,8 +17459,8 @@ abstract class ApiHelper { } - def getCandidateInterfaceVlanIds(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateInterfaceVlanIdsAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateInterfaceVlanIdsAction() + def getResourceStackFromResource(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceStackFromResourceAction.class) Closure c) { + def a = new org.zstack.sdk.GetResourceStackFromResourceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18081,8 +17486,8 @@ abstract class ApiHelper { } - def getCandidateIsoForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateIsoForAttachingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateIsoForAttachingVmAction() + def getResourceStackVmStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceStackVmStatusAction.class) Closure c) { + def a = new org.zstack.sdk.GetResourceStackVmStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18108,8 +17513,8 @@ abstract class ApiHelper { } - def getCandidateL2NetworksForAttachingCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL2NetworksForAttachingClusterAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateL2NetworksForAttachingClusterAction() + def getRouteTableVpcVRouterCandidate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetRouteTableVpcVRouterCandidateAction.class) Closure c) { + def a = new org.zstack.sdk.GetRouteTableVpcVRouterCandidateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18135,36 +17540,9 @@ abstract class ApiHelper { } - def getCandidateL3NetworksForChangeVmNicNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL3NetworksForChangeVmNicNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateL3NetworksForChangeVmNicNetworkAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } + def getSSOClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSSOClientAction.class) Closure c) { + def a = new org.zstack.sdk.GetSSOClientAction() - return out - } else { - return errorOut(a.call()) - } - } - - - def getCandidateL3NetworksForIpSecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL3NetworksForIpSecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateL3NetworksForIpSecConnectionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -18189,8 +17567,8 @@ abstract class ApiHelper { } - def getCandidateL3NetworksForLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL3NetworksForLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateL3NetworksForLoadBalancerAction() + def getSchedulerExecutionReport(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSchedulerExecutionReportAction.class) Closure c) { + def a = new org.zstack.sdk.GetSchedulerExecutionReportAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18216,8 +17594,8 @@ abstract class ApiHelper { } - def getCandidateL3NetworksForServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateL3NetworksForServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateL3NetworksForServerGroupAction() + def getScsiLunCandidatesForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetScsiLunCandidatesForAttachingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetScsiLunCandidatesForAttachingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18243,8 +17621,8 @@ abstract class ApiHelper { } - def getCandidateMiniHosts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateMiniHostsAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateMiniHostsAction() + def getSharedBlockCandidate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSharedBlockCandidateAction.class) Closure c) { + def a = new org.zstack.sdk.GetSharedBlockCandidateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18270,36 +17648,9 @@ abstract class ApiHelper { } - def getCandidateNetworkBondings(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateNetworkBondingsAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateNetworkBondingsAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } + def getSignatureServerEncryptPublicKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSignatureServerEncryptPublicKeyAction.class) Closure c) { + def a = new org.zstack.sdk.GetSignatureServerEncryptPublicKeyAction() - return out - } else { - return errorOut(a.call()) - } - } - - - def getCandidateNetworkInterfaces(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateNetworkInterfacesAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateNetworkInterfacesAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -18324,8 +17675,8 @@ abstract class ApiHelper { } - def getCandidatePrimaryStoragesForCreatingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidatePrimaryStoragesForCreatingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidatePrimaryStoragesForCreatingVmAction() + def getSpiceCertificates(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSpiceCertificatesAction.class) Closure c) { + def a = new org.zstack.sdk.GetSpiceCertificatesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18351,36 +17702,9 @@ abstract class ApiHelper { } - def getCandidateVMForAttachingAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVMForAttachingAffinityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateVMForAttachingAffinityGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } + def getSupportAPIs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSupportAPIsAction.class) Closure c) { + def a = new org.zstack.sdk.GetSupportAPIsAction() - return out - } else { - return errorOut(a.call()) - } - } - - - def getCandidateVmForAttachingIso(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmForAttachingIsoAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateVmForAttachingIsoAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -18405,8 +17729,8 @@ abstract class ApiHelper { } - def getCandidateVmNicForSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmNicForSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateVmNicForSecurityGroupAction() + def getSupportedCloudFormationResources(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSupportedCloudFormationResourcesAction.class) Closure c) { + def a = new org.zstack.sdk.GetSupportedCloudFormationResourcesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18432,8 +17756,8 @@ abstract class ApiHelper { } - def getCandidateVmNicsForLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmNicsForLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateVmNicsForLoadBalancerAction() + def getTaskProgress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTaskProgressAction.class) Closure c) { + def a = new org.zstack.sdk.GetTaskProgressAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18459,8 +17783,8 @@ abstract class ApiHelper { } - def getCandidateVmNicsForLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmNicsForLoadBalancerServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateVmNicsForLoadBalancerServerGroupAction() + def getTrashOnBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTrashOnBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.GetTrashOnBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18486,8 +17810,8 @@ abstract class ApiHelper { } - def getCandidateVmNicsForPortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateVmNicsForPortMirrorAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateVmNicsForPortMirrorAction() + def getTrashOnPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTrashOnPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.GetTrashOnPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18513,9 +17837,9 @@ abstract class ApiHelper { } - def getCandidateZonesClustersHostsForCreatingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCandidateZonesClustersHostsForCreatingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetCandidateZonesClustersHostsForCreatingVmAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def getTwoFactorAuthenticationSecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTwoFactorAuthenticationSecretAction.class) Closure c) { + def a = new org.zstack.sdk.GetTwoFactorAuthenticationSecretAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -18540,9 +17864,9 @@ abstract class ApiHelper { } - def getChainTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetChainTaskAction.class) Closure c) { - def a = new org.zstack.sdk.GetChainTaskAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def getTwoFactorAuthenticationState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTwoFactorAuthenticationStateAction.class) Closure c) { + def a = new org.zstack.sdk.GetTwoFactorAuthenticationStateAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -18567,8 +17891,8 @@ abstract class ApiHelper { } - def getChronyServers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetChronyServersAction.class) Closure c) { - def a = new org.zstack.sdk.GetChronyServersAction() + def getUploadImageJobDetails(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetUploadImageJobDetailsAction.class) Closure c) { + def a = new org.zstack.sdk.GetUploadImageJobDetailsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18594,8 +17918,8 @@ abstract class ApiHelper { } - def getClusterDRSStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetClusterDRSStatusAction.class) Closure c) { - def a = new org.zstack.sdk.GetClusterDRSStatusAction() + def getUsbDeviceCandidatesForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetUsbDeviceCandidatesForAttachingVmAction.class) Closure c) { + def a = new org.zstack.sdk.GetUsbDeviceCandidatesForAttachingVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18621,8 +17945,8 @@ abstract class ApiHelper { } - def getClusterHostNetworkFacts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetClusterHostNetworkFactsAction.class) Closure c) { - def a = new org.zstack.sdk.GetClusterHostNetworkFactsAction() + def getVRouterFlowCounter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVRouterFlowCounterAction.class) Closure c) { + def a = new org.zstack.sdk.GetVRouterFlowCounterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18648,8 +17972,8 @@ abstract class ApiHelper { } - def getConnectionAccessPointFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetConnectionAccessPointFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetConnectionAccessPointFromRemoteAction() + def getVRouterOspfNeighbor(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVRouterOspfNeighborAction.class) Closure c) { + def a = new org.zstack.sdk.GetVRouterOspfNeighborAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18675,8 +17999,8 @@ abstract class ApiHelper { } - def getConnectionBetweenL3NetworkAndAliyunVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetConnectionBetweenL3NetworkAndAliyunVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.GetConnectionBetweenL3NetworkAndAliyunVSwitchAction() + def getVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVRouterRouteTableAction.class) Closure c) { + def a = new org.zstack.sdk.GetVRouterRouteTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18702,8 +18026,8 @@ abstract class ApiHelper { } - def getCpuMemoryCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCpuMemoryCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.GetCpuMemoryCapacityAction() + def getVRouterRouterId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVRouterRouterIdAction.class) Closure c) { + def a = new org.zstack.sdk.GetVRouterRouterIdAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18729,8 +18053,8 @@ abstract class ApiHelper { } - def getCreateEcsImageProgress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCreateEcsImageProgressAction.class) Closure c) { - def a = new org.zstack.sdk.GetCreateEcsImageProgressAction() + def getVSwitchTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVSwitchTypesAction.class) Closure c) { + def a = new org.zstack.sdk.GetVSwitchTypesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18756,8 +18080,8 @@ abstract class ApiHelper { } - def getCurrentTime(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetCurrentTimeAction.class) Closure c) { - def a = new org.zstack.sdk.GetCurrentTimeAction() + def getVersion(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVersionAction.class) Closure c) { + def a = new org.zstack.sdk.GetVersionAction() c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18783,8 +18107,8 @@ abstract class ApiHelper { } - def getDataCenterFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetDataCenterFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetDataCenterFromRemoteAction() + def getVipAvailablePort(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVipAvailablePortAction.class) Closure c) { + def a = new org.zstack.sdk.GetVipAvailablePortAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18810,8 +18134,8 @@ abstract class ApiHelper { } - def getDataVolumeAttachableVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetDataVolumeAttachableVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetDataVolumeAttachableVmAction() + def getVipQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVipQosAction.class) Closure c) { + def a = new org.zstack.sdk.GetVipQosAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18837,8 +18161,8 @@ abstract class ApiHelper { } - def getDebugSignal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetDebugSignalAction.class) Closure c) { - def a = new org.zstack.sdk.GetDebugSignalAction() + def getVipUsedPorts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVipUsedPortsAction.class) Closure c) { + def a = new org.zstack.sdk.GetVipUsedPortsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18864,8 +18188,8 @@ abstract class ApiHelper { } - def getEcsInstanceType(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetEcsInstanceTypeAction.class) Closure c) { - def a = new org.zstack.sdk.GetEcsInstanceTypeAction() + def getVirtualRouterSoftwareVersion(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVirtualRouterSoftwareVersionAction.class) Closure c) { + def a = new org.zstack.sdk.GetVirtualRouterSoftwareVersionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18891,8 +18215,8 @@ abstract class ApiHelper { } - def getEcsInstanceVncUrl(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetEcsInstanceVncUrlAction.class) Closure c) { - def a = new org.zstack.sdk.GetEcsInstanceVncUrlAction() + def getVirtualizerInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVirtualizerInfoAction.class) Closure c) { + def a = new org.zstack.sdk.GetVirtualizerInfoAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18918,8 +18242,8 @@ abstract class ApiHelper { } - def getEipAttachableVmNics(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetEipAttachableVmNicsAction.class) Closure c) { - def a = new org.zstack.sdk.GetEipAttachableVmNicsAction() + def getVmAttachableDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmAttachableDataVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmAttachableDataVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18945,8 +18269,8 @@ abstract class ApiHelper { } - def getElaborationCategories(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetElaborationCategoriesAction.class) Closure c) { - def a = new org.zstack.sdk.GetElaborationCategoriesAction() + def getVmAttachableL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmAttachableL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmAttachableL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18972,8 +18296,8 @@ abstract class ApiHelper { } - def getElaborations(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetElaborationsAction.class) Closure c) { - def a = new org.zstack.sdk.GetElaborationsAction() + def getVmBootOrder(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmBootOrderAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmBootOrderAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -18999,8 +18323,8 @@ abstract class ApiHelper { } - def getEncryptedField(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetEncryptedFieldAction.class) Closure c) { - def a = new org.zstack.sdk.GetEncryptedFieldAction() + def getVmCapabilities(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmCapabilitiesAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmCapabilitiesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19026,8 +18350,8 @@ abstract class ApiHelper { } - def getExternalServices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetExternalServicesAction.class) Closure c) { - def a = new org.zstack.sdk.GetExternalServicesAction() + def getVmConsoleAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmConsoleAddressAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmConsoleAddressAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19053,8 +18377,8 @@ abstract class ApiHelper { } - def getFactoryModeState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFactoryModeStateAction.class) Closure c) { - def a = new org.zstack.sdk.GetFactoryModeStateAction() + def getVmConsolePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmConsolePasswordAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmConsolePasswordAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19080,8 +18404,8 @@ abstract class ApiHelper { } - def getFaultToleranceVms(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFaultToleranceVmsAction.class) Closure c) { - def a = new org.zstack.sdk.GetFaultToleranceVmsAction() + def getVmDeviceAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmDeviceAddressAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmDeviceAddressAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19107,8 +18431,8 @@ abstract class ApiHelper { } - def getFlowMeterRouterId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFlowMeterRouterIdAction.class) Closure c) { - def a = new org.zstack.sdk.GetFlowMeterRouterIdAction() + def getVmDns(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmDnsAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmDnsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19134,8 +18458,8 @@ abstract class ApiHelper { } - def getFreeIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFreeIpAction.class) Closure c) { - def a = new org.zstack.sdk.GetFreeIpAction() + def getVmEmulatorPinning(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmEmulatorPinningAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmEmulatorPinningAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19161,8 +18485,8 @@ abstract class ApiHelper { } - def getFreeIpOfIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFreeIpOfIpRangeAction.class) Closure c) { - def a = new org.zstack.sdk.GetFreeIpOfIpRangeAction() + def getVmHostname(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmHostnameAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmHostnameAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19188,8 +18512,8 @@ abstract class ApiHelper { } - def getFreeIpOfL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetFreeIpOfL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.GetFreeIpOfL3NetworkAction() + def getVmInstanceFirstBootDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmInstanceFirstBootDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmInstanceFirstBootDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19215,8 +18539,8 @@ abstract class ApiHelper { } - def getGlobalConfigOptions(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetGlobalConfigOptionsAction.class) Closure c) { - def a = new org.zstack.sdk.GetGlobalConfigOptionsAction() + def getVmInstanceHaLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmInstanceHaLevelAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmInstanceHaLevelAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19242,8 +18566,8 @@ abstract class ApiHelper { } - def getHostAllocatorStrategies(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostAllocatorStrategiesAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostAllocatorStrategiesAction() + def getVmInstanceProtectedRecoveryPoints(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmInstanceProtectedRecoveryPointsAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmInstanceProtectedRecoveryPointsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19269,8 +18593,8 @@ abstract class ApiHelper { } - def getHostBlockDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostBlockDevicesAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostBlockDevicesAction() + def getVmInstanceRecoveryPoints(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmInstanceRecoveryPointsAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmInstanceRecoveryPointsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19296,8 +18620,8 @@ abstract class ApiHelper { } - def getHostCandidatesForVmMigration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostCandidatesForVmMigrationAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostCandidatesForVmMigrationAction() + def getVmMigrationCandidateHosts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmMigrationCandidateHostsAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmMigrationCandidateHostsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19323,8 +18647,8 @@ abstract class ApiHelper { } - def getHostIommuState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostIommuStateAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostIommuStateAction() + def getVmMonitorNumber(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmMonitorNumberAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmMonitorNumberAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19350,8 +18674,8 @@ abstract class ApiHelper { } - def getHostIommuStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostIommuStatusAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostIommuStatusAction() + def getVmNicAttachableEips(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmNicAttachableEipsAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmNicAttachableEipsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19377,8 +18701,8 @@ abstract class ApiHelper { } - def getHostMultipathTopology(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostMultipathTopologyAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostMultipathTopologyAction() + def getVmNicAttachedNetworkService(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmNicAttachedNetworkServiceAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmNicAttachedNetworkServiceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19404,8 +18728,8 @@ abstract class ApiHelper { } - def getHostNUMATopology(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostNUMATopologyAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostNUMATopologyAction() + def getVmNuma(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmNumaAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmNumaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19431,8 +18755,8 @@ abstract class ApiHelper { } - def getHostNetworkFacts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostNetworkFactsAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostNetworkFactsAction() + def getVmQga(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmQgaAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmQgaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19458,8 +18782,8 @@ abstract class ApiHelper { } - def getHostNetworkInterfaceLldp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostNetworkInterfaceLldpAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostNetworkInterfaceLldpAction() + def getVmRDP(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmRDPAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmRDPAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19485,8 +18809,8 @@ abstract class ApiHelper { } - def getHostPhysicalMemoryFacts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostPhysicalMemoryFactsAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostPhysicalMemoryFactsAction() + def getVmSchedulingRulesExecuteState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmSchedulingRulesExecuteStateAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmSchedulingRulesExecuteStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19512,8 +18836,8 @@ abstract class ApiHelper { } - def getHostPowerStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostPowerStatusAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostPowerStatusAction() + def getVmSshKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmSshKeyAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmSshKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19539,8 +18863,8 @@ abstract class ApiHelper { } - def getHostResourceAllocation(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostResourceAllocationAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostResourceAllocationAction() + def getVmStartingCandidateClustersHosts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmStartingCandidateClustersHostsAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmStartingCandidateClustersHostsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19566,8 +18890,8 @@ abstract class ApiHelper { } - def getHostSensors(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostSensorsAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostSensorsAction() + def getVmTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmTaskAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19593,8 +18917,8 @@ abstract class ApiHelper { } - def getHostTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostTaskAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostTaskAction() + def getVmUptime(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmUptimeAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmUptimeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19620,8 +18944,8 @@ abstract class ApiHelper { } - def getHostWebSshUrl(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHostWebSshUrlAction.class) Closure c) { - def a = new org.zstack.sdk.GetHostWebSshUrlAction() + def getVmUsbRedirect(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmUsbRedirectAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmUsbRedirectAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19647,8 +18971,8 @@ abstract class ApiHelper { } - def getHypervisorTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetHypervisorTypesAction.class) Closure c) { - def a = new org.zstack.sdk.GetHypervisorTypesAction() + def getVmXml(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmXmlAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmXmlAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19674,8 +18998,8 @@ abstract class ApiHelper { } - def getIdentityZoneFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetIdentityZoneFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetIdentityZoneFromRemoteAction() + def getVmXmlHookScript(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmXmlHookScriptAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmXmlHookScriptAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19701,8 +19025,8 @@ abstract class ApiHelper { } - def getImageCandidatesForVmToChange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetImageCandidatesForVmToChangeAction.class) Closure c) { - def a = new org.zstack.sdk.GetImageCandidatesForVmToChangeAction() + def getVmsCapabilities(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmsCapabilitiesAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmsCapabilitiesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19728,8 +19052,8 @@ abstract class ApiHelper { } - def getImageQga(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetImageQgaAction.class) Closure c) { - def a = new org.zstack.sdk.GetImageQgaAction() + def getVmsSchedulingStateFromSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmsSchedulingStateFromSchedulingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmsSchedulingStateFromSchedulingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19755,8 +19079,8 @@ abstract class ApiHelper { } - def getImagesFromImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetImagesFromImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.GetImagesFromImageStoreBackupStorageAction() + def getVmvNUMATopology(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmvNUMATopologyAction.class) Closure c) { + def a = new org.zstack.sdk.GetVmvNUMATopologyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19782,8 +19106,8 @@ abstract class ApiHelper { } - def getInterdependentL3NetworksBackupStorages(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetInterdependentL3NetworksBackupStoragesAction.class) Closure c) { - def a = new org.zstack.sdk.GetInterdependentL3NetworksBackupStoragesAction() + def getVolumeCapabilities(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeCapabilitiesAction.class) Closure c) { + def a = new org.zstack.sdk.GetVolumeCapabilitiesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19809,8 +19133,8 @@ abstract class ApiHelper { } - def getInterdependentL3NetworksImages(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetInterdependentL3NetworksImagesAction.class) Closure c) { - def a = new org.zstack.sdk.GetInterdependentL3NetworksImagesAction() + def getVolumeFormat(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeFormatAction.class) Closure c) { + def a = new org.zstack.sdk.GetVolumeFormatAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19836,8 +19160,8 @@ abstract class ApiHelper { } - def getInterfaceServiceTypeStatistic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetInterfaceServiceTypeStatisticAction.class) Closure c) { - def a = new org.zstack.sdk.GetInterfaceServiceTypeStatisticAction() + def getVolumeIoThreadPin(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeIoThreadPinAction.class) Closure c) { + def a = new org.zstack.sdk.GetVolumeIoThreadPinAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19863,8 +19187,8 @@ abstract class ApiHelper { } - def getIpAddressCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetIpAddressCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.GetIpAddressCapacityAction() + def getVolumeQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeQosAction.class) Closure c) { + def a = new org.zstack.sdk.GetVolumeQosAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19890,8 +19214,8 @@ abstract class ApiHelper { } - def getL2NetworkTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL2NetworkTypesAction.class) Closure c) { - def a = new org.zstack.sdk.GetL2NetworkTypesAction() + def getVolumeSnapshotSize(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeSnapshotSizeAction.class) Closure c) { + def a = new org.zstack.sdk.GetVolumeSnapshotSizeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19917,8 +19241,8 @@ abstract class ApiHelper { } - def getL3NetworkDhcpIpAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkDhcpIpAddressAction.class) Closure c) { - def a = new org.zstack.sdk.GetL3NetworkDhcpIpAddressAction() + def getVpcAttachedEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedEipAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcAttachedEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19944,8 +19268,8 @@ abstract class ApiHelper { } - def getL3NetworkIpStatistic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkIpStatisticAction.class) Closure c) { - def a = new org.zstack.sdk.GetL3NetworkIpStatisticAction() + def getVpcAttachedIpsec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedIpsecAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcAttachedIpsecAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19971,8 +19295,8 @@ abstract class ApiHelper { } - def getL3NetworkMtu(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkMtuAction.class) Closure c) { - def a = new org.zstack.sdk.GetL3NetworkMtuAction() + def getVpcAttachedLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcAttachedLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19998,8 +19322,8 @@ abstract class ApiHelper { } - def getL3NetworkRouterInterfaceIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkRouterInterfaceIpAction.class) Closure c) { - def a = new org.zstack.sdk.GetL3NetworkRouterInterfaceIpAction() + def getVpcAttachedNetflow(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedNetflowAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcAttachedNetflowAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20025,8 +19349,8 @@ abstract class ApiHelper { } - def getL3NetworkTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetL3NetworkTypesAction.class) Closure c) { - def a = new org.zstack.sdk.GetL3NetworkTypesAction() + def getVpcAttachedOspf(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedOspfAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcAttachedOspfAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20052,8 +19376,8 @@ abstract class ApiHelper { } - def getLatestGuestToolsForVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLatestGuestToolsForVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetLatestGuestToolsForVmAction() + def getVpcAttachedPortForwardingRules(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedPortForwardingRulesAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcAttachedPortForwardingRulesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20079,9 +19403,9 @@ abstract class ApiHelper { } - def getLicenseAddOns(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseAddOnsAction.class) Closure c) { - def a = new org.zstack.sdk.GetLicenseAddOnsAction() - + def getVpcAttachedVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedVipAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcAttachedVipAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -20106,8 +19430,8 @@ abstract class ApiHelper { } - def getLicenseCapabilities(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseCapabilitiesAction.class) Closure c) { - def a = new org.zstack.sdk.GetLicenseCapabilitiesAction() + def getVpcIPsecLog(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcIPsecLogAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcIPsecLogAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20133,9 +19457,9 @@ abstract class ApiHelper { } - def getLicenseInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseInfoAction.class) Closure c) { - def a = new org.zstack.sdk.GetLicenseInfoAction() - + def getVpcMulticastRoute(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcMulticastRouteAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcMulticastRouteAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -20160,9 +19484,9 @@ abstract class ApiHelper { } - def getLicenseRecords(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseRecordsAction.class) Closure c) { - def a = new org.zstack.sdk.GetLicenseRecordsAction() - + def getVpcVRouterDistributedRoutingConnections(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcVRouterDistributedRoutingConnectionsAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcVRouterDistributedRoutingConnectionsAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -20187,8 +19511,8 @@ abstract class ApiHelper { } - def getLicenseUKeyStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLicenseUKeyStatusAction.class) Closure c) { - def a = new org.zstack.sdk.GetLicenseUKeyStatusAction() + def getVpcVRouterDistributedRoutingEnabled(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcVRouterDistributedRoutingEnabledAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcVRouterDistributedRoutingEnabledAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20214,8 +19538,8 @@ abstract class ApiHelper { } - def getLoadBalancerListenerACLEntries(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLoadBalancerListenerACLEntriesAction.class) Closure c) { - def a = new org.zstack.sdk.GetLoadBalancerListenerACLEntriesAction() + def getVpcVRouterNetworkServiceState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcVRouterNetworkServiceStateAction.class) Closure c) { + def a = new org.zstack.sdk.GetVpcVRouterNetworkServiceStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20241,8 +19565,8 @@ abstract class ApiHelper { } - def getLocalRaidPhysicalDriveSmart(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLocalRaidPhysicalDriveSmartAction.class) Closure c) { - def a = new org.zstack.sdk.GetLocalRaidPhysicalDriveSmartAction() + def getZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetZoneAction.class) Closure c) { + def a = new org.zstack.sdk.GetZoneAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20268,8 +19592,8 @@ abstract class ApiHelper { } - def getLocalStorageHostDiskCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLocalStorageHostDiskCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.GetLocalStorageHostDiskCapacityAction() + def identifyHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.IdentifyHostAction.class) Closure c) { + def a = new org.zstack.sdk.IdentifyHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20295,8 +19619,8 @@ abstract class ApiHelper { } - def getLogConfiguration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLogConfigurationAction.class) Closure c) { - def a = new org.zstack.sdk.GetLogConfigurationAction() + def inspectBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.InspectBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.InspectBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20322,8 +19646,8 @@ abstract class ApiHelper { } - def getLoginCaptcha(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLoginCaptchaAction.class) Closure c) { - def a = new org.zstack.sdk.GetLoginCaptchaAction() + def isOpensourceVersion(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.IsOpensourceVersionAction.class) Closure c) { + def a = new org.zstack.sdk.IsOpensourceVersionAction() c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20349,8 +19673,8 @@ abstract class ApiHelper { } - def getLoginProcedures(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetLoginProceduresAction.class) Closure c) { - def a = new org.zstack.sdk.GetLoginProceduresAction() + def isReadyToGo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.IsReadyToGoAction.class) Closure c) { + def a = new org.zstack.sdk.IsReadyToGoAction() c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20376,9 +19700,9 @@ abstract class ApiHelper { } - def getManagementNodeArch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetManagementNodeArchAction.class) Closure c) { - def a = new org.zstack.sdk.GetManagementNodeArchAction() - + def isVfNicAvailableInL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.IsVfNicAvailableInL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.IsVfNicAvailableInL3NetworkAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -20403,9 +19727,9 @@ abstract class ApiHelper { } - def getManagementNodeOS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetManagementNodeOSAction.class) Closure c) { - def a = new org.zstack.sdk.GetManagementNodeOSAction() - + def kvmRunShell(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.KvmRunShellAction.class) Closure c) { + def a = new org.zstack.sdk.KvmRunShellAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -20430,8 +19754,8 @@ abstract class ApiHelper { } - def getMdevDeviceCandidates(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetMdevDeviceCandidatesAction.class) Closure c) { - def a = new org.zstack.sdk.GetMdevDeviceCandidatesAction() + def listVmSchedulingRulesFromExecuteState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ListVmSchedulingRulesFromExecuteStateAction.class) Closure c) { + def a = new org.zstack.sdk.ListVmSchedulingRulesFromExecuteStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20457,8 +19781,8 @@ abstract class ApiHelper { } - def getMdevDeviceSpecCandidates(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetMdevDeviceSpecCandidatesAction.class) Closure c) { - def a = new org.zstack.sdk.GetMdevDeviceSpecCandidatesAction() + def listVmsFromSchedulingState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ListVmsFromSchedulingStateAction.class) Closure c) { + def a = new org.zstack.sdk.ListVmsFromSchedulingStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20484,8 +19808,8 @@ abstract class ApiHelper { } - def getMemorySnapshotGroupReference(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetMemorySnapshotGroupReferenceAction.class) Closure c) { - def a = new org.zstack.sdk.GetMemorySnapshotGroupReferenceAction() + def localStorageGetVolumeMigratableHosts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LocalStorageGetVolumeMigratableHostsAction.class) Closure c) { + def a = new org.zstack.sdk.LocalStorageGetVolumeMigratableHostsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20511,8 +19835,8 @@ abstract class ApiHelper { } - def getMonitorItem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetMonitorItemAction.class) Closure c) { - def a = new org.zstack.sdk.GetMonitorItemAction() + def localStorageMigrateVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LocalStorageMigrateVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.LocalStorageMigrateVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20538,8 +19862,8 @@ abstract class ApiHelper { } - def getNetworkServiceTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetNetworkServiceTypesAction.class) Closure c) { - def a = new org.zstack.sdk.GetNetworkServiceTypesAction() + def locateHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LocateHostNetworkInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.LocateHostNetworkInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20565,8 +19889,8 @@ abstract class ApiHelper { } - def getNicQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetNicQosAction.class) Closure c) { - def a = new org.zstack.sdk.GetNicQosAction() + def locateLocalRaidPhysicalDrive(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LocateLocalRaidPhysicalDriveAction.class) Closure c) { + def a = new org.zstack.sdk.LocateLocalRaidPhysicalDriveAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20592,9 +19916,9 @@ abstract class ApiHelper { } - def getNoTriggerSchedulerJobs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetNoTriggerSchedulerJobsAction.class) Closure c) { - def a = new org.zstack.sdk.GetNoTriggerSchedulerJobsAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def logIn(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LogInAction.class) Closure c) { + def a = new org.zstack.sdk.LogInAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -20619,9 +19943,9 @@ abstract class ApiHelper { } - def getOAuth2Token(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetOAuth2TokenAction.class) Closure c) { - def a = new org.zstack.sdk.GetOAuth2TokenAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def logInByAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LogInByAccountAction.class) Closure c) { + def a = new org.zstack.sdk.LogInByAccountAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -20646,9 +19970,9 @@ abstract class ApiHelper { } - def getOssBackupBucketFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetOssBackupBucketFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetOssBackupBucketFromRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def logOut(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LogOutAction.class) Closure c) { + def a = new org.zstack.sdk.LogOutAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -20673,8 +19997,8 @@ abstract class ApiHelper { } - def getOssBucketFileFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetOssBucketFileFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetOssBucketFileFromRemoteAction() + def mergeDataOnBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MergeDataOnBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.MergeDataOnBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20700,8 +20024,8 @@ abstract class ApiHelper { } - def getOssBucketNameFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetOssBucketNameFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetOssBucketNameFromRemoteAction() + def migrateVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MigrateVmAction.class) Closure c) { + def a = new org.zstack.sdk.MigrateVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20727,8 +20051,8 @@ abstract class ApiHelper { } - def getPciDeviceCandidatesForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPciDeviceCandidatesForAttachingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetPciDeviceCandidatesForAttachingVmAction() + def mountBlockDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MountBlockDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.MountBlockDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20754,8 +20078,8 @@ abstract class ApiHelper { } - def getPciDeviceCandidatesForNewCreateVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPciDeviceCandidatesForNewCreateVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetPciDeviceCandidatesForNewCreateVmAction() + def mountVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MountVmInstanceRecoveryPointAction.class) Closure c) { + def a = new org.zstack.sdk.MountVmInstanceRecoveryPointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20781,8 +20105,8 @@ abstract class ApiHelper { } - def getPciDeviceSpecCandidates(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPciDeviceSpecCandidatesAction.class) Closure c) { - def a = new org.zstack.sdk.GetPciDeviceSpecCandidatesAction() + def moveDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MoveDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.MoveDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20808,8 +20132,8 @@ abstract class ApiHelper { } - def getPhysicalMachineBlockDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPhysicalMachineBlockDevicesAction.class) Closure c) { - def a = new org.zstack.sdk.GetPhysicalMachineBlockDevicesAction() + def moveResourcesToDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MoveResourcesToDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.MoveResourcesToDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20835,8 +20159,8 @@ abstract class ApiHelper { } - def getPlatformTimeZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPlatformTimeZoneAction.class) Closure c) { - def a = new org.zstack.sdk.GetPlatformTimeZoneAction() + def parseOvf(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ParseOvfAction.class) Closure c) { + def a = new org.zstack.sdk.ParseOvfAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20862,8 +20186,8 @@ abstract class ApiHelper { } - def getPolicyRouteRuleSetFromVirtualRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPolicyRouteRuleSetFromVirtualRouterAction.class) Closure c) { - def a = new org.zstack.sdk.GetPolicyRouteRuleSetFromVirtualRouterAction() + def pauseVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PauseVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.PauseVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20889,8 +20213,8 @@ abstract class ApiHelper { } - def getPortForwardingAttachableVmNics(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPortForwardingAttachableVmNicsAction.class) Closure c) { - def a = new org.zstack.sdk.GetPortForwardingAttachableVmNicsAction() + def powerOffBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOffBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.PowerOffBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20916,8 +20240,8 @@ abstract class ApiHelper { } - def getPrimaryStorageAllocatorStrategies(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageAllocatorStrategiesAction.class) Closure c) { - def a = new org.zstack.sdk.GetPrimaryStorageAllocatorStrategiesAction() + def powerOffHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOffHostAction.class) Closure c) { + def a = new org.zstack.sdk.PowerOffHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20943,8 +20267,8 @@ abstract class ApiHelper { } - def getPrimaryStorageCandidatesForVmMigration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageCandidatesForVmMigrationAction.class) Closure c) { - def a = new org.zstack.sdk.GetPrimaryStorageCandidatesForVmMigrationAction() + def powerOnBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOnBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.PowerOnBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20970,8 +20294,8 @@ abstract class ApiHelper { } - def getPrimaryStorageCandidatesForVolumeMigration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageCandidatesForVolumeMigrationAction.class) Closure c) { - def a = new org.zstack.sdk.GetPrimaryStorageCandidatesForVolumeMigrationAction() + def powerOnHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOnHostAction.class) Closure c) { + def a = new org.zstack.sdk.PowerOnHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20997,8 +20321,8 @@ abstract class ApiHelper { } - def getPrimaryStorageCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.GetPrimaryStorageCapacityAction() + def powerResetBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerResetBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.PowerResetBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21024,8 +20348,8 @@ abstract class ApiHelper { } - def getPrimaryStorageLicenseInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageLicenseInfoAction.class) Closure c) { - def a = new org.zstack.sdk.GetPrimaryStorageLicenseInfoAction() + def powerResetHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerResetHostAction.class) Closure c) { + def a = new org.zstack.sdk.PowerResetHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21051,8 +20375,8 @@ abstract class ApiHelper { } - def getPrimaryStorageTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageTypesAction.class) Closure c) { - def a = new org.zstack.sdk.GetPrimaryStorageTypesAction() + def previewResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PreviewResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.PreviewResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21078,8 +20402,8 @@ abstract class ApiHelper { } - def getPrimaryStorageUsageReport(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetPrimaryStorageUsageReportAction.class) Closure c) { - def a = new org.zstack.sdk.GetPrimaryStorageUsageReportAction() + def primaryStorageMigrateVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrimaryStorageMigrateVmAction.class) Closure c) { + def a = new org.zstack.sdk.PrimaryStorageMigrateVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21105,8 +20429,8 @@ abstract class ApiHelper { } - def getResourceAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceAccountAction.class) Closure c) { - def a = new org.zstack.sdk.GetResourceAccountAction() + def primaryStorageMigrateVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrimaryStorageMigrateVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.PrimaryStorageMigrateVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21132,8 +20456,8 @@ abstract class ApiHelper { } - def getResourceBindableConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceBindableConfigAction.class) Closure c) { - def a = new org.zstack.sdk.GetResourceBindableConfigAction() + def prometheusQueryLabelValues(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrometheusQueryLabelValuesAction.class) Closure c) { + def a = new org.zstack.sdk.PrometheusQueryLabelValuesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21159,8 +20483,8 @@ abstract class ApiHelper { } - def getResourceConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceConfigAction.class) Closure c) { - def a = new org.zstack.sdk.GetResourceConfigAction() + def prometheusQueryMetadata(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrometheusQueryMetadataAction.class) Closure c) { + def a = new org.zstack.sdk.PrometheusQueryMetadataAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21186,8 +20510,8 @@ abstract class ApiHelper { } - def getResourceConfigs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceConfigsAction.class) Closure c) { - def a = new org.zstack.sdk.GetResourceConfigsAction() + def prometheusQueryPassThrough(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrometheusQueryPassThroughAction.class) Closure c) { + def a = new org.zstack.sdk.PrometheusQueryPassThroughAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21213,8 +20537,8 @@ abstract class ApiHelper { } - def getResourceFromResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceFromResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.GetResourceFromResourceStackAction() + def prometheusQueryVmMonitoringData(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrometheusQueryVmMonitoringDataAction.class) Closure c) { + def a = new org.zstack.sdk.PrometheusQueryVmMonitoringDataAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21240,8 +20564,8 @@ abstract class ApiHelper { } - def getResourceNames(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceNamesAction.class) Closure c) { - def a = new org.zstack.sdk.GetResourceNamesAction() + def protectVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ProtectVmInstanceRecoveryPointAction.class) Closure c) { + def a = new org.zstack.sdk.ProtectVmInstanceRecoveryPointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21267,8 +20591,8 @@ abstract class ApiHelper { } - def getResourceStackFromResource(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceStackFromResourceAction.class) Closure c) { - def a = new org.zstack.sdk.GetResourceStackFromResourceAction() + def provisionVirtualRouterConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ProvisionVirtualRouterConfigAction.class) Closure c) { + def a = new org.zstack.sdk.ProvisionVirtualRouterConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -21294,13 +20618,15 @@ abstract class ApiHelper { } - def getResourceStackVmStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetResourceStackVmStatusAction.class) Closure c) { - def a = new org.zstack.sdk.GetResourceStackVmStatusAction() + def queryAccessControlList(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccessControlListAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAccessControlListAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21321,40 +20647,15 @@ abstract class ApiHelper { } - def getRouteTableVpcVRouterCandidate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetRouteTableVpcVRouterCandidateAction.class) Closure c) { - def a = new org.zstack.sdk.GetRouteTableVpcVRouterCandidateAction() + def queryAccessControlRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccessControlRuleAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAccessControlRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def getSSOClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSSOClientAction.class) Closure c) { - def a = new org.zstack.sdk.GetSSOClientAction() - - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21375,13 +20676,15 @@ abstract class ApiHelper { } - def getSchedulerExecutionReport(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSchedulerExecutionReportAction.class) Closure c) { - def a = new org.zstack.sdk.GetSchedulerExecutionReportAction() + def queryAccessKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccessKeyAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAccessKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21402,13 +20705,15 @@ abstract class ApiHelper { } - def getScsiLunCandidatesForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetScsiLunCandidatesForAttachingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetScsiLunCandidatesForAttachingVmAction() + def queryAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccountAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21429,40 +20734,15 @@ abstract class ApiHelper { } - def getSharedBlockCandidate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSharedBlockCandidateAction.class) Closure c) { - def a = new org.zstack.sdk.GetSharedBlockCandidateAction() + def queryAccountBilling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccountBillingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAccountBillingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def getSignatureServerEncryptPublicKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSignatureServerEncryptPublicKeyAction.class) Closure c) { - def a = new org.zstack.sdk.GetSignatureServerEncryptPublicKeyAction() - - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21483,41 +20763,16 @@ abstract class ApiHelper { } - def getSpiceCertificates(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSpiceCertificatesAction.class) Closure c) { - def a = new org.zstack.sdk.GetSpiceCertificatesAction() + def queryAccountPriceTableRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccountPriceTableRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAccountPriceTableRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } + a.conditions = a.conditions.collect { it.toString() } - def getSupportAPIs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSupportAPIsAction.class) Closure c) { - def a = new org.zstack.sdk.GetSupportAPIsAction() - - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid @@ -21537,13 +20792,15 @@ abstract class ApiHelper { } - def getSupportedCloudFormationResources(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetSupportedCloudFormationResourcesAction.class) Closure c) { - def a = new org.zstack.sdk.GetSupportedCloudFormationResourcesAction() + def queryAccountResourceRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccountResourceRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAccountResourceRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21564,13 +20821,15 @@ abstract class ApiHelper { } - def getTaskProgress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTaskProgressAction.class) Closure c) { - def a = new org.zstack.sdk.GetTaskProgressAction() + def queryAddressPool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAddressPoolAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAddressPoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21591,13 +20850,15 @@ abstract class ApiHelper { } - def getTrashOnBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTrashOnBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.GetTrashOnBackupStorageAction() + def queryAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAffinityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAffinityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21618,41 +20879,16 @@ abstract class ApiHelper { } - def getTrashOnPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTrashOnPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.GetTrashOnPrimaryStorageAction() + def queryAlert(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAlertAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAlertAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } + a.conditions = a.conditions.collect { it.toString() } - def getTwoFactorAuthenticationSecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTwoFactorAuthenticationSecretAction.class) Closure c) { - def a = new org.zstack.sdk.GetTwoFactorAuthenticationSecretAction() - - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid @@ -21672,13 +20908,15 @@ abstract class ApiHelper { } - def getTwoFactorAuthenticationState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetTwoFactorAuthenticationStateAction.class) Closure c) { - def a = new org.zstack.sdk.GetTwoFactorAuthenticationStateAction() - + def queryApplianceVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryApplianceVmAction.class) Closure c) { + def a = new org.zstack.sdk.QueryApplianceVmAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21699,13 +20937,15 @@ abstract class ApiHelper { } - def getUploadImageJobDetails(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetUploadImageJobDetailsAction.class) Closure c) { - def a = new org.zstack.sdk.GetUploadImageJobDetailsAction() + def queryAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAutoScalingGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21726,13 +20966,15 @@ abstract class ApiHelper { } - def getUsbDeviceCandidatesForAttachingVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetUsbDeviceCandidatesForAttachingVmAction.class) Closure c) { - def a = new org.zstack.sdk.GetUsbDeviceCandidatesForAttachingVmAction() + def queryAutoScalingGroupActivity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingGroupActivityAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAutoScalingGroupActivityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21753,13 +20995,15 @@ abstract class ApiHelper { } - def getVRouterFlowCounter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVRouterFlowCounterAction.class) Closure c) { - def a = new org.zstack.sdk.GetVRouterFlowCounterAction() + def queryAutoScalingGroupInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingGroupInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAutoScalingGroupInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21780,13 +21024,15 @@ abstract class ApiHelper { } - def getVRouterOspfNeighbor(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVRouterOspfNeighborAction.class) Closure c) { - def a = new org.zstack.sdk.GetVRouterOspfNeighborAction() + def queryAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAutoScalingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21807,13 +21053,15 @@ abstract class ApiHelper { } - def getVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVRouterRouteTableAction.class) Closure c) { - def a = new org.zstack.sdk.GetVRouterRouteTableAction() + def queryAutoScalingRuleTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingRuleTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAutoScalingRuleTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21834,13 +21082,15 @@ abstract class ApiHelper { } - def getVRouterRouterId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVRouterRouterIdAction.class) Closure c) { - def a = new org.zstack.sdk.GetVRouterRouterIdAction() + def queryAutoScalingVmTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingVmTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryAutoScalingVmTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21861,13 +21111,15 @@ abstract class ApiHelper { } - def getVSwitchTypes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVSwitchTypesAction.class) Closure c) { - def a = new org.zstack.sdk.GetVSwitchTypesAction() + def queryBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21888,13 +21140,15 @@ abstract class ApiHelper { } - def getVersion(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVersionAction.class) Closure c) { - def a = new org.zstack.sdk.GetVersionAction() - + def queryBaremetalBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBaremetalBondingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryBaremetalBondingAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21915,40 +21169,15 @@ abstract class ApiHelper { } - def getVipAvailablePort(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVipAvailablePortAction.class) Closure c) { - def a = new org.zstack.sdk.GetVipAvailablePortAction() + def queryBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.QueryBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def getVipQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVipQosAction.class) Closure c) { - def a = new org.zstack.sdk.GetVipQosAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -21969,40 +21198,15 @@ abstract class ApiHelper { } - def getVipUsedPorts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVipUsedPortsAction.class) Closure c) { - def a = new org.zstack.sdk.GetVipUsedPortsAction() + def queryBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryBaremetalInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def getVirtualRouterSoftwareVersion(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVirtualRouterSoftwareVersionAction.class) Closure c) { - def a = new org.zstack.sdk.GetVirtualRouterSoftwareVersionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22023,13 +21227,15 @@ abstract class ApiHelper { } - def getVirtualizerInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVirtualizerInfoAction.class) Closure c) { - def a = new org.zstack.sdk.GetVirtualizerInfoAction() + def queryBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBaremetalPxeServerAction.class) Closure c) { + def a = new org.zstack.sdk.QueryBaremetalPxeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22050,13 +21256,15 @@ abstract class ApiHelper { } - def getVmAttachableDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmAttachableDataVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmAttachableDataVolumeAction() + def queryBlockPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBlockPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryBlockPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22077,13 +21285,15 @@ abstract class ApiHelper { } - def getVmAttachableL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmAttachableL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmAttachableL3NetworkAction() + def queryBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBlockVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryBlockVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22104,13 +21314,15 @@ abstract class ApiHelper { } - def getVmBootOrder(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmBootOrderAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmBootOrderAction() + def queryCCSCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCCSCertificateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCCSCertificateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22131,13 +21343,15 @@ abstract class ApiHelper { } - def getVmCapabilities(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmCapabilitiesAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmCapabilitiesAction() + def queryCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCbtTaskAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCbtTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22158,13 +21372,15 @@ abstract class ApiHelper { } - def getVmConsoleAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmConsoleAddressAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmConsoleAddressAction() + def queryCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCdpPolicyAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCdpPolicyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22185,13 +21401,15 @@ abstract class ApiHelper { } - def getVmConsolePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmConsolePasswordAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmConsolePasswordAction() + def queryCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCdpTaskAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCdpTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22212,13 +21430,15 @@ abstract class ApiHelper { } - def getVmDeviceAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmDeviceAddressAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmDeviceAddressAction() + def queryCephBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCephBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCephBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22239,13 +21459,15 @@ abstract class ApiHelper { } - def getVmDns(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmDnsAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmDnsAction() + def queryCephOsdGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCephOsdGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCephOsdGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22266,13 +21488,15 @@ abstract class ApiHelper { } - def getVmEmulatorPinning(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmEmulatorPinningAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmEmulatorPinningAction() + def queryCephPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCephPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCephPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22293,13 +21517,15 @@ abstract class ApiHelper { } - def getVmGuestToolsInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmGuestToolsInfoAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmGuestToolsInfoAction() + def queryCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCephPrimaryStoragePoolAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCephPrimaryStoragePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22320,13 +21546,15 @@ abstract class ApiHelper { } - def getVmHostname(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmHostnameAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmHostnameAction() + def queryCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCertificateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryCertificateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22347,13 +21575,15 @@ abstract class ApiHelper { } - def getVmInstanceFirstBootDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmInstanceFirstBootDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmInstanceFirstBootDeviceAction() + def queryCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryClusterAction.class) Closure c) { + def a = new org.zstack.sdk.QueryClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22374,13 +21604,15 @@ abstract class ApiHelper { } - def getVmInstanceHaLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmInstanceHaLevelAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmInstanceHaLevelAction() + def queryClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryClusterDRSAction.class) Closure c) { + def a = new org.zstack.sdk.QueryClusterDRSAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22401,13 +21633,15 @@ abstract class ApiHelper { } - def getVmInstanceProtectedRecoveryPoints(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmInstanceProtectedRecoveryPointsAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmInstanceProtectedRecoveryPointsAction() + def queryConsoleProxyAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryConsoleProxyAgentAction.class) Closure c) { + def a = new org.zstack.sdk.QueryConsoleProxyAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22428,13 +21662,15 @@ abstract class ApiHelper { } - def getVmInstanceRecoveryPoints(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmInstanceRecoveryPointsAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmInstanceRecoveryPointsAction() + def queryDRSAdvice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDRSAdviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryDRSAdviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22455,13 +21691,15 @@ abstract class ApiHelper { } - def getVmMigrationCandidateHosts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmMigrationCandidateHostsAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmMigrationCandidateHostsAction() + def queryDRSVmMigrationActivity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDRSVmMigrationActivityAction.class) Closure c) { + def a = new org.zstack.sdk.QueryDRSVmMigrationActivityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22482,13 +21720,15 @@ abstract class ApiHelper { } - def getVmMonitorNumber(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmMonitorNumberAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmMonitorNumberAction() + def queryDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.QueryDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22509,13 +21749,15 @@ abstract class ApiHelper { } - def getVmNicAttachableEips(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmNicAttachableEipsAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmNicAttachableEipsAction() + def queryDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDiskOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryDiskOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22536,13 +21778,15 @@ abstract class ApiHelper { } - def getVmNicAttachedNetworkService(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmNicAttachedNetworkServiceAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmNicAttachedNetworkServiceAction() + def queryEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEipAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22563,13 +21807,15 @@ abstract class ApiHelper { } - def getVmNuma(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmNumaAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmNumaAction() + def queryEmailMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEmailMediaAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEmailMediaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22590,13 +21836,15 @@ abstract class ApiHelper { } - def getVmQga(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmQgaAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmQgaAction() + def queryEmailTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEmailTriggerActionAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEmailTriggerActionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22617,13 +21865,15 @@ abstract class ApiHelper { } - def getVmRDP(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmRDPAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmRDPAction() + def queryEthernetVF(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEthernetVFAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEthernetVFAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22644,13 +21894,15 @@ abstract class ApiHelper { } - def getVmSchedulingRulesExecuteState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmSchedulingRulesExecuteStateAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmSchedulingRulesExecuteStateAction() + def queryEventFromResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEventFromResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEventFromResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22671,13 +21923,15 @@ abstract class ApiHelper { } - def getVmSshKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmSshKeyAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmSshKeyAction() + def queryEventLog(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEventLogAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEventLogAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22698,13 +21952,15 @@ abstract class ApiHelper { } - def getVmStartingCandidateClustersHosts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmStartingCandidateClustersHostsAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmStartingCandidateClustersHostsAction() + def queryExponBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryExponBlockVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryExponBlockVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22725,13 +21981,15 @@ abstract class ApiHelper { } - def getVmTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmTaskAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmTaskAction() + def queryExternalBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryExternalBackupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryExternalBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22752,13 +22010,15 @@ abstract class ApiHelper { } - def getVmUptime(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmUptimeAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmUptimeAction() + def queryFaultToleranceVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFaultToleranceVmAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFaultToleranceVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22779,13 +22039,15 @@ abstract class ApiHelper { } - def getVmUsbRedirect(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmUsbRedirectAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmUsbRedirectAction() + def queryFcHbaDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFcHbaDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFcHbaDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22806,13 +22068,15 @@ abstract class ApiHelper { } - def getVmXml(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmXmlAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmXmlAction() + def queryFiberChannelLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFiberChannelLunAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFiberChannelLunAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22833,13 +22097,15 @@ abstract class ApiHelper { } - def getVmXmlHookScript(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmXmlHookScriptAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmXmlHookScriptAction() + def queryFiberChannelStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFiberChannelStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFiberChannelStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22860,13 +22126,15 @@ abstract class ApiHelper { } - def getVmsCapabilities(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmsCapabilitiesAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmsCapabilitiesAction() + def queryFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallIpSetTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFirewallIpSetTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22887,13 +22155,15 @@ abstract class ApiHelper { } - def getVmsSchedulingStateFromSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmsSchedulingStateFromSchedulingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmsSchedulingStateFromSchedulingRuleAction() + def queryFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFirewallRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22914,40 +22184,15 @@ abstract class ApiHelper { } - def getVmvNUMATopology(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVmvNUMATopologyAction.class) Closure c) { - def a = new org.zstack.sdk.GetVmvNUMATopologyAction() + def queryFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleSetAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFirewallRuleSetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def getVolumeCapabilities(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeCapabilitiesAction.class) Closure c) { - def a = new org.zstack.sdk.GetVolumeCapabilitiesAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -22968,40 +22213,15 @@ abstract class ApiHelper { } - def getVolumeFormat(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeFormatAction.class) Closure c) { - def a = new org.zstack.sdk.GetVolumeFormatAction() + def queryFirewallRuleSetL3Ref(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleSetL3RefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFirewallRuleSetL3RefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def getVolumeIoThreadPin(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeIoThreadPinAction.class) Closure c) { - def a = new org.zstack.sdk.GetVolumeIoThreadPinAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23022,40 +22242,15 @@ abstract class ApiHelper { } - def getVolumeQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeQosAction.class) Closure c) { - def a = new org.zstack.sdk.GetVolumeQosAction() + def queryFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFirewallRuleTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def getVolumeSnapshotSize(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVolumeSnapshotSizeAction.class) Closure c) { - def a = new org.zstack.sdk.GetVolumeSnapshotSizeAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23076,13 +22271,15 @@ abstract class ApiHelper { } - def getVpcAttachedEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedEipAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcAttachedEipAction() + def queryFlowCollector(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFlowCollectorAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFlowCollectorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23103,13 +22300,15 @@ abstract class ApiHelper { } - def getVpcAttachedIpsec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedIpsecAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcAttachedIpsecAction() + def queryFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFlowMeterAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFlowMeterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23130,13 +22329,15 @@ abstract class ApiHelper { } - def getVpcAttachedLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcAttachedLoadBalancerAction() + def queryGCJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGCJobAction.class) Closure c) { + def a = new org.zstack.sdk.QueryGCJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23157,13 +22358,15 @@ abstract class ApiHelper { } - def getVpcAttachedNetflow(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedNetflowAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcAttachedNetflowAction() + def queryGlobalConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGlobalConfigAction.class) Closure c) { + def a = new org.zstack.sdk.QueryGlobalConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23184,13 +22387,15 @@ abstract class ApiHelper { } - def getVpcAttachedOspf(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedOspfAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcAttachedOspfAction() + def queryGlobalConfigTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGlobalConfigTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryGlobalConfigTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23211,13 +22416,15 @@ abstract class ApiHelper { } - def getVpcAttachedPortForwardingRules(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedPortForwardingRulesAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcAttachedPortForwardingRulesAction() + def queryGpuDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGpuDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryGpuDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23238,13 +22445,15 @@ abstract class ApiHelper { } - def getVpcAttachedVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcAttachedVipAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcAttachedVipAction() + def queryHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23265,13 +22474,15 @@ abstract class ApiHelper { } - def getVpcIPsecLog(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcIPsecLogAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcIPsecLogAction() + def queryHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostKernelInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostKernelInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23292,13 +22503,15 @@ abstract class ApiHelper { } - def getVpcMulticastRoute(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcMulticastRouteAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcMulticastRouteAction() + def queryHostNetworkBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostNetworkBondingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostNetworkBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23319,13 +22532,15 @@ abstract class ApiHelper { } - def getVpcVRouterDistributedRoutingConnections(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcVRouterDistributedRoutingConnectionsAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcVRouterDistributedRoutingConnectionsAction() + def queryHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostNetworkInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostNetworkInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23346,13 +22561,15 @@ abstract class ApiHelper { } - def getVpcVRouterDistributedRoutingEnabled(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcVRouterDistributedRoutingEnabledAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcVRouterDistributedRoutingEnabledAction() + def queryHostNetworkInterfaceLldp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostNetworkInterfaceLldpAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostNetworkInterfaceLldpAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23373,13 +22590,15 @@ abstract class ApiHelper { } - def getVpcVRouterNetworkServiceState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcVRouterNetworkServiceStateAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcVRouterNetworkServiceStateAction() + def queryHostOsCategory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostOsCategoryAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostOsCategoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23400,13 +22619,15 @@ abstract class ApiHelper { } - def getVpcVpnConfigurationFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetVpcVpnConfigurationFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.GetVpcVpnConfigurationFromRemoteAction() + def queryHostPhysicalCpu(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostPhysicalCpuAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostPhysicalCpuAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23427,13 +22648,15 @@ abstract class ApiHelper { } - def getZBoxBackupDetails(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetZBoxBackupDetailsAction.class) Closure c) { - def a = new org.zstack.sdk.GetZBoxBackupDetailsAction() + def queryHostPhysicalMemory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostPhysicalMemoryAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostPhysicalMemoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23454,13 +22677,15 @@ abstract class ApiHelper { } - def getZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.GetZoneAction.class) Closure c) { - def a = new org.zstack.sdk.GetZoneAction() + def queryHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryHostSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23481,13 +22706,15 @@ abstract class ApiHelper { } - def identifyHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.IdentifyHostAction.class) Closure c) { - def a = new org.zstack.sdk.IdentifyHostAction() + def queryIPSecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIPSecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.QueryIPSecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23508,13 +22735,15 @@ abstract class ApiHelper { } - def inspectBareMetal2Chassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.InspectBareMetal2ChassisAction.class) Closure c) { - def a = new org.zstack.sdk.InspectBareMetal2ChassisAction() + def queryImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23535,40 +22764,15 @@ abstract class ApiHelper { } - def inspectBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.InspectBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.InspectBaremetalChassisAction() + def queryImageCache(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImageCacheAction.class) Closure c) { + def a = new org.zstack.sdk.QueryImageCacheAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def isOpensourceVersion(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.IsOpensourceVersionAction.class) Closure c) { - def a = new org.zstack.sdk.IsOpensourceVersionAction() - - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23589,13 +22793,15 @@ abstract class ApiHelper { } - def isReadyToGo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.IsReadyToGoAction.class) Closure c) { - def a = new org.zstack.sdk.IsReadyToGoAction() - + def queryImagePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImagePackageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryImagePackageAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23616,13 +22822,15 @@ abstract class ApiHelper { } - def isVfNicAvailableInL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.IsVfNicAvailableInL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.IsVfNicAvailableInL3NetworkAction() + def queryImageReplicationGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImageReplicationGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryImageReplicationGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23643,13 +22851,15 @@ abstract class ApiHelper { } - def kvmRunShell(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.KvmRunShellAction.class) Closure c) { - def a = new org.zstack.sdk.KvmRunShellAction() + def queryImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23670,13 +22880,15 @@ abstract class ApiHelper { } - def listVmSchedulingRulesFromExecuteState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ListVmSchedulingRulesFromExecuteStateAction.class) Closure c) { - def a = new org.zstack.sdk.ListVmSchedulingRulesFromExecuteStateAction() + def queryInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryInstanceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryInstanceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23697,13 +22909,15 @@ abstract class ApiHelper { } - def listVmsFromSchedulingState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ListVmsFromSchedulingStateAction.class) Closure c) { - def a = new org.zstack.sdk.ListVmsFromSchedulingStateAction() + def queryIpAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIpAddressAction.class) Closure c) { + def a = new org.zstack.sdk.QueryIpAddressAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23724,13 +22938,15 @@ abstract class ApiHelper { } - def localStorageGetVolumeMigratableHosts(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LocalStorageGetVolumeMigratableHostsAction.class) Closure c) { - def a = new org.zstack.sdk.LocalStorageGetVolumeMigratableHostsAction() + def queryIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIpRangeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryIpRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23751,13 +22967,15 @@ abstract class ApiHelper { } - def localStorageMigrateVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LocalStorageMigrateVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.LocalStorageMigrateVolumeAction() + def queryIscsiLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIscsiLunAction.class) Closure c) { + def a = new org.zstack.sdk.QueryIscsiLunAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23778,13 +22996,15 @@ abstract class ApiHelper { } - def locateHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LocateHostNetworkInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.LocateHostNetworkInterfaceAction() + def queryIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIscsiServerAction.class) Closure c) { + def a = new org.zstack.sdk.QueryIscsiServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23805,40 +23025,15 @@ abstract class ApiHelper { } - def locateLocalRaidPhysicalDrive(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LocateLocalRaidPhysicalDriveAction.class) Closure c) { - def a = new org.zstack.sdk.LocateLocalRaidPhysicalDriveAction() + def queryKvmHypervisorInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryKvmHypervisorInfoAction.class) Closure c) { + def a = new org.zstack.sdk.QueryKvmHypervisorInfoAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def logIn(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LogInAction.class) Closure c) { - def a = new org.zstack.sdk.LogInAction() - - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23859,13 +23054,15 @@ abstract class ApiHelper { } - def logInByAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LogInByAccountAction.class) Closure c) { - def a = new org.zstack.sdk.LogInByAccountAction() - + def queryL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.QueryL2NetworkAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23886,13 +23083,15 @@ abstract class ApiHelper { } - def logOut(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.LogOutAction.class) Closure c) { - def a = new org.zstack.sdk.LogOutAction() - + def queryL2PortGroupNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2PortGroupNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.QueryL2PortGroupNetworkAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23913,13 +23112,15 @@ abstract class ApiHelper { } - def mergeDataOnBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MergeDataOnBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.MergeDataOnBackupStorageAction() + def queryL2VirtualSwitchNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2VirtualSwitchNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.QueryL2VirtualSwitchNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23940,13 +23141,15 @@ abstract class ApiHelper { } - def migrateVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MigrateVmAction.class) Closure c) { - def a = new org.zstack.sdk.MigrateVmAction() + def queryL2VlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2VlanNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.QueryL2VlanNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23967,13 +23170,15 @@ abstract class ApiHelper { } - def mountBlockDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MountBlockDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.MountBlockDeviceAction() + def queryL2VxlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2VxlanNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.QueryL2VxlanNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -23994,13 +23199,15 @@ abstract class ApiHelper { } - def mountVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MountVmInstanceRecoveryPointAction.class) Closure c) { - def a = new org.zstack.sdk.MountVmInstanceRecoveryPointAction() + def queryL2VxlanNetworkPool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2VxlanNetworkPoolAction.class) Closure c) { + def a = new org.zstack.sdk.QueryL2VxlanNetworkPoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24021,13 +23228,15 @@ abstract class ApiHelper { } - def moveDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MoveDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.MoveDirectoryAction() + def queryL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.QueryL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24048,13 +23257,15 @@ abstract class ApiHelper { } - def moveResourcesToDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.MoveResourcesToDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.MoveResourcesToDirectoryAction() + def queryLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.QueryLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24075,13 +23286,15 @@ abstract class ApiHelper { } - def parseOvf(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ParseOvfAction.class) Closure c) { - def a = new org.zstack.sdk.ParseOvfAction() + def queryLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.QueryLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24102,13 +23315,15 @@ abstract class ApiHelper { } - def pauseVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PauseVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.PauseVmInstanceAction() + def queryLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLoadBalancerServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryLoadBalancerServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24129,13 +23344,15 @@ abstract class ApiHelper { } - def powerOffBareMetal2Chassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOffBareMetal2ChassisAction.class) Closure c) { - def a = new org.zstack.sdk.PowerOffBareMetal2ChassisAction() + def queryLocalRaidController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLocalRaidControllerAction.class) Closure c) { + def a = new org.zstack.sdk.QueryLocalRaidControllerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24156,13 +23373,15 @@ abstract class ApiHelper { } - def powerOffBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOffBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.PowerOffBaremetalChassisAction() + def queryLocalRaidPhysicalDrive(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLocalRaidPhysicalDriveAction.class) Closure c) { + def a = new org.zstack.sdk.QueryLocalRaidPhysicalDriveAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24183,13 +23402,15 @@ abstract class ApiHelper { } - def powerOffHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOffHostAction.class) Closure c) { - def a = new org.zstack.sdk.PowerOffHostAction() + def queryLocalStorageResourceRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLocalStorageResourceRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryLocalStorageResourceRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24210,13 +23431,15 @@ abstract class ApiHelper { } - def powerOnBareMetal2Chassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOnBareMetal2ChassisAction.class) Closure c) { - def a = new org.zstack.sdk.PowerOnBareMetal2ChassisAction() + def queryLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLongJobAction.class) Closure c) { + def a = new org.zstack.sdk.QueryLongJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24237,13 +23460,15 @@ abstract class ApiHelper { } - def powerOnBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOnBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.PowerOnBaremetalChassisAction() + def queryManagementNode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryManagementNodeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryManagementNodeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24264,13 +23489,15 @@ abstract class ApiHelper { } - def powerOnHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerOnHostAction.class) Closure c) { - def a = new org.zstack.sdk.PowerOnHostAction() + def queryMdevDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMdevDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryMdevDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24291,13 +23518,15 @@ abstract class ApiHelper { } - def powerResetBareMetal2Chassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerResetBareMetal2ChassisAction.class) Closure c) { - def a = new org.zstack.sdk.PowerResetBareMetal2ChassisAction() + def queryMdevDeviceSpec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMdevDeviceSpecAction.class) Closure c) { + def a = new org.zstack.sdk.QueryMdevDeviceSpecAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24318,13 +23547,15 @@ abstract class ApiHelper { } - def powerResetBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerResetBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.PowerResetBaremetalChassisAction() + def queryMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMediaAction.class) Closure c) { + def a = new org.zstack.sdk.QueryMediaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24345,13 +23576,15 @@ abstract class ApiHelper { } - def powerResetHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PowerResetHostAction.class) Closure c) { - def a = new org.zstack.sdk.PowerResetHostAction() + def queryMonitorTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMonitorTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.QueryMonitorTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24372,13 +23605,15 @@ abstract class ApiHelper { } - def previewResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PreviewResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.PreviewResourceStackAction() + def queryMonitorTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMonitorTriggerActionAction.class) Closure c) { + def a = new org.zstack.sdk.QueryMonitorTriggerActionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24399,13 +23634,15 @@ abstract class ApiHelper { } - def primaryStorageMigrateVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrimaryStorageMigrateVmAction.class) Closure c) { - def a = new org.zstack.sdk.PrimaryStorageMigrateVmAction() + def queryMttyDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMttyDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryMttyDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24426,13 +23663,15 @@ abstract class ApiHelper { } - def primaryStorageMigrateVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrimaryStorageMigrateVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.PrimaryStorageMigrateVolumeAction() + def queryMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMulticastRouterAction.class) Closure c) { + def a = new org.zstack.sdk.QueryMulticastRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24453,13 +23692,15 @@ abstract class ApiHelper { } - def prometheusQueryLabelValues(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrometheusQueryLabelValuesAction.class) Closure c) { - def a = new org.zstack.sdk.PrometheusQueryLabelValuesAction() + def queryNasFileSystem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNasFileSystemAction.class) Closure c) { + def a = new org.zstack.sdk.QueryNasFileSystemAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24480,13 +23721,15 @@ abstract class ApiHelper { } - def prometheusQueryMetadata(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrometheusQueryMetadataAction.class) Closure c) { - def a = new org.zstack.sdk.PrometheusQueryMetadataAction() + def queryNasMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNasMountTargetAction.class) Closure c) { + def a = new org.zstack.sdk.QueryNasMountTargetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24507,13 +23750,15 @@ abstract class ApiHelper { } - def prometheusQueryPassThrough(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrometheusQueryPassThroughAction.class) Closure c) { - def a = new org.zstack.sdk.PrometheusQueryPassThroughAction() + def queryNetworkServiceL3NetworkRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNetworkServiceL3NetworkRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryNetworkServiceL3NetworkRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24534,13 +23779,15 @@ abstract class ApiHelper { } - def prometheusQueryVmMonitoringData(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.PrometheusQueryVmMonitoringDataAction.class) Closure c) { - def a = new org.zstack.sdk.PrometheusQueryVmMonitoringDataAction() + def queryNetworkServiceProvider(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNetworkServiceProviderAction.class) Closure c) { + def a = new org.zstack.sdk.QueryNetworkServiceProviderAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24561,13 +23808,15 @@ abstract class ApiHelper { } - def protectVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ProtectVmInstanceRecoveryPointAction.class) Closure c) { - def a = new org.zstack.sdk.ProtectVmInstanceRecoveryPointAction() + def queryNvmeLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNvmeLunAction.class) Closure c) { + def a = new org.zstack.sdk.QueryNvmeLunAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24588,13 +23837,15 @@ abstract class ApiHelper { } - def provisionVirtualRouterConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ProvisionVirtualRouterConfigAction.class) Closure c) { - def a = new org.zstack.sdk.ProvisionVirtualRouterConfigAction() + def queryNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNvmeServerAction.class) Closure c) { + def a = new org.zstack.sdk.QueryNvmeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -24615,8 +23866,8 @@ abstract class ApiHelper { } - def queryAccessControlList(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccessControlListAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAccessControlListAction() + def queryNvmeTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNvmeTargetAction.class) Closure c) { + def a = new org.zstack.sdk.QueryNvmeTargetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24644,8 +23895,8 @@ abstract class ApiHelper { } - def queryAccessControlRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccessControlRuleAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAccessControlRuleAction() + def queryPciDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPciDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPciDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24673,8 +23924,8 @@ abstract class ApiHelper { } - def queryAccessKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccessKeyAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAccessKeyAction() + def queryPciDeviceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPciDeviceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPciDeviceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24702,8 +23953,8 @@ abstract class ApiHelper { } - def queryAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccountAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAccountAction() + def queryPciDevicePciDeviceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPciDevicePciDeviceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPciDevicePciDeviceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24731,8 +23982,8 @@ abstract class ApiHelper { } - def queryAccountBilling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccountBillingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAccountBillingAction() + def queryPciDeviceSpec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPciDeviceSpecAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPciDeviceSpecAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24760,8 +24011,8 @@ abstract class ApiHelper { } - def queryAccountPriceTableRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccountPriceTableRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAccountPriceTableRefAction() + def queryPhysicalDriveSelfTestHistory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPhysicalDriveSelfTestHistoryAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPhysicalDriveSelfTestHistoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24789,8 +24040,8 @@ abstract class ApiHelper { } - def queryAccountResourceRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAccountResourceRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAccountResourceRefAction() + def queryPolicyRouteRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteRuleAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPolicyRouteRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24818,8 +24069,8 @@ abstract class ApiHelper { } - def queryAddressPool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAddressPoolAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAddressPoolAction() + def queryPolicyRouteRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteRuleSetAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPolicyRouteRuleSetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24847,8 +24098,8 @@ abstract class ApiHelper { } - def queryAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAffinityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAffinityGroupAction() + def queryPolicyRouteRuleSetL3Ref(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteRuleSetL3RefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPolicyRouteRuleSetL3RefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24876,8 +24127,8 @@ abstract class ApiHelper { } - def queryAlert(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAlertAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAlertAction() + def queryPolicyRouteRuleSetVRouterRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteRuleSetVRouterRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPolicyRouteRuleSetVRouterRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24905,8 +24156,8 @@ abstract class ApiHelper { } - def queryAliyunDiskFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunDiskFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunDiskFromLocalAction() + def queryPolicyRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteTableAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPolicyRouteTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24934,8 +24185,8 @@ abstract class ApiHelper { } - def queryAliyunEbsBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunEbsBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunEbsBackupStorageAction() + def queryPolicyRouteTableRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteTableRouteEntryAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPolicyRouteTableRouteEntryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24963,8 +24214,8 @@ abstract class ApiHelper { } - def queryAliyunEbsPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunEbsPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunEbsPrimaryStorageAction() + def queryPolicyRouteTableVRouterRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteTableVRouterRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPolicyRouteTableVRouterRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -24992,8 +24243,8 @@ abstract class ApiHelper { } - def queryAliyunNasAccessGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunNasAccessGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunNasAccessGroupAction() + def queryPortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortForwardingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPortForwardingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25021,124 +24272,8 @@ abstract class ApiHelper { } - def queryAliyunPanguPartition(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunPanguPartitionAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunPanguPartitionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def queryAliyunProxyVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunProxyVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunProxyVSwitchAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def queryAliyunProxyVpc(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunProxyVpcAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunProxyVpcAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def queryAliyunRouteEntryFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunRouteEntryFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunRouteEntryFromLocalAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def queryAliyunRouterInterfaceFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunRouterInterfaceFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunRouterInterfaceFromLocalAction() + def queryPortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPortGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25166,8 +24301,8 @@ abstract class ApiHelper { } - def queryAliyunSnapshotFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunSnapshotFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunSnapshotFromLocalAction() + def queryPortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortMirrorAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPortMirrorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25195,8 +24330,8 @@ abstract class ApiHelper { } - def queryAliyunVirtualRouterFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAliyunVirtualRouterFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAliyunVirtualRouterFromLocalAction() + def queryPortMirrorNetworkUsedIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortMirrorNetworkUsedIpAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPortMirrorNetworkUsedIpAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25224,8 +24359,8 @@ abstract class ApiHelper { } - def queryApplianceVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryApplianceVmAction.class) Closure c) { - def a = new org.zstack.sdk.QueryApplianceVmAction() + def queryPortMirrorSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortMirrorSessionAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPortMirrorSessionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25253,8 +24388,8 @@ abstract class ApiHelper { } - def queryAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAutoScalingGroupAction() + def queryPreconfigurationTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPreconfigurationTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPreconfigurationTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25282,8 +24417,8 @@ abstract class ApiHelper { } - def queryAutoScalingGroupActivity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingGroupActivityAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAutoScalingGroupActivityAction() + def queryPriceTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPriceTableAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPriceTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25311,8 +24446,8 @@ abstract class ApiHelper { } - def queryAutoScalingGroupInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingGroupInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAutoScalingGroupInstanceAction() + def queryPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25340,8 +24475,8 @@ abstract class ApiHelper { } - def queryAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAutoScalingRuleAction() + def queryQuota(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryQuotaAction.class) Closure c) { + def a = new org.zstack.sdk.QueryQuotaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25369,8 +24504,8 @@ abstract class ApiHelper { } - def queryAutoScalingRuleTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingRuleTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAutoScalingRuleTriggerAction() + def queryResourceConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryResourceConfigAction.class) Closure c) { + def a = new org.zstack.sdk.QueryResourceConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25398,8 +24533,8 @@ abstract class ApiHelper { } - def queryAutoScalingVmTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryAutoScalingVmTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryAutoScalingVmTemplateAction() + def queryResourcePrice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryResourcePriceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryResourcePriceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25427,8 +24562,8 @@ abstract class ApiHelper { } - def queryBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBackupStorageAction() + def queryResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.QueryResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25456,8 +24591,8 @@ abstract class ApiHelper { } - def queryBareMetal2Bonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBareMetal2BondingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBareMetal2BondingAction() + def querySchedulerJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySchedulerJobAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySchedulerJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25485,8 +24620,8 @@ abstract class ApiHelper { } - def queryBareMetal2BondingNicRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBareMetal2BondingNicRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBareMetal2BondingNicRefAction() + def querySchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySchedulerJobGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySchedulerJobGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25514,8 +24649,8 @@ abstract class ApiHelper { } - def queryBareMetal2Chassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBareMetal2ChassisAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBareMetal2ChassisAction() + def querySchedulerJobHistory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySchedulerJobHistoryAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySchedulerJobHistoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25543,8 +24678,8 @@ abstract class ApiHelper { } - def queryBareMetal2ChassisOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBareMetal2ChassisOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBareMetal2ChassisOfferingAction() + def querySchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25572,8 +24707,8 @@ abstract class ApiHelper { } - def queryBareMetal2Gateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBareMetal2GatewayAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBareMetal2GatewayAction() + def queryScsiLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryScsiLunAction.class) Closure c) { + def a = new org.zstack.sdk.QueryScsiLunAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25601,8 +24736,8 @@ abstract class ApiHelper { } - def queryBareMetal2Instance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBareMetal2InstanceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBareMetal2InstanceAction() + def querySdnController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySdnControllerAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySdnControllerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25630,8 +24765,8 @@ abstract class ApiHelper { } - def queryBareMetal2ProvisionNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBareMetal2ProvisionNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBareMetal2ProvisionNetworkAction() + def querySecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25659,8 +24794,8 @@ abstract class ApiHelper { } - def queryBaremetalBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBaremetalBondingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBaremetalBondingAction() + def querySecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25688,8 +24823,8 @@ abstract class ApiHelper { } - def queryBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBaremetalChassisAction() + def querySecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySecurityGroupRuleAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySecurityGroupRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25717,8 +24852,8 @@ abstract class ApiHelper { } - def queryBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBaremetalInstanceAction() + def querySecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySecurityMachineAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySecurityMachineAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25746,8 +24881,8 @@ abstract class ApiHelper { } - def queryBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBaremetalPxeServerAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBaremetalPxeServerAction() + def querySftpBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySftpBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySftpBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25775,8 +24910,8 @@ abstract class ApiHelper { } - def queryBlockPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBlockPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBlockPrimaryStorageAction() + def queryShareableVolumeVmInstanceRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryShareableVolumeVmInstanceRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryShareableVolumeVmInstanceRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25804,8 +24939,8 @@ abstract class ApiHelper { } - def queryBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryBlockVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryBlockVolumeAction() + def querySharedBlock(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySharedBlockAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySharedBlockAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25833,8 +24968,8 @@ abstract class ApiHelper { } - def queryCCSCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCCSCertificateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCCSCertificateAction() + def querySharedBlockGroupPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySharedBlockGroupPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySharedBlockGroupPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25862,8 +24997,8 @@ abstract class ApiHelper { } - def queryCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCbtTaskAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCbtTaskAction() + def querySharedBlockGroupPrimaryStorageHostRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySharedBlockGroupPrimaryStorageHostRefAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySharedBlockGroupPrimaryStorageHostRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25891,8 +25026,8 @@ abstract class ApiHelper { } - def queryCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCdpPolicyAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCdpPolicyAction() + def querySlbGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySlbGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySlbGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25920,8 +25055,8 @@ abstract class ApiHelper { } - def queryCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCdpTaskAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCdpTaskAction() + def querySlbOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySlbOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySlbOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25949,8 +25084,8 @@ abstract class ApiHelper { } - def queryCephBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCephBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCephBackupStorageAction() + def querySnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySnmpAgentAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySnmpAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -25978,8 +25113,8 @@ abstract class ApiHelper { } - def queryCephOsdGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCephOsdGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCephOsdGroupAction() + def querySshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySshKeyPairAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySshKeyPairAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26007,8 +25142,8 @@ abstract class ApiHelper { } - def queryCephPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCephPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCephPrimaryStorageAction() + def queryStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryStackTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryStackTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26036,8 +25171,8 @@ abstract class ApiHelper { } - def queryCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCephPrimaryStoragePoolAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCephPrimaryStoragePoolAction() + def querySystemTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySystemTagAction.class) Closure c) { + def a = new org.zstack.sdk.QuerySystemTagAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26065,8 +25200,8 @@ abstract class ApiHelper { } - def queryCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryCertificateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryCertificateAction() + def queryTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryTagAction.class) Closure c) { + def a = new org.zstack.sdk.QueryTagAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26094,8 +25229,8 @@ abstract class ApiHelper { } - def queryCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryClusterAction.class) Closure c) { - def a = new org.zstack.sdk.QueryClusterAction() + def queryTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryTemplateConfigAction.class) Closure c) { + def a = new org.zstack.sdk.QueryTemplateConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26123,8 +25258,8 @@ abstract class ApiHelper { } - def queryClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryClusterDRSAction.class) Closure c) { - def a = new org.zstack.sdk.QueryClusterDRSAction() + def queryTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryTemplatedVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryTemplatedVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26152,8 +25287,8 @@ abstract class ApiHelper { } - def queryConnectionAccessPointFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryConnectionAccessPointFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryConnectionAccessPointFromLocalAction() + def queryTwoFactorAuthentication(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryTwoFactorAuthenticationAction.class) Closure c) { + def a = new org.zstack.sdk.QueryTwoFactorAuthenticationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26181,8 +25316,8 @@ abstract class ApiHelper { } - def queryConnectionBetweenL3NetworkAndAliyunVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryConnectionBetweenL3NetworkAndAliyunVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.QueryConnectionBetweenL3NetworkAndAliyunVSwitchAction() + def queryUplinkGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryUplinkGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryUplinkGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26210,8 +25345,8 @@ abstract class ApiHelper { } - def queryConsoleProxyAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryConsoleProxyAgentAction.class) Closure c) { - def a = new org.zstack.sdk.QueryConsoleProxyAgentAction() + def queryUsbDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryUsbDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryUsbDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26239,8 +25374,8 @@ abstract class ApiHelper { } - def queryDRSAdvice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDRSAdviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDRSAdviceAction() + def queryUserTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryUserTagAction.class) Closure c) { + def a = new org.zstack.sdk.QueryUserTagAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26268,8 +25403,8 @@ abstract class ApiHelper { } - def queryDRSVmMigrationActivity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDRSVmMigrationActivityAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDRSVmMigrationActivityAction() + def queryVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVCenterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26297,8 +25432,8 @@ abstract class ApiHelper { } - def queryDataCenterFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDataCenterFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDataCenterFromLocalAction() + def queryVCenterBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVCenterBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26326,8 +25461,8 @@ abstract class ApiHelper { } - def queryDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDirectoryAction() + def queryVCenterCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterClusterAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVCenterClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26355,8 +25490,8 @@ abstract class ApiHelper { } - def queryDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDiskOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDiskOfferingAction() + def queryVCenterDatacenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterDatacenterAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVCenterDatacenterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26384,8 +25519,8 @@ abstract class ApiHelper { } - def queryEcsImageFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEcsImageFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEcsImageFromLocalAction() + def queryVCenterPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVCenterPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26413,8 +25548,8 @@ abstract class ApiHelper { } - def queryEcsInstanceFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEcsInstanceFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEcsInstanceFromLocalAction() + def queryVCenterResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVCenterResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26442,66 +25577,8 @@ abstract class ApiHelper { } - def queryEcsSecurityGroupFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEcsSecurityGroupFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEcsSecurityGroupFromLocalAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def queryEcsSecurityGroupRuleFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEcsSecurityGroupRuleFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEcsSecurityGroupRuleFromLocalAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def queryEcsVSwitchFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEcsVSwitchFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEcsVSwitchFromLocalAction() + def queryVRouterFlowMeterNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterFlowMeterNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVRouterFlowMeterNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26529,8 +25606,8 @@ abstract class ApiHelper { } - def queryEcsVpcFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEcsVpcFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEcsVpcFromLocalAction() + def queryVRouterOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterOspfAreaAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVRouterOspfAreaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26558,8 +25635,8 @@ abstract class ApiHelper { } - def queryEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEipAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEipAction() + def queryVRouterOspfNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterOspfNetworkAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVRouterOspfNetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26587,8 +25664,8 @@ abstract class ApiHelper { } - def queryEmailMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEmailMediaAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEmailMediaAction() + def queryVRouterRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterRouteEntryAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVRouterRouteEntryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26616,8 +25693,8 @@ abstract class ApiHelper { } - def queryEmailTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEmailTriggerActionAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEmailTriggerActionAction() + def queryVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterRouteTableAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVRouterRouteTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26645,8 +25722,8 @@ abstract class ApiHelper { } - def queryEthernetVF(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEthernetVFAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEthernetVFAction() + def queryVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVipAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26674,8 +25751,8 @@ abstract class ApiHelper { } - def queryEventFromResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEventFromResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEventFromResourceStackAction() + def queryVirtualRouterOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVirtualRouterOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVirtualRouterOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26703,8 +25780,8 @@ abstract class ApiHelper { } - def queryEventLog(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEventLogAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEventLogAction() + def queryVirtualRouterVRouterRouteTableRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVirtualRouterVRouterRouteTableRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVirtualRouterVRouterRouteTableRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26732,8 +25809,8 @@ abstract class ApiHelper { } - def queryExponBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryExponBlockVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryExponBlockVolumeAction() + def queryVirtualRouterVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVirtualRouterVmAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVirtualRouterVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26761,8 +25838,8 @@ abstract class ApiHelper { } - def queryExternalBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryExternalBackupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryExternalBackupAction() + def queryVmCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmCdRomAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmCdRomAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26790,8 +25867,8 @@ abstract class ApiHelper { } - def queryFaultToleranceVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFaultToleranceVmAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFaultToleranceVmAction() + def queryVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26819,8 +25896,8 @@ abstract class ApiHelper { } - def queryFcHbaDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFcHbaDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFcHbaDeviceAction() + def queryVmInstanceMdevDeviceSpecRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmInstanceMdevDeviceSpecRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmInstanceMdevDeviceSpecRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26848,8 +25925,8 @@ abstract class ApiHelper { } - def queryFiberChannelLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFiberChannelLunAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFiberChannelLunAction() + def queryVmInstancePciDeviceSpecRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmInstancePciDeviceSpecRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmInstancePciDeviceSpecRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26877,8 +25954,8 @@ abstract class ApiHelper { } - def queryFiberChannelStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFiberChannelStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFiberChannelStorageAction() + def queryVmInstanceResourceMetadataArchive(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmInstanceResourceMetadataArchiveAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmInstanceResourceMetadataArchiveAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26906,8 +25983,8 @@ abstract class ApiHelper { } - def queryFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallIpSetTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallIpSetTemplateAction() + def queryVmInstanceResourceMetadataGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmInstanceResourceMetadataGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmInstanceResourceMetadataGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26935,8 +26012,8 @@ abstract class ApiHelper { } - def queryFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallRuleAction() + def queryVmNic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmNicAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmNicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26964,8 +26041,8 @@ abstract class ApiHelper { } - def queryFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallRuleSetAction() + def queryVmNicInSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmNicInSecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmNicInSecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -26993,8 +26070,8 @@ abstract class ApiHelper { } - def queryFirewallRuleSetL3Ref(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleSetL3RefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallRuleSetL3RefAction() + def queryVmNicSecurityPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmNicSecurityPolicyAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmNicSecurityPolicyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27022,8 +26099,8 @@ abstract class ApiHelper { } - def queryFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallRuleTemplateAction() + def queryVmPriorityConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmPriorityConfigAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmPriorityConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27051,8 +26128,8 @@ abstract class ApiHelper { } - def queryFlowCollector(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFlowCollectorAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFlowCollectorAction() + def queryVmSchedHistory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmSchedHistoryAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmSchedHistoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27080,8 +26157,8 @@ abstract class ApiHelper { } - def queryFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFlowMeterAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFlowMeterAction() + def queryVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmSchedulingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmSchedulingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27109,8 +26186,8 @@ abstract class ApiHelper { } - def queryGCJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGCJobAction.class) Closure c) { - def a = new org.zstack.sdk.QueryGCJobAction() + def queryVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVmSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27138,8 +26215,8 @@ abstract class ApiHelper { } - def queryGlobalConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGlobalConfigAction.class) Closure c) { - def a = new org.zstack.sdk.QueryGlobalConfigAction() + def queryVniRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVniRangeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVniRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27167,8 +26244,8 @@ abstract class ApiHelper { } - def queryGlobalConfigTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGlobalConfigTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryGlobalConfigTemplateAction() + def queryVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27196,8 +26273,8 @@ abstract class ApiHelper { } - def queryGpuDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGpuDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryGpuDeviceAction() + def queryVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27225,8 +26302,8 @@ abstract class ApiHelper { } - def queryGuestToolsState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryGuestToolsStateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryGuestToolsStateAction() + def queryVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVolumeSnapshotGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVolumeSnapshotGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27254,8 +26331,8 @@ abstract class ApiHelper { } - def queryHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostAction() + def queryVolumeSnapshotTree(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVolumeSnapshotTreeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVolumeSnapshotTreeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27283,8 +26360,8 @@ abstract class ApiHelper { } - def queryHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostKernelInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostKernelInterfaceAction() + def queryVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcFirewallAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVpcFirewallAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27312,8 +26389,8 @@ abstract class ApiHelper { } - def queryHostNetworkBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostNetworkBondingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostNetworkBondingAction() + def queryVpcFirewallVRouterRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcFirewallVRouterRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVpcFirewallVRouterRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27341,8 +26418,8 @@ abstract class ApiHelper { } - def queryHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostNetworkInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostNetworkInterfaceAction() + def queryVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcHaGroupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVpcHaGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27370,8 +26447,8 @@ abstract class ApiHelper { } - def queryHostNetworkInterfaceLldp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostNetworkInterfaceLldpAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostNetworkInterfaceLldpAction() + def queryVpcHaGroupNetworkServiceRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcHaGroupNetworkServiceRefAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVpcHaGroupNetworkServiceRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27399,8 +26476,8 @@ abstract class ApiHelper { } - def queryHostOsCategory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostOsCategoryAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostOsCategoryAction() + def queryVpcRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcRouterAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVpcRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27428,8 +26505,8 @@ abstract class ApiHelper { } - def queryHostPhysicalCpu(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostPhysicalCpuAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostPhysicalCpuAction() + def queryVpcSnatState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcSnatStateAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVpcSnatStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27457,8 +26534,8 @@ abstract class ApiHelper { } - def queryHostPhysicalMemory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostPhysicalMemoryAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostPhysicalMemoryAction() + def queryVtep(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVtepAction.class) Closure c) { + def a = new org.zstack.sdk.QueryVtepAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27486,8 +26563,8 @@ abstract class ApiHelper { } - def queryHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHostSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHostSchedulingRuleGroupAction() + def queryWebhook(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryWebhookAction.class) Closure c) { + def a = new org.zstack.sdk.QueryWebhookAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27515,8 +26592,8 @@ abstract class ApiHelper { } - def queryHybridEipFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHybridEipFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHybridEipFromLocalAction() + def queryXskyBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryXskyBlockVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryXskyBlockVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27544,8 +26621,8 @@ abstract class ApiHelper { } - def queryHybridKeySecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryHybridKeySecretAction.class) Closure c) { - def a = new org.zstack.sdk.QueryHybridKeySecretAction() + def queryZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryZoneAction.class) Closure c) { + def a = new org.zstack.sdk.QueryZoneAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -27573,15 +26650,13 @@ abstract class ApiHelper { } - def queryIPSecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIPSecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.QueryIPSecConnectionAction() + def rebootBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RebootBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.RebootBaremetalInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27602,15 +26677,13 @@ abstract class ApiHelper { } - def queryIdentityZoneFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIdentityZoneFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryIdentityZoneFromLocalAction() + def rebootVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RebootVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.RebootVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27631,15 +26704,13 @@ abstract class ApiHelper { } - def queryImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryImageAction() + def reclaimSpaceFromImageStore(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReclaimSpaceFromImageStoreAction.class) Closure c) { + def a = new org.zstack.sdk.ReclaimSpaceFromImageStoreAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27660,15 +26731,13 @@ abstract class ApiHelper { } - def queryImageCache(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImageCacheAction.class) Closure c) { - def a = new org.zstack.sdk.QueryImageCacheAction() + def reconnectBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27689,15 +26758,13 @@ abstract class ApiHelper { } - def queryImagePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImagePackageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryImagePackageAction() + def reconnectBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectBaremetalPxeServerAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectBaremetalPxeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27718,15 +26785,13 @@ abstract class ApiHelper { } - def queryImageReplicationGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImageReplicationGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryImageReplicationGroupAction() + def reconnectConsoleProxyAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectConsoleProxyAgentAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectConsoleProxyAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27747,15 +26812,13 @@ abstract class ApiHelper { } - def queryImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryImageStoreBackupStorageAction() + def reconnectHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectHostAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27776,15 +26839,13 @@ abstract class ApiHelper { } - def queryInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryInstanceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryInstanceOfferingAction() + def reconnectIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27805,15 +26866,13 @@ abstract class ApiHelper { } - def queryIpAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIpAddressAction.class) Closure c) { - def a = new org.zstack.sdk.QueryIpAddressAction() + def reconnectImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27834,15 +26893,13 @@ abstract class ApiHelper { } - def queryIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIpRangeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryIpRangeAction() + def reconnectPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27863,15 +26920,13 @@ abstract class ApiHelper { } - def queryIscsiLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIscsiLunAction.class) Closure c) { - def a = new org.zstack.sdk.QueryIscsiLunAction() + def reconnectSftpBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectSftpBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectSftpBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27892,15 +26947,13 @@ abstract class ApiHelper { } - def queryIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryIscsiServerAction.class) Closure c) { - def a = new org.zstack.sdk.QueryIscsiServerAction() + def reconnectVirtualRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectVirtualRouterAction.class) Closure c) { + def a = new org.zstack.sdk.ReconnectVirtualRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27921,15 +26974,13 @@ abstract class ApiHelper { } - def queryKvmHypervisorInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryKvmHypervisorInfoAction.class) Closure c) { - def a = new org.zstack.sdk.QueryKvmHypervisorInfoAction() + def recoverBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.RecoverBaremetalInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27950,15 +27001,13 @@ abstract class ApiHelper { } - def queryL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryL2NetworkAction() + def recoverDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverDataVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.RecoverDataVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -27979,15 +27028,13 @@ abstract class ApiHelper { } - def queryL2PortGroupNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2PortGroupNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryL2PortGroupNetworkAction() + def recoverImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverImageAction.class) Closure c) { + def a = new org.zstack.sdk.RecoverImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28008,15 +27055,13 @@ abstract class ApiHelper { } - def queryL2VirtualSwitchNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2VirtualSwitchNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryL2VirtualSwitchNetworkAction() + def recoverVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.RecoverVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28037,15 +27082,13 @@ abstract class ApiHelper { } - def queryL2VlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2VlanNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryL2VlanNetworkAction() + def recoveryImageFromImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoveryImageFromImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.RecoveryImageFromImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28066,15 +27109,13 @@ abstract class ApiHelper { } - def queryL2VxlanNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2VxlanNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryL2VxlanNetworkAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def refreshCaptcha(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshCaptchaAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshCaptchaAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28095,15 +27136,13 @@ abstract class ApiHelper { } - def queryL2VxlanNetworkPool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL2VxlanNetworkPoolAction.class) Closure c) { - def a = new org.zstack.sdk.QueryL2VxlanNetworkPoolAction() + def refreshFiberChannelStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshFiberChannelStorageAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshFiberChannelStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28124,15 +27163,13 @@ abstract class ApiHelper { } - def queryL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryL3NetworkAction() + def refreshFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshFirewallAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshFirewallAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28153,15 +27190,13 @@ abstract class ApiHelper { } - def queryLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.QueryLoadBalancerAction() + def refreshIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshIscsiServerAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshIscsiServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28182,15 +27217,13 @@ abstract class ApiHelper { } - def queryLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.QueryLoadBalancerListenerAction() + def refreshLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28211,15 +27244,13 @@ abstract class ApiHelper { } - def queryLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLoadBalancerServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryLoadBalancerServerGroupAction() + def refreshLocalRaid(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshLocalRaidAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshLocalRaidAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28240,15 +27271,13 @@ abstract class ApiHelper { } - def queryLocalRaidController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLocalRaidControllerAction.class) Closure c) { - def a = new org.zstack.sdk.QueryLocalRaidControllerAction() + def refreshNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshNvmeServerAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshNvmeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28269,15 +27298,13 @@ abstract class ApiHelper { } - def queryLocalRaidPhysicalDrive(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLocalRaidPhysicalDriveAction.class) Closure c) { - def a = new org.zstack.sdk.QueryLocalRaidPhysicalDriveAction() + def refreshNvmeTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshNvmeTargetAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshNvmeTargetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28298,15 +27325,13 @@ abstract class ApiHelper { } - def queryLocalStorageResourceRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLocalStorageResourceRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryLocalStorageResourceRefAction() + def refreshSearchIndexes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshSearchIndexesAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshSearchIndexesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28327,15 +27352,13 @@ abstract class ApiHelper { } - def queryLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryLongJobAction.class) Closure c) { - def a = new org.zstack.sdk.QueryLongJobAction() + def refreshSharedblockDeviceCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshSharedblockDeviceCapacityAction.class) Closure c) { + def a = new org.zstack.sdk.RefreshSharedblockDeviceCapacityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28356,15 +27379,13 @@ abstract class ApiHelper { } - def queryManagementNode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryManagementNodeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryManagementNodeAction() + def registerLicenseRequestedApplication(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RegisterLicenseRequestedApplicationAction.class) Closure c) { + def a = new org.zstack.sdk.RegisterLicenseRequestedApplicationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28385,15 +27406,13 @@ abstract class ApiHelper { } - def queryMdevDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMdevDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMdevDeviceAction() + def reimageVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReimageVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.ReimageVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28414,15 +27433,13 @@ abstract class ApiHelper { } - def queryMdevDeviceSpec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMdevDeviceSpecAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMdevDeviceSpecAction() + def reloadElaboration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReloadElaborationAction.class) Closure c) { + def a = new org.zstack.sdk.ReloadElaborationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28443,15 +27460,13 @@ abstract class ApiHelper { } - def queryMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMediaAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMediaAction() + def reloadExternalService(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReloadExternalServiceAction.class) Closure c) { + def a = new org.zstack.sdk.ReloadExternalServiceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28472,15 +27487,13 @@ abstract class ApiHelper { } - def queryMiniStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMiniStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMiniStorageAction() + def reloadLicense(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReloadLicenseAction.class) Closure c) { + def a = new org.zstack.sdk.ReloadLicenseAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28501,15 +27514,13 @@ abstract class ApiHelper { } - def queryMiniStorageHostRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMiniStorageHostRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMiniStorageHostRefAction() + def removeAccessControlListEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveAccessControlListEntryAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveAccessControlListEntryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28530,15 +27541,13 @@ abstract class ApiHelper { } - def queryMiniStorageResourceReplication(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMiniStorageResourceReplicationAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMiniStorageResourceReplicationAction() + def removeAccessControlListFromLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveAccessControlListFromLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveAccessControlListFromLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28559,15 +27568,13 @@ abstract class ApiHelper { } - def queryMonitorTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMonitorTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMonitorTriggerAction() + def removeBackendServerFromServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveBackendServerFromServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveBackendServerFromServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28588,15 +27595,13 @@ abstract class ApiHelper { } - def queryMonitorTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMonitorTriggerActionAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMonitorTriggerActionAction() + def removeCertificateFromLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveCertificateFromLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveCertificateFromLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28617,15 +27622,13 @@ abstract class ApiHelper { } - def queryMttyDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMttyDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMttyDeviceAction() + def removeDnsFromL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveDnsFromL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveDnsFromL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28646,15 +27649,13 @@ abstract class ApiHelper { } - def queryMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryMulticastRouterAction.class) Closure c) { - def a = new org.zstack.sdk.QueryMulticastRouterAction() + def removeDnsFromVpcRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveDnsFromVpcRouterAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveDnsFromVpcRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28675,15 +27676,13 @@ abstract class ApiHelper { } - def queryNasFileSystem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNasFileSystemAction.class) Closure c) { - def a = new org.zstack.sdk.QueryNasFileSystemAction() + def removeHostRouteFromL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveHostRouteFromL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveHostRouteFromL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28704,15 +27703,13 @@ abstract class ApiHelper { } - def queryNasMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNasMountTargetAction.class) Closure c) { - def a = new org.zstack.sdk.QueryNasMountTargetAction() + def removeMdevDeviceSpecFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveMdevDeviceSpecFromVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveMdevDeviceSpecFromVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28733,15 +27730,13 @@ abstract class ApiHelper { } - def queryNetworkServiceL3NetworkRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNetworkServiceL3NetworkRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryNetworkServiceL3NetworkRefAction() + def removeMonFromCephBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveMonFromCephBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveMonFromCephBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28762,15 +27757,13 @@ abstract class ApiHelper { } - def queryNetworkServiceProvider(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNetworkServiceProviderAction.class) Closure c) { - def a = new org.zstack.sdk.QueryNetworkServiceProviderAction() + def removeMonFromCephPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveMonFromCephPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveMonFromCephPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28791,15 +27784,13 @@ abstract class ApiHelper { } - def queryNvmeLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNvmeLunAction.class) Closure c) { - def a = new org.zstack.sdk.QueryNvmeLunAction() + def removePciDeviceSpecFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemovePciDeviceSpecFromVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.RemovePciDeviceSpecFromVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28820,15 +27811,13 @@ abstract class ApiHelper { } - def queryNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNvmeServerAction.class) Closure c) { - def a = new org.zstack.sdk.QueryNvmeServerAction() + def removeRemoteCidrsFromIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveRemoteCidrsFromIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveRemoteCidrsFromIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28849,15 +27838,13 @@ abstract class ApiHelper { } - def queryNvmeTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryNvmeTargetAction.class) Closure c) { - def a = new org.zstack.sdk.QueryNvmeTargetAction() + def removeRendezvousPointFromMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveRendezvousPointFromMulticastRouterAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveRendezvousPointFromMulticastRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28878,15 +27865,13 @@ abstract class ApiHelper { } - def queryOssBucketFileName(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryOssBucketFileNameAction.class) Closure c) { - def a = new org.zstack.sdk.QueryOssBucketFileNameAction() + def removeResourcesFromDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveResourcesFromDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveResourcesFromDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28907,15 +27892,13 @@ abstract class ApiHelper { } - def queryPciDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPciDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPciDeviceAction() + def removeSchedulerJobFromSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveSchedulerJobFromSchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveSchedulerJobFromSchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28936,15 +27919,13 @@ abstract class ApiHelper { } - def queryPciDeviceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPciDeviceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPciDeviceOfferingAction() + def removeSchedulerJobGroupFromSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveSchedulerJobGroupFromSchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveSchedulerJobGroupFromSchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28965,15 +27946,13 @@ abstract class ApiHelper { } - def queryPciDevicePciDeviceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPciDevicePciDeviceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPciDevicePciDeviceOfferingAction() + def removeSchedulerJobsFromSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveSchedulerJobsFromSchedulerJobGroupAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveSchedulerJobsFromSchedulerJobGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -28994,15 +27973,13 @@ abstract class ApiHelper { } - def queryPciDeviceSpec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPciDeviceSpecAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPciDeviceSpecAction() + def removeSdnController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveSdnControllerAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveSdnControllerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29023,15 +28000,13 @@ abstract class ApiHelper { } - def queryPhysicalDriveSelfTestHistory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPhysicalDriveSelfTestHistoryAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPhysicalDriveSelfTestHistoryAction() + def removeServerGroupFromLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveServerGroupFromLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveServerGroupFromLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29052,15 +28027,13 @@ abstract class ApiHelper { } - def queryPolicyRouteRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteRuleAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPolicyRouteRuleAction() + def removeVRouterNetworksFromFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVRouterNetworksFromFlowMeterAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveVRouterNetworksFromFlowMeterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29081,15 +28054,13 @@ abstract class ApiHelper { } - def queryPolicyRouteRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPolicyRouteRuleSetAction() + def removeVRouterNetworksFromOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVRouterNetworksFromOspfAreaAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveVRouterNetworksFromOspfAreaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29110,15 +28081,13 @@ abstract class ApiHelper { } - def queryPolicyRouteRuleSetL3Ref(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteRuleSetL3RefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPolicyRouteRuleSetL3RefAction() + def removeVmFromAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVmFromAffinityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveVmFromAffinityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29139,15 +28108,13 @@ abstract class ApiHelper { } - def queryPolicyRouteRuleSetVRouterRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteRuleSetVRouterRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPolicyRouteRuleSetVRouterRefAction() + def removeVmNicFromLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVmNicFromLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveVmNicFromLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29168,15 +28135,13 @@ abstract class ApiHelper { } - def queryPolicyRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteTableAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPolicyRouteTableAction() + def removeVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVmSchedulingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.RemoveVmSchedulingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29197,15 +28162,13 @@ abstract class ApiHelper { } - def queryPolicyRouteTableRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteTableRouteEntryAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPolicyRouteTableRouteEntryAction() + def renewSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RenewSessionAction.class) Closure c) { + def a = new org.zstack.sdk.RenewSessionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29226,15 +28189,13 @@ abstract class ApiHelper { } - def queryPolicyRouteTableVRouterRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPolicyRouteTableVRouterRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPolicyRouteTableVRouterRefAction() + def requestConsoleAccess(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RequestConsoleAccessAction.class) Closure c) { + def a = new org.zstack.sdk.RequestConsoleAccessAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29255,15 +28216,13 @@ abstract class ApiHelper { } - def queryPortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortForwardingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPortForwardingRuleAction() + def rerunLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RerunLongJobAction.class) Closure c) { + def a = new org.zstack.sdk.RerunLongJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29284,15 +28243,13 @@ abstract class ApiHelper { } - def queryPortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPortGroupAction() + def resetGlobalConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResetGlobalConfigAction.class) Closure c) { + def a = new org.zstack.sdk.ResetGlobalConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29313,15 +28270,13 @@ abstract class ApiHelper { } - def queryPortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortMirrorAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPortMirrorAction() + def resetTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResetTemplateConfigAction.class) Closure c) { + def a = new org.zstack.sdk.ResetTemplateConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29342,15 +28297,13 @@ abstract class ApiHelper { } - def queryPortMirrorNetworkUsedIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortMirrorNetworkUsedIpAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPortMirrorNetworkUsedIpAction() + def resetTwoFactorAuthenticationSecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResetTwoFactorAuthenticationSecretAction.class) Closure c) { + def a = new org.zstack.sdk.ResetTwoFactorAuthenticationSecretAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29371,15 +28324,13 @@ abstract class ApiHelper { } - def queryPortMirrorSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPortMirrorSessionAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPortMirrorSessionAction() + def resizeDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResizeDataVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.ResizeDataVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29400,15 +28351,13 @@ abstract class ApiHelper { } - def queryPreconfigurationTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPreconfigurationTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPreconfigurationTemplateAction() + def resizeRootVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResizeRootVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.ResizeRootVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29429,15 +28378,13 @@ abstract class ApiHelper { } - def queryPriceTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPriceTableAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPriceTableAction() + def restartResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RestartResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.RestartResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29458,15 +28405,13 @@ abstract class ApiHelper { } - def queryPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryPrimaryStorageAction() + def resumeLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResumeLongJobAction.class) Closure c) { + def a = new org.zstack.sdk.ResumeLongJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29487,15 +28432,13 @@ abstract class ApiHelper { } - def queryQuota(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryQuotaAction.class) Closure c) { - def a = new org.zstack.sdk.QueryQuotaAction() + def resumeVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResumeVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.ResumeVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29516,15 +28459,13 @@ abstract class ApiHelper { } - def queryResourceConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryResourceConfigAction.class) Closure c) { - def a = new org.zstack.sdk.QueryResourceConfigAction() + def revertTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevertTemplateConfigAction.class) Closure c) { + def a = new org.zstack.sdk.RevertTemplateConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29545,15 +28486,13 @@ abstract class ApiHelper { } - def queryResourcePrice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryResourcePriceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryResourcePriceAction() + def revertVmFromCdpBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevertVmFromCdpBackupAction.class) Closure c) { + def a = new org.zstack.sdk.RevertVmFromCdpBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29574,15 +28513,13 @@ abstract class ApiHelper { } - def queryResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.QueryResourceStackAction() + def revertVmFromSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevertVmFromSnapshotGroupAction.class) Closure c) { + def a = new org.zstack.sdk.RevertVmFromSnapshotGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29603,15 +28540,13 @@ abstract class ApiHelper { } - def querySchedulerJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySchedulerJobAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySchedulerJobAction() + def revertVolumeFromSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevertVolumeFromSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.RevertVolumeFromSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29632,15 +28567,13 @@ abstract class ApiHelper { } - def querySchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySchedulerJobGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySchedulerJobGroupAction() + def revokeResourceSharing(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevokeResourceSharingAction.class) Closure c) { + def a = new org.zstack.sdk.RevokeResourceSharingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29661,15 +28594,13 @@ abstract class ApiHelper { } - def querySchedulerJobHistory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySchedulerJobHistoryAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySchedulerJobHistoryAction() + def runSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RunSchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.RunSchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29690,15 +28621,13 @@ abstract class ApiHelper { } - def querySchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySchedulerTriggerAction() + def securityMachineDetectSync(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SecurityMachineDetectSyncAction.class) Closure c) { + def a = new org.zstack.sdk.SecurityMachineDetectSyncAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29719,15 +28648,13 @@ abstract class ApiHelper { } - def queryScsiLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryScsiLunAction.class) Closure c) { - def a = new org.zstack.sdk.QueryScsiLunAction() + def securityMachineEncrypt(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SecurityMachineEncryptAction.class) Closure c) { + def a = new org.zstack.sdk.SecurityMachineEncryptAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29748,15 +28675,13 @@ abstract class ApiHelper { } - def querySdnController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySdnControllerAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySdnControllerAction() + def selfTestLocalRaid(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SelfTestLocalRaidAction.class) Closure c) { + def a = new org.zstack.sdk.SelfTestLocalRaidAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29777,15 +28702,13 @@ abstract class ApiHelper { } - def querySecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySecretResourcePoolAction() + def setFlowMeterRouterId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetFlowMeterRouterIdAction.class) Closure c) { + def a = new org.zstack.sdk.SetFlowMeterRouterIdAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29806,15 +28729,13 @@ abstract class ApiHelper { } - def querySecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySecurityGroupAction() + def setImageBootMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetImageBootModeAction.class) Closure c) { + def a = new org.zstack.sdk.SetImageBootModeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29835,15 +28756,13 @@ abstract class ApiHelper { } - def querySecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySecurityGroupRuleAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySecurityGroupRuleAction() + def setImageQga(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetImageQgaAction.class) Closure c) { + def a = new org.zstack.sdk.SetImageQgaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29864,15 +28783,13 @@ abstract class ApiHelper { } - def querySecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySecurityMachineAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySecurityMachineAction() + def setImageSecurityLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetImageSecurityLevelAction.class) Closure c) { + def a = new org.zstack.sdk.SetImageSecurityLevelAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29893,15 +28810,13 @@ abstract class ApiHelper { } - def querySftpBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySftpBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySftpBackupStorageAction() + def setImageStoreBackupStorageQuota(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetImageStoreBackupStorageQuotaAction.class) Closure c) { + def a = new org.zstack.sdk.SetImageStoreBackupStorageQuotaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29922,15 +28837,13 @@ abstract class ApiHelper { } - def queryShareableVolumeVmInstanceRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryShareableVolumeVmInstanceRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryShareableVolumeVmInstanceRefAction() + def setIpOnHostNetworkBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetIpOnHostNetworkBondingAction.class) Closure c) { + def a = new org.zstack.sdk.SetIpOnHostNetworkBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29951,15 +28864,13 @@ abstract class ApiHelper { } - def querySharedBlock(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySharedBlockAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySharedBlockAction() + def setIpOnHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetIpOnHostNetworkInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.SetIpOnHostNetworkInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -29980,15 +28891,13 @@ abstract class ApiHelper { } - def querySharedBlockGroupPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySharedBlockGroupPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySharedBlockGroupPrimaryStorageAction() + def setL3NetworkMtu(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetL3NetworkMtuAction.class) Closure c) { + def a = new org.zstack.sdk.SetL3NetworkMtuAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30009,15 +28918,13 @@ abstract class ApiHelper { } - def querySharedBlockGroupPrimaryStorageHostRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySharedBlockGroupPrimaryStorageHostRefAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySharedBlockGroupPrimaryStorageHostRefAction() + def setL3NetworkRouterInterfaceIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetL3NetworkRouterInterfaceIpAction.class) Closure c) { + def a = new org.zstack.sdk.SetL3NetworkRouterInterfaceIpAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30038,15 +28945,13 @@ abstract class ApiHelper { } - def querySlbGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySlbGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySlbGroupAction() + def setNicQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetNicQosAction.class) Closure c) { + def a = new org.zstack.sdk.SetNicQosAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30067,15 +28972,13 @@ abstract class ApiHelper { } - def querySlbOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySlbOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySlbOfferingAction() + def setSecurityMachineKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetSecurityMachineKeyAction.class) Closure c) { + def a = new org.zstack.sdk.SetSecurityMachineKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30096,15 +28999,13 @@ abstract class ApiHelper { } - def querySnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySnmpAgentAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySnmpAgentAction() + def setServiceTypeOnHostNetworkBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetServiceTypeOnHostNetworkBondingAction.class) Closure c) { + def a = new org.zstack.sdk.SetServiceTypeOnHostNetworkBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30125,15 +29026,13 @@ abstract class ApiHelper { } - def querySshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySshKeyPairAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySshKeyPairAction() + def setServiceTypeOnHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetServiceTypeOnHostNetworkInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.SetServiceTypeOnHostNetworkInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30154,15 +29053,13 @@ abstract class ApiHelper { } - def queryStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryStackTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryStackTemplateAction() + def setVRouterRouterId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVRouterRouterIdAction.class) Closure c) { + def a = new org.zstack.sdk.SetVRouterRouterIdAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30183,15 +29080,13 @@ abstract class ApiHelper { } - def querySystemTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QuerySystemTagAction.class) Closure c) { - def a = new org.zstack.sdk.QuerySystemTagAction() + def setVipQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVipQosAction.class) Closure c) { + def a = new org.zstack.sdk.SetVipQosAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30212,15 +29107,13 @@ abstract class ApiHelper { } - def queryTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryTagAction.class) Closure c) { - def a = new org.zstack.sdk.QueryTagAction() + def setVmBootMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmBootModeAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmBootModeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30241,15 +29134,13 @@ abstract class ApiHelper { } - def queryTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryTemplateConfigAction.class) Closure c) { - def a = new org.zstack.sdk.QueryTemplateConfigAction() + def setVmBootOrder(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmBootOrderAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmBootOrderAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30270,15 +29161,13 @@ abstract class ApiHelper { } - def queryTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryTemplatedVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryTemplatedVmInstanceAction() + def setVmBootVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmBootVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmBootVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30299,15 +29188,13 @@ abstract class ApiHelper { } - def queryTwoFactorAuthentication(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryTwoFactorAuthenticationAction.class) Closure c) { - def a = new org.zstack.sdk.QueryTwoFactorAuthenticationAction() + def setVmCleanTraffic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmCleanTrafficAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmCleanTrafficAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30328,15 +29215,13 @@ abstract class ApiHelper { } - def queryUplinkGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryUplinkGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryUplinkGroupAction() + def setVmClockTrack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmClockTrackAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmClockTrackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30357,15 +29242,13 @@ abstract class ApiHelper { } - def queryUsbDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryUsbDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryUsbDeviceAction() + def setVmConsoleMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmConsoleModeAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmConsoleModeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30386,15 +29269,13 @@ abstract class ApiHelper { } - def queryUserTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryUserTagAction.class) Closure c) { - def a = new org.zstack.sdk.QueryUserTagAction() + def setVmConsolePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmConsolePasswordAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmConsolePasswordAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30415,15 +29296,13 @@ abstract class ApiHelper { } - def queryVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVCenterAction() + def setVmDns(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmDnsAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmDnsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30444,15 +29323,13 @@ abstract class ApiHelper { } - def queryVCenterBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVCenterBackupStorageAction() + def setVmEmulatorPinning(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmEmulatorPinningAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmEmulatorPinningAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30473,15 +29350,13 @@ abstract class ApiHelper { } - def queryVCenterCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterClusterAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVCenterClusterAction() + def setVmHostname(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmHostnameAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmHostnameAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30502,15 +29377,13 @@ abstract class ApiHelper { } - def queryVCenterDatacenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterDatacenterAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVCenterDatacenterAction() + def setVmInstanceDefaultCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmInstanceDefaultCdRomAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmInstanceDefaultCdRomAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30531,15 +29404,13 @@ abstract class ApiHelper { } - def queryVCenterPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVCenterPrimaryStorageAction() + def setVmInstanceHaLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmInstanceHaLevelAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmInstanceHaLevelAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30560,15 +29431,13 @@ abstract class ApiHelper { } - def queryVCenterResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVCenterResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVCenterResourcePoolAction() + def setVmMonitorNumber(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmMonitorNumberAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmMonitorNumberAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30589,15 +29458,13 @@ abstract class ApiHelper { } - def queryVRouterFlowMeterNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterFlowMeterNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVRouterFlowMeterNetworkAction() + def setVmNicSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmNicSecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmNicSecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30618,15 +29485,13 @@ abstract class ApiHelper { } - def queryVRouterOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterOspfAreaAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVRouterOspfAreaAction() + def setVmNuma(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmNumaAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmNumaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30647,15 +29512,13 @@ abstract class ApiHelper { } - def queryVRouterOspfNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterOspfNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVRouterOspfNetworkAction() + def setVmQga(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmQgaAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmQgaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30676,15 +29539,13 @@ abstract class ApiHelper { } - def queryVRouterRouteEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterRouteEntryAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVRouterRouteEntryAction() + def setVmQxlMemory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmQxlMemoryAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmQxlMemoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30705,15 +29566,13 @@ abstract class ApiHelper { } - def queryVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVRouterRouteTableAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVRouterRouteTableAction() + def setVmRDP(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmRDPAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmRDPAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30734,15 +29593,13 @@ abstract class ApiHelper { } - def queryVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVipAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVipAction() + def setVmSecurityLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmSecurityLevelAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmSecurityLevelAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30763,15 +29620,13 @@ abstract class ApiHelper { } - def queryVirtualBorderRouterFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVirtualBorderRouterFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVirtualBorderRouterFromLocalAction() + def setVmSoundType(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmSoundTypeAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmSoundTypeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30792,15 +29647,13 @@ abstract class ApiHelper { } - def queryVirtualRouterOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVirtualRouterOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVirtualRouterOfferingAction() + def setVmSshKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmSshKeyAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmSshKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30821,15 +29674,40 @@ abstract class ApiHelper { } - def queryVirtualRouterVRouterRouteTableRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVirtualRouterVRouterRouteTableRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVirtualRouterVRouterRouteTableRefAction() + def setVmStaticIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmStaticIpAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmStaticIpAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { + if (a.apiId == null) { + a.apiId = Platform.uuid + } + + def tracker = new ApiPathTracker(a.apiId) + def out = errorOut(a.call()) + def path = tracker.getApiPath() + if (!path.isEmpty()) { + Test.apiPaths[a.class.name] = path.join(" --->\n") + } + + return out + } else { + return errorOut(a.call()) + } + } + + + def setVmUsbRedirect(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmUsbRedirectAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmUsbRedirectAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid + c.resolveStrategy = Closure.OWNER_FIRST + c.delegate = a + c() + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30850,15 +29728,40 @@ abstract class ApiHelper { } - def queryVirtualRouterVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVirtualRouterVmAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVirtualRouterVmAction() + def setVmUserDefinedXml(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmUserDefinedXmlAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmUserDefinedXmlAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { + if (a.apiId == null) { + a.apiId = Platform.uuid + } + + def tracker = new ApiPathTracker(a.apiId) + def out = errorOut(a.call()) + def path = tracker.getApiPath() + if (!path.isEmpty()) { + Test.apiPaths[a.class.name] = path.join(" --->\n") + } + + return out + } else { + return errorOut(a.call()) + } + } + + + def setVmUserDefinedXmlHookScript(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmUserDefinedXmlHookScriptAction.class) Closure c) { + def a = new org.zstack.sdk.SetVmUserDefinedXmlHookScriptAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid + c.resolveStrategy = Closure.OWNER_FIRST + c.delegate = a + c() + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30879,15 +29782,40 @@ abstract class ApiHelper { } - def queryVmCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmCdRomAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmCdRomAction() + def setVolumeIoThreadPin(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVolumeIoThreadPinAction.class) Closure c) { + def a = new org.zstack.sdk.SetVolumeIoThreadPinAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { + if (a.apiId == null) { + a.apiId = Platform.uuid + } + + def tracker = new ApiPathTracker(a.apiId) + def out = errorOut(a.call()) + def path = tracker.getApiPath() + if (!path.isEmpty()) { + Test.apiPaths[a.class.name] = path.join(" --->\n") + } + + return out + } else { + return errorOut(a.call()) + } + } + + + def setVolumeQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVolumeQosAction.class) Closure c) { + def a = new org.zstack.sdk.SetVolumeQosAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid + c.resolveStrategy = Closure.OWNER_FIRST + c.delegate = a + c() + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30908,16 +29836,41 @@ abstract class ApiHelper { } - def queryVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmInstanceAction() + def setVpcVRouterDistributedRoutingEnabled(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVpcVRouterDistributedRoutingEnabledAction.class) Closure c) { + def a = new org.zstack.sdk.SetVpcVRouterDistributedRoutingEnabledAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } + + if (System.getProperty("apipath") != null) { + if (a.apiId == null) { + a.apiId = Platform.uuid + } + + def tracker = new ApiPathTracker(a.apiId) + def out = errorOut(a.call()) + def path = tracker.getApiPath() + if (!path.isEmpty()) { + Test.apiPaths[a.class.name] = path.join(" --->\n") + } + + return out + } else { + return errorOut(a.call()) + } + } + def setVpcVRouterNetworkServiceState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVpcVRouterNetworkServiceStateAction.class) Closure c) { + def a = new org.zstack.sdk.SetVpcVRouterNetworkServiceStateAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid + c.resolveStrategy = Closure.OWNER_FIRST + c.delegate = a + c() + + if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid @@ -30937,15 +29890,40 @@ abstract class ApiHelper { } - def queryVmInstanceResourceMetadataArchive(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = QueryVmInstanceResourceMetadataArchiveAction.class) Closure c) { - def a = new QueryVmInstanceResourceMetadataArchiveAction() + def shareResource(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ShareResourceAction.class) Closure c) { + def a = new org.zstack.sdk.ShareResourceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { + if (a.apiId == null) { + a.apiId = Platform.uuid + } + + def tracker = new ApiPathTracker(a.apiId) + def out = errorOut(a.call()) + def path = tracker.getApiPath() + if (!path.isEmpty()) { + Test.apiPaths[a.class.name] = path.join(" --->\n") + } + + return out + } else { + return errorOut(a.call()) + } + } + + + def shrinkVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ShrinkVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.ShrinkVolumeSnapshotAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid + c.resolveStrategy = Closure.OWNER_FIRST + c.delegate = a + c() + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30966,15 +29944,40 @@ abstract class ApiHelper { } - def queryVmInstanceResourceMetadataGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = QueryVmInstanceResourceMetadataGroupAction.class) Closure c) { - def a = new QueryVmInstanceResourceMetadataGroupAction() + def shutdownHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ShutdownHostAction.class) Closure c) { + def a = new org.zstack.sdk.ShutdownHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { + if (a.apiId == null) { + a.apiId = Platform.uuid + } + + def tracker = new ApiPathTracker(a.apiId) + def out = errorOut(a.call()) + def path = tracker.getApiPath() + if (!path.isEmpty()) { + Test.apiPaths[a.class.name] = path.join(" --->\n") + } + + return out + } else { + return errorOut(a.call()) + } + } + + + def startBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.StartBaremetalInstanceAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid + c.resolveStrategy = Closure.OWNER_FIRST + c.delegate = a + c() + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -30995,15 +29998,13 @@ abstract class ApiHelper { } - def queryVmInstanceMdevDeviceSpecRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmInstanceMdevDeviceSpecRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmInstanceMdevDeviceSpecRefAction() + def startBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartBaremetalPxeServerAction.class) Closure c) { + def a = new org.zstack.sdk.StartBaremetalPxeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31024,15 +30025,13 @@ abstract class ApiHelper { } - def queryVmInstancePciDeviceSpecRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmInstancePciDeviceSpecRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmInstancePciDeviceSpecRefAction() + def startDataProtection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartDataProtectionAction.class) Closure c) { + def a = new org.zstack.sdk.StartDataProtectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31053,15 +30052,13 @@ abstract class ApiHelper { } - def queryVmNic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmNicAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmNicAction() + def startSnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartSnmpAgentAction.class) Closure c) { + def a = new org.zstack.sdk.StartSnmpAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31082,15 +30079,13 @@ abstract class ApiHelper { } - def queryVmNicInSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmNicInSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmNicInSecurityGroupAction() + def startVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.StartVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31111,15 +30106,13 @@ abstract class ApiHelper { } - def queryVmNicSecurityPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmNicSecurityPolicyAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmNicSecurityPolicyAction() + def stopBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.StopBaremetalInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31140,15 +30133,13 @@ abstract class ApiHelper { } - def queryVmPriorityConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmPriorityConfigAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmPriorityConfigAction() + def stopBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopBaremetalPxeServerAction.class) Closure c) { + def a = new org.zstack.sdk.StopBaremetalPxeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31169,15 +30160,13 @@ abstract class ApiHelper { } - def queryVmSchedHistory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmSchedHistoryAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmSchedHistoryAction() + def stopSnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopSnmpAgentAction.class) Closure c) { + def a = new org.zstack.sdk.StopSnmpAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31198,15 +30187,13 @@ abstract class ApiHelper { } - def queryVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmSchedulingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmSchedulingRuleAction() + def stopVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.StopVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31227,15 +30214,13 @@ abstract class ApiHelper { } - def queryVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVmSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVmSchedulingRuleGroupAction() + def submitLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SubmitLongJobAction.class) Closure c) { + def a = new org.zstack.sdk.SubmitLongJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31256,15 +30241,13 @@ abstract class ApiHelper { } - def queryVniRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVniRangeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVniRangeAction() + def syncChronyServers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncChronyServersAction.class) Closure c) { + def a = new org.zstack.sdk.SyncChronyServersAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31285,15 +30268,13 @@ abstract class ApiHelper { } - def queryVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVolumeAction() + def syncImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncImageAction.class) Closure c) { + def a = new org.zstack.sdk.SyncImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31314,15 +30295,13 @@ abstract class ApiHelper { } - def queryVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVolumeSnapshotAction() + def syncImageFromImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncImageFromImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.SyncImageFromImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31343,15 +30322,13 @@ abstract class ApiHelper { } - def queryVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVolumeSnapshotGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVolumeSnapshotGroupAction() + def syncImageSize(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncImageSizeAction.class) Closure c) { + def a = new org.zstack.sdk.SyncImageSizeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31372,15 +30349,13 @@ abstract class ApiHelper { } - def queryVolumeSnapshotTree(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVolumeSnapshotTreeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVolumeSnapshotTreeAction() + def syncPrimaryStorageCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncPrimaryStorageCapacityAction.class) Closure c) { + def a = new org.zstack.sdk.SyncPrimaryStorageCapacityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31401,15 +30376,13 @@ abstract class ApiHelper { } - def queryVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcFirewallAction() + def syncVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVCenterAction.class) Closure c) { + def a = new org.zstack.sdk.SyncVCenterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31430,15 +30403,13 @@ abstract class ApiHelper { } - def queryVpcFirewallVRouterRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcFirewallVRouterRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcFirewallVRouterRefAction() + def syncVmClock(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVmClockAction.class) Closure c) { + def a = new org.zstack.sdk.SyncVmClockAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31459,15 +30430,13 @@ abstract class ApiHelper { } - def queryVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcHaGroupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcHaGroupAction() + def syncVolumeSize(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVolumeSizeAction.class) Closure c) { + def a = new org.zstack.sdk.SyncVolumeSizeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31488,44 +30457,13 @@ abstract class ApiHelper { } - def queryVpcHaGroupNetworkServiceRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcHaGroupNetworkServiceRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcHaGroupNetworkServiceRefAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def queryVpcIkeConfigFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcIkeConfigFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcIkeConfigFromLocalAction() + def takeVmConsoleScreenshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.TakeVmConsoleScreenshotAction.class) Closure c) { + def a = new org.zstack.sdk.TakeVmConsoleScreenshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31546,15 +30484,13 @@ abstract class ApiHelper { } - def queryVpcIpSecConfigFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcIpSecConfigFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcIpSecConfigFromLocalAction() + def triggerGCJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.TriggerGCJobAction.class) Closure c) { + def a = new org.zstack.sdk.TriggerGCJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31575,15 +30511,13 @@ abstract class ApiHelper { } - def queryVpcRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcRouterAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcRouterAction() + def undoSnapshotCreation(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UndoSnapshotCreationAction.class) Closure c) { + def a = new org.zstack.sdk.UndoSnapshotCreationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31604,15 +30538,13 @@ abstract class ApiHelper { } - def queryVpcSnatState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcSnatStateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcSnatStateAction() + def unexportNbdVolumes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UnexportNbdVolumesAction.class) Closure c) { + def a = new org.zstack.sdk.UnexportNbdVolumesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31633,15 +30565,13 @@ abstract class ApiHelper { } - def queryVpcUserVpnGatewayFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcUserVpnGatewayFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcUserVpnGatewayFromLocalAction() + def ungenerateMdevDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UngenerateMdevDevicesAction.class) Closure c) { + def a = new org.zstack.sdk.UngenerateMdevDevicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31662,15 +30592,13 @@ abstract class ApiHelper { } - def queryVpcVpnConnectionFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcVpnConnectionFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcVpnConnectionFromLocalAction() + def ungenerateSeMdevDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UngenerateSeMdevDevicesAction.class) Closure c) { + def a = new org.zstack.sdk.UngenerateSeMdevDevicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31691,15 +30619,13 @@ abstract class ApiHelper { } - def queryVpcVpnGatewayFromLocal(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcVpnGatewayFromLocalAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcVpnGatewayFromLocalAction() + def ungenerateSriovPciDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UngenerateSriovPciDevicesAction.class) Closure c) { + def a = new org.zstack.sdk.UngenerateSriovPciDevicesAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31720,15 +30646,13 @@ abstract class ApiHelper { } - def queryVtep(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVtepAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVtepAction() + def ungroupVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UngroupVolumeSnapshotGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UngroupVolumeSnapshotGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31749,15 +30673,13 @@ abstract class ApiHelper { } - def queryWebhook(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryWebhookAction.class) Closure c) { - def a = new org.zstack.sdk.QueryWebhookAction() + def unlockIdentity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UnlockIdentityAction.class) Closure c) { + def a = new org.zstack.sdk.UnlockIdentityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31778,15 +30700,13 @@ abstract class ApiHelper { } - def queryXskyBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryXskyBlockVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryXskyBlockVolumeAction() + def unmountVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UnmountVmInstanceRecoveryPointAction.class) Closure c) { + def a = new org.zstack.sdk.UnmountVmInstanceRecoveryPointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31807,15 +30727,13 @@ abstract class ApiHelper { } - def queryZBox(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryZBoxAction.class) Closure c) { - def a = new org.zstack.sdk.QueryZBoxAction() + def unprotectVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UnprotectVmInstanceRecoveryPointAction.class) Closure c) { + def a = new org.zstack.sdk.UnprotectVmInstanceRecoveryPointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31836,15 +30754,13 @@ abstract class ApiHelper { } - def queryZBoxBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryZBoxBackupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryZBoxBackupAction() + def updateAccessControlRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAccessControlRuleAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAccessControlRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31865,15 +30781,13 @@ abstract class ApiHelper { } - def queryZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryZoneAction.class) Closure c) { - def a = new org.zstack.sdk.QueryZoneAction() + def updateAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAccountAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -31894,8 +30808,8 @@ abstract class ApiHelper { } - def rebootBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RebootBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.RebootBaremetalInstanceAction() + def updateAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAffinityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAffinityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -31921,8 +30835,8 @@ abstract class ApiHelper { } - def rebootEcsInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RebootEcsInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.RebootEcsInstanceAction() + def updateAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAutoScalingGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -31948,8 +30862,8 @@ abstract class ApiHelper { } - def rebootVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RebootVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.RebootVmInstanceAction() + def updateAutoScalingGroupAddingNewInstanceRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingGroupAddingNewInstanceRuleAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAutoScalingGroupAddingNewInstanceRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -31975,8 +30889,8 @@ abstract class ApiHelper { } - def reclaimSpaceFromImageStore(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReclaimSpaceFromImageStoreAction.class) Closure c) { - def a = new org.zstack.sdk.ReclaimSpaceFromImageStoreAction() + def updateAutoScalingGroupInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingGroupInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAutoScalingGroupInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32002,8 +30916,8 @@ abstract class ApiHelper { } - def reconnectBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectBackupStorageAction() + def updateAutoScalingGroupRemovalInstanceRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingGroupRemovalInstanceRuleAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAutoScalingGroupRemovalInstanceRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32029,8 +30943,8 @@ abstract class ApiHelper { } - def reconnectBareMetal2Gateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectBareMetal2GatewayAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectBareMetal2GatewayAction() + def updateAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAutoScalingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32056,8 +30970,8 @@ abstract class ApiHelper { } - def reconnectBareMetal2Instance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectBareMetal2InstanceAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectBareMetal2InstanceAction() + def updateAutoScalingVmTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingVmTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateAutoScalingVmTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32083,8 +30997,8 @@ abstract class ApiHelper { } - def reconnectBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectBaremetalPxeServerAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectBaremetalPxeServerAction() + def updateBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32110,8 +31024,8 @@ abstract class ApiHelper { } - def reconnectConsoleProxyAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectConsoleProxyAgentAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectConsoleProxyAgentAction() + def updateBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32137,8 +31051,8 @@ abstract class ApiHelper { } - def reconnectHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectHostAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectHostAction() + def updateBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBaremetalInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateBaremetalInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32164,8 +31078,8 @@ abstract class ApiHelper { } - def reconnectIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectIPsecConnectionAction() + def updateBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBaremetalPxeServerAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateBaremetalPxeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32191,8 +31105,8 @@ abstract class ApiHelper { } - def reconnectImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectImageStoreBackupStorageAction() + def updateBlockPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBlockPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateBlockPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32218,8 +31132,8 @@ abstract class ApiHelper { } - def reconnectPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectPrimaryStorageAction() + def updateBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBlockVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateBlockVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32245,8 +31159,8 @@ abstract class ApiHelper { } - def reconnectSftpBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectSftpBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectSftpBackupStorageAction() + def updateBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBondingAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32272,8 +31186,8 @@ abstract class ApiHelper { } - def reconnectVirtualRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReconnectVirtualRouterAction.class) Closure c) { - def a = new org.zstack.sdk.ReconnectVirtualRouterAction() + def updateCCSCertificateAccountState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCCSCertificateAccountStateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateCCSCertificateAccountStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32299,8 +31213,8 @@ abstract class ApiHelper { } - def recoverBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.RecoverBaremetalInstanceAction() + def updateCasClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCasClientAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateCasClientAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32326,8 +31240,8 @@ abstract class ApiHelper { } - def recoverDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverDataVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.RecoverDataVolumeAction() + def updateCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCdpPolicyAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateCdpPolicyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32353,8 +31267,8 @@ abstract class ApiHelper { } - def recoverImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverImageAction.class) Closure c) { - def a = new org.zstack.sdk.RecoverImageAction() + def updateCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCdpTaskAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateCdpTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32380,8 +31294,8 @@ abstract class ApiHelper { } - def recoverResourceSplitBrain(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverResourceSplitBrainAction.class) Closure c) { - def a = new org.zstack.sdk.RecoverResourceSplitBrainAction() + def updateCephBackupStorageMon(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCephBackupStorageMonAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateCephBackupStorageMonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32407,8 +31321,8 @@ abstract class ApiHelper { } - def recoverVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoverVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.RecoverVmInstanceAction() + def updateCephPrimaryStorageMon(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCephPrimaryStorageMonAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateCephPrimaryStorageMonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32434,8 +31348,8 @@ abstract class ApiHelper { } - def recoveryImageFromImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoveryImageFromImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.RecoveryImageFromImageStoreBackupStorageAction() + def updateCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCephPrimaryStoragePoolAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateCephPrimaryStoragePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32461,8 +31375,8 @@ abstract class ApiHelper { } - def recoveryVirtualBorderRouterRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RecoveryVirtualBorderRouterRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.RecoveryVirtualBorderRouterRemoteAction() + def updateCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCertificateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateCertificateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32488,9 +31402,9 @@ abstract class ApiHelper { } - def refreshCaptcha(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshCaptchaAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshCaptchaAction() - + def updateChronyServers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateChronyServersAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateChronyServersAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -32515,8 +31429,8 @@ abstract class ApiHelper { } - def refreshFiberChannelStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshFiberChannelStorageAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshFiberChannelStorageAction() + def updateCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateClusterAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32542,8 +31456,8 @@ abstract class ApiHelper { } - def refreshFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshFirewallAction() + def updateClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateClusterDRSAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateClusterDRSAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32569,8 +31483,8 @@ abstract class ApiHelper { } - def refreshIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshIscsiServerAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshIscsiServerAction() + def updateClusterOS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateClusterOSAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateClusterOSAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32596,8 +31510,8 @@ abstract class ApiHelper { } - def refreshLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshLoadBalancerAction() + def updateConsoleProxyAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateConsoleProxyAgentAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateConsoleProxyAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32623,8 +31537,8 @@ abstract class ApiHelper { } - def refreshLocalRaid(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshLocalRaidAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshLocalRaidAction() + def updateDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32650,8 +31564,8 @@ abstract class ApiHelper { } - def refreshNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshNvmeServerAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshNvmeServerAction() + def updateDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateDiskOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateDiskOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32677,8 +31591,8 @@ abstract class ApiHelper { } - def refreshNvmeTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshNvmeTargetAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshNvmeTargetAction() + def updateEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEipAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32704,8 +31618,8 @@ abstract class ApiHelper { } - def refreshSearchIndexes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshSearchIndexesAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshSearchIndexesAction() + def updateEmailMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEmailMediaAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateEmailMediaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32731,8 +31645,8 @@ abstract class ApiHelper { } - def refreshSharedblockDeviceCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshSharedblockDeviceCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshSharedblockDeviceCapacityAction() + def updateEmailMonitorTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEmailMonitorTriggerActionAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateEmailMonitorTriggerActionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32758,8 +31672,8 @@ abstract class ApiHelper { } - def registerLicenseRequestedApplication(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RegisterLicenseRequestedApplicationAction.class) Closure c) { - def a = new org.zstack.sdk.RegisterLicenseRequestedApplicationAction() + def updateExternalPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateExternalPrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateExternalPrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32785,8 +31699,8 @@ abstract class ApiHelper { } - def reimageVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReimageVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.ReimageVmInstanceAction() + def updateFactoryModeState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFactoryModeStateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFactoryModeStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32812,8 +31726,8 @@ abstract class ApiHelper { } - def reloadElaboration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReloadElaborationAction.class) Closure c) { - def a = new org.zstack.sdk.ReloadElaborationAction() + def updateFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallIpSetTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFirewallIpSetTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32839,8 +31753,8 @@ abstract class ApiHelper { } - def reloadExternalService(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReloadExternalServiceAction.class) Closure c) { - def a = new org.zstack.sdk.ReloadExternalServiceAction() + def updateFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFirewallRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32866,8 +31780,8 @@ abstract class ApiHelper { } - def reloadLicense(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ReloadLicenseAction.class) Closure c) { - def a = new org.zstack.sdk.ReloadLicenseAction() + def updateFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleSetAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFirewallRuleSetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32893,8 +31807,8 @@ abstract class ApiHelper { } - def removeAccessControlListEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveAccessControlListEntryAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveAccessControlListEntryAction() + def updateFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFirewallRuleTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32920,8 +31834,8 @@ abstract class ApiHelper { } - def removeAccessControlListFromLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveAccessControlListFromLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveAccessControlListFromLoadBalancerAction() + def updateFlkSecSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFlkSecSecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFlkSecSecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32947,8 +31861,8 @@ abstract class ApiHelper { } - def removeBackendServerFromServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveBackendServerFromServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveBackendServerFromServerGroupAction() + def updateFlkSecSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFlkSecSecurityMachineAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFlkSecSecurityMachineAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -32974,8 +31888,8 @@ abstract class ApiHelper { } - def removeCertificateFromLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveCertificateFromLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveCertificateFromLoadBalancerListenerAction() + def updateFlowCollector(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFlowCollectorAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFlowCollectorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33001,8 +31915,8 @@ abstract class ApiHelper { } - def removeDnsFromL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveDnsFromL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveDnsFromL3NetworkAction() + def updateFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFlowMeterAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateFlowMeterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33028,8 +31942,8 @@ abstract class ApiHelper { } - def removeDnsFromVpcRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveDnsFromVpcRouterAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveDnsFromVpcRouterAction() + def updateGlobalConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateGlobalConfigAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateGlobalConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33055,8 +31969,8 @@ abstract class ApiHelper { } - def removeHostRouteFromL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveHostRouteFromL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveHostRouteFromL3NetworkAction() + def updateHaStrategyCondition(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHaStrategyConditionAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHaStrategyConditionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33082,8 +31996,8 @@ abstract class ApiHelper { } - def removeMdevDeviceSpecFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveMdevDeviceSpecFromVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveMdevDeviceSpecFromVmInstanceAction() + def updateHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33109,8 +32023,8 @@ abstract class ApiHelper { } - def removeMonFromCephBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveMonFromCephBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveMonFromCephBackupStorageAction() + def updateHostIommuState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostIommuStateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostIommuStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33136,8 +32050,8 @@ abstract class ApiHelper { } - def removeMonFromCephPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveMonFromCephPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveMonFromCephPrimaryStorageAction() + def updateHostIpmi(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostIpmiAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostIpmiAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33163,8 +32077,8 @@ abstract class ApiHelper { } - def removePciDeviceSpecFromVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemovePciDeviceSpecFromVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.RemovePciDeviceSpecFromVmInstanceAction() + def updateHostIscsiInitiatorName(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostIscsiInitiatorNameAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostIscsiInitiatorNameAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33190,8 +32104,8 @@ abstract class ApiHelper { } - def removeRemoteCidrsFromIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveRemoteCidrsFromIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveRemoteCidrsFromIPsecConnectionAction() + def updateHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostKernelInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostKernelInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33217,8 +32131,8 @@ abstract class ApiHelper { } - def removeRendezvousPointFromMulticastRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveRendezvousPointFromMulticastRouterAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveRendezvousPointFromMulticastRouterAction() + def updateHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostNetworkInterfaceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostNetworkInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33244,8 +32158,8 @@ abstract class ApiHelper { } - def removeResourcesFromDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveResourcesFromDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveResourcesFromDirectoryAction() + def updateHostNqn(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostNqnAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostNqnAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33271,8 +32185,8 @@ abstract class ApiHelper { } - def removeSchedulerJobFromSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveSchedulerJobFromSchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveSchedulerJobFromSchedulerTriggerAction() + def updateHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateHostSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33298,8 +32212,8 @@ abstract class ApiHelper { } - def removeSchedulerJobGroupFromSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveSchedulerJobGroupFromSchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveSchedulerJobGroupFromSchedulerTriggerAction() + def updateIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateIPsecConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateIPsecConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33325,8 +32239,8 @@ abstract class ApiHelper { } - def removeSchedulerJobsFromSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveSchedulerJobsFromSchedulerJobGroupAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveSchedulerJobsFromSchedulerJobGroupAction() + def updateImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateImageAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateImageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33352,8 +32266,8 @@ abstract class ApiHelper { } - def removeSdnController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveSdnControllerAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveSdnControllerAction() + def updateImagePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateImagePackageAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateImagePackageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33379,8 +32293,8 @@ abstract class ApiHelper { } - def removeServerGroupFromLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveServerGroupFromLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveServerGroupFromLoadBalancerListenerAction() + def updateImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33406,8 +32320,8 @@ abstract class ApiHelper { } - def removeVRouterNetworksFromFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVRouterNetworksFromFlowMeterAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveVRouterNetworksFromFlowMeterAction() + def updateInfoSecSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateInfoSecSecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateInfoSecSecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33433,8 +32347,8 @@ abstract class ApiHelper { } - def removeVRouterNetworksFromOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVRouterNetworksFromOspfAreaAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveVRouterNetworksFromOspfAreaAction() + def updateInfoSecSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateInfoSecSecurityMachineAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateInfoSecSecurityMachineAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33460,8 +32374,8 @@ abstract class ApiHelper { } - def removeVmFromAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVmFromAffinityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveVmFromAffinityGroupAction() + def updateInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateInstanceOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateInstanceOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33487,8 +32401,8 @@ abstract class ApiHelper { } - def removeVmNicFromLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVmNicFromLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveVmNicFromLoadBalancerAction() + def updateIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateIpRangeAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateIpRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33514,8 +32428,8 @@ abstract class ApiHelper { } - def removeVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RemoveVmSchedulingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.RemoveVmSchedulingRuleAction() + def updateIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateIscsiServerAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateIscsiServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33541,8 +32455,8 @@ abstract class ApiHelper { } - def renewSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RenewSessionAction.class) Closure c) { - def a = new org.zstack.sdk.RenewSessionAction() + def updateKVMHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateKVMHostAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateKVMHostAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33568,8 +32482,8 @@ abstract class ApiHelper { } - def requestConsoleAccess(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RequestConsoleAccessAction.class) Closure c) { - def a = new org.zstack.sdk.RequestConsoleAccessAction() + def updateL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateL2NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateL2NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33595,8 +32509,8 @@ abstract class ApiHelper { } - def rerunLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RerunLongJobAction.class) Closure c) { - def a = new org.zstack.sdk.RerunLongJobAction() + def updateL2NetworkVirtualNetworkId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateL2NetworkVirtualNetworkIdAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateL2NetworkVirtualNetworkIdAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33622,8 +32536,8 @@ abstract class ApiHelper { } - def resetGlobalConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResetGlobalConfigAction.class) Closure c) { - def a = new org.zstack.sdk.ResetGlobalConfigAction() + def updateL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateL3NetworkAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateL3NetworkAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33649,8 +32563,8 @@ abstract class ApiHelper { } - def resetTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResetTemplateConfigAction.class) Closure c) { - def a = new org.zstack.sdk.ResetTemplateConfigAction() + def updateLicense(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLicenseAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateLicenseAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33676,8 +32590,8 @@ abstract class ApiHelper { } - def resetTwoFactorAuthenticationSecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResetTwoFactorAuthenticationSecretAction.class) Closure c) { - def a = new org.zstack.sdk.ResetTwoFactorAuthenticationSecretAction() + def updateLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLoadBalancerAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateLoadBalancerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33703,8 +32617,8 @@ abstract class ApiHelper { } - def resizeDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResizeDataVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.ResizeDataVolumeAction() + def updateLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLoadBalancerListenerAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateLoadBalancerListenerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33730,8 +32644,8 @@ abstract class ApiHelper { } - def resizeRootVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResizeRootVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.ResizeRootVolumeAction() + def updateLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLoadBalancerServerGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateLoadBalancerServerGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33757,8 +32671,8 @@ abstract class ApiHelper { } - def restartResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RestartResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.RestartResourceStackAction() + def updateLogConfiguration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLogConfigurationAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateLogConfigurationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33784,8 +32698,8 @@ abstract class ApiHelper { } - def resumeLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResumeLongJobAction.class) Closure c) { - def a = new org.zstack.sdk.ResumeLongJobAction() + def updateLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLongJobAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateLongJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33811,8 +32725,8 @@ abstract class ApiHelper { } - def resumeVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ResumeVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.ResumeVmInstanceAction() + def updateMdevDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateMdevDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateMdevDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33838,8 +32752,8 @@ abstract class ApiHelper { } - def revertTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevertTemplateConfigAction.class) Closure c) { - def a = new org.zstack.sdk.RevertTemplateConfigAction() + def updateMdevDeviceSpec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateMdevDeviceSpecAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateMdevDeviceSpecAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33865,8 +32779,8 @@ abstract class ApiHelper { } - def revertVmFromCdpBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevertVmFromCdpBackupAction.class) Closure c) { - def a = new org.zstack.sdk.RevertVmFromCdpBackupAction() + def updateMonitorTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateMonitorTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateMonitorTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33892,8 +32806,8 @@ abstract class ApiHelper { } - def revertVmFromSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevertVmFromSnapshotGroupAction.class) Closure c) { - def a = new org.zstack.sdk.RevertVmFromSnapshotGroupAction() + def updateNasFileSystem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateNasFileSystemAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateNasFileSystemAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33919,8 +32833,8 @@ abstract class ApiHelper { } - def revertVolumeFromSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevertVolumeFromSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.RevertVolumeFromSnapshotAction() + def updateNasMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateNasMountTargetAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateNasMountTargetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33946,8 +32860,8 @@ abstract class ApiHelper { } - def revokeResourceSharing(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RevokeResourceSharingAction.class) Closure c) { - def a = new org.zstack.sdk.RevokeResourceSharingAction() + def updateNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateNvmeServerAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateNvmeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -33973,8 +32887,8 @@ abstract class ApiHelper { } - def runSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RunSchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.RunSchedulerTriggerAction() + def updateOAuthClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateOAuthClientAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateOAuthClientAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34000,8 +32914,8 @@ abstract class ApiHelper { } - def securityMachineDetectSync(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SecurityMachineDetectSyncAction.class) Closure c) { - def a = new org.zstack.sdk.SecurityMachineDetectSyncAction() + def updatePciDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePciDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePciDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34027,8 +32941,8 @@ abstract class ApiHelper { } - def securityMachineEncrypt(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SecurityMachineEncryptAction.class) Closure c) { - def a = new org.zstack.sdk.SecurityMachineEncryptAction() + def updatePciDeviceSpec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePciDeviceSpecAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePciDeviceSpecAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34054,8 +32968,8 @@ abstract class ApiHelper { } - def selfTestLocalRaid(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SelfTestLocalRaidAction.class) Closure c) { - def a = new org.zstack.sdk.SelfTestLocalRaidAction() + def updatePolicyRouteRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePolicyRouteRuleSetAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePolicyRouteRuleSetAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34081,8 +32995,8 @@ abstract class ApiHelper { } - def setFlowMeterRouterId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetFlowMeterRouterIdAction.class) Closure c) { - def a = new org.zstack.sdk.SetFlowMeterRouterIdAction() + def updatePortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePortForwardingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePortForwardingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34108,8 +33022,8 @@ abstract class ApiHelper { } - def setImageBootMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetImageBootModeAction.class) Closure c) { - def a = new org.zstack.sdk.SetImageBootModeAction() + def updatePortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePortGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePortGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34135,8 +33049,8 @@ abstract class ApiHelper { } - def setImageQga(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetImageQgaAction.class) Closure c) { - def a = new org.zstack.sdk.SetImageQgaAction() + def updatePortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePortMirrorAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePortMirrorAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34162,8 +33076,8 @@ abstract class ApiHelper { } - def setImageSecurityLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetImageSecurityLevelAction.class) Closure c) { - def a = new org.zstack.sdk.SetImageSecurityLevelAction() + def updatePreconfigurationTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePreconfigurationTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePreconfigurationTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34189,8 +33103,8 @@ abstract class ApiHelper { } - def setImageStoreBackupStorageQuota(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetImageStoreBackupStorageQuotaAction.class) Closure c) { - def a = new org.zstack.sdk.SetImageStoreBackupStorageQuotaAction() + def updatePriceTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePriceTableAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePriceTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34216,8 +33130,8 @@ abstract class ApiHelper { } - def setIpOnHostNetworkBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetIpOnHostNetworkBondingAction.class) Closure c) { - def a = new org.zstack.sdk.SetIpOnHostNetworkBondingAction() + def updatePrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePrimaryStorageAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePrimaryStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34243,8 +33157,8 @@ abstract class ApiHelper { } - def setIpOnHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetIpOnHostNetworkInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.SetIpOnHostNetworkInterfaceAction() + def updatePriorityConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePriorityConfigAction.class) Closure c) { + def a = new org.zstack.sdk.UpdatePriorityConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34270,8 +33184,8 @@ abstract class ApiHelper { } - def setL3NetworkMtu(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetL3NetworkMtuAction.class) Closure c) { - def a = new org.zstack.sdk.SetL3NetworkMtuAction() + def updateQuota(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateQuotaAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateQuotaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34297,8 +33211,8 @@ abstract class ApiHelper { } - def setL3NetworkRouterInterfaceIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetL3NetworkRouterInterfaceIpAction.class) Closure c) { - def a = new org.zstack.sdk.SetL3NetworkRouterInterfaceIpAction() + def updateResourceConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateResourceConfigAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateResourceConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34324,8 +33238,8 @@ abstract class ApiHelper { } - def setNicQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetNicQosAction.class) Closure c) { - def a = new org.zstack.sdk.SetNicQosAction() + def updateResourceConfigs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateResourceConfigsAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateResourceConfigsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34351,8 +33265,8 @@ abstract class ApiHelper { } - def setSecurityMachineKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetSecurityMachineKeyAction.class) Closure c) { - def a = new org.zstack.sdk.SetSecurityMachineKeyAction() + def updateResourcePrice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateResourcePriceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateResourcePriceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34378,8 +33292,8 @@ abstract class ApiHelper { } - def setServiceTypeOnHostNetworkBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetServiceTypeOnHostNetworkBondingAction.class) Closure c) { - def a = new org.zstack.sdk.SetServiceTypeOnHostNetworkBondingAction() + def updateResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34405,8 +33319,8 @@ abstract class ApiHelper { } - def setServiceTypeOnHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetServiceTypeOnHostNetworkInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.SetServiceTypeOnHostNetworkInterfaceAction() + def updateSSORedirectTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSSORedirectTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSSORedirectTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34432,8 +33346,8 @@ abstract class ApiHelper { } - def setVRouterRouterId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVRouterRouterIdAction.class) Closure c) { - def a = new org.zstack.sdk.SetVRouterRouterIdAction() + def updateSchedulerJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSchedulerJobAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSchedulerJobAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34459,8 +33373,8 @@ abstract class ApiHelper { } - def setVipQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVipQosAction.class) Closure c) { - def a = new org.zstack.sdk.SetVipQosAction() + def updateSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSchedulerJobGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSchedulerJobGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34486,8 +33400,8 @@ abstract class ApiHelper { } - def setVmBootMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmBootModeAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmBootModeAction() + def updateSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSchedulerTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSchedulerTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34513,8 +33427,8 @@ abstract class ApiHelper { } - def setVmBootOrder(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmBootOrderAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmBootOrderAction() + def updateScsiLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateScsiLunAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateScsiLunAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34540,8 +33454,8 @@ abstract class ApiHelper { } - def setVmBootVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmBootVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmBootVolumeAction() + def updateSdnController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSdnControllerAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSdnControllerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34567,8 +33481,8 @@ abstract class ApiHelper { } - def setVmCleanTraffic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmCleanTrafficAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmCleanTrafficAction() + def updateSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSecretResourcePoolAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSecretResourcePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34594,8 +33508,8 @@ abstract class ApiHelper { } - def setVmClockTrack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmClockTrackAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmClockTrackAction() + def updateSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSecurityGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSecurityGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34621,8 +33535,8 @@ abstract class ApiHelper { } - def setVmConsoleMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmConsoleModeAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmConsoleModeAction() + def updateSecurityGroupRulePriority(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSecurityGroupRulePriorityAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSecurityGroupRulePriorityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34648,8 +33562,8 @@ abstract class ApiHelper { } - def setVmConsolePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmConsolePasswordAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmConsolePasswordAction() + def updateSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSecurityMachineAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSecurityMachineAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34675,8 +33589,8 @@ abstract class ApiHelper { } - def setVmDns(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmDnsAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmDnsAction() + def updateSftpBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSftpBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSftpBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34702,8 +33616,8 @@ abstract class ApiHelper { } - def setVmEmulatorPinning(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmEmulatorPinningAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmEmulatorPinningAction() + def updateSharedBlock(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSharedBlockAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSharedBlockAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34729,8 +33643,8 @@ abstract class ApiHelper { } - def setVmHostname(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmHostnameAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmHostnameAction() + def updateSlbGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSlbGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSlbGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34756,8 +33670,8 @@ abstract class ApiHelper { } - def setVmInstanceDefaultCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmInstanceDefaultCdRomAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmInstanceDefaultCdRomAction() + def updateSnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSnmpAgentAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSnmpAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34783,8 +33697,8 @@ abstract class ApiHelper { } - def setVmInstanceHaLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmInstanceHaLevelAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmInstanceHaLevelAction() + def updateSshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSshKeyPairAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSshKeyPairAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34810,8 +33724,8 @@ abstract class ApiHelper { } - def setVmMonitorNumber(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmMonitorNumberAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmMonitorNumberAction() + def updateStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateStackTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateStackTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34837,8 +33751,8 @@ abstract class ApiHelper { } - def setVmNicSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmNicSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmNicSecurityGroupAction() + def updateSystemTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSystemTagAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateSystemTagAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34864,8 +33778,8 @@ abstract class ApiHelper { } - def setVmNuma(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmNumaAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmNumaAction() + def updateTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateTagAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateTagAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34891,8 +33805,8 @@ abstract class ApiHelper { } - def setVmQga(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmQgaAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmQgaAction() + def updateTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateTemplateConfigAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateTemplateConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34918,8 +33832,8 @@ abstract class ApiHelper { } - def setVmQxlMemory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmQxlMemoryAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmQxlMemoryAction() + def updateTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateTemplatedVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateTemplatedVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34945,8 +33859,8 @@ abstract class ApiHelper { } - def setVmRDP(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmRDPAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmRDPAction() + def updateUsbDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateUsbDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateUsbDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34972,8 +33886,8 @@ abstract class ApiHelper { } - def setVmSecurityLevel(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmSecurityLevelAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmSecurityLevelAction() + def updateVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVCenterAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVCenterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -34999,8 +33913,8 @@ abstract class ApiHelper { } - def setVmSoundType(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmSoundTypeAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmSoundTypeAction() + def updateVRouterOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVRouterOspfAreaAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVRouterOspfAreaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35026,8 +33940,8 @@ abstract class ApiHelper { } - def setVmSshKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmSshKeyAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmSshKeyAction() + def updateVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVRouterRouteTableAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVRouterRouteTableAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35053,8 +33967,8 @@ abstract class ApiHelper { } - def setVmStaticIp(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmStaticIpAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmStaticIpAction() + def updateVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVipAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35080,8 +33994,8 @@ abstract class ApiHelper { } - def setVmUsbRedirect(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmUsbRedirectAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmUsbRedirectAction() + def updateVirtualRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualRouterAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVirtualRouterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35107,8 +34021,8 @@ abstract class ApiHelper { } - def setVmUserDefinedXml(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmUserDefinedXmlAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmUserDefinedXmlAction() + def updateVirtualRouterOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualRouterOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVirtualRouterOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35134,8 +34048,8 @@ abstract class ApiHelper { } - def setVmUserDefinedXmlHookScript(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVmUserDefinedXmlHookScriptAction.class) Closure c) { - def a = new org.zstack.sdk.SetVmUserDefinedXmlHookScriptAction() + def updateVirtualRouterSoftwareVersion(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualRouterSoftwareVersionAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVirtualRouterSoftwareVersionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35161,8 +34075,8 @@ abstract class ApiHelper { } - def setVolumeIoThreadPin(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVolumeIoThreadPinAction.class) Closure c) { - def a = new org.zstack.sdk.SetVolumeIoThreadPinAction() + def updateVirtualSwitchUplinkBondings(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualSwitchUplinkBondingsAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVirtualSwitchUplinkBondingsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35188,8 +34102,8 @@ abstract class ApiHelper { } - def setVolumeQos(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVolumeQosAction.class) Closure c) { - def a = new org.zstack.sdk.SetVolumeQosAction() + def updateVirtualSwitchUplinkGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualSwitchUplinkGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVirtualSwitchUplinkGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35215,8 +34129,8 @@ abstract class ApiHelper { } - def setVpcVRouterDistributedRoutingEnabled(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVpcVRouterDistributedRoutingEnabledAction.class) Closure c) { - def a = new org.zstack.sdk.SetVpcVRouterDistributedRoutingEnabledAction() + def updateVmCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmCdRomAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVmCdRomAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35242,8 +34156,8 @@ abstract class ApiHelper { } - def setVpcVRouterNetworkServiceState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SetVpcVRouterNetworkServiceStateAction.class) Closure c) { - def a = new org.zstack.sdk.SetVpcVRouterNetworkServiceStateAction() + def updateVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVmInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35269,8 +34183,8 @@ abstract class ApiHelper { } - def shareResource(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ShareResourceAction.class) Closure c) { - def a = new org.zstack.sdk.ShareResourceAction() + def updateVmNicDriver(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmNicDriverAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVmNicDriverAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35296,8 +34210,8 @@ abstract class ApiHelper { } - def shrinkVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ShrinkVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.ShrinkVolumeSnapshotAction() + def updateVmNicMac(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmNicMacAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVmNicMacAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35323,8 +34237,8 @@ abstract class ApiHelper { } - def shutdownHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ShutdownHostAction.class) Closure c) { - def a = new org.zstack.sdk.ShutdownHostAction() + def updateVmPriority(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmPriorityAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVmPriorityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35350,8 +34264,8 @@ abstract class ApiHelper { } - def startBareMetal2Instance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartBareMetal2InstanceAction.class) Closure c) { - def a = new org.zstack.sdk.StartBareMetal2InstanceAction() + def updateVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmSchedulingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVmSchedulingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35377,8 +34291,8 @@ abstract class ApiHelper { } - def startBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.StartBaremetalInstanceAction() + def updateVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmSchedulingRuleGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVmSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35404,8 +34318,8 @@ abstract class ApiHelper { } - def startBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartBaremetalPxeServerAction.class) Closure c) { - def a = new org.zstack.sdk.StartBaremetalPxeServerAction() + def updateVniRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVniRangeAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVniRangeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35431,8 +34345,8 @@ abstract class ApiHelper { } - def startConnectionBetweenAliyunRouterInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartConnectionBetweenAliyunRouterInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.StartConnectionBetweenAliyunRouterInterfaceAction() + def updateVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35458,8 +34372,8 @@ abstract class ApiHelper { } - def startDataProtection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartDataProtectionAction.class) Closure c) { - def a = new org.zstack.sdk.StartDataProtectionAction() + def updateVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVolumeSnapshotAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVolumeSnapshotAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35485,8 +34399,8 @@ abstract class ApiHelper { } - def startEcsInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartEcsInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.StartEcsInstanceAction() + def updateVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVolumeSnapshotGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVolumeSnapshotGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35512,8 +34426,8 @@ abstract class ApiHelper { } - def startSnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartSnmpAgentAction.class) Closure c) { - def a = new org.zstack.sdk.StartSnmpAgentAction() + def updateVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcFirewallAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVpcFirewallAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35539,8 +34453,8 @@ abstract class ApiHelper { } - def startVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StartVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.StartVmInstanceAction() + def updateVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcHaGroupAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateVpcHaGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35566,8 +34480,8 @@ abstract class ApiHelper { } - def stopBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.StopBaremetalInstanceAction() + def updateWebhook(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateWebhookAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateWebhookAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35593,8 +34507,8 @@ abstract class ApiHelper { } - def stopBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopBaremetalPxeServerAction.class) Closure c) { - def a = new org.zstack.sdk.StopBaremetalPxeServerAction() + def updateXskyBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateXskyBlockVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateXskyBlockVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35620,8 +34534,8 @@ abstract class ApiHelper { } - def stopEcsInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopEcsInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.StopEcsInstanceAction() + def updateZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateZoneAction.class) Closure c) { + def a = new org.zstack.sdk.UpdateZoneAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35647,8 +34561,8 @@ abstract class ApiHelper { } - def stopSnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopSnmpAgentAction.class) Closure c) { - def a = new org.zstack.sdk.StopSnmpAgentAction() + def validateClusterSupportDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateClusterSupportDRSAction.class) Closure c) { + def a = new org.zstack.sdk.ValidateClusterSupportDRSAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35674,8 +34588,8 @@ abstract class ApiHelper { } - def stopVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.StopVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.StopVmInstanceAction() + def validateDiskOfferingUserConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateDiskOfferingUserConfigAction.class) Closure c) { + def a = new org.zstack.sdk.ValidateDiskOfferingUserConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35701,8 +34615,8 @@ abstract class ApiHelper { } - def submitLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SubmitLongJobAction.class) Closure c) { - def a = new org.zstack.sdk.SubmitLongJobAction() + def validateInstanceOfferingUserConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateInstanceOfferingUserConfigAction.class) Closure c) { + def a = new org.zstack.sdk.ValidateInstanceOfferingUserConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35728,9 +34642,9 @@ abstract class ApiHelper { } - def syncAliyunRouteEntryFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncAliyunRouteEntryFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncAliyunRouteEntryFromRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def validatePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidatePasswordAction.class) Closure c) { + def a = new org.zstack.sdk.ValidatePasswordAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -35755,8 +34669,8 @@ abstract class ApiHelper { } - def syncAliyunRouterInterfaceFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncAliyunRouterInterfaceFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncAliyunRouterInterfaceFromRemoteAction() + def validatePriceUserConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidatePriceUserConfigAction.class) Closure c) { + def a = new org.zstack.sdk.ValidatePriceUserConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35782,8 +34696,8 @@ abstract class ApiHelper { } - def syncAliyunSnapshotRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncAliyunSnapshotRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncAliyunSnapshotRemoteAction() + def validateSecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateSecurityGroupRuleAction.class) Closure c) { + def a = new org.zstack.sdk.ValidateSecurityGroupRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35809,9 +34723,9 @@ abstract class ApiHelper { } - def syncAliyunVirtualRouterFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncAliyunVirtualRouterFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncAliyunVirtualRouterFromRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid + def validateSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateSessionAction.class) Closure c) { + def a = new org.zstack.sdk.ValidateSessionAction() + c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() @@ -35836,8 +34750,8 @@ abstract class ApiHelper { } - def syncChronyServers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncChronyServersAction.class) Closure c) { - def a = new org.zstack.sdk.SyncChronyServersAction() + def validateVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateVmSchedulingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.ValidateVmSchedulingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35863,8 +34777,8 @@ abstract class ApiHelper { } - def syncConnectionAccessPointFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncConnectionAccessPointFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncConnectionAccessPointFromRemoteAction() + def validateVolumeSnapshotChain(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateVolumeSnapshotChainAction.class) Closure c) { + def a = new org.zstack.sdk.ValidateVolumeSnapshotChainAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35890,8 +34804,8 @@ abstract class ApiHelper { } - def syncDataCenterFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncDataCenterFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncDataCenterFromRemoteAction() + def zQLQuery(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ZQLQueryAction.class) Closure c) { + def a = new org.zstack.sdk.ZQLQueryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35917,8 +34831,8 @@ abstract class ApiHelper { } - def syncDiskFromAliyunFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncDiskFromAliyunFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncDiskFromAliyunFromRemoteAction() + def createResourceAttributeKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.CreateResourceAttributeKeyAction.class) Closure c) { + def a = new org.zstack.sdk.attribute.api.CreateResourceAttributeKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35944,8 +34858,8 @@ abstract class ApiHelper { } - def syncEcsImageFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncEcsImageFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncEcsImageFromRemoteAction() + def createResourceAttributeValue(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.CreateResourceAttributeValueAction.class) Closure c) { + def a = new org.zstack.sdk.attribute.api.CreateResourceAttributeValueAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35971,8 +34885,8 @@ abstract class ApiHelper { } - def syncEcsInstanceFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncEcsInstanceFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncEcsInstanceFromRemoteAction() + def deleteResourceAttributeKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.DeleteResourceAttributeKeyAction.class) Closure c) { + def a = new org.zstack.sdk.attribute.api.DeleteResourceAttributeKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -35998,62 +34912,8 @@ abstract class ApiHelper { } - def syncEcsSecurityGroupFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncEcsSecurityGroupFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncEcsSecurityGroupFromRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def syncEcsSecurityGroupRuleFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncEcsSecurityGroupRuleFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncEcsSecurityGroupRuleFromRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def syncEcsVSwitchFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncEcsVSwitchFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncEcsVSwitchFromRemoteAction() + def deleteResourceAttributeValue(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.DeleteResourceAttributeValueAction.class) Closure c) { + def a = new org.zstack.sdk.attribute.api.DeleteResourceAttributeValueAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36079,41 +34939,16 @@ abstract class ApiHelper { } - def syncEcsVpcFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncEcsVpcFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncEcsVpcFromRemoteAction() + def queryResourceAttributeKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.QueryResourceAttributeKeyAction.class) Closure c) { + def a = new org.zstack.sdk.attribute.api.QueryResourceAttributeKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } + a.conditions = a.conditions.collect { it.toString() } - def syncHybridEipFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncHybridEipFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncHybridEipFromRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid @@ -36133,40 +34968,15 @@ abstract class ApiHelper { } - def syncIdentityFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncIdentityFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncIdentityFromRemoteAction() + def queryResourceAttributeValue(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.QueryResourceAttributeValueAction.class) Closure c) { + def a = new org.zstack.sdk.attribute.api.QueryResourceAttributeValueAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def syncImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncImageAction.class) Closure c) { - def a = new org.zstack.sdk.SyncImageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -36187,8 +34997,8 @@ abstract class ApiHelper { } - def syncImageFromImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncImageFromImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.SyncImageFromImageStoreBackupStorageAction() + def updateResourceAttributeKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.UpdateResourceAttributeKeyAction.class) Closure c) { + def a = new org.zstack.sdk.attribute.api.UpdateResourceAttributeKeyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36214,8 +35024,8 @@ abstract class ApiHelper { } - def syncImageSize(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncImageSizeAction.class) Closure c) { - def a = new org.zstack.sdk.SyncImageSizeAction() + def createDatabaseBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.CreateDatabaseBackupAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.CreateDatabaseBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36241,8 +35051,8 @@ abstract class ApiHelper { } - def syncPrimaryStorageCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncPrimaryStorageCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.SyncPrimaryStorageCapacityAction() + def deleteDatabaseBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.DeleteDatabaseBackupAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.DeleteDatabaseBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36268,8 +35078,8 @@ abstract class ApiHelper { } - def syncVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVCenterAction.class) Closure c) { - def a = new org.zstack.sdk.SyncVCenterAction() + def deleteExportedDatabaseBackupFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.DeleteExportedDatabaseBackupFromBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.DeleteExportedDatabaseBackupFromBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36295,8 +35105,8 @@ abstract class ApiHelper { } - def syncVirtualBorderRouterFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVirtualBorderRouterFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncVirtualBorderRouterFromRemoteAction() + def exportDatabaseBackupFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.ExportDatabaseBackupFromBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.ExportDatabaseBackupFromBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36322,8 +35132,8 @@ abstract class ApiHelper { } - def syncVmClock(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVmClockAction.class) Closure c) { - def a = new org.zstack.sdk.SyncVmClockAction() + def getDatabaseBackupFromImageStore(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.GetDatabaseBackupFromImageStoreAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.GetDatabaseBackupFromImageStoreAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36349,40 +35159,15 @@ abstract class ApiHelper { } - def syncVolumeSize(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVolumeSizeAction.class) Closure c) { - def a = new org.zstack.sdk.SyncVolumeSizeAction() + def queryDatabaseBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.QueryDatabaseBackupAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.QueryDatabaseBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def syncVpcUserVpnGatewayFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVpcUserVpnGatewayFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncVpcUserVpnGatewayFromRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -36403,8 +35188,8 @@ abstract class ApiHelper { } - def syncVpcVpnConnectionFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVpcVpnConnectionFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncVpcVpnConnectionFromRemoteAction() + def recoverDatabaseFromBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.RecoverDatabaseFromBackupAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.RecoverDatabaseFromBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36430,8 +35215,8 @@ abstract class ApiHelper { } - def syncVpcVpnGatewayFromRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncVpcVpnGatewayFromRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.SyncVpcVpnGatewayFromRemoteAction() + def syncDatabaseBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.SyncDatabaseBackupAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.SyncDatabaseBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36457,8 +35242,8 @@ abstract class ApiHelper { } - def syncZBoxCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.SyncZBoxCapacityAction.class) Closure c) { - def a = new org.zstack.sdk.SyncZBoxCapacityAction() + def syncDatabaseBackupFromImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.SyncDatabaseBackupFromImageStoreBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.databasebackup.SyncDatabaseBackupFromImageStoreBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36484,8 +35269,8 @@ abstract class ApiHelper { } - def takeVmConsoleScreenshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.TakeVmConsoleScreenshotAction.class) Closure c) { - def a = new org.zstack.sdk.TakeVmConsoleScreenshotAction() + def attachGuestToolsIsoToVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.AttachGuestToolsIsoToVmAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.AttachGuestToolsIsoToVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36511,8 +35296,8 @@ abstract class ApiHelper { } - def terminateVirtualBorderRouterRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.TerminateVirtualBorderRouterRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.TerminateVirtualBorderRouterRemoteAction() + def detachGuestToolsIsoFromVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.DetachGuestToolsIsoFromVmAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.DetachGuestToolsIsoFromVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36538,8 +35323,8 @@ abstract class ApiHelper { } - def triggerGCJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.TriggerGCJobAction.class) Closure c) { - def a = new org.zstack.sdk.TriggerGCJobAction() + def getLatestGuestToolsForVm(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.GetLatestGuestToolsForVmAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.GetLatestGuestToolsForVmAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36565,8 +35350,8 @@ abstract class ApiHelper { } - def undoSnapshotCreation(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UndoSnapshotCreationAction.class) Closure c) { - def a = new org.zstack.sdk.UndoSnapshotCreationAction() + def getVmGuestToolsInfo(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.GetVmGuestToolsInfoAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.GetVmGuestToolsInfoAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36592,41 +35377,16 @@ abstract class ApiHelper { } - def unexportNbdVolumes(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UnexportNbdVolumesAction.class) Closure c) { - def a = new org.zstack.sdk.UnexportNbdVolumesAction() + def queryGuestToolsState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.QueryGuestToolsStateAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.QueryGuestToolsStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } + a.conditions = a.conditions.collect { it.toString() } - def ungenerateMdevDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UngenerateMdevDevicesAction.class) Closure c) { - def a = new org.zstack.sdk.UngenerateMdevDevicesAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid @@ -36646,8 +35406,8 @@ abstract class ApiHelper { } - def ungenerateSeMdevDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UngenerateSeMdevDevicesAction.class) Closure c) { - def a = new org.zstack.sdk.UngenerateSeMdevDevicesAction() + def updateGuestToolsState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.UpdateGuestToolsStateAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.UpdateGuestToolsStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36673,8 +35433,8 @@ abstract class ApiHelper { } - def ungenerateSriovPciDevices(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UngenerateSriovPciDevicesAction.class) Closure c) { - def a = new org.zstack.sdk.UngenerateSriovPciDevicesAction() + def updateVmNetworkConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.UpdateVmNetworkConfigAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.UpdateVmNetworkConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36700,8 +35460,8 @@ abstract class ApiHelper { } - def ungroupVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UngroupVolumeSnapshotGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UngroupVolumeSnapshotGroupAction() + def createVmCustomSpecification(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.advanced.CreateVmCustomSpecificationAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.advanced.CreateVmCustomSpecificationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36727,8 +35487,8 @@ abstract class ApiHelper { } - def unlockIdentity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UnlockIdentityAction.class) Closure c) { - def a = new org.zstack.sdk.UnlockIdentityAction() + def deleteVmCustomSpecification(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.advanced.DeleteVmCustomSpecificationAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.advanced.DeleteVmCustomSpecificationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36754,40 +35514,15 @@ abstract class ApiHelper { } - def unmountVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UnmountVmInstanceRecoveryPointAction.class) Closure c) { - def a = new org.zstack.sdk.UnmountVmInstanceRecoveryPointAction() + def queryVmCustomSpecification(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.advanced.QueryVmCustomSpecificationAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.advanced.QueryVmCustomSpecificationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def unprotectVmInstanceRecoveryPoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UnprotectVmInstanceRecoveryPointAction.class) Closure c) { - def a = new org.zstack.sdk.UnprotectVmInstanceRecoveryPointAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -36808,8 +35543,8 @@ abstract class ApiHelper { } - def updateAccessControlRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAccessControlRuleAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAccessControlRuleAction() + def updateVmCustomSpecification(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.guesttools.advanced.UpdateVmCustomSpecificationAction.class) Closure c) { + def a = new org.zstack.sdk.guesttools.advanced.UpdateVmCustomSpecificationAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36835,8 +35570,8 @@ abstract class ApiHelper { } - def updateAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAccountAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAccountAction() + def addAccountToGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.AddAccountToGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.AddAccountToGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36862,8 +35597,8 @@ abstract class ApiHelper { } - def updateAffinityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAffinityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAffinityGroupAction() + def attachRoleToAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.AttachRoleToAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.AttachRoleToAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36889,8 +35624,8 @@ abstract class ApiHelper { } - def updateAliyunDisk(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunDiskAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunDiskAction() + def createAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.CreateAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.CreateAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36916,8 +35651,8 @@ abstract class ApiHelper { } - def updateAliyunEbsBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunEbsBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunEbsBackupStorageAction() + def deleteAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.DeleteAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.DeleteAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36943,8 +35678,8 @@ abstract class ApiHelper { } - def updateAliyunEbsPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunEbsPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunEbsPrimaryStorageAction() + def detachRoleFromAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.DetachRoleFromAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.DetachRoleFromAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36970,8 +35705,8 @@ abstract class ApiHelper { } - def updateAliyunKeySecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunKeySecretAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunKeySecretAction() + def getAccountGroupTree(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.GetAccountGroupTreeAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.GetAccountGroupTreeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -36997,8 +35732,8 @@ abstract class ApiHelper { } - def updateAliyunMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunMountTargetAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunMountTargetAction() + def getResourceInAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.GetResourceInAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.GetResourceInAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -37024,8 +35759,8 @@ abstract class ApiHelper { } - def updateAliyunNasAccessGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunNasAccessGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunNasAccessGroupAction() + def getRolesForAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.GetRolesForAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.GetRolesForAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -37051,4875 +35786,13 @@ abstract class ApiHelper { } - def updateAliyunPanguPartition(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunPanguPartitionAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunPanguPartitionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAliyunProxyVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunProxyVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunProxyVSwitchAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAliyunProxyVpc(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunProxyVpcAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunProxyVpcAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAliyunRouteInterfaceRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunRouteInterfaceRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunRouteInterfaceRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAliyunSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunSnapshotAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAliyunVirtualRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAliyunVirtualRouterAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAliyunVirtualRouterAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAutoScalingGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAutoScalingGroupAddingNewInstanceRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingGroupAddingNewInstanceRuleAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAutoScalingGroupAddingNewInstanceRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAutoScalingGroupInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingGroupInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAutoScalingGroupInstanceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAutoScalingGroupRemovalInstanceRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingGroupRemovalInstanceRuleAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAutoScalingGroupRemovalInstanceRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAutoScalingRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateAutoScalingVmTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateAutoScalingVmTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateAutoScalingVmTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBackupStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBareMetal2Chassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBareMetal2ChassisAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBareMetal2ChassisAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBareMetal2ChassisOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBareMetal2ChassisOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBareMetal2ChassisOfferingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBareMetal2Gateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBareMetal2GatewayAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBareMetal2GatewayAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBareMetal2Instance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBareMetal2InstanceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBareMetal2InstanceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBareMetal2IpmiChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBareMetal2IpmiChassisAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBareMetal2IpmiChassisAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBareMetal2ProvisionNetwork(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBareMetal2ProvisionNetworkAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBareMetal2ProvisionNetworkAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBaremetalChassisAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBaremetalInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBaremetalInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBaremetalInstanceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBaremetalPxeServerAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBaremetalPxeServerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBlockPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBlockPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBlockPrimaryStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBlockVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBlockVolumeAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateBondingAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateBondingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCCSCertificateAccountState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCCSCertificateAccountStateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateCCSCertificateAccountStateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCasClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCasClientAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateCasClientAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCdpPolicyAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateCdpPolicyAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCdpTaskAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateCdpTaskAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCephBackupStorageMon(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCephBackupStorageMonAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateCephBackupStorageMonAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCephPrimaryStorageMon(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCephPrimaryStorageMonAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateCephPrimaryStorageMonAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCephPrimaryStoragePoolAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateCephPrimaryStoragePoolAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateCertificateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateCertificateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateChronyServers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateChronyServersAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateChronyServersAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateClusterAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateClusterAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateClusterDRSAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateClusterDRSAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateClusterOS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateClusterOSAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateClusterOSAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateConnectionBetweenL3NetWorkAndAliyunVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateConnectionBetweenL3NetWorkAndAliyunVSwitchAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateConsoleProxyAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateConsoleProxyAgentAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateConsoleProxyAgentAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateDirectoryAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateDiskOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateDiskOfferingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEcsImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEcsImageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEcsImageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEcsInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEcsInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEcsInstanceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEcsInstanceVncPassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEcsInstanceVncPasswordAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEcsInstanceVncPasswordAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEcsSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEcsSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEcsSecurityGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEcsVSwitch(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEcsVSwitchAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEcsVSwitchAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEcsVpc(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEcsVpcAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEcsVpcAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEipAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEipAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEmailMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEmailMediaAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEmailMediaAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateEmailMonitorTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateEmailMonitorTriggerActionAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateEmailMonitorTriggerActionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateExternalPrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateExternalPrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateExternalPrimaryStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFactoryModeState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFactoryModeStateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFactoryModeStateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallIpSetTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFirewallIpSetTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFirewallRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFirewallRuleSetAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFirewallRuleTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFlkSecSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFlkSecSecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFlkSecSecretResourcePoolAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFlkSecSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFlkSecSecurityMachineAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFlkSecSecurityMachineAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFlowCollector(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFlowCollectorAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFlowCollectorAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFlowMeter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFlowMeterAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFlowMeterAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateGlobalConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateGlobalConfigAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateGlobalConfigAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateGuestToolsState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateGuestToolsStateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateGuestToolsStateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHaStrategyCondition(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHaStrategyConditionAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHaStrategyConditionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHostAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHostIommuState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostIommuStateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHostIommuStateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHostIpmi(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostIpmiAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHostIpmiAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHostIscsiInitiatorName(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostIscsiInitiatorNameAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHostIscsiInitiatorNameAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostKernelInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHostKernelInterfaceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHostNetworkInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostNetworkInterfaceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHostNetworkInterfaceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHostNqn(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostNqnAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHostNqnAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHostSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHostSchedulingRuleGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHybridEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHybridEipAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHybridEipAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateHybridKeySecret(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateHybridKeySecretAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateHybridKeySecretAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateIPsecConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateIPsecConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateIPsecConnectionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateImage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateImageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateImageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateImagePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateImagePackageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateImagePackageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateImageStoreBackupStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateInfoSecSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateInfoSecSecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateInfoSecSecretResourcePoolAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateInfoSecSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateInfoSecSecurityMachineAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateInfoSecSecurityMachineAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateInstanceOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateInstanceOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateInstanceOfferingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateIpRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateIpRangeAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateIpRangeAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateIscsiServerAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateIscsiServerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateKVMHost(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateKVMHostAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateKVMHostAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateL2Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateL2NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateL2NetworkAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateL2NetworkVirtualNetworkId(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateL2NetworkVirtualNetworkIdAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateL2NetworkVirtualNetworkIdAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateL3Network(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateL3NetworkAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateL3NetworkAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateLicense(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLicenseAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateLicenseAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateLoadBalancer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLoadBalancerAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateLoadBalancerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateLoadBalancerListener(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLoadBalancerListenerAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateLoadBalancerListenerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateLoadBalancerServerGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLoadBalancerServerGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateLoadBalancerServerGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateLogConfiguration(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLogConfigurationAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateLogConfigurationAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateLongJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateLongJobAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateLongJobAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateMdevDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateMdevDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateMdevDeviceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateMdevDeviceSpec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateMdevDeviceSpecAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateMdevDeviceSpecAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateMonitorTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateMonitorTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateMonitorTriggerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateNasFileSystem(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateNasFileSystemAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateNasFileSystemAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateNasMountTarget(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateNasMountTargetAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateNasMountTargetAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateNvmeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateNvmeServerAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateNvmeServerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateOAuthClient(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateOAuthClientAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateOAuthClientAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateOssBucket(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateOssBucketAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateOssBucketAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePciDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePciDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePciDeviceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePciDeviceSpec(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePciDeviceSpecAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePciDeviceSpecAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePolicyRouteRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePolicyRouteRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePolicyRouteRuleSetAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePortForwardingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePortForwardingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePortForwardingRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePortGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePortGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePortGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePortMirror(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePortMirrorAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePortMirrorAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePreconfigurationTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePreconfigurationTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePreconfigurationTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePriceTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePriceTableAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePriceTableAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePrimaryStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePrimaryStorageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePrimaryStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updatePriorityConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdatePriorityConfigAction.class) Closure c) { - def a = new org.zstack.sdk.UpdatePriorityConfigAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateQuota(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateQuotaAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateQuotaAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateResourceConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateResourceConfigAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateResourceConfigAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateResourceConfigs(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateResourceConfigsAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateResourceConfigsAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateResourcePrice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateResourcePriceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateResourcePriceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateResourceStackAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSSORedirectTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSSORedirectTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSSORedirectTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSchedulerJob(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSchedulerJobAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSchedulerJobAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSchedulerJobGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSchedulerJobGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSchedulerJobGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSchedulerTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSchedulerTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSchedulerTriggerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateScsiLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateScsiLunAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateScsiLunAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSdnController(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSdnControllerAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSdnControllerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSecretResourcePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSecretResourcePoolAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSecretResourcePoolAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSecurityGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSecurityGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSecurityGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSecurityGroupRulePriority(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSecurityGroupRulePriorityAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSecurityGroupRulePriorityAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSecurityMachine(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSecurityMachineAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSecurityMachineAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSftpBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSftpBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSftpBackupStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSharedBlock(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSharedBlockAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSharedBlockAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSlbGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSlbGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSlbGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSnmpAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSnmpAgentAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSnmpAgentAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSshKeyPair(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSshKeyPairAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSshKeyPairAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateStackTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateStackTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateStackTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateSystemTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateSystemTagAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateSystemTagAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateTag(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateTagAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateTagAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateTemplateConfigAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateTemplateConfigAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateTemplatedVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateTemplatedVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateTemplatedVmInstanceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateUsbDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateUsbDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateUsbDeviceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVCenter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVCenterAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVCenterAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVRouterOspfArea(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVRouterOspfAreaAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVRouterOspfAreaAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVRouterRouteTable(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVRouterRouteTableAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVRouterRouteTableAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVipAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVipAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVirtualBorderRouterRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualBorderRouterRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVirtualBorderRouterRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVirtualRouter(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualRouterAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVirtualRouterAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVirtualRouterOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualRouterOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVirtualRouterOfferingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVirtualRouterSoftwareVersion(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualRouterSoftwareVersionAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVirtualRouterSoftwareVersionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVirtualSwitchUplinkBondings(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualSwitchUplinkBondingsAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVirtualSwitchUplinkBondingsAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVirtualSwitchUplinkGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVirtualSwitchUplinkGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVirtualSwitchUplinkGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVmCdRom(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmCdRomAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVmCdRomAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVmInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVmInstanceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVmNetworkConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmNetworkConfigAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVmNetworkConfigAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVmNicDriver(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmNicDriverAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVmNicDriverAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVmNicMac(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmNicMacAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVmNicMacAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVmPriority(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmPriorityAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVmPriorityAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmSchedulingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVmSchedulingRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVmSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVmSchedulingRuleGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVmSchedulingRuleGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVniRange(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVniRangeAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVniRangeAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVolumeAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVolumeSnapshot(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVolumeSnapshotAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVolumeSnapshotAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVolumeSnapshotGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVolumeSnapshotGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVolumeSnapshotGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVpcFirewallAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcHaGroupAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVpcHaGroupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVpcUserVpnGateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcUserVpnGatewayAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVpcUserVpnGatewayAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVpcVpnConnectionRemote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcVpnConnectionRemoteAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVpcVpnConnectionRemoteAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateVpcVpnGateway(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcVpnGatewayAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVpcVpnGatewayAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateWebhook(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateWebhookAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateWebhookAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateXskyBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateXskyBlockVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateXskyBlockVolumeAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateZone(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateZoneAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateZoneAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validateClusterSupportDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateClusterSupportDRSAction.class) Closure c) { - def a = new org.zstack.sdk.ValidateClusterSupportDRSAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validateDiskOfferingUserConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateDiskOfferingUserConfigAction.class) Closure c) { - def a = new org.zstack.sdk.ValidateDiskOfferingUserConfigAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validateInstanceOfferingUserConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateInstanceOfferingUserConfigAction.class) Closure c) { - def a = new org.zstack.sdk.ValidateInstanceOfferingUserConfigAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validatePassword(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidatePasswordAction.class) Closure c) { - def a = new org.zstack.sdk.ValidatePasswordAction() - - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validatePriceUserConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidatePriceUserConfigAction.class) Closure c) { - def a = new org.zstack.sdk.ValidatePriceUserConfigAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validateSecurityGroupRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateSecurityGroupRuleAction.class) Closure c) { - def a = new org.zstack.sdk.ValidateSecurityGroupRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validateSession(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateSessionAction.class) Closure c) { - def a = new org.zstack.sdk.ValidateSessionAction() - - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validateVmSchedulingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateVmSchedulingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.ValidateVmSchedulingRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def validateVolumeSnapshotChain(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ValidateVolumeSnapshotChainAction.class) Closure c) { - def a = new org.zstack.sdk.ValidateVolumeSnapshotChainAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def zQLQuery(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ZQLQueryAction.class) Closure c) { - def a = new org.zstack.sdk.ZQLQueryAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def createResourceAttributeKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.CreateResourceAttributeKeyAction.class) Closure c) { - def a = new org.zstack.sdk.attribute.api.CreateResourceAttributeKeyAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def createResourceAttributeValue(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.CreateResourceAttributeValueAction.class) Closure c) { - def a = new org.zstack.sdk.attribute.api.CreateResourceAttributeValueAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteResourceAttributeKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.DeleteResourceAttributeKeyAction.class) Closure c) { - def a = new org.zstack.sdk.attribute.api.DeleteResourceAttributeKeyAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteResourceAttributeValue(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.DeleteResourceAttributeValueAction.class) Closure c) { - def a = new org.zstack.sdk.attribute.api.DeleteResourceAttributeValueAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def queryResourceAttributeKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.QueryResourceAttributeKeyAction.class) Closure c) { - def a = new org.zstack.sdk.attribute.api.QueryResourceAttributeKeyAction() + def moveAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.MoveAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.MoveAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -41940,8 +35813,8 @@ abstract class ApiHelper { } - def queryResourceAttributeValue(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.QueryResourceAttributeValueAction.class) Closure c) { - def a = new org.zstack.sdk.attribute.api.QueryResourceAttributeValueAction() + def queryAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.QueryAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.QueryAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -41969,143 +35842,8 @@ abstract class ApiHelper { } - def updateResourceAttributeKey(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.attribute.api.UpdateResourceAttributeKeyAction.class) Closure c) { - def a = new org.zstack.sdk.attribute.api.UpdateResourceAttributeKeyAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def createDatabaseBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.CreateDatabaseBackupAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.CreateDatabaseBackupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteDatabaseBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.DeleteDatabaseBackupAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.DeleteDatabaseBackupAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def deleteExportedDatabaseBackupFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.DeleteExportedDatabaseBackupFromBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.DeleteExportedDatabaseBackupFromBackupStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def exportDatabaseBackupFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.ExportDatabaseBackupFromBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.ExportDatabaseBackupFromBackupStorageAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def getDatabaseBackupFromImageStore(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.GetDatabaseBackupFromImageStoreAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.GetDatabaseBackupFromImageStoreAction() + def removeAccountFromGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.RemoveAccountFromGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.RemoveAccountFromGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42131,15 +35869,13 @@ abstract class ApiHelper { } - def queryDatabaseBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.QueryDatabaseBackupAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.QueryDatabaseBackupAction() + def revokeResourceSharingToGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.RevokeResourceSharingToGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.RevokeResourceSharingToGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -42160,8 +35896,8 @@ abstract class ApiHelper { } - def recoverDatabaseFromBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.RecoverDatabaseFromBackupAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.RecoverDatabaseFromBackupAction() + def shareResourceToGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.ShareResourceToGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.ShareResourceToGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42187,8 +35923,8 @@ abstract class ApiHelper { } - def syncDatabaseBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.SyncDatabaseBackupAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.SyncDatabaseBackupAction() + def updateAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.UpdateAccountGroupAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.accounts.UpdateAccountGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42214,8 +35950,8 @@ abstract class ApiHelper { } - def syncDatabaseBackupFromImageStoreBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.databasebackup.SyncDatabaseBackupFromImageStoreBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.databasebackup.SyncDatabaseBackupFromImageStoreBackupStorageAction() + def getResourceEnsembleMembers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.ensemble.GetResourceEnsembleMembersAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.ensemble.GetResourceEnsembleMembersAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42241,8 +35977,8 @@ abstract class ApiHelper { } - def addAccountToGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.AddAccountToGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.AddAccountToGroupAction() + def getResourceSharing(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.ensemble.GetResourceSharingAction.class) Closure c) { + def a = new org.zstack.sdk.iam1.ensemble.GetResourceSharingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42268,13 +36004,15 @@ abstract class ApiHelper { } - def attachRoleToAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.AttachRoleToAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.AttachRoleToAccountGroupAction() + def queryThirdPartyAccountSourceBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.imports.api.QueryThirdPartyAccountSourceBindingAction.class) Closure c) { + def a = new org.zstack.sdk.identity.imports.api.QueryThirdPartyAccountSourceBindingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -42295,8 +36033,8 @@ abstract class ApiHelper { } - def createAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.CreateAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.CreateAccountGroupAction() + def addLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.AddLdapServerAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.AddLdapServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42322,8 +36060,8 @@ abstract class ApiHelper { } - def deleteAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.DeleteAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.DeleteAccountGroupAction() + def createLdapBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.CreateLdapBindingAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.CreateLdapBindingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42349,8 +36087,8 @@ abstract class ApiHelper { } - def detachRoleFromAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.DetachRoleFromAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.DetachRoleFromAccountGroupAction() + def deleteLdapBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.DeleteLdapBindingAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.DeleteLdapBindingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42376,8 +36114,8 @@ abstract class ApiHelper { } - def getAccountGroupTree(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.GetAccountGroupTreeAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.GetAccountGroupTreeAction() + def deleteLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.DeleteLdapServerAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.DeleteLdapServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42403,8 +36141,8 @@ abstract class ApiHelper { } - def getResourceInAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.GetResourceInAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.GetResourceInAccountGroupAction() + def getCandidateLdapEntryForBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.GetCandidateLdapEntryForBindingAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.GetCandidateLdapEntryForBindingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42430,8 +36168,8 @@ abstract class ApiHelper { } - def getRolesForAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.GetRolesForAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.GetRolesForAccountGroupAction() + def getLdapEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.GetLdapEntryAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.GetLdapEntryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42457,13 +36195,15 @@ abstract class ApiHelper { } - def moveAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.MoveAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.MoveAccountGroupAction() + def queryLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.QueryLdapServerAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.QueryLdapServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -42484,15 +36224,13 @@ abstract class ApiHelper { } - def queryAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.QueryAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.QueryAccountGroupAction() + def syncAccountsFromLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.SyncAccountsFromLdapServerAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.SyncAccountsFromLdapServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -42513,8 +36251,8 @@ abstract class ApiHelper { } - def removeAccountFromGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.RemoveAccountFromGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.RemoveAccountFromGroupAction() + def updateLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.UpdateLdapServerAction.class) Closure c) { + def a = new org.zstack.sdk.identity.ldap.api.UpdateLdapServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42540,8 +36278,8 @@ abstract class ApiHelper { } - def revokeResourceSharingToGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.RevokeResourceSharingToGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.RevokeResourceSharingToGroupAction() + def attachRoleToAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.AttachRoleToAccountAction.class) Closure c) { + def a = new org.zstack.sdk.identity.role.api.AttachRoleToAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42567,8 +36305,8 @@ abstract class ApiHelper { } - def shareResourceToGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.ShareResourceToGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.ShareResourceToGroupAction() + def createRole(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.CreateRoleAction.class) Closure c) { + def a = new org.zstack.sdk.identity.role.api.CreateRoleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42594,8 +36332,8 @@ abstract class ApiHelper { } - def updateAccountGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.accounts.UpdateAccountGroupAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.accounts.UpdateAccountGroupAction() + def deleteRole(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.DeleteRoleAction.class) Closure c) { + def a = new org.zstack.sdk.identity.role.api.DeleteRoleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42621,8 +36359,8 @@ abstract class ApiHelper { } - def getResourceEnsembleMembers(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.ensemble.GetResourceEnsembleMembersAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.ensemble.GetResourceEnsembleMembersAction() + def detachRoleFromAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.DetachRoleFromAccountAction.class) Closure c) { + def a = new org.zstack.sdk.identity.role.api.DetachRoleFromAccountAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42648,8 +36386,8 @@ abstract class ApiHelper { } - def getResourceSharing(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.iam1.ensemble.GetResourceSharingAction.class) Closure c) { - def a = new org.zstack.sdk.iam1.ensemble.GetResourceSharingAction() + def getRolePolicysAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.GetRolePolicyActionsAction.class) Closure c) { + def a = new org.zstack.sdk.identity.role.api.GetRolePolicyActionsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42675,8 +36413,8 @@ abstract class ApiHelper { } - def queryThirdPartyAccountSourceBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.imports.api.QueryThirdPartyAccountSourceBindingAction.class) Closure c) { - def a = new org.zstack.sdk.identity.imports.api.QueryThirdPartyAccountSourceBindingAction() + def queryRoleAccountRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.QueryRoleAccountRefAction.class) Closure c) { + def a = new org.zstack.sdk.identity.role.api.QueryRoleAccountRefAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42704,13 +36442,15 @@ abstract class ApiHelper { } - def addLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.AddLdapServerAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.AddLdapServerAction() + def queryRole(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.QueryRoleAction.class) Closure c) { + def a = new org.zstack.sdk.identity.role.api.QueryRoleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -42731,8 +36471,8 @@ abstract class ApiHelper { } - def createLdapBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.CreateLdapBindingAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.CreateLdapBindingAction() + def updateRole(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.UpdateRoleAction.class) Closure c) { + def a = new org.zstack.sdk.identity.role.api.UpdateRoleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42758,8 +36498,8 @@ abstract class ApiHelper { } - def deleteLdapBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.DeleteLdapBindingAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.DeleteLdapBindingAction() + def getManagementNodesStatus(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.managements.common.GetManagementNodesStatusAction.class) Closure c) { + def a = new org.zstack.sdk.managements.common.GetManagementNodesStatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42785,8 +36525,8 @@ abstract class ApiHelper { } - def deleteLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.DeleteLdapServerAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.DeleteLdapServerAction() + def getZSha2Status(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.managements.ha2.GetZSha2StatusAction.class) Closure c) { + def a = new org.zstack.sdk.managements.ha2.GetZSha2StatusAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42812,8 +36552,8 @@ abstract class ApiHelper { } - def getCandidateLdapEntryForBinding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.GetCandidateLdapEntryForBindingAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.GetCandidateLdapEntryForBindingAction() + def zSha2Demote(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.managements.ha2.ZSha2DemoteAction.class) Closure c) { + def a = new org.zstack.sdk.managements.ha2.ZSha2DemoteAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42839,8 +36579,8 @@ abstract class ApiHelper { } - def getLdapEntry(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.GetLdapEntryAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.GetLdapEntryAction() + def addSNSSmsReceiver(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.AddSNSSmsReceiverAction.class) Closure c) { + def a = new org.zstack.sdk.sns.AddSNSSmsReceiverAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42866,15 +36606,13 @@ abstract class ApiHelper { } - def queryLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.QueryLdapServerAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.QueryLdapServerAction() + def changeSNSApplicationEndpointState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.ChangeSNSApplicationEndpointStateAction.class) Closure c) { + def a = new org.zstack.sdk.sns.ChangeSNSApplicationEndpointStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -42895,8 +36633,8 @@ abstract class ApiHelper { } - def syncAccountsFromLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.SyncAccountsFromLdapServerAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.SyncAccountsFromLdapServerAction() + def changeSNSApplicationPlatformState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.ChangeSNSApplicationPlatformStateAction.class) Closure c) { + def a = new org.zstack.sdk.sns.ChangeSNSApplicationPlatformStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42922,8 +36660,8 @@ abstract class ApiHelper { } - def updateLdapServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.ldap.api.UpdateLdapServerAction.class) Closure c) { - def a = new org.zstack.sdk.identity.ldap.api.UpdateLdapServerAction() + def changeSNSTopicState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.ChangeSNSTopicStateAction.class) Closure c) { + def a = new org.zstack.sdk.sns.ChangeSNSTopicStateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42949,8 +36687,8 @@ abstract class ApiHelper { } - def attachRoleToAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.AttachRoleToAccountAction.class) Closure c) { - def a = new org.zstack.sdk.identity.role.api.AttachRoleToAccountAction() + def createSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.CreateSNSTopicAction.class) Closure c) { + def a = new org.zstack.sdk.sns.CreateSNSTopicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -42976,8 +36714,8 @@ abstract class ApiHelper { } - def createRole(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.CreateRoleAction.class) Closure c) { - def a = new org.zstack.sdk.identity.role.api.CreateRoleAction() + def deleteSNSApplicationEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.DeleteSNSApplicationEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.DeleteSNSApplicationEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43003,8 +36741,8 @@ abstract class ApiHelper { } - def deleteRole(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.DeleteRoleAction.class) Closure c) { - def a = new org.zstack.sdk.identity.role.api.DeleteRoleAction() + def deleteSNSApplicationPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.DeleteSNSApplicationPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.DeleteSNSApplicationPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43030,8 +36768,8 @@ abstract class ApiHelper { } - def detachRoleFromAccount(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.DetachRoleFromAccountAction.class) Closure c) { - def a = new org.zstack.sdk.identity.role.api.DetachRoleFromAccountAction() + def deleteSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.DeleteSNSTopicAction.class) Closure c) { + def a = new org.zstack.sdk.sns.DeleteSNSTopicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43057,13 +36795,15 @@ abstract class ApiHelper { } - def getRolePolicysAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.GetRolePolicyActionsAction.class) Closure c) { - def a = new org.zstack.sdk.identity.role.api.GetRolePolicyActionsAction() + def querySNSApplicationEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSApplicationEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.QuerySNSApplicationEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43084,8 +36824,8 @@ abstract class ApiHelper { } - def queryRoleAccountRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.QueryRoleAccountRefAction.class) Closure c) { - def a = new org.zstack.sdk.identity.role.api.QueryRoleAccountRefAction() + def querySNSApplicationPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSApplicationPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.QuerySNSApplicationPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43113,8 +36853,8 @@ abstract class ApiHelper { } - def queryRole(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.QueryRoleAction.class) Closure c) { - def a = new org.zstack.sdk.identity.role.api.QueryRoleAction() + def querySNSSmsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSSmsEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.QuerySNSSmsEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43142,13 +36882,15 @@ abstract class ApiHelper { } - def updateRole(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.identity.role.api.UpdateRoleAction.class) Closure c) { - def a = new org.zstack.sdk.identity.role.api.UpdateRoleAction() + def querySNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSTopicAction.class) Closure c) { + def a = new org.zstack.sdk.sns.QuerySNSTopicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43169,13 +36911,15 @@ abstract class ApiHelper { } - def addSNSSmsReceiver(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.AddSNSSmsReceiverAction.class) Closure c) { - def a = new org.zstack.sdk.sns.AddSNSSmsReceiverAction() + def querySNSTopicSubscriber(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSTopicSubscriberAction.class) Closure c) { + def a = new org.zstack.sdk.sns.QuerySNSTopicSubscriberAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43196,8 +36940,8 @@ abstract class ApiHelper { } - def changeSNSApplicationEndpointState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.ChangeSNSApplicationEndpointStateAction.class) Closure c) { - def a = new org.zstack.sdk.sns.ChangeSNSApplicationEndpointStateAction() + def removeSNSSmsReceiver(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.RemoveSNSSmsReceiverAction.class) Closure c) { + def a = new org.zstack.sdk.sns.RemoveSNSSmsReceiverAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43223,8 +36967,8 @@ abstract class ApiHelper { } - def changeSNSApplicationPlatformState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.ChangeSNSApplicationPlatformStateAction.class) Closure c) { - def a = new org.zstack.sdk.sns.ChangeSNSApplicationPlatformStateAction() + def subscribeSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.SubscribeSNSTopicAction.class) Closure c) { + def a = new org.zstack.sdk.sns.SubscribeSNSTopicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43250,8 +36994,8 @@ abstract class ApiHelper { } - def changeSNSTopicState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.ChangeSNSTopicStateAction.class) Closure c) { - def a = new org.zstack.sdk.sns.ChangeSNSTopicStateAction() + def unsubscribeSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.UnsubscribeSNSTopicAction.class) Closure c) { + def a = new org.zstack.sdk.sns.UnsubscribeSNSTopicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43277,8 +37021,8 @@ abstract class ApiHelper { } - def createSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.CreateSNSTopicAction.class) Closure c) { - def a = new org.zstack.sdk.sns.CreateSNSTopicAction() + def updateSNSApplicationEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.UpdateSNSApplicationEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.UpdateSNSApplicationEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43304,8 +37048,8 @@ abstract class ApiHelper { } - def deleteSNSApplicationEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.DeleteSNSApplicationEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.DeleteSNSApplicationEndpointAction() + def updateSNSApplicationPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.UpdateSNSApplicationPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.UpdateSNSApplicationPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43331,8 +37075,8 @@ abstract class ApiHelper { } - def deleteSNSApplicationPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.DeleteSNSApplicationPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.DeleteSNSApplicationPlatformAction() + def updateSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.UpdateSNSTopicAction.class) Closure c) { + def a = new org.zstack.sdk.sns.UpdateSNSTopicAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43358,8 +37102,8 @@ abstract class ApiHelper { } - def deleteSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.DeleteSNSTopicAction.class) Closure c) { - def a = new org.zstack.sdk.sns.DeleteSNSTopicAction() + def addSNSDingTalkAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.AddSNSDingTalkAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.dingtalk.AddSNSDingTalkAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43385,15 +37129,13 @@ abstract class ApiHelper { } - def querySNSApplicationEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSApplicationEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.QuerySNSApplicationEndpointAction() + def createSNSDingTalkEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.CreateSNSDingTalkEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.dingtalk.CreateSNSDingTalkEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43414,8 +37156,8 @@ abstract class ApiHelper { } - def querySNSApplicationPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSApplicationPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.QuerySNSApplicationPlatformAction() + def querySNSDingTalkAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.QuerySNSDingTalkAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.dingtalk.QuerySNSDingTalkAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43443,8 +37185,8 @@ abstract class ApiHelper { } - def querySNSSmsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSSmsEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.QuerySNSSmsEndpointAction() + def querySNSDingTalkEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.QuerySNSDingTalkEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.dingtalk.QuerySNSDingTalkEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43472,15 +37214,13 @@ abstract class ApiHelper { } - def querySNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSTopicAction.class) Closure c) { - def a = new org.zstack.sdk.sns.QuerySNSTopicAction() + def removeSNSDingTalkAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.RemoveSNSDingTalkAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.dingtalk.RemoveSNSDingTalkAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43501,15 +37241,40 @@ abstract class ApiHelper { } - def querySNSTopicSubscriber(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.QuerySNSTopicSubscriberAction.class) Closure c) { - def a = new org.zstack.sdk.sns.QuerySNSTopicSubscriberAction() + def sNSDingTalkTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.SNSDingTalkTestConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.dingtalk.SNSDingTalkTestConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { + if (a.apiId == null) { + a.apiId = Platform.uuid + } + + def tracker = new ApiPathTracker(a.apiId) + def out = errorOut(a.call()) + def path = tracker.getApiPath() + if (!path.isEmpty()) { + Test.apiPaths[a.class.name] = path.join(" --->\n") + } + + return out + } else { + return errorOut(a.call()) + } + } + + + def updateAtPersonOfAtDingTalkEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.UpdateAtPersonOfAtDingTalkEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.dingtalk.UpdateAtPersonOfAtDingTalkEndpointAction() + a.sessionId = Test.currentEnvSpec?.session?.uuid + c.resolveStrategy = Closure.OWNER_FIRST + c.delegate = a + c() + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43530,8 +37295,8 @@ abstract class ApiHelper { } - def removeSNSSmsReceiver(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.RemoveSNSSmsReceiverAction.class) Closure c) { - def a = new org.zstack.sdk.sns.RemoveSNSSmsReceiverAction() + def updateSNSDingTalkEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.UpdateSNSDingTalkEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.dingtalk.UpdateSNSDingTalkEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43557,8 +37322,8 @@ abstract class ApiHelper { } - def subscribeSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.SubscribeSNSTopicAction.class) Closure c) { - def a = new org.zstack.sdk.sns.SubscribeSNSTopicAction() + def addEmailAddressToSNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.AddEmailAddressToSNSEmailEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.AddEmailAddressToSNSEmailEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43584,8 +37349,8 @@ abstract class ApiHelper { } - def unsubscribeSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.UnsubscribeSNSTopicAction.class) Closure c) { - def a = new org.zstack.sdk.sns.UnsubscribeSNSTopicAction() + def createSNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.CreateSNSEmailEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.CreateSNSEmailEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43611,8 +37376,8 @@ abstract class ApiHelper { } - def updateSNSApplicationEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.UpdateSNSApplicationEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.UpdateSNSApplicationEndpointAction() + def createSNSEmailPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.CreateSNSEmailPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.CreateSNSEmailPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43638,8 +37403,8 @@ abstract class ApiHelper { } - def updateSNSApplicationPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.UpdateSNSApplicationPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.UpdateSNSApplicationPlatformAction() + def deleteEmailAddressOfSNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.DeleteEmailAddressOfSNSEmailEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.DeleteEmailAddressOfSNSEmailEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43665,13 +37430,15 @@ abstract class ApiHelper { } - def updateSNSTopic(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.UpdateSNSTopicAction.class) Closure c) { - def a = new org.zstack.sdk.sns.UpdateSNSTopicAction() + def querySNSEmailAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.QuerySNSEmailAddressAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.QuerySNSEmailAddressAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43692,13 +37459,15 @@ abstract class ApiHelper { } - def createSNSAliyunSmsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.aliyunsms.CreateSNSAliyunSmsEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.aliyunsms.CreateSNSAliyunSmsEndpointAction() + def querySNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.QuerySNSEmailEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.QuerySNSEmailEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43719,13 +37488,15 @@ abstract class ApiHelper { } - def validateSNSAliyunSmsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.aliyunsms.ValidateSNSAliyunSmsEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.aliyunsms.ValidateSNSAliyunSmsEndpointAction() + def querySNSEmailPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.QuerySNSEmailPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.QuerySNSEmailPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43746,8 +37517,8 @@ abstract class ApiHelper { } - def addSNSDingTalkAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.AddSNSDingTalkAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.dingtalk.AddSNSDingTalkAtPersonAction() + def sNSEmailTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.SNSEmailTestConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.SNSEmailTestConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43773,8 +37544,8 @@ abstract class ApiHelper { } - def createSNSDingTalkEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.CreateSNSDingTalkEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.dingtalk.CreateSNSDingTalkEndpointAction() + def updateEmailAddressOfSNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.UpdateEmailAddressOfSNSEmailEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.UpdateEmailAddressOfSNSEmailEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43800,15 +37571,13 @@ abstract class ApiHelper { } - def querySNSDingTalkAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.QuerySNSDingTalkAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.dingtalk.QuerySNSDingTalkAtPersonAction() + def validateSNSEmailPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.ValidateSNSEmailPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.email.ValidateSNSEmailPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43829,15 +37598,13 @@ abstract class ApiHelper { } - def querySNSDingTalkEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.QuerySNSDingTalkEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.dingtalk.QuerySNSDingTalkEndpointAction() + def addSNSFeiShuAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.AddSNSFeiShuAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.feishu.AddSNSFeiShuAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43858,8 +37625,8 @@ abstract class ApiHelper { } - def removeSNSDingTalkAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.RemoveSNSDingTalkAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.dingtalk.RemoveSNSDingTalkAtPersonAction() + def createSNSFeiShuEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.CreateSNSFeiShuEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.feishu.CreateSNSFeiShuEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43885,13 +37652,15 @@ abstract class ApiHelper { } - def sNSDingTalkTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.SNSDingTalkTestConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.dingtalk.SNSDingTalkTestConnectionAction() + def querySNSFeiShuAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.QuerySNSFeiShuAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.feishu.QuerySNSFeiShuAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43912,13 +37681,15 @@ abstract class ApiHelper { } - def updateAtPersonOfAtDingTalkEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.UpdateAtPersonOfAtDingTalkEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.dingtalk.UpdateAtPersonOfAtDingTalkEndpointAction() + def querySNSFeiShuEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.QuerySNSFeiShuEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.feishu.QuerySNSFeiShuEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -43939,8 +37710,8 @@ abstract class ApiHelper { } - def updateSNSDingTalkEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.dingtalk.UpdateSNSDingTalkEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.dingtalk.UpdateSNSDingTalkEndpointAction() + def removeSNSFeiShuAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.RemoveSNSFeiShuAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.feishu.RemoveSNSFeiShuAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43966,8 +37737,8 @@ abstract class ApiHelper { } - def addEmailAddressToSNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.AddEmailAddressToSNSEmailEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.AddEmailAddressToSNSEmailEndpointAction() + def sNSFeiShuTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.SNSFeiShuTestConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.feishu.SNSFeiShuTestConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -43993,8 +37764,8 @@ abstract class ApiHelper { } - def createSNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.CreateSNSEmailEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.CreateSNSEmailEndpointAction() + def updateAtPersonOfAtFeiShuEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.UpdateAtPersonOfAtFeiShuEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.feishu.UpdateAtPersonOfAtFeiShuEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44020,8 +37791,8 @@ abstract class ApiHelper { } - def createSNSEmailPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.CreateSNSEmailPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.CreateSNSEmailPlatformAction() + def updateSNSFeiShuEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.UpdateSNSFeiShuEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.feishu.UpdateSNSFeiShuEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44047,8 +37818,8 @@ abstract class ApiHelper { } - def deleteEmailAddressOfSNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.DeleteEmailAddressOfSNSEmailEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.DeleteEmailAddressOfSNSEmailEndpointAction() + def createSNSHttpEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.http.CreateSNSHttpEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.http.CreateSNSHttpEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44074,8 +37845,8 @@ abstract class ApiHelper { } - def querySNSEmailAddress(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.QuerySNSEmailAddressAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.QuerySNSEmailAddressAction() + def querySNSHttpEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.http.QuerySNSHttpEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.http.QuerySNSHttpEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44103,15 +37874,13 @@ abstract class ApiHelper { } - def querySNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.QuerySNSEmailEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.QuerySNSEmailEndpointAction() + def sNSHttpTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.http.SNSHttpTestConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.http.SNSHttpTestConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -44132,15 +37901,13 @@ abstract class ApiHelper { } - def querySNSEmailPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.QuerySNSEmailPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.QuerySNSEmailPlatformAction() + def updateSNSHttpEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.http.UpdateSNSHttpEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.http.UpdateSNSHttpEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -44161,8 +37928,8 @@ abstract class ApiHelper { } - def sNSEmailTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.SNSEmailTestConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.SNSEmailTestConnectionAction() + def createSNSMicrosoftTeamsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.microsoftteams.CreateSNSMicrosoftTeamsEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.microsoftteams.CreateSNSMicrosoftTeamsEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44188,13 +37955,15 @@ abstract class ApiHelper { } - def updateEmailAddressOfSNSEmailEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.UpdateEmailAddressOfSNSEmailEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.UpdateEmailAddressOfSNSEmailEndpointAction() + def querySNSMicrosoftTeamsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.microsoftteams.QuerySNSMicrosoftTeamsEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.microsoftteams.QuerySNSMicrosoftTeamsEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -44215,8 +37984,8 @@ abstract class ApiHelper { } - def validateSNSEmailPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.email.ValidateSNSEmailPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.email.ValidateSNSEmailPlatformAction() + def sNSMicrosoftTeamsTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.microsoftteams.SNSMicrosoftTeamsTestConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.microsoftteams.SNSMicrosoftTeamsTestConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44242,8 +38011,8 @@ abstract class ApiHelper { } - def addSNSFeiShuAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.AddSNSFeiShuAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.feishu.AddSNSFeiShuAtPersonAction() + def updateSNSMicrosoftTeamsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.microsoftteams.UpdateSNSMicrosoftTeamsEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.microsoftteams.UpdateSNSMicrosoftTeamsEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44269,8 +38038,8 @@ abstract class ApiHelper { } - def createSNSFeiShuEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.CreateSNSFeiShuEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.feishu.CreateSNSFeiShuEndpointAction() + def createSNSSnmpEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.CreateSNSSnmpEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.snmp.CreateSNSSnmpEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44296,15 +38065,13 @@ abstract class ApiHelper { } - def querySNSFeiShuAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.QuerySNSFeiShuAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.feishu.QuerySNSFeiShuAtPersonAction() + def createSNSSnmpPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.CreateSNSSnmpPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.snmp.CreateSNSSnmpPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -44325,8 +38092,8 @@ abstract class ApiHelper { } - def querySNSFeiShuEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.QuerySNSFeiShuEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.feishu.QuerySNSFeiShuEndpointAction() + def querySNSSnmpPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.QuerySNSSnmpPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.snmp.QuerySNSSnmpPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44354,8 +38121,8 @@ abstract class ApiHelper { } - def removeSNSFeiShuAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.RemoveSNSFeiShuAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.feishu.RemoveSNSFeiShuAtPersonAction() + def sNSSnmpTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.SNSSnmpTestConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.snmp.SNSSnmpTestConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44381,8 +38148,8 @@ abstract class ApiHelper { } - def sNSFeiShuTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.SNSFeiShuTestConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.feishu.SNSFeiShuTestConnectionAction() + def updateSNSSnmpPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.UpdateSNSSnmpPlatformAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.snmp.UpdateSNSSnmpPlatformAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44408,8 +38175,8 @@ abstract class ApiHelper { } - def updateAtPersonOfAtFeiShuEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.UpdateAtPersonOfAtFeiShuEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.feishu.UpdateAtPersonOfAtFeiShuEndpointAction() + def addSNSWeComAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.AddSNSWeComAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.wecom.AddSNSWeComAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44435,8 +38202,8 @@ abstract class ApiHelper { } - def updateSNSFeiShuEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.feishu.UpdateSNSFeiShuEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.feishu.UpdateSNSFeiShuEndpointAction() + def createSNSWeComEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.CreateSNSWeComEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.wecom.CreateSNSWeComEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44462,13 +38229,15 @@ abstract class ApiHelper { } - def createSNSHttpEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.http.CreateSNSHttpEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.http.CreateSNSHttpEndpointAction() + def querySNSWeComAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.QuerySNSWeComAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.wecom.QuerySNSWeComAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -44489,8 +38258,8 @@ abstract class ApiHelper { } - def querySNSHttpEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.http.QuerySNSHttpEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.http.QuerySNSHttpEndpointAction() + def querySNSWeComEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.QuerySNSWeComEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.wecom.QuerySNSWeComEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44518,8 +38287,8 @@ abstract class ApiHelper { } - def sNSHttpTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.http.SNSHttpTestConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.http.SNSHttpTestConnectionAction() + def removeSNSWeComAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.RemoveSNSWeComAtPersonAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.wecom.RemoveSNSWeComAtPersonAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44545,8 +38314,8 @@ abstract class ApiHelper { } - def updateSNSHttpEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.http.UpdateSNSHttpEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.http.UpdateSNSHttpEndpointAction() + def sNSWeComTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.SNSWeComTestConnectionAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.wecom.SNSWeComTestConnectionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44572,8 +38341,8 @@ abstract class ApiHelper { } - def createSNSMicrosoftTeamsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.microsoftteams.CreateSNSMicrosoftTeamsEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.microsoftteams.CreateSNSMicrosoftTeamsEndpointAction() + def updateAtPersonOfAtWeComEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.UpdateAtPersonOfAtWeComEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.wecom.UpdateAtPersonOfAtWeComEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44599,15 +38368,13 @@ abstract class ApiHelper { } - def querySNSMicrosoftTeamsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.microsoftteams.QuerySNSMicrosoftTeamsEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.microsoftteams.QuerySNSMicrosoftTeamsEndpointAction() + def updateSNSWeComEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.UpdateSNSWeComEndpointAction.class) Closure c) { + def a = new org.zstack.sdk.sns.platform.wecom.UpdateSNSWeComEndpointAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -44628,8 +38395,8 @@ abstract class ApiHelper { } - def sNSMicrosoftTeamsTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.microsoftteams.SNSMicrosoftTeamsTestConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.microsoftteams.SNSMicrosoftTeamsTestConnectionAction() + def addZBox(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.zbox.AddZBoxAction.class) Closure c) { + def a = new org.zstack.sdk.zbox.AddZBoxAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44655,8 +38422,8 @@ abstract class ApiHelper { } - def updateSNSMicrosoftTeamsEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.microsoftteams.UpdateSNSMicrosoftTeamsEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.microsoftteams.UpdateSNSMicrosoftTeamsEndpointAction() + def createZBoxBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.zbox.CreateZBoxBackupAction.class) Closure c) { + def a = new org.zstack.sdk.zbox.CreateZBoxBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44682,8 +38449,8 @@ abstract class ApiHelper { } - def createSNSSnmpEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.CreateSNSSnmpEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.snmp.CreateSNSSnmpEndpointAction() + def ejectZBox(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.zbox.EjectZBoxAction.class) Closure c) { + def a = new org.zstack.sdk.zbox.EjectZBoxAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44709,8 +38476,8 @@ abstract class ApiHelper { } - def createSNSSnmpPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.CreateSNSSnmpPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.snmp.CreateSNSSnmpPlatformAction() + def getZBoxBackupDetails(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.zbox.GetZBoxBackupDetailsAction.class) Closure c) { + def a = new org.zstack.sdk.zbox.GetZBoxBackupDetailsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44736,8 +38503,8 @@ abstract class ApiHelper { } - def querySNSSnmpPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.QuerySNSSnmpPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.snmp.QuerySNSSnmpPlatformAction() + def queryZBox(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.zbox.QueryZBoxAction.class) Closure c) { + def a = new org.zstack.sdk.zbox.QueryZBoxAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44765,13 +38532,15 @@ abstract class ApiHelper { } - def sNSSnmpTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.SNSSnmpTestConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.snmp.SNSSnmpTestConnectionAction() + def queryZBoxBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.zbox.QueryZBoxBackupAction.class) Closure c) { + def a = new org.zstack.sdk.zbox.QueryZBoxBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() + a.conditions = a.conditions.collect { it.toString() } + if (System.getProperty("apipath") != null) { if (a.apiId == null) { @@ -44792,8 +38561,8 @@ abstract class ApiHelper { } - def updateSNSSnmpPlatform(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.snmp.UpdateSNSSnmpPlatformAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.snmp.UpdateSNSSnmpPlatformAction() + def syncZBoxCapacity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.zbox.SyncZBoxCapacityAction.class) Closure c) { + def a = new org.zstack.sdk.zbox.SyncZBoxCapacityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -44819,26 +38588,25 @@ abstract class ApiHelper { } - def addSNSWeComAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.AddSNSWeComAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.wecom.AddSNSWeComAtPersonAction() + def cleanSoftwarePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.softwarePackage.header.CleanSoftwarePackageAction.class) Closure c) { + def a = new org.zstack.sdk.softwarePackage.header.CleanSoftwarePackageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid } - + def tracker = new ApiPathTracker(a.apiId) def out = errorOut(a.call()) def path = tracker.getApiPath() if (!path.isEmpty()) { Test.apiPaths[a.class.name] = path.join(" --->\n") } - + return out } else { return errorOut(a.call()) @@ -44846,26 +38614,25 @@ abstract class ApiHelper { } - def createSNSWeComEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.CreateSNSWeComEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.wecom.CreateSNSWeComEndpointAction() + def getDirectoryUsage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.softwarePackage.header.GetDirectoryUsageAction.class) Closure c) { + def a = new org.zstack.sdk.softwarePackage.header.GetDirectoryUsageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid } - + def tracker = new ApiPathTracker(a.apiId) def out = errorOut(a.call()) def path = tracker.getApiPath() if (!path.isEmpty()) { Test.apiPaths[a.class.name] = path.join(" --->\n") } - + return out } else { return errorOut(a.call()) @@ -44873,28 +38640,25 @@ abstract class ApiHelper { } - def querySNSWeComAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.QuerySNSWeComAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.wecom.QuerySNSWeComAtPersonAction() + def getUploadSoftwarePackageJobDetails(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.softwarePackage.header.GetUploadSoftwarePackageJobDetailsAction.class) Closure c) { + def a = new org.zstack.sdk.softwarePackage.header.GetUploadSoftwarePackageJobDetailsAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - - a.conditions = a.conditions.collect { it.toString() } - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid } - + def tracker = new ApiPathTracker(a.apiId) def out = errorOut(a.call()) def path = tracker.getApiPath() if (!path.isEmpty()) { Test.apiPaths[a.class.name] = path.join(" --->\n") } - + return out } else { return errorOut(a.call()) @@ -44902,28 +38666,22 @@ abstract class ApiHelper { } - def querySNSWeComEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.QuerySNSWeComEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.wecom.QuerySNSWeComEndpointAction() + def installSoftwarePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.softwarePackage.header.InstallSoftwarePackageAction.class) Closure c) { + def a = new org.zstack.sdk.softwarePackage.header.InstallSoftwarePackageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - - a.conditions = a.conditions.collect { it.toString() } - - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid } - def tracker = new ApiPathTracker(a.apiId) def out = errorOut(a.call()) def path = tracker.getApiPath() if (!path.isEmpty()) { Test.apiPaths[a.class.name] = path.join(" --->\n") } - return out } else { return errorOut(a.call()) @@ -44931,53 +38689,28 @@ abstract class ApiHelper { } - def removeSNSWeComAtPerson(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.RemoveSNSWeComAtPersonAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.wecom.RemoveSNSWeComAtPersonAction() + def querySoftwarePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.softwarePackage.header.QuerySoftwarePackageAction.class) Closure c) { + def a = new org.zstack.sdk.softwarePackage.header.QuerySoftwarePackageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } + a.conditions = a.conditions.collect { it.toString() } - def sNSWeComTestConnection(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.SNSWeComTestConnectionAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.wecom.SNSWeComTestConnectionAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid } - + def tracker = new ApiPathTracker(a.apiId) def out = errorOut(a.call()) def path = tracker.getApiPath() if (!path.isEmpty()) { Test.apiPaths[a.class.name] = path.join(" --->\n") } - + return out } else { return errorOut(a.call()) @@ -44985,26 +38718,26 @@ abstract class ApiHelper { } - def updateAtPersonOfAtWeComEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.UpdateAtPersonOfAtWeComEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.wecom.UpdateAtPersonOfAtWeComEndpointAction() + def uninstallSoftwarePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.softwarePackage.header.UninstallSoftwarePackageAction.class) Closure c) { + def a = new org.zstack.sdk.softwarePackage.header.UninstallSoftwarePackageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - + if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid } - + def tracker = new ApiPathTracker(a.apiId) def out = errorOut(a.call()) def path = tracker.getApiPath() if (!path.isEmpty()) { Test.apiPaths[a.class.name] = path.join(" --->\n") } - + return out } else { return errorOut(a.call()) @@ -45012,26 +38745,25 @@ abstract class ApiHelper { } - def updateSNSWeComEndpoint(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.sns.platform.wecom.UpdateSNSWeComEndpointAction.class) Closure c) { - def a = new org.zstack.sdk.sns.platform.wecom.UpdateSNSWeComEndpointAction() + def uploadSoftwarePackage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.softwarePackage.header.UploadSoftwarePackageAction.class) Closure c) { + def a = new org.zstack.sdk.softwarePackage.header.UploadSoftwarePackageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a c() - if (System.getProperty("apipath") != null) { if (a.apiId == null) { a.apiId = Platform.uuid } - + def tracker = new ApiPathTracker(a.apiId) def out = errorOut(a.call()) def path = tracker.getApiPath() if (!path.isEmpty()) { Test.apiPaths[a.class.name] = path.join(" --->\n") } - + return out } else { return errorOut(a.call()) diff --git a/testlib/src/main/java/org/zstack/testlib/EnvSpec.groovy b/testlib/src/main/java/org/zstack/testlib/EnvSpec.groovy index b0090cd364..240df36d6f 100755 --- a/testlib/src/main/java/org/zstack/testlib/EnvSpec.groovy +++ b/testlib/src/main/java/org/zstack/testlib/EnvSpec.groovy @@ -40,7 +40,6 @@ import org.zstack.sdk.sns.CreateSNSTopicAction import org.zstack.sdk.sns.DeleteSNSApplicationEndpointAction import org.zstack.sdk.sns.DeleteSNSApplicationPlatformAction import org.zstack.sdk.sns.DeleteSNSTopicAction -import org.zstack.sdk.sns.platform.aliyunsms.CreateSNSAliyunSmsEndpointAction import org.zstack.sdk.sns.platform.dingtalk.CreateSNSDingTalkEndpointAction import org.zstack.sdk.sns.platform.email.CreateSNSEmailEndpointAction import org.zstack.sdk.sns.platform.email.CreateSNSEmailPlatformAction @@ -64,6 +63,7 @@ import org.zstack.testlib.identity.IdentitySpec import org.zstack.testlib.identity.ldap.LdapServerSpec import org.zstack.testlib.identity.ldap.LdapVirtualEndpointSpec import org.zstack.testlib.vfs.VFS +import org.zstack.testlib.vops.VOpsVirtualEndpointSpec import org.zstack.utils.BeanUtils import org.zstack.utils.DebugUtils import org.zstack.utils.data.Pair @@ -164,7 +164,6 @@ class EnvSpec extends ApiHelper implements Node { [SubscribeEventAction.metaClass, SubscribeEventAction.Result.metaClass, UnsubscribeEventAction.class], [CreateSNSHttpEndpointAction.metaClass, CreateSNSHttpEndpointAction.Result.metaClass, DeleteSNSApplicationEndpointAction.class], [CreateSNSDingTalkEndpointAction.metaClass, CreateSNSDingTalkEndpointAction.Result.metaClass, DeleteSNSApplicationEndpointAction.class], - [CreateSNSAliyunSmsEndpointAction.metaClass, CreateSNSAliyunSmsEndpointAction.Result.metaClass, DeleteSNSApplicationEndpointAction.class], [CreateSNSTextTemplateAction.metaClass, CreateSNSTextTemplateAction.Result.metaClass, DeleteSNSTextTemplateAction.class], [CreateAliyunSmsSNSTextTemplateAction.metaClass, CreateAliyunSmsSNSTextTemplateAction.Result.metaClass, DeleteSNSTextTemplateAction.class], [CreateEmailMonitorTriggerActionAction.metaClass, CreateEmailMonitorTriggerActionAction.Result.metaClass, DeleteMonitorTriggerActionAction.class], @@ -176,8 +175,6 @@ class EnvSpec extends ApiHelper implements Node { [CreateTagAction.metaClass, CreateTagAction.Result.metaClass, DeleteTagAction.class], [CreateResourcePriceAction.metaClass, CreateResourcePriceAction.Result.metaClass, DeleteResourcePriceAction.class], [CreatePriceTableAction.metaClass, CreatePriceTableAction.Result.metaClass, DeletePriceTableAction.class], - [CreateAliyunProxyVpcAction.metaClass, CreateAliyunProxyVpcAction.Result.metaClass, DeleteAliyunProxyVpcAction.class], - [CreateAliyunProxyVSwitchAction.metaClass, CreateAliyunProxyVSwitchAction.Result.metaClass, DeleteAliyunProxyVSwitchAction.class], [CreateMonitorGroupAction.metaClass, CreateMonitorGroupAction.Result.metaClass, DeleteMonitorGroupAction.class], [CreateMonitorTemplateAction.metaClass, CreateMonitorTemplateAction.Result.metaClass, DeleteMonitorTemplateAction.class], [CreateDirectoryAction.metaClass, CreateDirectoryAction.Result.metaClass, DeleteDirectoryAction.class], @@ -393,6 +390,16 @@ class EnvSpec extends ApiHelper implements Node { return i } + VOpsVirtualEndpointSpec vops( + @DelegatesTo(strategy = Closure.DELEGATE_FIRST, value = VOpsVirtualEndpointSpec.class) Closure c) { + def subSpec = new VOpsVirtualEndpointSpec(this) + c.delegate = subSpec + c.resolveStrategy = Closure.DELEGATE_FIRST + c() + addChild(subSpec) + return subSpec + } + void adminLogin() { session = login(AccountConstant.INITIAL_SYSTEM_ADMIN_NAME, AccountConstant.INITIAL_SYSTEM_ADMIN_PASSWORD) } diff --git a/testlib/src/main/java/org/zstack/testlib/ExternalPrimaryStorageSpec.groovy b/testlib/src/main/java/org/zstack/testlib/ExternalPrimaryStorageSpec.groovy index e9f5580767..a347942694 100644 --- a/testlib/src/main/java/org/zstack/testlib/ExternalPrimaryStorageSpec.groovy +++ b/testlib/src/main/java/org/zstack/testlib/ExternalPrimaryStorageSpec.groovy @@ -3,6 +3,7 @@ package org.zstack.testlib import org.springframework.http.HttpEntity import org.zstack.cbd.LogicalPoolInfo import org.zstack.cbd.kvm.KvmCbdCommands +import org.zstack.kvm.KVMAgentCommands import org.zstack.sdk.PrimaryStorageInventory import org.zstack.storage.zbs.ZbsPrimaryStorageMdsBase import org.zstack.storage.zbs.ZbsStorageController @@ -70,6 +71,29 @@ class ExternalPrimaryStorageSpec extends PrimaryStorageSpec { return rsp } + simulator(ZbsStorageController.GET_FACTS_PATH) { HttpEntity e, EnvSpec spec -> + ZbsStorageController.GetFactsCmd cmd = JSONObjectUtil.toObject(e.body, ZbsStorageController.GetFactsCmd.class) + ExternalPrimaryStorageSpec zspec = spec.specByUuid(cmd.uuid) + assert zspec != null: "cannot found zbs primary storage[uuid:${cmd.uuid}], check your environment()." + + def rsp = new ZbsStorageController.GetFactsRsp() + rsp.uuid = "123456789" + rsp.version = "1.6.1-for-test" + rsp.success = true + + return rsp + } + + simulator(ZbsStorageController.CHECK_HOST_STORAGE_CONNECTION_PATH) { HttpEntity e -> + ZbsStorageController.CheckHostStorageConnectionCmd cmd = JSONObjectUtil.toObject(e.body, ZbsStorageController.CheckHostStorageConnectionCmd.class) + assert cmd.hostUuid != null + + def rsp = new ZbsStorageController.CheckHostStorageConnectionRsp() + rsp.success = true + + return rsp + } + simulator(ZbsStorageController.GET_CAPACITY_PATH) { HttpEntity e, EnvSpec spec -> ZbsStorageController.GetCapacityCmd cmd = JSONObjectUtil.toObject(e.body, ZbsStorageController.GetCapacityCmd.class) ExternalPrimaryStorageSpec zspec = spec.specByUuid(cmd.uuid) @@ -185,6 +209,11 @@ class ExternalPrimaryStorageSpec extends PrimaryStorageSpec { return rsp } + + simulator(ZbsStorageController.GET_VOLUME_CLIENTS_PATH) { HttpEntity e, EnvSpec spec -> + return new ZbsStorageController.GetVolumeClientsRsp() + } + simulator(KvmCbdCommands.SETUP_CBD_SELF_FENCER_PATH) { return new KvmCbdCommands.AgentRsp() } diff --git a/testlib/src/main/java/org/zstack/testlib/KVMSimulator.groovy b/testlib/src/main/java/org/zstack/testlib/KVMSimulator.groovy index d15f2c9957..20a1eb571d 100755 --- a/testlib/src/main/java/org/zstack/testlib/KVMSimulator.groovy +++ b/testlib/src/main/java/org/zstack/testlib/KVMSimulator.groovy @@ -179,6 +179,7 @@ class KVMSimulator implements Simulator { rsp.hvmCpuFlag = "" rsp.cpuCache = "64.0,4096.0,16384.0" rsp.nqn = "nqn.2014-08.org.nvmexpress:uuid:748d0363-8366-44db-803b-146effb96988" + rsp.hostname = "hostname" rsp.iscsiInitiatorName = "iqn.1994-05.com.redhat:" + hostUuid.substring(0, 12) rsp.virtualizerInfo = new VirtualizerInfoTO() rsp.virtualizerInfo.version = "4.2.0-627.g36ee592.el7" @@ -254,11 +255,11 @@ class KVMSimulator implements Simulator { .param("deviceId", cmd.volume.getDeviceId()) .find() - assert vol : "cannot find dest volume[path: ${cmd.destPath}, deviceId: ${cmd.volume.getDeviceId()}] of VM[uuid: ${cmd.vmUuid}] in database" + assert vol: "cannot find dest volume[path: ${cmd.destPath}, deviceId: ${cmd.volume.getDeviceId()}] of VM[uuid: ${cmd.vmUuid}] in database" volume = vol.toInventory() primaryStorageType = q(PrimaryStorageVO.class).select(PrimaryStorageVO_.type).eq(PrimaryStorageVO_.uuid, vol.primaryStorageUuid).findValue() - assert primaryStorageType : "cannot find primary storage[uuid: ${vol.primaryStorageUuid}]" + assert primaryStorageType: "cannot find primary storage[uuid: ${vol.primaryStorageUuid}]" } }.execute() @@ -274,10 +275,10 @@ class KVMSimulator implements Simulator { KVMAgentCommands.TakeSnapshotCmd cmd = JSONObjectUtil.toObject(e.body, KVMAgentCommands.TakeSnapshotCmd.class) VolumeVO volume = Q.New(VolumeVO.class).eq(VolumeVO_.uuid, cmd.volumeUuid).find() - assert volume : "cannot find volume[uuid: ${cmd.volumeUuid}]" + assert volume: "cannot find volume[uuid: ${cmd.volumeUuid}]" String primaryStorageType = Q.New(PrimaryStorageVO.class).select(PrimaryStorageVO_.type) .eq(PrimaryStorageVO_.uuid, volume.primaryStorageUuid).findValue() - assert primaryStorageType : "cannot find primary storage[uuid: ${volume.primaryStorageUuid}] from volume[uuid: ${volume.uuid}, name: ${volume.name}]" + assert primaryStorageType: "cannot find primary storage[uuid: ${volume.primaryStorageUuid}] from volume[uuid: ${volume.uuid}, name: ${volume.name}]" VFSPrimaryStorageTakeSnapshotBackend bkd = getVFSPrimaryStorageTakeSnapshotBackend(primaryStorageType) VFSSnapshot snapshot = bkd.takeSnapshot(e, espec, cmd, volume.toInventory() as VolumeInventory) @@ -361,7 +362,7 @@ class KVMSimulator implements Simulator { // assume all data volumes has same deviceType. if (Q.New(PrimaryStorageVO.class).select(PrimaryStorageVO_.type).listValues().stream().distinct().count() == 1) { assert (cmd.addons["attachedDataVolumes"] as List).stream() - .allMatch({vol -> vol.deviceType == cmd.volume.deviceType}) + .allMatch({ vol -> vol.deviceType == cmd.volume.deviceType }) } return new KVMAgentCommands.AttachDataVolumeResponse() } @@ -443,7 +444,7 @@ class KVMSimulator implements Simulator { } spec.simulator(KVMConstant.KVM_DELETE_VHOST_USER_CLIENT_PATH) { - return new KVMAgentCommands.AgentResponse() + return new KVMAgentCommands.AgentResponse() } spec.simulator(KVMConstant.KVM_SYNC_VM_DEVICEINFO_PATH) { HttpEntity e -> @@ -461,7 +462,7 @@ class KVMSimulator implements Simulator { spec.simulator(KVMConstant.KVM_START_VM_PATH) { HttpEntity e -> StartVmCmd cmd = JSONObjectUtil.toObject(e.body, StartVmCmd.class) assert new HashSet<>(cmd.dataVolumes.deviceId).size() == cmd.dataVolumes.size() - StartVmResponse rsp = new StartVmResponse() + StartVmResponse rsp = new StartVmResponse() rsp.virtualDeviceInfoList = [] List pciInfo = new ArrayList() pciInfo.add(cmd.rootVolume) @@ -575,12 +576,12 @@ class KVMSimulator implements Simulator { KVMAgentCommands.CheckFileOnHostCmd cmd = JSONObjectUtil.toObject(e.body, KVMAgentCommands.CheckFileOnHostCmd.class) KVMAgentCommands.CheckFileOnHostResponse response = new KVMAgentCommands.CheckFileOnHostResponse() response.existPaths = new HashMap<>() - cmd.paths.forEach({path -> response.existPaths.put(path, "")}) + cmd.paths.forEach({ path -> response.existPaths.put(path, "") }) return response } spec.simulator(KVMConstant.KVM_HOST_NUMA_PATH) { - def rsp = new KVMAgentCommands.GetHostNUMATopologyResponse() + def rsp = new KVMAgentCommands.GetHostNUMATopologyResponse() return rsp } @@ -595,7 +596,7 @@ class KVMSimulator implements Simulator { return rsp } - spec.simulator(KVMConstant.KVM_BLOCK_COMMIT_VOLUME_PATH) { HttpEntity e -> + spec.simulator(KVMConstant.KVM_BLOCK_COMMIT_VOLUME_PATH) { HttpEntity e -> def rsp = new BlockCommitResponse() rsp.size = 1 return rsp @@ -605,11 +606,11 @@ class KVMSimulator implements Simulator { BlockCommitCmd cmd = JSONObjectUtil.toObject(e.body, BlockCommitCmd.class) VolumeVO volume = Q.New(VolumeVO.class).eq(VolumeVO_.uuid, cmd.volume.getVolumeUuid()).find() - assert volume : "cannot find volume[uuid: ${cmd.volume.getVolumeUuid()}]" + assert volume: "cannot find volume[uuid: ${cmd.volume.getVolumeUuid()}]" String primaryStorageType = Q.New(PrimaryStorageVO.class).select(PrimaryStorageVO_.type) .eq(PrimaryStorageVO_.uuid, volume.primaryStorageUuid).findValue() - assert primaryStorageType : "cannot find primary storage[uuid: ${volume.primaryStorageUuid}] " + + assert primaryStorageType: "cannot find primary storage[uuid: ${volume.primaryStorageUuid}] " + "from volume[uuid: ${volume.uuid}, name: ${volume.name}]" VFSPrimaryStorageTakeSnapshotBackend bkd = getVFSPrimaryStorageTakeSnapshotBackend(primaryStorageType) @@ -617,7 +618,7 @@ class KVMSimulator implements Simulator { return rsp } - spec.simulator(KVMConstant.KVM_BLOCK_PULL_VOLUME_PATH) { HttpEntity e -> + spec.simulator(KVMConstant.KVM_BLOCK_PULL_VOLUME_PATH) { HttpEntity e -> def rsp = new BlockPullResponse() rsp.size = 1 return rsp @@ -627,11 +628,11 @@ class KVMSimulator implements Simulator { BlockPullCmd cmd = JSONObjectUtil.toObject(e.body, BlockPullCmd.class) VolumeVO volume = Q.New(VolumeVO.class).eq(VolumeVO_.uuid, cmd.volume.getVolumeUuid()).find() - assert volume : "cannot find volume[uuid: ${cmd.getVolume().getVolumeUuid()}]" + assert volume: "cannot find volume[uuid: ${cmd.getVolume().getVolumeUuid()}]" String primaryStorageType = Q.New(PrimaryStorageVO.class).select(PrimaryStorageVO_.type) .eq(PrimaryStorageVO_.uuid, volume.primaryStorageUuid).findValue() - assert primaryStorageType : "cannot find primary storage[uuid: ${volume.primaryStorageUuid}] " + + assert primaryStorageType: "cannot find primary storage[uuid: ${volume.primaryStorageUuid}] " + "from volume[uuid: ${volume.uuid}, name: ${volume.name}]" VFSPrimaryStorageTakeSnapshotBackend bkd = getVFSPrimaryStorageTakeSnapshotBackend(primaryStorageType) @@ -651,5 +652,31 @@ class KVMSimulator implements Simulator { def rsp = new KVMAgentCommands.UpdateHostNqnRsp() return rsp } + + spec.simulator(KVMConstant.KVM_HOST_FILE_DOWNLOAD_PATH) { + DownloadFileResponse rsp = new DownloadFileResponse() + rsp.md5sum = "00df1327d49e4631a21f4467aa729c11" + rsp.size = 1024 + return rsp + } + + spec.simulator(KVMConstant.KVM_HOST_FILE_UPLOAD_PATH) { + UploadFileResponse rsp = new UploadFileResponse() + rsp.directUploadPath = "http://172.1.1.1:7070/host/file/direct-upload" + return rsp + } + + spec.simulator(KVMConstant.KVM_HOST_FILE_DOWNLOAD_PROGRESS_PATH) { + GetDownloadFileProgressResponse rsp = new GetDownloadFileProgressResponse() + rsp.completed = false + rsp.downloadSize = 1 + rsp.size = 1024 + rsp.lastOpTime = System.currentTimeMillis() + return rsp + } + + spec.simulator(KVMConstant.KVM_UPDATE_HOSTNAME_PATH) { + return new UpdateHostnameRsp() + } } } diff --git a/testlib/src/main/java/org/zstack/testlib/VmDiskSpec.groovy b/testlib/src/main/java/org/zstack/testlib/VmDiskSpec.groovy new file mode 100644 index 0000000000..ee07e12ef9 --- /dev/null +++ b/testlib/src/main/java/org/zstack/testlib/VmDiskSpec.groovy @@ -0,0 +1,76 @@ +package org.zstack.testlib + +import org.zstack.header.vm.DiskAO +import org.zstack.utils.data.SizeUnit + +class VmDiskSpec extends Spec { + @SpecParam(required = false) + boolean boot + @SpecParam(required = false) + String platform + @SpecParam(required = false) + String guestOsType + @SpecParam(required = false) + String architecture + @SpecParam(required = false) + String primaryStorageUuid + @SpecParam(required = false) + long size + /** + * allow: ImageVO.uuid + */ + @SpecParam(required = false) + String templateUuid + @SpecParam(required = false) + String diskOfferingUuid + @SpecParam(required = false) + String sourceType + /** + * allow: VolumeVO.uuid + */ + @SpecParam(required = false) + String sourceUuid + @SpecParam(required = false) + List systemTags = [] + @SpecParam(required = false) + String name + + String virtualUuid + String virtualName + + VmDiskSpec(EnvSpec envSpec) { + super(envSpec) + } + + @Override + SpecID create(String uuid, String sessionId) { + virtualName = name == null ? "VmDiskSpec-" + uuid : name + return id(virtualName, virtualUuid = uuid) + } + + @Override + void delete(String sessionId) { + // do-nothing + } + + DiskAO toDiskAO() { + DiskAO ao = new DiskAO() + ao.boot = boot + ao.platform = platform + ao.guestOsType = guestOsType + ao.architecture = architecture + ao.primaryStorageUuid = primaryStorageUuid + ao.size = size + ao.templateUuid = templateUuid + ao.diskOfferingUuid = diskOfferingUuid + ao.sourceType = sourceType + ao.sourceUuid = sourceUuid + ao.systemTags = new ArrayList<>(systemTags) + ao.name = name + return ao + } + + void sizeGB(long sizeGB) { + this.size = SizeUnit.GIGABYTE.toByte(sizeGB) + } +} diff --git a/testlib/src/main/java/org/zstack/testlib/VmSpec.groovy b/testlib/src/main/java/org/zstack/testlib/VmSpec.groovy index 433de732b9..f8a94a8736 100755 --- a/testlib/src/main/java/org/zstack/testlib/VmSpec.groovy +++ b/testlib/src/main/java/org/zstack/testlib/VmSpec.groovy @@ -1,7 +1,9 @@ package org.zstack.testlib +import org.zstack.header.vm.DiskAO import org.zstack.sdk.AttachDataVolumeToVmAction import org.zstack.sdk.VmInstanceInventory +import org.zstack.utils.data.SizeUnit import org.zstack.utils.gson.JSONObjectUtil /** * Created by xing5 on 2017/2/16. @@ -30,9 +32,8 @@ class VmSpec extends Spec implements HasSession { List rootVolumeSystemTags = [] @SpecParam List dataVolumeSystemTags = [] - @SpecParam - Map> dataVolumeSystemTagsOnIndex = [:] private List volumeToAttach = [] + private List disks = [] VmInstanceInventory inventory @@ -165,6 +166,16 @@ class VmSpec extends Spec implements HasSession { } } + VmDiskSpec disk(@DelegatesTo(strategy = Closure.DELEGATE_FIRST, value = VmDiskSpec.class) Closure c) { + def diskSpec = new VmDiskSpec(envSpec) + c.delegate = diskSpec + c.resolveStrategy = Closure.DELEGATE_FIRST + c() + addChild(diskSpec) + disks << diskSpec.toDiskAO() + return diskSpec + } + SpecID create(String uuid, String sessionId) { inventory = createVmInstance { delegate.resourceUuid = uuid @@ -185,8 +196,14 @@ class VmSpec extends Spec implements HasSession { delegate.systemTags = systemTags delegate.rootVolumeSystemTags = rootVolumeSystemTags delegate.dataVolumeSystemTags = dataVolumeSystemTags - delegate.dataVolumeSystemTagsOnIndex = dataVolumeSystemTagsOnIndex delegate.virtio = virtio + + if (!disks.isEmpty()) { + if (disks.every { (!it.boot) }) { + disks.first().boot = true + } + delegate.diskAOs = disks + } } postCreate { @@ -230,4 +247,8 @@ class VmSpec extends Spec implements HasSession { inventory = null } } + + void memoryGB(long memoryGB) { + this.memorySize = SizeUnit.GIGABYTE.toByte(memoryGB) + } } diff --git a/testlib/src/main/java/org/zstack/testlib/http/PostHandlerPair.groovy b/testlib/src/main/java/org/zstack/testlib/http/PostHandlerPair.groovy new file mode 100644 index 0000000000..498366a36d --- /dev/null +++ b/testlib/src/main/java/org/zstack/testlib/http/PostHandlerPair.groovy @@ -0,0 +1,16 @@ +package org.zstack.testlib.http + +import org.zstack.header.errorcode.ErrorableValue + +import java.util.function.BiFunction +import java.util.function.Predicate + +class PostHandlerPair { + Predicate condition + BiFunction, ErrorableValue> runIfMatch + + PostHandlerPair(Predicate condition, BiFunction, ErrorableValue> runIfMatch) { + this.condition = condition + this.runIfMatch = runIfMatch + } +} diff --git a/testlib/src/main/java/org/zstack/testlib/vops/VOpsClientForTest.groovy b/testlib/src/main/java/org/zstack/testlib/vops/VOpsClientForTest.groovy new file mode 100644 index 0000000000..9cd6543cbf --- /dev/null +++ b/testlib/src/main/java/org/zstack/testlib/vops/VOpsClientForTest.groovy @@ -0,0 +1,159 @@ +package org.zstack.testlib.vops + +import com.google.gson.JsonObject +import org.springframework.beans.factory.annotation.Autowired +import org.zstack.core.Platform +import org.zstack.core.errorcode.ErrorFacade +import org.zstack.header.errorcode.ErrorableValue +import org.zstack.header.rest.RestHttp +import org.zstack.externalservice.vops.VOpsClient +import org.zstack.utils.gson.JSONObjectUtil + +import java.util.function.Function + +import static org.zstack.externalservice.vops.VOpsCommands.*; + +class VOpsClientForTest extends VOpsClient { + public final VOpsVirtualEndpointSpec parent + + VOpsClientForTest(VOpsVirtualEndpointSpec parent) { + this.parent = parent + } + + @Autowired + ErrorFacade errorFacade + + /** + * key example: + * "GET:/open/ping" + * "POST:/open/ping" + */ + public final Map defaultHandlers = [:] + /** + * key example: + * api_id + */ + public final Map apiHandlers = [:] + + static class Handler { + String method + String path + Function function + + String key() { + return "${method}:${this.path}" + } + + boolean match(HttpForTest http) { + return method == http.method.toString() && this.path == http.getPathWithoutIpAndPort() + } + + static Handler ofGet(String path, Function function) { + Handler handler = new Handler() + handler.method = "GET" + handler.path = path + handler.function = function + return handler + } + + static Handler ofPut(String path, Function function) { + Handler handler = new Handler() + handler.method = "PUT" + handler.path = path + handler.function = function + return handler + } + } + + void addDefaultHandler(Handler handler) { + defaultHandlers.put(handler.key(), handler) + } + + @Override + protected RestHttp http(Class returnClass) { + return new HttpForTest(returnClass, this) + } + + static class HttpForTest extends RestHttp { + final VOpsClientForTest client + + HttpForTest(Class returnClass, VOpsClientForTest client) { + super(returnClass) + this.client = client + this.errorCodeBuilder = { Exception e, http2 -> client.errorFacade.throwableToOperationError(e) } + } + + /** + * "http://localhost:8080/a/b/c" -> "/a/b/c" + * "http://localhost:8080/a/b/c?id=123" -> "/a/b/c" + */ + String getPathWithoutIpAndPort() { + assert path != null : "path cannot be null" + int slashIndex = path.indexOf("/", 8) + if (slashIndex == -1) { + throw new RuntimeException("invalid path: ${path}") + } + + int queryIndex = path.indexOf("?") + return queryIndex == -1 ? path.substring(slashIndex) : path.substring(slashIndex, queryIndex) + } + + @Override + ErrorableValue handleWithErrorCode() { + def result = findValueFromHandle() + + for (def handler : new ArrayList<>(client.parent.postHandlers)) { + if (handler.condition.test(this)) { + try { + def next = handler.runIfMatch.apply(this, result) + result = next == null ? result : next + } catch (Exception e) { + result = ErrorableValue.ofErrorCode(errorCodeBuilder.apply(e, this)) + } + } + } + return result + } + + private ErrorableValue findValueFromHandle() { + def path = getPathWithoutIpAndPort() + + Handler currentHandler + if (path.startsWith("/api/")) { + def apiId = path.substring(5) + currentHandler = client.apiHandlers.get(apiId) + } else { + currentHandler = client.defaultHandlers.get(method.toString() + ":" + path) + } + + if (currentHandler == null) { + throw new RuntimeException("no handler found for path: ${getPath()}") + } + return ErrorableValue.of((T) currentHandler.function.apply(this)) + } + } + + { + addDefaultHandler(Handler.ofPut(ZSHA2_DEMOTE_PATH, { http -> + String apiId = Platform.getUuid() + def ret = JSONObjectUtil.toObject("{\"api_id\":\"${apiId}\"}".toString(), JsonObject) + + def asyncRet = """\ +{ + "finished": true, + "api_id": "${apiId}", + "progresses": [], + "success": true, + "results": { + "success": true + } +} +""".toString() + apiHandlers.put(apiId, Handler.ofGet("/api/${apiId}", { asyncHttp -> + JSONObjectUtil.toObject(asyncRet, JsonObject) + })) + return ret + })) + } + +} diff --git a/testlib/src/main/java/org/zstack/testlib/vops/VOpsVirtualEndpointSpec.groovy b/testlib/src/main/java/org/zstack/testlib/vops/VOpsVirtualEndpointSpec.groovy new file mode 100644 index 0000000000..bf873b66d6 --- /dev/null +++ b/testlib/src/main/java/org/zstack/testlib/vops/VOpsVirtualEndpointSpec.groovy @@ -0,0 +1,74 @@ +package org.zstack.testlib.vops + +import org.springframework.http.HttpMethod +import org.zstack.header.errorcode.ErrorableValue +import org.zstack.externalservice.vops.VOpsClient +import org.zstack.testlib.EnvSpec +import org.zstack.testlib.Spec +import org.zstack.testlib.SpecID +import org.zstack.testlib.SpecParam +import org.zstack.testlib.Test +import org.zstack.testlib.http.PostHandlerPair + +import java.util.function.BiFunction +import java.util.function.BooleanSupplier +import java.util.function.Predicate + +class VOpsVirtualEndpointSpec extends Spec { + @SpecParam + String endpointName = getClass().getSimpleName() // Only use for finding this spec + String endpointUuid + + VOpsVirtualEndpointSpec(EnvSpec envSpec) { + super(envSpec) + } + + @Override + SpecID create(String uuid, String sessionId) { + mockFactory(VOpsClient.class, { return new VOpsClientForTest(this) }) + return id(endpointName, endpointUuid = uuid) + } + + @Override + void delete(String sessionId) { + Test.functionForMockTestObjectFactory.remove(VOpsClient.class) + } + + public List> postHandlers = [] + + /** + * @return a function to remove this handler + */ + BooleanSupplier registerPostHttpHandler( + Predicate predicate, + BiFunction, ErrorableValue> handler) { + def pair = new PostHandlerPair( + Objects.requireNonNull(predicate), + Objects.requireNonNull(handler)) + + this.postHandlers << pair + return { this.postHandlers.remove(pair) } + } + + /** + * @return a function to remove this handler + */ + BooleanSupplier registerPostHttpHandler( + String path, + BiFunction, ErrorableValue> handler) { + return registerPostHttpHandler({ it.path == path || it.pathWithoutIpAndPort == path }, handler) + } + + /** + * @return a function to remove this handler + */ + BooleanSupplier registerPostHttpHandler( + String path, + HttpMethod method, + BiFunction, ErrorableValue> handler) { + return registerPostHttpHandler( + { + (it.path == path || it.pathWithoutIpAndPort == path) && it.method == method + }, handler) + } +} diff --git a/utils/src/main/java/org/zstack/utils/HTTP.java b/utils/src/main/java/org/zstack/utils/HTTP.java index cff6ddc142..e8cc82ec39 100755 --- a/utils/src/main/java/org/zstack/utils/HTTP.java +++ b/utils/src/main/java/org/zstack/utils/HTTP.java @@ -5,6 +5,7 @@ import org.zstack.utils.gson.JSONObjectUtil; import org.zstack.utils.logging.CLogger; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -129,6 +130,7 @@ public static class Builder { private Request request; private boolean build; + private MultipartBody.Builder multipartBody; public Param getParam() { return param; @@ -196,6 +198,32 @@ public Builder logging() { return this; } + public Builder formData(Map formFields) { + if (formFields == null) { + throw new IllegalArgumentException("formFields cannot be null"); + } + + if (param.body != null) { + throw new IllegalStateException("Cannot set both body and form data"); + } + + multipartBody = new MultipartBody.Builder().setType(MultipartBody.FORM); + formFields.forEach((k, v) -> { + if (k == null || v == null) { + return; // skip null entries + } + + if (v instanceof File) { + File file = (File) v; + RequestBody fileBody = RequestBody.create(file, MediaType.parse("application/octet-stream")); + multipartBody.addFormDataPart(k, file.getName(), fileBody); + } else { + multipartBody.addFormDataPart(k, v.toString()); + } + }); + return this; + } + public Response callWithException() throws IOException { build(); @@ -254,15 +282,23 @@ private void build() { } if ("POST".equals(param.method)) { - DebugUtils.Assert(param.body != null, "POST requires body"); - rb.post(RequestBody.create(MediaType.parse(contentType), param.body)); + if (multipartBody != null) { + rb.post(multipartBody.build()); + } else { + DebugUtils.Assert(param.body != null, "POST requires body"); + rb.post(RequestBody.create(param.body, MediaType.parse(contentType))); + } } else if ("GET".equals(param.method)) { rb.get(); } else if ("DELETE".equals(param.method)) { rb.delete(); } else if ("PUT".equals(param.method)) { - DebugUtils.Assert(param.body != null, "PUT requires body"); - rb.put(RequestBody.create(MediaType.parse(contentType), param.body)); + if (multipartBody != null) { + rb.put(multipartBody.build()); + } else { + DebugUtils.Assert(param.body != null, "PUT requires body"); + rb.put(RequestBody.create(param.body, MediaType.parse(contentType))); + } } else if ("HEAD".equals(param.method)) { rb.head(); } else { diff --git a/utils/src/main/java/org/zstack/utils/network/NetworkUtils.java b/utils/src/main/java/org/zstack/utils/network/NetworkUtils.java index 01930f1c15..73f7b9dab7 100755 --- a/utils/src/main/java/org/zstack/utils/network/NetworkUtils.java +++ b/utils/src/main/java/org/zstack/utils/network/NetworkUtils.java @@ -588,6 +588,16 @@ public static boolean isIpv4InCidr(String ipv4, String cidr) { return isIpv4InRange(ipv4, info.getLowAddress(), info.getHighAddress()); } + public static boolean isIpInCidr(String ip, String cidr) { + if (isIpv4Address(ip) && isCidr(cidr, IPv6Constants.IPv4)) { + return isIpv4InCidr(ip, cidr); + } else if (isIpv6Address(ip) && isCidr(cidr, IPv6Constants.IPv6)) { + return IPv6NetworkUtils.isIpv6InCidrRange(ip, cidr); + } + + return false; + } + public static List filterIpv4sInCidr(List ipv4s, String cidr) { DebugUtils.Assert(isCidr(cidr), String.format("%s is not a cidr", cidr)); SubnetUtils.SubnetInfo info = getSubnetInfo(new SubnetUtils(cidr)); diff --git a/utils/src/main/java/org/zstack/utils/path/PathUtil.java b/utils/src/main/java/org/zstack/utils/path/PathUtil.java index 2902840221..2c4fea4f63 100755 --- a/utils/src/main/java/org/zstack/utils/path/PathUtil.java +++ b/utils/src/main/java/org/zstack/utils/path/PathUtil.java @@ -3,10 +3,12 @@ import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; import java.io.*; +import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.Charset; @@ -18,7 +20,6 @@ public class PathUtil { private static final CLogger logger = Utils.getLogger(PathUtil.class); public static String HOME_DIR_PROPERTY_NAME = "user.home"; - public static String join(String... paths) { assert paths != null && paths.length > 0; @@ -447,4 +448,20 @@ public static FileTime getFileLastModifiedTime(String filePath) { throw new RuntimeException(e); } } + + public static String normalizePathWithoutQuery(String path) { + try { + String normalizedPath = path.replaceFirst( + "^([a-zA-Z]+:)(?!/{2})", + "$1//"); + final String query = new URI(normalizedPath).getQuery(); + if (query != null) { + return StringUtils.removeEnd(path, '?' + query); + } + } catch (URISyntaxException ignored) { + logger.warn(String.format("unexpected path: %s", path)); + } + + return path; + } } \ No newline at end of file diff --git a/utils/src/main/java/org/zstack/utils/ssh/Ssh.java b/utils/src/main/java/org/zstack/utils/ssh/Ssh.java index acd26e4bda..ab88c65bfb 100755 --- a/utils/src/main/java/org/zstack/utils/ssh/Ssh.java +++ b/utils/src/main/java/org/zstack/utils/ssh/Ssh.java @@ -1,21 +1,17 @@ package org.zstack.utils.ssh; import com.jcraft.jsch.*; -import org.apache.commons.io.Charsets; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.StopWatch; -import org.zstack.utils.CollectionUtils; import org.zstack.utils.DebugUtils; import org.zstack.utils.Utils; -import org.zstack.utils.function.Function; import org.zstack.utils.logging.CLogger; -import org.zstack.utils.path.PathUtil; import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.*; import java.util.concurrent.TimeUnit; @@ -26,8 +22,6 @@ import static org.zstack.utils.path.PathUtil.setFilePosixPermissions; import static org.zstack.utils.path.PathUtil.writeFile; -/** - */ public class Ssh { private static final CLogger logger = Utils.getLogger(Ssh.class); @@ -48,72 +42,20 @@ public class Ssh { private int timeout = 5; private int execTimeout = 604800; private int socketTimeout = 300; - private List commands = new ArrayList(); private Session session; private File privateKeyFile; private boolean closed = false; private boolean suppressException = false; - private ScriptRunner script; - private String language = "LANG=\"en_US.UTF-8\"; "; + private static final String LANGUAGE = "LANG=\"en_US.UTF-8\"; "; private boolean init = false; - private interface SshRunner { - SshResult run(); - String getCommand(); - String getCommandWithoutPassword(); - } - - private class ScriptRunner { - String scriptName; - File scriptFile; + private class ScriptRunner implements SshRunner { + String rawScript; SshRunner scriptCommand; - String scriptContent; - - ScriptRunner(String scriptName, String parameters, Map token) { - this.scriptName = scriptName; - String scriptPath = PathUtil.findFileOnClassPath(scriptName, true).getAbsolutePath(); - try { - if (parameters == null) { - parameters = ""; - } - if (token == null) { - token = new HashMap(); - } - - String contents = FileUtils.readFileToString(new File(scriptPath)); - String srcScript = String.format("zstack-script-%s", UUID.randomUUID().toString()); - scriptFile = new File(PathUtil.join(PathUtil.getFolderUnderZStackHomeFolder("temp-scripts"), srcScript)); - scriptContent = s(contents).formatByMap(token); - - String remoteScript = ln( - "cat << EOF1 > {remotePath}", - "PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", - "{scriptContent}", - "EOF1", - "timeout {execTimeout} /bin/bash {remotePath} {parameters} 1>{stdout} 2>{stderr}", - "ret=$?", - "test -f {stdout} && cat {stdout}", - "test -f {stderr} && cat {stderr} 1>&2", - "rm -f {remotePath}", - "rm -f {stdout}", - "rm -f {stderr}", - "exit $ret" - ).formatByMap(map(e("remotePath", String.format("/tmp/%s", UUID.randomUUID().toString())), - e("scriptContent", scriptContent), - e("parameters", parameters), - e("execTimeout", execTimeout), - e("stdout", String.format("/tmp/%s", UUID.randomUUID().toString())), - e("stderr", String.format("/tmp/%s", UUID.randomUUID().toString())) - )); - - scriptCommand = createCommand(remoteScript); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - ScriptRunner(String script) { + ScriptRunner(CommandScript script) { + this.rawScript = script.cmd; String remoteScript = ln( "cat << EOF1 > {remotePath}", "PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", @@ -133,20 +75,89 @@ private class ScriptRunner { e("stdout", String.format("/tmp/%s", UUID.randomUUID().toString())), e("stderr", String.format("/tmp/%s", UUID.randomUUID().toString())) )); - scriptCommand = createCommand(remoteScript); + + CommandScript become = new CommandScript(remoteScript); + if (script.sudo) { + become.enableSudo(); + } + scriptCommand = buildSshRunner(become); } - SshResult run() { + @Override + public SshResult run() { + if (logger.isTraceEnabled()) { + logger.trace(String.format("run script remotely[ip: %s, port: %s]:\n%s\n", hostname, port, rawScript)); + } return scriptCommand.run(); } - void cleanup() { - if (scriptFile != null) { - if (!scriptFile.delete()) { - logger.warn("delete file failed: " +scriptFile.getAbsolutePath()); - } + @Override + public String getCommand() { + return rawScript; + } + } + + public static class CommandScript { + public final String cmd; + private boolean sudo; + private String mode = MODE_SSH; + private final Map parameters = new HashMap<>(); + + public static final String MODE_SSH = "ssh"; + public static final String MODE_BATCH_SCRIPTS = "batchScripts"; + public static final String MODE_UPLOAD = "upload"; + public static final String MODE_DOWNLOAD = "download"; + + public CommandScript(String cmd) { + this.cmd = cmd; + } + public CommandScript enableSudo() { + this.sudo = true; + return this; + } + public CommandScript withMode(String mode) { + this.mode = mode; + return this; + } + public CommandScript withParameter(String key, String value) { + parameters.put(key, value); + return this; + } + public String getParameter(String key) { + return parameters.get(key); + } + @Override + public String toString() { + return removeSensitiveInfoFromCmd(cmd); + } + } + private List commandScripts = new ArrayList<>(); + + private SshRunner buildSshRunner(CommandScript commandScript) { + switch (commandScript.mode) { + case CommandScript.MODE_SSH: { + if (!commandScript.sudo || "root".equals(username)) { + return createCommand(commandScript.cmd); + } else if (password == null) { + return createCommand("sudo " + commandScript.cmd); + } else { + String quotePassword = shellQuote(password); + return createCommand(String.format("echo %s | sudo -S %s 2>/dev/null", quotePassword, commandScript.cmd)); } } + + case CommandScript.MODE_BATCH_SCRIPTS: + return new ScriptRunner(commandScript); + + case CommandScript.MODE_UPLOAD: + return createScpCommand(commandScript.getParameter("from"), commandScript.getParameter("to"), false); + + case CommandScript.MODE_DOWNLOAD: + return createScpCommand(commandScript.getParameter("from"), commandScript.getParameter("to"), true); + + default: + throw new IllegalArgumentException(String.format("unsupported mode[%s]", commandScript.mode)); + } } public int getExecTimeout() { @@ -214,18 +225,25 @@ public Ssh setSuppressException(boolean suppressException) { public Ssh command(String...cmds) { for (String cmd : cmds) { - commands.add(createCommand(cmd)); + commandScripts.add(new CommandScript(cmd)); + } + return this; + } + + public Ssh sudoCommand(String...cmds) { + for (String cmd : cmds) { + commandScripts.add(new CommandScript(cmd).enableSudo()); } return this; } private SshRunner createCommand(final String cmdWithoutPrefix) { - final String cmd = language + cmdWithoutPrefix; + final String cmd = LANGUAGE + cmdWithoutPrefix; return new SshRunner() { @Override public SshResult run() { SshResult ret = new SshResult(); - String cmdWithoutPassword = getCommandWithoutPassword(); + String cmdWithoutPassword = removeSensitiveInfoFromCmd(getCommand()); ret.setCommandToExecute(cmdWithoutPassword); try { @@ -242,8 +260,8 @@ public SshResult run() { InputStream errs = channel.getErrStream()) { channel.connect(getTimeoutInMilli(timeout)); - String output = IOUtils.toString(ins, Charsets.UTF_8); - String stderr = IOUtils.toString(errs, Charsets.UTF_8); + String output = IOUtils.toString(ins, StandardCharsets.UTF_8); + String stderr = IOUtils.toString(errs, StandardCharsets.UTF_8); ret.setReturnCode(channel.getExitStatus()); ret.setStderr(stderr); ret.setStdout(output); @@ -277,21 +295,22 @@ public SshResult run() { public String getCommand() { return cmd; } - - @Override - public String getCommandWithoutPassword() { - return cmd.replaceAll("echo .*?\\s*\\|\\s*sudo -S", "echo ****** | sudo -S"); - } }; } public Ssh scpUpload(final String local, final String remote) { - commands.add(createScpCommand(local, remote, false)); + commandScripts.add(new CommandScript("scpUpload") + .withMode(CommandScript.MODE_UPLOAD) + .withParameter("from", local) + .withParameter("to", remote)); return this; } public Ssh scpDownload(final String remote, final String local) { - commands.add(createScpCommand(remote, local, true)); + commandScripts.add(new CommandScript("scpDownload") + .withMode(CommandScript.MODE_DOWNLOAD) + .withParameter("to", local) + .withParameter("from", remote)); return this; } @@ -340,11 +359,6 @@ public String getCommand() { return String.format("scp -P %d %s %s@%s:%s", port, src, username, hostname, dst); } } - - @Override - public String getCommandWithoutPassword() { - return getCommand(); - } }; } @@ -355,29 +369,19 @@ public Ssh checkTool(String...toolNames) { } public Ssh shell(String script) { - DebugUtils.Assert(this.script==null, "every Ssh object can only specify one script"); - this.script = new ScriptRunner(script); - return this; - } - - public Ssh script(String scriptName, String parameters, Map token) { - DebugUtils.Assert(script==null, "every Ssh object can only specify one script"); - script = new ScriptRunner(scriptName, parameters, token); + boolean hasScript = false; + for (CommandScript cs : commandScripts) { + if (CommandScript.MODE_BATCH_SCRIPTS.equals(cs.mode)) { + hasScript = true; + break; + } + } + DebugUtils.Assert(!hasScript, "every Ssh object can only specify one script"); + commandScripts.add(new CommandScript(script) + .withMode(CommandScript.MODE_BATCH_SCRIPTS)); return this; } - public Ssh script(String scriptName, Map tokens) { - return script(scriptName, null, tokens); - } - - public Ssh script(String scriptName, String parameters) { - return script(scriptName, parameters, null); - } - - public Ssh script(String scriptName) { - return script(scriptName, null, null); - } - private static int getTimeoutInMilli(int seconds) { if (seconds <= 0) { return 0; @@ -432,10 +436,6 @@ public void close() { } } - if (script != null) { - script.cleanup(); - } - if (session != null) { session.disconnect(); } @@ -450,14 +450,10 @@ public SshResult run() { watch.start(); try { build(); - if (commands.isEmpty() && script == null) { + if (commandScripts.isEmpty()) { throw new IllegalArgumentException("no command or scp command or script specified"); } - if (!commands.isEmpty() && script != null) { - throw new IllegalArgumentException("you cannot use script with command or scp"); - } - if (privateKey == null && password == null) { throw new IllegalArgumentException("no password and private key specified"); } @@ -470,23 +466,17 @@ public SshResult run() { throw new IllegalArgumentException("no hostname specified"); } - if (script != null) { - if (logger.isTraceEnabled()) { - logger.trace(String.format("run script remotely[ip: %s, port: %s]:\n%s\n", hostname, port, script.scriptContent)); + SshResult ret = null; + for (CommandScript commandScript : commandScripts) { + SshRunner runner = buildSshRunner(commandScript); + ret = runner.run(); + if (ret.getReturnCode() != 0) { + return ret; } - return script.run(); - } else { - SshResult ret = null; - for (SshRunner runner : commands) { - ret = runner.run(); - if (ret.getReturnCode() != 0) { - return ret; - } - } - - return ret; } + return ret; + } catch (IOException e) { StringBuilder sb = new StringBuilder("ssh exception\n"); sb.append(String.format("[host:%s, port:%s, user:%s, timeout:%s]\n", hostname, port, username, timeout)); @@ -501,18 +491,13 @@ public SshResult run() { } finally { watch.stop(); if (logger.isTraceEnabled()) { - if (script != null) { - logger.trace(String.format("execute script[%s], cost time:%s", script.scriptName, watch.getTime())); - } else { - String cmd = StringUtils.join(CollectionUtils.transform( - commands, SshRunner::getCommandWithoutPassword), ","); - String info = s( - "\nssh execution[host: {0}, port:{1}]\n", - "command: {2}\n", - "cost time: {3}ms\n" - ).format(hostname, port, cmd, watch.getTime()); - logger.trace(info); - } + String cmd = StringUtils.join(commandScripts, ","); + String info = s( + "\nssh execution[host: {0}, port:{1}]\n", + "command: {2}\n", + "cost time: {3}ms\n" + ).format(hostname, port, cmd, watch.getTime()); + logger.trace(info); } } } @@ -544,7 +529,7 @@ public void setSession(Session session) { } public Ssh reset() { - commands = new ArrayList(); + commandScripts.clear(); return this; } @@ -560,20 +545,17 @@ public void runErrorByExceptionAndClose() { ret.raiseExceptionIfFailed(); } - @Deprecated - public void runErrorByException() { - SshResult ret = run(); - try { - ret.raiseExceptionIfFailed(); - } catch (SshException e) { - close(); - throw e; - } - } - private static void writeSecretFile(File file, String content) throws IOException { writeFile(file, new byte[0]); setFilePosixPermissions(file, "rw-------"); writeFile(file, content); } + + public static String removeSensitiveInfoFromCmd(String cmd) { + return cmd.replaceAll("echo .*?\\s*\\|\\s*sudo -S", "echo ****** | sudo -S"); + } + + public static String shellQuote(String s) { + return "'" + s.replace("'", "'\\''") + "'"; + } } diff --git a/utils/src/main/java/org/zstack/utils/ssh/SshBuilder.java b/utils/src/main/java/org/zstack/utils/ssh/SshBuilder.java deleted file mode 100755 index 526c92cccc..0000000000 --- a/utils/src/main/java/org/zstack/utils/ssh/SshBuilder.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.zstack.utils.ssh; - -/** - */ -public class SshBuilder { - private String hostname; - private String username; - private String privateKey; - private String password; - private int port; -} diff --git a/utils/src/main/java/org/zstack/utils/ssh/SshRunner.java b/utils/src/main/java/org/zstack/utils/ssh/SshRunner.java new file mode 100644 index 0000000000..abb8809a0e --- /dev/null +++ b/utils/src/main/java/org/zstack/utils/ssh/SshRunner.java @@ -0,0 +1,7 @@ +package org.zstack.utils.ssh; + +interface SshRunner { + SshResult run(); + + String getCommand(); +} diff --git a/utils/src/main/java/org/zstack/utils/ssh/SshShell.java b/utils/src/main/java/org/zstack/utils/ssh/SshShell.java index 80ea35c94c..8c0b779eb9 100755 --- a/utils/src/main/java/org/zstack/utils/ssh/SshShell.java +++ b/utils/src/main/java/org/zstack/utils/ssh/SshShell.java @@ -19,7 +19,10 @@ /** * Created by frank on 12/5/2015. + * + * deprecated: TODO use Ssh.java instead. will merge to {@link Ssh} with a mode "localBashSsh" */ +@Deprecated public class SshShell { private static final CLogger logger = Utils.getLogger(SshShell.class); diff --git a/utils/src/main/java/org/zstack/utils/zsha2/ZSha2Helper.java b/utils/src/main/java/org/zstack/utils/zsha2/ZSha2Helper.java index 5e9d4b9a4d..af9eb34d16 100644 --- a/utils/src/main/java/org/zstack/utils/zsha2/ZSha2Helper.java +++ b/utils/src/main/java/org/zstack/utils/zsha2/ZSha2Helper.java @@ -48,7 +48,7 @@ public static ZSha2StatusJsonInfo getStatusInfo() { result = ShellUtils.runAndReturn("/usr/local/bin/zsha2 status -json"); if (!result.isReturnCode(0)) { - throw new RuntimeException(String.format("cannot get zsha2 status json, because %s.", result.getStderr())); + throw new RuntimeException("cannot get zsha2 status json: " + result.getStderr()); } return JSONObjectUtil.toObject(result.getStdout(), ZSha2StatusJsonInfo.class); diff --git a/utils/src/main/java/org/zstack/utils/zsha2/ZSha2StatusJsonInfo.java b/utils/src/main/java/org/zstack/utils/zsha2/ZSha2StatusJsonInfo.java index 7d03e084b7..f051da976b 100644 --- a/utils/src/main/java/org/zstack/utils/zsha2/ZSha2StatusJsonInfo.java +++ b/utils/src/main/java/org/zstack/utils/zsha2/ZSha2StatusJsonInfo.java @@ -1,5 +1,7 @@ package org.zstack.utils.zsha2; +import com.google.gson.annotations.SerializedName; + /** * @author hanyu.liang * @date 2023/11/6 17:02 @@ -13,7 +15,8 @@ public class ZSha2StatusJsonInfo { private String mnStatus; private String timeToSyncDB; private boolean slaveIoRunning; - private boolean slaveSqlRuning; + @SerializedName("slaveSqlRuning") // zsha2 typo + private boolean slaveSqlRunning; public boolean isOwnsVip() { return ownsVip; @@ -79,11 +82,11 @@ public void setSlaveIoRunning(boolean slaveIoRunning) { this.slaveIoRunning = slaveIoRunning; } - public boolean isSlaveSqlRuning() { - return slaveSqlRuning; + public boolean isSlaveSqlRunning() { + return slaveSqlRunning; } - public void setSlaveSqlRuning(boolean slaveSqlRuning) { - this.slaveSqlRuning = slaveSqlRuning; + public void setSlaveSqlRunning(boolean slaveSqlRunning) { + this.slaveSqlRunning = slaveSqlRunning; } }