tccli 3.0.1229.1__py2.py3-none-any.whl → 3.0.1231.1__py2.py3-none-any.whl

tccli/services/cynosdb/cynosdb_client.py

@@ -901,7 +901,7 @@ def doCloseProxy(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doExportResourcePackageDeductDetails(args, parsed_globals):
+def doDescribeProxySpecs(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -930,11 +930,11 @@ def doExportResourcePackageDeductDetails(args, parsed_globals):
     client = mod.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ExportResourcePackageDeductDetailsRequest()
+    model = models.DescribeProxySpecsRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ExportResourcePackageDeductDetails(model)
+        rsp = client.DescribeProxySpecs(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1265,6 +1265,58 @@ def doDescribeResourcesByDealName(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doExportResourcePackageDeductDetails(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.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ExportResourcePackageDeductDetailsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ExportResourcePackageDeductDetails(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 doModifyClusterStorage(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3761,58 +3813,6 @@ def doAddInstances(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeProxySpecs(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.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeProxySpecsRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DescribeProxySpecs(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 doModifyInstanceUpgradeLimitDays(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4749,6 +4749,58 @@ def doBindClusterResourcePackages(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeServerlessInstanceSpecs(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.CynosdbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeServerlessInstanceSpecsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeServerlessInstanceSpecs(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 doDescribeAuditLogs(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8001,13 +8053,14 @@ ACTION_MAP = {
     "RenewClusters": doRenewClusters,
     "CloseProxyEndPoint": doCloseProxyEndPoint,
     "CloseProxy": doCloseProxy,
-    "ExportResourcePackageDeductDetails": doExportResourcePackageDeductDetails,
+    "DescribeProxySpecs": doDescribeProxySpecs,
     "InquirePriceModify": doInquirePriceModify,
     "DescribeClusterDetail": doDescribeClusterDetail,
     "DescribeTasks": doDescribeTasks,
     "DescribeInstanceSpecs": doDescribeInstanceSpecs,
     "DescribeBinlogDownloadUrl": doDescribeBinlogDownloadUrl,
     "DescribeResourcesByDealName": doDescribeResourcesByDealName,
+    "ExportResourcePackageDeductDetails": doExportResourcePackageDeductDetails,
     "ModifyClusterStorage": doModifyClusterStorage,
     "ActivateInstance": doActivateInstance,
     "DescribeProxyNodes": doDescribeProxyNodes,
@@ -8056,7 +8109,6 @@ ACTION_MAP = {
     "SwitchClusterZone": doSwitchClusterZone,
     "OpenClusterTransparentEncrypt": doOpenClusterTransparentEncrypt,
     "AddInstances": doAddInstances,
-    "DescribeProxySpecs": doDescribeProxySpecs,
     "ModifyInstanceUpgradeLimitDays": doModifyInstanceUpgradeLimitDays,
     "DeleteAccounts": doDeleteAccounts,
     "RevokeAccountPrivileges": doRevokeAccountPrivileges,
@@ -8075,6 +8127,7 @@ ACTION_MAP = {
     "ModifyInstanceParam": doModifyInstanceParam,
     "DescribeInstanceCLSLogDelivery": doDescribeInstanceCLSLogDelivery,
     "BindClusterResourcePackages": doBindClusterResourcePackages,
+    "DescribeServerlessInstanceSpecs": doDescribeServerlessInstanceSpecs,
     "DescribeAuditLogs": doDescribeAuditLogs,
     "UnbindClusterResourcePackages": doUnbindClusterResourcePackages,
     "DescribeProxies": doDescribeProxies,

tccli/services/cynosdb/v20190107/api.json

@@ -546,6 +546,13 @@
       "output": "DescribeRollbackTimeRangeResponse",
       "status": "online"
     },
+    "DescribeServerlessInstanceSpecs": {
+      "document": "查询Serverless实例可选规格",
+      "input": "DescribeServerlessInstanceSpecsRequest",
+      "name": "查询Serverless实例可选规格",
+      "output": "DescribeServerlessInstanceSpecsResponse",
+      "status": "online"
+    },
     "DescribeServerlessStrategy": {
       "document": "查询serverless策略",
       "input": "DescribeServerlessStrategyRequest",
@@ -11808,6 +11815,43 @@
       ],
       "type": "object"
     },
+    "DescribeServerlessInstanceSpecsRequest": {
+      "document": "DescribeServerlessInstanceSpecs请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "可用区",
+          "example": "ap-guangzhou-3",
+          "member": "string",
+          "name": "Zone",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeServerlessInstanceSpecsResponse": {
+      "document": "DescribeServerlessInstanceSpecs返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "Serverless实例可选规格",
+          "example": "无",
+          "member": "ServerlessSpec",
+          "name": "Specs",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeServerlessStrategyRequest": {
       "document": "DescribeServerlessStrategy请求参数结构体",
       "members": [
@@ -15939,24 +15983,6 @@
           "name": "MaxRoCount",
           "required": false,
           "type": "int"
-        },
-        {
-          "disabled": false,
-          "document": "集群是否允许扩容，可选范围<li>yes</li><li>no</li>",
-          "example": "yes",
-          "member": "string",
-          "name": "AutoScaleUp",
-          "required": false,
-          "type": "string"
-        },
-        {
-          "disabled": false,
-          "document": "集群是否允许缩容，可选范围<li>yes</li><li>no</li>",
-          "example": "yes",
-          "member": "string",
-          "name": "AutoScaleDown",
-          "required": false,
-          "type": "string"
         }
       ],
       "type": "object"
@@ -20398,6 +20424,128 @@
       ],
       "usage": "out"
     },
+    "ServerlessSpec": {
+      "document": "serverless规格",
+      "members": [
+        {
+          "disabled": false,
+          "document": "cpu最小值",
+          "example": "1",
+          "member": "float",
+          "name": "MinCpu",
+          "output_required": true,
+          "type": "float",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "cpu最大值",
+          "example": "1",
+          "member": "float",
+          "name": "MaxCpu",
+          "output_required": true,
+          "type": "float",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "最大存储空间",
+          "example": "1",
+          "member": "int64",
+          "name": "MaxStorageSize",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "是否为默认规格",
+          "example": "1",
+          "member": "int64",
+          "name": "IsDefault",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "是否有库存",
+          "example": "false",
+          "member": "bool",
+          "name": "HasStock",
+          "output_required": true,
+          "type": "bool",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "库存数量",
+          "example": "1",
+          "member": "int64",
+          "name": "StockCount",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "可用区库存信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "ServerlessZoneStockInfo",
+          "name": "ZoneStockInfos",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
+    "ServerlessZoneStockInfo": {
+      "document": "serverless类型的可用区库存信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "可用区\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "Zone",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "存储量\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "int64",
+          "name": "StockCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "是否包含库存\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "bool",
+          "name": "HasStock",
+          "output_required": false,
+          "type": "bool",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "从可用区库存信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "SlaveZoneStockInfo",
+          "name": "SlaveZoneStockInfos",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
     "SetRenewFlagRequest": {
       "document": "SetRenewFlag请求参数结构体",
       "members": [

tccli/services/cynosdb/v20190107/examples.json

@@ -648,6 +648,14 @@
         "title": "查询回档时间范围"
       }
     ],
+    "DescribeServerlessInstanceSpecs": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeServerlessInstanceSpecs\n<公共请求参数>\n\n{}",
+        "output": "{\n    \"Response\": {\n        \"Specs\": [\n            {\n                \"MaxStorageSize\": 1000,\n                \"MinCpu\": 0.25,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.5,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            },\n            {\n                \"MaxStorageSize\": 1000,\n                \"MinCpu\": 0.25,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            },\n            {\n                \"MaxStorageSize\": 5000,\n                \"MinCpu\": 0.25,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            },\n            {\n                \"MaxStorageSize\": 10000,\n                \"MinCpu\": 0.25,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            },\n            {\n                \"MaxStorageSize\": 1000,\n                \"MinCpu\": 0.5,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            },\n            {\n                \"MaxStorageSize\": 5000,\n                \"MinCpu\": 0.5,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 1\n            },\n            {\n                \"MaxStorageSize\": 10000,\n                \"MinCpu\": 0.5,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            },\n            {\n                \"MaxStorageSize\": 5000,\n                \"MinCpu\": 0.0,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            },\n            {\n                \"MaxStorageSize\": 10000,\n                \"MinCpu\": 0.0,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            },\n            {\n                \"MaxStorageSize\": 10000,\n                \"MinCpu\": 0.0,\n                \"StockCount\": 0,\n                \"MaxCpu\": 0.0,\n                \"HasStock\": true,\n                \"IsDefault\": 0\n            }\n        ],\n        \"RequestId\": \"52-a341-4269-bce2-221ec952ea16|m\"\n    }\n}",
+        "title": "查询Serverless实例可选规格"
+      }
+    ],
     "DescribeServerlessStrategy": [
       {
         "document": "",
@@ -982,6 +990,12 @@
         "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyServerlessStrategy\n<公共请求参数>\n\n{\n    \"AutoPause\": \"no\",\n    \"AutoScaleUpDelay\": 200,\n    \"AutoPauseDelay\": 100,\n    \"MinCpu\": 0.25,\n    \"MaxCpu\": 2,\n    \"ClusterId\": \"cynosdbmysql-8vcxoq75\",\n    \"AutoScaleDownDelay\": 300\n}",
         "output": "{\n    \"Response\": {\n        \"FlowId\": 1008300,\n        \"RequestId\": \"c3da7958-23e8-11eb-8e52-525400b7dd5a\"\n    }\n}",
         "title": "修改serverless策略"
+      },
+      {
+        "document": "调整主节点",
+        "input": "POST / HTTP/1.1\nHost: cynosdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyServerlessStrategy\n<公共请求参数>\n\n{\n    \"ClusterId\": \"cynosdbmysql-92oecwyv\",\n    \"MinCpu\": 2,\n    \"MaxCpu\": 2\n}",
+        "output": "{\n    \"Response\": {\n        \"FlowId\": 917319,\n        \"RequestId\": \"a7ef1e81-e306-45fd-ab3d-37a6ae7ecf96\"\n    }\n}",
+        "title": "变更serverless策略"
       }
     ],
     "ModifyVipVport": [

tccli/services/dbbrain/v20210527/api.json

@@ -6686,7 +6686,7 @@
         },
         {
           "disabled": false,
-          "document": "默认是ture, 记录下kill的记录，为了加快kill，可设置为false。",
+          "document": "默认是true，会记录下kill的记录；该参数为true, 则在kill操作前校验目标会话是否存在，存在则继续kill，否则取消kill。为了加快kill速度，可设置为false。",
           "example": "false",
           "member": "bool",
           "name": "RecordHistory",
@@ -6705,6 +6705,7 @@
           "example": "[536284]",
           "member": "int64",
           "name": "Threads",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -6714,6 +6715,7 @@
           "example": "\"AEnnKexGijsX\"",
           "member": "string",
           "name": "SqlExecId",
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },

tccli/services/emr/emr_client.py

@@ -433,7 +433,7 @@ def doModifyYarnQueueV2(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeHDFSStorageInfo(args, parsed_globals):
+def doCreateCloudInstance(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -462,11 +462,11 @@ def doDescribeHDFSStorageInfo(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.DescribeHDFSStorageInfoRequest()
+    model = models.CreateCloudInstanceRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeHDFSStorageInfo(model)
+        rsp = client.CreateCloudInstance(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1993,6 +1993,58 @@ def doDescribeInstanceRenewNodes(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeHDFSStorageInfo(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.DescribeHDFSStorageInfoRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeHDFSStorageInfo(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 doModifyResourceScheduler(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3293,6 +3345,58 @@ def doDescribeEmrOverviewMetrics(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyPodNum(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.ModifyPodNumRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyPodNum(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 doScaleOutCluster(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3416,7 +3520,7 @@ ACTION_MAP = {
     "DescribeImpalaQueries": doDescribeImpalaQueries,
     "DescribeYarnQueue": doDescribeYarnQueue,
     "ModifyYarnQueueV2": doModifyYarnQueueV2,
-    "DescribeHDFSStorageInfo": doDescribeHDFSStorageInfo,
+    "CreateCloudInstance": doCreateCloudInstance,
     "DeployYarnConf": doDeployYarnConf,
     "DescribeClusterFlowStatusDetail": doDescribeClusterFlowStatusDetail,
     "InquiryPriceScaleOutInstance": doInquiryPriceScaleOutInstance,
@@ -3446,6 +3550,7 @@ ACTION_MAP = {
     "DeleteAutoScaleStrategy": doDeleteAutoScaleStrategy,
     "DescribeEmrApplicationStatics": doDescribeEmrApplicationStatics,
     "DescribeInstanceRenewNodes": doDescribeInstanceRenewNodes,
+    "DescribeHDFSStorageInfo": doDescribeHDFSStorageInfo,
     "ModifyResourceScheduler": doModifyResourceScheduler,
     "DescribeResourceScheduleDiffDetail": doDescribeResourceScheduleDiffDetail,
     "DescribeSLInstance": doDescribeSLInstance,
@@ -3471,6 +3576,7 @@ ACTION_MAP = {
     "ModifyResourcePools": doModifyResourcePools,
     "DescribeInsightList": doDescribeInsightList,
     "DescribeEmrOverviewMetrics": doDescribeEmrOverviewMetrics,
+    "ModifyPodNum": doModifyPodNum,
     "ScaleOutCluster": doScaleOutCluster,
     "RunJobFlow": doRunJobFlow,