tccli 3.0.1108.1__py2.py3-none-any.whl → 3.0.1110.1__py2.py3-none-any.whl

tccli/services/ckafka/v20190819/api.json

@@ -3063,6 +3063,15 @@
           "name": "KafkaConnectParam",
           "required": false,
           "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "MQTT配置，Type为 MQTT 时必填",
+          "example": "xxx",
+          "member": "MqttConnectParam",
+          "name": "MqttConnectParam",
+          "required": false,
+          "type": "object"
         }
       ],
       "type": "object"
@@ -3076,6 +3085,7 @@
           "example": "xxx",
           "member": "ConnectResourceResourceIdResp",
           "name": "Result",
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },
@@ -5099,7 +5109,7 @@
           "example": "task-xxx",
           "member": "string",
           "name": "TaskId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -5109,7 +5119,7 @@
           "example": "xxx",
           "member": "string",
           "name": "TaskName",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -5119,7 +5129,7 @@
           "example": "SINK",
           "member": "string",
           "name": "TaskType",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -5129,7 +5139,7 @@
           "example": "1",
           "member": "int64",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -5139,7 +5149,7 @@
           "example": "xxx",
           "member": "DatahubResource",
           "name": "SourceResource",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -5149,7 +5159,7 @@
           "example": "xxx",
           "member": "DatahubResource",
           "name": "TargetResource",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": true
         },
@@ -5159,7 +5169,7 @@
           "example": "xxxx",
           "member": "string",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -5169,7 +5179,7 @@
           "example": "xxxx",
           "member": "string",
           "name": "ErrorMessage",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -5179,7 +5189,7 @@
           "example": "90",
           "member": "float",
           "name": "TaskProgress",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": true
         },
@@ -5189,7 +5199,7 @@
           "example": "等待连接",
           "member": "string",
           "name": "TaskCurrentStep",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -5199,7 +5209,7 @@
           "example": "datahub-xxx",
           "member": "string",
           "name": "DatahubId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -5209,7 +5219,7 @@
           "example": "xxx",
           "member": "string",
           "name": "StepList",
-          "required": true,
+          "output_required": false,
           "type": "list",
           "value_allowed_null": true
         }
@@ -6357,7 +6367,7 @@
           "example": "xxx",
           "member": "string",
           "name": "StepList",
-          "output_required": true,
+          "output_required": false,
           "type": "list",
           "value_allowed_null": true
         },
@@ -12890,6 +12900,15 @@
           "name": "KafkaConnectParam",
           "required": false,
           "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "MQTT配置，Type为 MQTT 时必填",
+          "example": "xxx",
+          "member": "MqttConnectParam",
+          "name": "MqttConnectParam",
+          "required": false,
+          "type": "object"
         }
       ],
       "type": "object"
@@ -12903,6 +12922,7 @@
           "example": "xxx",
           "member": "ConnectResourceResourceIdResp",
           "name": "Result",
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         },

tccli/services/cls/v20201016/api.json

@@ -3631,20 +3631,20 @@
         },
         {
           "disabled": false,
-          "document": "COS文件所在文件夹的前缀",
-          "example": "var/xxx",
+          "document": "采集的日志类型，json_log代表json格式日志，delimiter_log代表分隔符格式日志，minimalist_log代表单行全文；\n默认为minimalist_log",
+          "example": "minimalist_log",
           "member": "string",
-          "name": "Prefix",
+          "name": "LogType",
           "required": true,
           "type": "string"
         },
         {
           "disabled": false,
-          "document": "采集的日志类型，json_log代表json格式日志，delimiter_log代表分隔符格式日志，minimalist_log代表单行全文；\n默认为minimalist_log",
-          "example": "minimalist_log",
+          "document": "COS文件所在文件夹的前缀。默认为空，投递存储桶下所有的文件。",
+          "example": "var/xxx",
           "member": "string",
-          "name": "LogType",
-          "required": true,
+          "name": "Prefix",
+          "required": false,
           "type": "string"
         },
         {
@@ -10449,7 +10449,7 @@
         },
         {
           "disabled": false,
-          "document": "COS文件所在文件夹的前缀",
+          "document": "COS文件所在文件夹的前缀。为空串时投递存储桶下所有的文件。",
           "example": "var/xxx",
           "member": "string",
           "name": "Prefix",
@@ -12544,11 +12544,11 @@
         },
         {
           "disabled": false,
-          "document": "cos文件所在文件夹的前缀",
+          "document": "COS文件所在文件夹的前缀。默认为空，投递存储桶下所有的文件。",
           "example": "var/xxx",
           "member": "string",
           "name": "Prefix",
-          "required": true,
+          "required": false,
           "type": "string"
         },
         {

tccli/services/cvm/v20170312/api.json

@@ -1376,6 +1376,30 @@
       ],
       "type": "object"
     },
+    "CpuTopology": {
+      "document": "描述了实例CPU拓扑结构的相关信息。",
+      "members": [
+        {
+          "disabled": false,
+          "document": "决定启用的CPU物理核心数。",
+          "example": "4",
+          "member": "int64",
+          "name": "CoreCount",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "每核心线程数。该参数决定是否开启或关闭超线程。<br><li>1 表示关闭超线程 </li><br><li>2 表示开启超线程</li>\n 不设置时，实例使用默认的超线程策略。开关超线程请参考文档：[开启与关闭超线程](https://cloud.tencent.com/document/product/213/103798)。",
+          "example": "2",
+          "member": "int64",
+          "name": "ThreadPerCore",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "usage": "in"
+    },
     "CreateDisasterRecoverGroupRequest": {
       "document": "CreateDisasterRecoverGroup请求参数结构体",
       "members": [
@@ -11015,6 +11039,15 @@
           "required": false,
           "type": "bool"
         },
+        {
+          "disabled": false,
+          "document": "描述了实例CPU拓扑结构的相关信息。若不指定该参数，则按系统资源情况决定。",
+          "example": "无",
+          "member": "CpuTopology",
+          "name": "CpuTopology",
+          "required": false,
+          "type": "object"
+        },
         {
           "disabled": false,
           "document": "CAM角色名称。可通过[`DescribeRoleList`](https://cloud.tencent.com/document/product/598/13887)接口返回值中的`roleName`获取。",

tccli/services/dbbrain/v20210527/api.json

@@ -3040,7 +3040,7 @@
         },
         {
           "disabled": false,
-          "document": "服务产品类型，支持值包括： \"mysql\" - 云数据库 MySQL， \"cynosdb\" - 云数据库 CynosDB  for MySQL，默认为\"mysql\"。",
+          "document": "服务产品类型，支持值包括： \"mysql\" - 云数据库 MySQL， \"cynosdb\" - 云数据库 CynosDB  for MySQL，\"mongodb\" - 云数据库 MongoDB，默认为\"mysql\"。",
           "example": "mysql",
           "member": "string",
           "name": "Product",
@@ -3059,7 +3059,7 @@
           "example": "231",
           "member": "int64",
           "name": "Growth",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -3069,7 +3069,7 @@
           "example": "23224",
           "member": "int64",
           "name": "Remain",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -3079,7 +3079,7 @@
           "example": "50000",
           "member": "int64",
           "name": "Total",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -3089,7 +3089,7 @@
           "example": "35",
           "member": "int64",
           "name": "AvailableDays",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },

tccli/services/emr/emr_client.py

@@ -693,6 +693,58 @@ def doModifyUserManagerPwd(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeHBaseTableOverview(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.EmrClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeHBaseTableOverviewRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeHBaseTableOverview(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 doDescribeInstances(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -849,6 +901,58 @@ def doTerminateClusterNodes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeEmrOverviewMetrics(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.EmrClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeEmrOverviewMetricsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeEmrOverviewMetrics(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 doDescribeUsersForUserManager(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1421,7 +1525,7 @@ def doInquiryPriceCreateInstance(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeResourceSchedule(args, parsed_globals):
+def doAddMetricScaleStrategy(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1450,11 +1554,11 @@ def doDescribeResourceSchedule(args, parsed_globals):
     client = mod.EmrClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeResourceScheduleRequest()
+    model = models.AddMetricScaleStrategyRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeResourceSchedule(model)
+        rsp = client.AddMetricScaleStrategy(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1785,7 +1889,7 @@ def doDescribeAutoScaleStrategies(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doAddMetricScaleStrategy(args, parsed_globals):
+def doDescribeResourceSchedule(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1814,11 +1918,11 @@ def doAddMetricScaleStrategy(args, parsed_globals):
     client = mod.EmrClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.AddMetricScaleStrategyRequest()
+    model = models.DescribeResourceScheduleRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.AddMetricScaleStrategy(model)
+        rsp = client.DescribeResourceSchedule(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2173,9 +2277,11 @@ ACTION_MAP = {
     "DescribeCvmQuota": doDescribeCvmQuota,
     "ScaleOutInstance": doScaleOutInstance,
     "ModifyUserManagerPwd": doModifyUserManagerPwd,
+    "DescribeHBaseTableOverview": doDescribeHBaseTableOverview,
     "DescribeInstances": doDescribeInstances,
     "RunJobFlow": doRunJobFlow,
     "TerminateClusterNodes": doTerminateClusterNodes,
+    "DescribeEmrOverviewMetrics": doDescribeEmrOverviewMetrics,
     "DescribeUsersForUserManager": doDescribeUsersForUserManager,
     "DeleteUserManagerUserList": doDeleteUserManagerUserList,
     "AddUsersForUserManager": doAddUsersForUserManager,
@@ -2187,14 +2293,14 @@ ACTION_MAP = {
     "SyncPodState": doSyncPodState,
     "CreateInstance": doCreateInstance,
     "InquiryPriceCreateInstance": doInquiryPriceCreateInstance,
-    "DescribeResourceSchedule": doDescribeResourceSchedule,
+    "AddMetricScaleStrategy": doAddMetricScaleStrategy,
     "ModifyResourceScheduleConfig": doModifyResourceScheduleConfig,
     "DescribeHiveQueries": doDescribeHiveQueries,
     "StartStopServiceOrMonitor": doStartStopServiceOrMonitor,
     "TerminateTasks": doTerminateTasks,
     "TerminateInstance": doTerminateInstance,
     "DescribeAutoScaleStrategies": doDescribeAutoScaleStrategies,
-    "AddMetricScaleStrategy": doAddMetricScaleStrategy,
+    "DescribeResourceSchedule": doDescribeResourceSchedule,
     "DescribeAutoScaleGroupGlobalConf": doDescribeAutoScaleGroupGlobalConf,
     "DescribeClusterNodes": doDescribeClusterNodes,
     "DescribeInstancesList": doDescribeInstancesList,