tccli 3.0.1302.1__py2.py3-none-any.whl → 3.0.1303.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1302.1'
+__version__ = '3.0.1303.1'

tccli/services/billing/v20180709/api.json

@@ -10982,7 +10982,7 @@
         {
           "disabled": false,
           "document": "各地域花费分布详情\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "[{\"ProjectId\":\"0\",\"RealTotalCost\":\"2924616.19000000\",\"TotalCost\":\"6622736.21547221\",\"CashPayAmount\":\"2924616.19000000\",\"IncentivePayAmount\":\"0.00000000\",\"VoucherPayAmount\":\"0.00000000\",\"TransferPayAmount\":\"0.00000000\",\"BillMonth\":\"2024-01\",\"RealTotalCostRatio\":\"100.00\",\"ProjectName\":\"默认项目\"}]",
+          "example": "无",
           "member": "RegionSummaryOverviewItem",
           "name": "SummaryOverview",
           "output_required": true,
@@ -11205,7 +11205,7 @@
         {
           "disabled": false,
           "document": "账单多维度汇总消费详情",
-          "example": "[{\"tagValue\":\"运维服务-temp\",\"business\":[{\"businessCode\":\"p_cvm\",\"businessCodeName\":\"云服务器CVM\",\"totalCost\":\"385.50\",\"realTotalCost\":\"212.03\",\"cashPayAmount\":\"212.03\",\"incentivePayAmount\":\"0.00\",\"voucherPayAmount\":\"0.00\",\"transferPayAmount\":\"0.00\",\"trend\":{\"type\":\"type_a\",\"value\":\"0.00\",\"preMonthRealTotalCost\":\"212.03\"}}],\"totalCost\":\"385.50\",\"realTotalCost\":\"212.03\",\"cashPayAmount\":\"212.03\",\"incentivePayAmount\":\"0.00\",\"voucherPayAmount\":\"0.00\",\"transferPayAmount\":\"0.00\",\"trend\":{\"type\":\"type_a\",\"value\":\"47.59\",\"preMonthRealTotalCost\":\"404.53\"}}]",
+          "example": "无",
           "member": "SummaryDetail",
           "name": "SummaryDetail",
           "output_required": true,

tccli/services/billing/v20180709/examples.json

@@ -168,7 +168,7 @@
       {
         "document": "获取按产品维度汇总费用明细",
         "input": "POST / HTTP/1.1\nHost: billing.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeBillSummary\n<公共请求参数>\n\n{\n    \"Month\": \"2023-04\",\n    \"GroupType\": \"business\"\n}",
-        "output": "{\n    \"Response\": {\n        \"Ready\": 1,\n        \"RequestId\": \"db6f4a8c-c8b3-4d86-836a-b0897e772b22\",\n        \"SummaryDetail\": [\n            {\n                \"Business\": null,\n                \"CashPayAmount\": \"5661.16\",\n                \"GroupKey\": \"p_rav\",\n                \"GroupValue\": \"实时音视频\",\n                \"IncentivePayAmount\": \"0.00\",\n                \"RealTotalCost\": \"5661.16\",\n                \"TotalCost\": \"24600.63\",\n                \"TransferPayAmount\": \"0.00\",\n                \"VoucherPayAmount\": \"0.00\"\n            },\n            {\n                \"Business\": null,\n                \"CashPayAmount\": \"4783.65\",\n                \"GroupKey\": \"p_cvm\",\n                \"GroupValue\": \"云服务器CVM\",\n                \"IncentivePayAmount\": \"0.00\",\n                \"RealTotalCost\": \"5069.65\",\n                \"TotalCost\": \"13178.28\",\n                \"TransferPayAmount\": \"0.00\",\n                \"VoucherPayAmount\": \"286.00\"\n            }\n        ]\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"Ready\": 1,\n        \"RequestId\": \"db6f4a8c-c8b3-4d86-836a-b0897e772b22\",\n        \"SummaryDetail\": [\n            {\n                \"Business\": [],\n                \"CashPayAmount\": \"5661.16\",\n                \"GroupKey\": \"p_rav\",\n                \"GroupValue\": \"实时音视频\",\n                \"IncentivePayAmount\": \"0.00\",\n                \"RealTotalCost\": \"5661.16\",\n                \"TotalCost\": \"24600.63\",\n                \"TransferPayAmount\": \"0.00\",\n                \"VoucherPayAmount\": \"0.00\"\n            },\n            {\n                \"Business\": [],\n                \"CashPayAmount\": \"4783.65\",\n                \"GroupKey\": \"p_cvm\",\n                \"GroupValue\": \"云服务器CVM\",\n                \"IncentivePayAmount\": \"0.00\",\n                \"RealTotalCost\": \"5069.65\",\n                \"TotalCost\": \"13178.28\",\n                \"TransferPayAmount\": \"0.00\",\n                \"VoucherPayAmount\": \"286.00\"\n            }\n        ]\n    }\n}",
         "title": "获取按产品维度汇总费用明细"
       },
       {
@@ -292,7 +292,7 @@
       {
         "document": "获取按地域汇总消耗详情",
         "input": "POST / HTTP/1.1\nHost: billing.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeCostSummaryByRegion\n<公共请求参数>\n\n{\n    \"NeedRecordNum\": \"1\",\n    \"EndTime\": \"2018-11\",\n    \"Limit\": \"1\",\n    \"BeginTime\": \"2018-11\",\n    \"Offset\": \"0\"\n}",
-        "output": "{\n    \"Response\": {\n        \"Ready\": 1,\n        \"RecordNum\": 0,\n        \"Total\": {\n            \"RealTotalCost\": \"91.04\"\n        },\n        \"Data\": [\n            {\n                \"RegionId\": \"18\",\n                \"RegionName\": \"Asia Pacific (Seoul)\",\n                \"RealTotalCost\": \"67.00\",\n                \"CashPayAmount\": \"66.99654091\",\n                \"VoucherPayAmount\": \"0.00000000\",\n                \"IncentivePayAmount\": \"0.00000000\",\n                \"TransferPayAmount\": \"0.00000000\",\n                \"Trend\": {\n                    \"Type\": \"none\",\n                    \"Value\": null\n                },\n                \"Business\": [\n                    {\n                        \"BusinessCode\": \"p_cos\",\n                        \"BusinessCodeName\": \"Cloud Object Storage\",\n                        \"RegionName\": \"Asia Pacific (Seoul)\",\n                        \"RealTotalCost\": \"66.99654091\",\n                        \"CashPayAmount\": \"66.99654091\",\n                        \"IncentivePayAmount\": \"0.00000000\",\n                        \"VoucherPayAmount\": \"0.00000000\",\n                        \"TransferPayAmount\": \"0.00000000\",\n                        \"Trend\": {\n                            \"Type\": \"none\",\n                            \"Value\": null\n                        }\n                    }\n                ]\n            }\n        ],\n        \"RequestId\": \"cdf3ef28-5ec7-4915-9cc8-a07210dc1f28\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"Ready\": 1,\n        \"RecordNum\": 0,\n        \"Total\": {\n            \"RealTotalCost\": \"91.04\"\n        },\n        \"Data\": [\n            {\n                \"RegionId\": \"18\",\n                \"RegionName\": \"Asia Pacific (Seoul)\",\n                \"RealTotalCost\": \"67.00\",\n                \"CashPayAmount\": \"66.99654091\",\n                \"VoucherPayAmount\": \"0.00000000\",\n                \"IncentivePayAmount\": \"0.00000000\",\n                \"TransferPayAmount\": \"0.00000000\",\n                \"Trend\": {\n                    \"Type\": \"none\",\n                    \"Value\": \"0\"\n                },\n                \"Business\": [\n                    {\n                        \"BusinessCode\": \"p_cos\",\n                        \"BusinessCodeName\": \"Cloud Object Storage\",\n                        \"RegionName\": \"Asia Pacific (Seoul)\",\n                        \"RealTotalCost\": \"66.99654091\",\n                        \"CashPayAmount\": \"66.99654091\",\n                        \"IncentivePayAmount\": \"0.00000000\",\n                        \"VoucherPayAmount\": \"0.00000000\",\n                        \"TransferPayAmount\": \"0.00000000\",\n                        \"Trend\": {\n                            \"Type\": \"none\",\n                            \"Value\": \"0\"\n                        }\n                    }\n                ]\n            }\n        ],\n        \"RequestId\": \"cdf3ef28-5ec7-4915-9cc8-a07210dc1f28\"\n    }\n}",
         "title": "获取按地域汇总消耗详情"
       }
     ],

tccli/services/cam/v20190116/api.json

@@ -3663,13 +3663,13 @@
       "members": [
         {
           "disabled": false,
-          "document": "策略版本详情\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "策略版本详情",
           "example": "{\"VersionId\":2,\"CreateDate\":\"2019-08-09T10:31:47Z\",\"IsDefaultVersion\":1,\"Document\":\"{\\\"version\\\":\\\"2.0\\\",\\\"statement\\\":[{\\\"effect\\\":\\\"allow\\\",\\\"action\\\":[\\\"name\\\\/cos:*\\\"],\\\"resource\\\":[\\\"*\\\"]}]}\"}",
           "member": "PolicyVersionDetail",
           "name": "PolicyVersion",
           "output_required": true,
           "type": "object",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",

tccli/services/cat/v20180409/api.json

@@ -639,6 +639,36 @@
     "DescribeNodeGroupsResponse": {
       "document": "DescribeNodeGroups返回参数结构体",
       "members": [
+        {
+          "disabled": false,
+          "document": "树状节点列表，总共两级\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "NodeTree",
+          "name": "NodeList",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "省份或国家列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "DistinctOrNetServiceInfo",
+          "name": "DistrictList",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "运营商列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "DistinctOrNetServiceInfo",
+          "name": "NetServiceList",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": true
+        },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
           "member": "string",
@@ -1076,6 +1106,32 @@
       ],
       "usage": "out"
     },
+    "DistinctOrNetServiceInfo": {
+      "document": "省份(国际)或运营商基本信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "省份(国际)或运营商ID",
+          "example": "100",
+          "member": "string",
+          "name": "ID",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "名称",
+          "example": "广东",
+          "member": "string",
+          "name": "Name",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "Field": {
       "document": "储存float类型字段",
       "members": [
@@ -1386,6 +1442,104 @@
       ],
       "usage": "out"
     },
+    "NodeInfoBase": {
+      "document": "Node节点基本信息，用于新建任务页面重构节点选择",
+      "members": [
+        {
+          "disabled": false,
+          "document": "节点code",
+          "example": "10000",
+          "member": "string",
+          "name": "ID",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节点名称",
+          "example": "北京-北京市-中国电信[IDC]",
+          "member": "string",
+          "name": "Content",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
+    "NodeLeaf": {
+      "document": "子节点。用于新建任务重构页面的节点选择",
+      "members": [
+        {
+          "disabled": false,
+          "document": "子节点ID",
+          "example": "1100201",
+          "member": "string",
+          "name": "ID",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "子节点名称",
+          "example": "广东",
+          "member": "string",
+          "name": "Content",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节点列表",
+          "example": "无",
+          "member": "NodeInfoBase",
+          "name": "Children",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
+    "NodeTree": {
+      "document": "拨测节点数（新建任务页面重构）",
+      "members": [
+        {
+          "disabled": false,
+          "document": "节点ID",
+          "example": "1100201",
+          "member": "string",
+          "name": "ID",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节点名称",
+          "example": "子节点名称",
+          "member": "string",
+          "name": "Content",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "子节点",
+          "example": "无",
+          "member": "NodeLeaf",
+          "name": "Children",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "ProbeTask": {
       "document": "拨测任务",
       "members": [

tccli/services/cat/v20180409/examples.json

@@ -42,19 +42,19 @@
       {
         "document": "获取拨测点组\n",
         "input": "POST / HTTP/1.1\nHost: cat.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeNodeGroups\nX-TC-Language: zh-CN\n<公共请求参数>\n\n{\n    \"RegionID\": 1,\n    \"NetServiceID\": 99\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"fyy3-g7ujmxbouxshy3plmkmhlnmdbfh\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"DistrictList\": [\n            {\n                \"ID\": \"0\",\n                \"Name\": \"全部\"\n            },\n            {\n                \"ID\": \"1100100\",\n                \"Name\": \"黑龙江\"\n            }\n        ],\n        \"NetServiceList\": [\n            {\n                \"ID\": \"0\",\n                \"Name\": \"全部\"\n            },\n            {\n                \"ID\": \"99\",\n                \"Name\": \"其他\"\n            }\n        ],\n        \"NodeList\": [\n            {\n                \"ID\": \"1102700\",\n                \"Content\": \"黑龙江\",\n                \"Children\": [\n                    {\n                        \"ID\": \"1102701\",\n                        \"Content\": \"哈尔滨市\",\n                        \"Children\": [\n                            {\n                                \"ID\": \"11537\",\n                                \"Content\": \"黑龙江-哈尔滨市-广电宽带[LM]\"\n                            }\n                        ]\n                    }\n                ]\n            }\n        ],\n        \"RequestId\": \"fyy3-g7ujmxbouxshy3plmkmhlnmdbfh\"\n    }\n}",
         "title": "获取拨测点组"
       },
       {
         "document": "获取定时任务中网络质量任务类型，PC类任务的可用性拨测点组",
         "input": "POST / HTTP/1.1\nHost: cat.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeNodeGroups\nX-TC-Language: zh-CN\n<公共请求参数>\n\n{\n    \"NodeGroupType\": 1,\n    \"IPType\": 0,\n    \"NodeType\": [\n        1\n    ],\n    \"TaskType\": 5,\n    \"ProbeType\": 0\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"3ea82ed9-5901-4c69-b5e2-c4c84c9538e5\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"DistrictList\": [],\n        \"NetServiceList\": [],\n        \"NodeList\": [\n            {\n                \"ID\": \"PC\",\n                \"Content\": \"PC\",\n                \"Children\": [\n                    {\n                        \"ID\": \"125\",\n                        \"Content\": \"国内区域可用性探测\",\n                        \"Children\": [\n                            {\n                                \"ID\": \"12136\",\n                                \"Content\": \"广东-深圳市[IDC]\"\n                            }\n                        ]\n                    },\n                    {\n                        \"ID\": \"126\",\n                        \"Content\": \"国内十大城市\",\n                        \"Children\": [\n                            {\n                                \"ID\": \"12136\",\n                                \"Content\": \"广东-深圳市[IDC]\"\n                            }\n                        ]\n                    },\n                    {\n                        \"ID\": \"127\",\n                        \"Content\": \"国内主要城市运营商\",\n                        \"Children\": [\n                            {\n                                \"ID\": \"12058\",\n                                \"Content\": \"广东-广州市-中国移动[IDC]\"\n                            }\n                        ]\n                    },\n                    {\n                        \"ID\": \"141\",\n                        \"Content\": \"海外主要城市\",\n                        \"Children\": [\n                            {\n                                \"ID\": \"12170\",\n                                \"Content\": \"美国-弗吉尼亚州[IDC]\"\n                            }\n                        ]\n                    },\n                    {\n                        \"ID\": \"142\",\n                        \"Content\": \"港澳台主要城市\",\n                        \"Children\": [\n                            {\n                                \"ID\": \"12181\",\n                                \"Content\": \"香港-香港特区[IDC]\"\n                            }\n                        ]\n                    }\n                ]\n            }\n        ],\n        \"RequestId\": \"3ea82ed9-5901-4c69-b5e2-c4c84c9538e5\"\n    }\n}",
         "title": "获取定时任务拨测点组"
       },
       {
         "document": "获取即时拨测任务中网络质量任务类型，PC类任务的精选拨测点组",
         "input": "POST / HTTP/1.1\nHost: cat.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeNodeGroups\nX-TC-Language: zh-CN\n<公共请求参数>\n\n{\n    \"NodeGroupType\": 0,\n    \"TaskCategory\": 1,\n    \"IPType\": 0,\n    \"NodeType\": [\n        1,\n        2\n    ],\n    \"TaskType\": 5,\n    \"ProbeType\": 1\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"248cfe54-6cb6-46c7-b73d-9c78108add00\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"DistrictList\": [],\n        \"NetServiceList\": [\n            {\n                \"ID\": \"0\",\n                \"Name\": \"全部\"\n            }\n        ],\n        \"NodeList\": [\n            {\n                \"ID\": \"IDC\",\n                \"Content\": \"IDC\",\n                \"Children\": [\n                    {\n                        \"ID\": \"560\",\n                        \"Content\": \"境内主要城市运营商\",\n                        \"Children\": [\n                            {\n                                \"ID\": \"10000\",\n                                \"Content\": \"北京-北京市-中国电信[IDC]\"\n                            }\n                        ]\n                    }\n                ]\n            },\n            {\n                \"ID\": \"LastMile\",\n                \"Content\": \"LastMile\",\n                \"Children\": [\n                    {\n                        \"ID\": \"27\",\n                        \"Content\": \"省会城市-电信(Last Mile)\",\n                        \"Children\": [\n                            {\n                                \"ID\": \"10103\",\n                                \"Content\": \"北京-北京市-中国电信[LM]\"\n                            }\n                        ]\n                    }\n                ]\n            }\n        ],\n        \"RequestId\": \"248cfe54-6cb6-46c7-b73d-9c78108add00\"\n    }\n}",
         "title": "获取即时拨测拨测点组"
       }
     ],

tccli/services/ccc/v20200210/api.json

@@ -8429,7 +8429,7 @@
           "value_allowed_null": false
         },
         {
-          "disabled": false,
+          "disabled": true,
           "document": "用户角色id列表",
           "example": "[1]",
           "member": "uint64",
@@ -8438,6 +8438,16 @@
           "type": "int",
           "value_allowed_null": false
         },
+        {
+          "disabled": false,
+          "document": "用户角色id列表",
+          "example": "[1]",
+          "member": "uint64",
+          "name": "RoleList",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
         {
           "disabled": false,
           "document": "所属技能组列表",

tccli/services/gs/gs_client.py

@@ -537,7 +537,7 @@ def doCreateAndroidInstanceImage(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeInstancesCount(args, parsed_globals):
+def doModifyAndroidInstancesInformation(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -566,11 +566,11 @@ def doDescribeInstancesCount(args, parsed_globals):
     client = mod.GsClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeInstancesCountRequest()
+    model = models.ModifyAndroidInstancesInformationRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeInstancesCount(model)
+        rsp = client.ModifyAndroidInstancesInformation(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2201,6 +2201,58 @@ def doDescribeAndroidApps(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeInstancesCount(args, parsed_globals):
+    g_param = parse_global_arg(parsed_globals)
+
+    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+        cred = credential.CVMRoleCredential()
+    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+        cred = credential.STSAssumeRoleCredential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+            g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE)             and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+    else:
+        cred = credential.Credential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+        )
+    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],
+        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.GsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeInstancesCountRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeInstancesCount(model)
+        result = rsp.to_json_string()
+        try:
+            json_obj = json.loads(result)
+        except TypeError as e:
+            json_obj = json.loads(result.decode('utf-8'))  # python3.3
+        if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+            break
+        cur_time = time.time()
+        if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+            raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+            (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+            search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+        else:
+            print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+        time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+    FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doCopyAndroidInstance(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2461,6 +2513,58 @@ def doModifyAndroidInstancesUserId(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doFetchAndroidInstancesLogs(args, parsed_globals):
+    g_param = parse_global_arg(parsed_globals)
+
+    if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+        cred = credential.CVMRoleCredential()
+    elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+        cred = credential.STSAssumeRoleCredential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+            g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+        )
+    elif os.getenv(OptionsDefine.ENV_TKE_REGION)             and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID)             and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE)             and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+        cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+    else:
+        cred = credential.Credential(
+            g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+        )
+    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],
+        proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+    )
+    profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.GsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.FetchAndroidInstancesLogsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.FetchAndroidInstancesLogs(model)
+        result = rsp.to_json_string()
+        try:
+            json_obj = json.loads(result)
+        except TypeError as e:
+            json_obj = json.loads(result.decode('utf-8'))  # python3.3
+        if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+            break
+        cur_time = time.time()
+        if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+            raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+            (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+            search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+        else:
+            print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+        time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+    FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
 def doExecuteCommandOnAndroidInstances(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2794,7 +2898,7 @@ ACTION_MAP = {
     "CreateAndroidInstancesScreenshot": doCreateAndroidInstancesScreenshot,
     "UninstallAndroidInstancesApp": doUninstallAndroidInstancesApp,
     "CreateAndroidInstanceImage": doCreateAndroidInstanceImage,
-    "DescribeInstancesCount": doDescribeInstancesCount,
+    "ModifyAndroidInstancesInformation": doModifyAndroidInstancesInformation,
     "DeleteAndroidInstanceImages": doDeleteAndroidInstanceImages,
     "DescribeAndroidInstanceTasksStatus": doDescribeAndroidInstanceTasksStatus,
     "TrylockWorker": doTrylockWorker,
@@ -2826,11 +2930,13 @@ ACTION_MAP = {
     "DescribeAndroidInstanceLabels": doDescribeAndroidInstanceLabels,
     "InstallAndroidInstancesApp": doInstallAndroidInstancesApp,
     "DescribeAndroidApps": doDescribeAndroidApps,
+    "DescribeInstancesCount": doDescribeInstancesCount,
     "CopyAndroidInstance": doCopyAndroidInstance,
     "DescribeAndroidInstanceApps": doDescribeAndroidInstanceApps,
     "CreateAndroidAppVersion": doCreateAndroidAppVersion,
     "DestroyAndroidInstances": doDestroyAndroidInstances,
     "ModifyAndroidInstancesUserId": doModifyAndroidInstancesUserId,
+    "FetchAndroidInstancesLogs": doFetchAndroidInstancesLogs,
     "ExecuteCommandOnAndroidInstances": doExecuteCommandOnAndroidInstances,
     "StartPublishStreamToCSS": doStartPublishStreamToCSS,
     "StopAndroidInstances": doStopAndroidInstances,

tccli/services/gs/v20191118/api.json

@@ -182,6 +182,13 @@
       "output": "ExecuteCommandOnAndroidInstancesResponse",
       "status": "online"
     },
+    "FetchAndroidInstancesLogs": {
+      "document": "批量获取安卓实例日志",
+      "input": "FetchAndroidInstancesLogsRequest",
+      "name": "批量获取安卓实例日志",
+      "output": "FetchAndroidInstancesLogsResponse",
+      "status": "online"
+    },
     "InstallAndroidInstancesApp": {
       "document": "安装安卓实例应用",
       "input": "InstallAndroidInstancesAppRequest",
@@ -217,6 +224,13 @@
       "output": "ModifyAndroidInstanceResolutionResponse",
       "status": "online"
     },
+    "ModifyAndroidInstancesInformation": {
+      "document": "批量修改安卓实例信息",
+      "input": "ModifyAndroidInstancesInformationRequest",
+      "name": "批量修改安卓实例信息",
+      "output": "ModifyAndroidInstancesInformationResponse",
+      "status": "online"
+    },
     "ModifyAndroidInstancesLabels": {
       "document": "修改安卓实例分辨率。需要注意的是该接口可能导致正在运行的应用出现闪退，所以建议在实例维护时期才进行调用。",
       "input": "ModifyAndroidInstancesLabelsRequest",
@@ -803,6 +817,30 @@
       ],
       "usage": "out"
     },
+    "AndroidInstanceInformation": {
+      "document": "安卓实例信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "安卓实例 ID",
+          "example": "cai-abcd1234",
+          "member": "string",
+          "name": "AndroidInstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "实例名称",
+          "example": "test_name",
+          "member": "string",
+          "name": "Name",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "usage": "in"
+    },
     "AndroidInstanceLabel": {
       "document": "安卓实例标签",
       "members": [
@@ -2650,6 +2688,69 @@
       ],
       "type": "object"
     },
+    "FetchAndroidInstancesLogsRequest": {
+      "document": "FetchAndroidInstancesLogs请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "安卓实例 ID 列表",
+          "example": "[\"cai_xxx\"]",
+          "member": "string",
+          "name": "AndroidInstanceIds",
+          "required": true,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "cos 桶名称",
+          "example": "test-appid",
+          "member": "string",
+          "name": "BucketName",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "cos 桶区域",
+          "example": "ap-guangzhou",
+          "member": "string",
+          "name": "BucketRegion",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "cos 桶目录，默认为 /log/",
+          "example": "/log/",
+          "member": "string",
+          "name": "BucketDirectory",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "下载最近几天的日志，默认值为 1",
+          "example": "1",
+          "member": "uint64",
+          "name": "RecentDays",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "FetchAndroidInstancesLogsResponse": {
+      "document": "FetchAndroidInstancesLogs返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "Filter": {
       "document": "过滤",
       "members": [
@@ -2975,6 +3076,33 @@
       ],
       "type": "object"
     },
+    "ModifyAndroidInstancesInformationRequest": {
+      "document": "ModifyAndroidInstancesInformation请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "安卓实例信息数据",
+          "example": "无",
+          "member": "AndroidInstanceInformation",
+          "name": "AndroidInstanceInformations",
+          "required": true,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "ModifyAndroidInstancesInformationResponse": {
+      "document": "ModifyAndroidInstancesInformation返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ModifyAndroidInstancesLabelsRequest": {
       "document": "ModifyAndroidInstancesLabels请求参数结构体",
       "members": [