From b3743acb0916d8c95f11e7148ee5262362630488 Mon Sep 17 00:00:00 2001 From: Zhang Wenhao Date: Wed, 15 Jul 2026 10:33:22 +0800 Subject: [PATCH] [sdk]: remove port-mirror module Resolves: ZSV-12555 Related: ZSV-5323 Change-Id: I6e7575657174797872787a7777676a6b71666678 --- conf/roleDefinitions/roleDefinition.json | 1 - sdk/src/main/java/SourceClassMap.java | 12 - .../sdk/ChangePortMirrorStateAction.java | 104 ------- .../sdk/ChangePortMirrorStateResult.java | 14 - .../zstack/sdk/CreatePortMirrorAction.java | 116 -------- .../zstack/sdk/CreatePortMirrorResult.java | 14 - .../sdk/CreatePortMirrorSessionAction.java | 122 -------- .../sdk/CreatePortMirrorSessionResult.java | 14 - .../zstack/sdk/DeletePortMirrorAction.java | 104 ------- .../zstack/sdk/DeletePortMirrorResult.java | 7 - .../sdk/DeletePortMirrorSessionAction.java | 104 ------- .../sdk/DeletePortMirrorSessionResult.java | 7 - ...GetCandidateVmNicsForPortMirrorAction.java | 98 ------- ...GetCandidateVmNicsForPortMirrorResult.java | 14 - .../sdk/MirrorNetworkUsedIpInventory.java | 55 ---- .../org/zstack/sdk/PortMirrorInventory.java | 71 ----- .../sdk/PortMirrorSessionInventory.java | 96 ------ .../java/org/zstack/sdk/PortMirrorState.java | 6 - .../org/zstack/sdk/QueryPortMirrorAction.java | 75 ----- .../QueryPortMirrorNetworkUsedIpAction.java | 75 ----- .../QueryPortMirrorNetworkUsedIpResult.java | 22 -- .../org/zstack/sdk/QueryPortMirrorResult.java | 22 -- .../sdk/QueryPortMirrorSessionAction.java | 75 ----- .../sdk/QueryPortMirrorSessionResult.java | 22 -- .../java/org/zstack/sdk/SessionStatus.java | 7 - .../main/java/org/zstack/sdk/SessionType.java | 7 - .../zstack/sdk/UpdatePortMirrorAction.java | 107 ------- .../zstack/sdk/UpdatePortMirrorResult.java | 14 - .../java/org/zstack/testlib/ApiHelper.groovy | 276 ------------------ 29 files changed, 1661 deletions(-) delete mode 100644 sdk/src/main/java/org/zstack/sdk/ChangePortMirrorStateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/ChangePortMirrorStateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreatePortMirrorAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreatePortMirrorResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreatePortMirrorSessionAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreatePortMirrorSessionResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeletePortMirrorAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeletePortMirrorResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeletePortMirrorSessionAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeletePortMirrorSessionResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/GetCandidateVmNicsForPortMirrorAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/GetCandidateVmNicsForPortMirrorResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/MirrorNetworkUsedIpInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/PortMirrorInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/PortMirrorSessionInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/PortMirrorState.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryPortMirrorAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryPortMirrorNetworkUsedIpAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryPortMirrorNetworkUsedIpResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryPortMirrorResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryPortMirrorSessionAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryPortMirrorSessionResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/SessionStatus.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/SessionType.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdatePortMirrorAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdatePortMirrorResult.java diff --git a/conf/roleDefinitions/roleDefinition.json b/conf/roleDefinitions/roleDefinition.json index 63fce6d52d0..a70b01829b1 100644 --- a/conf/roleDefinitions/roleDefinition.json +++ b/conf/roleDefinitions/roleDefinition.json @@ -69,7 +69,6 @@ "org.zstack.aliyun.pangu.**", "org.zstack.network.service.lb.**", "org.zstack.core.gc.**", - "org.zstack.header.portMirror.**", "org.zstack.sns.**", "org.zstack.license.APIDeleteLicenseMsg", "org.zstack.license.APIUpdateLicenseMsg", diff --git a/sdk/src/main/java/SourceClassMap.java b/sdk/src/main/java/SourceClassMap.java index c4321f1fd69..7595149741d 100644 --- a/sdk/src/main/java/SourceClassMap.java +++ b/sdk/src/main/java/SourceClassMap.java @@ -202,12 +202,6 @@ public class SourceClassMap { put("org.zstack.header.network.l3.datatypes.IpCapacityData", "org.zstack.sdk.IpCapacityData"); put("org.zstack.header.network.service.NetworkServiceL3NetworkRefInventory", "org.zstack.sdk.NetworkServiceL3NetworkRefInventory"); put("org.zstack.header.network.service.NetworkServiceProviderInventory", "org.zstack.sdk.NetworkServiceProviderInventory"); - put("org.zstack.header.portMirror.MirrorNetworkUsedIpInventory", "org.zstack.sdk.MirrorNetworkUsedIpInventory"); - put("org.zstack.header.portMirror.PortMirrorInventory", "org.zstack.sdk.PortMirrorInventory"); - put("org.zstack.header.portMirror.PortMirrorSessionInventory", "org.zstack.sdk.PortMirrorSessionInventory"); - put("org.zstack.header.portMirror.PortMirrorState", "org.zstack.sdk.PortMirrorState"); - put("org.zstack.header.portMirror.SessionStatus", "org.zstack.sdk.SessionStatus"); - put("org.zstack.header.portMirror.SessionType", "org.zstack.sdk.SessionType"); put("org.zstack.header.protocol.Neighbor", "org.zstack.sdk.Neighbor"); put("org.zstack.header.protocol.NetworkRouterAreaRefInventory", "org.zstack.sdk.NetworkRouterAreaRefInventory"); put("org.zstack.header.protocol.RouterAreaInventory", "org.zstack.sdk.RouterAreaInventory"); @@ -903,7 +897,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.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"); put("org.zstack.sdk.MonInfo", "org.zstack.storage.ceph.primary.KvmCephIsoTO$MonInfo"); @@ -970,9 +963,6 @@ public class SourceClassMap { put("org.zstack.sdk.PortForwardingRuleInventory", "org.zstack.network.service.portforwarding.PortForwardingRuleInventory"); put("org.zstack.sdk.PortGroupInventory", "org.zstack.network.l2.virtualSwitch.header.PortGroupInventory"); put("org.zstack.sdk.PortGroupVlanMode", "org.zstack.network.l2.virtualSwitch.header.PortGroupVlanMode"); - put("org.zstack.sdk.PortMirrorInventory", "org.zstack.header.portMirror.PortMirrorInventory"); - put("org.zstack.sdk.PortMirrorSessionInventory", "org.zstack.header.portMirror.PortMirrorSessionInventory"); - put("org.zstack.sdk.PortMirrorState", "org.zstack.header.portMirror.PortMirrorState"); put("org.zstack.sdk.PowerOffHardwareResult", "org.zstack.header.cluster.PowerOffHardwareResult"); put("org.zstack.sdk.PreconfigurationTemplateInventory", "org.zstack.header.baremetal.preconfiguration.PreconfigurationTemplateInventory"); put("org.zstack.sdk.PreviewResourceStruct", "org.zstack.header.cloudformation.PreviewResourceStruct"); @@ -1036,8 +1026,6 @@ public class SourceClassMap { put("org.zstack.sdk.Sensor", "org.zstack.header.host.Sensor"); put("org.zstack.sdk.ServiceTypeStatisticData", "org.zstack.header.host.ServiceTypeStatisticData"); put("org.zstack.sdk.SessionInventory", "org.zstack.header.identity.SessionInventory"); - put("org.zstack.sdk.SessionStatus", "org.zstack.header.portMirror.SessionStatus"); - put("org.zstack.sdk.SessionType", "org.zstack.header.portMirror.SessionType"); put("org.zstack.sdk.SftpBackupStorageInventory", "org.zstack.storage.backup.sftp.SftpBackupStorageInventory"); put("org.zstack.sdk.ShareableVolumeVmInstanceRefInventory", "org.zstack.mevoco.ShareableVolumeVmInstanceRefInventory"); put("org.zstack.sdk.SharedBlockCandidateStruct", "org.zstack.storage.primary.sharedblock.SharedBlockCandidateStruct"); diff --git a/sdk/src/main/java/org/zstack/sdk/ChangePortMirrorStateAction.java b/sdk/src/main/java/org/zstack/sdk/ChangePortMirrorStateAction.java deleted file mode 100644 index 58eb69d29bc..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangePortMirrorStateAction.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 ChangePortMirrorStateAction 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.ChangePortMirrorStateResult 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.ChangePortMirrorStateResult value = res.getResult(org.zstack.sdk.ChangePortMirrorStateResult.class); - ret.value = value == null ? new org.zstack.sdk.ChangePortMirrorStateResult() : 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 = "/port-mirrors/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "changePortMirrorState"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangePortMirrorStateResult.java b/sdk/src/main/java/org/zstack/sdk/ChangePortMirrorStateResult.java deleted file mode 100644 index 8cd9ddfb34c..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangePortMirrorStateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.PortMirrorInventory; - -public class ChangePortMirrorStateResult { - public PortMirrorInventory inventory; - public void setInventory(PortMirrorInventory inventory) { - this.inventory = inventory; - } - public PortMirrorInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorAction.java b/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorAction.java deleted file mode 100644 index 64f085dedd7..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorAction.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 CreatePortMirrorAction 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.CreatePortMirrorResult 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 mirrorNetworkUuid; - - @Param(required = false, maxLength = 128, 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, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String stateEvent; - - @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.CreatePortMirrorResult value = res.getResult(org.zstack.sdk.CreatePortMirrorResult.class); - ret.value = value == null ? new org.zstack.sdk.CreatePortMirrorResult() : 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 = "/port-mirrors"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorResult.java b/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorResult.java deleted file mode 100644 index 6d4f2bbf97b..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.PortMirrorInventory; - -public class CreatePortMirrorResult { - public PortMirrorInventory inventory; - public void setInventory(PortMirrorInventory inventory) { - this.inventory = inventory; - } - public PortMirrorInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorSessionAction.java b/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorSessionAction.java deleted file mode 100644 index 71aa76004c4..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorSessionAction.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 CreatePortMirrorSessionAction 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.CreatePortMirrorSessionResult 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 portMirrorUuid; - - @Param(required = true, maxLength = 128, 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 = true, validValues = {"Ingress","Egress","Bidirection"}, 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 srcEndPoint; - - @Param(required = true, maxLength = 32, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String dstEndPoint; - - @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.CreatePortMirrorSessionResult value = res.getResult(org.zstack.sdk.CreatePortMirrorSessionResult.class); - ret.value = value == null ? new org.zstack.sdk.CreatePortMirrorSessionResult() : 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 = "/port-mirrors/sessions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorSessionResult.java b/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorSessionResult.java deleted file mode 100644 index 2b65f66d238..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreatePortMirrorSessionResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.PortMirrorSessionInventory; - -public class CreatePortMirrorSessionResult { - public PortMirrorSessionInventory inventory; - public void setInventory(PortMirrorSessionInventory inventory) { - this.inventory = inventory; - } - public PortMirrorSessionInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorAction.java b/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorAction.java deleted file mode 100644 index 0f737ba6cfb..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorAction.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 DeletePortMirrorAction 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.DeletePortMirrorResult 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.DeletePortMirrorResult value = res.getResult(org.zstack.sdk.DeletePortMirrorResult.class); - ret.value = value == null ? new org.zstack.sdk.DeletePortMirrorResult() : 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 = "/port-mirrors/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorResult.java b/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorResult.java deleted file mode 100644 index 33a9f85283b..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeletePortMirrorResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorSessionAction.java b/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorSessionAction.java deleted file mode 100644 index 3defbc8ff17..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorSessionAction.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 DeletePortMirrorSessionAction 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.DeletePortMirrorSessionResult 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.DeletePortMirrorSessionResult value = res.getResult(org.zstack.sdk.DeletePortMirrorSessionResult.class); - ret.value = value == null ? new org.zstack.sdk.DeletePortMirrorSessionResult() : 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 = "/port-mirrors/sessons/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorSessionResult.java b/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorSessionResult.java deleted file mode 100644 index c0d1d658a89..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeletePortMirrorSessionResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeletePortMirrorSessionResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetCandidateVmNicsForPortMirrorAction.java b/sdk/src/main/java/org/zstack/sdk/GetCandidateVmNicsForPortMirrorAction.java deleted file mode 100644 index 315de7011af..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetCandidateVmNicsForPortMirrorAction.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 GetCandidateVmNicsForPortMirrorAction 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.GetCandidateVmNicsForPortMirrorResult 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 portMirrorUuid; - - @Param(required = true, validValues = {"source","dest"}, 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; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.GetCandidateVmNicsForPortMirrorResult value = res.getResult(org.zstack.sdk.GetCandidateVmNicsForPortMirrorResult.class); - ret.value = value == null ? new org.zstack.sdk.GetCandidateVmNicsForPortMirrorResult() : 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 = "/port-mirrors/{portMirrorUuid}/vm-instances/candidate-nics/{type}"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/GetCandidateVmNicsForPortMirrorResult.java b/sdk/src/main/java/org/zstack/sdk/GetCandidateVmNicsForPortMirrorResult.java deleted file mode 100644 index 8fa95254780..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/GetCandidateVmNicsForPortMirrorResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class GetCandidateVmNicsForPortMirrorResult { - 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/MirrorNetworkUsedIpInventory.java b/sdk/src/main/java/org/zstack/sdk/MirrorNetworkUsedIpInventory.java deleted file mode 100644 index eb16e255003..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/MirrorNetworkUsedIpInventory.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.UsedIpInventory; - -public class MirrorNetworkUsedIpInventory { - - public UsedIpInventory usedIpInventory; - public void setUsedIpInventory(UsedIpInventory usedIpInventory) { - this.usedIpInventory = usedIpInventory; - } - public UsedIpInventory getUsedIpInventory() { - return this.usedIpInventory; - } - - public java.lang.String l3NetworkUuid; - public void setL3NetworkUuid(java.lang.String l3NetworkUuid) { - this.l3NetworkUuid = l3NetworkUuid; - } - public java.lang.String getL3NetworkUuid() { - return this.l3NetworkUuid; - } - - 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 description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - 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 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/PortMirrorInventory.java b/sdk/src/main/java/org/zstack/sdk/PortMirrorInventory.java deleted file mode 100644 index 6b9f407889d..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/PortMirrorInventory.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.PortMirrorState; - -public class PortMirrorInventory { - - 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 PortMirrorState state; - public void setState(PortMirrorState state) { - this.state = state; - } - public PortMirrorState getState() { - return this.state; - } - - public java.lang.String mirrorNetworkUuid; - public void setMirrorNetworkUuid(java.lang.String mirrorNetworkUuid) { - this.mirrorNetworkUuid = mirrorNetworkUuid; - } - public java.lang.String getMirrorNetworkUuid() { - return this.mirrorNetworkUuid; - } - - 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 sessions; - public void setSessions(java.util.List sessions) { - this.sessions = sessions; - } - public java.util.List getSessions() { - return this.sessions; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/PortMirrorSessionInventory.java b/sdk/src/main/java/org/zstack/sdk/PortMirrorSessionInventory.java deleted file mode 100644 index e99e3b48066..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/PortMirrorSessionInventory.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.SessionStatus; -import org.zstack.sdk.SessionType; - -public class PortMirrorSessionInventory { - - 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 SessionStatus status; - public void setStatus(SessionStatus status) { - this.status = status; - } - public SessionStatus getStatus() { - return this.status; - } - - public java.lang.Long internalId; - public void setInternalId(java.lang.Long internalId) { - this.internalId = internalId; - } - public java.lang.Long getInternalId() { - return this.internalId; - } - - public java.lang.String srcEndPoint; - public void setSrcEndPoint(java.lang.String srcEndPoint) { - this.srcEndPoint = srcEndPoint; - } - public java.lang.String getSrcEndPoint() { - return this.srcEndPoint; - } - - public SessionType type; - public void setType(SessionType type) { - this.type = type; - } - public SessionType getType() { - return this.type; - } - - public java.lang.String dstEndPoint; - public void setDstEndPoint(java.lang.String dstEndPoint) { - this.dstEndPoint = dstEndPoint; - } - public java.lang.String getDstEndPoint() { - return this.dstEndPoint; - } - - public java.lang.String portMirrorUuid; - public void setPortMirrorUuid(java.lang.String portMirrorUuid) { - this.portMirrorUuid = portMirrorUuid; - } - public java.lang.String getPortMirrorUuid() { - return this.portMirrorUuid; - } - - 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/PortMirrorState.java b/sdk/src/main/java/org/zstack/sdk/PortMirrorState.java deleted file mode 100644 index 6ed54dddcd5..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/PortMirrorState.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.zstack.sdk; - -public enum PortMirrorState { - Enabled, - Disabled, -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorAction.java b/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorAction.java deleted file mode 100644 index 1d7ac00a308..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorAction.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 QueryPortMirrorAction 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.QueryPortMirrorResult 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.QueryPortMirrorResult value = res.getResult(org.zstack.sdk.QueryPortMirrorResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryPortMirrorResult() : 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 = "/port-mirrors"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorNetworkUsedIpAction.java b/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorNetworkUsedIpAction.java deleted file mode 100644 index 8ca0e91382a..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorNetworkUsedIpAction.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 QueryPortMirrorNetworkUsedIpAction 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.QueryPortMirrorNetworkUsedIpResult 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.QueryPortMirrorNetworkUsedIpResult value = res.getResult(org.zstack.sdk.QueryPortMirrorNetworkUsedIpResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryPortMirrorNetworkUsedIpResult() : 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 = "/port-mirrors/networks/usedIps"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorNetworkUsedIpResult.java b/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorNetworkUsedIpResult.java deleted file mode 100644 index 69f306c2308..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorNetworkUsedIpResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryPortMirrorNetworkUsedIpResult { - 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/QueryPortMirrorResult.java b/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorResult.java deleted file mode 100644 index d015ecbcbe7..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryPortMirrorResult { - 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/QueryPortMirrorSessionAction.java b/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorSessionAction.java deleted file mode 100644 index 7e9108fe322..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorSessionAction.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 QueryPortMirrorSessionAction 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.QueryPortMirrorSessionResult 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.QueryPortMirrorSessionResult value = res.getResult(org.zstack.sdk.QueryPortMirrorSessionResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryPortMirrorSessionResult() : 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 = "/port-mirrors/sessions"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorSessionResult.java b/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorSessionResult.java deleted file mode 100644 index 17911a20016..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryPortMirrorSessionResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryPortMirrorSessionResult { - 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/SessionStatus.java b/sdk/src/main/java/org/zstack/sdk/SessionStatus.java deleted file mode 100644 index 1e4aa4cc2ac..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/SessionStatus.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - -public enum SessionStatus { - Created, - Active, - Inactive, -} diff --git a/sdk/src/main/java/org/zstack/sdk/SessionType.java b/sdk/src/main/java/org/zstack/sdk/SessionType.java deleted file mode 100644 index 5c4ee2e5628..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/SessionType.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - -public enum SessionType { - Ingress, - Egress, - Bidirection, -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdatePortMirrorAction.java b/sdk/src/main/java/org/zstack/sdk/UpdatePortMirrorAction.java deleted file mode 100644 index f8aa8b0108e..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdatePortMirrorAction.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 UpdatePortMirrorAction 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.UpdatePortMirrorResult 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 = 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.UpdatePortMirrorResult value = res.getResult(org.zstack.sdk.UpdatePortMirrorResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdatePortMirrorResult() : 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 = "/port-mirrors/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updatePortMirror"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdatePortMirrorResult.java b/sdk/src/main/java/org/zstack/sdk/UpdatePortMirrorResult.java deleted file mode 100644 index 5ba8cf69c2d..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdatePortMirrorResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.PortMirrorInventory; - -public class UpdatePortMirrorResult { - public PortMirrorInventory inventory; - public void setInventory(PortMirrorInventory inventory) { - this.inventory = inventory; - } - public PortMirrorInventory getInventory() { - return this.inventory; - } - -} diff --git a/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy b/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy index 5232c9cb2f8..3ee3e43770c 100644 --- a/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy +++ b/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy @@ -3822,33 +3822,6 @@ 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() - 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 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 @@ -6819,60 +6792,6 @@ 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() - 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 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 - 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 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 @@ -9897,60 +9816,6 @@ 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() - 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 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 - 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 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 @@ -13758,33 +13623,6 @@ 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() - 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 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 @@ -22713,93 +22551,6 @@ 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() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.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 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 - 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 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 - 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 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 @@ -31063,33 +30814,6 @@ abstract class ApiHelper { } - 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