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

tccli/services/billing/v20180709/examples.json

@@ -148,7 +148,7 @@
       {
         "document": "获取账单资源汇总",
         "input": "POST / HTTP/1.1\nHost: billing.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeOrganizationBillResourceSummary\n<公共请求参数>\n\n{\n    \"Offset\": 0,\n    \"Limit\": 1,\n    \"Month\": \"2023-08\",\n    \"NeedRecordNum\": 1,\n    \"ResourceId\": \"cdb-0a90mrac\"\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"0a27bddd-8683-4187-b9c0-7d407a2c818f\",\n        \"ResourceSummarySet\": [\n            {\n                \"ActionTypeName\": \"包年包月续费\",\n                \"BusinessCode\": \"p_cdb\",\n                \"BusinessCodeName\": \"云数据库MySQL\",\n                \"CashPayAmount\": \"11.56675785\",\n                \"ConfigDesc\": \"云数据库MySQL-CPU: 1 核\",\n                \"Discount\": \"0.325825\",\n                \"ExtendField1\": \"vpc: vpc-l0u15j26,Default-VPC\",\n                \"ExtendField2\": \"vip: 172.27.0.8\",\n                \"ExtendField3\": \"extend info\",\n                \"ExtendField4\": \"extend info\",\n                \"ExtendField5\": \"extend info\",\n                \"FeeBeginTime\": \"2023-08-07 10:58:41\",\n                \"FeeEndTime\": \"2023-09-07 10:58:41\",\n                \"IncentivePayAmount\": \"0.00000000\",\n                \"InstanceType\": \"it\",\n                \"OperateUin\": \"700000686592\",\n                \"OrderId\": \"20230807867037044170861\",\n                \"OriginalCostWithRI\": \"0.00000000\",\n                \"OriginalCostWithSP\": \"0.00000000\",\n                \"OwnerUin\": \"700000686592\",\n                \"PayModeName\": \"包年包月\",\n                \"PayTime\": \"2023-08-07 03:42:18\",\n                \"ProductCode\": \"sp_cdb_master\",\n                \"ProductCodeName\": \"云数据库MySQL-高可用版-通用型\",\n                \"ProjectName\": \"默认项目\",\n                \"RealTotalCost\": \"11.56675785\",\n                \"ReduceType\": \"折扣\",\n                \"RegionId\": 16,\n                \"RegionName\": \"西南地区（成都）\",\n                \"ResourceId\": \"cdb-0a90mrac\",\n                \"ResourceName\": \"云数据库mysql-test7\",\n                \"SPDeduction\": \"0.00000000\",\n                \"Tags\": [],\n                \"TotalCost\": \"35.5\",\n                \"TransferPayAmount\": \"0.00000000\",\n                \"VoucherPayAmount\": \"0.00000000\",\n                \"ZoneName\": \"成都一区\"\n            }\n        ],\n        \"Total\": 3\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"0a27bddd-8683-4187-b9c0-7d407a2c818f\",\n        \"ResourceSummarySet\": [\n            {\n                \"ActionTypeName\": \"包年包月续费\",\n                \"BusinessCode\": \"p_cdb\",\n                \"BusinessCodeName\": \"云数据库MySQL\",\n                \"CashPayAmount\": \"11.56675785\",\n                \"ConfigDesc\": \"云数据库MySQL-CPU: 1 核\",\n                \"Discount\": \"0.325825\",\n                \"ExtendField1\": \"vpc: vpc-l0u15j26,Default-VPC\",\n                \"ExtendField2\": \"vip: 172.27.0.8\",\n                \"ExtendField3\": \"extend info\",\n                \"ExtendField4\": \"extend info\",\n                \"ExtendField5\": \"extend info\",\n                \"FeeBeginTime\": \"2023-08-07 10:58:41\",\n                \"FeeEndTime\": \"2023-09-07 10:58:41\",\n                \"IncentivePayAmount\": \"0.00000000\",\n                \"InstanceType\": \"it\",\n                \"OperateUin\": \"700000686592\",\n                \"OrderId\": \"20230807867037044170861\",\n                \"OriginalCostWithRI\": \"0.00000000\",\n                \"OriginalCostWithSP\": \"0.00000000\",\n                \"OwnerUin\": \"700000686592\",\n                \"PayModeName\": \"包年包月\",\n                \"PayTime\": \"2023-08-07 03:42:18\",\n                \"ProductCode\": \"sp_cdb_master\",\n                \"ProductCodeName\": \"云数据库MySQL-高可用版-通用型\",\n                \"ProjectName\": \"默认项目\",\n                \"RealTotalCost\": \"11.56675785\",\n                \"ReduceType\": \"折扣\",\n                \"RegionId\": 16,\n                \"RegionName\": \"西南地区（成都）\",\n                \"ResourceId\": \"cdb-0a90mrac\",\n                \"ResourceName\": \"云数据库mysql-test7\",\n                \"SPDeduction\": \"0.00000000\",\n                \"Tags\": [],\n                \"TotalCost\": \"35.5\",\n                \"TransferPayAmount\": \"0.00000000\",\n                \"VoucherPayAmount\": \"0.00000000\",\n                \"ZoneName\": \"成都一区\"\n            }\n        ],\n        \"Total\": 1\n    }\n}",
         "title": "获取账单资源汇总"
       }
     ],
@@ -240,7 +240,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": "获取按产品维度汇总费用明细"
       },
       {
@@ -350,14 +350,6 @@
         "title": "查询分账账单资源归集汇总"
       }
     ],
-    "DescribeSavingPlanCoverage": [
-      {
-        "document": "查询节省计划覆盖率数据",
-        "input": "POST / HTTP/1.1\nHost: billing.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeSavingPlanCoverage\n<公共请求参数>\n\n{\n    \"PeriodType\": 1,\n    \"StartDate\": \"2023-06-01\",\n    \"EndDate\": \"2023-07-01\",\n    \"Offset\": 0,\n    \"Limit\": 2\n}",
-        "output": "{\n    \"Response\": {\n        \"DetailSet\": [\n            {\n                \"EndDate\": \"2023-06-13\",\n                \"ExpectedAmount\": 99.01,\n                \"ProductCode\": \"p_trade_t_s\",\n                \"RegionId\": 1,\n                \"ResourceId\": \"0140051917592\",\n                \"SpCoverage\": 0,\n                \"SpCoveredAmount\": 0,\n                \"SpUncoveredAmount\": 99.01,\n                \"StartDate\": \"2023-06-13\",\n                \"SubProductCode\": \"sp_trade_t_s\",\n                \"TotalRealAmount\": 99.01\n            },\n            {\n                \"EndDate\": \"2023-06-13\",\n                \"ExpectedAmount\": 99.01,\n                \"ProductCode\": \"p_trade_t_s\",\n                \"RegionId\": 1,\n                \"ResourceId\": \"0140053056082\",\n                \"SpCoverage\": 0,\n                \"SpCoveredAmount\": 0,\n                \"SpUncoveredAmount\": 99.01,\n                \"StartDate\": \"2023-06-13\",\n                \"SubProductCode\": \"sp_trade_t_s\",\n                \"TotalRealAmount\": 99.01\n            }\n        ],\n        \"RateSet\": [\n            {\n                \"DatePoint\": \"2023-06-07\",\n                \"Rate\": 0\n            },\n            {\n                \"DatePoint\": \"2023-06-13\",\n                \"Rate\": 0\n            },\n            {\n                \"DatePoint\": \"2023-06-14\",\n                \"Rate\": 0\n            }\n        ],\n        \"RequestId\": \"a0041c91-65c3-4552-8802-f073cfed0202\",\n        \"TotalCount\": 6\n    }\n}",
-        "title": "查询节省计划覆盖率数据"
-      }
-    ],
     "DescribeSavingPlanResourceInfo": [
       {
         "document": "查询名下可共享的sp资源详细",

tccli/services/bpaas/v20181217/api.json

@@ -234,13 +234,13 @@
         },
         {
           "disabled": false,
-          "document": "申请人昵称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "申请人昵称",
           "example": "jack",
           "member": "string",
           "name": "ApplyUinNick",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
@@ -264,73 +264,73 @@
         },
         {
           "disabled": false,
-          "document": "申请参数\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "申请参数",
           "example": "[{\"Key\":\"name\",\"Value\":[\"jack\"],\"Name\":\"子用户\"}]",
           "member": "ApplyParam",
           "name": "ApplicationParams",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "申请原因\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "申请原因",
           "example": "需求上线",
           "member": "string",
           "name": "Reason",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "申请时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "申请时间",
           "example": "2021-12-12 10:12:10",
           "member": "string",
           "name": "CreateTime",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "申请单状态\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "申请单状态",
           "example": "1",
           "member": "uint64",
           "name": "Status",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "节点信息\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "[{\"NodeId\":\"1\",\"NodeName\":\"管理员审批\",\"NodeType\":1,\"NextNode\":\"2\",\"Opinion\":{\"Type\":1,\"Content\":[\"1\"]},\"ScfName\":\"get-names\",\"SubStatus\":1,\"ApprovedUin\":[1],\"CreateTime\":\"2024-11-27 19:30:29\",\"Msg\":\"同意\",\"Users\":{\"Uin\":1,\"Type\":1,\"Desc\":\"开发用\",\"Nick\":\"jack\",\"Scf\":{\"ScfName\":\"get-approvers\",\"ScfRegion\":\"ap-guangdong\",\"ScfRegionName\":\"广东\",\"Params\":[{\"Key\":\"total\",\"Name\":\"总数\",\"Type\":1,\"Values\":[\"1\"]}]},\"ApproveStatus\":1,\"ApproveMsg\":\"同意\",\"ApproveTime\":\"2024-11-27 19:30:29\",\"ApproveGroup\":\"1\"},\"IsApprove\":true,\"ApproveId\":\"1\",\"ApproveMethod\":1,\"ApproveType\":1,\"CallMethod\":1,\"DataHubId\":\"data94\",\"TaskName\":\"data\",\"CKafkaRegion\":\"ap-guangzhou\",\"ExternalUrl\":\"\",\"ParallelNodes\":\"3-2\",\"RejectedCloudFunctionMsg\":\"\",\"PrevNode\":\"\"}]",
+          "document": "节点信息",
+          "example": "无",
           "member": "StatusNode",
           "name": "Nodes",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "正在审批的节点id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "正在审批的节点id",
           "example": "1",
           "member": "string",
           "name": "ApprovingNodeId",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "更新时间，时间格式：2021-12-12 10:12:10\t\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "更新时间，时间格式：2021-12-12 10:12:10\t",
           "example": "2021-12-12 10:12:10",
           "member": "string",
           "name": "ModifyTime",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
@@ -531,193 +531,193 @@
         },
         {
           "disabled": false,
-          "document": "审批意见模型\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "审批意见模型",
           "example": "{\"Type\":1,\"Content\":[\"1\"]}",
           "member": "ApproveOpinion",
           "name": "Opinion",
           "output_required": true,
           "type": "object",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "scf函数名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "scf函数名称",
           "example": "get-user",
           "member": "string",
           "name": "ScfName",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "状态（0：待审批，1：审批通过，2：拒绝，3：scf执行失败，4：scf执行成功）18: 外部审批中\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "状态（0：待审批，1：审批通过，2：拒绝，3：scf执行失败，4：scf执行成功）18: 外部审批中",
           "example": "0",
           "member": "uint64",
           "name": "SubStatus",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "审批节点审批人\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "审批节点审批人",
           "example": "[1]",
           "member": "uint64",
           "name": "ApprovedUin",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "审批时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "审批时间",
           "example": "2021-09-06 10:11:11",
           "member": "string",
           "name": "CreateTime",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "审批意见信息 审批节点:审批人意见  执行节点:scf函数执行日志\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "审批意见信息 审批节点:审批人意见  执行节点:scf函数执行日志",
           "example": "success",
           "member": "string",
           "name": "Msg",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "有权限审批该节点的uin\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "{\"Uin\":1,\"Type\":1,\"Desc\":\"普通用户\",\"Nick\":\"jack\",\"Scf\":{\"ScfName\":\"get-approvers\",\"ScfRegion\":\"ap-guangdong\",\"ScfRegionName\":\"广东\",\"Params\":[{\"Key\":\"total\",\"Name\":\"总数\",\"Type\":1,\"Values\":[\"1\"]}]},\"ApproveStatus\":1,\"ApproveMsg\":\"同意\",\"ApproveTime\":\"2024-11-27 19:30:29\",\"ApproveGroup\":\"1\"}",
+          "document": "有权限审批该节点的uin",
+          "example": "无",
           "member": "ApproveUser",
           "name": "Users",
           "output_required": true,
           "type": "object",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "是否有权限审批该节点\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "是否有权限审批该节点",
           "example": "false",
           "member": "bool",
           "name": "IsApprove",
           "output_required": true,
           "type": "bool",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "审批id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "审批id",
           "example": "101",
           "member": "string",
           "name": "ApproveId",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "审批方式 0或签 1会签\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "审批方式 0或签 1会签",
           "example": "1",
           "member": "uint64",
           "name": "ApproveMethod",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "审批节点审批类型，1人工审批 2自动通过 3自动决绝 4外部审批scf\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "审批节点审批类型，1人工审批 2自动通过 3自动决绝 4外部审批scf",
           "example": "1",
           "member": "uint64",
           "name": "ApproveType",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "外部审批类型 scf:0或null ; CKafka:1\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "外部审批类型 scf:0或null ; CKafka:1",
           "example": "0",
           "member": "uint64",
           "name": "CallMethod",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "CKafka - 接入资源ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "CKafka - 接入资源ID",
           "example": "datahub-y9xxx",
           "member": "string",
           "name": "DataHubId",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "CKafka - 任务名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "CKafka - 任务名称",
           "example": "TOPIC",
           "member": "string",
           "name": "TaskName",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "CKafka - 地域\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "CKafka - 地域",
           "example": "ap-guangzhou",
           "member": "string",
           "name": "CKafkaRegion",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "外部审批Url\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "外部审批Url",
           "example": "https://www.baidu.com/",
           "member": "string",
           "name": "ExternalUrl",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "并行节点 3-4\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "并行节点 3-4",
           "example": "3-4",
           "member": "string",
           "name": "ParallelNodes",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "scf拒绝时返回信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "scf拒绝时返回信息",
           "example": "信息有误，重新申请",
           "member": "string",
           "name": "RejectedCloudFunctionMsg",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "上一个节点\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "上一个节点",
           "example": "0",
           "member": "string",
           "name": "PrevNode",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         }
       ],
       "usage": "out"

tccli/services/cat/cat_client.py

@@ -329,7 +329,7 @@ def doCreateProbeTasks(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeInstantTasks(args, parsed_globals):
+def doDescribeProbeNodes(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -358,11 +358,63 @@ def doDescribeInstantTasks(args, parsed_globals):
     client = mod.CatClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeInstantTasksRequest()
+    model = models.DescribeProbeNodesRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeInstantTasks(model)
+        rsp = client.DescribeProbeNodes(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 doDescribeNodeGroups(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.CatClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeNodeGroupsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeNodeGroups(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -433,7 +485,7 @@ def doUpdateProbeTaskConfigurationList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeProbeNodes(args, parsed_globals):
+def doDescribeInstantTasks(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -462,11 +514,11 @@ def doDescribeProbeNodes(args, parsed_globals):
     client = mod.CatClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeProbeNodesRequest()
+    model = models.DescribeInstantTasksRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeProbeNodes(model)
+        rsp = client.DescribeInstantTasks(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -658,9 +710,10 @@ ACTION_MAP = {
     "UpdateProbeTaskAttributes": doUpdateProbeTaskAttributes,
     "DescribeNodes": doDescribeNodes,
     "CreateProbeTasks": doCreateProbeTasks,
-    "DescribeInstantTasks": doDescribeInstantTasks,
-    "UpdateProbeTaskConfigurationList": doUpdateProbeTaskConfigurationList,
     "DescribeProbeNodes": doDescribeProbeNodes,
+    "DescribeNodeGroups": doDescribeNodeGroups,
+    "UpdateProbeTaskConfigurationList": doUpdateProbeTaskConfigurationList,
+    "DescribeInstantTasks": doDescribeInstantTasks,
     "DescribeDetailedSingleProbeData": doDescribeDetailedSingleProbeData,
     "DeleteProbeTask": doDeleteProbeTask,
     "ResumeProbeTask": doResumeProbeTask,

tccli/services/cat/v20180409/api.json

@@ -28,6 +28,13 @@
       "output": "DescribeInstantTasksResponse",
       "status": "online"
     },
+    "DescribeNodeGroups": {
+      "document": "获取拨测点组（可用性拨测点组、高级拨测点组、我的拨测点组）",
+      "input": "DescribeNodeGroupsRequest",
+      "name": "获取拨测点组",
+      "output": "DescribeNodeGroupsResponse",
+      "status": "online"
+    },
     "DescribeNodes": {
       "document": "获取拨测节点",
       "input": "DescribeNodesRequest",
@@ -533,6 +540,114 @@
       ],
       "type": "object"
     },
+    "DescribeNodeGroupsRequest": {
+      "document": "DescribeNodeGroups请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "节点类型。0: 全部 1: IDC 2: LastMile 3: Mobile，不填默认为0",
+          "example": "[1, 2]",
+          "member": "int64",
+          "name": "NodeType",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "节点分类。0: 全部 1: PC 2：Mobile，不填默认为0。PC分类包括IDC和LM节点类型，Mobile分类包括Mobile节点类型。与NodeType参数取交集。",
+          "example": "1",
+          "member": "int64",
+          "name": "TaskCategory",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "IP类型。0: 全部 1: IPv4 2: IPv6，不填默认为0",
+          "example": "1",
+          "member": "int64",
+          "name": "IPType",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "拨测点描述关键词。",
+          "example": "广州",
+          "member": "string",
+          "name": "Name",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "地域ID。0: 精选拨测点 1: 国内 2: 港澳台 3: 亚太 4: 欧洲与美洲 5: 非洲与大洋洲，不填默认为0",
+          "example": "1",
+          "member": "int64",
+          "name": "RegionID",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "省份或国家ID。0表示全部，不填默认为0",
+          "example": "1",
+          "member": "int64",
+          "name": "DistrictID",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "运营商ID。0: 全部 1: 中国电信 2: 中国联通 3: 中国移动 99: 其他，不填默认为0",
+          "example": "1",
+          "member": "int64",
+          "name": "NetServiceID",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "节点组类型。0: 高级拨测点组 1: 可用性节点 2: 我的拨测点组，不填默认为0",
+          "example": "1",
+          "member": "int64",
+          "name": "NodeGroupType",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "任务类型，如1、2、3、4、5、6、7；1-页面性能、2-文件上传、3-文件下载、4-端口性能、5-网络质量、6-音视频体验、7-域名whois，不填默认为0，不对任务类型做过滤",
+          "example": "1",
+          "member": "int64",
+          "name": "TaskType",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "测试类型，包含定时测试与即时测试。0-定时拨测，其它表示即时拨测。",
+          "example": "1",
+          "member": "uint64",
+          "name": "ProbeType",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeNodeGroupsResponse": {
+      "document": "DescribeNodeGroups返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeNodesRequest": {
       "document": "DescribeNodes请求参数结构体",
       "members": [