Skip to content

Commit d85d85e

Browse files
committed
publish jdcloud-sdk-python 1.6.83
1 parent 03e8c43 commit d85d85e

22 files changed

Lines changed: 439 additions & 18 deletions

jdcloud_sdk/services/jmr/ChangeLog.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# 更新历史 #
2-
API版本:1.1.5
2+
API版本:1.1.6
33

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

jdcloud_sdk/services/jmr/apis/ClusterExpansionRequest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ClusterExpansionParameters(object):
3535
def __init__(self, regionId, clusterExpansion, ):
3636
"""
3737
:param regionId: 地域ID
38-
:param clusterExpansion: 描述集群配置
38+
:param clusterExpansion: 描述集群扩容信息
3939
"""
4040

4141
self.regionId = regionId
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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 ClusterReductionRequest(JDCloudRequest):
23+
"""
24+
缩容集群
25+
"""
26+
27+
def __init__(self, parameters, header=None, version="v1"):
28+
super(ClusterReductionRequest, self).__init__(
29+
'/regions/{regionId}/cluster:reduction', 'POST', header, version)
30+
self.parameters = parameters
31+
32+
33+
class ClusterReductionParameters(object):
34+
35+
def __init__(self, regionId, clusterReduction, ):
36+
"""
37+
:param regionId: 地域ID
38+
:param clusterReduction: 描述集群缩容信息
39+
"""
40+
41+
self.regionId = regionId
42+
self.clusterReduction = clusterReduction
43+
self.clientToken = None
44+
45+
def setClientToken(self, clientToken):
46+
"""
47+
:param clientToken: (Optional) 用于保证请求的幂等性。由客户端生成,长度不能超过64个字符。
48+
49+
"""
50+
self.clientToken = clientToken
51+

jdcloud_sdk/services/jmr/apis/GetSoftwareInfoRequest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ class GetSoftwareInfoRequest(JDCloudRequest):
2626

2727
def __init__(self, parameters, header=None, version="v1"):
2828
super(GetSoftwareInfoRequest, self).__init__(
29-
'/regions/{regionId}/softwareInfo', 'POST', header, version)
29+
'/regions/{regionId}/softwareInfo', 'GET', header, version)
3030
self.parameters = parameters
3131

3232

3333
class GetSoftwareInfoParameters(object):
3434

35-
def __init__(self, regionId, ver, ):
35+
def __init__(self, regionId, version):
3636
"""
3737
:param regionId: 地域ID
38-
:param ver: JMR软件版本号
38+
:param version: JMR软件版本号
3939
"""
4040

4141
self.regionId = regionId
42-
self.ver = ver
42+
self.version = version
4343

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
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 MonitorLabelListRequest(JDCloudRequest):
23+
"""
24+
查询JMR的监控模板信息
25+
"""
26+
27+
def __init__(self, parameters, header=None, version="v1"):
28+
super(MonitorLabelListRequest, self).__init__(
29+
'/regions/{regionId}/monitorLabelList/{clusterId}', 'POST', header, version)
30+
self.parameters = parameters
31+
32+
33+
class MonitorLabelListParameters(object):
34+
35+
def __init__(self, regionId, clusterId, ):
36+
"""
37+
:param regionId: 地域ID
38+
:param clusterId: 集群ID
39+
"""
40+
41+
self.regionId = regionId
42+
self.clusterId = clusterId
43+

jdcloud_sdk/services/jmr/client/JmrClient.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('jmr.jdcloud-api.com')
2828

29-
super(JmrClient, self).__init__(credential, config, 'jmr', '1.1.5', logger)
29+
super(JmrClient, self).__init__(credential, config, 'jmr', '1.1.6', logger)
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 ClusterReduction(object):
21+
22+
def __init__(self, clusterId, reserveNum=None, nodeType=None):
23+
"""
24+
:param clusterId: 集群ID
25+
:param reserveNum: (Optional) 保留的节点个数
26+
:param nodeType: (Optional) 缩容节点类型。 仅支持 Task ,即计算节点
27+
"""
28+
29+
self.clusterId = clusterId
30+
self.reserveNum = reserveNum
31+
self.nodeType = nodeType
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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 MonitorLabelDetail(object):
21+
22+
def __init__(self, label=None, serviceCode=None, resourceId=None, filters=None, nodes=None):
23+
"""
24+
:param label: (Optional) 监控显示名称
25+
:param serviceCode: (Optional) 监控项目代码
26+
:param resourceId: (Optional) 监控项目资源代码
27+
:param filters: (Optional) 过滤条件的值
28+
:param nodes: (Optional) 监控项目子节点信息
29+
"""
30+
31+
self.label = label
32+
self.serviceCode = serviceCode
33+
self.resourceId = resourceId
34+
self.filters = filters
35+
self.nodes = nodes
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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 MonitorLabelNodeDetail(object):
21+
22+
def __init__(self, label=None, serviceCode=None, resourceId=None, filters=None):
23+
"""
24+
:param label: (Optional) 监控显示名称
25+
:param serviceCode: (Optional) 监控项目代码
26+
:param resourceId: (Optional) 监控项目资源代码
27+
:param filters: (Optional) 过滤条件的值
28+
"""
29+
30+
self.label = label
31+
self.serviceCode = serviceCode
32+
self.resourceId = resourceId
33+
self.filters = filters

jdcloud_sdk/services/live/ChangeLog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# 更新历史 #
2-
API 版本:1.0.17
2+
API 版本:1.0.18
33

44
|发布时间|版本号|更新|说明|
55
|------------|-------|------|-------|
6+
|2020-10-12|1.0.18| 添加接口| 添加oss录制文件删除接口|
67
|2020-02-23|1.0.17| 接口更新| 查询流分组统计数据接口更新查询条件为非必填|
78
|2020-01-14|1.0.16| 添加接口| 添加直播账单管理相关接口|
89
|2019-11-13|1.0.15| 添加接口| 添加P2P管理相关接口|

0 commit comments

Comments
 (0)