diff --git a/build/pom.xml b/build/pom.xml index 1139b7dc3f6..e846f13b597 100755 --- a/build/pom.xml +++ b/build/pom.xml @@ -53,7 +53,6 @@ springConfigXml/AccountManager.xml serviceConfig/metadata.xml searchConfig/indexConfig.xml - springConfigXml/resourceConfig.xml diff --git a/sdk/src/main/java/SourceClassMap.java b/sdk/src/main/java/SourceClassMap.java index 2349397cf0c..7585a4723bb 100644 --- a/sdk/src/main/java/SourceClassMap.java +++ b/sdk/src/main/java/SourceClassMap.java @@ -578,15 +578,6 @@ public class SourceClassMap { put("org.zstack.twoFactorAuthentication.TwoFactorAuthenticationSecretInventory", "org.zstack.sdk.TwoFactorAuthenticationSecretInventory"); put("org.zstack.usbDevice.UsbDeviceInventory", "org.zstack.sdk.UsbDeviceInventory"); put("org.zstack.usbDevice.UsbDeviceState", "org.zstack.sdk.UsbDeviceState"); - put("org.zstack.vmware.ESXHostInventory", "org.zstack.sdk.ESXHostInventory"); - put("org.zstack.vmware.SkippedResources", "org.zstack.sdk.SkippedResources"); - put("org.zstack.vmware.VCenterBackupStorageInventory", "org.zstack.sdk.VCenterBackupStorageInventory"); - put("org.zstack.vmware.VCenterClusterInventory", "org.zstack.sdk.VCenterClusterInventory"); - put("org.zstack.vmware.VCenterDatacenterInventory", "org.zstack.sdk.VCenterDatacenterInventory"); - put("org.zstack.vmware.VCenterInventory", "org.zstack.sdk.VCenterInventory"); - put("org.zstack.vmware.VCenterPrimaryStorageInventory", "org.zstack.sdk.VCenterPrimaryStorageInventory"); - put("org.zstack.vmware.VCenterResourcePoolInventory", "org.zstack.sdk.VCenterResourcePoolInventory"); - put("org.zstack.vmware.VCenterResourcePoolUsageInventory", "org.zstack.sdk.VCenterResourcePoolUsageInventory"); put("org.zstack.vpcfirewall.entity.ActionType", "org.zstack.sdk.ActionType"); put("org.zstack.vpcfirewall.entity.FirewallRuleState", "org.zstack.sdk.FirewallRuleState"); put("org.zstack.vpcfirewall.entity.IpSetType", "org.zstack.sdk.IpSetType"); @@ -796,7 +787,6 @@ public class SourceClassMap { put("org.zstack.sdk.DeviceTO", "org.zstack.storage.device.multipath.DeviceTO"); 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.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"); @@ -1104,7 +1094,6 @@ public class SourceClassMap { put("org.zstack.sdk.ShellResult", "org.zstack.kvm.APIKvmRunShellEvent$ShellResult"); put("org.zstack.sdk.ShrinkResult", "org.zstack.header.storage.snapshot.ShrinkResult"); put("org.zstack.sdk.SimulatorHostInventory", "org.zstack.header.simulator.SimulatorHostInventory"); - put("org.zstack.sdk.SkippedResources", "org.zstack.vmware.SkippedResources"); put("org.zstack.sdk.SlbGroupInventory", "org.zstack.network.service.slb.SlbGroupInventory"); put("org.zstack.sdk.SlbGroupL3NetworkRefInventory", "org.zstack.network.service.slb.SlbGroupL3NetworkRefInventory"); put("org.zstack.sdk.SlbLoadBalancerInventory", "org.zstack.network.service.slb.SlbLoadBalancerInventory"); @@ -1143,13 +1132,6 @@ public class SourceClassMap { put("org.zstack.sdk.UsbDeviceState", "org.zstack.usbDevice.UsbDeviceState"); put("org.zstack.sdk.UsedIpInventory", "org.zstack.header.network.l3.UsedIpInventory"); put("org.zstack.sdk.UserTagInventory", "org.zstack.header.tag.UserTagInventory"); - put("org.zstack.sdk.VCenterBackupStorageInventory", "org.zstack.vmware.VCenterBackupStorageInventory"); - put("org.zstack.sdk.VCenterClusterInventory", "org.zstack.vmware.VCenterClusterInventory"); - put("org.zstack.sdk.VCenterDatacenterInventory", "org.zstack.vmware.VCenterDatacenterInventory"); - put("org.zstack.sdk.VCenterInventory", "org.zstack.vmware.VCenterInventory"); - put("org.zstack.sdk.VCenterPrimaryStorageInventory", "org.zstack.vmware.VCenterPrimaryStorageInventory"); - put("org.zstack.sdk.VCenterResourcePoolInventory", "org.zstack.vmware.VCenterResourcePoolInventory"); - put("org.zstack.sdk.VCenterResourcePoolUsageInventory", "org.zstack.vmware.VCenterResourcePoolUsageInventory"); put("org.zstack.sdk.VHostAddOn", "org.zstack.kvm.KVMAgentCommands$VHostAddOn"); put("org.zstack.sdk.VRouterRouteEntryAO", "org.zstack.vrouterRoute.VRouterRouteEntryAO"); put("org.zstack.sdk.VRouterRouteEntryInventory", "org.zstack.vrouterRoute.VRouterRouteEntryInventory"); diff --git a/sdk/src/main/java/org/zstack/sdk/AddVCenterAction.java b/sdk/src/main/java/org/zstack/sdk/AddVCenterAction.java deleted file mode 100644 index 5a1bee15ca5..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddVCenterAction.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 AddVCenterAction 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.AddVCenterResult 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 username; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String password; - - @Param(required = true, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String zoneUuid; - - @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 boolean https = true; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Integer port; - - @Param(required = true, maxLength = 256, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String domainName; - - @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 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.AddVCenterResult value = res.getResult(org.zstack.sdk.AddVCenterResult.class); - ret.value = value == null ? new org.zstack.sdk.AddVCenterResult() : 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 = "/vcenters"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AddVCenterResult.java b/sdk/src/main/java/org/zstack/sdk/AddVCenterResult.java deleted file mode 100644 index 618fc3bddf7..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/AddVCenterResult.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VCenterInventory; -import org.zstack.sdk.SkippedResources; - -public class AddVCenterResult { - public VCenterInventory inventory; - public void setInventory(VCenterInventory inventory) { - this.inventory = inventory; - } - public VCenterInventory getInventory() { - return this.inventory; - } - - public SkippedResources skippedResources; - public void setSkippedResources(SkippedResources skippedResources) { - this.skippedResources = skippedResources; - } - public SkippedResources getSkippedResources() { - return this.skippedResources; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVCenterAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteVCenterAction.java deleted file mode 100644 index e661eb54a4b..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVCenterAction.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 DeleteVCenterAction 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.DeleteVCenterResult 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.DeleteVCenterResult value = res.getResult(org.zstack.sdk.DeleteVCenterResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteVCenterResult() : 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 = "/vcenters/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteVCenterResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteVCenterResult.java deleted file mode 100644 index baf7792fc1e..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteVCenterResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteVCenterResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ESXHostInventory.java b/sdk/src/main/java/org/zstack/sdk/ESXHostInventory.java deleted file mode 100644 index 18866c5973b..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ESXHostInventory.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.zstack.sdk; - - - -public class ESXHostInventory extends org.zstack.sdk.HostInventory { - - public java.lang.String vCenterUuid; - public void setVCenterUuid(java.lang.String vCenterUuid) { - this.vCenterUuid = vCenterUuid; - } - public java.lang.String getVCenterUuid() { - return this.vCenterUuid; - } - - public java.lang.String morval; - public void setMorval(java.lang.String morval) { - this.morval = morval; - } - public java.lang.String getMorval() { - return this.morval; - } - - public java.lang.String esxiVersion; - public void setEsxiVersion(java.lang.String esxiVersion) { - this.esxiVersion = esxiVersion; - } - public java.lang.String getEsxiVersion() { - return this.esxiVersion; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVCenterAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterAction.java deleted file mode 100644 index 85791bee5e6..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterAction.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 QueryVCenterAction 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.QueryVCenterResult 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.QueryVCenterResult value = res.getResult(org.zstack.sdk.QueryVCenterResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVCenterResult() : 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 = "/vcenters"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVCenterBackupStorageAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterBackupStorageAction.java deleted file mode 100644 index 276e8fbf7b2..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterBackupStorageAction.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 QueryVCenterBackupStorageAction 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.QueryVCenterBackupStorageResult 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.QueryVCenterBackupStorageResult value = res.getResult(org.zstack.sdk.QueryVCenterBackupStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVCenterBackupStorageResult() : 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 = "/vcenters/backup-storage"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVCenterBackupStorageResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterBackupStorageResult.java deleted file mode 100644 index c8f7c259d3e..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterBackupStorageResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVCenterBackupStorageResult { - 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/QueryVCenterClusterAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterClusterAction.java deleted file mode 100644 index bb964e316a8..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterClusterAction.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 QueryVCenterClusterAction 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.QueryVCenterClusterResult 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.QueryVCenterClusterResult value = res.getResult(org.zstack.sdk.QueryVCenterClusterResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVCenterClusterResult() : 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 = "/vcenters/clusters"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVCenterClusterResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterClusterResult.java deleted file mode 100644 index b8d89aa0b7c..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterClusterResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVCenterClusterResult { - 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/QueryVCenterDatacenterAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterDatacenterAction.java deleted file mode 100644 index 5c72ea87d6d..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterDatacenterAction.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 QueryVCenterDatacenterAction 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.QueryVCenterDatacenterResult 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.QueryVCenterDatacenterResult value = res.getResult(org.zstack.sdk.QueryVCenterDatacenterResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVCenterDatacenterResult() : 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 = "/vcenters/datacenters"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVCenterDatacenterResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterDatacenterResult.java deleted file mode 100644 index 651ca312fc0..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterDatacenterResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVCenterDatacenterResult { - 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/QueryVCenterPrimaryStorageAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterPrimaryStorageAction.java deleted file mode 100644 index a7c591c9522..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterPrimaryStorageAction.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 QueryVCenterPrimaryStorageAction 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.QueryVCenterPrimaryStorageResult 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.QueryVCenterPrimaryStorageResult value = res.getResult(org.zstack.sdk.QueryVCenterPrimaryStorageResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVCenterPrimaryStorageResult() : 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 = "/vcenters/primary-storage"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVCenterPrimaryStorageResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterPrimaryStorageResult.java deleted file mode 100644 index 15e8218e069..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterPrimaryStorageResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVCenterPrimaryStorageResult { - 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/QueryVCenterResourcePoolAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterResourcePoolAction.java deleted file mode 100644 index 0973d34d1fa..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterResourcePoolAction.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 QueryVCenterResourcePoolAction 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.QueryVCenterResourcePoolResult 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.QueryVCenterResourcePoolResult value = res.getResult(org.zstack.sdk.QueryVCenterResourcePoolResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVCenterResourcePoolResult() : 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 = "/vcenters/clusters/resourcepools"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVCenterResourcePoolResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterResourcePoolResult.java deleted file mode 100644 index 29ff6a2908e..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterResourcePoolResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVCenterResourcePoolResult { - 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/QueryVCenterResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVCenterResult.java deleted file mode 100644 index 5631c377630..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVCenterResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVCenterResult { - 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/SkippedResources.java b/sdk/src/main/java/org/zstack/sdk/SkippedResources.java deleted file mode 100644 index 742242308e1..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/SkippedResources.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.zstack.sdk; - - - -public class SkippedResources { - - public java.util.Set vmInstances; - public void setVmInstances(java.util.Set vmInstances) { - this.vmInstances = vmInstances; - } - public java.util.Set getVmInstances() { - return this.vmInstances; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVCenterAction.java b/sdk/src/main/java/org/zstack/sdk/SyncVCenterAction.java deleted file mode 100644 index cf077c72cc9..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVCenterAction.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 SyncVCenterAction 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.SyncVCenterResult 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.SyncVCenterResult value = res.getResult(org.zstack.sdk.SyncVCenterResult.class); - ret.value = value == null ? new org.zstack.sdk.SyncVCenterResult() : 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 = "/vcenters/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "syncVCenter"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/SyncVCenterResult.java b/sdk/src/main/java/org/zstack/sdk/SyncVCenterResult.java deleted file mode 100644 index 9ee19eb1991..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/SyncVCenterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.SkippedResources; - -public class SyncVCenterResult { - public SkippedResources skippedResources; - public void setSkippedResources(SkippedResources skippedResources) { - this.skippedResources = skippedResources; - } - public SkippedResources getSkippedResources() { - return this.skippedResources; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVCenterAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateVCenterAction.java deleted file mode 100644 index 64ca0ef1f59..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVCenterAction.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 UpdateVCenterAction 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.UpdateVCenterResult 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 = 255, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String username; - - @Param(required = false, maxLength = 255, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String password; - - @Param(required = false, maxLength = 256, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String domainName; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.Integer port; - - @Param(required = false, validValues = {"Enabled","Disabled"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String state; - - @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.UpdateVCenterResult value = res.getResult(org.zstack.sdk.UpdateVCenterResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateVCenterResult() : 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 = "/vcenters/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateVCenter"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVCenterResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateVCenterResult.java deleted file mode 100644 index 90dec4ee659..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVCenterResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VCenterInventory; - -public class UpdateVCenterResult { - public VCenterInventory inventory; - public void setInventory(VCenterInventory inventory) { - this.inventory = inventory; - } - public VCenterInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VCenterBackupStorageInventory.java b/sdk/src/main/java/org/zstack/sdk/VCenterBackupStorageInventory.java deleted file mode 100644 index 9134c280150..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VCenterBackupStorageInventory.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - - - -public class VCenterBackupStorageInventory extends org.zstack.sdk.BackupStorageInventory { - - public java.lang.String vCenterUuid; - public void setVCenterUuid(java.lang.String vCenterUuid) { - this.vCenterUuid = vCenterUuid; - } - public java.lang.String getVCenterUuid() { - return this.vCenterUuid; - } - - public java.lang.String datastore; - public void setDatastore(java.lang.String datastore) { - this.datastore = datastore; - } - public java.lang.String getDatastore() { - return this.datastore; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VCenterClusterInventory.java b/sdk/src/main/java/org/zstack/sdk/VCenterClusterInventory.java deleted file mode 100644 index e4ef76a2a57..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VCenterClusterInventory.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.zstack.sdk; - - - -public class VCenterClusterInventory extends org.zstack.sdk.ClusterInventory { - - public java.lang.String vCenterUuid; - public void setVCenterUuid(java.lang.String vCenterUuid) { - this.vCenterUuid = vCenterUuid; - } - public java.lang.String getVCenterUuid() { - return this.vCenterUuid; - } - - public java.lang.String morval; - public void setMorval(java.lang.String morval) { - this.morval = morval; - } - public java.lang.String getMorval() { - return this.morval; - } - - public java.lang.String dataCenterUuid; - public void setDataCenterUuid(java.lang.String dataCenterUuid) { - this.dataCenterUuid = dataCenterUuid; - } - public java.lang.String getDataCenterUuid() { - return this.dataCenterUuid; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VCenterDatacenterInventory.java b/sdk/src/main/java/org/zstack/sdk/VCenterDatacenterInventory.java deleted file mode 100644 index 3d924f65dd7..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VCenterDatacenterInventory.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.zstack.sdk; - - - -public class VCenterDatacenterInventory { - - 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 vCenterUuid; - public void setVCenterUuid(java.lang.String vCenterUuid) { - this.vCenterUuid = vCenterUuid; - } - public java.lang.String getVCenterUuid() { - return this.vCenterUuid; - } - - 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 morval; - public void setMorval(java.lang.String morval) { - this.morval = morval; - } - public java.lang.String getMorval() { - return this.morval; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VCenterInventory.java b/sdk/src/main/java/org/zstack/sdk/VCenterInventory.java deleted file mode 100644 index 52a0814014c..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VCenterInventory.java +++ /dev/null @@ -1,111 +0,0 @@ -package org.zstack.sdk; - - - -public class VCenterInventory { - - 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 domainName; - public void setDomainName(java.lang.String domainName) { - this.domainName = domainName; - } - public java.lang.String getDomainName() { - return this.domainName; - } - - public java.lang.Integer port; - public void setPort(java.lang.Integer port) { - this.port = port; - } - public java.lang.Integer getPort() { - return this.port; - } - - public java.lang.String userName; - public void setUserName(java.lang.String userName) { - this.userName = userName; - } - public java.lang.String getUserName() { - return this.userName; - } - - 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 version; - public void setVersion(java.lang.String version) { - this.version = version; - } - public java.lang.String getVersion() { - return this.version; - } - - public java.lang.Boolean https; - public void setHttps(java.lang.Boolean https) { - this.https = https; - } - public java.lang.Boolean getHttps() { - return this.https; - } - - 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.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/VCenterPrimaryStorageInventory.java b/sdk/src/main/java/org/zstack/sdk/VCenterPrimaryStorageInventory.java deleted file mode 100644 index 6bd4be6e08c..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VCenterPrimaryStorageInventory.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.zstack.sdk; - - - -public class VCenterPrimaryStorageInventory extends org.zstack.sdk.PrimaryStorageInventory { - - public java.lang.String vCenterUuid; - public void setVCenterUuid(java.lang.String vCenterUuid) { - this.vCenterUuid = vCenterUuid; - } - public java.lang.String getVCenterUuid() { - return this.vCenterUuid; - } - - public java.lang.String datastore; - public void setDatastore(java.lang.String datastore) { - this.datastore = datastore; - } - public java.lang.String getDatastore() { - return this.datastore; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VCenterResourcePoolInventory.java b/sdk/src/main/java/org/zstack/sdk/VCenterResourcePoolInventory.java deleted file mode 100644 index bd567446afb..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VCenterResourcePoolInventory.java +++ /dev/null @@ -1,151 +0,0 @@ -package org.zstack.sdk; - - - -public class VCenterResourcePoolInventory { - - 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 vCenterClusterUuid; - public void setVCenterClusterUuid(java.lang.String vCenterClusterUuid) { - this.vCenterClusterUuid = vCenterClusterUuid; - } - public java.lang.String getVCenterClusterUuid() { - return this.vCenterClusterUuid; - } - - 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 morVal; - public void setMorVal(java.lang.String morVal) { - this.morVal = morVal; - } - public java.lang.String getMorVal() { - return this.morVal; - } - - public java.lang.String parentUuid; - public void setParentUuid(java.lang.String parentUuid) { - this.parentUuid = parentUuid; - } - public java.lang.String getParentUuid() { - return this.parentUuid; - } - - public java.lang.Long CPULimit; - public void setCPULimit(java.lang.Long CPULimit) { - this.CPULimit = CPULimit; - } - public java.lang.Long getCPULimit() { - return this.CPULimit; - } - - public java.lang.Long CPUOverheadLimit; - public void setCPUOverheadLimit(java.lang.Long CPUOverheadLimit) { - this.CPUOverheadLimit = CPUOverheadLimit; - } - public java.lang.Long getCPUOverheadLimit() { - return this.CPUOverheadLimit; - } - - public java.lang.Long CPUReservation; - public void setCPUReservation(java.lang.Long CPUReservation) { - this.CPUReservation = CPUReservation; - } - public java.lang.Long getCPUReservation() { - return this.CPUReservation; - } - - public java.lang.Long CPUShares; - public void setCPUShares(java.lang.Long CPUShares) { - this.CPUShares = CPUShares; - } - public java.lang.Long getCPUShares() { - return this.CPUShares; - } - - public java.lang.String CPULevel; - public void setCPULevel(java.lang.String CPULevel) { - this.CPULevel = CPULevel; - } - public java.lang.String getCPULevel() { - return this.CPULevel; - } - - public java.lang.Long memoryLimit; - public void setMemoryLimit(java.lang.Long memoryLimit) { - this.memoryLimit = memoryLimit; - } - public java.lang.Long getMemoryLimit() { - return this.memoryLimit; - } - - public java.lang.Long memoryOverheadLimit; - public void setMemoryOverheadLimit(java.lang.Long memoryOverheadLimit) { - this.memoryOverheadLimit = memoryOverheadLimit; - } - public java.lang.Long getMemoryOverheadLimit() { - return this.memoryOverheadLimit; - } - - public java.lang.Long memoryReservation; - public void setMemoryReservation(java.lang.Long memoryReservation) { - this.memoryReservation = memoryReservation; - } - public java.lang.Long getMemoryReservation() { - return this.memoryReservation; - } - - public java.lang.Long memoryShares; - public void setMemoryShares(java.lang.Long memoryShares) { - this.memoryShares = memoryShares; - } - public java.lang.Long getMemoryShares() { - return this.memoryShares; - } - - public java.lang.String memoryLevel; - public void setMemoryLevel(java.lang.String memoryLevel) { - this.memoryLevel = memoryLevel; - } - public java.lang.String getMemoryLevel() { - return this.memoryLevel; - } - - 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 subResources; - public void setSubResources(java.util.List subResources) { - this.subResources = subResources; - } - public java.util.List getSubResources() { - return this.subResources; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VCenterResourcePoolUsageInventory.java b/sdk/src/main/java/org/zstack/sdk/VCenterResourcePoolUsageInventory.java deleted file mode 100644 index 56a71439bd4..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VCenterResourcePoolUsageInventory.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.zstack.sdk; - - - -public class VCenterResourcePoolUsageInventory { - - 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 vCenterResourcePoolUuid; - public void setVCenterResourcePoolUuid(java.lang.String vCenterResourcePoolUuid) { - this.vCenterResourcePoolUuid = vCenterResourcePoolUuid; - } - public java.lang.String getVCenterResourcePoolUuid() { - return this.vCenterResourcePoolUuid; - } - - 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 resourceType; - public void setResourceType(java.lang.String resourceType) { - this.resourceType = resourceType; - } - public java.lang.String getResourceType() { - return this.resourceType; - } - - 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/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy b/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy index 7160cd1d93d..f4c1bf00feb 100644 --- a/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy +++ b/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy @@ -2123,33 +2123,6 @@ 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() - 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 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 @@ -11735,33 +11708,6 @@ 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() - 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 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 @@ -25511,180 +25457,6 @@ 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() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.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 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 - 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 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 - 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 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 - 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 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 - 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 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 - 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 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 @@ -30538,33 +30310,6 @@ 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() - 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 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 @@ -34102,33 +33847,6 @@ abstract class ApiHelper { } - 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