release 3.0.12.1

TencentCloud · Jun 21, 2018 · b7ced88 · b7ced88
1 parent b75117b
commit b7ced88
Show file tree

Hide file tree

Showing 7 changed files with 344 additions and 155 deletions.
diff --git a/tccli/__init__.py b/tccli/__init__.py
@@ -1 +1 @@
-__version__ = '3.0.11.1'
+__version__ = '3.0.12.1'
diff --git a/tccli/services/cbs/cbs_client.py b/tccli/services/cbs/cbs_client.py
@@ -35,6 +35,7 @@ def doCreateDisks(argv, arglist):
         "SnapshotId": Utils.try_to_json(argv, "--SnapshotId"),
         "ClientToken": Utils.try_to_json(argv, "--ClientToken"),
         "Encrypt": Utils.try_to_json(argv, "--Encrypt"),
+        "Tags": Utils.try_to_json(argv, "--Tags"),
 
     }
     cred = credential.Credential(g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey])

diff --git a/tccli/services/cbs/v20170312/help.py b/tccli/services/cbs/v20170312/help.py
@@ -29,7 +29,7 @@
       },
       {
         "name": "DiskSize",
-        "desc": "云硬盘大小，单位为GB。<br><li>如果传入`SnapshotId`则可不传`DiskSize`，此时新建云盘的大小为快照大小<br><li>如果传入`SnapshotId`同时传入`DiskSize`，则云盘大小必须大于或等于快照大小<br><li>云盘大小取值范围： 普通云硬盘:10GB ~ 4000G；高性能云硬盘:50GB ~ 4000GB；SSD云硬盘:100GB ~ 4000GB。步长均为10GB"
+        "desc": "云硬盘大小，单位为GB。<br><li>如果传入`SnapshotId`则可不传`DiskSize`，此时新建云盘的大小为快照大小<br><li>如果传入`SnapshotId`同时传入`DiskSize`，则云盘大小必须大于或等于快照大小<br><li>云盘大小取值范围参见云硬盘[产品分类](/document/product/362/2353)的说明。"
       },
       {
         "name": "SnapshotId",
@@ -42,6 +42,10 @@
       {
         "name": "Encrypt",
         "desc": "传入该参数用于创建加密云盘，取值固定为ENCRYPT。"
+      },
+      {
+        "name": "Tags",
+        "desc": "云盘绑定的标签。"
       }
     ],
     "desc": "本接口（CreateDisks）用于创建云硬盘。\n\n* 预付费云盘的购买会预先扣除本次云盘购买所需金额，在调用本接口前请确保账户余额充足。\n* 本接口支持传入数据盘快照来创建云盘，实现将快照数据复制到新购云盘上。\n* 本接口为异步接口，当创建请求下发成功后会返回一个新建的云盘ID列表，此时云盘的创建并未立即完成。可以通过调用[DescribeDisks](/document/product/362/16315)接口根据DiskId查询对应云盘，如果能查到云盘，且状态为'UNATTACHED'或'ATTACHED'，则表示创建成功。"
@@ -75,7 +79,7 @@
       },
       {
         "name": "DiskSize",
-        "desc": "云硬盘扩容后的大小，单位为GB，不得小于当前云硬盘大小。取值范围： 普通云硬盘:10GB ~ 4000G；高性能云硬盘:50GB ~ 4000GB；SSD云硬盘:100GB ~ 4000GB，步长均为10GB。"
+        "desc": "云硬盘扩容后的大小，单位为GB，不得小于当前云硬盘大小。云盘大小取值范围参见云硬盘[产品分类](/document/product/362/2353)的说明。"
       },
       {
         "name": "ProjectId",
@@ -176,7 +180,7 @@
         "desc": "快照原云硬盘ID，可通过[DescribeDisks](/document/product/362/16315)接口查询。"
       }
     ],
-    "desc": "本接口（ApplySnapshot）用于回滚快照到原云硬盘。\n\n* 仅支持回滚到原云硬盘上。对于数据盘快照，如果您需要复制快照数据到其它云硬盘上，请使用[CreateDisks](/document/product/362/16312)接口创建新的弹性云盘，将快照数据复制到新购云盘上。 \n* 用于回滚的快照必须处于NORMAL状态。快照状态可以通过[DescribeSnapshots](/document/product/362/15647)接口查询，见输出参数中SnapshotState字段解释。\n* 如果是弹性云盘，则云盘必须处于未挂载状态，云硬盘挂载状态可以通过[DescribeDisks](/document/product/362/16315)接口查询，见Attached字段解释；如果是随云主机一起购买的非弹性云盘，则云主机必须处于关机状态，云主机状态可以通过[DescribeInstancesStatus](/document/product/213/15738)接口查询。"
+    "desc": "本接口（ApplySnapshot）用于回滚快照到原云硬盘。\n\n* 仅支持回滚到原云硬盘上。对于数据盘快照，如果您需要复制快照数据到其它云硬盘上，请使用[CreateDisks](/document/product/362/16312)接口创建新的弹性云盘，将快照数据复制到新购云盘上。 \n* 用于回滚的快照必须处于NORMAL状态。快照状态可以通过[DescribeSnapshots](/document/product/362/15647)接口查询，见输出参数中SnapshotState字段解释。\n* 如果是弹性云盘，则云盘必须处于未挂载状态，云硬盘挂载状态可以通过[DescribeDisks](/document/product/362/16315)接口查询，见Attached字段解释；如果是随实例一起购买的非弹性云盘，则实例必须处于关机状态，实例状态可以通过[DescribeInstancesStatus](/document/product/213/15738)接口查询。"
   },
   "ModifySnapshotAttribute": {
     "params": [
@@ -313,7 +317,7 @@
       },
       {
         "name": "DiskSize",
-        "desc": "云硬盘扩容后的大小，单位为GB，必须大于当前云硬盘大小。取值范围： 普通云硬盘:10GB ~ 4000G；高性能云硬盘:50GB ~ 4000GB；SSD云硬盘:100GB ~ 4000GB，步长均为10GB。"
+        "desc": "云硬盘扩容后的大小，单位为GB，必须大于当前云硬盘大小。云盘大小取值范围参见云硬盘[产品分类](/document/product/362/2353)的说明。"
       }
     ],
     "desc": "本接口（ResizeDisk）用于扩容云硬盘。\n\n* 只支持扩容弹性云盘。云硬盘类型可以通过[DescribeDisks](/document/product/362/16315)接口查询，见输出参数中Portable字段解释。随云主机创建的云硬盘需通过[ResizeInstanceDisks](/document/product/213/15731)接口扩容。\n* 本接口为异步接口，接口成功返回时，云盘并未立即扩容到指定大小，可通过接口[DescribeDisks](/document/product/362/16315)来查询对应云盘的状态，如果云盘的状态为“EXPANDING”，表示正在扩容中，当状态变为“UNATTACHED”，表示扩容完成。 "

diff --git a/tccli/services/cvm/cvm_client.py b/tccli/services/cvm/cvm_client.py
@@ -189,31 +189,16 @@ def doDescribeImageSharePermission(argv, arglist):
     FormatOutput.output("action", jsonobj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doInquiryPriceRunInstances(argv, arglist):
+def doInquiryPriceModifyInstancesChargeType(argv, arglist):
     g_param = parse_global_arg(argv)
     if "help" in argv:
-        show_help("InquiryPriceRunInstances", g_param[OptionsDefine.Version])
+        show_help("InquiryPriceModifyInstancesChargeType", g_param[OptionsDefine.Version])
         return
 
     param = {
+        "InstanceIds": Utils.try_to_json(argv, "--InstanceIds"),
         "InstanceChargeType": Utils.try_to_json(argv, "--InstanceChargeType"),
         "InstanceChargePrepaid": Utils.try_to_json(argv, "--InstanceChargePrepaid"),
-        "Placement": Utils.try_to_json(argv, "--Placement"),
-        "InstanceType": Utils.try_to_json(argv, "--InstanceType"),
-        "ImageId": Utils.try_to_json(argv, "--ImageId"),
-        "SystemDisk": Utils.try_to_json(argv, "--SystemDisk"),
-        "DataDisks": Utils.try_to_json(argv, "--DataDisks"),
-        "VirtualPrivateCloud": Utils.try_to_json(argv, "--VirtualPrivateCloud"),
-        "InternetAccessible": Utils.try_to_json(argv, "--InternetAccessible"),
-        "InstanceCount": Utils.try_to_json(argv, "--InstanceCount"),
-        "InstanceName": Utils.try_to_json(argv, "--InstanceName"),
-        "LoginSettings": Utils.try_to_json(argv, "--LoginSettings"),
-        "SecurityGroupIds": Utils.try_to_json(argv, "--SecurityGroupIds"),
-        "EnhancedService": Utils.try_to_json(argv, "--EnhancedService"),
-        "ClientToken": Utils.try_to_json(argv, "--ClientToken"),
-        "HostName": Utils.try_to_json(argv, "--HostName"),
-        "TagSpecification": Utils.try_to_json(argv, "--TagSpecification"),
-        "InstanceMarketOptions": Utils.try_to_json(argv, "--InstanceMarketOptions"),
 
     }
     cred = credential.Credential(g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey])
@@ -227,9 +212,9 @@ def doInquiryPriceRunInstances(argv, arglist):
     client = mod.CvmClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.InquiryPriceRunInstancesRequest()
+    model = models.InquiryPriceModifyInstancesChargeTypeRequest()
     model.from_json_string(json.dumps(param))
-    rsp = client.InquiryPriceRunInstances(model)
+    rsp = client.InquiryPriceModifyInstancesChargeType(model)
     result = rsp.to_json_string()
     jsonobj = None
     try:
@@ -311,6 +296,41 @@ def doDescribeImages(argv, arglist):
     FormatOutput.output("action", jsonobj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyKeyPairAttribute(argv, arglist):
+    g_param = parse_global_arg(argv)
+    if "help" in argv:
+        show_help("ModifyKeyPairAttribute", g_param[OptionsDefine.Version])
+        return
+
+    param = {
+        "KeyId": Utils.try_to_json(argv, "--KeyId"),
+        "KeyName": Utils.try_to_json(argv, "--KeyName"),
+        "Description": Utils.try_to_json(argv, "--Description"),
+
+    }
+    cred = credential.Credential(g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey])
+    http_profile = HttpProfile(
+        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+        reqMethod="POST",
+        endpoint=g_param[OptionsDefine.Endpoint]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.CvmClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ModifyKeyPairAttributeRequest()
+    model.from_json_string(json.dumps(param))
+    rsp = client.ModifyKeyPairAttribute(model)
+    result = rsp.to_json_string()
+    jsonobj = None
+    try:
+        jsonobj = json.loads(result)
+    except TypeError as e:
+        jsonobj = json.loads(result.decode('utf-8')) # python3.3
+    FormatOutput.output("action", jsonobj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doDescribeZoneInstanceConfigInfos(argv, arglist):
     g_param = parse_global_arg(argv)
     if "help" in argv:
@@ -1360,17 +1380,15 @@ def doDescribeImportImageOs(argv, arglist):
     FormatOutput.output("action", jsonobj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doResetInstancesInternetMaxBandwidth(argv, arglist):
+def doModifyInstancesProject(argv, arglist):
     g_param = parse_global_arg(argv)
     if "help" in argv:
-        show_help("ResetInstancesInternetMaxBandwidth", g_param[OptionsDefine.Version])
+        show_help("ModifyInstancesProject", g_param[OptionsDefine.Version])
         return
 
     param = {
         "InstanceIds": Utils.try_to_json(argv, "--InstanceIds"),
-        "InternetAccessible": Utils.try_to_json(argv, "--InternetAccessible"),
-        "StartTime": Utils.try_to_json(argv, "--StartTime"),
-        "EndTime": Utils.try_to_json(argv, "--EndTime"),
+        "ProjectId": Utils.try_to_json(argv, "--ProjectId"),
 
     }
     cred = credential.Credential(g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey])
@@ -1384,9 +1402,9 @@ def doResetInstancesInternetMaxBandwidth(argv, arglist):
     client = mod.CvmClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ResetInstancesInternetMaxBandwidthRequest()
+    model = models.ModifyInstancesProjectRequest()
     model.from_json_string(json.dumps(param))
-    rsp = client.ResetInstancesInternetMaxBandwidth(model)
+    rsp = client.ModifyInstancesProject(model)
     result = rsp.to_json_string()
     jsonobj = None
     try:
@@ -1431,16 +1449,31 @@ def doInquiryPriceRenewInstances(argv, arglist):
     FormatOutput.output("action", jsonobj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyKeyPairAttribute(argv, arglist):
+def doInquiryPriceRunInstances(argv, arglist):
     g_param = parse_global_arg(argv)
     if "help" in argv:
-        show_help("ModifyKeyPairAttribute", g_param[OptionsDefine.Version])
+        show_help("InquiryPriceRunInstances", g_param[OptionsDefine.Version])
         return
 
     param = {
-        "KeyId": Utils.try_to_json(argv, "--KeyId"),
-        "KeyName": Utils.try_to_json(argv, "--KeyName"),
-        "Description": Utils.try_to_json(argv, "--Description"),
+        "InstanceChargeType": Utils.try_to_json(argv, "--InstanceChargeType"),
+        "InstanceChargePrepaid": Utils.try_to_json(argv, "--InstanceChargePrepaid"),
+        "Placement": Utils.try_to_json(argv, "--Placement"),
+        "InstanceType": Utils.try_to_json(argv, "--InstanceType"),
+        "ImageId": Utils.try_to_json(argv, "--ImageId"),
+        "SystemDisk": Utils.try_to_json(argv, "--SystemDisk"),
+        "DataDisks": Utils.try_to_json(argv, "--DataDisks"),
+        "VirtualPrivateCloud": Utils.try_to_json(argv, "--VirtualPrivateCloud"),
+        "InternetAccessible": Utils.try_to_json(argv, "--InternetAccessible"),
+        "InstanceCount": Utils.try_to_json(argv, "--InstanceCount"),
+        "InstanceName": Utils.try_to_json(argv, "--InstanceName"),
+        "LoginSettings": Utils.try_to_json(argv, "--LoginSettings"),
+        "SecurityGroupIds": Utils.try_to_json(argv, "--SecurityGroupIds"),
+        "EnhancedService": Utils.try_to_json(argv, "--EnhancedService"),
+        "ClientToken": Utils.try_to_json(argv, "--ClientToken"),
+        "HostName": Utils.try_to_json(argv, "--HostName"),
+        "TagSpecification": Utils.try_to_json(argv, "--TagSpecification"),
+        "InstanceMarketOptions": Utils.try_to_json(argv, "--InstanceMarketOptions"),
 
     }
     cred = credential.Credential(g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey])
@@ -1454,9 +1487,9 @@ def doModifyKeyPairAttribute(argv, arglist):
     client = mod.CvmClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyKeyPairAttributeRequest()
+    model = models.InquiryPriceRunInstancesRequest()
     model.from_json_string(json.dumps(param))
-    rsp = client.ModifyKeyPairAttribute(model)
+    rsp = client.InquiryPriceRunInstances(model)
     result = rsp.to_json_string()
     jsonobj = None
     try:
@@ -1606,15 +1639,16 @@ def doDescribeInstanceFamilyConfigs(argv, arglist):
     FormatOutput.output("action", jsonobj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyInstancesProject(argv, arglist):
+def doModifyInstancesChargeType(argv, arglist):
     g_param = parse_global_arg(argv)
     if "help" in argv:
-        show_help("ModifyInstancesProject", g_param[OptionsDefine.Version])
+        show_help("ModifyInstancesChargeType", g_param[OptionsDefine.Version])
         return
 
     param = {
         "InstanceIds": Utils.try_to_json(argv, "--InstanceIds"),
-        "ProjectId": Utils.try_to_json(argv, "--ProjectId"),
+        "InstanceChargeType": Utils.try_to_json(argv, "--InstanceChargeType"),
+        "InstanceChargePrepaid": Utils.try_to_json(argv, "--InstanceChargePrepaid"),
 
     }
     cred = credential.Credential(g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey])
@@ -1628,9 +1662,9 @@ def doModifyInstancesProject(argv, arglist):
     client = mod.CvmClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyInstancesProjectRequest()
+    model = models.ModifyInstancesChargeTypeRequest()
     model.from_json_string(json.dumps(param))
-    rsp = client.ModifyInstancesProject(model)
+    rsp = client.ModifyInstancesChargeType(model)
     result = rsp.to_json_string()
     jsonobj = None
     try:
@@ -1743,6 +1777,42 @@ def doStartInstances(argv, arglist):
     FormatOutput.output("action", jsonobj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doResetInstancesInternetMaxBandwidth(argv, arglist):
+    g_param = parse_global_arg(argv)
+    if "help" in argv:
+        show_help("ResetInstancesInternetMaxBandwidth", g_param[OptionsDefine.Version])
+        return
+
+    param = {
+        "InstanceIds": Utils.try_to_json(argv, "--InstanceIds"),
+        "InternetAccessible": Utils.try_to_json(argv, "--InternetAccessible"),
+        "StartTime": Utils.try_to_json(argv, "--StartTime"),
+        "EndTime": Utils.try_to_json(argv, "--EndTime"),
+
+    }
+    cred = credential.Credential(g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey])
+    http_profile = HttpProfile(
+        reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+        reqMethod="POST",
+        endpoint=g_param[OptionsDefine.Endpoint]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.CvmClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ResetInstancesInternetMaxBandwidthRequest()
+    model.from_json_string(json.dumps(param))
+    rsp = client.ResetInstancesInternetMaxBandwidth(model)
+    result = rsp.to_json_string()
+    jsonobj = None
+    try:
+        jsonobj = json.loads(result)
+    except TypeError as e:
+        jsonobj = json.loads(result.decode('utf-8')) # python3.3
+    FormatOutput.output("action", jsonobj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doDescribeKeyPairs(argv, arglist):
     g_param = parse_global_arg(argv)
     if "help" in argv:
@@ -1967,9 +2037,10 @@ def doDescribeInstanceTypeConfigs(argv, arglist):
     "DescribeInstancesStatus": doDescribeInstancesStatus,
     "ModifyImageSharePermission": doModifyImageSharePermission,
     "DescribeImageSharePermission": doDescribeImageSharePermission,
-    "InquiryPriceRunInstances": doInquiryPriceRunInstances,
+    "InquiryPriceModifyInstancesChargeType": doInquiryPriceModifyInstancesChargeType,
     "ModifyHostsAttribute": doModifyHostsAttribute,
     "DescribeImages": doDescribeImages,
+    "ModifyKeyPairAttribute": doModifyKeyPairAttribute,
     "DescribeZoneInstanceConfigInfos": doDescribeZoneInstanceConfigInfos,
     "ModifyInstancesAttribute": doModifyInstancesAttribute,
     "SyncImages": doSyncImages,
@@ -2000,17 +2071,18 @@ def doDescribeInstanceTypeConfigs(argv, arglist):
     "DescribeRegions": doDescribeRegions,
     "DeleteDisasterRecoverGroups": doDeleteDisasterRecoverGroups,
     "DescribeImportImageOs": doDescribeImportImageOs,
-    "ResetInstancesInternetMaxBandwidth": doResetInstancesInternetMaxBandwidth,
+    "ModifyInstancesProject": doModifyInstancesProject,
     "InquiryPriceRenewInstances": doInquiryPriceRenewInstances,
-    "ModifyKeyPairAttribute": doModifyKeyPairAttribute,
+    "InquiryPriceRunInstances": doInquiryPriceRunInstances,
     "ImportImage": doImportImage,
     "RenewInstances": doRenewInstances,
     "ModifyDisasterRecoverGroupAttribute": doModifyDisasterRecoverGroupAttribute,
     "DescribeInstanceFamilyConfigs": doDescribeInstanceFamilyConfigs,
-    "ModifyInstancesProject": doModifyInstancesProject,
+    "ModifyInstancesChargeType": doModifyInstancesChargeType,
     "RenewHosts": doRenewHosts,
     "DescribeDisasterRecoverGroups": doDescribeDisasterRecoverGroups,
     "StartInstances": doStartInstances,
+    "ResetInstancesInternetMaxBandwidth": doResetInstancesInternetMaxBandwidth,
     "DescribeKeyPairs": doDescribeKeyPairs,
     "DescribeHosts": doDescribeHosts,
     "AllocateHosts": doAllocateHosts,