Merge pull request #118 from Tanc009/master

publish jdcloud-sdk-python 1.6.83

Author: Tanc009

jdcloud_sdk/services/jmr/ChangeLog.md

@@ -1,8 +1,11 @@
 # 更新历史 #
-API版本：1.1.5
+API版本：1.1.6
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|2020-11-30|1.1.6|修改|* 修改版本号为1.1.6。|
+|2020-11-26|1.1.5|修改|* 修改softwareInfo和monitorLabelList接口。|
+|2020-11-24|1.1.5|修改|* 增加描述文件，增加clusterReduction的缩容集群接口。增加云监控监控标签列表monitorLabelList接口。|
 |2020-10-16|1.1.5|修改|* 增加描述文件，list和clusterDetail返回的数据和前端一致，保证IAM主子账号可以工作。|
 |2020-10-13|1.1.5|修改|* 增加create接口的3个参数，兼容jmr agent版本。|
 |2020-09-27|1.1.4|修改|* 增加describeClusters接口；去掉create的无用参数；增加cluster detail的详细节点信息。|

jdcloud_sdk/services/jmr/apis/ClusterExpansionRequest.py

@@ -35,7 +35,7 @@ class ClusterExpansionParameters(object):
     def __init__(self, regionId, clusterExpansion, ):
         """
         :param regionId: 地域ID
-        :param clusterExpansion: 描述集群配置
+        :param clusterExpansion: 描述集群扩容信息
         """
 
         self.regionId = regionId

…/DescribeDisasterSyncAttributeRequest.py …ices/jmr/apis/ClusterReductionRequest.pyjdcloud_sdk/services/rds/apis/DescribeDisasterSyncAttributeRequest.py renamed to jdcloud_sdk/services/jmr/apis/ClusterReductionRequest.py jdcloud_sdk/services/rds/apis/DescribeDisasterSyncAttributeRequest.py renamed to jdcloud_sdk/services/jmr/apis/ClusterReductionRequest.py

@@ -19,25 +19,33 @@
 from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
 
 
-class DescribeDisasterSyncAttributeRequest(JDCloudRequest):
+class ClusterReductionRequest(JDCloudRequest):
     """
-    查询MySQL实例的数据同步任务详情。<br>- 仅支持MySQL
+    缩容集群
     """
 
     def __init__(self, parameters, header=None, version="v1"):
-        super(DescribeDisasterSyncAttributeRequest, self).__init__(
-            '/regions/{regionId}/instances/{instanceId}/disasterInstance:describeDisasterSyncAttribute', 'GET', header, version)
+        super(ClusterReductionRequest, self).__init__(
+            '/regions/{regionId}/cluster:reduction', 'POST', header, version)
         self.parameters = parameters
 
 
-class DescribeDisasterSyncAttributeParameters(object):
+class ClusterReductionParameters(object):
 
-    def __init__(self, regionId, instanceId, ):
+    def __init__(self, regionId, clusterReduction, ):
         """
-        :param regionId: 地域代码，取值范围参见[《各地域及可用区对照表》](../Enum-Definitions/Regions-AZ.md)
-        :param instanceId: RDS 实例ID，唯一标识一个RDS实例
+        :param regionId: 地域ID
+        :param clusterReduction: 描述集群缩容信息
         """
 
         self.regionId = regionId
-        self.instanceId = instanceId
+        self.clusterReduction = clusterReduction
+        self.clientToken = None
+
+    def setClientToken(self, clientToken):
+        """
+        :param clientToken: (Optional) 用于保证请求的幂等性。由客户端生成，长度不能超过64个字符。
+
+        """
+        self.clientToken = clientToken
 

jdcloud_sdk/services/jmr/apis/GetSoftwareInfoRequest.py

@@ -26,18 +26,18 @@ class GetSoftwareInfoRequest(JDCloudRequest):
 
     def __init__(self, parameters, header=None, version="v1"):
         super(GetSoftwareInfoRequest, self).__init__(
-            '/regions/{regionId}/softwareInfo', 'POST', header, version)
+            '/regions/{regionId}/softwareInfo', 'GET', header, version)
         self.parameters = parameters
 
 
 class GetSoftwareInfoParameters(object):
 
-    def __init__(self, regionId, ver, ):
+    def __init__(self, regionId, version):
         """
         :param regionId: 地域ID
-        :param ver: JMR软件版本号
+        :param version: JMR软件版本号
         """
 
         self.regionId = regionId
-        self.ver = ver
+        self.version = version
 

…ervices/rds/apis/DetachNetworkRequest.py …ices/jmr/apis/MonitorLabelListRequest.pyjdcloud_sdk/services/rds/apis/DetachNetworkRequest.py renamed to jdcloud_sdk/services/jmr/apis/MonitorLabelListRequest.py jdcloud_sdk/services/rds/apis/DetachNetworkRequest.py renamed to jdcloud_sdk/services/jmr/apis/MonitorLabelListRequest.py

@@ -19,25 +19,25 @@
 from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
 
 
-class DetachNetworkRequest(JDCloudRequest):
+class MonitorLabelListRequest(JDCloudRequest):
     """
-    当 RDS 实例欠费或者到期了，关闭RDS实例的网络访问功能。关闭后，用户无法通过域名访问RDS
+    查询JMR的监控模板信息
     """
 
     def __init__(self, parameters, header=None, version="v1"):
-        super(DetachNetworkRequest, self).__init__(
-            '/regions/{regionId}/instances/{instanceId}:detachNetwork', 'POST', header, version)
+        super(MonitorLabelListRequest, self).__init__(
+            '/regions/{regionId}/monitorLabelList/{clusterId}', 'POST', header, version)
         self.parameters = parameters
 
 
-class DetachNetworkParameters(object):
+class MonitorLabelListParameters(object):
 
-    def __init__(self, regionId, instanceId, ):
+    def __init__(self, regionId, clusterId, ):
         """
-        :param regionId: 地域代码，取值范围参见[《各地域及可用区对照表》](../Enum-Definitions/Regions-AZ.md)
-        :param instanceId: RDS 实例ID，唯一标识一个RDS实例
+        :param regionId: 地域ID
+        :param clusterId: 集群ID
         """
 
         self.regionId = regionId
-        self.instanceId = instanceId
+        self.clusterId = clusterId
 

jdcloud_sdk/services/jmr/client/JmrClient.py

@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
         if config is None:
             config = Config('jmr.jdcloud-api.com')
 
-        super(JmrClient, self).__init__(credential, config, 'jmr', '1.1.5', logger)
+        super(JmrClient, self).__init__(credential, config, 'jmr', '1.1.6', logger)

jdcloud_sdk/services/jmr/models/ClusterReduction.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 ClusterReduction(object):
+
+    def __init__(self, clusterId, reserveNum=None, nodeType=None):
+        """
+        :param clusterId:  集群ID
+        :param reserveNum: (Optional) 保留的节点个数
+        :param nodeType: (Optional) 缩容节点类型。 仅支持 Task ，即计算节点
+        """
+
+        self.clusterId = clusterId
+        self.reserveNum = reserveNum
+        self.nodeType = nodeType

jdcloud_sdk/services/jmr/models/MonitorLabelDetail.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 MonitorLabelDetail(object):
+
+    def __init__(self, label=None, serviceCode=None, resourceId=None, filters=None, nodes=None):
+        """
+        :param label: (Optional) 监控显示名称
+        :param serviceCode: (Optional) 监控项目代码
+        :param resourceId: (Optional) 监控项目资源代码
+        :param filters: (Optional) 过滤条件的值
+        :param nodes: (Optional) 监控项目子节点信息
+        """
+
+        self.label = label
+        self.serviceCode = serviceCode
+        self.resourceId = resourceId
+        self.filters = filters
+        self.nodes = nodes

jdcloud_sdk/services/jmr/models/MonitorLabelNodeDetail.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 MonitorLabelNodeDetail(object):
+
+    def __init__(self, label=None, serviceCode=None, resourceId=None, filters=None):
+        """
+        :param label: (Optional) 监控显示名称
+        :param serviceCode: (Optional) 监控项目代码
+        :param resourceId: (Optional) 监控项目资源代码
+        :param filters: (Optional) 过滤条件的值
+        """
+
+        self.label = label
+        self.serviceCode = serviceCode
+        self.resourceId = resourceId
+        self.filters = filters

jdcloud_sdk/services/live/ChangeLog.md

@@ -1,8 +1,9 @@
 # 更新历史 #
-API 版本：1.0.17
+API 版本：1.0.18
 
 |发布时间|版本号|更新|说明|
 |------------|-------|------|-------|
+|2020-10-12|1.0.18| 添加接口| 添加oss录制文件删除接口|
 |2020-02-23|1.0.17| 接口更新| 查询流分组统计数据接口更新查询条件为非必填|
 |2020-01-14|1.0.16| 添加接口| 添加直播账单管理相关接口|
 |2019-11-13|1.0.15| 添加接口| 添加P2P管理相关接口|