Skip to content

Commit 64b78d1

Browse files
Tanc009Tanc009
authored
Merge pull request #99 from Tanc009/master
publish jdcloud-sdk-python 1.6.65
2 parents 42f8c93 + 8b587ec commit 64b78d1

34 files changed

Lines changed: 410 additions & 43 deletions

‎jdcloud_sdk/services/ipanti/ChangeLog.md‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# 更新历史 #
2-
API版本：1.6.12
2+
API版本：1.7.0
33

4-
|发布时间|版本号|更新|说明|
5-
|---|---|---|---|
6-
|2020-03-05|1.6.12|接口新增与更新|1. 网站规则创建与编辑不再支持上传证书, IP 高防已对接 SSL 数字证书, 新增网站规则绑定证书接口 bindCert <br>2. 网站类规则支持按地域回源, 新增接口查询网站类转发规则按地域回源配置 geoRsRoute 参数可设置的区域|
7-
|2019-07-26|1.4.9|接口新增与删除|1. 新增网站规则级黑白名单相关接口<br>2. 新增非网站规则级黑白名单相关接口<br>3. 新增实例 IP 黑白名单库相关接口<br>4. 新增网站规则级 CC 防护相关接口<br>5. 网站规则回源 IP 支持设置云物理服务器公网 IP(使用 describeCpsIpList 查询可知)<br>6. 删除实例级 IP 黑白名单, url 白名单及 CC 防护等相关接口|
8-
|2019-02-28|1.3.0|新增接口|1. 新增接口: 查询非网站类转发规则的防护规则(describeProtectionRuleOfForwardRule)<br>2. 新增接口: 修改非网站类转发规则的防护规则(modifyProtectionRuleOfForwardRule)<br>3. 新增接口: 查询非网站类转发规则的防护规则 Geo 拦截可设置区域编码(describeGeoAreas)|
9-
|2018-11-30|1.2.0|接口更新|1. 创建实例, 查询实例添加 ipv6 支持|
10-
|2018-08-31|1.1.0|新增接口|1. 新增 DDos 攻击日志, CC攻击日志, CC攻击详情下载接口<br>2. 新增攻击次数及流量峰值, 各类型攻击次数查询接口<br>3. 新增高防实例名称列表, 高防实例防护统计信息, CC 自定义默认阈值, 用户的京东云 IP 资源查询接口<br>4. 新增实例名称合法性检测接口, 实例弹性防护带宽更新接口<br>5. 新增告警配置查询, 告警配置更新接口<br>6. 新增证书预览信息查询接口, 证书编辑接口|
11-
|2018-06-26|1.0.1|问题修复|1. 修复 operationId 重复的问题|
12-
|2018-06-26|1.0.0|新增接口|1. 新增 CC 防护 IP 限速, 观察者模式接口<br>2. 新增 DDos 攻击日志, CC 攻击日志, CC 攻击详情查询接口<br>3. 新增 DDos 攻击流量报表, 转发流量报表, CC 流量报表查询接口|
13-
|2018-04-20|0.3.0|问题修复|1. 调整操作类型接口 path|
14-
|2018-03-31|0.2.0|新增接口|1. 新增网站规则操作接口<br>2. 新增非网站规则操作接口|
15-
|2018-01-31|0.1.0|初始版本|1. IP 高防基本操作接口|
4+
| 发布时间 | 版本号 | 更新 | 说明 |
5+
| ---------- | ------ | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
6+
| 2020-06-24 | 1.7.0 | 接口新增与更新 | 1. 新增查询实例高防IP接口 |
7+
| 2020-03-05 | 1.6.12 | 接口新增与更新 | 1. 网站规则创建与编辑不再支持上传证书, IP 高防已对接 SSL 数字证书, 新增网站规则绑定证书接口 bindCert <br>2. 网站类规则支持按地域回源, 新增接口查询网站类转发规则按地域回源配置 geoRsRoute 参数可设置的区域 |
8+
| 2019-07-26 | 1.4.9 | 接口新增与删除 | 1. 新增网站规则级黑白名单相关接口<br>2. 新增非网站规则级黑白名单相关接口<br>3. 新增实例 IP 黑白名单库相关接口<br>4. 新增网站规则级 CC 防护相关接口<br>5. 网站规则回源 IP 支持设置云物理服务器公网 IP(使用 describeCpsIpList 查询可知)<br>6. 删除实例级 IP 黑白名单, url 白名单及 CC 防护等相关接口 |
9+
| 2019-02-28 | 1.3.0 | 新增接口 | 1. 新增接口: 查询非网站类转发规则的防护规则(describeProtectionRuleOfForwardRule)<br>2. 新增接口: 修改非网站类转发规则的防护规则(modifyProtectionRuleOfForwardRule)<br>3. 新增接口: 查询非网站类转发规则的防护规则 Geo 拦截可设置区域编码(describeGeoAreas) |
10+
| 2018-11-30 | 1.2.0 | 接口更新 | 1. 创建实例, 查询实例添加 ipv6 支持 |
11+
| 2018-08-31 | 1.1.0 | 新增接口 | 1. 新增 DDos 攻击日志, CC攻击日志, CC攻击详情下载接口<br>2. 新增攻击次数及流量峰值, 各类型攻击次数查询接口<br>3. 新增高防实例名称列表, 高防实例防护统计信息, CC 自定义默认阈值, 用户的京东云 IP 资源查询接口<br>4. 新增实例名称合法性检测接口, 实例弹性防护带宽更新接口<br>5. 新增告警配置查询, 告警配置更新接口<br>6. 新增证书预览信息查询接口, 证书编辑接口 |
12+
| 2018-06-26 | 1.0.1 | 问题修复 | 1. 修复 operationId 重复的问题 |
13+
| 2018-06-26 | 1.0.0 | 新增接口 | 1. 新增 CC 防护 IP 限速, 观察者模式接口<br>2. 新增 DDos 攻击日志, CC 攻击日志, CC 攻击详情查询接口<br>3. 新增 DDos 攻击流量报表, 转发流量报表, CC 流量报表查询接口 |
14+
| 2018-04-20 | 0.3.0 | 问题修复 | 1. 调整操作类型接口 path |
15+
| 2018-03-31 | 0.2.0 | 新增接口 | 1. 新增网站规则操作接口<br>2. 新增非网站规则操作接口 |
16+
| 2018-01-31 | 0.1.0 | 初始版本 | 1. IP 高防基本操作接口 |
1617

‎jdcloud_sdk/services/ipanti/apis/CreateInstanceRequest.py‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,19 @@ def __init__(self, parameters, header=None, version="v1"):
3232

3333
class CreateInstanceParameters(object):
3434

35-
def __init__(self, regionId, createInstanceSpec):
35+
def __init__(self, regionId, createInstanceSpec, ):
3636
"""
3737
:param regionId: 区域 ID, 高防不区分区域, 传 cn-north-1 即可
3838
:param createInstanceSpec: 新购或升级实例请求参数
3939
"""
4040

4141
self.regionId = regionId
4242
self.createInstanceSpec = createInstanceSpec
43+
self.autoRenewalSpec = None
44+
45+
def setAutoRenewalSpec(self, autoRenewalSpec):
46+
"""
47+
:param autoRenewalSpec: (Optional) 自动续费配置, 默认不开通, 仅新购实例时可设置
48+
"""
49+
self.autoRenewalSpec = autoRenewalSpec
4350

‎jdcloud_sdk/services/ipanti/apis/DescribeForwardRulesRequest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def setPageSize(self, pageSize):
5959

6060
def setSearchType(self, searchType):
6161
"""
62-
:param searchType: (Optional) 查询类型名称, domain:源站域名, ip:源站 IP, port: 转发端口, originPort: 源站端口
62+
:param searchType: (Optional) 查询类型名称, domain:源站域名, ip:源站 IP, port: 转发端口, originPort: 源站端口, serviceIp: 高防IP(仅支持BGP线路的实例)
6363
"""
6464
self.searchType = searchType
6565

‎jdcloud_sdk/services/ipanti/apis/DescribeServiceIpListRequest.py‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
20+
21+
22+
class DescribeServiceIpListRequest(JDCloudRequest):
23+
"""
24+
查询实例高防 IP 列表
25+
"""
26+
27+
def __init__(self, parameters, header=None, version="v1"):
28+
super(DescribeServiceIpListRequest, self).__init__(
29+
'/regions/{regionId}/instances/{instanceId}:describeServiceIpList', 'GET', header, version)
30+
self.parameters = parameters
31+
32+
33+
class DescribeServiceIpListParameters(object):
34+
35+
def __init__(self, regionId, instanceId, ):
36+
"""
37+
:param regionId: 区域 ID, 高防不区分区域, 传 cn-north-1 即可
38+
:param instanceId: 实例 ID
39+
"""
40+
41+
self.regionId = regionId
42+
self.instanceId = instanceId
43+
self.pageNumber = None
44+
self.pageSize = None
45+
46+
def setPageNumber(self, pageNumber):
47+
"""
48+
:param pageNumber: (Optional) 页码, 默认为 1
49+
"""
50+
self.pageNumber = pageNumber
51+
52+
def setPageSize(self, pageSize):
53+
"""
54+
:param pageSize: (Optional) 分页大小, 默认为 10, 取值范围[10, 100]
55+
"""
56+
self.pageSize = pageSize
57+

‎jdcloud_sdk/services/ipanti/apis/DescribeWebRulesRequest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def setPageSize(self, pageSize):
5959

6060
def setSearchType(self, searchType):
6161
"""
62-
:param searchType: (Optional) 查询类型名称, domain:源站域名, ip:源站 IP, rawDomain: 域名
62+
:param searchType: (Optional) 查询类型名称, domain:源站域名, ip:源站 IP, rawDomain: 域名, serviceIp: 高防IP(仅支持BGP线路的实例)
6363
"""
6464
self.searchType = searchType
6565

‎jdcloud_sdk/services/ipanti/client/IpantiClient.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
2626
if config is None:
2727
config = Config('ipanti.jdcloud-api.com')
2828

29-
super(IpantiClient, self).__init__(credential, config, 'ipanti', '1.6.12', logger)
29+
super(IpantiClient, self).__init__(credential, config, 'ipanti', '1.7.0', logger)

‎jdcloud_sdk/services/ipanti/models/AlarmConfig.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
class AlarmConfig(object):
2121

22-
def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, blackHoleAlarmStatus=None, ddosAlarmEmailStatus=None, ddosAlarmSmsStatus=None, ddosAlarmStatus=None, errorCodeAlarmStatus=None, errorCodeDomain=None):
22+
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):
2323
"""
2424
:param blackHoleAlarmEmailStatus: (Optional) 黑洞告警邮件开关 0 关闭 1 开启
2525
:param blackHoleAlarmSmsStatus: (Optional) 黑洞告警短信开关 0 关闭 1 开启
@@ -29,6 +29,9 @@ def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None,
2929
:param ddosAlarmStatus: (Optional) DDos 告警总开关 0 关闭 1 开启
3030
:param errorCodeAlarmStatus: (Optional) 错误码告警总开关
3131
:param errorCodeDomain: (Optional) 错误码告警域名列表
32+
:param errorCode: (Optional) 错误码列表
33+
:param errorCodePercent: (Optional) 错误码触发告警比例
34+
:param errorCodeCount: (Optional) 错误码触发告警次数
3235
"""
3336

3437
self.blackHoleAlarmEmailStatus = blackHoleAlarmEmailStatus
@@ -39,3 +42,6 @@ def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None,
3942
self.ddosAlarmStatus = ddosAlarmStatus
4043
self.errorCodeAlarmStatus = errorCodeAlarmStatus
4144
self.errorCodeDomain = errorCodeDomain
45+
self.errorCode = errorCode
46+
self.errorCodePercent = errorCodePercent
47+
self.errorCodeCount = errorCodeCount

‎jdcloud_sdk/services/ipanti/models/AlarmConfigSpec.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
class AlarmConfigSpec(object):
2121

22-
def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None, blackHoleAlarmStatus=None, ddosAlarmEmailStatus=None, ddosAlarmSmsStatus=None, ddosAlarmStatus=None, errorCodeAlarmStatus=None, errorCodeDomain=None):
22+
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):
2323
"""
2424
:param blackHoleAlarmEmailStatus: (Optional) 黑洞告警邮件开关 0 关闭 1 开启
2525
:param blackHoleAlarmSmsStatus: (Optional) 黑洞告警短信开关 0 关闭 1 开启
@@ -29,6 +29,9 @@ def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None,
2929
:param ddosAlarmStatus: (Optional) DDos 告警总开关 0 关闭 1 开启
3030
:param errorCodeAlarmStatus: (Optional) 错误码告警总开关
3131
:param errorCodeDomain: (Optional) 错误码告警域名列表
32+
:param errorCode: (Optional) 错误码列表
33+
:param errorCodePercent: (Optional) 错误码触发告警比例
34+
:param errorCodeCount: (Optional) 错误码触发告警次数
3235
"""
3336

3437
self.blackHoleAlarmEmailStatus = blackHoleAlarmEmailStatus
@@ -39,3 +42,6 @@ def __init__(self, blackHoleAlarmEmailStatus=None, blackHoleAlarmSmsStatus=None,
3942
self.ddosAlarmStatus = ddosAlarmStatus
4043
self.errorCodeAlarmStatus = errorCodeAlarmStatus
4144
self.errorCodeDomain = errorCodeDomain
45+
self.errorCode = errorCode
46+
self.errorCodePercent = errorCodePercent
47+
self.errorCodeCount = errorCodeCount

‎jdcloud_sdk/services/ipanti/models/AutoRenewalSpec.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# coding=utf8
2+
3+
# Copyright 2018 JDCLOUD.COM
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
# NOTE: This class is auto generated by the jdcloud code generator program.
18+
19+
20+
class AutoRenewalSpec(object):
21+
22+
def __init__(self, autoRenewalEnable, timeSpan=None, timeUnit=None):
23+
"""
24+
:param autoRenewalEnable: 是否开通自动续费, true: 开通自动续费, false: 不开通自动续费
25+
:param timeSpan: (Optional) 购买时长, 开通自动续费时必传. <br>- timeUnit 为 3 时, 可取值 1-9<br>- timeUnit 为 4 时, 可取值 1-3
26+
:param timeUnit: (Optional) 自动续费时长类型, 开通自动续费时必传. <br>- 3: 月<br>- 4: 年
27+
"""
28+
29+
self.autoRenewalEnable = autoRenewalEnable
30+
self.timeSpan = timeSpan
31+
self.timeUnit = timeUnit

‎jdcloud_sdk/services/ipanti/models/CCProtectionRule.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
class CCProtectionRule(object):
2121

22-
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):
22+
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):
2323
"""
2424
:param id: (Optional) CC 防护规则 ID
2525
:param webRuleId: (Optional) CC 防护规则对应的网站规则 ID
@@ -32,6 +32,8 @@ def __init__(self, id=None, webRuleId=None, instanceId=None, name=None, enable=N
3232
:param singleIpLimit: (Optional) ip 访问次数, 取值范围[2, 2000]
3333
:param blockType: (Optional) 阻断类型, 1: 封禁, 2: 人机交互
3434
:param blockTime: (Optional) 阻断持续时间, 单位为秒, 取值范围[10, 86400]
35+
:param pageId: (Optional) 关联的自定义页面id
36+
:param pageName: (Optional) 关联的自定义页面名称
3537
"""
3638

3739
self.id = id
@@ -45,3 +47,5 @@ def __init__(self, id=None, webRuleId=None, instanceId=None, name=None, enable=N
4547
self.singleIpLimit = singleIpLimit
4648
self.blockType = blockType
4749
self.blockTime = blockTime
50+
self.pageId = pageId
51+
self.pageName = pageName

0 commit comments

Comments
 (0)