tccli 3.0.1307.1__py2.py3-none-any.whl → 3.0.1309.1__py2.py3-none-any.whl

tccli/services/cat/cat_client.py

@@ -225,6 +225,58 @@ def doUpdateProbeTaskAttributes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeProbeMetricTagValues(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.DescribeProbeMetricTagValuesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeProbeMetricTagValues(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 doDescribeNodes(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -708,6 +760,7 @@ ACTION_MAP = {
     "DescribeProbeMetricData": doDescribeProbeMetricData,
     "DescribeProbeTasks": doDescribeProbeTasks,
     "UpdateProbeTaskAttributes": doUpdateProbeTaskAttributes,
+    "DescribeProbeMetricTagValues": doDescribeProbeMetricTagValues,
     "DescribeNodes": doDescribeNodes,
     "CreateProbeTasks": doCreateProbeTasks,
     "DescribeProbeNodes": doDescribeProbeNodes,

tccli/services/cat/v20180409/api.json

@@ -49,6 +49,13 @@
       "output": "DescribeProbeMetricDataResponse",
       "status": "online"
     },
+    "DescribeProbeMetricTagValues": {
+      "document": "查询同个任务类型下的维度标签值，包括查询用户任务信息，具体任务下的多个维度标签信息。（通过为DescribeProbeMetricData接口的Filters参数添加维度筛选条件，可实现多维数据分析）",
+      "input": "DescribeProbeMetricTagValuesRequest",
+      "name": "查询云拨测维度标签值",
+      "output": "DescribeProbeMetricTagValuesResponse",
+      "status": "online"
+    },
     "DescribeProbeNodes": {
       "document": "查询拨测节点",
       "input": "DescribeProbeNodesRequest",
@@ -842,6 +849,79 @@
       ],
       "type": "object"
     },
+    "DescribeProbeMetricTagValuesRequest": {
+      "document": "DescribeProbeMetricTagValues请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "分析任务类型，支持以下几种类型：\nAnalyzeTaskType_Network：网络质量\nAnalyzeTaskType_Browse：页面性能 \nAnalyzeTaskType_Transport：端口性能\nAnalyzeTaskType_UploadDownload：文件传输\nAnalyzeTaskType_MediaStream：音视频体验\n",
+          "example": "AnalyzeTaskType_UploadDownload",
+          "member": "string",
+          "name": "AnalyzeTaskType",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "维度标签值，参考：\nhost：任务域名\nerrorInfo：状态类型\narea：拨测点地区\noperator：拨测点运营商\ntaskId：任务ID",
+          "example": "host",
+          "member": "string",
+          "name": "Key",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "过滤条件，可以传单个过滤条件也可以拼接多个参数，支持正则匹配",
+          "example": "host = 'www.qq.com' and taskId =~ /^(task-probe123)$/",
+          "member": "string",
+          "name": "Filter",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "过滤条件数组",
+          "example": "[\"\"]",
+          "member": "string",
+          "name": "Filters",
+          "required": false,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "时间范围",
+          "example": "time >= now()-1h",
+          "member": "string",
+          "name": "TimeRange",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeProbeMetricTagValuesResponse": {
+      "document": "DescribeProbeMetricTagValues返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "标签值序列化后的字符串",
+          "example": "无",
+          "member": "string",
+          "name": "TagValueSet",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeProbeNodesRequest": {
       "document": "DescribeProbeNodes请求参数结构体",
       "members": [

tccli/services/cat/v20180409/examples.json

@@ -74,6 +74,14 @@
         "title": "请求浏览数据"
       }
     ],
+    "DescribeProbeMetricTagValues": [
+      {
+        "document": "请求域名数据\n",
+        "input": "POST / HTTP/1.1\nHost: cat.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeProbeMetricTagValues\n<公共请求参数>\n\n{\n    \"AnalyzeTaskType\": \"AnalyzeTaskType_Network\",\n    \"Key\": \"area\",\n    \"Filter\": \"host = 'baidu.com'\",\n    \"TimeRange\": \"now()-30d\"\n}",
+        "output": "{\n    \"Response\": {\n        \"TagValueSet\": \"{\\\"name\\\":\\\"netenv_request_gauge\\\",\\\"columns\\\":[\\\"key\\\",\\\"value\\\"],\\\"values\\\":[[\\\"area\\\",\\\"上海\\\"]],\\\"tags\\\":null}\",\n        \"RequestId\": \"asd\"\n    }\n}",
+        "title": "请求域名数据"
+      }
+    ],
     "DescribeProbeNodes": [
       {
         "document": "查询拨测节点\n",

tccli/services/cdwch/v20200915/api.json

@@ -864,7 +864,7 @@
         {
           "disabled": false,
           "document": "数据节点\nSpecName从DescribeSpec接口中返回的DataSpec.Name获取",
-          "example": "{\"SpecName\":\"SCH1\", \"Count\":1, \"DiskSize\":200}",
+          "example": "{\"SpecName\":\"S_16_64_H\", \"Count\":1, \"DiskSize\":200}",
           "member": "NodeSpec",
           "name": "DataSpec",
           "required": true,
@@ -918,7 +918,7 @@
         {
           "disabled": false,
           "document": "ZK节点\nSpecName从DescribeSpec接口中返回的CommonSpec.Name（ZK节点）获取",
-          "example": "{\"SpecName\":\"SCH1\", \"Count\":1, \"DiskSize\":200}",
+          "example": "{\"SpecName\":\"S_4_16_P\", \"Count\":1, \"DiskSize\":200}",
           "member": "NodeSpec",
           "name": "CommonSpec",
           "required": false,
@@ -936,7 +936,7 @@
         {
           "disabled": false,
           "document": "副可用去信息",
-          "example": "[{\"ap-guangzhou-3\",\"user-1\"}]",
+          "example": "[   {     \"SecondaryZone\": \"ap-guangzhou-4\",     \"SecondarySubnet\": \"subnet-atpdmj7g\",     \"SecondaryUserSubnetIPNum\": 223   },   {     \"SecondaryZone\": \"ap-guangzhou-6\",     \"SecondarySubnet\": \"subnet-e4nl52om\",     \"SecondaryUserSubnetIPNum\": 4   } ]",
           "member": "SecondaryZoneInfo",
           "name": "SecondaryZoneInfo",
           "required": false,

tccli/services/cfs/v20190719/api.json

@@ -1037,6 +1037,15 @@
           "name": "EnableAutoScaleUp",
           "required": false,
           "type": "bool"
+        },
+        {
+          "disabled": false,
+          "document": "v1.5：创建普通版的通用文件系统；\nv3.1：创建增强版的通用文件系统\n说明：增强版的通用系统需要开通白名单才能使用，如有需要请提交工单与我们联系。",
+          "example": "v1.5",
+          "member": "string",
+          "name": "CfsVersion",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"