From 8b587eca7d318fb042d2dd064169891f12ba0ea6 Mon Sep 17 00:00:00 2001 From: Tanc009 Date: Wed, 24 Jun 2020 03:47:04 +0000 Subject: [PATCH] publish jdcloud-sdk-python 1.6.65 --- jdcloud_sdk/services/ipanti/ChangeLog.md | 27 ++++----- .../ipanti/apis/CreateInstanceRequest.py | 9 ++- .../apis/DescribeForwardRulesRequest.py | 2 +- .../apis/DescribeServiceIpListRequest.py | 57 +++++++++++++++++++ .../ipanti/apis/DescribeWebRulesRequest.py | 2 +- .../services/ipanti/client/IpantiClient.py | 2 +- .../services/ipanti/models/AlarmConfig.py | 8 ++- .../services/ipanti/models/AlarmConfigSpec.py | 8 ++- .../services/ipanti/models/AutoRenewalSpec.py | 31 ++++++++++ .../ipanti/models/CCProtectionRule.py | 6 +- .../ipanti/models/CCProtectionRuleSpec.py | 4 +- .../services/ipanti/models/CcsIpResource.py | 29 ++++++++++ .../services/ipanti/models/CpsIpResource.py | 2 +- .../ipanti/models/CreateDispatchRuleSpec.py | 35 ++++++++++++ .../ipanti/models/CreateInstanceSpec.py | 8 +-- .../services/ipanti/models/CustomPage.py | 35 ++++++++++++ .../services/ipanti/models/CustomPageSpec.py | 29 ++++++++++ .../services/ipanti/models/DDoSAttackLog.py | 2 +- .../services/ipanti/models/DispatchRule.py | 41 +++++++++++++ .../services/ipanti/models/FailedRule.py | 29 ++++++++++ .../services/ipanti/models/Instance.py | 8 ++- .../services/ipanti/models/InstanceAcl.py | 4 +- .../ipanti/models/ModifyDispatchRuleSpec.py | 35 ++++++++++++ .../services/ipanti/models/VpcIpResource.py | 2 +- jdcloud_sdk/services/jdccs/ChangeLog.md | 4 +- .../jdccs/apis/DescribeMetricDataRequest.py | 2 +- .../services/jdccs/client/JdccsClient.py | 2 +- .../services/jdccs/models/Bandwidth.py | 6 +- .../services/jdccs/models/BandwidthTraffic.py | 2 +- .../jdccs/models/DescribeBandwidth.py | 6 +- jdcloud_sdk/services/jdccs/models/Ip.py | 8 ++- .../services/jdccs/models/RelatedIp.py | 2 +- .../jdccs/models/TrafficSamplingData.py | 4 +- setup.py | 2 +- 34 files changed, 410 insertions(+), 43 deletions(-) create mode 100644 jdcloud_sdk/services/ipanti/apis/DescribeServiceIpListRequest.py create mode 100644 jdcloud_sdk/services/ipanti/models/AutoRenewalSpec.py create mode 100644 jdcloud_sdk/services/ipanti/models/CcsIpResource.py create mode 100644 jdcloud_sdk/services/ipanti/models/CreateDispatchRuleSpec.py create mode 100644 jdcloud_sdk/services/ipanti/models/CustomPage.py create mode 100644 jdcloud_sdk/services/ipanti/models/CustomPageSpec.py create mode 100644 jdcloud_sdk/services/ipanti/models/DispatchRule.py create mode 100644 jdcloud_sdk/services/ipanti/models/FailedRule.py create mode 100644 jdcloud_sdk/services/ipanti/models/ModifyDispatchRuleSpec.py diff --git a/jdcloud_sdk/services/ipanti/ChangeLog.md b/jdcloud_sdk/services/ipanti/ChangeLog.md index 9e68ef29..5ee614bf 100644 --- a/jdcloud_sdk/services/ipanti/ChangeLog.md +++ b/jdcloud_sdk/services/ipanti/ChangeLog.md @@ -1,16 +1,17 @@ # 更新历史 # -API版本：1.6.12 +API版本：1.7.0 -|发布时间|版本号|更新|说明| -|---|---|---|---| -|2020-03-05|1.6.12|接口新增与更新|1. 网站规则创建与编辑不再支持上传证书, IP 高防已对接 SSL 数字证书, 新增网站规则绑定证书接口 bindCert
2. 网站类规则支持按地域回源, 新增接口查询网站类转发规则按地域回源配置 geoRsRoute 参数可设置的区域| -|2019-07-26|1.4.9|接口新增与删除|1. 新增网站规则级黑白名单相关接口
2. 新增非网站规则级黑白名单相关接口
3. 新增实例 IP 黑白名单库相关接口
4. 新增网站规则级 CC 防护相关接口
5. 网站规则回源 IP 支持设置云物理服务器公网 IP(使用 describeCpsIpList 查询可知)
6. 删除实例级 IP 黑白名单, url 白名单及 CC 防护等相关接口| -|2019-02-28|1.3.0|新增接口|1. 新增接口: 查询非网站类转发规则的防护规则(describeProtectionRuleOfForwardRule)
2. 新增接口: 修改非网站类转发规则的防护规则(modifyProtectionRuleOfForwardRule)
3. 新增接口: 查询非网站类转发规则的防护规则 Geo 拦截可设置区域编码(describeGeoAreas)| -|2018-11-30|1.2.0|接口更新|1. 创建实例, 查询实例添加 ipv6 支持| -|2018-08-31|1.1.0|新增接口|1. 新增 DDos 攻击日志, CC攻击日志, CC攻击详情下载接口
2. 新增攻击次数及流量峰值, 各类型攻击次数查询接口
3. 新增高防实例名称列表, 高防实例防护统计信息, CC 自定义默认阈值, 用户的京东云 IP 资源查询接口
4. 新增实例名称合法性检测接口, 实例弹性防护带宽更新接口
5. 新增告警配置查询, 告警配置更新接口
6. 新增证书预览信息查询接口, 证书编辑接口| -|2018-06-26|1.0.1|问题修复|1. 修复 operationId 重复的问题| -|2018-06-26|1.0.0|新增接口|1. 新增 CC 防护 IP 限速, 观察者模式接口
2. 新增 DDos 攻击日志, CC 攻击日志, CC 攻击详情查询接口
3. 新增 DDos 攻击流量报表, 转发流量报表, CC 流量报表查询接口| -|2018-04-20|0.3.0|问题修复|1. 调整操作类型接口 path| -|2018-03-31|0.2.0|新增接口|1. 新增网站规则操作接口
2. 新增非网站规则操作接口| -|2018-01-31|0.1.0|初始版本|1. IP 高防基本操作接口| +| 发布时间 | 版本号 | 更新 | 说明 | +| ---------- | ------ | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| 2020-06-24 | 1.7.0 | 接口新增与更新 | 1. 新增查询实例高防IP接口 | +| 2020-03-05 | 1.6.12 | 接口新增与更新 | 1. 网站规则创建与编辑不再支持上传证书, IP 高防已对接 SSL 数字证书, 新增网站规则绑定证书接口 bindCert
2. 网站类规则支持按地域回源, 新增接口查询网站类转发规则按地域回源配置 geoRsRoute 参数可设置的区域 | +| 2019-07-26 | 1.4.9 | 接口新增与删除 | 1. 新增网站规则级黑白名单相关接口
2. 新增非网站规则级黑白名单相关接口
3. 新增实例 IP 黑白名单库相关接口
4. 新增网站规则级 CC 防护相关接口
5. 网站规则回源 IP 支持设置云物理服务器公网 IP(使用 describeCpsIpList 查询可知)
6. 删除实例级 IP 黑白名单, url 白名单及 CC 防护等相关接口 | +| 2019-02-28 | 1.3.0 | 新增接口 | 1. 新增接口: 查询非网站类转发规则的防护规则(describeProtectionRuleOfForwardRule)
2. 新增接口: 修改非网站类转发规则的防护规则(modifyProtectionRuleOfForwardRule)
3. 新增接口: 查询非网站类转发规则的防护规则 Geo 拦截可设置区域编码(describeGeoAreas) | +| 2018-11-30 | 1.2.0 | 接口更新 | 1. 创建实例, 查询实例添加 ipv6 支持 | +| 2018-08-31 | 1.1.0 | 新增接口 | 1. 新增 DDos 攻击日志, CC攻击日志, CC攻击详情下载接口
2. 新增攻击次数及流量峰值, 各类型攻击次数查询接口
3. 新增高防实例名称列表, 高防实例防护统计信息, CC 自定义默认阈值, 用户的京东云 IP 资源查询接口
4. 新增实例名称合法性检测接口, 实例弹性防护带宽更新接口
5. 新增告警配置查询, 告警配置更新接口
6. 新增证书预览信息查询接口, 证书编辑接口 | +| 2018-06-26 | 1.0.1 | 问题修复 | 1. 修复 operationId 重复的问题 | +| 2018-06-26 | 1.0.0 | 新增接口 | 1. 新增 CC 防护 IP 限速, 观察者模式接口
2. 新增 DDos 攻击日志, CC 攻击日志, CC 攻击详情查询接口
3. 新增 DDos 攻击流量报表, 转发流量报表, CC 流量报表查询接口 | +| 2018-04-20 | 0.3.0 | 问题修复 | 1. 调整操作类型接口 path | +| 2018-03-31 | 0.2.0 | 新增接口 | 1. 新增网站规则操作接口
2. 新增非网站规则操作接口 | +| 2018-01-31 | 0.1.0 | 初始版本 | 1. IP 高防基本操作接口 | diff --git a/jdcloud_sdk/services/ipanti/apis/CreateInstanceRequest.py b/jdcloud_sdk/services/ipanti/apis/CreateInstanceRequest.py index 3d1ad488..68feca8b 100644 --- a/jdcloud_sdk/services/ipanti/apis/CreateInstanceRequest.py +++ b/jdcloud_sdk/services/ipanti/apis/CreateInstanceRequest.py @@ -32,7 +32,7 @@ def __init__(self, parameters, header=None, version="v1"): class CreateInstanceParameters(object): - def __init__(self, regionId, createInstanceSpec): + def __init__(self, regionId, createInstanceSpec, ): """ :param regionId: 区域 ID, 高防不区分区域, 传 cn-north-1 即可 :param createInstanceSpec: 新购或升级实例请求参数 @@ -40,4 +40,11 @@ def __init__(self, regionId, createInstanceSpec): self.regionId = regionId self.createInstanceSpec = createInstanceSpec + self.autoRenewalSpec = None + + def setAutoRenewalSpec(self, autoRenewalSpec): + """ + :param autoRenewalSpec: (Optional) 自动续费配置, 默认不开通, 仅新购实例时可设置 + """ + self.autoRenewalSpec = autoRenewalSpec diff --git a/jdcloud_sdk/services/ipanti/apis/DescribeForwardRulesRequest.py b/jdcloud_sdk/services/ipanti/apis/DescribeForwardRulesRequest.py index 8ce506a5..848fee98 100644 --- a/jdcloud_sdk/services/ipanti/apis/DescribeForwardRulesRequest.py +++ b/jdcloud_sdk/services/ipanti/apis/DescribeForwardRulesRequest.py @@ -59,7 +59,7 @@ def setPageSize(self, pageSize): def setSearchType(self, searchType): """ - :param searchType: (Optional) 查询类型名称, domain:源站域名, ip:源站 IP, port: 转发端口, originPort: 源站端口 + :param searchType: (Optional) 查询类型名称, domain:源站域名, ip:源站 IP, port: 转发端口, originPort: 源站端口, serviceIp: 高防IP(仅支持BGP线路的实例) """ self.searchType = searchType diff --git a/jdcloud_sdk/services/ipanti/apis/DescribeServiceIpListRequest.py b/jdcloud_sdk/services/ipanti/apis/DescribeServiceIpListRequest.py new file mode 100644 index 00000000..021abe9d --- /dev/null +++ b/jdcloud_sdk/services/ipanti/apis/DescribeServiceIpListRequest.py @@ -0,0 +1,57 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + +from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest + + +class DescribeServiceIpListRequest(JDCloudRequest): + """ + 查询实例高防 IP 列表 + """ + + def __init__(self, parameters, header=None, version="v1"): + super(DescribeServiceIpListRequest, self).__init__( + '/regions/{regionId}/instances/{instanceId}:describeServiceIpList', 'GET', header, version) + self.parameters = parameters + + +class DescribeServiceIpListParameters(object): + + def __init__(self, regionId, instanceId, ): + """ + :param regionId: 区域 ID, 高防不区分区域, 传 cn-north-1 即可 + :param instanceId: 实例 ID + """ + + self.regionId = regionId + self.instanceId = instanceId + self.pageNumber = None + self.pageSize = None + + def setPageNumber(self, pageNumber): + """ + :param pageNumber: (Optional) 页码, 默认为 1 + """ + self.pageNumber = pageNumber + + def setPageSize(self, pageSize): + """ + :param pageSize: (Optional) 分页大小, 默认为 10, 取值范围[10, 100] + """ + self.pageSize = pageSize + diff --git a/jdcloud_sdk/services/ipanti/apis/DescribeWebRulesRequest.py b/jdcloud_sdk/services/ipanti/apis/DescribeWebRulesRequest.py index 157f1d99..4851bbb1 100644 --- a/jdcloud_sdk/services/ipanti/apis/DescribeWebRulesRequest.py +++ b/jdcloud_sdk/services/ipanti/apis/DescribeWebRulesRequest.py @@ -59,7 +59,7 @@ def setPageSize(self, pageSize): def setSearchType(self, searchType): """ - :param searchType: (Optional) 查询类型名称, domain:源站域名, ip:源站 IP, rawDomain: 域名 + :param searchType: (Optional) 查询类型名称, domain:源站域名, ip:源站 IP, rawDomain: 域名, serviceIp: 高防IP(仅支持BGP线路的实例) """ self.searchType = searchType diff --git a/jdcloud_sdk/services/ipanti/client/IpantiClient.py b/jdcloud_sdk/services/ipanti/client/IpantiClient.py index e47e85fa..944a3ad7 100644 --- a/jdcloud_sdk/services/ipanti/client/IpantiClient.py +++ b/jdcloud_sdk/services/ipanti/client/IpantiClient.py @@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None): if config is None: config = Config('ipanti.jdcloud-api.com') - super(IpantiClient, self).__init__(credential, config, 'ipanti', '1.6.12', logger) + super(IpantiClient, self).__init__(credential, config, 'ipanti', '1.7.0', logger) diff --git a/jdcloud_sdk/services/ipanti/models/AlarmConfig.py b/jdcloud_sdk/services/ipanti/models/AlarmConfig.py index 993594a0..1fadbb25 100644 --- a/jdcloud_sdk/services/ipanti/models/AlarmConfig.py +++ b/jdcloud_sdk/services/ipanti/models/AlarmConfig.py @@ -19,7 +19,7 @@ class AlarmConfig(object): - def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, blackHoleAlarmStatus=None, ddosAlarmEmailStatus=None, ddosAlarmSmsStatus=None, ddosAlarmStatus=None, errorCodeAlarmStatus=None, errorCodeDomain=None): + def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, blackHoleAlarmStatus=None, ddosAlarmEmailStatus=None, ddosAlarmSmsStatus=None, ddosAlarmStatus=None, errorCodeAlarmStatus=None, errorCodeDomain=None, errorCode=None, errorCodePercent=None, errorCodeCount=None): """ :param blackHoleAlarmEmailStatus: (Optional) 黑洞告警邮件开关 0 关闭 1 开启 :param blackHoleAlarmSmsStatus: (Optional) 黑洞告警短信开关 0 关闭 1 开启 @@ -29,6 +29,9 @@ def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, :param ddosAlarmStatus: (Optional) DDos 告警总开关 0 关闭 1 开启 :param errorCodeAlarmStatus: (Optional) 错误码告警总开关 :param errorCodeDomain: (Optional) 错误码告警域名列表 + :param errorCode: (Optional) 错误码列表 + :param errorCodePercent: (Optional) 错误码触发告警比例 + :param errorCodeCount: (Optional) 错误码触发告警次数 """ self.blackHoleAlarmEmailStatus = blackHoleAlarmEmailStatus @@ -39,3 +42,6 @@ def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, self.ddosAlarmStatus = ddosAlarmStatus self.errorCodeAlarmStatus = errorCodeAlarmStatus self.errorCodeDomain = errorCodeDomain + self.errorCode = errorCode + self.errorCodePercent = errorCodePercent + self.errorCodeCount = errorCodeCount diff --git a/jdcloud_sdk/services/ipanti/models/AlarmConfigSpec.py b/jdcloud_sdk/services/ipanti/models/AlarmConfigSpec.py index 1f780f38..16f8a000 100644 --- a/jdcloud_sdk/services/ipanti/models/AlarmConfigSpec.py +++ b/jdcloud_sdk/services/ipanti/models/AlarmConfigSpec.py @@ -19,7 +19,7 @@ class AlarmConfigSpec(object): - def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, blackHoleAlarmStatus=None, ddosAlarmEmailStatus=None, ddosAlarmSmsStatus=None, ddosAlarmStatus=None, errorCodeAlarmStatus=None, errorCodeDomain=None): + def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, blackHoleAlarmStatus=None, ddosAlarmEmailStatus=None, ddosAlarmSmsStatus=None, ddosAlarmStatus=None, errorCodeAlarmStatus=None, errorCodeDomain=None, errorCode=None, errorCodePercent=None, errorCodeCount=None): """ :param blackHoleAlarmEmailStatus: (Optional) 黑洞告警邮件开关 0 关闭 1 开启 :param blackHoleAlarmSmsStatus: (Optional) 黑洞告警短信开关 0 关闭 1 开启 @@ -29,6 +29,9 @@ def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, :param ddosAlarmStatus: (Optional) DDos 告警总开关 0 关闭 1 开启 :param errorCodeAlarmStatus: (Optional) 错误码告警总开关 :param errorCodeDomain: (Optional) 错误码告警域名列表 + :param errorCode: (Optional) 错误码列表 + :param errorCodePercent: (Optional) 错误码触发告警比例 + :param errorCodeCount: (Optional) 错误码触发告警次数 """ self.blackHoleAlarmEmailStatus = blackHoleAlarmEmailStatus @@ -39,3 +42,6 @@ def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, self.ddosAlarmStatus = ddosAlarmStatus self.errorCodeAlarmStatus = errorCodeAlarmStatus self.errorCodeDomain = errorCodeDomain + self.errorCode = errorCode + self.errorCodePercent = errorCodePercent + self.errorCodeCount = errorCodeCount diff --git a/jdcloud_sdk/services/ipanti/models/AutoRenewalSpec.py b/jdcloud_sdk/services/ipanti/models/AutoRenewalSpec.py new file mode 100644 index 00000000..bca8c858 --- /dev/null +++ b/jdcloud_sdk/services/ipanti/models/AutoRenewalSpec.py @@ -0,0 +1,31 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class AutoRenewalSpec(object): + + def __init__(self, autoRenewalEnable, timeSpan=None, timeUnit=None): + """ + :param autoRenewalEnable: 是否开通自动续费, true: 开通自动续费, false: 不开通自动续费 + :param timeSpan: (Optional) 购买时长, 开通自动续费时必传.
- timeUnit 为 3 时, 可取值 1-9
- timeUnit 为 4 时, 可取值 1-3 + :param timeUnit: (Optional) 自动续费时长类型, 开通自动续费时必传.
- 3: 月
- 4: 年 + """ + + self.autoRenewalEnable = autoRenewalEnable + self.timeSpan = timeSpan + self.timeUnit = timeUnit diff --git a/jdcloud_sdk/services/ipanti/models/CCProtectionRule.py b/jdcloud_sdk/services/ipanti/models/CCProtectionRule.py index 4d6722f7..50d95cfa 100644 --- a/jdcloud_sdk/services/ipanti/models/CCProtectionRule.py +++ b/jdcloud_sdk/services/ipanti/models/CCProtectionRule.py @@ -19,7 +19,7 @@ class CCProtectionRule(object): - def __init__(self, id=None, webRuleId=None, instanceId=None, name=None, enable=None, uri=None, matchType=None, detectPeriod=None, singleIpLimit=None, blockType=None, blockTime=None): + def __init__(self, id=None, webRuleId=None, instanceId=None, name=None, enable=None, uri=None, matchType=None, detectPeriod=None, singleIpLimit=None, blockType=None, blockTime=None, pageId=None, pageName=None): """ :param id: (Optional) CC 防护规则 ID :param webRuleId: (Optional) CC 防护规则对应的网站规则 ID @@ -32,6 +32,8 @@ def __init__(self, id=None, webRuleId=None, instanceId=None, name=None, enable=N :param singleIpLimit: (Optional) ip 访问次数, 取值范围[2, 2000] :param blockType: (Optional) 阻断类型, 1: 封禁, 2: 人机交互 :param blockTime: (Optional) 阻断持续时间, 单位为秒, 取值范围[10, 86400] + :param pageId: (Optional) 关联的自定义页面id + :param pageName: (Optional) 关联的自定义页面名称 """ self.id = id @@ -45,3 +47,5 @@ def __init__(self, id=None, webRuleId=None, instanceId=None, name=None, enable=N self.singleIpLimit = singleIpLimit self.blockType = blockType self.blockTime = blockTime + self.pageId = pageId + self.pageName = pageName diff --git a/jdcloud_sdk/services/ipanti/models/CCProtectionRuleSpec.py b/jdcloud_sdk/services/ipanti/models/CCProtectionRuleSpec.py index f9e22bce..ffb2ff63 100644 --- a/jdcloud_sdk/services/ipanti/models/CCProtectionRuleSpec.py +++ b/jdcloud_sdk/services/ipanti/models/CCProtectionRuleSpec.py @@ -19,7 +19,7 @@ class CCProtectionRuleSpec(object): - def __init__(self, name, uri, matchType, detectPeriod, singleIpLimit, blockType, blockTime, ): + def __init__(self, name, uri, matchType, detectPeriod, singleIpLimit, blockType, blockTime, pageId=None): """ :param name: CC 防护规则名称, 不允许为空, 长度不超过 32 个字符, 支持中文, 大小写字母, 数字及字符'-'、'/'、'.'、'_' :param uri: uri, 不允许为空, 以 / 开头, 长度不超过 2048 个字符 @@ -28,6 +28,7 @@ def __init__(self, name, uri, matchType, detectPeriod, singleIpLimit, blockType, :param singleIpLimit: ip 访问次数, 取值范围[2, 2000] :param blockType: 阻断类型, 1: 封禁, 2: 人机交互 :param blockTime: 阻断持续时间, 单位为秒, 取值范围[10, 86400] + :param pageId: (Optional) 关联的自定义页面id """ self.name = name @@ -37,3 +38,4 @@ def __init__(self, name, uri, matchType, detectPeriod, singleIpLimit, blockType, self.singleIpLimit = singleIpLimit self.blockType = blockType self.blockTime = blockTime + self.pageId = pageId diff --git a/jdcloud_sdk/services/ipanti/models/CcsIpResource.py b/jdcloud_sdk/services/ipanti/models/CcsIpResource.py new file mode 100644 index 00000000..4eadee4c --- /dev/null +++ b/jdcloud_sdk/services/ipanti/models/CcsIpResource.py @@ -0,0 +1,29 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class CcsIpResource(object): + + def __init__(self, ip=None, resourceType=None): + """ + :param ip: (Optional) 云物理服务器公网 IP 地址 + :param resourceType: (Optional) 公网 IP 类型或绑定资源类型.
- 0: 未知类型
- 1: 弹性公网 IP(IP 为弹性公网 IP, 绑定资源类型未知)
- 10: 弹性公网 IP(IP 为弹性公网 IP, 但未绑定资源)
- 11: 弹性公网 IP, 绑定了云主机
- 12: 弹性公网 IP, 绑定了负载均衡
- 13: 弹性公网 IP, 绑定了原生容器实例
- 14: 弹性公网 IP, 绑定了原生容器 Pod
- 2: 云物理服务器公网 IP
- 4: 托管区公网 IP + """ + + self.ip = ip + self.resourceType = resourceType diff --git a/jdcloud_sdk/services/ipanti/models/CpsIpResource.py b/jdcloud_sdk/services/ipanti/models/CpsIpResource.py index de39bdac..f067d850 100644 --- a/jdcloud_sdk/services/ipanti/models/CpsIpResource.py +++ b/jdcloud_sdk/services/ipanti/models/CpsIpResource.py @@ -22,7 +22,7 @@ class CpsIpResource(object): def __init__(self, ip=None, resourceType=None): """ :param ip: (Optional) 云物理服务器公网 IP 地址 - :param resourceType: (Optional) 公网 IP 类型或绑定资源类型.
- 0: 未知类型
- 1: 弹性公网 IP(IP 为弹性公网 IP, 绑定资源类型未知)
- 10: 弹性公网 IP(IP 为弹性公网 IP, 但未绑定资源)
- 11: 弹性公网 IP, 绑定了云主机
- 12: 弹性公网 IP, 绑定了负载均衡
- 13: 弹性公网 IP, 绑定了原生容器实例
- 14: 弹性公网 IP, 绑定了原生容器 Pod
- 2: 云物理服务器公网 IP + :param resourceType: (Optional) 公网 IP 类型或绑定资源类型.
- 0: 未知类型
- 1: 弹性公网 IP(IP 为弹性公网 IP, 绑定资源类型未知)
- 10: 弹性公网 IP(IP 为弹性公网 IP, 但未绑定资源)
- 11: 弹性公网 IP, 绑定了云主机
- 12: 弹性公网 IP, 绑定了负载均衡
- 13: 弹性公网 IP, 绑定了原生容器实例
- 14: 弹性公网 IP, 绑定了原生容器 Pod
- 2: 云物理服务器公网 IP
- 4: 托管区公网 IP """ self.ip = ip diff --git a/jdcloud_sdk/services/ipanti/models/CreateDispatchRuleSpec.py b/jdcloud_sdk/services/ipanti/models/CreateDispatchRuleSpec.py new file mode 100644 index 00000000..711f8f43 --- /dev/null +++ b/jdcloud_sdk/services/ipanti/models/CreateDispatchRuleSpec.py @@ -0,0 +1,35 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class CreateDispatchRuleSpec(object): + + def __init__(self, name, innerIps, dispatchThresholdMbps, dispatchThresholdPps, serviceIp=None): + """ + :param name: 规则名称 + :param serviceIp: (Optional) 高防 IP + :param innerIps: 云内IP + :param dispatchThresholdMbps: 触发调度的流量阈值, 单位 Mbps + :param dispatchThresholdPps: 触发调度的报文阈值, 单位 pps + """ + + self.name = name + self.serviceIp = serviceIp + self.innerIps = innerIps + self.dispatchThresholdMbps = dispatchThresholdMbps + self.dispatchThresholdPps = dispatchThresholdPps diff --git a/jdcloud_sdk/services/ipanti/models/CreateInstanceSpec.py b/jdcloud_sdk/services/ipanti/models/CreateInstanceSpec.py index 482e3b6a..d8d44b5b 100644 --- a/jdcloud_sdk/services/ipanti/models/CreateInstanceSpec.py +++ b/jdcloud_sdk/services/ipanti/models/CreateInstanceSpec.py @@ -19,20 +19,20 @@ class CreateInstanceSpec(object): - def __init__(self, buyType, carrier, ipCount, portCount, bp, ep, bw, id=None, name=None, ipType=None, domainCount=None, timeSpan=None, timeUnit=None, returnUrl=None): + def __init__(self, buyType, carrier, bp, ep, bw, id=None, name=None, ipType=None, ipCount=None, portCount=None, domainCount=None, timeSpan=None, timeUnit=None, returnUrl=None): """ :param id: (Optional) 实例 Id, 升级时必传 :param name: (Optional) 实例名称, 新购时必传 :param buyType: 购买类型.
- 1: 新购
- 3: 升级 :param carrier: 链路类型.
- 1: 电信
- 3: 电信、联通和移动
- 4: BGP 线路 :param ipType: (Optional) 可防护 ip 类型, 目前仅电信线路支持 IPV6 线路
- 0: IPV4,
- 1: IPV4/IPV6 - :param ipCount: IP 数量 - :param portCount: 可配的转发端口数量 + :param ipCount: (Optional) IP 数量 + :param portCount: (Optional) 可配的转发端口数量 :param domainCount: (Optional) 可配的网站规则域名数量 :param bp: 保底带宽: 单位 Gbps :param ep: 弹性带宽: 单位 Gbps :param bw: 业务带宽: 单位 Mbps - :param timeSpan: (Optional) 购买防护包时长, 新购高防实例时必传
- timeUnit 为 3 时, 可取值 1-9
- timeUnit 为 4 时, 可取值 1-3 + :param timeSpan: (Optional) 购买时长, 新购高防实例时必传
- timeUnit 为 3 时, 可取值 1-9
- timeUnit 为 4 时, 可取值 1-3 :param timeUnit: (Optional) 购买时长类型, 新购高防实例时必传
- 3: 月
- 4: 年 :param returnUrl: (Optional) 支付成功后跳转的页面, 控制台交互模式传该字段 """ diff --git a/jdcloud_sdk/services/ipanti/models/CustomPage.py b/jdcloud_sdk/services/ipanti/models/CustomPage.py new file mode 100644 index 00000000..82ced55d --- /dev/null +++ b/jdcloud_sdk/services/ipanti/models/CustomPage.py @@ -0,0 +1,35 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class CustomPage(object): + + def __init__(self, id=None, name=None, content=None, updateTime=None, status=None): + """ + :param id: (Optional) 自定义页面Id + :param name: (Optional) 自定义页面名称 + :param content: (Optional) 自定义页面内容 + :param updateTime: (Optional) 更新时间 + :param status: (Optional) approving: 审批中, refused: 审批不通过, approved: 审批通过 + """ + + self.id = id + self.name = name + self.content = content + self.updateTime = updateTime + self.status = status diff --git a/jdcloud_sdk/services/ipanti/models/CustomPageSpec.py b/jdcloud_sdk/services/ipanti/models/CustomPageSpec.py new file mode 100644 index 00000000..522e4508 --- /dev/null +++ b/jdcloud_sdk/services/ipanti/models/CustomPageSpec.py @@ -0,0 +1,29 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class CustomPageSpec(object): + + def __init__(self, content, name=None): + """ + :param name: (Optional) 自定义页面名称, 创建后不可修改, 添加自定义页面时必传 + :param content: 自定义页面内容, 添加自定义页面时必传 + """ + + self.name = name + self.content = content diff --git a/jdcloud_sdk/services/ipanti/models/DDoSAttackLog.py b/jdcloud_sdk/services/ipanti/models/DDoSAttackLog.py index 42b0b883..567758b7 100644 --- a/jdcloud_sdk/services/ipanti/models/DDoSAttackLog.py +++ b/jdcloud_sdk/services/ipanti/models/DDoSAttackLog.py @@ -22,7 +22,7 @@ class DDoSAttackLog(object): def __init__(self, attackTraffic=None, blackHole=None, startTime=None, endTime=None, unit=None, instanceId=None, name=None): """ :param attackTraffic: (Optional) 攻击流量大小 - :param blackHole: (Optional) 是否触发黑洞, 0否 1是 + :param blackHole: (Optional) 封禁状态,0:未封禁,1:封禁中,2:封禁结束 :param startTime: (Optional) 攻击开始时间 :param endTime: (Optional) 攻击结束时间 :param unit: (Optional) 流量单位, bps、Kbps、Mbps、Gbps diff --git a/jdcloud_sdk/services/ipanti/models/DispatchRule.py b/jdcloud_sdk/services/ipanti/models/DispatchRule.py new file mode 100644 index 00000000..e5ab5961 --- /dev/null +++ b/jdcloud_sdk/services/ipanti/models/DispatchRule.py @@ -0,0 +1,41 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class DispatchRule(object): + + def __init__(self, id=None, name=None, cname=None, serviceIp=None, innerIps=None, dispatchThresholdMbps=None, dispatchThresholdPps=None, status=None): + """ + :param id: (Optional) 规则 Id + :param name: (Optional) 规则名称 + :param cname: (Optional) 规则的 CNAME + :param serviceIp: (Optional) 高防 IP + :param innerIps: (Optional) 云内IP + :param dispatchThresholdMbps: (Optional) 触发调度的流量阈值, 单位 Mbps + :param dispatchThresholdPps: (Optional) 触发调度的报文阈值, 单位 pps + :param status: (Optional) 0: 防御状态, 1: 回源状态 + """ + + self.id = id + self.name = name + self.cname = cname + self.serviceIp = serviceIp + self.innerIps = innerIps + self.dispatchThresholdMbps = dispatchThresholdMbps + self.dispatchThresholdPps = dispatchThresholdPps + self.status = status diff --git a/jdcloud_sdk/services/ipanti/models/FailedRule.py b/jdcloud_sdk/services/ipanti/models/FailedRule.py new file mode 100644 index 00000000..8ae85baa --- /dev/null +++ b/jdcloud_sdk/services/ipanti/models/FailedRule.py @@ -0,0 +1,29 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class FailedRule(object): + + def __init__(self, name=None, message=None): + """ + :param name: (Optional) 规则名称 + :param message: (Optional) 错误原因 + """ + + self.name = name + self.message = message diff --git a/jdcloud_sdk/services/ipanti/models/Instance.py b/jdcloud_sdk/services/ipanti/models/Instance.py index 0e1db603..86413053 100644 --- a/jdcloud_sdk/services/ipanti/models/Instance.py +++ b/jdcloud_sdk/services/ipanti/models/Instance.py @@ -19,7 +19,7 @@ class Instance(object): - def __init__(self, id=None, name=None, carrier=None, ipType=None, ipCount=None, portCount=None, domainCount=None, elasticTriggerCount=None, abovePeakCount=None, inBitslimit=None, resilientBitslimit=None, businessBitslimit=None, ccThreshold=None, ccPeakQPS=None, ruleCount=None, webRuleCount=None, chargeStatus=None, securityStatus=None, createTime=None, expireTime=None, resourceId=None, ccObserveMode=None, ccProtectMode=None, ccProtectStatus=None, ccSpeedLimit=None, ccSpeedPeriod=None, ipBlackList=None, ipBlackStatus=None, ipWhiteList=None, ipWhiteStatus=None, urlWhitelist=None, urlWhitelistStatus=None, hostQps=None, hostUrlQps=None, ipHostQps=None, ipHostUrlQps=None): + def __init__(self, id=None, name=None, carrier=None, ipType=None, ipCount=None, portCount=None, domainCount=None, elasticTriggerCount=None, abovePeakCount=None, inBitslimit=None, resilientBitslimit=None, businessBitslimit=None, ccThreshold=None, ccPeakQPS=None, ruleCount=None, webRuleCount=None, dispatchRuleCount=None, chargeStatus=None, securityStatus=None, createTime=None, expireTime=None, resourceId=None, ccObserveMode=None, ccProtectMode=None, ccProtectStatus=None, ccSpeedLimit=None, ccSpeedPeriod=None, ipBlackList=None, ipBlackStatus=None, ipWhiteList=None, ipWhiteStatus=None, urlWhitelist=None, urlWhitelistStatus=None, hostQps=None, hostUrlQps=None, ipHostQps=None, ipHostUrlQps=None, pageId=None, pageName=None): """ :param id: (Optional) 实例 ID :param name: (Optional) 实例名称 @@ -37,6 +37,7 @@ def __init__(self, id=None, name=None, carrier=None, ipType=None, ipCount=None, :param ccPeakQPS: (Optional) CC 防护峰值, 单位: QPS :param ruleCount: (Optional) 非网站类规则数 :param webRuleCount: (Optional) 网站类规则数 + :param dispatchRuleCount: (Optional) 防护调度规则数 :param chargeStatus: (Optional) 计费状态.
- PAID: 已支付
- ARREARS: 欠费
- EXPIRED: 过期 :param securityStatus: (Optional) 安全状态.
- SAFE: 安全
- CLEANING: 清洗中
- BLOCKING: 封禁中 :param createTime: (Optional) 实例的创建的时间 @@ -57,6 +58,8 @@ def __init__(self, id=None, name=None, carrier=None, ipType=None, ipCount=None, :param hostUrlQps: (Optional) ccProtectMode为自定义模式时, 每个Host+URI的防护阈值 :param ipHostQps: (Optional) ccProtectMode为自定义模式时, 每个源IP对Host的防护阈值 :param ipHostUrlQps: (Optional) ccProtectMode为自定义模式时, 每个源IP对Host+URI的防护阈值 + :param pageId: (Optional) 关联的自定义页面id + :param pageName: (Optional) 关联的自定义页面名称 """ self.id = id @@ -75,6 +78,7 @@ def __init__(self, id=None, name=None, carrier=None, ipType=None, ipCount=None, self.ccPeakQPS = ccPeakQPS self.ruleCount = ruleCount self.webRuleCount = webRuleCount + self.dispatchRuleCount = dispatchRuleCount self.chargeStatus = chargeStatus self.securityStatus = securityStatus self.createTime = createTime @@ -95,3 +99,5 @@ def __init__(self, id=None, name=None, carrier=None, ipType=None, ipCount=None, self.hostUrlQps = hostUrlQps self.ipHostQps = ipHostQps self.ipHostUrlQps = ipHostUrlQps + self.pageId = pageId + self.pageName = pageName diff --git a/jdcloud_sdk/services/ipanti/models/InstanceAcl.py b/jdcloud_sdk/services/ipanti/models/InstanceAcl.py index 86759b37..7402eb76 100644 --- a/jdcloud_sdk/services/ipanti/models/InstanceAcl.py +++ b/jdcloud_sdk/services/ipanti/models/InstanceAcl.py @@ -21,8 +21,8 @@ class InstanceAcl(object): def __init__(self, blackListIds=None, whiteListIds=None, geoBlack=None, success=None, canRecover=None): """ - :param blackListIds: (Optional) 四层黑名单引用的IP黑白名单库列表 - :param whiteListIds: (Optional) 四层白名单引用的IP黑白名单库列表 + :param blackListIds: (Optional) 黑名单引用的IP黑白名单库列表 + :param whiteListIds: (Optional) 白名单引用的IP黑白名单库列表 :param geoBlack: (Optional) geo 拦截地域列表 :param success: (Optional) 上一次修改是否下发成功 :param canRecover: (Optional) 上一次修改下发失败的情况下，是否可以回滚到上一次修改之前下发成功的配置 diff --git a/jdcloud_sdk/services/ipanti/models/ModifyDispatchRuleSpec.py b/jdcloud_sdk/services/ipanti/models/ModifyDispatchRuleSpec.py new file mode 100644 index 00000000..82dad15f --- /dev/null +++ b/jdcloud_sdk/services/ipanti/models/ModifyDispatchRuleSpec.py @@ -0,0 +1,35 @@ +# coding=utf8 + +# Copyright 2018 JDCLOUD.COM +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# NOTE: This class is auto generated by the jdcloud code generator program. + + +class ModifyDispatchRuleSpec(object): + + def __init__(self, name, innerIps, dispatchThresholdMbps, dispatchThresholdPps, serviceIp=None): + """ + :param name: 规则名称 + :param serviceIp: (Optional) 高防 IP + :param innerIps: 云内IP + :param dispatchThresholdMbps: 触发调度的流量阈值, 单位 Mbps + :param dispatchThresholdPps: 触发调度的报文阈值, 单位 pps + """ + + self.name = name + self.serviceIp = serviceIp + self.innerIps = innerIps + self.dispatchThresholdMbps = dispatchThresholdMbps + self.dispatchThresholdPps = dispatchThresholdPps diff --git a/jdcloud_sdk/services/ipanti/models/VpcIpResource.py b/jdcloud_sdk/services/ipanti/models/VpcIpResource.py index 20967cf0..b6cd70d8 100644 --- a/jdcloud_sdk/services/ipanti/models/VpcIpResource.py +++ b/jdcloud_sdk/services/ipanti/models/VpcIpResource.py @@ -23,7 +23,7 @@ def __init__(self, ip=None, binded=None, resourceType=None): """ :param ip: (Optional) 云内 IP 地址 :param binded: (Optional) 是否绑定 - :param resourceType: (Optional) 公网 IP 类型或绑定资源类型.
- 0: 未知类型
- 1: 弹性公网 IP(IP 为弹性公网 IP, 绑定资源类型未知)
- 10: 弹性公网 IP(IP 为弹性公网 IP, 但未绑定资源)
- 11: 弹性公网 IP, 绑定了云主机
- 12: 弹性公网 IP, 绑定了负载均衡
- 13: 弹性公网 IP, 绑定了原生容器实例
- 14: 弹性公网 IP, 绑定了原生容器 Pod
- 2: 云物理服务器公网 IP + :param resourceType: (Optional) 公网 IP 类型或绑定资源类型.
- 0: 未知类型
- 1: 弹性公网 IP(IP 为弹性公网 IP, 绑定资源类型未知)
- 10: 弹性公网 IP(IP 为弹性公网 IP, 但未绑定资源)
- 11: 弹性公网 IP, 绑定了云主机
- 12: 弹性公网 IP, 绑定了负载均衡
- 13: 弹性公网 IP, 绑定了原生容器实例
- 14: 弹性公网 IP, 绑定了原生容器 Pod
- 2: 云物理服务器公网 IP
- 4: 托管区公网 IP """ self.ip = ip diff --git a/jdcloud_sdk/services/jdccs/ChangeLog.md b/jdcloud_sdk/services/jdccs/ChangeLog.md index 68773711..d63d6812 100644 --- a/jdcloud_sdk/services/jdccs/ChangeLog.md +++ b/jdcloud_sdk/services/jdccs/ChangeLog.md @@ -1,8 +1,10 @@ # 更新历史 # -API版本：1.0.8 +API版本：1.0.10 |发布时间|版本号|更新|说明| |---|---|---|---| +|2020-06-22|1.0.10|接口变更|带宽（上、下行流量）监控项数据2小时范围查询支持5m粒度| +|2020-03-20|1.0.9|接口变更|公网IP列表新增IP地址数量、IP类型、线路类型
带宽（出口）列表、详情新增计费方式| |2020-03-11|1.0.8|接口变更|VIVO需求:根据IP网段查询流量采样数据| |2020-02-03|1.0.7|接口变更|报警历史列表返回字段优化| |2020-01-16|1.0.6|接口变更|报警规则列表、报警历史列表、IP列表返回字段优化| diff --git a/jdcloud_sdk/services/jdccs/apis/DescribeMetricDataRequest.py b/jdcloud_sdk/services/jdccs/apis/DescribeMetricDataRequest.py index 511e174e..fa744831 100644 --- a/jdcloud_sdk/services/jdccs/apis/DescribeMetricDataRequest.py +++ b/jdcloud_sdk/services/jdccs/apis/DescribeMetricDataRequest.py @@ -52,7 +52,7 @@ def __init__(self, idc, metric, resourceId, startTime, endTime, ): def setTimeInterval(self, timeInterval): """ - :param timeInterval: (Optional) 时间间隔：分钟m、小时h、天d，如： 10分钟=10m、1小时=1h，3天=3d；默认5m，最小支持5m，最大90d 目前带宽上、下行流量查询，会根据时间范围是否超过2小时，设定时间间隔为1m或5m + :param timeInterval: (Optional) 时间间隔：分钟m、小时h、天d，如： 10分钟=10m、1小时=1h，3天=3d；默认5m，最小支持5m，最大90d 目前带宽上、下行流量查询，时间间隔：1m、5m，默认5m。1m时间间隔支持的最大时间范围为2小时 """ self.timeInterval = timeInterval diff --git a/jdcloud_sdk/services/jdccs/client/JdccsClient.py b/jdcloud_sdk/services/jdccs/client/JdccsClient.py index 9004505b..4b2ff6bb 100644 --- a/jdcloud_sdk/services/jdccs/client/JdccsClient.py +++ b/jdcloud_sdk/services/jdccs/client/JdccsClient.py @@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None): if config is None: config = Config('jdccs.jdcloud-api.com') - super(JdccsClient, self).__init__(credential, config, 'jdccs', '1.0.8', logger) + super(JdccsClient, self).__init__(credential, config, 'jdccs', '1.0.10', logger) diff --git a/jdcloud_sdk/services/jdccs/models/Bandwidth.py b/jdcloud_sdk/services/jdccs/models/Bandwidth.py index e00a77e1..232bfc23 100644 --- a/jdcloud_sdk/services/jdccs/models/Bandwidth.py +++ b/jdcloud_sdk/services/jdccs/models/Bandwidth.py @@ -19,14 +19,15 @@ class Bandwidth(object): - def __init__(self, idc=None, idcName=None, bandwidthId=None, bandwidthName=None, status=None, lineType=None, bandwidth=None, relatedIp=None, switchboard=None): + def __init__(self, idc=None, idcName=None, bandwidthId=None, bandwidthName=None, status=None, lineType=None, chargeType=None, bandwidth=None, relatedIp=None, switchboard=None): """ :param idc: (Optional) 机房英文标识 :param idcName: (Optional) 机房名称 :param bandwidthId: (Optional) 带宽实例ID :param bandwidthName: (Optional) 带宽名称 :param status: (Optional) 状态 normal:正常 abnormal:异常 - :param lineType: (Optional) 线路类型 bgp:BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 + :param lineType: (Optional) 线路类型 dynamicBGP:动态BGP thirdLineBGP:三线BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 + :param chargeType: (Optional) 计费方式 fixedBandwidth:固定带宽 95thPercentile:95峰值 merge95thPercentile:合并95峰值 :param bandwidth: (Optional) 合同带宽（Mbps） :param relatedIp: (Optional) 关联的公网IP :param switchboard: (Optional) 交换机信息 @@ -38,6 +39,7 @@ def __init__(self, idc=None, idcName=None, bandwidthId=None, bandwidthName=None, self.bandwidthName = bandwidthName self.status = status self.lineType = lineType + self.chargeType = chargeType self.bandwidth = bandwidth self.relatedIp = relatedIp self.switchboard = switchboard diff --git a/jdcloud_sdk/services/jdccs/models/BandwidthTraffic.py b/jdcloud_sdk/services/jdccs/models/BandwidthTraffic.py index 63778573..ab0e7938 100644 --- a/jdcloud_sdk/services/jdccs/models/BandwidthTraffic.py +++ b/jdcloud_sdk/services/jdccs/models/BandwidthTraffic.py @@ -28,7 +28,7 @@ def __init__(self, idc=None, idcName=None, bandwidthId=None, bandwidthName=None, :param totalTrafficIn: (Optional) 总上行实时流量 :param totalTrafficOut: (Optional) 总下行实时流量 :param bandwidth: (Optional) 总带宽 - :param lineType: (Optional) 线路类型 bgp:BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 + :param lineType: (Optional) 线路类型 dynamicBGP:动态BGP thirdLineBGP:三线BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 :param relatedIp: (Optional) 关联的公网IP :param switchboard: (Optional) 交换机信息 """ diff --git a/jdcloud_sdk/services/jdccs/models/DescribeBandwidth.py b/jdcloud_sdk/services/jdccs/models/DescribeBandwidth.py index f311927e..d37ed448 100644 --- a/jdcloud_sdk/services/jdccs/models/DescribeBandwidth.py +++ b/jdcloud_sdk/services/jdccs/models/DescribeBandwidth.py @@ -19,14 +19,15 @@ class DescribeBandwidth(object): - def __init__(self, idc=None, idcName=None, bandwidthId=None, bandwidthName=None, status=None, lineType=None, bandwidth=None, relatedIp=None): + def __init__(self, idc=None, idcName=None, bandwidthId=None, bandwidthName=None, status=None, lineType=None, chargeType=None, bandwidth=None, relatedIp=None): """ :param idc: (Optional) 机房英文标识 :param idcName: (Optional) 机房名称 :param bandwidthId: (Optional) 带宽实例ID :param bandwidthName: (Optional) 带宽名称 :param status: (Optional) 状态 normal:正常 abnormal:异常 - :param lineType: (Optional) 线路类型 bgp:BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 + :param lineType: (Optional) 线路类型 dynamicBGP:动态BGP thirdLineBGP:三线BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 + :param chargeType: (Optional) 计费方式 fixedBandwidth:固定带宽 95thPercentile:95峰值 merge95thPercentile:合并95峰值 :param bandwidth: (Optional) 合同带宽（Mbps） :param relatedIp: (Optional) 关联的公网IP """ @@ -37,5 +38,6 @@ def __init__(self, idc=None, idcName=None, bandwidthId=None, bandwidthName=None, self.bandwidthName = bandwidthName self.status = status self.lineType = lineType + self.chargeType = chargeType self.bandwidth = bandwidth self.relatedIp = relatedIp diff --git a/jdcloud_sdk/services/jdccs/models/Ip.py b/jdcloud_sdk/services/jdccs/models/Ip.py index e7c55558..336cbd35 100644 --- a/jdcloud_sdk/services/jdccs/models/Ip.py +++ b/jdcloud_sdk/services/jdccs/models/Ip.py @@ -19,15 +19,18 @@ class Ip(object): - def __init__(self, idc=None, idcName=None, ipId=None, cidrAddr=None, networkAddr=None, gatewayAddr=None, broadcastAddr=None, status=None): + def __init__(self, idc=None, idcName=None, ipId=None, cidrAddr=None, ipQuantity=None, ipType=None, networkAddr=None, gatewayAddr=None, broadcastAddr=None, lineType=None, status=None): """ :param idc: (Optional) 机房英文标识 :param idcName: (Optional) 机房名称 :param ipId: (Optional) 公网IP实例ID :param cidrAddr: (Optional) IP地址段 + :param ipQuantity: (Optional) IP数量 + :param ipType: (Optional) IP类型 IPV4/IPV6 :param networkAddr: (Optional) 网络位地址 :param gatewayAddr: (Optional) 网关地址 :param broadcastAddr: (Optional) 广播地址 + :param lineType: (Optional) 线路类型 dynamicBGP:动态BGP thirdLineBGP:三线BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 :param status: (Optional) 状态 normal:正常 abnormal:异常 """ @@ -35,7 +38,10 @@ def __init__(self, idc=None, idcName=None, ipId=None, cidrAddr=None, networkAddr self.idcName = idcName self.ipId = ipId self.cidrAddr = cidrAddr + self.ipQuantity = ipQuantity + self.ipType = ipType self.networkAddr = networkAddr self.gatewayAddr = gatewayAddr self.broadcastAddr = broadcastAddr + self.lineType = lineType self.status = status diff --git a/jdcloud_sdk/services/jdccs/models/RelatedIp.py b/jdcloud_sdk/services/jdccs/models/RelatedIp.py index 3dd5976c..ec9f0540 100644 --- a/jdcloud_sdk/services/jdccs/models/RelatedIp.py +++ b/jdcloud_sdk/services/jdccs/models/RelatedIp.py @@ -22,7 +22,7 @@ class RelatedIp(object): def __init__(self, cidrAddr=None, lineType=None): """ :param cidrAddr: (Optional) IP地址段 - :param lineType: (Optional) 线路类型 bgp:BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 + :param lineType: (Optional) 线路类型 dynamicBGP:动态BGP thirdLineBGP:三线BGP telecom:电信单线 unicom:联通单线 mobile:移动单线 """ self.cidrAddr = cidrAddr diff --git a/jdcloud_sdk/services/jdccs/models/TrafficSamplingData.py b/jdcloud_sdk/services/jdccs/models/TrafficSamplingData.py index 6f1a8a8f..165b2a4f 100644 --- a/jdcloud_sdk/services/jdccs/models/TrafficSamplingData.py +++ b/jdcloud_sdk/services/jdccs/models/TrafficSamplingData.py @@ -19,7 +19,7 @@ class TrafficSamplingData(object): - def __init__(self, srcIp=None, dstIp=None, srcPort=None, dstPort=None, sampleDataLength=None, samplingInterval=None, protocolName=None, timestamp=None, operatorType=None): + def __init__(self, srcIp=None, dstIp=None, srcPort=None, dstPort=None, sampleDataLength=None, samplingInterval=None, protocolName=None, timestamp=None, uniqueId=None, operatorType=None): """ :param srcIp: (Optional) 源IP :param dstIp: (Optional) 目的IP @@ -29,6 +29,7 @@ def __init__(self, srcIp=None, dstIp=None, srcPort=None, dstPort=None, sampleDat :param samplingInterval: (Optional) 采样比 :param protocolName: (Optional) 协议 :param timestamp: (Optional) 时间戳 + :param uniqueId: (Optional) 唯一ID标识 :param operatorType: (Optional) 运营商类型 移动:CM 联通:CU 电信:CT """ @@ -40,4 +41,5 @@ def __init__(self, srcIp=None, dstIp=None, srcPort=None, dstPort=None, sampleDat self.samplingInterval = samplingInterval self.protocolName = protocolName self.timestamp = timestamp + self.uniqueId = uniqueId self.operatorType = operatorType diff --git a/setup.py b/setup.py index a3fe8eb9..ec2ef630 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name='jdcloud_sdk', - version="1.6.64", + version="1.6.65", long_description=long_description, long_description_content_type="text/markdown", author='JDCloud API Gateway Team',