Merge pull request #123 from Tanc009/master

publish jdcloud-sdk-python 1.6.88

Author: Tanc009

jdcloud_sdk/services/vm/ChangeLog.md

@@ -1,34 +1,34 @@
 # 更新历史 #
-API版本：1.3.0
+API版本：1.3.4
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
-|2020-04-20   |1.3.0   |新增接口       |* 增加查询云主机列表轻量接口 |
-|2020-04-20   |1.2.8   |新增参数       |* 创建、停止虚机，创建模板的接口增加chargeOnStopped参数 |
+|2020-10-23   |1.3.4   |新增参数       |* 实例接口新增hostname、K-V形式元数据等参数；实例模板接口新增userdata、K-V形式元数据等参数 |
+|2020-05-28   |1.3.2   |新增参数       |* 实例接口/实例模板接口新增云硬盘快照策略参数 |
+|2020-04-20   |1.2.8   |新增参数       |* 实例接口/实例模板接口增加停机不计费参数 |
 |2020-01-16   |1.2.7   |新增接口       |* 新增镜像导出接口 |
-|2019-10-25   |1.2.5   |新增参数       |* 支持创建虚机时指定标签 |
-|2019-10-21   |1.2.4   |升级          |* 升级Charge模块版本 */
-|2019-09-04   |1.2.3   |新增接口       |* 新增发布社区镜像、取消发布社区镜像接口，修改DescribeImages等参数 */
+|2019-10-25   |1.2.5   |新增参数       |* 支持创建实例时指定标签 |
+|2019-10-21   |1.2.4   |升级           |* 升级Charge模块版本 |
 |2019-07-25   |1.2.2   |新功能         |* 新增参数userData
 |2019-07-22   |1.2.1   |新增接口       |* 新增镜像导入、镜像任务查询相关接口 |
 |2019-07-04   |1.2.0   |新增接口       |* 新增实例模板相关功能 |
-|2018-12-05   |1.1.0   |新增参数       |* 创建虚机新增参数，可排除模板中某些参数 |
+|2018-12-05   |1.1.0   |新增参数       |* 创建实例新增参数，可排除模板中某些参数 |
 |2018-10-17   |1.0.9   |文档完善       |* 完善文档描述，针对逻辑不清楚的地方补充描述 |
 |2018-09-26   |1.0.8   |接口变更       |* 实例类型接口增加Gpu和本地缓存盘属性<br> * 配额接口增加可查询镜像共享配额<br> * 新增密钥相关接口 |
 |2018-09-19   |1.0.6   |文档完善       |* 完善文档描述，针对逻辑不清楚的地方补充描述 |
 |2018-09-19   |1.0.5   |文档完善       |* 完善文档描述，针对逻辑不清楚的地方补充描述 |
 |2018-09-06   |1.0.4   |文档完善       |* 完善文档描述，针对逻辑不清楚的地方补充描述 |
 |2018-08-20   |1.0.3   |Android支持    |* Java SDK新增对Android系统的支持   |
-|2018-08-06   |1.0.2   |接口变更       |* 增加接口：批量查询云主机主网卡内网IP地址<br> * 变更接口：查询云主机列表、批量查询云主机状态、增加筛选条件[子网ID]   |
+|2018-08-06   |1.0.2   |接口变更       |* 增加接口：批量查询实例主网卡内网IP地址<br> * 变更接口：查询实例列表、批量查询云主机状态、增加筛选条件[子网ID]   |
 |2018-07-24   |1.0.1   |新增接口       |* 增加接口：创建ssh密钥对<br> * 增加接口：导入ssh密钥对<br> * 增加接口：查询ssh密钥对<br> * 增加接口：删除ssh密钥对   |
 |2018-07-24   |1.0.0   |新增接口       |* 增加接口：挂载弹性网卡<br> * 增加接口：缷载弹性网卡<br> * 增加接口：修改弹性网卡属性<br> * 增加接口：修改数据盘属性<br> * 增加接口：修改私有镜像属性<br> * 增加接口：私有镜像跨区复制   |
-|2018-07-11   |0.7.5   |新增接口       |* 增加批量查询云主机状态接口<br> * 增加批量查询镜像限制接口   |
+|2018-07-11   |0.7.5   |新增接口       |* 增加批量查询实例状态接口<br> * 增加批量查询镜像限制接口   |
 |2018-04-08   |0.7.4   |文档补充       |* 修正一些是否必填的属性   |
 |2018-04-08   |0.7.2   |接口变更       |* 实例规格列表接口变更，增加可用区售卖状态   |
-|2018-04-08   |0.7.1   |接口变更       |* 增加变配接口<br> * 增加重置系统接口<br> * 查询主机列表增加Tag过滤条件   |
+|2018-04-08   |0.7.1   |接口变更       |* 增加变配接口<br> * 增加重置系统接口<br> * 查询实例列表增加Tag过滤条件   |
 |2018-04-08   |0.6.1   |文档完善       | * 完善文档描述，针对逻辑不清楚的地方补充描述
-|2018-04-08   |0.5.0   |接口变更       | * 主机挂载云硬盘时，deviceName修改为必传参数
+|2018-04-08   |0.5.0   |接口变更       | * 实例挂载云硬盘时，deviceName修改为必传参数
 |2018-04-03   |0.4.0   |接口变更       | * 查询Quota增加类型(模板)<br> * 修改Quota增加类型(模板)
-|2018-04-02   |0.3.0   |新增接口       | * 增加主机基本操作
+|2018-04-02   |0.3.0   |新增接口       | * 增加实例基本操作
 |2018-03-31   |0.2.0   |新增接口       | * 增加镜像共享相关接口<br> * 增加主机配置变更相关接口
-|2018-01-31   |0.1.0   |新增接口       | * 增加主机基本操作
+|2018-01-31   |0.1.0   |新增接口       | * 增加实例基本操作

jdcloud_sdk/services/vm/apis/AttachKeypairRequest.py

@@ -0,0 +1,49 @@
+# 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 AttachKeypairRequest(JDCloudRequest):
+    """
+    绑定ssh密钥对。
+
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(AttachKeypairRequest, self).__init__(
+            '/regions/{regionId}/keypairs/{keyName}:attach', 'POST', header, version)
+        self.parameters = parameters
+
+
+class AttachKeypairParameters(object):
+
+    def __init__(self, regionId, keyName, instanceIds, passWordAuth):
+        """
+        :param regionId: 地域ID
+        :param keyName: 密钥名称
+        :param instanceIds: 虚机Id
+        :param passWordAuth: 密码授权，绑定密钥后，根据此参数决定是否使用密码登录，"yes"为使用，"no"为不使用
+
+        """
+
+        self.regionId = regionId
+        self.keyName = keyName
+        self.instanceIds = instanceIds
+        self.passWordAuth = passWordAuth
+

jdcloud_sdk/services/vm/apis/DeleteImageRequest.py

@@ -42,4 +42,11 @@ def __init__(self, regionId, imageId, ):
 
         self.regionId = regionId
         self.imageId = imageId
+        self.deleteSnapshot = None
+
+    def setDeleteSnapshot(self, deleteSnapshot):
+        """
+        :param deleteSnapshot: (Optional) 删除镜像是否删除关联的快照，默认为false；如果指定为true, 将会删除镜像关联的快照。
+        """
+        self.deleteSnapshot = deleteSnapshot
 

jdcloud_sdk/services/vm/apis/DescribeBriefInstancesRequest.py

@@ -28,7 +28,7 @@ class DescribeBriefInstancesRequest(JDCloudRequest):
 
     def __init__(self, parameters, header=None, version="v1"):
         super(DescribeBriefInstancesRequest, self).__init__(
-            '/regions/{regionId}/instances:describeBriefInstances', 'POST', header, version)
+            '/regions/{regionId}/instances:describeBriefInstances', 'GET', header, version)
         self.parameters = parameters
 
 

jdcloud_sdk/services/vm/apis/DescribeImagesRequest.py

@@ -46,6 +46,7 @@ def __init__(self, regionId, ):
         self.offline = None
         self.platform = None
         self.ids = None
+        self.imageName = None
         self.rootDeviceType = None
         self.launchPermission = None
         self.status = None
@@ -82,6 +83,12 @@ def setIds(self, ids):
         """
         self.ids = ids
 
+    def setImageName(self, imageName):
+        """
+        :param imageName: (Optional) 根据镜像名称模糊查找
+        """
+        self.imageName = imageName
+
     def setRootDeviceType(self, rootDeviceType):
         """
         :param rootDeviceType: (Optional) 镜像支持的系统盘类型，[localDisk,cloudDisk]

jdcloud_sdk/services/vm/apis/DescribeInstanceTemplatesCustomdataRequest.py

@@ -0,0 +1,49 @@
+# 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 DescribeInstanceTemplatesCustomdataRequest(JDCloudRequest):
+    """
+    查询模板自定义元数据
+
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(DescribeInstanceTemplatesCustomdataRequest, self).__init__(
+            '/regions/{regionId}/instanceTemplatesCustomData', 'GET', header, version)
+        self.parameters = parameters
+
+
+class DescribeInstanceTemplatesCustomdataParameters(object):
+
+    def __init__(self, regionId, ):
+        """
+        :param regionId: 地域ID
+        """
+
+        self.regionId = regionId
+        self.filters = None
+
+    def setFilters(self, filters):
+        """
+        :param filters: (Optional) instanceTemplateId - 启动模板ID，精确匹配，支持多个，最多支持10个
+        """
+        self.filters = filters
+

jdcloud_sdk/services/vm/apis/DescribeInstancesCustomDataRequest.py

@@ -0,0 +1,69 @@
+# 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 DescribeInstancesCustomDataRequest(JDCloudRequest):
+    """
+    批量查询云主机用户自定义元数据
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(DescribeInstancesCustomDataRequest, self).__init__(
+            '/regions/{regionId}/instancesCustomData', 'GET', header, version)
+        self.parameters = parameters
+
+
+class DescribeInstancesCustomDataParameters(object):
+
+    def __init__(self, regionId, ):
+        """
+        :param regionId: 地域ID
+        """
+
+        self.regionId = regionId
+        self.pageNumber = None
+        self.pageSize = None
+        self.filters = None
+
+    def setPageNumber(self, pageNumber):
+        """
+        :param pageNumber: (Optional) 页码；默认为1
+        """
+        self.pageNumber = pageNumber
+
+    def setPageSize(self, pageSize):
+        """
+        :param pageSize: (Optional) 分页大小；默认为10；取值范围[1, 10]
+        """
+        self.pageSize = pageSize
+
+    def setFilters(self, filters):
+        """
+        :param filters: (Optional) instanceId - 云主机ID，精确匹配，支持多个
+privateIpAddress - 主网卡内网主IP地址，模糊匹配，支持多个
+vpcId - 私有网络ID，精确匹配，支持多个
+status - 云主机状态，精确匹配，支持多个，<a href="http://docs.jdcloud.com/virtual-machines/api/vm_status">参考云主机状态</a>
+imageId - 镜像ID，精确匹配，支持多个
+networkInterfaceId - 弹性网卡ID，精确匹配，支持多个
+subnetId - 子网ID，精确匹配，支持多个
+
+        """
+        self.filters = filters
+

jdcloud_sdk/services/vm/apis/DescribeInstancesRequest.py

@@ -72,7 +72,7 @@ def setFilters(self, filters):
 dedicatedHostId - 专有宿主机ID，精确匹配，支持多个
 dedicatedPoolId - 专有宿主机池ID，精确匹配，支持多个
 instanceType - 实例规格，精确匹配，支持多个
-elasticIpAddress - 公网IP地址，精确匹配，支持单个
+elasticIpAddress - 公网IP地址，精确匹配，支持单个。该条件会将公网IP转换成networkInterfaceId进行查询，所以与networkInterfaceId为或者的关系。
 
         """
         self.filters = filters

jdcloud_sdk/services/vm/apis/DetachKeypairRequest.py

@@ -0,0 +1,46 @@
+# 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 DetachKeypairRequest(JDCloudRequest):
+    """
+    解绑ssh密钥对。
+
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(DetachKeypairRequest, self).__init__(
+            '/regions/{regionId}/keypairs/{keyName}:detach', 'POST', header, version)
+        self.parameters = parameters
+
+
+class DetachKeypairParameters(object):
+
+    def __init__(self, regionId, keyName, instanceIds):
+        """
+        :param regionId: 地域ID
+        :param keyName: 密钥名称
+        :param instanceIds: 虚机Id
+        """
+
+        self.regionId = regionId
+        self.keyName = keyName
+        self.instanceIds = instanceIds
+

jdcloud_sdk/services/vm/apis/ModifyInstanceAttributeRequest.py

@@ -43,10 +43,13 @@ def __init__(self, regionId, instanceId, ):
         self.instanceId = instanceId
         self.name = None
         self.description = None
+        self.hostname = None
+        self.metadata = None
+        self.userdata = None
 
     def setName(self, name):
         """
-        :param name: (Optional) 名称，<a href="http://docs.jdcloud.com/virtual-machines/api/general_parameters">参考公共参数规范</a>。
+        :param name: (Optional) 名称，不为空且只允许中文、数字、大小写字母、英文下划线（_）、中划线（-）及点（.），不能以（.）作为首尾，长度为2~128个字符
         """
         self.name = name
 
@@ -56,3 +59,30 @@ def setDescription(self, description):
         """
         self.description = description
 
+    def setHostname(self, hostname):
+        """
+        :param hostname: (Optional) 云主机hostname，若不指定hostname，则hostname默认使用云主机名称name，但是会以RFC 952和RFC 1123命名规范做一定转义
+Windows Server系统：长度为2-15个字符，允许大小写字母、数字或连字符（-）。不能以连字符（-）开头或结尾，不能连续使用连字符（-），也不能全部使用数字。不支持点号（.）。
+Linux系统：长度为2-64个字符，允许支持多个点号，点之间为一段，每段允许使用大小写字母、数字或连字符（-），但不能连续使用点号（.）或连字符（-），不能以点号（.）或连字符（-）开头或结尾。
+hostname修改后，重启云主机hostname生效
+
+        """
+        self.hostname = hostname
+
+    def setMetadata(self, metadata):
+        """
+        :param metadata: (Optional) 用户自定义元数据信息，key-value 键值对总数量不超过40，其中更新和新增键值对总数量不超过20对，删除的键值对总数量不超过20对。不区分大小写。
+如key已有认为是更新value；如key不存在认为是新增键值对；如key后面有连字符(-)，比如key-，则删除此key。
+
+        """
+        self.metadata = metadata
+
+    def setUserdata(self, userdata):
+        """
+        :param userdata: (Optional) 元数据信息，目前只支持传入一个key为"launch-script"，表示首次启动脚本。value为base64格式。
+launch-script：linux系统支持bash和python，编码前须分别以 #!/bin/bash 和 #!/usr/bin/env python 作为内容首行;
+launch-script：windows系统支持bat和powershell，编码前须分别以 <cmd></cmd> 和 <powershell></powershell> 作为内容首、尾行。
+
+        """
+        self.userdata = userdata
+