tccli 3.0.1235.1__py2.py3-none-any.whl → 3.0.1237.1__py2.py3-none-any.whl

tccli/services/cdb/cdb_client.py

@@ -5529,6 +5529,58 @@ def doCloseCDBProxy(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyProtectMode(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.ModifyProtectModeRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyProtectMode(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 doDescribeAsyncRequestInfo(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8974,6 +9026,7 @@ ACTION_MAP = {
     "ResetPassword": doResetPassword,
     "ModifyLocalBinlogConfig": doModifyLocalBinlogConfig,
     "CloseCDBProxy": doCloseCDBProxy,
+    "ModifyProtectMode": doModifyProtectMode,
     "DescribeAsyncRequestInfo": doDescribeAsyncRequestInfo,
     "DescribeAuditLogs": doDescribeAuditLogs,
     "DescribeDBInstanceRebootTime": doDescribeDBInstanceRebootTime,

tccli/services/cdb/v20170320/api.json

@@ -973,6 +973,13 @@
       "output": "ModifyParamTemplateResponse",
       "status": "online"
     },
+    "ModifyProtectMode": {
+      "document": "该接口（ModifyProtectMode）用于修改实例的同步方式。",
+      "input": "ModifyProtectModeRequest",
+      "name": "修改实例的同步方式",
+      "output": "ModifyProtectModeResponse",
+      "status": "online"
+    },
     "ModifyRemoteBackupConfig": {
       "document": "本接口(ModifyRemoteBackupConfig)用于修改数据库异地备份配置信息。",
       "input": "ModifyRemoteBackupConfigRequest",
@@ -16823,6 +16830,42 @@
       ],
       "type": "object"
     },
+    "ModifyProtectModeRequest": {
+      "document": "ModifyProtectMode请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "无",
+          "example": "1",
+          "member": "int64",
+          "name": "ProtectMode",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "实例ID。",
+          "example": "cdb-ezq1vzem",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "ModifyProtectModeResponse": {
+      "document": "ModifyProtectMode返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ModifyRemoteBackupConfigRequest": {
       "document": "ModifyRemoteBackupConfig请求参数结构体",
       "members": [

tccli/services/cdb/v20170320/examples.json

@@ -1154,6 +1154,14 @@
         "title": "修改参数模板"
       }
     ],
+    "ModifyProtectMode": [
+      {
+        "document": "",
+        "input": "https://cdb.tencentcloudapi.com/?Action=ModifyProtectMode\n&ProtectMode=1\n&InstanceId=cdb-ezq1vzem\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"6EF60BEC-0242-43AF-BB20-270359FB54A7\"\n    }\n}",
+        "title": "修改实例同步方式"
+      }
+    ],
     "ModifyRemoteBackupConfig": [
       {
         "document": "无",

tccli/services/cfg/v20210820/api.json

@@ -1750,6 +1750,16 @@
           "output_required": false,
           "type": "int",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "1.接入层 2.逻辑层 3. 数据层",
+          "example": "1",
+          "member": "int64",
+          "name": "ArchLayer",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -3953,6 +3963,17 @@
           "required": false,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "故障表现",
+          "example": "故障表现xxxx",
+          "member": "string",
+          "name": "FailurePerformance",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "both"

tccli/services/cloudapp/v20220530/api.json

@@ -177,6 +177,16 @@
           "output_required": false,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "授权的类型：Standard正式版/Development开发版/Trial体验版",
+          "example": "Standard",
+          "member": "string",
+          "name": "LicenseType",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"

tccli/services/cloudaudit/v20190319/api.json

@@ -146,56 +146,61 @@
       "members": [
         {
           "disabled": false,
-          "document": "输入框类型",
-          "example": "xx",
+          "document": "输入框类型\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "type",
           "member": "string",
           "name": "LabelType",
+          "output_required": false,
           "required": true,
           "type": "string",
-          "value_allowed_null": false
+          "value_allowed_null": true
         },
         {
           "disabled": false,
-          "document": "初始化展示",
-          "example": "xx",
+          "document": "初始化展示\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "12",
           "member": "string",
           "name": "Starter",
+          "output_required": false,
           "required": true,
           "type": "string",
-          "value_allowed_null": false
+          "value_allowed_null": true
         },
         {
           "disabled": false,
-          "document": "展示排序",
-          "example": "1",
+          "document": "展示排序\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "desc",
           "member": "int64",
           "name": "Order",
+          "output_required": false,
           "required": true,
           "type": "int",
-          "value_allowed_null": false
+          "value_allowed_null": true
         },
         {
           "disabled": false,
-          "document": "AttributeKey值",
-          "example": "xx",
+          "document": "AttributeKey值\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "tag1",
           "member": "string",
           "name": "Value",
+          "output_required": false,
           "required": true,
           "type": "string",
-          "value_allowed_null": false
+          "value_allowed_null": true
         },
         {
           "disabled": false,
-          "document": "中文标签",
-          "example": "xx",
+          "document": "中文标签\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "事件",
           "member": "string",
           "name": "Label",
+          "output_required": false,
           "required": true,
           "type": "string",
-          "value_allowed_null": false
+          "value_allowed_null": true
         }
       ],
-      "usage": "in"
+      "usage": "both"
     },
     "AuditSummary": {
       "document": "跟踪集概览",
@@ -1131,7 +1136,7 @@
         {
           "disabled": false,
           "document": "网站类型，取值范围是zh和en。如果不传值默认zh",
-          "example": "xx",
+          "example": "ap-guangzhou",
           "member": "string",
           "name": "WebsiteType",
           "required": false,
@@ -1146,10 +1151,10 @@
         {
           "disabled": false,
           "document": "AttributeKey的有效取值范围",
-          "example": "xx",
+          "example": " [       {         \"Label\": \"只读\",         \"Value\": \"ReadOnly\",         \"Starter\": \"选择只读值\",         \"LabelType\": \"select\",         \"Order\": 1       }      ]",
           "member": "AttributeKeyDetail",
           "name": "AttributeKeyDetails",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -1194,26 +1199,28 @@
       "members": [
         {
           "disabled": false,
-          "document": "作为密钥更容易辨识，更容易被人看懂的别名",
-          "example": "xx",
+          "document": "作为密钥更容易辨识，更容易被人看懂的别名\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "audit_name",
           "member": "string",
           "name": "Alias",
+          "output_required": false,
           "required": false,
           "type": "string",
-          "value_allowed_null": false
+          "value_allowed_null": true
         },
         {
           "disabled": false,
-          "document": "CMK的全局唯一标识",
-          "example": "xx",
+          "document": "CMK的全局唯一标识\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "key_34244",
           "member": "string",
           "name": "KeyId",
+          "output_required": false,
           "required": false,
           "type": "string",
-          "value_allowed_null": false
+          "value_allowed_null": true
         }
       ],
-      "usage": "in"
+      "usage": "both"
     },
     "ListAuditsRequest": {
       "document": "ListAudits请求参数结构体",
@@ -1248,7 +1255,7 @@
         {
           "disabled": false,
           "document": "站点类型。zh表示中国区，en表示国际区。默认中国区。",
-          "example": "xx",
+          "example": "zh",
           "member": "string",
           "name": "WebsiteType",
           "required": false,
@@ -1263,7 +1270,7 @@
         {
           "disabled": false,
           "document": "操作审计支持的cmq的可用区",
-          "example": "xx",
+          "example": " [       {         \"CmqRegion\": \"sh\",         \"CmqRegionName\": \"上海\"       },       {         \"CmqRegion\": \"hk\",         \"CmqRegionName\": \"香港\"       }     ]",
           "member": "CmqRegionInfo",
           "name": "EnableRegions",
           "output_required": true,
@@ -1322,7 +1329,7 @@
         {
           "disabled": false,
           "document": "Kms地域",
-          "example": "xx",
+          "example": "ap-guangzhou",
           "member": "string",
           "name": "KmsRegion",
           "required": true,
@@ -1358,7 +1365,7 @@
           "example": "1",
           "member": "int64",
           "name": "TotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -1368,7 +1375,7 @@
           "example": "[xx,xx]",
           "member": "KeyMetadata",
           "name": "KeyMetadatas",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -1414,7 +1421,7 @@
         {
           "disabled": false,
           "document": "查看更多日志的凭证",
-          "example": "xxx",
+          "example": "79ba1f24-c21c-4858-a8e6-a9266b0599ff",
           "member": "string",
           "name": "NextToken",
           "required": false,
@@ -1447,7 +1454,7 @@
         {
           "disabled": false,
           "document": "查看更多日志的凭证\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "xxxxxxx",
+          "example": "79ba1f24-c21c-4858-a8e6-a9266b0599ff",
           "member": "string",
           "name": "NextToken",
           "output_required": true,
@@ -1457,7 +1464,7 @@
         {
           "disabled": false,
           "document": "日志集合\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "[     {         \"CloudAuditEvent\": \"*\",         \"EventId\": \"e92a92fc259c4a9333d2a7ce64d1ef201\",         \"EventName\": \"LookupEvents\",         \"EventTime\": \"2019-03-20 12:36:27\",         \"SecretId\": \"XXX\",         \"ErrorCode\": 0,         \"RequestID\": \"15936031437374_1553056587.6815_v2\",         \"AccountID\": 1150691759,         \"SourceIPAddress\": \"*\",         \"EventSource\": \"cloudaudit.api.tencentyun.com/v2/index.php\",         \"EventRegion\": \"ap-guangzhou\",         \"Resources\": {             \"ResourceName\": \"\",             \"ResourceType\": \"cloudaudit\"         },         \"Username\": \"root\",         \"ResourceTypeCn\": \"操作审计\",         \"EventNameCn\": \"检索日志\"     } ]",
           "member": "Event",
           "name": "Events",
           "output_required": true,
@@ -1754,7 +1761,7 @@
         {
           "disabled": false,
           "document": "跟踪集名称",
-          "example": "xx",
+          "example": "audit_log",
           "member": "string",
           "name": "AuditName",
           "required": true,
@@ -1772,7 +1779,7 @@
           "example": "1",
           "member": "int64",
           "name": "IsSuccess",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },

tccli/services/cloudaudit/v20190319/examples.json

@@ -107,7 +107,7 @@
     "LookUpEvents": [
       {
         "document": "用于对操作日志进行检索，便于用户进行查询相关的操作信息。",
-        "input": "https://cloudaudit.tencentcloudapi.com/?Action=LookUpEvents\n&EndTime=1553056687\n&LookupAttributes.0.AttributeKey=AccessKeyId\n&LookupAttributes.0.AttributeValue=XXXX\n&StartTime=1553056487\n&<公共请求参数>",
+        "input": "https://cloudaudit.tencentcloudapi.com/?Action=LookUpEvents\n&EndTime=1553056687\n&LookupAttributes.0.AttributeKey=AccessKeyId\n&LookupAttributes.0.AttributeValue=a9266b0599ff\n&StartTime=1553056487\n&<公共请求参数>",
         "output": "{\n    \"Response\": {\n        \"Events\": [\n            {\n                \"CloudAuditEvent\": \"{\\\"actionType\\\":\\\"Read\\\",\\\"apiErrorCode\\\":\\\"\\\",\\\"apiErrorMessage\\\":\\\"\\\",\\\"apiVersion\\\":\\\"2.0\\\",\\\"errorCode\\\":0,\\\"errorMessage\\\":\\\"permission verify\\\",\\\"eventID\\\":\\\"e92a92fc259c4a9333d2a7ce64d1ef201\\\",\\\"eventName\\\":\\\"LookupEvents\\\",\\\"eventRegion\\\":\\\"ap-guangzhou\\\",\\\"eventSource\\\":\\\"cloudaudit.api.tencentyun.com/v2/index.php\\\",\\\"eventTime\\\":\\\"2019-03-20 12:36:27\\\",\\\"eventType\\\":\\\"ConsoleCall\\\",\\\"eventVersion\\\":2,\\\"httpMethod\\\":\\\"POST\\\",\\\"region\\\":\\\"\\\",\\\"requestID\\\":\\\"15936031437374_1553056587.6815_v2\\\",\\\"requestParameters\\\":\\\"{\\\"Action\\\":\\\"LookupEvents\\\",\\\"EndTime\\\":\\\"1553097599\\\",\\\"MaxResults\\\":\\\"10\\\",\\\"Nonce\\\":\\\"36881\\\",\\\"Region\\\":\\\"gz\\\",\\\"RequestClient\\\":\\\"SDK_NODEJS_0.2.1\\\",\\\"RequestOperator\\\":\\\"1150691759\\\",\\\"RequestSource\\\":\\\"MC\\\",\\\"SecretId\\\":\\\"XXX\\\",\\\"StartTime\\\":\\\"1552406400\\\",\\\"Timestamp\\\":\\\"1553056583\\\",\\\"Token\\\":\\\"147d2c5b0319541a13d9fe6ceb5af2aae9b67f6610001\\\",\\\"seqId\\\":\\\"cdb9c38c-7031-bb13-6a9c-cd7641734c8f\\\"}\\\",\\\"resourceName\\\":\\\"\\\",\\\"resourceType\\\":\\\"cloudaudit\\\",\\\"resources\\\":\\\"\\\",\\\"sourceIPAddress\\\":\\\"59.37.125.124\\\",\\\"userAgent\\\":\\\"\\\",\\\"userIdentity\\\":{\\\"userName\\\":\\\"root\\\",\\\"type\\\":\\\"Root\\\",\\\"secretId\\\":\\\"XXX\\\",\\\"accountId\\\":1150691759,\\\"principalId\\\":1150691759,\\\"sessionContext\\\":{\\\"expireTime\\\":\\\"2019-03-20 13:04:46\\\",\\\"hasPolicyFilter\\\":0,\\\"extraInfo\\\":\\\"\\\",\\\"interfaceName\\\":\\\"\\\",\\\"ownerUin\\\":1150691759,\\\"ua\\\":\\\"27513f02ea3ab649f0cacb6476df54eb\\\",\\\"mfa\\\":0,\\\"userIp\\\":\\\"59.37.125.124\\\",\\\"mfaExpireTime\\\":\\\"2019-03-20 12:34:46\\\",\\\"uin\\\":1150691759,\\\"token\\\":\\\"147d2c5b0319541a13d9fe6ceb5af2aae9b67f6610001\\\",\\\"appId\\\":1251840716,\\\"policyFilter\\\":\\\"\\\"}}}\",\n                \"EventId\": \"e92a92fc259c4a9333d2a7ce64d1ef201\",\n                \"EventName\": \"LookupEvents\",\n                \"EventTime\": \"2019-03-20 12:36:27\",\n                \"SecretId\": \"XXX\",\n                \"ErrorCode\": 0,\n                \"RequestID\": \"15936031437374_1553056587.6815_v2\",\n                \"AccountID\": 1150691759,\n                \"SourceIPAddress\": \"59.37.125.124\",\n                \"EventSource\": \"cloudaudit.api.tencentyun.com/v2/index.php\",\n                \"EventRegion\": \"ap-guangzhou\",\n                \"Resources\": {\n                    \"ResourceName\": \"\",\n                    \"ResourceType\": \"cloudaudit\"\n                },\n                \"Username\": \"root\",\n                \"ResourceTypeCn\": \"操作审计\",\n                \"EventNameCn\": \"检索日志\"\n            }\n        ],\n        \"NextToken\": \"DnF1ZXJ5VGhlbkZldGNoDwAAAAAAACBuFjNoRHJ5YTd4U1B5YWY4c1ZmMmxBQWcAAAAAAAAgnBZZZkZoYy04LVJJeVpJNnZJS2hIVTdRAAAAAAAAI1QWYk5mQmZXTzhTWXFNZjFMVlhHY1RjdwAAAAAAAB9sFmhZbV8xbm1FUXE2NGVDQndWSlNoMncAAAAAAAAd9BZOelN1aGMycFNydUVEQ0dQbzdCcEZBAAAAAAAALroWMTh4c00xalhRbk9wR0NsYWZvV20tQQAAAAAAACCdFllmRmhjLTgtUkl5Wkk2dklLaEhVN1EAAAAAAAAuuRYxOHhzTTFqWFFuT3BHQ2xhZm9XbS1BAAAAAAAAIJ4WWWZGaGMtOC1SSXlaSTZ2SUtoSFU3UQAAAAAAAB81FnN5aTBfTWJKU25HdXZuMWxsRkdJZ3cAAAAAAAApMhZ1UjdybjlCY1NRYUZVYWRub2x4YW9RAAAAAAAAHzQWc3lpMF9NYkpTbkd1dm4xbGxGR0lndwAAAAAAAB31Fk56U3VoYzJwU3J1RURDR1BvN0JwRkEAAAAAAAAfbRZoWW1fMW5tRVFxNjRlQ0J3VkpTaDJ3AAAAAAAAH24WaFltXzFubUVRcTY0ZUNCd1ZKU2gydw==\",\n        \"ListOver\": true,\n        \"TotalCount\": 1,\n        \"RequestId\": \"91e2998d-edc0-4ba0-a76d-cebbbfd99391\"\n    }\n}",
         "title": "日志检索"
       }
@@ -131,7 +131,7 @@
     "StartLogging": [
       {
         "document": "开启跟踪集",
-        "input": "https://cloudaudit.tencentcloudapi.com/?Action=StartLogging\n&AuditName=xxxxx\n&<公共请求参数>",
+        "input": "https://cloudaudit.tencentcloudapi.com/?Action=StartLogging\n&AuditName=audit_log\n&<公共请求参数>",
         "output": "{\n    \"Response\": {\n        \"IsSuccess\": 1,\n        \"RequestId\": \"94ced030-d9df-4fb3-9894-7accd0c29d23\"\n    }\n}",
         "title": "开启跟踪集"
       }

tccli/services/cvm/v20170312/api.json

@@ -9250,7 +9250,7 @@
         },
         {
           "disabled": false,
-          "document": "私有网络相关信息配置，通过该参数指定私有网络的ID，子网ID，私有网络ip等信息。<br><li>当指定私有网络ID和子网ID（子网必须在实例所在的可用区）与指定实例所在私有网络不一致时，会将实例迁移至指定的私有网络的子网下。<br><li>可通过`PrivateIpAddresses`指定私有网络子网IP，若需指定则所有已指定的实例均需要指定子网IP，此时`InstanceIds`与`PrivateIpAddresses`一一对应。<br><li>不指定`PrivateIpAddresses`时随机分配私有网络子网IP。",
+          "document": "私有网络相关信息配置，通过该参数指定私有网络的ID，子网ID，私有网络ip等信息。<br><li>当指定私有网络ID和子网ID（子网必须在实例所在的可用区）与指定实例所在私有网络不一致时，会将实例迁移至指定的私有网络的子网下。</li><li>可通过`PrivateIpAddresses`指定私有网络子网IP，若需指定则所有已指定的实例均需要指定子网IP，此时`InstanceIds`与`PrivateIpAddresses`一一对应。</li><li>不指定`PrivateIpAddresses`时随机分配私有网络子网IP。</li>",
           "example": "无",
           "member": "VirtualPrivateCloud",
           "name": "VirtualPrivateCloud",
@@ -9259,8 +9259,8 @@
         },
         {
           "disabled": false,
-          "document": "是否对运行中的实例选择强制关机。默认为TRUE。",
-          "example": "无",
+          "document": "是否对运行中的实例选择强制关机。默认为true。",
+          "example": "false",
           "member": "bool",
           "name": "ForceStop",
           "required": false,
@@ -9268,8 +9268,8 @@
         },
         {
           "disabled": false,
-          "document": "是否保留主机名。默认为FALSE。",
-          "example": "无",
+          "document": "是否保留主机名。默认为false。",
+          "example": "false",
           "member": "bool",
           "name": "ReserveHostName",
           "required": false,

tccli/services/cynosdb/cynosdb_client.py

@@ -3033,6 +3033,58 @@ def doModifyClusterDatabase(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeClusterDatabaseTables(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.DescribeClusterDatabaseTablesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeClusterDatabaseTables(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 doModifyParamTemplate(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8094,6 +8146,7 @@ ACTION_MAP = {
     "CloseWan": doCloseWan,
     "DescribeProjectSecurityGroups": doDescribeProjectSecurityGroups,
     "ModifyClusterDatabase": doModifyClusterDatabase,
+    "DescribeClusterDatabaseTables": doDescribeClusterDatabaseTables,
     "ModifyParamTemplate": doModifyParamTemplate,
     "ModifyResourcePackagesDeductionPriority": doModifyResourcePackagesDeductionPriority,
     "DescribeInstanceParams": doDescribeInstanceParams,