publish jdcloud-sdk-python 1.6.81

Author: Tanc009

jdcloud_sdk/services/jmr/ChangeLog.md

@@ -1,8 +1,10 @@
 # 更新历史 #
-API版本：1.1.3
+API版本：1.1.5
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|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的详细节点信息。|
 |2020-09-21|1.1.3|修改|* 标准化接口的url、参数及返回值的格式，并只提供JMR集群查询接口|
 |2018-10-24|1.1.2|修改|* 标准化接口的url、参数及返回值的格式，并只提供JMR集群创建、释放和查询接口|

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.4', logger)
+        super(JmrClient, self).__init__(credential, config, 'jmr', '1.1.5', logger)

jdcloud_sdk/services/jmr/models/Cluster.py

@@ -19,39 +19,37 @@
 
 class Cluster(object):
 
-    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):
+    def __init__(self, id=None, name=None, dataCenter=None, clusterPrimaryId=None, monitorResourceId=None, status=None, softwareStack=None, createTime=None, haFlag=None, jssFlag=None, payPrice=None, payType=None, duration=None, nodeCount=None, hardware=None):
         """
         :param id: (Optional) 集群ID
         :param name: (Optional) 集群名称
-        :param region: (Optional) 集群所属地域
-        :param vpcName: (Optional) VPC名称
-        :param vpcSubnetName: (Optional) 集群子网名称
+        :param dataCenter: (Optional) 集群所属地域
+        :param clusterPrimaryId: (Optional) 集群ID
+        :param monitorResourceId: (Optional) 监控ID
         :param status: (Optional) 集群状态
-        :param version: (Optional) 集群版本
-        :param software: (Optional) 集群服务
+        :param softwareStack: (Optional) 软件信息
         :param createTime: (Optional) 集群创建时间
-        :param haFlag: (Optional) 集群所属可用区
-        :param ossFlag: (Optional) 集群是否使用OSS
+        :param haFlag: (Optional) 集群是否高可用
+        :param jssFlag: (Optional) 集群是否使用OSS
         :param payPrice: (Optional) 集群费用
         :param payType: (Optional) 集群收费类型
         :param duration: (Optional) 集群运行时间
         :param nodeCount: (Optional) 集群节点个数
-        :param clusterNodes: (Optional) 集群节点信息
+        :param hardware: (Optional) 集群节点信息
         """
 
         self.id = id
         self.name = name
-        self.region = region
-        self.vpcName = vpcName
-        self.vpcSubnetName = vpcSubnetName
+        self.dataCenter = dataCenter
+        self.clusterPrimaryId = clusterPrimaryId
+        self.monitorResourceId = monitorResourceId
         self.status = status
-        self.version = version
-        self.software = software
+        self.softwareStack = softwareStack
         self.createTime = createTime
         self.haFlag = haFlag
-        self.ossFlag = ossFlag
+        self.jssFlag = jssFlag
         self.payPrice = payPrice
         self.payType = payType
         self.duration = duration
         self.nodeCount = nodeCount
-        self.clusterNodes = clusterNodes
+        self.hardware = hardware

jdcloud_sdk/services/jmr/models/ClusterListNode.py

@@ -0,0 +1,47 @@
+# 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 ClusterListNode(object):
+
+    def __init__(self, id=None, name=None, dataCenter=None, recordId=None, monitorResourceId=None, status=None, errorMessage=None, createTime=None, payType=None, duration=None, outerIp=None):
+        """
+        :param id: (Optional) 集群ID
+        :param name: (Optional) 集群名称
+        :param dataCenter: (Optional) 集群所属地域
+        :param recordId: (Optional) 集群ID
+        :param monitorResourceId: (Optional) 监控ID
+        :param status: (Optional) 集群状态
+        :param errorMessage: (Optional) 错误信息
+        :param createTime: (Optional) 集群创建时间
+        :param payType: (Optional) 集群收费类型
+        :param duration: (Optional) 集群运行时间
+        :param outerIp: (Optional) 公网Ip
+        """
+
+        self.id = id
+        self.name = name
+        self.dataCenter = dataCenter
+        self.recordId = recordId
+        self.monitorResourceId = monitorResourceId
+        self.status = status
+        self.errorMessage = errorMessage
+        self.createTime = createTime
+        self.payType = payType
+        self.duration = duration
+        self.outerIp = outerIp

jdcloud_sdk/services/jmr/models/ClusterNode.py

@@ -19,7 +19,7 @@
 
 class ClusterNode(object):
 
-    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):
+    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, msg=None, nodeSystemInfo=None, nodeDiskCategory=None, nodeSystemDiskCategory=None, nodeCoreNum=None, nodeMemoryNum=None):
         """
         :param serverId: (Optional) 节点ID
         :param instanceInfo: (Optional) 节点实例信息
@@ -33,6 +33,12 @@ def __init__(self, serverId=None, instanceInfo=None, nodeName=None, nodeSystemDi
         :param innerIp: (Optional) 节点内网IP
         :param nodeSystemDiskVolume: (Optional) 节点系统盘大小(GB)
         :param nodeDiskVolume: (Optional) 节点数据盘大小(GB)
+        :param msg: (Optional) 信息
+        :param nodeSystemInfo: (Optional) 节点系统信息
+        :param nodeDiskCategory: (Optional) 节点硬盘类型
+        :param nodeSystemDiskCategory: (Optional) 节点系统盘类型
+        :param nodeCoreNum: (Optional) 节点数量
+        :param nodeMemoryNum: (Optional) 节点内存数量
         """
 
         self.serverId = serverId
@@ -47,3 +53,9 @@ def __init__(self, serverId=None, instanceInfo=None, nodeName=None, nodeSystemDi
         self.innerIp = innerIp
         self.nodeSystemDiskVolume = nodeSystemDiskVolume
         self.nodeDiskVolume = nodeDiskVolume
+        self.msg = msg
+        self.nodeSystemInfo = nodeSystemInfo
+        self.nodeDiskCategory = nodeDiskCategory
+        self.nodeSystemDiskCategory = nodeSystemDiskCategory
+        self.nodeCoreNum = nodeCoreNum
+        self.nodeMemoryNum = nodeMemoryNum

jdcloud_sdk/services/jmr/models/ClusterSpec.py

@@ -19,7 +19,7 @@
 
 class ClusterSpec(object):
 
-    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):
+    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, createOuterIpFlag=None, createSecurityGroupFlag=None, securityGroupId=None):
         """
         :param name:  集群名称(不能少于6字符不能超过20字符，除下划线外不能包含特殊符号)
         :param password:  集群root用户密码(须包含大小写字母、数字及特殊字符其中三类，且不能少于8字符不能超过30字符)
@@ -48,6 +48,9 @@ def __init__(self, name, password, version, masterNodeCount, masterSystemDiskTyp
         :param vpcId:  Vpc网络ID
         :param vpcSubnetId:  Vpc子网ID
         :param az:  数据中心的可用区
+        :param createOuterIpFlag: (Optional) 是否创建公网IP
+        :param createSecurityGroupFlag: (Optional) 是否创建安全组
+        :param securityGroupId: (Optional) 安全组ID
         """
 
         self.name = name
@@ -77,3 +80,6 @@ def __init__(self, name, password, version, masterNodeCount, masterSystemDiskTyp
         self.vpcId = vpcId
         self.vpcSubnetId = vpcSubnetId
         self.az = az
+        self.createOuterIpFlag = createOuterIpFlag
+        self.createSecurityGroupFlag = createSecurityGroupFlag
+        self.securityGroupId = securityGroupId

jdcloud_sdk/services/jmr/models/SoftwareStack.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 SoftwareStack(object):
+
+    def __init__(self, software=None, version=None):
+        """
+        :param software: (Optional) 软件列表
+        :param version: (Optional) 版本
+        """
+
+        self.software = software
+        self.version = version

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='jdcloud_sdk',
-    version="1.6.80",
+    version="1.6.81",
     long_description=long_description,
     long_description_content_type="text/markdown",
     author='JDCloud API Gateway Team',