Merge pull request #105 from Tanc009/master

ublish jdcloud-sdk-python 1.6.72

Author: Tanc009

jdcloud_sdk/services/apigateway/ChangeLog.md

@@ -1,9 +1,9 @@
 # 更新历史 #
-API版本：1.0.0
+API版本：1.0.1
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
-|2019-11-25|1.0.0|将接口对外发布|
+|2019-11-26|1.0.1|将接口对外发布|
 |2019-08-05|0.11.0|增加计费支持|
 |2019-06-17|0.10.0|增加微服务后端支持|
 |2019-05-22|0.9.0|增加查询删除列表及删除恢复接口|

jdcloud_sdk/services/apigateway/client/ApigatewayClient.py

@@ -26,4 +26,4 @@ def __init__(self, credential, config=None, logger=None):
         if config is None:
             config = Config('apigateway.jdcloud-api.com')
 
-        super(ApigatewayClient, self).__init__(credential, config, 'apigateway', '1.0.0', logger)
+        super(ApigatewayClient, self).__init__(credential, config, 'apigateway', '1.0.1', logger)

jdcloud_sdk/services/apigatewaytestproductline/ChangeLog.md

@@ -0,0 +1,25 @@
+# 更新历史 #
+API版本：1.0.8
+
+|发布时间|版本号|更新|说明|
+|---|---|---|---|
+|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-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-04-08   |0.7.4   |文档补充       |* 修正一些是否必填的属性   |
+|2018-04-08   |0.7.2   |接口变更       |* 实例规格列表接口变更，增加可用区售卖状态   |
+|2018-04-08   |0.7.1   |接口变更       |* 增加变配接口<br> * 增加重置系统接口<br> * 查询主机列表增加Tag过滤条件   |
+|2018-04-08   |0.6.1   |文档完善       | * 完善文档描述，针对逻辑不清楚的地方补充描述
+|2018-04-08   |0.5.0   |接口变更       | * 主机挂载云硬盘时，deviceName修改为必传参数
+|2018-04-03   |0.4.0   |接口变更       | * 查询Quota增加类型(模板)<br> * 修改Quota增加类型(模板)
+|2018-04-02   |0.3.0   |新增接口       | * 增加主机基本操作
+|2018-03-31   |0.2.0   |新增接口       | * 增加镜像共享相关接口<br> * 增加主机配置变更相关接口
+|2018-01-31   |0.1.0   |新增接口       | * 增加主机基本操作

…cloud_sdk/services/monitorcm/__init__.py …es/apigatewaytestproductline/__init__.pyjdcloud_sdk/services/monitorcm/__init__.py renamed to jdcloud_sdk/services/apigatewaytestproductline/__init__.py jdcloud_sdk/services/monitorcm/__init__.py renamed to jdcloud_sdk/services/apigatewaytestproductline/__init__.py

@@ -19,25 +19,27 @@
 from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
 
 
-class GetResultRequest(JDCloudRequest):
+class CreateTestTaskBakToIdRequest(JDCloudRequest):
     """
-    多级筛选结果查询接口
+    创建testTask
     """
 
     def __init__(self, parameters, header=None, version="v1"):
-        super(GetResultRequest, self).__init__(
-            '/v1/regions/{regionId}/profileMultiLevel/getResult', 'GET', header, version)
+        super(CreateTestTaskBakToIdRequest, self).__init__(
+            '/regions/{regionId}/TaskId', 'POST', header, version)
         self.parameters = parameters
 
 
-class GetResultParameters(object):
+class CreateTestTaskBakToIdParameters(object):
 
-    def __init__(self, regionId, profileSelectRecordId):
+    def __init__(self, regionId, title, description):
         """
         :param regionId: 地域ID
-        :param profileSelectRecordId: 多级筛选任务ID
+        :param title: title
+        :param description: 描述
         """
 
         self.regionId = regionId
-        self.profileSelectRecordId = profileSelectRecordId
+        self.title = title
+        self.description = description
 

…rvices/datastar/apis/GetResultRequest.py …ine/apis/CreateTestTaskBakToIdRequest.pyjdcloud_sdk/services/datastar/apis/GetResultRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/CreateTestTaskBakToIdRequest.py jdcloud_sdk/services/datastar/apis/GetResultRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/CreateTestTaskBakToIdRequest.py

@@ -19,25 +19,27 @@
 from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
 
 
-class CreateAndExcuteJobRequest(JDCloudRequest):
+class CreateTestTaskIdNewRequest(JDCloudRequest):
     """
-    创建作业并执行
+    创建testTask
     """
 
     def __init__(self, parameters, header=None, version="v1"):
-        super(CreateAndExcuteJobRequest, self).__init__(
-            '/regions/{regionId}/job:createAndExecute', 'POST', header, version)
+        super(CreateTestTaskIdNewRequest, self).__init__(
+            '/regions/{regionId}/TaskIdNew', 'POST', header, version)
         self.parameters = parameters
 
 
-class CreateAndExcuteJobParameters(object):
+class CreateTestTaskIdNewParameters(object):
 
-    def __init__(self, regionId, jmrJobViewModel):
+    def __init__(self, regionId, title, description):
         """
         :param regionId: 地域ID
-        :param jmrJobViewModel: 
+        :param title: title
+        :param description: 描述
         """
 
         self.regionId = regionId
-        self.jmrJobViewModel = jmrJobViewModel
+        self.title = title
+        self.description = description
 

…es/jmr/apis/CreateAndExcuteJobRequest.py …tline/apis/CreateTestTaskIdNewRequest.pyjdcloud_sdk/services/jmr/apis/CreateAndExcuteJobRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/CreateTestTaskIdNewRequest.py jdcloud_sdk/services/jmr/apis/CreateAndExcuteJobRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/CreateTestTaskIdNewRequest.py

@@ -19,25 +19,27 @@
 from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
 
 
-class CreateClusterInNewNetworkRequest(JDCloudRequest):
+class CreateTestTaskRequest(JDCloudRequest):
     """
-    创建新集群
+    创建testTask
     """
 
     def __init__(self, parameters, header=None, version="v1"):
-        super(CreateClusterInNewNetworkRequest, self).__init__(
-            '/regions/{regionId}/cluster:create', 'POST', header, version)
+        super(CreateTestTaskRequest, self).__init__(
+            '/regions/{regionId}/Task', 'POST', header, version)
         self.parameters = parameters
 
 
-class CreateClusterInNewNetworkParameters(object):
+class CreateTestTaskParameters(object):
 
-    def __init__(self, regionId, clusterModel):
+    def __init__(self, regionId, title, description):
         """
         :param regionId: 地域ID
-        :param clusterModel: 
+        :param title: title
+        :param description: 描述
         """
 
         self.regionId = regionId
-        self.clusterModel = clusterModel
+        self.title = title
+        self.description = description
 

…apis/CreateClusterInNewNetworkRequest.py …roductline/apis/CreateTestTaskRequest.pyjdcloud_sdk/services/jmr/apis/CreateClusterInNewNetworkRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/CreateTestTaskRequest.py jdcloud_sdk/services/jmr/apis/CreateClusterInNewNetworkRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/CreateTestTaskRequest.py

@@ -19,25 +19,26 @@
 from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
 
 
-class IdataClusterRequest(JDCloudRequest):
+class DescribeInstanceRequest(JDCloudRequest):
     """
-    查询用户集群列表及相关服务的一些信息
+    查询一台云主机的详细信息
+
     """
 
     def __init__(self, parameters, header=None, version="v1"):
-        super(IdataClusterRequest, self).__init__(
-            '/regions/{regionId}/idata', 'GET', header, version)
+        super(DescribeInstanceRequest, self).__init__(
+            '/regions/{regionId}/instances/{instanceId}', 'GET', header, version)
         self.parameters = parameters
 
 
-class IdataClusterParameters(object):
+class DescribeInstanceParameters(object):
 
-    def __init__(self, regionId, id, ):
+    def __init__(self, regionId, instanceId, ):
         """
         :param regionId: 地域ID
-        :param id: 集群ID；由八位字符组成
+        :param instanceId: 云主机ID
         """
 
         self.regionId = regionId
-        self.id = id
+        self.instanceId = instanceId
 

…services/jmr/apis/IdataClusterRequest.py …ductline/apis/DescribeInstanceRequest.pyjdcloud_sdk/services/jmr/apis/IdataClusterRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/DescribeInstanceRequest.py jdcloud_sdk/services/jmr/apis/IdataClusterRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/DescribeInstanceRequest.py

@@ -19,32 +19,27 @@
 from jdcloud_sdk.core.jdcloudrequest import JDCloudRequest
 
 
-class GetCronJobDetailRequest(JDCloudRequest):
+class DescribeInstanceVncUrlRequest(JDCloudRequest):
     """
-    获取定时任务详情
+    获取云主机vnc，用于连接管理云主机。<br>
+vnc地址的有效期为1个小时，调用接口获取vnc地址后如果1个小时内没有使用，vnc地址自动失效，再次使用需要重新获取。
+
     """
 
     def __init__(self, parameters, header=None, version="v1"):
-        super(GetCronJobDetailRequest, self).__init__(
-            '/regions/{regionId}/cronJob:detail', 'POST', header, version)
+        super(DescribeInstanceVncUrlRequest, self).__init__(
+            '/regions/{regionId}/instances/{instanceId}/vnc', 'GET', header, version)
         self.parameters = parameters
 
 
-class GetCronJobDetailParameters(object):
+class DescribeInstanceVncUrlParameters(object):
 
-    def __init__(self, regionId, planId, ):
+    def __init__(self, regionId, instanceId, ):
         """
         :param regionId: 地域ID
-        :param planId: 执行计划的Id
+        :param instanceId: 云主机ID
         """
 
         self.regionId = regionId
-        self.planId = planId
-        self.selectParams = None
-
-    def setSelectParams(self, selectParams):
-        """
-        :param selectParams: (Optional) 
-        """
-        self.selectParams = selectParams
+        self.instanceId = instanceId
 

…ices/jmr/apis/GetCronJobDetailRequest.py …ne/apis/DescribeInstanceVncUrlRequest.pyjdcloud_sdk/services/jmr/apis/GetCronJobDetailRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/DescribeInstanceVncUrlRequest.py jdcloud_sdk/services/jmr/apis/GetCronJobDetailRequest.py renamed to jdcloud_sdk/services/apigatewaytestproductline/apis/DescribeInstanceVncUrlRequest.py

@@ -0,0 +1,75 @@
+# 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 DescribeInstancesRequest(JDCloudRequest):
+    """
+    批量查询云主机的详细信息<br>
+此接口支持分页查询，默认每页20条。
+
+    """
+
+    def __init__(self, parameters, header=None, version="v1"):
+        super(DescribeInstancesRequest, self).__init__(
+            '/regions/{regionId}/instances', 'GET', header, version)
+        self.parameters = parameters
+
+
+class DescribeInstancesParameters(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) 分页大小；默认为20；取值范围[10, 100]
+        """
+        self.pageSize = pageSize
+
+    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 - 错误域，支持多个
+
+        """
+        self.filters = filters
+