Skip to content

Commit a57a608

Browse files
Tanc009Tanc009
authored
Merge pull request #114 from Tanc009/master
publish jdcloud-sdk-python 1.6.79
2 parents d640aef + a20a507 commit a57a608

10 files changed

Lines changed: 116 additions & 77 deletions

File tree

‎jdcloud_sdk/services/jmr/ChangeLog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ API版本：1.1.3
33

44
|发布时间|版本号|更新|说明|
55
|---|---|---|---|
6+
|2020-09-27|1.1.4|修改|* 增加describeClusters接口；去掉create的无用参数；增加cluster detail的详细节点信息。|
67
|2020-09-21|1.1.3|修改|* 标准化接口的url、参数及返回值的格式，并只提供JMR集群查询接口|
78
|2018-10-24|1.1.2|修改|* 标准化接口的url、参数及返回值的格式，并只提供JMR集群创建、释放和查询接口|
89
|2018-08-16|1.1.1|国际化文档|* 国际化预备工作，添加参数注释<br> * 修改返回数据参数较少情况统一类型为"object" <br>* 添加请求参数的描述并提示哪些为必传字段|

‎jdcloud_sdk/services/jmr/apis/ClusterExpansionRequest.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ def __init__(self, parameters, header=None, version="v1"):
3232

3333
class ClusterExpansionParameters(object):
3434

35-
def __init__(self, regionId, clusterSpec, ):
35+
def __init__(self, regionId, clusterExpansion, ):
3636
"""
3737
:param regionId: 地域ID
38-
:param clusterSpec: 描述集群配置
38+
:param clusterExpansion: 描述集群配置
3939
"""
4040

4141
self.regionId = regionId
42-
self.clusterSpec = clusterSpec
42+
self.clusterExpansion = clusterExpansion
4343
self.clientToken = None
4444

4545
def setClientToken(self, clientToken):

‎jdcloud_sdk/services/jmr/apis/DescribeClustersRequest.py‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121

2222
class DescribeClustersRequest(JDCloudRequest):
2323
"""
24-
查询集群列表
24+
查询用户集群的列表
25+
2526
"""
2627

2728
def __init__(self, parameters, header=None, version="v1"):
2829
super(DescribeClustersRequest, self).__init__(
29-
'/regions/{regionId}/cluster:create', 'GET', header, version)
30+
'/regions/{regionId}/clusters', 'GET', header, version)
3031
self.parameters = parameters
3132

3233

@@ -38,18 +39,46 @@ def __init__(self, regionId, ):
3839
"""
3940

4041
self.regionId = regionId
41-
self.pageNumber = None
42+
self.dataCenter = None
43+
self.status = None
44+
self.clusterName = None
45+
self.orderBy = None
46+
self.pageNum = None
4247
self.pageSize = None
4348

44-
def setPageNumber(self, pageNumber):
49+
def setDataCenter(self, dataCenter):
50+
"""
51+
:param dataCenter: (Optional) 地域
52+
"""
53+
self.dataCenter = dataCenter
54+
55+
def setStatus(self, status):
56+
"""
57+
:param status: (Optional) 集群状态，CREATING，RUNNING，RELEASED，FAILED等
58+
"""
59+
self.status = status
60+
61+
def setClusterName(self, clusterName):
62+
"""
63+
:param clusterName: (Optional) 集群名称
64+
"""
65+
self.clusterName = clusterName
66+
67+
def setOrderBy(self, orderBy):
68+
"""
69+
:param orderBy: (Optional) 排序，比如 id desc
70+
"""
71+
self.orderBy = orderBy
72+
73+
def setPageNum(self, pageNum):
4574
"""
46-
:param pageNumber: (Optional) 页码；默认为1
75+
:param pageNum: (Optional) 页数，默认为1
4776
"""
48-
self.pageNumber = pageNumber
77+
self.pageNum = pageNum
4978

5079
def setPageSize(self, pageSize):
5180
"""
52-
:param pageSize: (Optional) 分页大小；默认为10；取值范围[10, 100]
81+
:param pageSize: (Optional) 每页数目，默认为10
5382
"""
5483
self.pageSize = pageSize
5584

‎jdcloud_sdk/services/jmr/apis/IdataClusterRequest.py‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
class IdataClusterRequest(JDCloudRequest):
2323
"""
24-
查询用户指定clusterId对应的集群列表及相关服务的一些信息
24+
查询用户的集群列表及相关服务的一些信息
2525
"""
2626

2727
def __init__(self, parameters, header=None, version="v1"):
@@ -32,12 +32,17 @@ def __init__(self, parameters, header=None, version="v1"):
3232

3333
class IdataClusterParameters(object):
3434

35-
def __init__(self, regionId, clusterId, ):
35+
def __init__(self, regionId, , ):
3636
"""
3737
:param regionId: 地域ID
38-
:param clusterId: 集群ID
3938
"""
4039

4140
self.regionId = regionId
42-
self.clusterId = clusterId
41+
self.dataCenter = None
42+
43+
def setDataCenter(self, dataCenter):
44+
"""
45+
:param dataCenter: (Optional) 地域信息
46+
"""
47+
self.dataCenter = dataCenter
4348

‎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.3', logger)
29+
super(JmrClient, self).__init__(credential, config, 'jmr', '1.1.4', logger)

‎jdcloud_sdk/services/jmr/models/Cluster.py‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,39 @@
1919

2020
class Cluster(object):
2121

22-
def __init__(self, clusterId=None, clusterName=None, clusterCreateTime=None, clusterHa=None, clusterStatus=None, clusterVersion=None, clusterService=None, clusterRegion=None, clusterAz=None, clusterPrice=None, clusterPaymentType=None, clusterOss=None, clusterVpc=None, clusterVpcSubnet=None, clusterBandwidth=None, clusterNodes=None):
22+
def __init__(self, id=None, name=None, region=None, vpcName=None, vpcSubnetName=None, status=None, version=None, software=None, createTime=None, haFlag=None, ossFlag=None, payPrice=None, payType=None, duration=None, nodeCount=None, clusterNodes=None):
2323
"""
24-
:param clusterId: (Optional) 集群ID
25-
:param clusterName: (Optional) 集群名称
26-
:param clusterCreateTime: (Optional) 集群创建时间
27-
:param clusterHa: (Optional) 集群是否为高可用
28-
:param clusterStatus: (Optional) 集群状态
29-
:param clusterVersion: (Optional) 集群版本
30-
:param clusterService: (Optional) 集群服务
31-
:param clusterRegion: (Optional) 集群所属地域
32-
:param clusterAz: (Optional) 集群所属可用区
33-
:param clusterPrice: (Optional) 集群费用
34-
:param clusterPaymentType: (Optional) 集群计费类型
35-
:param clusterOss: (Optional) 集群是否关联对象存储
36-
:param clusterVpc: (Optional) 集群私有网络名称
37-
:param clusterVpcSubnet: (Optional) 集群子网名称
38-
:param clusterBandwidth: (Optional) 集群公网网络带宽
24+
:param id: (Optional) 集群ID
25+
:param name: (Optional) 集群名称
26+
:param region: (Optional) 集群所属地域
27+
:param vpcName: (Optional) VPC名称
28+
:param vpcSubnetName: (Optional) 集群子网名称
29+
:param status: (Optional) 集群状态
30+
:param version: (Optional) 集群版本
31+
:param software: (Optional) 集群服务
32+
:param createTime: (Optional) 集群创建时间
33+
:param haFlag: (Optional) 集群所属可用区
34+
:param ossFlag: (Optional) 集群是否使用OSS
35+
:param payPrice: (Optional) 集群费用
36+
:param payType: (Optional) 集群收费类型
37+
:param duration: (Optional) 集群运行时间
38+
:param nodeCount: (Optional) 集群节点个数
3939
:param clusterNodes: (Optional) 集群节点信息
4040
"""
4141

42-
self.clusterId = clusterId
43-
self.clusterName = clusterName
44-
self.clusterCreateTime = clusterCreateTime
45-
self.clusterHa = clusterHa
46-
self.clusterStatus = clusterStatus
47-
self.clusterVersion = clusterVersion
48-
self.clusterService = clusterService
49-
self.clusterRegion = clusterRegion
50-
self.clusterAz = clusterAz
51-
self.clusterPrice = clusterPrice
52-
self.clusterPaymentType = clusterPaymentType
53-
self.clusterOss = clusterOss
54-
self.clusterVpc = clusterVpc
55-
self.clusterVpcSubnet = clusterVpcSubnet
56-
self.clusterBandwidth = clusterBandwidth
42+
self.id = id
43+
self.name = name
44+
self.region = region
45+
self.vpcName = vpcName
46+
self.vpcSubnetName = vpcSubnetName
47+
self.status = status
48+
self.version = version
49+
self.software = software
50+
self.createTime = createTime
51+
self.haFlag = haFlag
52+
self.ossFlag = ossFlag
53+
self.payPrice = payPrice
54+
self.payType = payType
55+
self.duration = duration
56+
self.nodeCount = nodeCount
5757
self.clusterNodes = clusterNodes

‎jdcloud_sdk/services/jmr/models/ClusterExpansion.py‎

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

2020
class ClusterExpansion(object):
2121

22-
def __init__(self, clusterId, expansionNum, ):
22+
def __init__(self, clusterId, expansionNum, nodeType=None):
2323
"""
2424
:param clusterId: 集群ID
2525
:param expansionNum: 扩容节点个数
26+
:param nodeType: (Optional) 扩容节点类型。 Task：计算节点，Core：存储和计算节点
2627
"""
2728

2829
self.clusterId = clusterId
2930
self.expansionNum = expansionNum
31+
self.nodeType = nodeType

‎jdcloud_sdk/services/jmr/models/ClusterNode.py‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,31 @@
1919

2020
class ClusterNode(object):
2121

22-
def __init__(self, clusterNodeId=None, clusterNodeHostName=None, clusterNodeIntranetIp=None, clusterNodeConnectionIp=None, clusterNodeRole=None, clusterNodeDisk=None, clusterNodeModel=None):
22+
def __init__(self, serverId=None, instanceInfo=None, nodeName=None, nodeSystemDiskType=None, instanceType=None, nodeStatus=None, nodeDiskType=None, nodeType=None, outerIp=None, innerIp=None, nodeSystemDiskVolume=None, nodeDiskVolume=None):
2323
"""
24-
:param clusterNodeId: (Optional) 集群节点ID
25-
:param clusterNodeHostName: (Optional) 集群节点主机名称
26-
:param clusterNodeIntranetIp: (Optional) 集群节点内网IP
27-
:param clusterNodeConnectionIp: (Optional) 集群节点公网IP
28-
:param clusterNodeRole: (Optional) 集群节点类型
29-
:param clusterNodeDisk: (Optional) 集群节点硬盘信息
30-
:param clusterNodeModel: (Optional) 集群节点型号
24+
:param serverId: (Optional) 节点ID
25+
:param instanceInfo: (Optional) 节点实例信息
26+
:param nodeName: (Optional) 节点主机名称
27+
:param nodeSystemDiskType: (Optional) 节点系统盘类型
28+
:param instanceType: (Optional) 节点实例类型
29+
:param nodeStatus: (Optional) 节点运行状态
30+
:param nodeDiskType: (Optional) 节点数据盘类型
31+
:param nodeType: (Optional) 节点类型，MASTER或者SLAVE
32+
:param outerIp: (Optional) 节点外网IP
33+
:param innerIp: (Optional) 节点内网IP
34+
:param nodeSystemDiskVolume: (Optional) 节点系统盘大小(GB)
35+
:param nodeDiskVolume: (Optional) 节点数据盘大小(GB)
3136
"""
3237

33-
self.clusterNodeId = clusterNodeId
34-
self.clusterNodeHostName = clusterNodeHostName
35-
self.clusterNodeIntranetIp = clusterNodeIntranetIp
36-
self.clusterNodeConnectionIp = clusterNodeConnectionIp
37-
self.clusterNodeRole = clusterNodeRole
38-
self.clusterNodeDisk = clusterNodeDisk
39-
self.clusterNodeModel = clusterNodeModel
38+
self.serverId = serverId
39+
self.instanceInfo = instanceInfo
40+
self.nodeName = nodeName
41+
self.nodeSystemDiskType = nodeSystemDiskType
42+
self.instanceType = instanceType
43+
self.nodeStatus = nodeStatus
44+
self.nodeDiskType = nodeDiskType
45+
self.nodeType = nodeType
46+
self.outerIp = outerIp
47+
self.innerIp = innerIp
48+
self.nodeSystemDiskVolume = nodeSystemDiskVolume
49+
self.nodeDiskVolume = nodeDiskVolume

‎jdcloud_sdk/services/jmr/models/ClusterSpec.py‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,27 @@
1919

2020
class ClusterSpec(object):
2121

22-
def __init__(self, name, password, version, payType, masterNodeCount, masterSystemDiskType, masterSystemDiskVolume, masterSystemDiskIops, masterDiskType, masterDiskVolume, masterDiskIops, masterInstanceType, slaveNodeCount, slaveSystemDiskType, slaveSystemDiskVolume, slaveSystemDiskIops, slaveDiskType, slaveDiskVolume, slaveDiskIops, coreInstanceType, jssFlag, dataCenter, softwareList, haFlag, vpcId, vpcSubnetId, az, masterCore=None, masterMemory=None, slaveCore=None, slaveMemory=None):
22+
def __init__(self, name, password, version, masterNodeCount, masterSystemDiskType, masterSystemDiskVolume, masterDiskType, masterDiskVolume, masterInstanceType, slaveNodeCount, slaveSystemDiskType, slaveSystemDiskVolume, slaveDiskType, slaveDiskVolume, coreInstanceType, jssFlag, dataCenter, softwareList, haFlag, vpcId, vpcSubnetId, az, payType=None, masterSystemDiskIops=None, masterDiskIops=None, slaveSystemDiskIops=None, slaveDiskIops=None):
2323
"""
2424
:param name: 集群名称(不能少于6字符不能超过20字符，除下划线外不能包含特殊符号)
2525
:param password: 集群root用户密码(须包含大小写字母、数字及特殊字符其中三类，且不能少于8字符不能超过30字符)
2626
:param version: 集群版本，默认版本为JMR2.0.0
27-
:param payType: 集群计费类型，支持按配置和包年包月计费
27+
:param payType: (Optional) 集群计费类型，支持按配置和包年包月计费
2828
:param masterNodeCount: 主节点数量
29-
:param masterCore: (Optional) Master节点CPU
30-
:param masterMemory: (Optional) Master节点内存(推荐至少8G内存，否则服务可能会部署失败)
3129
:param masterSystemDiskType: Master系统硬盘类型：ssd.gp1,ssd.io1和hdd.std1
3230
:param masterSystemDiskVolume: Master系统硬盘大小，单位GB
33-
:param masterSystemDiskIops: Master系统硬盘iops，只有在硬盘类型是ssd.gp1,ssd.io1时，才需要有iops，200起步，步长为10
31+
:param masterSystemDiskIops: (Optional) Master系统硬盘iops，只有在硬盘类型是ssd.gp1,ssd.io1时，才需要有iops，200起步，步长为10
3432
:param masterDiskType: Master数据盘类型：ssd.gp1,ssd.io1和hdd.std1
3533
:param masterDiskVolume: Master数据盘大小，单位GB
36-
:param masterDiskIops: Master数据盘ipos，只有在硬盘类型是ssd.gp1,ssd.io1时，才需要有iops，200起步，步长为10
34+
:param masterDiskIops: (Optional) Master数据盘ipos，只有在硬盘类型是ssd.gp1,ssd.io1时，才需要有iops，200起步，步长为10
3735
:param masterInstanceType: master节点规格
3836
:param slaveNodeCount: Slave节点数量
39-
:param slaveCore: (Optional) Slave节点CPU
40-
:param slaveMemory: (Optional) Slave节点内存(推荐至少4G内存，否则服务可能会部署失败)
4137
:param slaveSystemDiskType: Slave系统硬盘类型：ssd.gp1,ssd.io1和hdd.std1
4238
:param slaveSystemDiskVolume: Slave系统硬盘大小，单位GB
43-
:param slaveSystemDiskIops: Slave系统硬盘iops，只有在硬盘类型是ssd.gp1,ssd.io1时，才需要有iops，200起步，步长为10
39+
:param slaveSystemDiskIops: (Optional) Slave系统硬盘iops，只有在硬盘类型是ssd.gp1,ssd.io1时，才需要有iops，200起步，步长为10
4440
:param slaveDiskType: Slave数据盘类型：ssd.gp1,ssd.io1和hdd.std1
4541
:param slaveDiskVolume: Slave数据盘大小，单位GB
46-
:param slaveDiskIops: Slave数据盘ipos，只有在硬盘类型是ssd.gp1,ssd.io1时，才需要有iops，200起步，步长为10
42+
:param slaveDiskIops: (Optional) Slave数据盘ipos，只有在硬盘类型是ssd.gp1,ssd.io1时，才需要有iops，200起步，步长为10
4743
:param coreInstanceType: slave节点规格
4844
:param jssFlag: 关联JSS
4945
:param dataCenter: 数据中心，即regionId
@@ -59,8 +55,6 @@ def __init__(self, name, password, version, payType, masterNodeCount, masterSyst
5955
self.version = version
6056
self.payType = payType
6157
self.masterNodeCount = masterNodeCount
62-
self.masterCore = masterCore
63-
self.masterMemory = masterMemory
6458
self.masterSystemDiskType = masterSystemDiskType
6559
self.masterSystemDiskVolume = masterSystemDiskVolume
6660
self.masterSystemDiskIops = masterSystemDiskIops
@@ -69,8 +63,6 @@ def __init__(self, name, password, version, payType, masterNodeCount, masterSyst
6963
self.masterDiskIops = masterDiskIops
7064
self.masterInstanceType = masterInstanceType
7165
self.slaveNodeCount = slaveNodeCount
72-
self.slaveCore = slaveCore
73-
self.slaveMemory = slaveMemory
7466
self.slaveSystemDiskType = slaveSystemDiskType
7567
self.slaveSystemDiskVolume = slaveSystemDiskVolume
7668
self.slaveSystemDiskIops = slaveSystemDiskIops

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
setup(
1111
name='jdcloud_sdk',
12-
version="1.6.78",
12+
version="1.6.79",
1313
long_description=long_description,
1414
long_description_content_type="text/markdown",
1515
author='JDCloud API Gateway Team',

0 commit comments

Comments
 (0)