tccli 3.0.1090.1__py2.py3-none-any.whl → 3.0.1092.1__py2.py3-none-any.whl

tccli/services/ccc/v20200210/examples.json

@@ -444,7 +444,7 @@
       {
         "document": "",
         "input": "POST / HTTP/1.1\nHost: ccc.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: UploadIvrAudio\n<公共请求参数>\n\n{\n    \"SdkAppId\": 0,\n    \"AudioList\": [\n        {\n            \"CustomFileName\": \"abc\",\n            \"AudioUrl\": \"http://xxxx.com/a.mp3\"\n        }\n    ]\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"abc\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"a\",\n        \"FailedFileList\": [],\n        \"SuccessFileList\": [\n            {\n                \"AudioFileName\": \"business_id_pic5.mp3\",\n                \"CustomFileName\": \"1231\",\n                \"FileId\": 50,\n                \"Status\": 0\n            },\n            {\n                \"AudioFileName\": \"business_id_pic6.mp3\",\n                \"CustomFileName\": \"4561\",\n                \"FileId\": 51,\n                \"Status\": 0\n            }\n        ]\n    }\n}",
         "title": "上传IVR音频文件"
       }
     ]

tccli/services/cdb/cdb_client.py

@@ -1213,6 +1213,58 @@ def doDescribeRollbackTaskDetail(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCheckMigrateCluster(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.CheckMigrateClusterRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CheckMigrateCluster(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 doModifyBackupDownloadRestriction(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4645,6 +4697,58 @@ def doDescribeDBInstanceInfo(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeClusterInfo(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.DescribeClusterInfoRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeClusterInfo(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 doDescribeRollbackRangeTime(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -8319,6 +8423,7 @@ ACTION_MAP = {
     "CreateAuditLogFile": doCreateAuditLogFile,
     "OpenDBInstanceGTID": doOpenDBInstanceGTID,
     "DescribeRollbackTaskDetail": doDescribeRollbackTaskDetail,
+    "CheckMigrateCluster": doCheckMigrateCluster,
     "ModifyBackupDownloadRestriction": doModifyBackupDownloadRestriction,
     "CloseCdbProxyAddress": doCloseCdbProxyAddress,
     "DescribeTasks": doDescribeTasks,
@@ -8385,6 +8490,7 @@ ACTION_MAP = {
     "SwitchDrInstanceToMaster": doSwitchDrInstanceToMaster,
     "DeleteAccounts": doDeleteAccounts,
     "DescribeDBInstanceInfo": doDescribeDBInstanceInfo,
+    "DescribeClusterInfo": doDescribeClusterInfo,
     "DescribeRollbackRangeTime": doDescribeRollbackRangeTime,
     "DescribeParamTemplates": doDescribeParamTemplates,
     "DeleteBackup": doDeleteBackup,

tccli/services/cdb/v20170320/api.json

@@ -42,6 +42,13 @@
       "output": "BalanceRoGroupLoadResponse",
       "status": "online"
     },
+    "CheckMigrateCluster": {
+      "document": "高可用实例一键迁移到集群版校验",
+      "input": "CheckMigrateClusterRequest",
+      "name": "迁移集群版校验",
+      "output": "CheckMigrateClusterResponse",
+      "status": "online"
+    },
     "CloseAuditService": {
       "document": "实例关闭审计服务",
       "input": "CloseAuditServiceRequest",
@@ -413,6 +420,13 @@
       "output": "DescribeCloneListResponse",
       "status": "online"
     },
+    "DescribeClusterInfo": {
+      "document": "本接口(DescribeClusterInfo)用于查询集群版实例信息。",
+      "input": "DescribeClusterInfoRequest",
+      "name": "查询集群版实例信息",
+      "output": "DescribeClusterInfoResponse",
+      "status": "online"
+    },
     "DescribeCpuExpandStrategy": {
       "document": "通过该 API 可以查询实例的 CPU 弹性扩容策略",
       "input": "DescribeCpuExpandStrategyRequest",
@@ -1320,6 +1334,82 @@
       ],
       "type": "object"
     },
+    "AddressInfo": {
+      "document": "实例地址信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "地址的资源id标识。",
+          "example": "cdb-xxx",
+          "member": "string",
+          "name": "ResourceId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "地址所在的vpc。",
+          "example": "vpc-xxx",
+          "member": "string",
+          "name": "UniqVpcId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "地址所在的子网。",
+          "example": "subnet-xxx",
+          "member": "string",
+          "name": "UniqSubnetId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "地址的vip。",
+          "example": "无",
+          "member": "string",
+          "name": "Vip",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "地址的端口。",
+          "example": "无",
+          "member": "int64",
+          "name": "VPort",
+          "output_required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "外网地址域名。",
+          "example": "无",
+          "member": "string",
+          "name": "WanDomain",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "外网地址端口。",
+          "example": "无",
+          "member": "int64",
+          "name": "WanPort",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "AdjustCdbProxyAddressRequest": {
       "document": "AdjustCdbProxyAddress请求参数结构体",
       "members": [
@@ -3719,6 +3809,23 @@
       ],
       "usage": "out"
     },
+    "CheckMigrateClusterRequest": {
+      "document": "CheckMigrateCluster请求参数结构体",
+      "members": [],
+      "type": "object"
+    },
+    "CheckMigrateClusterResponse": {
+      "document": "CheckMigrateCluster返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "CloneItem": {
       "document": "克隆任务记录。",
       "members": [
@@ -3970,6 +4077,67 @@
       ],
       "type": "object"
     },
+    "ClusterNodeInfo": {
+      "document": "集群版实例节点信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "节点id。",
+          "example": "dbn-xxx",
+          "member": "string",
+          "name": "NodeId",
+          "output_required": true,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节点的角色。",
+          "example": "master/ro",
+          "member": "string",
+          "name": "Role",
+          "output_required": true,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节点所在可用区。",
+          "example": "ap-guangzhou-3",
+          "member": "string",
+          "name": "Zone",
+          "output_required": true,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节点的权重",
+          "example": "100",
+          "member": "uint64",
+          "name": "Weight",
+          "output_required": true,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节点状态。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "normal",
+          "member": "string",
+          "name": "Status",
+          "output_required": true,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
     "ColumnPrivilege": {
       "document": "列权限信息",
       "members": [
@@ -8580,6 +8748,93 @@
       ],
       "type": "object"
     },
+    "DescribeClusterInfoRequest": {
+      "document": "DescribeClusterInfo请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例id。",
+          "example": "cdb-xxx",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeClusterInfoResponse": {
+      "document": "DescribeClusterInfo返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例名称。",
+          "example": "无",
+          "member": "string",
+          "name": "ClusterName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "集群读写地址信息。",
+          "example": "无",
+          "member": "AddressInfo",
+          "name": "ReadWriteAddress",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "集群只读地址信息。",
+          "example": "无",
+          "member": "AddressInfo",
+          "name": "ReadOnlyAddress",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "集群节点列表信息。",
+          "example": "无",
+          "member": "ClusterNodeInfo",
+          "name": "NodeList",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "只读空间保护阈值,单位GB",
+          "example": "无",
+          "member": "int64",
+          "name": "ReadonlyLimit",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "实例节点数。",
+          "example": "无",
+          "member": "int64",
+          "name": "NodeCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeCpuExpandStrategyRequest": {
       "document": "DescribeCpuExpandStrategy请求参数结构体",
       "members": [

tccli/services/cdb/v20170320/examples.json

@@ -54,6 +54,14 @@
         "title": "均衡RO组内实例的负载"
       }
     ],
+    "CheckMigrateCluster": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CheckMigrateCluster\n<公共请求参数>\n\n{}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "高可用实例一键迁移到集群版校验"
+      }
+    ],
     "CloseAuditService": [
       {
         "document": "无",
@@ -508,6 +516,14 @@
         "title": "查询克隆列表"
       }
     ],
+    "DescribeClusterInfo": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeClusterInfo\n<公共请求参数>\n\n{\n    \"InstanceId\": \"cdb-xxx\"\n}",
+        "output": "{\n    \"Response\": {\n        \"ClusterName\": \"dbname\",\n        \"ReadWriteAddress\": {\n            \"ResourceId\": \"cdb-xxx\",\n            \"UniqVpcId\": \"vpc-xxx\",\n            \"UniqSubnetId\": \"subnet-xxx\",\n            \"Vip\": \"192.168.3.4\",\n            \"VPort\": 3306,\n            \"WanDomain\": \"\",\n            \"WanPort\": 0\n        },\n        \"ReadOnlyAddress\": [\n            {\n                \"ResourceId\": \"cdb-xxx|readonly\",\n                \"UniqVpcId\": \"vpc-xxx\",\n                \"UniqSubnetId\": \"subnet-xxx\",\n                \"Vip\": \"192.168.3.5\",\n                \"VPort\": 3306,\n                \"WanDomain\": \"\",\n                \"WanPort\": 0\n            }\n        ],\n        \"NodeList\": [\n            {\n                \"NodeId\": \"dbn-xxx\",\n                \"Role\": \"master\",\n                \"Zone\": \"ap-guangzhou-1\",\n                \"Weight\": 1,\n                \"Status\": \"online\"\n            },\n            {\n                \"NodeId\": \"dbn-xxx\",\n                \"Role\": \"slave\",\n                \"Zone\": \"ap-guangzhou-2\",\n                \"Weight\": 1,\n                \"Status\": \"online\"\n            }\n        ],\n        \"ReadonlyLimit\": 10,\n        \"NodeCount\": 2,\n        \"RequestId\": \"abc\"\n    }\n}",
+        "title": "查询集群版实例信息"
+      }
+    ],
     "DescribeCpuExpandStrategy": [
       {
         "document": "用于查询实例的弹性扩容配置。",

tccli/services/cdn/v20180606/api.json

@@ -10047,7 +10047,7 @@
         {
           "disabled": false,
           "document": "http2 配置开关\non：开启\noff：关闭\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "rewrew",
+          "example": "on",
           "member": "string",
           "name": "Http2",
           "output_required": true,
@@ -10058,7 +10058,7 @@
         {
           "disabled": false,
           "document": "OCSP 配置开关\non：开启\noff：关闭\n默认为关闭状态\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "123456",
+          "example": "on",
           "member": "string",
           "name": "OcspStapling",
           "output_required": true,
@@ -10069,7 +10069,7 @@
         {
           "disabled": false,
           "document": "客户端证书校验功能\non：开启\noff：关闭\n默认为关闭状态，开启时需要上传客户端证书信息，该配置项目前在灰度中，尚未全量\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "dsadsa",
+          "example": "on",
           "member": "string",
           "name": "VerifyClient",
           "output_required": true,
@@ -10102,7 +10102,7 @@
         {
           "disabled": false,
           "document": "Spdy 配置开关\non：开启\noff：关闭\n默认为关闭状态\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "dfdf",
+          "example": "on",
           "member": "string",
           "name": "Spdy",
           "output_required": true,