tccli 3.0.1289.1__py2.py3-none-any.whl → 3.0.1291.1__py2.py3-none-any.whl

tccli/services/cbs/v20170312/api.json

@@ -335,43 +335,47 @@
       "members": [
         {
           "disabled": false,
-          "document": "保留最新快照Days天内的每天最新的一个快照，取值范围：[0, 100]\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "保留最新快照Days天内的每天最新的一个快照，取值范围：[0, 100]",
           "example": "6",
           "member": "uint64",
           "name": "Days",
+          "output_required": true,
           "required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "保留最新快照Weeks周内的每周最新的一个快照，取值范围：[0, 100]\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "保留最新快照Weeks周内的每周最新的一个快照，取值范围：[0, 100]",
           "example": "8",
           "member": "uint64",
           "name": "Weeks",
+          "output_required": true,
           "required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "保留最新快照Months月内的每月最新的一个快照， 取值范围：[0, 100]\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "保留最新快照Months月内的每月最新的一个快照， 取值范围：[0, 100]",
           "example": "3",
           "member": "uint64",
           "name": "Months",
+          "output_required": true,
           "required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "保留最新快照Years年内的每年最新的一个快照，取值范围：[0, 100]\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "保留最新快照Years年内的每年最新的一个快照，取值范围：[0, 100]",
           "example": "1",
           "member": "uint64",
           "name": "Years",
+          "output_required": true,
           "required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         }
       ],
       "usage": "both"
@@ -722,13 +726,13 @@
         },
         {
           "disabled": false,
-          "document": "是否是跨账号复制快照快照, 1：是, 0: 不是\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "是否是跨账号复制快照快照, 1：是, 0: 不是",
           "example": "0",
           "member": "uint64",
           "name": "IsCopyToRemote",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
@@ -812,33 +816,33 @@
         },
         {
           "disabled": false,
-          "document": "已绑定当前定期快照策略的实例ID列表。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "已绑定当前定期快照策略的实例ID列表。",
           "example": "[\"ins-og3j7lue\"]",
           "member": "string",
           "name": "InstanceIdSet",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "该定期快照创建的快照可以保留的月数。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "该定期快照创建的快照可以保留的月数。",
           "example": "1",
           "member": "uint64",
           "name": "RetentionMonths",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "该定期快照创建的快照最大保留数量。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "该定期快照创建的快照最大保留数量。",
           "example": "5",
           "member": "uint64",
           "name": "RetentionAmount",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
@@ -862,13 +866,13 @@
         },
         {
           "disabled": false,
-          "document": "标签。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "标签。",
           "example": "[{'Key': 'test_key', 'Value': 'test_value'}]",
           "member": "Tag",
           "name": "Tags",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -1030,13 +1034,13 @@
         },
         {
           "disabled": false,
-          "document": "独享集群的可用容量大小，单位GiB\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "独享集群的可用容量大小，单位GiB",
           "example": "100000",
           "member": "uint64",
           "name": "DiskAvailable",
           "output_required": false,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         }
       ],
       "usage": "out"

tccli/services/cdb/cdb_client.py

@@ -2201,6 +2201,58 @@ def doCreateDatabase(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeCPUExpandStrategyInfo(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.CdbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeCPUExpandStrategyInfoRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeCPUExpandStrategyInfo(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 doDisassociateSecurityGroups(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -9014,6 +9066,7 @@ ACTION_MAP = {
     "DescribeErrorLogData": doDescribeErrorLogData,
     "SwitchDBInstanceMasterSlave": doSwitchDBInstanceMasterSlave,
     "CreateDatabase": doCreateDatabase,
+    "DescribeCPUExpandStrategyInfo": doDescribeCPUExpandStrategyInfo,
     "DisassociateSecurityGroups": doDisassociateSecurityGroups,
     "ModifyCdbProxyParam": doModifyCdbProxyParam,
     "DescribeTables": doDescribeTables,

tccli/services/cdb/v20170320/api.json

@@ -420,6 +420,13 @@
       "output": "DescribeBinlogsResponse",
       "status": "online"
     },
+    "DescribeCPUExpandStrategyInfo": {
+      "document": "通过该 API 可以查询实例的 CPU 弹性扩容信息",
+      "input": "DescribeCPUExpandStrategyInfoRequest",
+      "name": "查询实例的 CPU 弹性扩容策略信息",
+      "output": "DescribeCPUExpandStrategyInfoResponse",
+      "status": "online"
+    },
     "DescribeCdbProxyInfo": {
       "document": "本接口（DescribeCdbProxyInfo）用于查询数据库代理详情信息。",
       "input": "DescribeCdbProxyInfoRequest",
@@ -9215,6 +9222,63 @@
       ],
       "type": "object"
     },
+    "DescribeCPUExpandStrategyInfoRequest": {
+      "document": "DescribeCPUExpandStrategyInfo请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例 ID 。",
+          "example": "cdb-xxdasd",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeCPUExpandStrategyInfoResponse": {
+      "document": "DescribeCPUExpandStrategyInfo返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "策略类型。可选值 auto、manual。如果返回为NULL说明尚未开通弹性扩容策略\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "auto",
+          "member": "string",
+          "name": "Type",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "手动扩容的 CPU 。Type为 manual 时有效。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "4",
+          "member": "int64",
+          "name": "ExpandCpu",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "自动扩容策略。Type 为 auto 时有效\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "略",
+          "member": "AutoStrategy",
+          "name": "AutoStrategy",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeCdbProxyInfoRequest": {
       "document": "DescribeCdbProxyInfo请求参数结构体",
       "members": [

tccli/services/cdb/v20170320/examples.json

@@ -516,6 +516,14 @@
         "title": "查询二进制日志"
       }
     ],
+    "DescribeCPUExpandStrategyInfo": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeCPUExpandStrategyInfo\n<公共请求参数>\n\n{\n    \"InstanceId\": \"cdb-sad1dsfa\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Type\": \"auto\",\n        \"ExpandCpu\": \"4\",\n        \"AutoStrategy\": {\n            \"ExpandThreshold\": 0,\n            \"ShrinkThreshold\": 0,\n            \"ExpandPeriod\": 0,\n            \"ShrinkPeriod\": 0\n        },\n        \"RequestId\": \"sasd8asf-f78asd-fas8-dga9-gdfadf1234\"\n    }\n}",
+        "title": "查询实例的 CPU 弹性扩容策略"
+      }
+    ],
     "DescribeCdbProxyInfo": [
       {
         "document": "查询代理信息",