From 5f1ecdbee8cb6779906f4762ca993a72809a3e37 Mon Sep 17 00:00:00 2001 From: Zhang Wenhao Date: Fri, 17 Jul 2026 10:44:48 +0800 Subject: [PATCH] [sdk]: remove vpc-firewall module Resolves: ZSV-12555 Related: ZSV-5323 Change-Id: I696370686c76726c6770777564686d696f6e786e --- build/pom.xml | 5 - conf/i18n_json/i18n_vpcFirewall.json | 482 --------- conf/roleDefinitions/roleDefinition.json | 1 - sdk/src/main/java/SourceClassMap.java | 24 - .../main/java/org/zstack/sdk/ActionType.java | 7 - .../zstack/sdk/ApplyRuleSetChangesAction.java | 101 -- .../zstack/sdk/ApplyRuleSetChangesResult.java | 14 - .../sdk/AttachFirewallRuleSetToL3Action.java | 110 -- .../sdk/AttachFirewallRuleSetToL3Result.java | 14 - .../sdk/ChangeFirewallRuleStateAction.java | 104 -- .../sdk/ChangeFirewallRuleStateResult.java | 14 - .../CheckFirewallRuleConfigFileAction.java | 95 -- .../CheckFirewallRuleConfigFileResult.java | 7 - .../CreateFirewallIpSetTemplateAction.java | 116 --- .../CreateFirewallIpSetTemplateResult.java | 14 - .../zstack/sdk/CreateFirewallRuleAction.java | 146 --- ...reateFirewallRuleFromConfigFileAction.java | 107 -- ...reateFirewallRuleFromConfigFileResult.java | 14 - .../zstack/sdk/CreateFirewallRuleResult.java | 14 - .../sdk/CreateFirewallRuleSetAction.java | 113 --- .../sdk/CreateFirewallRuleSetResult.java | 14 - .../sdk/CreateFirewallRuleTemplateAction.java | 146 --- .../sdk/CreateFirewallRuleTemplateResult.java | 14 - .../zstack/sdk/CreateVpcFirewallAction.java | 113 --- .../zstack/sdk/CreateVpcFirewallResult.java | 14 - .../org/zstack/sdk/DeleteFirewallAction.java | 104 -- .../DeleteFirewallIpSetTemplateAction.java | 104 -- .../DeleteFirewallIpSetTemplateResult.java | 7 - .../org/zstack/sdk/DeleteFirewallResult.java | 7 - .../zstack/sdk/DeleteFirewallRuleAction.java | 104 -- .../zstack/sdk/DeleteFirewallRuleResult.java | 7 - .../sdk/DeleteFirewallRuleSetAction.java | 104 -- .../sdk/DeleteFirewallRuleSetResult.java | 7 - .../sdk/DeleteFirewallRuleTemplateAction.java | 104 -- .../sdk/DeleteFirewallRuleTemplateResult.java | 7 - .../DetachFirewallRuleSetFromL3Action.java | 110 -- .../DetachFirewallRuleSetFromL3Result.java | 7 - .../org/zstack/sdk/FirewallRuleState.java | 6 - .../main/java/org/zstack/sdk/IpSetType.java | 6 - .../org/zstack/sdk/PacketsForwardType.java | 7 - .../java/org/zstack/sdk/ProtocolType.java | 52 - .../sdk/QueryFirewallIpSetTemplateAction.java | 75 -- .../sdk/QueryFirewallIpSetTemplateResult.java | 22 - .../zstack/sdk/QueryFirewallRuleAction.java | 75 -- .../zstack/sdk/QueryFirewallRuleResult.java | 22 - .../sdk/QueryFirewallRuleSetAction.java | 75 -- .../sdk/QueryFirewallRuleSetL3RefAction.java | 75 -- .../sdk/QueryFirewallRuleSetL3RefResult.java | 22 - .../sdk/QueryFirewallRuleSetResult.java | 22 - .../sdk/QueryFirewallRuleTemplateAction.java | 75 -- .../sdk/QueryFirewallRuleTemplateResult.java | 22 - .../zstack/sdk/QueryVpcFirewallAction.java | 75 -- .../zstack/sdk/QueryVpcFirewallResult.java | 22 - .../sdk/QueryVpcFirewallVRouterRefAction.java | 75 -- .../sdk/QueryVpcFirewallVRouterRefResult.java | 22 - .../org/zstack/sdk/RefreshFirewallAction.java | 101 -- .../org/zstack/sdk/RefreshFirewallResult.java | 14 - .../UpdateFirewallIpSetTemplateAction.java | 113 --- .../UpdateFirewallIpSetTemplateResult.java | 14 - .../zstack/sdk/UpdateFirewallRuleAction.java | 143 --- .../zstack/sdk/UpdateFirewallRuleResult.java | 14 - .../sdk/UpdateFirewallRuleSetAction.java | 110 -- .../sdk/UpdateFirewallRuleSetResult.java | 14 - .../sdk/UpdateFirewallRuleTemplateAction.java | 149 --- .../sdk/UpdateFirewallRuleTemplateResult.java | 14 - .../zstack/sdk/UpdateVpcFirewallAction.java | 107 -- .../zstack/sdk/UpdateVpcFirewallResult.java | 14 - .../org/zstack/sdk/VpcFirewallInventory.java | 55 - .../VpcFirewallIpSetTemplateInventory.java | 71 -- .../zstack/sdk/VpcFirewallRuleInventory.java | 159 --- .../sdk/VpcFirewallRuleSetInventory.java | 79 -- .../sdk/VpcFirewallRuleSetL3RefInventory.java | 63 -- .../sdk/VpcFirewallRuleTemplateInventory.java | 161 --- .../sdk/VpcFirewallVRouterRefInventory.java | 47 - .../java/org/zstack/testlib/ApiHelper.groovy | 957 ++---------------- 75 files changed, 80 insertions(+), 5544 deletions(-) delete mode 100644 conf/i18n_json/i18n_vpcFirewall.json delete mode 100644 sdk/src/main/java/org/zstack/sdk/ActionType.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/ApplyRuleSetChangesAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/ApplyRuleSetChangesResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/AttachFirewallRuleSetToL3Action.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/AttachFirewallRuleSetToL3Result.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/ChangeFirewallRuleStateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/ChangeFirewallRuleStateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CheckFirewallRuleConfigFileAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CheckFirewallRuleConfigFileResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallIpSetTemplateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallIpSetTemplateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleFromConfigFileAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleFromConfigFileResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleSetAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleSetResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleTemplateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleTemplateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateVpcFirewallAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/CreateVpcFirewallResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallIpSetTemplateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallIpSetTemplateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleSetAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleSetResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleTemplateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleTemplateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DetachFirewallRuleSetFromL3Action.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/DetachFirewallRuleSetFromL3Result.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/FirewallRuleState.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/IpSetType.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/PacketsForwardType.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/ProtocolType.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallIpSetTemplateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallIpSetTemplateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetL3RefAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetL3RefResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleTemplateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleTemplateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallVRouterRefAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallVRouterRefResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/RefreshFirewallAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/RefreshFirewallResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateFirewallIpSetTemplateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateFirewallIpSetTemplateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleSetAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleSetResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleTemplateAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleTemplateResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateVpcFirewallAction.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/UpdateVpcFirewallResult.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/VpcFirewallInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/VpcFirewallIpSetTemplateInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleSetInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleSetL3RefInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleTemplateInventory.java delete mode 100644 sdk/src/main/java/org/zstack/sdk/VpcFirewallVRouterRefInventory.java diff --git a/build/pom.xml b/build/pom.xml index beb4bf2a0ec..f97ac4a6226 100755 --- a/build/pom.xml +++ b/build/pom.xml @@ -417,11 +417,6 @@ ${project.version} - - org.zstack - vpcFirewall - ${project.version} - org.zstack guesttools diff --git a/conf/i18n_json/i18n_vpcFirewall.json b/conf/i18n_json/i18n_vpcFirewall.json deleted file mode 100644 index 2ae59ecaac7..00000000000 --- a/conf/i18n_json/i18n_vpcFirewall.json +++ /dev/null @@ -1,482 +0,0 @@ -[ - { - "raw": "can not detach system default ruleSet", - "en_US": "can not detach system default ruleSet", - "zh_CN": "无法分离系统默认规则集", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "only system ruleSet can change action type", - "en_US": "only system ruleSet can change action type", - "zh_CN": "只有系统规则集才能更改操作类型", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "can not delete system default ruleSet", - "en_US": "can not delete system default ruleSet", - "zh_CN": "无法删除系统默认规则集", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "can not delete system default rule", - "en_US": "can not delete system default rule", - "zh_CN": "无法删除系统默认规则", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "the router [uuid:%s] does not has a master router", - "en_US": "the router [uuid:{0}] does not has a master router", - "zh_CN": "路由器[uuid：{0}]没有主路由器", - "arguments": [ - "vRouteUuid" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "the VPC Router[uuid:%s] already has a firewall.", - "en_US": "the VPC Router[uuid:{0}] already has a firewall.", - "zh_CN": "VPC路由器[uuid：{0}]已有防火墙。", - "arguments": [ - "msg.getVpcUuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "already has a rule template with name %s", - "en_US": "already has a rule template with name {0}", - "zh_CN": "已有名为{0}的规则模板", - "arguments": [ - "msg.getName()", - "msg.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "the ruleSet[%s] already has a rule with rule number %s.", - "en_US": "the ruleSet[{0}] already has a rule with rule number {1}.", - "zh_CN": "规则集[{0}]已具有规则编号为{1}的规则。", - "arguments": [ - "msg.getRuleSetUuid()", - "msg.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "can not update default rule[%s]", - "en_US": "can not update default rule[{0}]", - "zh_CN": "无法更新默认规则[{0}]", - "arguments": [ - "msg.getUuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "only tcp or udp protocol can use port", - "en_US": "only tcp or udp protocol can use port", - "zh_CN": "只有TCP或UDP协议可以使用端口", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "only tcp protocol can use tcp flag", - "en_US": "only tcp protocol can use tcp flag", - "zh_CN": "只有TCP协议才能使用TCP标志", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "only icmp protocol can use icmp type", - "en_US": "only icmp protocol can use icmp type", - "zh_CN": "只有ICMP协议才能使用ICMP类型", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "the rule [%s] number is invalid", - "en_US": "the rule [{0}] number is invalid", - "zh_CN": "规则[{0}]编号无效", - "arguments": [ - "msg.getUuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "can not attach the default ruleSet to other nic", - "en_US": "can not attach the default ruleSet to other nic", - "zh_CN": "无法将默认规则集附加到其他NIC", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "ruleSet[%s] already has a l3[%s]", - "en_US": "ruleSet[{0}] already has a l3[{1}]", - "zh_CN": "规则集[{0}]已具有L3[{1}]", - "arguments": [ - "msg.getRuleSetUuid()", - "msg.getL3Uuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "already has a rule with the number[%s]", - "en_US": "already has a rule with the number[{0}]", - "zh_CN": "已具有编号为[{0}]的规则", - "arguments": [ - "duplicateRuleNumbers" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "the ruleSet[%s] already has a rule with the rule number %s.", - "en_US": "the ruleSet[{0}] already has a rule with the rule number {1}.", - "zh_CN": "规则集[{0}]已具有规则编号为{1}的规则。", - "arguments": [ - "msg.getRuleSetUuid()", - "msg.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule[%d] only tcp or udp protocol can use port", - "en_US": "could not add firewall rule[{0}] only tcp or udp protocol can use port", - "zh_CN": "无法添加防火墙规则[{0}]只有TCP或UDP协议可以使用端口", - "arguments": [ - "msg.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule[%d] only tcp protocol can use tcp flag", - "en_US": "could not add firewall rule[{0}] only tcp protocol can use tcp flag", - "zh_CN": "无法添加防火墙规则[{0}]只有TCP协议可以使用TCP标志", - "arguments": [ - "msg.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule[%d] because only icmp protocol can use icmp type", - "en_US": "could not add firewall rule[{0}] because only icmp protocol can use icmp type", - "zh_CN": "无法添加防火墙规则[{0}]，因为只有ICMP协议可以使用ICMP类型", - "arguments": [ - "msg.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule[%d] because only tcp or udp protocol can use port", - "en_US": "could not add firewall rule[{0}] because only tcp or udp protocol can use port", - "zh_CN": "无法添加防火墙规则[{0}]，因为只有TCP或UDP协议可以使用端口", - "arguments": [ - "msg.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule[%d] because only tcp protocol can use tcp flag", - "en_US": "could not add firewall rule[{0}] because only tcp protocol can use tcp flag", - "zh_CN": "无法添加防火墙规则[{0}]，因为只有TCP协议可以使用TCP标志", - "arguments": [ - "msg.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule[%d] because %s", - "en_US": "could not add firewall rule[{0}] because {1}", - "zh_CN": "无法添加防火墙规则[{0}]，因为{1}", - "arguments": [ - "msg.getRuleNumber()", - "error" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule, because ruleNo %d is invalid", - "en_US": "could not add firewall rule, because ruleNo {0} is invalid", - "zh_CN": "无法添加防火墙规则，因为RuleNo{0}无效", - "arguments": [ - "vo.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule, because there is no action for ruleNo:%d", - "en_US": "could not add firewall rule, because there is no action for ruleNo:{0}", - "zh_CN": "无法添加防火墙规则，因为没有针对RuleNo的操作：{0}", - "arguments": [ - "vo.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule, because source IP length: %s is not valid for ruleNo:%d", - "en_US": "could not add firewall rule, because source IP length: {0} is not valid for ruleNo:{1}", - "zh_CN": "无法添加防火墙规则，因为源IP长度{0}对RuleNo{1}无效", - "arguments": [ - "vo.getSourceIp()", - "vo.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule, because destination IP length: %s is not valid for ruleNo:%d", - "en_US": "could not add firewall rule, because destination IP length: {0} is not valid for ruleNo:{1}", - "zh_CN": "无法添加防火墙规则，因为目标IP长度{0}对RuleNo{1}无效", - "arguments": [ - "vo.getDestIp()", - "vo.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule, because there is no state for ruleNo:%d", - "en_US": "could not add firewall rule, because there is no state for ruleNo:{0}", - "zh_CN": "无法添加防火墙规则，因为RuleNo没有状态：{0}", - "arguments": [ - "vo.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "could not add firewall rule, because description length %s is not valid for ruleNo:%d", - "en_US": "could not add firewall rule, because description length {0} is not valid for ruleNo:{1}", - "zh_CN": "无法添加防火墙规则，因为描述长度{0}对RuleNo无效：{1}", - "arguments": [ - "vo.getDestIp()", - "vo.getRuleNumber()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "the configuration file has format error", - "en_US": "the configuration file has format error", - "zh_CN": "配置文件有格式错误", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "the firewall rules in the configuration file have syntax errors: %s", - "en_US": "the firewall rules in the configuration file have syntax errors: {0}", - "zh_CN": "配置文件中的防火墙规则有语法错误：{0}", - "arguments": [ - "errorInfo" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallApiInterceptor.java" - }, - { - "raw": "sync firewall config failed,because %s", - "en_US": "sync firewall config failed,because {0}", - "zh_CN": "同步防火墙配置失败，因为{0}", - "arguments": [ - "rsp.getError()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "update firewall ruleSet action failed, because %s", - "en_US": "update firewall ruleSet action failed, because {0}", - "zh_CN": "更新防火墙规则集操作失败，因为{0}", - "arguments": [ - "rsp.getError()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "Can not find l3[%] related mac on vRouter[%s]", - "en_US": "Can not find l3[%] related mac on vRouter[{0}]", - "zh_CN": "在VRouter[{0}]上找不到与L3[%]相关的MAC", - "arguments": [ - "l3Uuid", - "vRouterUuid" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "create firewall rule[%s] failed, because %s", - "en_US": "create firewall rule[{0}] failed, because {1}", - "zh_CN": "创建防火墙规则[{0}]失败，原因是{1}", - "arguments": [ - "cmd.getRef().getRuleSetInfo().getRules().get(0).getRuleNumber()", - "rsp.getError()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "delete firewall on vRouter[%s],because %s", - "en_US": "delete firewall on vRouter[{0}],because {1}", - "zh_CN": "删除VRouter[{0}]上的防火墙，因为{1}", - "arguments": [ - "vRouterUuid", - "re.getError().getCause()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "create firewall ruleSet[%s] failed, because %s", - "en_US": "create firewall ruleSet[{0}] failed, because {1}", - "zh_CN": "创建防火墙规则集[{0}]失败，原因是{1}", - "arguments": [ - "cmd.getRuleSet().getName()", - "re.getError().getCause()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "delete firewall rule failed on vRouter[%s], because %s", - "en_US": "delete firewall rule failed on vRouter[{0}], because {1}", - "zh_CN": "在VRouter[{0}]上删除防火墙规则失败，因为{1}", - "arguments": [ - "vRouterUuid", - "rsp.getError()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "change firewall rule state on vRouter[%s] failed, because %s", - "en_US": "change firewall rule state on vRouter[{0}] failed, because {1}", - "zh_CN": "更改VRouter[{0}]上的防火墙规则状态失败，原因是{1}", - "arguments": [ - "vRouterUuid", - "rsp.getError()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "attach firewall ruleSet[%s] failed, because %s", - "en_US": "attach firewall ruleSet[{0}] failed, because {1}", - "zh_CN": "附加防火墙规则集[{0}]失败，原因是{1}", - "arguments": [ - "struct.getRuleSetUuid()", - "re.getError()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "detach ruleSet failed, maybe it has been deleted", - "en_US": "detach ruleSet failed, maybe it has been deleted", - "zh_CN": "分离规则集失败，它可能已被删除", - "arguments": [], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "detach firewall ruleSet[%s] failed,because %s", - "en_US": "detach firewall ruleSet[{0}] failed,because {1}", - "zh_CN": "分离防火墙规则集[{0}]失败，原因是{1}", - "arguments": [ - "struct.getRuleSetUuid()", - "re.getError().getCause()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallBackend.java" - }, - { - "raw": "cannot find vpcFirewall[uuid:%s], it may have been deleted", - "en_US": "cannot find vpcFirewall[uuid:{0}], it may have been deleted", - "zh_CN": "找不到vpcFirewall[uuid：{0}]，它可能已被删除", - "arguments": [ - "msg.getVpcFirewallUuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallManagerImpl.java" - }, - { - "raw": "cannot find vpcFirewallRuleSet[uuid:%s], it may have been deleted", - "en_US": "cannot find vpcFirewallRuleSet[uuid:{0}], it may have been deleted", - "zh_CN": "找不到VpcFirewallRuleSet[uuid：{0}]，它可能已被删除", - "arguments": [ - "msg.getRuleSetUuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallManagerImpl.java" - }, - { - "raw": "cannot find vpcFirewallIpSetTemplate[uuid:%s], it may have been deleted", - "en_US": "cannot find vpcFirewallIpSetTemplate[uuid:{0}], it may have been deleted", - "zh_CN": "找不到VpcFireWallipSetTemplate[uuid：{0}]，它可能已被删除", - "arguments": [ - "msg.getUuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallManagerImpl.java" - }, - { - "raw": "attach firewall ruleSet[%s] to l3[%s] failed,because %s", - "en_US": "attach firewall ruleSet[{0}] to l3[{1}] failed,because {2}", - "zh_CN": "将防火墙规则集[{0}]附加到L3[{1}]失败，原因是{2}", - "arguments": [ - "msg.getRuleSetUuid()", - "msg.getL3Uuid()", - "errorCode.getCause()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallRuleSetBase.java" - }, - { - "raw": "detach firewall ruleSet from l3[%s] failed,because %s", - "en_US": "detach firewall ruleSet from l3[{0}] failed,because {1}", - "zh_CN": "从L3[{0}]分离防火墙规则集失败，原因是{1}", - "arguments": [ - "msg.getL3Uuid()", - "errorCode.getCause()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallRuleSetBase.java" - }, - { - "raw": "find duplicate rule numbers %s on firewall[%s],l3[%s],forward[%s]", - "en_US": "find duplicate rule numbers {0} on firewall[{1}],l3[{2}],forward[{3}]", - "zh_CN": "在防火墙[{1}]、L3[{2}]、转发[{3}]上查找重复的规则编号{0}", - "arguments": [ - "duplicateRuleNumber.get()", - "ref.getVpcFirewallUuid()", - "ref.getL3NetworkUuid()", - "ref.getPacketsForwardType()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallRuleSetBase.java" - }, - { - "raw": "no changes in ruleset %s", - "en_US": "no changes in ruleset {0}", - "zh_CN": "规则集{0}中没有更改", - "arguments": [ - "self.getUuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallRuleSetBase.java" - }, - { - "raw": "firewall %s related vpc not in running state", - "en_US": "firewall {0} related vpc not in running state", - "zh_CN": "防火墙{0}相关的VPC未处于运行状态", - "arguments": [ - "firewall.get()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallRuleSetBase.java" - }, - { - "raw": "can not delete ruleSet[%s] because it still attached to nic", - "en_US": "can not delete ruleSet[{0}] because it still attached to nic", - "zh_CN": "无法删除规则集[{0}]，因为它仍连接到NIC", - "arguments": [ - "msg.getUuid()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallRuleSetBase.java" - }, - { - "raw": "default ruleset %s can only attached to one interface forward, but find %s related interface", - "en_US": "default ruleset {0} can only attached to one interface forward, but find {1} related interface", - "zh_CN": "默认规则集{0}只能转发到一个接口，但找到{1}个相关接口", - "arguments": [ - "self.getUuid()", - "refVOs.size()" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallRuleSetBase.java" - }, - { - "raw": "cannot find vpcFirewall[uuid:%s] related vRouter", - "en_US": "cannot find vpcFirewall[uuid:{0}] related vRouter", - "zh_CN": "找不到与vpcFirewall[uuid：{0}]相关的虚拟路由器", - "arguments": [ - "firewallUuid" - ], - "fileName": "src/main/java/org/zstack/vpcfirewall/VpcFirewallRuleSetBase.java" - } -] \ No newline at end of file diff --git a/conf/roleDefinitions/roleDefinition.json b/conf/roleDefinitions/roleDefinition.json index 50ab8c8c70f..70ddd2aa56a 100644 --- a/conf/roleDefinitions/roleDefinition.json +++ b/conf/roleDefinitions/roleDefinition.json @@ -214,7 +214,6 @@ "org.zstack.storage.device.iscsi.**", "org.zstack.header.vipQos.**", "org.zstack.header.volume.**", - "org.zstack.vpcfirewall.api.**", "org.zstack.header.vo.APIGetResourceNamesMsg", "org.zstack.header.aliyun.network.vpc.APIUpdateEcsVpcMsg", "org.zstack.header.aliyun.network.group.APICreateEcsSecurityGroupRemoteMsg", diff --git a/sdk/src/main/java/SourceClassMap.java b/sdk/src/main/java/SourceClassMap.java index 2757de983da..51e8048eec7 100644 --- a/sdk/src/main/java/SourceClassMap.java +++ b/sdk/src/main/java/SourceClassMap.java @@ -536,18 +536,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.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"); - put("org.zstack.vpcfirewall.entity.PacketsForwardType", "org.zstack.sdk.PacketsForwardType"); - put("org.zstack.vpcfirewall.entity.ProtocolType", "org.zstack.sdk.ProtocolType"); - put("org.zstack.vpcfirewall.entity.VpcFirewallInventory", "org.zstack.sdk.VpcFirewallInventory"); - put("org.zstack.vpcfirewall.entity.VpcFirewallIpSetTemplateInventory", "org.zstack.sdk.VpcFirewallIpSetTemplateInventory"); - put("org.zstack.vpcfirewall.entity.VpcFirewallRuleInventory", "org.zstack.sdk.VpcFirewallRuleInventory"); - put("org.zstack.vpcfirewall.entity.VpcFirewallRuleSetInventory", "org.zstack.sdk.VpcFirewallRuleSetInventory"); - put("org.zstack.vpcfirewall.entity.VpcFirewallRuleSetL3RefInventory", "org.zstack.sdk.VpcFirewallRuleSetL3RefInventory"); - put("org.zstack.vpcfirewall.entity.VpcFirewallRuleTemplateInventory", "org.zstack.sdk.VpcFirewallRuleTemplateInventory"); - put("org.zstack.vpcfirewall.entity.VpcFirewallVRouterRefInventory", "org.zstack.sdk.VpcFirewallVRouterRefInventory"); put("org.zstack.vrouterRoute.VRouterRouteEntryAO", "org.zstack.sdk.VRouterRouteEntryAO"); put("org.zstack.vrouterRoute.VRouterRouteEntryInventory", "org.zstack.sdk.VRouterRouteEntryInventory"); put("org.zstack.vrouterRoute.VRouterRouteEntryType", "org.zstack.sdk.VRouterRouteEntryType"); @@ -656,7 +644,6 @@ public class SourceClassMap { put("org.zstack.sdk.AccountPriceTableRefInventory", "org.zstack.billing.table.AccountPriceTableRefInventory"); put("org.zstack.sdk.AccountResourceRefInventory", "org.zstack.header.identity.AccountResourceRefInventory"); put("org.zstack.sdk.ActionStruct", "org.zstack.cloudformation.template.struct.ActionStruct"); - put("org.zstack.sdk.ActionType", "org.zstack.vpcfirewall.entity.ActionType"); put("org.zstack.sdk.AddHostFromFileResult", "org.zstack.header.host.AddHostFromFileResult"); put("org.zstack.sdk.AddingNewVmRuleInventory", "org.zstack.autoscaling.group.rule.AddingNewVmRuleInventory"); put("org.zstack.sdk.AdditionalLicenseInfo", "org.zstack.license.AdditionalLicenseInfo"); @@ -765,7 +752,6 @@ public class SourceClassMap { put("org.zstack.sdk.FcHbaDeviceInventory", "org.zstack.storage.device.hba.FcHbaDeviceInventory"); put("org.zstack.sdk.FiberChannelLunInventory", "org.zstack.storage.device.fibreChannel.FiberChannelLunInventory"); put("org.zstack.sdk.FiberChannelStorageInventory", "org.zstack.storage.device.fibreChannel.FiberChannelStorageInventory"); - put("org.zstack.sdk.FirewallRuleState", "org.zstack.vpcfirewall.entity.FirewallRuleState"); put("org.zstack.sdk.FreeIpInventory", "org.zstack.header.network.l3.FreeIpInventory"); put("org.zstack.sdk.GarbageCollectorInventory", "org.zstack.core.gc.GarbageCollectorInventory"); put("org.zstack.sdk.GlobalConfigInventory", "org.zstack.core.config.GlobalConfigInventory"); @@ -817,7 +803,6 @@ public class SourceClassMap { put("org.zstack.sdk.IpCapacityData", "org.zstack.header.network.l3.datatypes.IpCapacityData"); put("org.zstack.sdk.IpRangeInventory", "org.zstack.header.network.l3.IpRangeInventory"); put("org.zstack.sdk.IpRangeType", "org.zstack.header.network.l3.IpRangeType"); - put("org.zstack.sdk.IpSetType", "org.zstack.vpcfirewall.entity.IpSetType"); put("org.zstack.sdk.IpStatisticData", "org.zstack.network.service.flat.IpStatisticData"); put("org.zstack.sdk.IscsiLunInventory", "org.zstack.storage.device.iscsi.IscsiLunInventory"); put("org.zstack.sdk.IscsiServerClusterRefInventory", "org.zstack.storage.device.iscsi.IscsiServerClusterRefInventory"); @@ -916,7 +901,6 @@ public class SourceClassMap { put("org.zstack.sdk.OvfOSInfo", "org.zstack.ovf.datatype.OvfOSInfo"); put("org.zstack.sdk.OvfSystemInfo", "org.zstack.ovf.datatype.OvfSystemInfo"); put("org.zstack.sdk.OvfVolumeInfo", "org.zstack.ovf.datatype.OvfVolumeInfo"); - put("org.zstack.sdk.PacketsForwardType", "org.zstack.vpcfirewall.entity.PacketsForwardType"); put("org.zstack.sdk.Pagination", "org.zstack.billing.Pagination"); put("org.zstack.sdk.PciDeviceBillingInventory", "org.zstack.billing.generator.pcidevice.PciDeviceBillingInventory"); put("org.zstack.sdk.PciDeviceChooser", "org.zstack.pciDevice.PciDeviceChooser"); @@ -952,7 +936,6 @@ public class SourceClassMap { put("org.zstack.sdk.PriceTableInventory", "org.zstack.billing.table.PriceTableInventory"); put("org.zstack.sdk.PrimaryStorageHostStatus", "org.zstack.header.storage.primary.PrimaryStorageHostStatus"); put("org.zstack.sdk.PrimaryStorageInventory", "org.zstack.header.storage.primary.PrimaryStorageInventory"); - put("org.zstack.sdk.ProtocolType", "org.zstack.vpcfirewall.entity.ProtocolType"); put("org.zstack.sdk.PubIpVipBandwidthInBillingInventory", "org.zstack.billing.generator.pubip.vip.PubIpVipBandwidthInBillingInventory"); put("org.zstack.sdk.PubIpVipBandwidthOutBillingInventory", "org.zstack.billing.generator.pubip.vip.PubIpVipBandwidthOutBillingInventory"); put("org.zstack.sdk.PubIpVipBandwidthSpending", "org.zstack.billing.spendingcalculator.vip.PubIpVipBandwidthSpending"); @@ -1113,13 +1096,6 @@ public class SourceClassMap { put("org.zstack.sdk.VolumeSnapshotReferenceTreeInventory", "org.zstack.header.storage.snapshot.reference.VolumeSnapshotReferenceTreeInventory"); put("org.zstack.sdk.VolumeSnapshotTreeInventory", "org.zstack.header.storage.snapshot.VolumeSnapshotTreeInventory"); put("org.zstack.sdk.VolumeTO", "org.zstack.kvm.VolumeTO"); - put("org.zstack.sdk.VpcFirewallInventory", "org.zstack.vpcfirewall.entity.VpcFirewallInventory"); - put("org.zstack.sdk.VpcFirewallIpSetTemplateInventory", "org.zstack.vpcfirewall.entity.VpcFirewallIpSetTemplateInventory"); - put("org.zstack.sdk.VpcFirewallRuleInventory", "org.zstack.vpcfirewall.entity.VpcFirewallRuleInventory"); - put("org.zstack.sdk.VpcFirewallRuleSetInventory", "org.zstack.vpcfirewall.entity.VpcFirewallRuleSetInventory"); - put("org.zstack.sdk.VpcFirewallRuleSetL3RefInventory", "org.zstack.vpcfirewall.entity.VpcFirewallRuleSetL3RefInventory"); - put("org.zstack.sdk.VpcFirewallRuleTemplateInventory", "org.zstack.vpcfirewall.entity.VpcFirewallRuleTemplateInventory"); - put("org.zstack.sdk.VpcFirewallVRouterRefInventory", "org.zstack.vpcfirewall.entity.VpcFirewallVRouterRefInventory"); put("org.zstack.sdk.VpcHaGroupApplianceVmRefInventory", "org.zstack.header.vpc.ha.VpcHaGroupApplianceVmRefInventory"); put("org.zstack.sdk.VpcHaGroupInventory", "org.zstack.header.vpc.ha.VpcHaGroupInventory"); put("org.zstack.sdk.VpcHaGroupMonitorIpInventory", "org.zstack.header.vpc.ha.VpcHaGroupMonitorIpInventory"); diff --git a/sdk/src/main/java/org/zstack/sdk/ActionType.java b/sdk/src/main/java/org/zstack/sdk/ActionType.java deleted file mode 100644 index 97e256dcaec..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ActionType.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - -public enum ActionType { - drop, - reject, - accept, -} diff --git a/sdk/src/main/java/org/zstack/sdk/ApplyRuleSetChangesAction.java b/sdk/src/main/java/org/zstack/sdk/ApplyRuleSetChangesAction.java deleted file mode 100644 index 973e2b494fd..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ApplyRuleSetChangesAction.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 ApplyRuleSetChangesAction 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.ApplyRuleSetChangesResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String 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.ApplyRuleSetChangesResult value = res.getResult(org.zstack.sdk.ApplyRuleSetChangesResult.class); - ret.value = value == null ? new org.zstack.sdk.ApplyRuleSetChangesResult() : 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 = "/vpcfirewalls/ruleSets/apply/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "applyRuleSetChanges"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ApplyRuleSetChangesResult.java b/sdk/src/main/java/org/zstack/sdk/ApplyRuleSetChangesResult.java deleted file mode 100644 index 52c073bc769..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ApplyRuleSetChangesResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleSetInventory; - -public class ApplyRuleSetChangesResult { - public VpcFirewallRuleSetInventory inventory; - public void setInventory(VpcFirewallRuleSetInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleSetInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachFirewallRuleSetToL3Action.java b/sdk/src/main/java/org/zstack/sdk/AttachFirewallRuleSetToL3Action.java deleted file mode 100644 index 0d999b0bfa3..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachFirewallRuleSetToL3Action.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class AttachFirewallRuleSetToL3Action 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.AttachFirewallRuleSetToL3Result value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpcFirewallUuid; - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String l3Uuid; - - @Param(required = true, validValues = {"in","out"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String forward; - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ruleSetUuid; - - @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.AttachFirewallRuleSetToL3Result value = res.getResult(org.zstack.sdk.AttachFirewallRuleSetToL3Result.class); - ret.value = value == null ? new org.zstack.sdk.AttachFirewallRuleSetToL3Result() : 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 = "/vpcfirewalls/ruleSets/{ruleSetUuid}/l3networks/{l3Uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/AttachFirewallRuleSetToL3Result.java b/sdk/src/main/java/org/zstack/sdk/AttachFirewallRuleSetToL3Result.java deleted file mode 100644 index 68d0816c809..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/AttachFirewallRuleSetToL3Result.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleSetL3RefInventory; - -public class AttachFirewallRuleSetToL3Result { - public VpcFirewallRuleSetL3RefInventory inventory; - public void setInventory(VpcFirewallRuleSetL3RefInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleSetL3RefInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeFirewallRuleStateAction.java b/sdk/src/main/java/org/zstack/sdk/ChangeFirewallRuleStateAction.java deleted file mode 100644 index 30509537cb4..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeFirewallRuleStateAction.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 ChangeFirewallRuleStateAction 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.ChangeFirewallRuleStateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"enable","disable"}, 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.ChangeFirewallRuleStateResult value = res.getResult(org.zstack.sdk.ChangeFirewallRuleStateResult.class); - ret.value = value == null ? new org.zstack.sdk.ChangeFirewallRuleStateResult() : 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 = "/vpcfirewalls/rules/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "changeFirewallRuleState"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/ChangeFirewallRuleStateResult.java b/sdk/src/main/java/org/zstack/sdk/ChangeFirewallRuleStateResult.java deleted file mode 100644 index 662ad74502d..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ChangeFirewallRuleStateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleInventory; - -public class ChangeFirewallRuleStateResult { - public VpcFirewallRuleInventory inventory; - public void setInventory(VpcFirewallRuleInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CheckFirewallRuleConfigFileAction.java b/sdk/src/main/java/org/zstack/sdk/CheckFirewallRuleConfigFileAction.java deleted file mode 100644 index 299d43afd19..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CheckFirewallRuleConfigFileAction.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CheckFirewallRuleConfigFileAction 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.CheckFirewallRuleConfigFileResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ruleInfo; - - @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.CheckFirewallRuleConfigFileResult value = res.getResult(org.zstack.sdk.CheckFirewallRuleConfigFileResult.class); - ret.value = value == null ? new org.zstack.sdk.CheckFirewallRuleConfigFileResult() : 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 = "/vpcfirewalls/rules/from-file/check"; - info.needSession = true; - info.needPoll = false; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CheckFirewallRuleConfigFileResult.java b/sdk/src/main/java/org/zstack/sdk/CheckFirewallRuleConfigFileResult.java deleted file mode 100644 index 5f0797091e7..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CheckFirewallRuleConfigFileResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class CheckFirewallRuleConfigFileResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallIpSetTemplateAction.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallIpSetTemplateAction.java deleted file mode 100644 index dc64b172b59..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallIpSetTemplateAction.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 CreateFirewallIpSetTemplateAction 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.CreateFirewallIpSetTemplateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = false, noTrim = false) - public java.lang.String name; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourceValue; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destValue; - - @Param(required = true, validValues = {"ip","port"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public org.zstack.sdk.IpSetType type; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateFirewallIpSetTemplateResult value = res.getResult(org.zstack.sdk.CreateFirewallIpSetTemplateResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateFirewallIpSetTemplateResult() : 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 = "/vpcfirewalls/ipset/templates"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallIpSetTemplateResult.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallIpSetTemplateResult.java deleted file mode 100644 index 9e8260656f5..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallIpSetTemplateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallIpSetTemplateInventory; - -public class CreateFirewallIpSetTemplateResult { - public VpcFirewallIpSetTemplateInventory inventory; - public void setInventory(VpcFirewallIpSetTemplateInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallIpSetTemplateInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleAction.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleAction.java deleted file mode 100644 index bb0db361731..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleAction.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateFirewallRuleAction 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.CreateFirewallRuleResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ruleSetUuid; - - @Param(required = true, validValues = {"drop","reject","accept"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String action; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String protocol; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destPort; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourcePort; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourceIp; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String allowStates; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String tcpFlag; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String icmpTypeName; - - @Param(required = true, maxLength = 4, nonempty = false, nullElements = false, emptyString = true, numberRange = {1001L,2999L}, noTrim = false) - public java.lang.Integer ruleNumber; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean enableLog = false; - - @Param(required = true, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String state; - - @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.CreateFirewallRuleResult value = res.getResult(org.zstack.sdk.CreateFirewallRuleResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateFirewallRuleResult() : 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 = "/vpcfirewalls/rules"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleFromConfigFileAction.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleFromConfigFileAction.java deleted file mode 100644 index f55a1012f02..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleFromConfigFileAction.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 CreateFirewallRuleFromConfigFileAction 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.CreateFirewallRuleFromConfigFileResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ruleInfo; - - @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.CreateFirewallRuleFromConfigFileResult value = res.getResult(org.zstack.sdk.CreateFirewallRuleFromConfigFileResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateFirewallRuleFromConfigFileResult() : 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 = "/vpcfirewalls/rules/from-file"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleFromConfigFileResult.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleFromConfigFileResult.java deleted file mode 100644 index a3b9d300e3a..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleFromConfigFileResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - - - -public class CreateFirewallRuleFromConfigFileResult { - public java.util.List inventory; - public void setInventory(java.util.List inventory) { - this.inventory = inventory; - } - public java.util.List getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleResult.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleResult.java deleted file mode 100644 index 625df61adea..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleInventory; - -public class CreateFirewallRuleResult { - public VpcFirewallRuleInventory inventory; - public void setInventory(VpcFirewallRuleInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleSetAction.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleSetAction.java deleted file mode 100644 index f32b74ad9c2..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleSetAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateFirewallRuleSetAction 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.CreateFirewallRuleSetResult 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 name; - - @Param(required = false, validValues = {"drop","accept","reject"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String actionType; - - @Param(required = false, 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.CreateFirewallRuleSetResult value = res.getResult(org.zstack.sdk.CreateFirewallRuleSetResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateFirewallRuleSetResult() : 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 = "/vpcfirewalls/ruleSets"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleSetResult.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleSetResult.java deleted file mode 100644 index faeb446e247..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleSetResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleSetInventory; - -public class CreateFirewallRuleSetResult { - public VpcFirewallRuleSetInventory inventory; - public void setInventory(VpcFirewallRuleSetInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleSetInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleTemplateAction.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleTemplateAction.java deleted file mode 100644 index aa25c866247..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleTemplateAction.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateFirewallRuleTemplateAction 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.CreateFirewallRuleTemplateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, validValues = {"drop","reject","accept"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String action; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String protocol; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destPort; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourcePort; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourceIp; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String allowStates; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String tcpFlag; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String icmpTypeName; - - @Param(required = true, maxLength = 4, nonempty = false, nullElements = false, emptyString = true, numberRange = {1001L,2999L}, noTrim = false) - public java.lang.Integer ruleNumber; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean enableLog = false; - - @Param(required = false, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String state = "enable"; - - @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.CreateFirewallRuleTemplateResult value = res.getResult(org.zstack.sdk.CreateFirewallRuleTemplateResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateFirewallRuleTemplateResult() : 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 = "/vpcfirewalls/rules/template"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleTemplateResult.java b/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleTemplateResult.java deleted file mode 100644 index df99f9d2d8c..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateFirewallRuleTemplateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleTemplateInventory; - -public class CreateFirewallRuleTemplateResult { - public VpcFirewallRuleTemplateInventory inventory; - public void setInventory(VpcFirewallRuleTemplateInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleTemplateInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpcFirewallAction.java b/sdk/src/main/java/org/zstack/sdk/CreateVpcFirewallAction.java deleted file mode 100644 index b3a5d2ea327..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpcFirewallAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class CreateVpcFirewallAction 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.CreateVpcFirewallResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpcUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false) - public java.lang.String resourceUuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.util.List tagUuids; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.CreateVpcFirewallResult value = res.getResult(org.zstack.sdk.CreateVpcFirewallResult.class); - ret.value = value == null ? new org.zstack.sdk.CreateVpcFirewallResult() : 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 = "/vpcfirewalls"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/CreateVpcFirewallResult.java b/sdk/src/main/java/org/zstack/sdk/CreateVpcFirewallResult.java deleted file mode 100644 index c7c6a9d4295..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/CreateVpcFirewallResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallInventory; - -public class CreateVpcFirewallResult { - public VpcFirewallInventory inventory; - public void setInventory(VpcFirewallInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallAction.java deleted file mode 100644 index 89df32ff378..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallAction.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 DeleteFirewallAction 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.DeleteFirewallResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String 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.DeleteFirewallResult value = res.getResult(org.zstack.sdk.DeleteFirewallResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteFirewallResult() : 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 = "/vpcfirewalls/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallIpSetTemplateAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallIpSetTemplateAction.java deleted file mode 100644 index 9240ff937b9..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallIpSetTemplateAction.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 DeleteFirewallIpSetTemplateAction 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.DeleteFirewallIpSetTemplateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String 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.DeleteFirewallIpSetTemplateResult value = res.getResult(org.zstack.sdk.DeleteFirewallIpSetTemplateResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteFirewallIpSetTemplateResult() : 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 = "/vpcfirewalls/ipset/templates/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallIpSetTemplateResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallIpSetTemplateResult.java deleted file mode 100644 index a7ffa222286..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallIpSetTemplateResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteFirewallIpSetTemplateResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallResult.java deleted file mode 100644 index c59ba81ef6d..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteFirewallResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleAction.java deleted file mode 100644 index 678022e04c6..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleAction.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 DeleteFirewallRuleAction 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.DeleteFirewallRuleResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String 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.DeleteFirewallRuleResult value = res.getResult(org.zstack.sdk.DeleteFirewallRuleResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteFirewallRuleResult() : 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 = "/vpcfirewalls/rules/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleResult.java deleted file mode 100644 index 372efc65579..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteFirewallRuleResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleSetAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleSetAction.java deleted file mode 100644 index 0969c353dbd..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleSetAction.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 DeleteFirewallRuleSetAction 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.DeleteFirewallRuleSetResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String 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.DeleteFirewallRuleSetResult value = res.getResult(org.zstack.sdk.DeleteFirewallRuleSetResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteFirewallRuleSetResult() : 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 = "/vpcfirewalls/ruleSets/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleSetResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleSetResult.java deleted file mode 100644 index ea1001682d7..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleSetResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteFirewallRuleSetResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleTemplateAction.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleTemplateAction.java deleted file mode 100644 index 7a363c36d5b..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleTemplateAction.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 DeleteFirewallRuleTemplateAction 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.DeleteFirewallRuleTemplateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, maxLength = 32, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String 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.DeleteFirewallRuleTemplateResult value = res.getResult(org.zstack.sdk.DeleteFirewallRuleTemplateResult.class); - ret.value = value == null ? new org.zstack.sdk.DeleteFirewallRuleTemplateResult() : 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 = "/vpcfirewalls/rules/templates/{uuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleTemplateResult.java b/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleTemplateResult.java deleted file mode 100644 index 56093a5eaec..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DeleteFirewallRuleTemplateResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DeleteFirewallRuleTemplateResult { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachFirewallRuleSetFromL3Action.java b/sdk/src/main/java/org/zstack/sdk/DetachFirewallRuleSetFromL3Action.java deleted file mode 100644 index fc99195aca1..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachFirewallRuleSetFromL3Action.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class DetachFirewallRuleSetFromL3Action 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.DetachFirewallRuleSetFromL3Result value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String vpcFirewallUuid; - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String l3Uuid; - - @Param(required = true, validValues = {"in","out"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String forward; - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ruleSetUuid; - - @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.DetachFirewallRuleSetFromL3Result value = res.getResult(org.zstack.sdk.DetachFirewallRuleSetFromL3Result.class); - ret.value = value == null ? new org.zstack.sdk.DetachFirewallRuleSetFromL3Result() : 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 = "/vpcfirewalls/l3networks/{l3Uuid}/ruleSets/{ruleSetUuid}"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "params"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/DetachFirewallRuleSetFromL3Result.java b/sdk/src/main/java/org/zstack/sdk/DetachFirewallRuleSetFromL3Result.java deleted file mode 100644 index 8f0b82f6a1a..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/DetachFirewallRuleSetFromL3Result.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - - - -public class DetachFirewallRuleSetFromL3Result { - -} diff --git a/sdk/src/main/java/org/zstack/sdk/FirewallRuleState.java b/sdk/src/main/java/org/zstack/sdk/FirewallRuleState.java deleted file mode 100644 index 05bb48a633f..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/FirewallRuleState.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.zstack.sdk; - -public enum FirewallRuleState { - disable, - enable, -} diff --git a/sdk/src/main/java/org/zstack/sdk/IpSetType.java b/sdk/src/main/java/org/zstack/sdk/IpSetType.java deleted file mode 100644 index 8ed266446dd..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/IpSetType.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.zstack.sdk; - -public enum IpSetType { - ip, - port, -} diff --git a/sdk/src/main/java/org/zstack/sdk/PacketsForwardType.java b/sdk/src/main/java/org/zstack/sdk/PacketsForwardType.java deleted file mode 100644 index ac629f753f4..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/PacketsForwardType.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.zstack.sdk; - -public enum PacketsForwardType { - in, - out, - local, -} diff --git a/sdk/src/main/java/org/zstack/sdk/ProtocolType.java b/sdk/src/main/java/org/zstack/sdk/ProtocolType.java deleted file mode 100644 index 2bda3ae642c..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/ProtocolType.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.zstack.sdk; - -public enum ProtocolType { - TCP_UDP, - ALL, - AH, - AX25, - DCCP, - DDP, - EGP, - EIGRP, - ENCAP, - ESP, - ETHERIP, - FC, - GGP, - GRE, - HIP, - HMP, - ICMP, - IDPR_CMTP, - IDRP, - IGMP, - IGP, - IP, - IPCOMP, - IPENCAP, - IPIP, - ISIS, - ISO_TP4, - L2TP, - MANET, - MPLS_IN_IP, - OSPF, - PIM, - PUP, - RDP, - ROHC, - RSPF, - RSVP, - SCTP, - SKIP, - ST, - TCP, - UDP, - UDPLITE, - VMTP, - VRRP, - WESP, - VNS_IDP, - XTP, -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryFirewallIpSetTemplateAction.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallIpSetTemplateAction.java deleted file mode 100644 index 1e921567a61..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallIpSetTemplateAction.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 QueryFirewallIpSetTemplateAction 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.QueryFirewallIpSetTemplateResult 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.QueryFirewallIpSetTemplateResult value = res.getResult(org.zstack.sdk.QueryFirewallIpSetTemplateResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryFirewallIpSetTemplateResult() : 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 = "/vpcfirewalls/ipset/templates"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryFirewallIpSetTemplateResult.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallIpSetTemplateResult.java deleted file mode 100644 index abbb9f926a7..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallIpSetTemplateResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryFirewallIpSetTemplateResult { - 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/QueryFirewallRuleAction.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleAction.java deleted file mode 100644 index 46b8dea0d2f..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleAction.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 QueryFirewallRuleAction 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.QueryFirewallRuleResult 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.QueryFirewallRuleResult value = res.getResult(org.zstack.sdk.QueryFirewallRuleResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryFirewallRuleResult() : 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 = "/vpcfirewalls/rules"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleResult.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleResult.java deleted file mode 100644 index 935a5b8dde2..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryFirewallRuleResult { - 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/QueryFirewallRuleSetAction.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetAction.java deleted file mode 100644 index db6e54045e3..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetAction.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 QueryFirewallRuleSetAction 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.QueryFirewallRuleSetResult 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.QueryFirewallRuleSetResult value = res.getResult(org.zstack.sdk.QueryFirewallRuleSetResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryFirewallRuleSetResult() : 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 = "/vpcfirewalls/ruleSets"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetL3RefAction.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetL3RefAction.java deleted file mode 100644 index 4ee6bacc707..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetL3RefAction.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 QueryFirewallRuleSetL3RefAction 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.QueryFirewallRuleSetL3RefResult 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.QueryFirewallRuleSetL3RefResult value = res.getResult(org.zstack.sdk.QueryFirewallRuleSetL3RefResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryFirewallRuleSetL3RefResult() : 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 = "/vpcfirewalls/l3networks/rulesets/refs"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetL3RefResult.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetL3RefResult.java deleted file mode 100644 index eafd2b989bc..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetL3RefResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryFirewallRuleSetL3RefResult { - 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/QueryFirewallRuleSetResult.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetResult.java deleted file mode 100644 index 4c2c4a6952c..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleSetResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryFirewallRuleSetResult { - 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/QueryFirewallRuleTemplateAction.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleTemplateAction.java deleted file mode 100644 index ce60e9cb330..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleTemplateAction.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 QueryFirewallRuleTemplateAction 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.QueryFirewallRuleTemplateResult 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.QueryFirewallRuleTemplateResult value = res.getResult(org.zstack.sdk.QueryFirewallRuleTemplateResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryFirewallRuleTemplateResult() : 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 = "/vpcfirewalls/rules/templates"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleTemplateResult.java b/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleTemplateResult.java deleted file mode 100644 index df35abe0792..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryFirewallRuleTemplateResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryFirewallRuleTemplateResult { - 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/QueryVpcFirewallAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallAction.java deleted file mode 100644 index 908f732d867..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallAction.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 QueryVpcFirewallAction 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.QueryVpcFirewallResult 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.QueryVpcFirewallResult value = res.getResult(org.zstack.sdk.QueryVpcFirewallResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVpcFirewallResult() : 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 = "/vpcfirewalls"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallResult.java deleted file mode 100644 index 30056ffa10e..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVpcFirewallResult { - 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/QueryVpcFirewallVRouterRefAction.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallVRouterRefAction.java deleted file mode 100644 index 4d71deb4d0b..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallVRouterRefAction.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 QueryVpcFirewallVRouterRefAction 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.QueryVpcFirewallVRouterRefResult 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.QueryVpcFirewallVRouterRefResult value = res.getResult(org.zstack.sdk.QueryVpcFirewallVRouterRefResult.class); - ret.value = value == null ? new org.zstack.sdk.QueryVpcFirewallVRouterRefResult() : 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 = "/vpcfirewalls/vrouters/refs"; - info.needSession = true; - info.needPoll = false; - info.parameterName = ""; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallVRouterRefResult.java b/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallVRouterRefResult.java deleted file mode 100644 index ad44718126c..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/QueryVpcFirewallVRouterRefResult.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.zstack.sdk; - - - -public class QueryVpcFirewallVRouterRefResult { - 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/RefreshFirewallAction.java b/sdk/src/main/java/org/zstack/sdk/RefreshFirewallAction.java deleted file mode 100644 index ff3586736c3..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/RefreshFirewallAction.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 RefreshFirewallAction 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.RefreshFirewallResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String 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.RefreshFirewallResult value = res.getResult(org.zstack.sdk.RefreshFirewallResult.class); - ret.value = value == null ? new org.zstack.sdk.RefreshFirewallResult() : 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 = "/vpcfirewalls/refresh/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "refreshFirewall"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/RefreshFirewallResult.java b/sdk/src/main/java/org/zstack/sdk/RefreshFirewallResult.java deleted file mode 100644 index 1176ef5c60b..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/RefreshFirewallResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallInventory; - -public class RefreshFirewallResult { - public VpcFirewallInventory inventory; - public void setInventory(VpcFirewallInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallIpSetTemplateAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateFirewallIpSetTemplateAction.java deleted file mode 100644 index d2c60aa6795..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallIpSetTemplateAction.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateFirewallIpSetTemplateAction 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.UpdateFirewallIpSetTemplateResult 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 sourceValue; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destValue; - - @Param(required = false, validValues = {"ip","port"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public org.zstack.sdk.IpSetType type; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateFirewallIpSetTemplateResult value = res.getResult(org.zstack.sdk.UpdateFirewallIpSetTemplateResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateFirewallIpSetTemplateResult() : 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 = "/vpcfirewalls/ipset/templates/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateFirewallIpSetTemplate"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallIpSetTemplateResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateFirewallIpSetTemplateResult.java deleted file mode 100644 index b5f930362f0..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallIpSetTemplateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallIpSetTemplateInventory; - -public class UpdateFirewallIpSetTemplateResult { - public VpcFirewallIpSetTemplateInventory inventory; - public void setInventory(VpcFirewallIpSetTemplateInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallIpSetTemplateInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleAction.java deleted file mode 100644 index 173a0a9ede0..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleAction.java +++ /dev/null @@ -1,143 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateFirewallRuleAction 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.UpdateFirewallRuleResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String ruleSetUuid; - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, validValues = {"drop","reject","accept"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String action; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String protocol; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destPort; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourcePort; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourceIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String allowStates; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String tcpFlag; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String icmpTypeName; - - @Param(required = true, maxLength = 4, nonempty = false, nullElements = false, emptyString = true, numberRange = {1001L,2999L}, noTrim = false) - public java.lang.Integer ruleNumber; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean enableLog = false; - - @Param(required = true, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String state; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateFirewallRuleResult value = res.getResult(org.zstack.sdk.UpdateFirewallRuleResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateFirewallRuleResult() : 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 = "/vpcfirewalls/rules/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateFirewallRule"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleResult.java deleted file mode 100644 index 0d4d2e943bf..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleInventory; - -public class UpdateFirewallRuleResult { - public VpcFirewallRuleInventory inventory; - public void setInventory(VpcFirewallRuleInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleSetAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleSetAction.java deleted file mode 100644 index 8eadc9975dd..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleSetAction.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateFirewallRuleSetAction 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.UpdateFirewallRuleSetResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, validValues = {"drop","accept","reject"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String actionType; - - @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.UpdateFirewallRuleSetResult value = res.getResult(org.zstack.sdk.UpdateFirewallRuleSetResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateFirewallRuleSetResult() : 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 = "/vpcfirewalls/ruleSets/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateFirewallRuleSet"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleSetResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleSetResult.java deleted file mode 100644 index 7d4451e58ca..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleSetResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleSetInventory; - -public class UpdateFirewallRuleSetResult { - public VpcFirewallRuleSetInventory inventory; - public void setInventory(VpcFirewallRuleSetInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleSetInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleTemplateAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleTemplateAction.java deleted file mode 100644 index 28722832db1..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleTemplateAction.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.zstack.sdk; - -import java.util.HashMap; -import java.util.Map; -import org.zstack.sdk.*; - -public class UpdateFirewallRuleTemplateAction 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.UpdateFirewallRuleTemplateResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = true, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = true, validValues = {"drop","reject","accept"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String action; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String protocol; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destPort; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourcePort; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String sourceIp; - - @Param(required = false, maxLength = 2048, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String destIp; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String allowStates; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String tcpFlag; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String icmpTypeName; - - @Param(required = true, maxLength = 4, nonempty = false, nullElements = false, emptyString = true, numberRange = {1001L,2999L}, noTrim = false) - public java.lang.Integer ruleNumber; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public boolean enableLog = false; - - @Param(required = false, validValues = {"enable","disable"}, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String state = "enable"; - - @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.UpdateFirewallRuleTemplateResult value = res.getResult(org.zstack.sdk.UpdateFirewallRuleTemplateResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateFirewallRuleTemplateResult() : 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 = "/vpcfirewalls/rules/template/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateFirewallRuleTemplate"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleTemplateResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleTemplateResult.java deleted file mode 100644 index 79e5e86c882..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateFirewallRuleTemplateResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallRuleTemplateInventory; - -public class UpdateFirewallRuleTemplateResult { - public VpcFirewallRuleTemplateInventory inventory; - public void setInventory(VpcFirewallRuleTemplateInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallRuleTemplateInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVpcFirewallAction.java b/sdk/src/main/java/org/zstack/sdk/UpdateVpcFirewallAction.java deleted file mode 100644 index 28ba0a34fda..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVpcFirewallAction.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 UpdateVpcFirewallAction 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.UpdateVpcFirewallResult value; - - public Result throwExceptionIfError() { - if (error != null) { - throw new ApiException( - String.format("error[code: %s, description: %s, details: %s]", error.code, error.description, error.details) - ); - } - - return this; - } - } - - @Param(required = true, nonempty = true, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String uuid; - - @Param(required = false, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String description; - - @Param(required = false, maxLength = 255, nonempty = false, nullElements = false, emptyString = true, noTrim = false) - public java.lang.String name; - - @Param(required = false) - public java.util.List systemTags; - - @Param(required = false) - public java.util.List userTags; - - @Param(required = false) - public String sessionId; - - @Param(required = false) - public String accessKeyId; - - @Param(required = false) - public String accessKeySecret; - - @Param(required = false) - public String requestIp; - - @NonAPIParam - public long timeout = -1; - - @NonAPIParam - public long pollingInterval = -1; - - - private Result makeResult(ApiResult res) { - Result ret = new Result(); - if (res.error != null) { - ret.error = res.error; - return ret; - } - - org.zstack.sdk.UpdateVpcFirewallResult value = res.getResult(org.zstack.sdk.UpdateVpcFirewallResult.class); - ret.value = value == null ? new org.zstack.sdk.UpdateVpcFirewallResult() : 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 = "/vpcfirewalls/{uuid}/actions"; - info.needSession = true; - info.needPoll = true; - info.parameterName = "updateVpcFirewall"; - return info; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/UpdateVpcFirewallResult.java b/sdk/src/main/java/org/zstack/sdk/UpdateVpcFirewallResult.java deleted file mode 100644 index 91895834984..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/UpdateVpcFirewallResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.VpcFirewallInventory; - -public class UpdateVpcFirewallResult { - public VpcFirewallInventory inventory; - public void setInventory(VpcFirewallInventory inventory) { - this.inventory = inventory; - } - public VpcFirewallInventory getInventory() { - return this.inventory; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcFirewallInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcFirewallInventory.java deleted file mode 100644 index 1eee02f1c78..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcFirewallInventory.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcFirewallInventory { - - 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.util.List refs; - public void setRefs(java.util.List refs) { - this.refs = refs; - } - public java.util.List getRefs() { - return this.refs; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcFirewallIpSetTemplateInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcFirewallIpSetTemplateInventory.java deleted file mode 100644 index eda07759558..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcFirewallIpSetTemplateInventory.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.IpSetType; - -public class VpcFirewallIpSetTemplateInventory { - - 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 sourceValue; - public void setSourceValue(java.lang.String sourceValue) { - this.sourceValue = sourceValue; - } - public java.lang.String getSourceValue() { - return this.sourceValue; - } - - public java.lang.String destValue; - public void setDestValue(java.lang.String destValue) { - this.destValue = destValue; - } - public java.lang.String getDestValue() { - return this.destValue; - } - - public IpSetType type; - public void setType(IpSetType type) { - this.type = type; - } - public IpSetType getType() { - return this.type; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public java.lang.String accountUuid; - public void setAccountUuid(java.lang.String accountUuid) { - this.accountUuid = accountUuid; - } - public java.lang.String getAccountUuid() { - return this.accountUuid; - } - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleInventory.java deleted file mode 100644 index 65eff39aca5..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleInventory.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcFirewallRuleInventory { - - 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 ruleSetUuid; - public void setRuleSetUuid(java.lang.String ruleSetUuid) { - this.ruleSetUuid = ruleSetUuid; - } - public java.lang.String getRuleSetUuid() { - return this.ruleSetUuid; - } - - public java.lang.String action; - public void setAction(java.lang.String action) { - this.action = action; - } - public java.lang.String getAction() { - return this.action; - } - - public java.lang.String protocol; - public void setProtocol(java.lang.String protocol) { - this.protocol = protocol; - } - public java.lang.String getProtocol() { - return this.protocol; - } - - public java.lang.String destPort; - public void setDestPort(java.lang.String destPort) { - this.destPort = destPort; - } - public java.lang.String getDestPort() { - return this.destPort; - } - - public java.lang.String sourcePort; - public void setSourcePort(java.lang.String sourcePort) { - this.sourcePort = sourcePort; - } - public java.lang.String getSourcePort() { - return this.sourcePort; - } - - public java.lang.String sourceIp; - public void setSourceIp(java.lang.String sourceIp) { - this.sourceIp = sourceIp; - } - public java.lang.String getSourceIp() { - return this.sourceIp; - } - - public java.lang.String destIp; - public void setDestIp(java.lang.String destIp) { - this.destIp = destIp; - } - public java.lang.String getDestIp() { - return this.destIp; - } - - public java.lang.Integer ruleNumber; - public void setRuleNumber(java.lang.Integer ruleNumber) { - this.ruleNumber = ruleNumber; - } - public java.lang.Integer getRuleNumber() { - return this.ruleNumber; - } - - public java.lang.String allowStates; - public void setAllowStates(java.lang.String allowStates) { - this.allowStates = allowStates; - } - public java.lang.String getAllowStates() { - return this.allowStates; - } - - public java.lang.String tcpFlag; - public void setTcpFlag(java.lang.String tcpFlag) { - this.tcpFlag = tcpFlag; - } - public java.lang.String getTcpFlag() { - return this.tcpFlag; - } - - public java.lang.String icmpTypeName; - public void setIcmpTypeName(java.lang.String icmpTypeName) { - this.icmpTypeName = icmpTypeName; - } - public java.lang.String getIcmpTypeName() { - return this.icmpTypeName; - } - - public boolean isApplied; - public void setIsApplied(boolean isApplied) { - this.isApplied = isApplied; - } - public boolean getIsApplied() { - return this.isApplied; - } - - public boolean expired; - public void setExpired(boolean expired) { - this.expired = expired; - } - public boolean getExpired() { - return this.expired; - } - - public java.lang.String state; - public void setState(java.lang.String state) { - this.state = state; - } - public java.lang.String getState() { - return this.state; - } - - public boolean isDefault; - public void setIsDefault(boolean isDefault) { - this.isDefault = isDefault; - } - public boolean getIsDefault() { - return this.isDefault; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleSetInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleSetInventory.java deleted file mode 100644 index cbe329f317b..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleSetInventory.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.ActionType; - -public class VpcFirewallRuleSetInventory { - - 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 ActionType actionType; - public void setActionType(ActionType actionType) { - this.actionType = actionType; - } - public ActionType getActionType() { - return this.actionType; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public boolean isDefault; - public void setIsDefault(boolean isDefault) { - this.isDefault = isDefault; - } - public boolean getIsDefault() { - return this.isDefault; - } - - public boolean isApplied; - public void setIsApplied(boolean isApplied) { - this.isApplied = isApplied; - } - public boolean getIsApplied() { - return this.isApplied; - } - - 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 rules; - public void setRules(java.util.List rules) { - this.rules = rules; - } - public java.util.List getRules() { - return this.rules; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleSetL3RefInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleSetL3RefInventory.java deleted file mode 100644 index 0ef60b16259..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleSetL3RefInventory.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.PacketsForwardType; - -public class VpcFirewallRuleSetL3RefInventory { - - public long id; - public void setId(long id) { - this.id = id; - } - public long getId() { - return this.id; - } - - public java.lang.String ruleSetUuid; - public void setRuleSetUuid(java.lang.String ruleSetUuid) { - this.ruleSetUuid = ruleSetUuid; - } - public java.lang.String getRuleSetUuid() { - return this.ruleSetUuid; - } - - 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 vpcFirewallUuid; - public void setVpcFirewallUuid(java.lang.String vpcFirewallUuid) { - this.vpcFirewallUuid = vpcFirewallUuid; - } - public java.lang.String getVpcFirewallUuid() { - return this.vpcFirewallUuid; - } - - public PacketsForwardType packetsForwardType; - public void setPacketsForwardType(PacketsForwardType packetsForwardType) { - this.packetsForwardType = packetsForwardType; - } - public PacketsForwardType getPacketsForwardType() { - return this.packetsForwardType; - } - - 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/VpcFirewallRuleTemplateInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleTemplateInventory.java deleted file mode 100644 index 3acc06e6f78..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcFirewallRuleTemplateInventory.java +++ /dev/null @@ -1,161 +0,0 @@ -package org.zstack.sdk; - -import org.zstack.sdk.ActionType; -import org.zstack.sdk.ProtocolType; -import org.zstack.sdk.FirewallRuleState; - -public class VpcFirewallRuleTemplateInventory { - - public ActionType action; - public void setAction(ActionType action) { - this.action = action; - } - public ActionType getAction() { - return this.action; - } - - public ProtocolType protocol; - public void setProtocol(ProtocolType protocol) { - this.protocol = protocol; - } - public ProtocolType getProtocol() { - return this.protocol; - } - - 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 destPort; - public void setDestPort(java.lang.String destPort) { - this.destPort = destPort; - } - public java.lang.String getDestPort() { - return this.destPort; - } - - public java.lang.String sourcePort; - public void setSourcePort(java.lang.String sourcePort) { - this.sourcePort = sourcePort; - } - public java.lang.String getSourcePort() { - return this.sourcePort; - } - - public java.lang.String sourceIp; - public void setSourceIp(java.lang.String sourceIp) { - this.sourceIp = sourceIp; - } - public java.lang.String getSourceIp() { - return this.sourceIp; - } - - public java.lang.String destIp; - public void setDestIp(java.lang.String destIp) { - this.destIp = destIp; - } - public java.lang.String getDestIp() { - return this.destIp; - } - - public java.lang.String allowStates; - public void setAllowStates(java.lang.String allowStates) { - this.allowStates = allowStates; - } - public java.lang.String getAllowStates() { - return this.allowStates; - } - - public java.lang.String tcpFlag; - public void setTcpFlag(java.lang.String tcpFlag) { - this.tcpFlag = tcpFlag; - } - public java.lang.String getTcpFlag() { - return this.tcpFlag; - } - - public java.lang.String icmpTypeName; - public void setIcmpTypeName(java.lang.String icmpTypeName) { - this.icmpTypeName = icmpTypeName; - } - public java.lang.String getIcmpTypeName() { - return this.icmpTypeName; - } - - public int ruleNumber; - public void setRuleNumber(int ruleNumber) { - this.ruleNumber = ruleNumber; - } - public int getRuleNumber() { - return this.ruleNumber; - } - - public boolean enableLog; - public void setEnableLog(boolean enableLog) { - this.enableLog = enableLog; - } - public boolean getEnableLog() { - return this.enableLog; - } - - public FirewallRuleState state; - public void setState(FirewallRuleState state) { - this.state = state; - } - public FirewallRuleState getState() { - return this.state; - } - - public boolean isDefault; - public void setIsDefault(boolean isDefault) { - this.isDefault = isDefault; - } - public boolean getIsDefault() { - return this.isDefault; - } - - public java.lang.String description; - public void setDescription(java.lang.String description) { - this.description = description; - } - public java.lang.String getDescription() { - return this.description; - } - - public java.sql.Timestamp createDate; - public void setCreateDate(java.sql.Timestamp createDate) { - this.createDate = createDate; - } - public java.sql.Timestamp getCreateDate() { - return this.createDate; - } - - public java.sql.Timestamp lastOpDate; - public void setLastOpDate(java.sql.Timestamp lastOpDate) { - this.lastOpDate = lastOpDate; - } - public java.sql.Timestamp getLastOpDate() { - return this.lastOpDate; - } - - public java.lang.String accountUuid; - public void setAccountUuid(java.lang.String accountUuid) { - this.accountUuid = accountUuid; - } - public java.lang.String getAccountUuid() { - return this.accountUuid; - } - - public java.lang.String uuid; - public void setUuid(java.lang.String uuid) { - this.uuid = uuid; - } - public java.lang.String getUuid() { - return this.uuid; - } - -} diff --git a/sdk/src/main/java/org/zstack/sdk/VpcFirewallVRouterRefInventory.java b/sdk/src/main/java/org/zstack/sdk/VpcFirewallVRouterRefInventory.java deleted file mode 100644 index 997c88546b5..00000000000 --- a/sdk/src/main/java/org/zstack/sdk/VpcFirewallVRouterRefInventory.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.zstack.sdk; - - - -public class VpcFirewallVRouterRefInventory { - - public long id; - public void setId(long id) { - this.id = id; - } - public long getId() { - return this.id; - } - - public java.lang.String vpcFirewallUuid; - public void setVpcFirewallUuid(java.lang.String vpcFirewallUuid) { - this.vpcFirewallUuid = vpcFirewallUuid; - } - public java.lang.String getVpcFirewallUuid() { - return this.vpcFirewallUuid; - } - - public java.lang.String vRouterUuid; - public void setVRouterUuid(java.lang.String vRouterUuid) { - this.vRouterUuid = vRouterUuid; - } - public java.lang.String getVRouterUuid() { - return this.vRouterUuid; - } - - public java.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 284aa1e92c2..48ad7647d50 100644 --- a/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy +++ b/testlib/src/main/java/org/zstack/testlib/ApiHelper.groovy @@ -1716,33 +1716,6 @@ abstract class ApiHelper { } - def applyRuleSetChanges(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ApplyRuleSetChangesAction.class) Closure c) { - def a = new org.zstack.sdk.ApplyRuleSetChangesAction() - 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 applyTemplateConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ApplyTemplateConfigAction.class) Closure c) { def a = new org.zstack.sdk.ApplyTemplateConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -1932,33 +1905,6 @@ abstract class ApiHelper { } - def attachFirewallRuleSetToL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachFirewallRuleSetToL3Action.class) Closure c) { - def a = new org.zstack.sdk.AttachFirewallRuleSetToL3Action() - 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 attachIscsiServerToCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.AttachIscsiServerToClusterAction.class) Closure c) { def a = new org.zstack.sdk.AttachIscsiServerToClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -3228,33 +3174,6 @@ abstract class ApiHelper { } - def changeFirewallRuleState(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeFirewallRuleStateAction.class) Closure c) { - def a = new org.zstack.sdk.ChangeFirewallRuleStateAction() - 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 changeHostNetworkInterfaceLldpMode(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.ChangeHostNetworkInterfaceLldpModeAction.class) Closure c) { def a = new org.zstack.sdk.ChangeHostNetworkInterfaceLldpModeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -4281,33 +4200,6 @@ abstract class ApiHelper { } - def checkFirewallRuleConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckFirewallRuleConfigFileAction.class) Closure c) { - def a = new org.zstack.sdk.CheckFirewallRuleConfigFileAction() - 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 checkIpAvailability(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CheckIpAvailabilityAction.class) Closure c) { def a = new org.zstack.sdk.CheckIpAvailabilityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -5739,141 +5631,6 @@ abstract class ApiHelper { } - def createFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallIpSetTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallIpSetTemplateAction() - 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 createFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 createFirewallRuleFromConfigFile(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleFromConfigFileAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallRuleFromConfigFileAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 createFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallRuleSetAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 createFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateFirewallRuleTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.CreateFirewallRuleTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 createHostKernelInterface(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateHostKernelInterfaceAction.class) Closure c) { def a = new org.zstack.sdk.CreateHostKernelInterfaceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -7386,33 +7143,6 @@ abstract class ApiHelper { } - def createVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.CreateVpcFirewallAction() - 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 createVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.CreateVpcHaGroupAction.class) Closure c) { def a = new org.zstack.sdk.CreateVpcHaGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -7791,143 +7521,8 @@ abstract class ApiHelper { } - def deleteAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingGroupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingGroupAction() - 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 deleteAutoScalingGroupInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingGroupInstanceAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingGroupInstanceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 deleteAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 deleteAutoScalingRuleTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingRuleTriggerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingRuleTriggerAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 deleteAutoScalingTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteAutoScalingTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 deleteBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBackupStorageAction() + def deleteAutoScalingGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingGroupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7953,8 +7548,8 @@ abstract class ApiHelper { } - def deleteBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBaremetalChassisAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBaremetalChassisAction() + def deleteAutoScalingGroupInstance(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingGroupInstanceAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingGroupInstanceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -7980,8 +7575,8 @@ abstract class ApiHelper { } - def deleteBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBaremetalPxeServerAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBaremetalPxeServerAction() + def deleteAutoScalingRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingRuleAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingRuleAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8007,8 +7602,8 @@ abstract class ApiHelper { } - def deleteBilling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBillingAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBillingAction() + def deleteAutoScalingRuleTrigger(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingRuleTriggerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingRuleTriggerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8034,8 +7629,8 @@ abstract class ApiHelper { } - def deleteBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBondingAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteBondingAction() + def deleteAutoScalingTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteAutoScalingTemplateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteAutoScalingTemplateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8061,8 +7656,8 @@ abstract class ApiHelper { } - def deleteCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCbtTaskAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCbtTaskAction() + def deleteBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8088,8 +7683,8 @@ abstract class ApiHelper { } - def deleteCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpPolicyAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCdpPolicyAction() + def deleteBaremetalChassis(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBaremetalChassisAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBaremetalChassisAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8115,8 +7710,8 @@ abstract class ApiHelper { } - def deleteCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpTaskAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCdpTaskAction() + def deleteBaremetalPxeServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBaremetalPxeServerAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBaremetalPxeServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8142,8 +7737,8 @@ abstract class ApiHelper { } - def deleteCdpTaskData(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpTaskDataAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCdpTaskDataAction() + def deleteBilling(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBillingAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBillingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8169,8 +7764,8 @@ abstract class ApiHelper { } - def deleteCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCephPrimaryStoragePoolAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCephPrimaryStoragePoolAction() + def deleteBonding(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteBondingAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteBondingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8196,8 +7791,8 @@ abstract class ApiHelper { } - def deleteCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCertificateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteCertificateAction() + def deleteCbtTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCbtTaskAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCbtTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8223,8 +7818,8 @@ abstract class ApiHelper { } - def deleteCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteClusterAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteClusterAction() + def deleteCdpPolicy(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpPolicyAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCdpPolicyAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8250,8 +7845,8 @@ abstract class ApiHelper { } - def deleteClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteClusterDRSAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteClusterDRSAction() + def deleteCdpTask(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpTaskAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCdpTaskAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8277,8 +7872,8 @@ abstract class ApiHelper { } - def deleteDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDataVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteDataVolumeAction() + def deleteCdpTaskData(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCdpTaskDataAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCdpTaskDataAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8304,8 +7899,8 @@ abstract class ApiHelper { } - def deleteDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteDirectoryAction() + def deleteCephPrimaryStoragePool(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCephPrimaryStoragePoolAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCephPrimaryStoragePoolAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8331,8 +7926,8 @@ abstract class ApiHelper { } - def deleteDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDiskOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteDiskOfferingAction() + def deleteCertificate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteCertificateAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteCertificateAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8358,8 +7953,8 @@ abstract class ApiHelper { } - def deleteEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEipAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteEipAction() + def deleteCluster(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteClusterAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteClusterAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8385,8 +7980,8 @@ abstract class ApiHelper { } - def deleteExportedImageFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteExportedImageFromBackupStorageAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteExportedImageFromBackupStorageAction() + def deleteClusterDRS(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteClusterDRSAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteClusterDRSAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8412,8 +8007,8 @@ abstract class ApiHelper { } - def deleteExternalBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteExternalBackupAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteExternalBackupAction() + def deleteDataVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDataVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteDataVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8439,8 +8034,8 @@ abstract class ApiHelper { } - def deleteFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallAction() + def deleteDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8466,8 +8061,8 @@ abstract class ApiHelper { } - def deleteFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallIpSetTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallIpSetTemplateAction() + def deleteDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteDiskOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteDiskOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8493,8 +8088,8 @@ abstract class ApiHelper { } - def deleteFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallRuleAction() + def deleteEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteEipAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8520,8 +8115,8 @@ abstract class ApiHelper { } - def deleteFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallRuleSetAction() + def deleteExportedImageFromBackupStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteExportedImageFromBackupStorageAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteExportedImageFromBackupStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -8547,8 +8142,8 @@ abstract class ApiHelper { } - def deleteFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteFirewallRuleTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.DeleteFirewallRuleTemplateAction() + def deleteExternalBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DeleteExternalBackupAction.class) Closure c) { + def a = new org.zstack.sdk.DeleteExternalBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -10896,33 +10491,6 @@ abstract class ApiHelper { } - def detachFirewallRuleSetFromL3(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachFirewallRuleSetFromL3Action.class) Closure c) { - def a = new org.zstack.sdk.DetachFirewallRuleSetFromL3Action() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - def detachHostFromHostSchedulingRuleGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.DetachHostFromHostSchedulingRuleGroupAction.class) Closure c) { def a = new org.zstack.sdk.DetachHostFromHostSchedulingRuleGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -19604,153 +19172,8 @@ abstract class ApiHelper { } - def queryConsoleProxyAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryConsoleProxyAgentAction.class) Closure c) { - def a = new org.zstack.sdk.QueryConsoleProxyAgentAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.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 queryDRSAdvice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDRSAdviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDRSAdviceAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(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 queryDRSVmMigrationActivity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDRSVmMigrationActivityAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDRSVmMigrationActivityAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(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 queryDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDirectoryAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDirectoryAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(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 queryDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDiskOfferingAction.class) Closure c) { - def a = new org.zstack.sdk.QueryDiskOfferingAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - a.conditions = a.conditions.collect { it.toString() } - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(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 queryEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEipAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEipAction() + def queryConsoleProxyAgent(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryConsoleProxyAgentAction.class) Closure c) { + def a = new org.zstack.sdk.QueryConsoleProxyAgentAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19778,8 +19201,8 @@ abstract class ApiHelper { } - def queryEmailMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEmailMediaAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEmailMediaAction() + def queryDRSAdvice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDRSAdviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryDRSAdviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19807,8 +19230,8 @@ abstract class ApiHelper { } - def queryEmailTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEmailTriggerActionAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEmailTriggerActionAction() + def queryDRSVmMigrationActivity(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDRSVmMigrationActivityAction.class) Closure c) { + def a = new org.zstack.sdk.QueryDRSVmMigrationActivityAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19836,8 +19259,8 @@ abstract class ApiHelper { } - def queryEthernetVF(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEthernetVFAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEthernetVFAction() + def queryDirectory(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDirectoryAction.class) Closure c) { + def a = new org.zstack.sdk.QueryDirectoryAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19865,8 +19288,8 @@ abstract class ApiHelper { } - def queryEventFromResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEventFromResourceStackAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEventFromResourceStackAction() + def queryDiskOffering(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryDiskOfferingAction.class) Closure c) { + def a = new org.zstack.sdk.QueryDiskOfferingAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19894,8 +19317,8 @@ abstract class ApiHelper { } - def queryEventLog(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEventLogAction.class) Closure c) { - def a = new org.zstack.sdk.QueryEventLogAction() + def queryEip(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEipAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEipAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19923,8 +19346,8 @@ abstract class ApiHelper { } - def queryExponBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryExponBlockVolumeAction.class) Closure c) { - def a = new org.zstack.sdk.QueryExponBlockVolumeAction() + def queryEmailMedia(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEmailMediaAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEmailMediaAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19952,8 +19375,8 @@ abstract class ApiHelper { } - def queryExternalBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryExternalBackupAction.class) Closure c) { - def a = new org.zstack.sdk.QueryExternalBackupAction() + def queryEmailTriggerAction(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEmailTriggerActionAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEmailTriggerActionAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -19981,8 +19404,8 @@ abstract class ApiHelper { } - def queryFcHbaDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFcHbaDeviceAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFcHbaDeviceAction() + def queryEthernetVF(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEthernetVFAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEthernetVFAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20010,8 +19433,8 @@ abstract class ApiHelper { } - def queryFiberChannelLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFiberChannelLunAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFiberChannelLunAction() + def queryEventFromResourceStack(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEventFromResourceStackAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEventFromResourceStackAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20039,8 +19462,8 @@ abstract class ApiHelper { } - def queryFiberChannelStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFiberChannelStorageAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFiberChannelStorageAction() + def queryEventLog(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryEventLogAction.class) Closure c) { + def a = new org.zstack.sdk.QueryEventLogAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20068,8 +19491,8 @@ abstract class ApiHelper { } - def queryFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallIpSetTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallIpSetTemplateAction() + def queryExponBlockVolume(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryExponBlockVolumeAction.class) Closure c) { + def a = new org.zstack.sdk.QueryExponBlockVolumeAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20097,8 +19520,8 @@ abstract class ApiHelper { } - def queryFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallRuleAction() + def queryExternalBackup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryExternalBackupAction.class) Closure c) { + def a = new org.zstack.sdk.QueryExternalBackupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20126,8 +19549,8 @@ abstract class ApiHelper { } - def queryFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallRuleSetAction() + def queryFcHbaDevice(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFcHbaDeviceAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFcHbaDeviceAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20155,8 +19578,8 @@ abstract class ApiHelper { } - def queryFirewallRuleSetL3Ref(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleSetL3RefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallRuleSetL3RefAction() + def queryFiberChannelLun(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFiberChannelLunAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFiberChannelLunAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -20184,8 +19607,8 @@ abstract class ApiHelper { } - def queryFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFirewallRuleTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.QueryFirewallRuleTemplateAction() + def queryFiberChannelStorage(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryFiberChannelStorageAction.class) Closure c) { + def a = new org.zstack.sdk.QueryFiberChannelStorageAction() a.sessionId = Test.currentEnvSpec?.session?.uuid c.resolveStrategy = Closure.OWNER_FIRST c.delegate = a @@ -23577,64 +23000,6 @@ abstract class ApiHelper { } - def queryVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcFirewallAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.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 queryVpcFirewallVRouterRef(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcFirewallVRouterRefAction.class) Closure c) { - def a = new org.zstack.sdk.QueryVpcFirewallVRouterRefAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - 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 queryVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.QueryVpcHaGroupAction.class) Closure c) { def a = new org.zstack.sdk.QueryVpcHaGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -24380,33 +23745,6 @@ abstract class ApiHelper { } - def refreshFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.RefreshFirewallAction() - 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 refreshIscsiServer(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.RefreshIscsiServerAction.class) Closure c) { def a = new org.zstack.sdk.RefreshIscsiServerAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -28754,114 +28092,6 @@ abstract class ApiHelper { } - def updateFirewallIpSetTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallIpSetTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFirewallIpSetTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFirewallRule(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFirewallRuleAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFirewallRuleSet(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleSetAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFirewallRuleSetAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - - def updateFirewallRuleTemplate(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateFirewallRuleTemplateAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateFirewallRuleTemplateAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - def updateGlobalConfig(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateGlobalConfigAction.class) Closure c) { def a = new org.zstack.sdk.UpdateGlobalConfigAction() a.sessionId = Test.currentEnvSpec?.session?.uuid @@ -31157,33 +30387,6 @@ abstract class ApiHelper { } - def updateVpcFirewall(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcFirewallAction.class) Closure c) { - def a = new org.zstack.sdk.UpdateVpcFirewallAction() - a.sessionId = Test.currentEnvSpec?.session?.uuid - c.resolveStrategy = Closure.OWNER_FIRST - c.delegate = a - c() - - - if (System.getProperty("apipath") != null) { - if (a.apiId == null) { - a.apiId = Platform.uuid - } - - def tracker = new ApiPathTracker(a.apiId) - def out = errorOut(a.call()) - def path = tracker.getApiPath() - if (!path.isEmpty()) { - Test.apiPaths[a.class.name] = path.join(" --->\n") - } - - return out - } else { - return errorOut(a.call()) - } - } - - def updateVpcHaGroup(@DelegatesTo(strategy = Closure.OWNER_FIRST, value = org.zstack.sdk.UpdateVpcHaGroupAction.class) Closure c) { def a = new org.zstack.sdk.UpdateVpcHaGroupAction() a.sessionId = Test.currentEnvSpec?.session?.uuid