Merge pull request #110 from Tanc009/master

publish jdcloud-sdk-python 1.6.75

Author: Tanc009

jdcloud_sdk/services/cdn/ChangeLog.md

@@ -1,11 +1,13 @@
 # 更新历史 #
-API版本：0.10.20
+API版本：0.10.22
 
 
 
 
 | 发布时间   | 版本号 | 更新                                                       | 说明 |
 | ---------- | ------ | ---------------------------------------------------------- | ---- |
+| 2020-08-25  | 0.10.22  |点播域名创建支持指定模板 |
+| 2020-08-14  | 0.10.21  |增加头条回源鉴权参数配置和dash鉴权参数配置接口|
 | 2020-08-06  | 0.10.20  |增加查询用户相关信息接口|
 | 2020-07-24  | 0.10.19  |海外配置增加修改加速区域接口，刷新预热任务增加是否包含海外或全球域名字段 |
 | 2020-07-22  | 0.10.18  |修改ssl证书详情返回字段，修改查询证书列表说明信息 |

jdcloud_sdk/services/cdn/apis/BatchCreateRequest.py

@@ -52,6 +52,7 @@ def __init__(self, ):
         self.domainSource = None
         self.ossSource = None
         self.accelerateRegion = None
+        self.tempInstId = None
 
     def setDomains(self, domains):
         """
@@ -149,3 +150,9 @@ def setAccelerateRegion(self, accelerateRegion):
         """
         self.accelerateRegion = accelerateRegion
 
+    def setTempInstId(self, tempInstId):
+        """
+        :param tempInstId: (Optional) 
+        """
+        self.tempInstId = tempInstId
+

jdcloud_sdk/services/cdn/apis/CreateDomainRequest.py

@@ -53,6 +53,7 @@ def __init__(self, domain, ):
         self.domainSource = None
         self.ossSource = None
         self.accelerateRegion = None
+        self.tempInstId = None
 
     def setSourceType(self, sourceType):
         """
@@ -144,3 +145,9 @@ def setAccelerateRegion(self, accelerateRegion):
         """
         self.accelerateRegion = accelerateRegion
 
+    def setTempInstId(self, tempInstId):
+        """
+        :param tempInstId: (Optional) 
+        """
+        self.tempInstId = tempInstId
+

jdcloud_sdk/services/cdn/apis/QueryJDBoxStatisticsDataRequest.py

@@ -42,25 +42,25 @@ def __init__(self, ):
         self.area = None
         self.isp = None
         self.period = None
-        self.groupBy = None
         self.category = None
         self.macAddr = None
+        self.pluginPin = None
 
     def setStartTime(self, startTime):
         """
-        :param startTime: (Optional) 查询起始时间,UTC时间，格式为:yyyy-MM-dd'T'HH:mm:ss'Z'，示例:2018-10-21T10:00:00Z
+        :param startTime: (Optional) 查询起始时间,时间戳
         """
         self.startTime = startTime
 
     def setEndTime(self, endTime):
         """
-        :param endTime: (Optional) 查询截止时间,UTC时间，格式为:yyyy-MM-dd'T'HH:mm:ss'Z'，示例:2018-10-21T10:00:00Z
+        :param endTime: (Optional) 查询截止时间,时间戳
         """
         self.endTime = endTime
 
     def setFields(self, fields):
         """
-        :param fields: (Optional) 查询的字段，决定了查询结果中出现哪些字段，取值范围见"统计字段说明"。多个用逗号分隔。默认为空，表示查询带宽流量 pv
+        :param fields: (Optional) 查询的字段，取值范围(avgbandwidth,pv,flow)。多个用逗号分隔。默认为空，表示查询带宽流量
         """
         self.fields = fields
 
@@ -78,16 +78,10 @@ def setIsp(self, isp):
 
     def setPeriod(self, period):
         """
-        :param period: (Optional) 查询周期，当前取值范围：“oneMin,fiveMin,halfHour,hour,twoHour,sixHour,day,followTime”，分别表示1min，5min，半小时，1小时，2小时，6小时，1天，跟随时间。默认为空，表示fiveMin。当传入followTime时，表示按Endtime-StartTime的周期，只返回一个点
+        :param period: (Optional) 查询周期，当前取值范围：“oneMin,fiveMin”，分别表示1min，5min。默认为空，表示fiveMin
         """
         self.period = period
 
-    def setGroupBy(self, groupBy):
-        """
-        :param groupBy: (Optional) 取值范围[area,isp,mac_addr,category]  按区域、运营商、设备、业务类型分组，默认为isp
-        """
-        self.groupBy = groupBy
-
     def setCategory(self, category):
         """
         :param category: (Optional) 业务类型
@@ -100,3 +94,9 @@ def setMacAddr(self, macAddr):
         """
         self.macAddr = macAddr
 
+    def setPluginPin(self, pluginPin):
+        """
+        :param pluginPin: (Optional) 插件pin
+        """
+        self.pluginPin = pluginPin
+

jdcloud_sdk/services/cdn/apis/SetAuthConfigRequest.py

@@ -0,0 +1,90 @@
+# 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 SetAuthConfigRequest(JDCloudRequest):
+    """
+    dash鉴权设置
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(SetAuthConfigRequest, self).__init__(
+            '/domain/{domain}/setAuthConfig', 'POST', header, version)
+        self.parameters = parameters
+
+
+class SetAuthConfigParameters(object):
+
+    def __init__(self, domain, ):
+        """
+        :param domain: 用户域名
+        """
+
+        self.domain = domain
+        self.enableUrlAuth = None
+        self.authKey = None
+        self.age = None
+        self.encAlgorithm = None
+        self.timeFormat = None
+        self.uriType = None
+        self.rule = None
+
+    def setEnableUrlAuth(self, enableUrlAuth):
+        """
+        :param enableUrlAuth: (Optional) 是否开启鉴权[on,off]
+        """
+        self.enableUrlAuth = enableUrlAuth
+
+    def setAuthKey(self, authKey):
+        """
+        :param authKey: (Optional) 鉴权key
+        """
+        self.authKey = authKey
+
+    def setAge(self, age):
+        """
+        :param age: (Optional) 鉴权时间戳过期时间，默认为0
+        """
+        self.age = age
+
+    def setEncAlgorithm(self, encAlgorithm):
+        """
+        :param encAlgorithm: (Optional) 鉴权参数加密算法，默认为md5且只支持md5
+        """
+        self.encAlgorithm = encAlgorithm
+
+    def setTimeFormat(self, timeFormat):
+        """
+        :param timeFormat: (Optional) 时间戳格式[hex,dec]
+        """
+        self.timeFormat = timeFormat
+
+    def setUriType(self, uriType):
+        """
+        :param uriType: (Optional) 加密算法版本[dash,dashv2,video],默认dashv2
+        """
+        self.uriType = uriType
+
+    def setRule(self, rule):
+        """
+        :param rule: (Optional) 鉴权key生成顺序
+        """
+        self.rule = rule
+

jdcloud_sdk/services/cdn/apis/SetSourceAuthConfigRequest.py

@@ -0,0 +1,76 @@
+# 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 SetSourceAuthConfigRequest(JDCloudRequest):
+    """
+    回源鉴权设置
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(SetSourceAuthConfigRequest, self).__init__(
+            '/domain/{domain}/setSourceAuthConfig', 'POST', header, version)
+        self.parameters = parameters
+
+
+class SetSourceAuthConfigParameters(object):
+
+    def __init__(self, domain, ):
+        """
+        :param domain: 用户域名
+        """
+
+        self.domain = domain
+        self.enable = None
+        self.originRole = None
+        self.authType = None
+        self.tosAuthInfo = None
+        self.ossAuthInfo = None
+
+    def setEnable(self, enable):
+        """
+        :param enable: (Optional) 是否开启鉴权[on,off]
+        """
+        self.enable = enable
+
+    def setOriginRole(self, originRole):
+        """
+        :param originRole: (Optional) 回源为主/备[master,slave]
+        """
+        self.originRole = originRole
+
+    def setAuthType(self, authType):
+        """
+        :param authType: (Optional) 鉴权类型[oss,aws,tos],aws暂不支持
+        """
+        self.authType = authType
+
+    def setTosAuthInfo(self, tosAuthInfo):
+        """
+        :param tosAuthInfo: (Optional) tos类型鉴权参数,authType为tos是不能为空
+        """
+        self.tosAuthInfo = tosAuthInfo
+
+    def setOssAuthInfo(self, ossAuthInfo):
+        """
+        :param ossAuthInfo: (Optional) oss类型鉴权参数,authType为oss是不能为空
+        """
+        self.ossAuthInfo = ossAuthInfo
+

jdcloud_sdk/services/cdn/client/CdnClient.py

@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
         if config is None:
             config = Config('cdn.jdcloud-api.com')
 
-        super(CdnClient, self).__init__(credential, config, 'cdn', '0.10.20', logger)
+        super(CdnClient, self).__init__(credential, config, 'cdn', '0.10.22', logger)

jdcloud_sdk/services/cdn/models/HdrCtrl.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 HdrCtrl(object):
+
+    def __init__(self, name=None, value=None):
+        """
+        :param name: (Optional) 名称
+        :param value: (Optional) 值
+        """
+
+        self.name = name
+        self.value = value

jdcloud_sdk/services/cdn/models/OSSAuthInfo.py

@@ -0,0 +1,33 @@
+# 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 OSSAuthInfo(object):
+
+    def __init__(self, accessKey=None, secretKey=None, bucketName=None, objectName=None):
+        """
+        :param accessKey: (Optional) 密钥
+        :param secretKey: (Optional) 密钥的加密密钥
+        :param bucketName: (Optional) 默认为/tt-video
+        :param objectName: (Optional) 
+        """
+
+        self.accessKey = accessKey
+        self.secretKey = secretKey
+        self.bucketName = bucketName
+        self.objectName = objectName

jdcloud_sdk/services/cdn/models/TOSAuthInfo.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 TOSAuthInfo(object):
+
+    def __init__(self, accessKey=None, secretKey=None, authVersion=None, authHeaders=None, expireTime=None):
+        """
+        :param accessKey: (Optional) 密钥
+        :param secretKey: (Optional) 密钥的加密密钥
+        :param authVersion: (Optional) 版本[v1,v2]
+        :param authHeaders: (Optional) 
+        :param expireTime: (Optional) 单位s，默认 900
+        """
+
+        self.accessKey = accessKey
+        self.secretKey = secretKey
+        self.authVersion = authVersion
+        self.authHeaders = authHeaders
+        self.expireTime = expireTime