publish jdcloud-sdk-python 1.6.57

Author: Tanc009

jdcloud_sdk/services/vm/ChangeLog.md

@@ -1,8 +1,10 @@
 # 更新历史 #
-API版本：1.2.7
+API版本：1.3.0
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|2020-04-20   |1.3.0   |新增接口       |* 增加查询云主机列表轻量接口 |
+|2020-04-20   |1.2.8   |新增参数       |* 创建、停止虚机，创建模板的接口增加chargeOnStopped参数 |
 |2020-01-16   |1.2.7   |新增接口       |* 新增镜像导出接口 |
 |2019-10-25   |1.2.5   |新增参数       |* 支持创建虚机时指定标签 |
 |2019-10-21   |1.2.4   |升级          |* 升级Charge模块版本 */

jdcloud_sdk/services/vm/apis/CreateInstancesRequest.py

@@ -58,6 +58,8 @@ class CreateInstancesRequest(JDCloudRequest):
         - 自动删除
             - 默认自动删除，如果是包年包月的云硬盘，此参数不生效
         - 可以从快照创建磁盘
+    - iops
+        - 仅当云盘类型为ssd.io1时，可指定iops值，范围为【200， min（32000，size * 50 ）】，步长为10，若不指定则按此公式计算默认值
     - local类型系统的云主机可以挂载8块云硬盘
     - cloud类型系统的云主机可以挂载7块云硬盘
 - 计费

jdcloud_sdk/services/vm/apis/DescribeBriefInstancesRequest.py

@@ -0,0 +1,86 @@
+# 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 DescribeBriefInstancesRequest(JDCloudRequest):
+    """
+    批量查询云主机信息的轻量接口，不返回云盘、网络、计费、标签等信息。如果不需要关联资源属性，尽量选择使用该接口。<br>
+此接口支持分页查询，默认每页20条。
+
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(DescribeBriefInstancesRequest, self).__init__(
+            '/regions/{regionId}/instances:describeBriefInstances', 'POST', header, version)
+        self.parameters = parameters
+
+
+class DescribeBriefInstancesParameters(object):
+
+    def __init__(self, regionId, ):
+        """
+        :param regionId: 地域ID
+        """
+
+        self.regionId = regionId
+        self.pageNumber = None
+        self.pageSize = None
+        self.tags = None
+        self.filters = None
+
+    def setPageNumber(self, pageNumber):
+        """
+        :param pageNumber: (Optional) 页码；默认为1
+        """
+        self.pageNumber = pageNumber
+
+    def setPageSize(self, pageSize):
+        """
+        :param pageSize: (Optional) 分页大小；默认为20；取值范围[10, 100]
+        """
+        self.pageSize = pageSize
+
+    def setTags(self, tags):
+        """
+        :param tags: (Optional) Tag筛选条件
+        """
+        self.tags = tags
+
+    def setFilters(self, filters):
+        """
+        :param filters: (Optional) instanceId - 云主机ID，精确匹配，支持多个
+privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个
+az - 可用区，精确匹配，支持多个
+vpcId - 私有网络ID，精确匹配，支持多个
+status - 云主机状态，精确匹配，支持多个，<a href="http://docs.jdcloud.com/virtual-machines/api/vm_status">参考云主机状态</a>
+name - 云主机名称，模糊匹配，支持单个
+imageId - 镜像ID，精确匹配，支持多个
+networkInterfaceId - 弹性网卡ID，精确匹配，支持多个
+subnetId - 子网ID，精确匹配，支持多个
+agId - 使用可用组id，支持单个
+faultDomain - 错误域，支持多个
+dedicatedHostId - 专有宿主机ID，精确匹配，支持多个
+dedicatedPoolId - 专有宿主机池ID，精确匹配，支持多个
+instanceType - 实例规格，精确匹配，支持多个
+elasticIpAddress - 公网IP地址，精确匹配，支持单个
+
+        """
+        self.filters = filters
+

jdcloud_sdk/services/vm/apis/DescribeImagesRequest.py

@@ -42,6 +42,8 @@ def __init__(self, regionId, ):
 
         self.regionId = regionId
         self.imageSource = None
+        self.serviceCode = None
+        self.offline = None
         self.platform = None
         self.ids = None
         self.rootDeviceType = None
@@ -56,6 +58,18 @@ def setImageSource(self, imageSource):
         """
         self.imageSource = imageSource
 
+    def setServiceCode(self, serviceCode):
+        """
+        :param serviceCode: (Optional) 产品线标识，非必传，不传的时候返回全部产品线镜像
+        """
+        self.serviceCode = serviceCode
+
+    def setOffline(self, offline):
+        """
+        :param offline: (Optional) 是否下线，默认值为false；imageSource为public或者thirdparty时，此参数才有意义，其它情况下此参数无效；指定镜像ID查询时，此参数无效
+        """
+        self.offline = offline
+
     def setPlatform(self, platform):
         """
         :param platform: (Optional) 操作系统平台，取值范围：Windows Server、CentOS、Ubuntu

jdcloud_sdk/services/vm/apis/DescribeInstancePrivateIpAddressRequest.py

@@ -64,6 +64,7 @@ def setFilters(self, filters):
 imageId - 镜像ID，精确匹配，支持多个
 networkInterfaceId - 弹性网卡ID，精确匹配，支持多个
 subnetId - 子网ID，精确匹配，支持多个
+chargeOnStopped - 停机不计费标志，keepCharging、stopCharging 或者 notApplicable
 
         """
         self.filters = filters

jdcloud_sdk/services/vm/apis/DescribeInstancesRequest.py

@@ -69,6 +69,10 @@ def setFilters(self, filters):
 subnetId - 子网ID，精确匹配，支持多个
 agId - 使用可用组id，支持单个
 faultDomain - 错误域，支持多个
+dedicatedHostId - 专有宿主机ID，精确匹配，支持多个
+dedicatedPoolId - 专有宿主机池ID，精确匹配，支持多个
+instanceType - 实例规格，精确匹配，支持多个
+elasticIpAddress - 公网IP地址，精确匹配，支持单个
 
         """
         self.filters = filters

jdcloud_sdk/services/vm/apis/StopInstanceRequest.py

@@ -41,4 +41,11 @@ def __init__(self, regionId, instanceId, ):
 
         self.regionId = regionId
         self.instanceId = instanceId
+        self.chargeOnStopped = None
+
+    def setChargeOnStopped(self, chargeOnStopped):
+        """
+        :param chargeOnStopped: (Optional) 关机模式，只支持云盘做系统盘的按配置计费云主机keepCharging：关机后继续计费；stopCharging：关机后停止计费。
+        """
+        self.chargeOnStopped = chargeOnStopped
 

jdcloud_sdk/services/vm/client/VmClient.py

@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
         if config is None:
             config = Config('vm.jdcloud-api.com')
 
-        super(VmClient, self).__init__(credential, config, 'vm', '1.2.7', logger)
+        super(VmClient, self).__init__(credential, config, 'vm', '1.3.0', logger)

jdcloud_sdk/services/vm/models/BriefInstance.py

@@ -0,0 +1,65 @@
+# 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 BriefInstance(object):
+
+    def __init__(self, instanceId=None, instanceName=None, instanceType=None, vpcId=None, subnetId=None, privateIpAddress=None, status=None, description=None, imageId=None, systemDisk=None, dataDisks=None, primaryNetworkInterface=None, secondaryNetworkInterfaces=None, launchTime=None, az=None, keyNames=None, faultDomain=None, chargeOnStopped=None, dedicatedPoolId=None, dedicatedHostId=None):
+        """
+        :param instanceId: (Optional) 云主机ID
+        :param instanceName: (Optional) 云主机名称
+        :param instanceType: (Optional) 实例规格
+        :param vpcId: (Optional) 主网卡所属VPC的ID
+        :param subnetId: (Optional) 主网卡所属子网的ID
+        :param privateIpAddress: (Optional) 主网卡主IP地址
+        :param status: (Optional) 云主机状态，<a href="http://docs.jdcloud.com/virtual-machines/api/vm_status">参考云主机状态</a>
+        :param description: (Optional) 云主机描述
+        :param imageId: (Optional) 镜像ID
+        :param systemDisk: (Optional) 系统盘配置
+        :param dataDisks: (Optional) 数据盘配置
+        :param primaryNetworkInterface: (Optional) 主网卡配置
+        :param secondaryNetworkInterfaces: (Optional) 辅助网卡配置
+        :param launchTime: (Optional) 创建时间
+        :param az: (Optional) 云主机所在可用区
+        :param keyNames: (Optional) 密钥对名称
+        :param faultDomain: (Optional) 高可用组中的错误域
+        :param chargeOnStopped: (Optional) 关机模式，只支持云盘做系统盘的按配置计费云主机。KeepCharging：关机后继续计费；StopCharging：关机后停止计费。
+        :param dedicatedPoolId: (Optional) 实例所属的专有宿主机池
+        :param dedicatedHostId: (Optional) 专有宿主机ID
+        """
+
+        self.instanceId = instanceId
+        self.instanceName = instanceName
+        self.instanceType = instanceType
+        self.vpcId = vpcId
+        self.subnetId = subnetId
+        self.privateIpAddress = privateIpAddress
+        self.status = status
+        self.description = description
+        self.imageId = imageId
+        self.systemDisk = systemDisk
+        self.dataDisks = dataDisks
+        self.primaryNetworkInterface = primaryNetworkInterface
+        self.secondaryNetworkInterfaces = secondaryNetworkInterfaces
+        self.launchTime = launchTime
+        self.az = az
+        self.keyNames = keyNames
+        self.faultDomain = faultDomain
+        self.chargeOnStopped = chargeOnStopped
+        self.dedicatedPoolId = dedicatedPoolId
+        self.dedicatedHostId = dedicatedHostId

jdcloud_sdk/services/vm/models/BriefInstanceDiskAttachment.py

@@ -0,0 +1,41 @@
+# 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 BriefInstanceDiskAttachment(object):
+
+    def __init__(self, diskCategory=None, autoDelete=None, localDisk=None, deviceName=None, status=None):
+        """
+        :param diskCategory: (Optional) 磁盘分类，取值为本地盘(local)或者数据盘(cloud)。
+系统盘支持本地盘(local)或者云硬盘(cloud)。系统盘选择local类型，必须使用localDisk类型的镜像；同理系统盘选择cloud类型，必须使用cloudDisk类型的镜像。
+数据盘仅支持云硬盘(cloud)。
+
+        :param autoDelete: (Optional) 随云主机一起删除，删除主机时自动删除此磁盘，默认为true，本地盘(local)不能更改此值。
+如果云主机中的数据盘(cloud)是包年包月计费方式，此参数不生效。
+如果云主机中的数据盘(cloud)是共享型数据盘，此参数不生效。
+
+        :param localDisk: (Optional) 本地磁盘配置
+        :param deviceName: (Optional) 数据盘逻辑挂载点，取值范围：vda,vdb,vdc,vdd,vde,vdf,vdg,vdh,vdi,vmj,vdk,vdl,vdm
+        :param status: (Optional) 数据盘挂载状态，取值范围：attaching,detaching,attached,detached,error_attach,error_detach
+        """
+
+        self.diskCategory = diskCategory
+        self.autoDelete = autoDelete
+        self.localDisk = localDisk
+        self.deviceName = deviceName
+        self.status = status