tccli 3.0.1182.1__py2.py3-none-any.whl → 3.0.1184.1__py2.py3-none-any.whl

tccli/services/dc/v20180410/examples.json

@@ -70,7 +70,7 @@
     ],
     "DeleteDirectConnect": [
       {
-        "document": "",
+        "document": "删除物理专线",
         "input": "https://dc.tencentcloudapi.com/?Action=DeleteDirectConnect\r\n&DirectConnectId=dc-abcdefgh\r\n&<公共请求参数>",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"3c140219-cfe9-470e-b241-907877d6fb03\"\n    }\n}",
         "title": "删除物理专线"
@@ -78,7 +78,7 @@
     ],
     "DeleteDirectConnectTunnel": [
       {
-        "document": "",
+        "document": "删除专用通道",
         "input": "https://dc.tencentcloudapi.com/?Action=DeleteDirectConnectTunnel\n&DirectConnectTunnelId=dcx-abcdefgh\n&<公共请求参数>",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"3c140219-cfe9-470e-b241-907877d6fb03\"\n    }\n}",
         "title": "删除专用通道"
@@ -122,15 +122,15 @@
     ],
     "DescribeDirectConnects": [
       {
-        "document": "使用Filter进行筛选，用direct-connect-name进行筛选；",
+        "document": "使用Filter进行筛选，用direct-connect-name进行筛选。",
         "input": "https://dc.tencentcloudapi.com/?Action=DescribeDirectConnects\r\n&Filters.0.Name=direct-connect-name\r\n&Filters.0.Values.0=专线接入\r\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"DirectConnectSet\": [\n            {\n                \"EnabledTime\": \"2018-06-02 15:12:34\",\n                \"CustomerContactNumber\": \"18812345678\",\n                \"AccessPointId\": \"ap-cn-shenzhen-ns-A\",\n                \"ChargeState\": \"NORMAL\",\n                \"DirectConnectId\": \"dc-gd3u0zov\",\n                \"State\": \"AVAILABLE\",\n                \"ExpiredTime\": null,\n                \"Location\": \"深南大道万利达大厦13楼591\",\n                \"CreatedTime\": \"2018-05-03 15:12:34\",\n                \"PortType\": \"1000Base-T\",\n                \"CustomerName\": \"张三\",\n                \"LineOperator\": \"ChinaTelecom\",\n                \"TencentAddress\": \"192.168.1.2/30\",\n                \"CircuitCode\": \"\",\n                \"CustomerAddress\": \"192.168.1.1/30\",\n                \"CustomerContactMail\": \"zzuzxy1111@163.com\",\n                \"Vlan\": 10,\n                \"Bandwidth\": 100,\n                \"DirectConnectName\": \"用户自建专线接入\",\n                \"ChargeType\": \"NON_RECURRING_CHARGE\",\n                \"RedundantDirectConnectId\": \"\"\n            },\n            {\n                \"EnabledTime\": \"2018-05-23 11:10:46\",\n                \"CustomerContactNumber\": \"18812345678\",\n                \"AccessPointId\": \"ap-cn-beijing-hx\",\n                \"ChargeState\": \"NORMAL\",\n                \"DirectConnectId\": \"dc-2zeyish1\",\n                \"State\": \"BUILDING\",\n                \"ExpiredTime\": null,\n                \"Location\": \"西土城路10号北京邮电大学\",\n                \"CreatedTime\": \"2018-04-23 11:10:46\",\n                \"PortType\": \"1000Base-T\",\n                \"CustomerName\": \"张三\",\n                \"LineOperator\": \"ChinaMobile\",\n                \"TencentAddress\": \"192.168.1.156/24\",\n                \"CircuitCode\": \"\",\n                \"CustomerAddress\": \"192.168.1.157/24\",\n                \"CustomerContactMail\": \"zzuzxy@163.com\",\n                \"Vlan\": 253,\n                \"Bandwidth\": 2,\n                \"DirectConnectName\": \"专线接入一次性付费测试\",\n                \"ChargeType\": \"PREPAID_BY_YEAR\",\n                \"RedundantDirectConnectId\": \"\"\n            },\n            {\n                \"EnabledTime\": \"2018-05-23 10:28:12\",\n                \"CustomerContactNumber\": \"18812345678\",\n                \"AccessPointId\": \"ap-cn-shenzhen-ns-A\",\n                \"ChargeState\": \"NORMAL\",\n                \"DirectConnectId\": \"dc-epeq2tj7\",\n                \"State\": \"BUILDING\",\n                \"ExpiredTime\": null,\n                \"Location\": \"万利达大厦13楼591房间\",\n                \"CreatedTime\": \"2018-04-23 10:28:12\",\n                \"PortType\": \"1000Base-T\",\n                \"CustomerName\": \"张三\",\n                \"LineOperator\": \"ChinaMobile\",\n                \"TencentAddress\": \"192.168.1.2/30\",\n                \"CircuitCode\": \"\",\n                \"CustomerAddress\": \"192.168.1.1/30\",\n                \"CustomerContactMail\": \"zzuzxy@163.com\",\n                \"Vlan\": 100,\n                \"Bandwidth\": 2,\n                \"DirectConnectName\": \"专线接入一次性付费测试\",\n                \"ChargeType\": \"NON_RECURRING_CHARGE\",\n                \"RedundantDirectConnectId\": \"\"\n            }\n        ],\n        \"RequestId\": \"70d690c8-477a-4e5d-99c0-fa1bb012a105\",\n        \"TotalCount\": 3\n    }\n}",
-        "title": "查询物理专线列表"
+        "output": "{\n    \"Response\": {\n        \"DirectConnectSet\": [\n            {\n                \"DirectConnectId\": \"dc-c3hbbsw9\",\n                \"DirectConnectName\": \"专线接入测试\",\n                \"RedundantDirectConnectId\": \"\",\n                \"State\": \"AVAILABLE\",\n                \"ChargeState\": \"NORMAL\",\n                \"AccessPointId\": \"ap-cn-guangzhou-kxc\",\n                \"AccessPointName\": \"广州科丰路\",\n                \"AccessPointType\": \"VXLAN\",\n                \"Bandwidth\": 10000,\n                \"LineOperator\": \"ChinaOther\",\n                \"Construct\": 1,\n                \"Location\": \"广东省广州市华新园0602-A01机架7号位\",\n                \"PortType\": \"10GBase-LR\",\n                \"CreatedTime\": \"2020-09-22T00:00:00+00:00\",\n                \"StartTime\": \"2019-09-12 17:09:07\",\n                \"CircuitCode\": \"唐镇0103-A09-PL01-1\",\n                \"Vlan\": 100,\n                \"CustomerName\": \"张三\",\n                \"CustomerContactMail\": \"zhangsan@tencent.com\",\n                \"CustomerContactNumber\": \"13888888888\",\n                \"FaultReportContactPerson\": \"李四\",\n                \"FaultReportContactNumber\": \"15999999999\",\n                \"IdcCity\": \"广东省广州市华新园0602-A01机架7号位\",\n                \"SignLaw\": false,\n                \"LocalZone\": false,\n                \"VlanZeroDirectConnectTunnelCount\": 0,\n                \"OtherVlanDirectConnectTunnelCount\": 0,\n                \"MinBandwidth\": 0,\n                \"ExpiredTime\": null,\n                \"EnabledTime\": \"2020-09-22T00:00:00+00:00\",\n                \"TencentAddress\": \"192.168.1.2/24\",\n                \"CustomerAddress\": \"192.168.1.1/24\",\n                \"ChargeType\": \"NON_RECURRING_CHARGE\",\n                \"TagSet\": []\n            }\n        ],\n        \"RequestId\": \"edafc0e0-3a01-4ac3-848d-e402ff04c1f3\",\n        \"TotalCount\": 1,\n        \"AllSignLaw\": false\n    }\n}",
+        "title": "查询物理专线列表-1"
       },
       {
-        "document": "",
-        "input": "https://dc.tencentcloudapi.com/?Action=DescribeDirectConnects\r\n&DirectConnectIds.0=dc-6mqd6t9j\r\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"DirectConnectSet\": [\n            {\n                \"EnabledTime\": \"2019-03-30 09:48:39\",\n                \"CustomerContactNumber\": \"13924777788\",\n                \"AccessPointId\": \"ap-cn-shenzhen-ns-A\",\n                \"ChargeState\": \"NORMAL\",\n                \"DirectConnectId\": \"dc-6mqd6t9j\",\n                \"State\": \"PENDING\",\n                \"ExpiredTime\": null,\n                \"Location\": \"腾讯大厦\",\n                \"CreatedTime\": \"2019-02-28 09:48:39\",\n                \"PortType\": \"1000Base-LX\",\n                \"CustomerName\": \"张三\",\n                \"LineOperator\": \"ChinaTelecom\",\n                \"TencentAddress\": \"\",\n                \"CircuitCode\": \"\",\n                \"CustomerAddress\": \"\",\n                \"CustomerContactMail\": \"zzubupt@163.com\",\n                \"Vlan\": -1,\n                \"Bandwidth\": 100,\n                \"DirectConnectName\": \"bbb\",\n                \"ChargeType\": \"PREPAID_BY_YEAR\",\n                \"RedundantDirectConnectId\": \"\"\n            }\n        ],\n        \"RequestId\": \"a17e965b-5c58-4cf2-b5fb-2e00946deea8\",\n        \"TotalCount\": 1\n    }\n}",
+        "document": "指定DirectConnectIds查询物理专线列表。",
+        "input": "https://dc.tencentcloudapi.com/?Action=DescribeDirectConnects\n&DirectConnectIds.0=dc-c3hbbsw9\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"DirectConnectSet\": [\n            {\n                \"DirectConnectId\": \"dc-c3hbbsw9\",\n                \"DirectConnectName\": \"专线接入测试\",\n                \"RedundantDirectConnectId\": \"\",\n                \"State\": \"AVAILABLE\",\n                \"ChargeState\": \"NORMAL\",\n                \"AccessPointId\": \"ap-cn-guangzhou-kxc\",\n                \"AccessPointName\": \"广州科丰路\",\n                \"AccessPointType\": \"VXLAN\",\n                \"Bandwidth\": 10000,\n                \"LineOperator\": \"ChinaOther\",\n                \"Construct\": 1,\n                \"Location\": \"广东省广州市华新园0602-A01机架7号位\",\n                \"PortType\": \"10GBase-LR\",\n                \"CreatedTime\": \"2020-09-22T00:00:00+00:00\",\n                \"StartTime\": \"2019-09-12 17:09:07\",\n                \"CircuitCode\": \"唐镇0103-A09-PL01-1\",\n                \"Vlan\": 100,\n                \"CustomerName\": \"张三\",\n                \"CustomerContactMail\": \"zhangsan@tencent.com\",\n                \"CustomerContactNumber\": \"13888888888\",\n                \"FaultReportContactPerson\": \"李四\",\n                \"FaultReportContactNumber\": \"15999999999\",\n                \"IdcCity\": \"广东省广州市华新园0602-A01机架7号位\",\n                \"SignLaw\": false,\n                \"LocalZone\": false,\n                \"VlanZeroDirectConnectTunnelCount\": 0,\n                \"OtherVlanDirectConnectTunnelCount\": 0,\n                \"MinBandwidth\": 0,\n                \"ExpiredTime\": null,\n                \"EnabledTime\": \"2020-09-22T00:00:00+00:00\",\n                \"TencentAddress\": \"192.168.1.2/24\",\n                \"CustomerAddress\": \"192.168.1.1/24\",\n                \"ChargeType\": \"NON_RECURRING_CHARGE\",\n                \"TagSet\": []\n            }\n        ],\n        \"RequestId\": \"edafc0e0-3a01-4ac3-848d-e402ff04c1f3\",\n        \"TotalCount\": 1,\n        \"AllSignLaw\": false\n    }\n}",
         "title": "查询物理专线列表-2"
       }
     ],
@@ -184,7 +184,7 @@
     ],
     "ModifyDirectConnectAttribute": [
       {
-        "document": "",
+        "document": "修改物理专线属性信息",
         "input": "https://dc.tencentcloudapi.com/?Action=ModifyDirectConnectAttribute\n&DirectConnectId=dcx-abcdefgh\n&DirectConnectName=abc\n&CircuitCode=ABF_123\n&Vlan=100\n&TencentAddress=172.168.1.1/30\n&CustomerAddress=172.168.1.2/30\n&CustomerName=张三\n&CustomerContactMail=12345@qq.com\n&CustomerContactNumber=18812345678\n&Bandwidth=1000\n&<公共请求参数>",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"3c140219-cfe9-470e-b241-907877d6fb03\"\n    }\n}",
         "title": "修改物理专线属性信息"
@@ -192,13 +192,13 @@
     ],
     "ModifyDirectConnectTunnelAttribute": [
       {
-        "document": "",
+        "document": "修改路由模式是BGP的专用通道",
         "input": "https://dc.tencentcloudapi.com/?Action=ModifyDirectConnectTunnelAttribute\n&DirectConnectTunnelId=dcx-abcdefgh\n&DirectConnectTunnelName=Test\n&Bandwidth=100\n&TencentAddress=192.168.1.1/30\n&CustomerAddress=192.168.1.2/30\n&BgpPeer.Asn=65128\n&BgpPeer.AuthKey=abcdefg\n&<公共请求参数>",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"3c140219-cfe9-470e-b241-907877d6fb03\"\n    }\n}",
         "title": "修改路由模式是BGP的专用通道"
       },
       {
-        "document": "",
+        "document": "修改路由模式是STATIC的专用通道",
         "input": "https://dc.tencentcloudapi.com/?Action=ModifyDirectConnectTunnelAttribute\n&DirectConnectTunnelId=dcx-abcdefgh\n&DirectConnectTunnelName=Test\n&Bandwidth=100\n&TencentAddress=192.168.1.1/30\n&CustomerAddress=192.168.1.2/30\n&RouteFilterPrefixes.0.Cidr=192.168.0.0/24\n&RouteFilterPrefixes.1.Cidr=192.168.1.0/24\n&RouteFilterPrefixes.2.Cidr=192.168.2.0/24\n&<公共请求参数>",
         "output": "{\n    \"Response\": {\n        \"RequestId\": \"3c140219-cfe9-470e-b241-907877d6fb03\"\n    }\n}",
         "title": "修改路由模式是STATIC的专用通道"

tccli/services/dcdb/dcdb_client.py

@@ -1681,6 +1681,58 @@ def doDescribeDBSyncMode(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeDCDBBinlogTime(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.DcdbClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeDCDBBinlogTimeRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeDCDBBinlogTime(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 doUpgradeHourDCDBInstance(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3856,6 +3908,7 @@ ACTION_MAP = {
     "DescribeDBLogFiles": doDescribeDBLogFiles,
     "IsolateHourDCDBInstance": doIsolateHourDCDBInstance,
     "DescribeDBSyncMode": doDescribeDBSyncMode,
+    "DescribeDCDBBinlogTime": doDescribeDCDBBinlogTime,
     "UpgradeHourDCDBInstance": doUpgradeHourDCDBInstance,
     "AssociateSecurityGroups": doAssociateSecurityGroups,
     "DescribeDCDBPrice": doDescribeDCDBPrice,

tccli/services/dcdb/v20180411/api.json

@@ -154,6 +154,13 @@
       "output": "DescribeDBTmpInstancesResponse",
       "status": "online"
     },
+    "DescribeDCDBBinlogTime": {
+      "document": "获取实例回档时可选的时间范围",
+      "input": "DescribeDCDBBinlogTimeRequest",
+      "name": "获取实例回档时可选的时间范围",
+      "output": "DescribeDCDBBinlogTimeResponse",
+      "status": "online"
+    },
     "DescribeDCDBInstanceDetail": {
       "document": "本接口（DescribeDCDBInstanceDetail）用于获取TDSQL实例详情",
       "input": "DescribeDCDBInstanceDetailRequest",
@@ -4245,6 +4252,53 @@
       ],
       "type": "object"
     },
+    "DescribeDCDBBinlogTimeRequest": {
+      "document": "DescribeDCDBBinlogTime请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "需要回档的实例ID",
+          "example": "tdsql-xxx",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeDCDBBinlogTimeResponse": {
+      "document": "DescribeDCDBBinlogTime返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "开始时间",
+          "example": "2019-01-01 10:00:00",
+          "member": "datetime",
+          "name": "StartTime",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "结束时间",
+          "example": "2019-01-01 12:00:00",
+          "member": "datetime",
+          "name": "EndTime",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeDCDBInstanceDetailRequest": {
       "document": "DescribeDCDBInstanceDetail请求参数结构体",
       "members": [

tccli/services/dcdb/v20180411/examples.json

@@ -176,6 +176,14 @@
         "title": "无"
       }
     ],
+    "DescribeDCDBBinlogTime": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: dcdb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeDCDBBinlogTime\n<公共请求参数>\n\n{\n    \"InstanceId\": \"dcdbt-21dfpcv1\"\n}",
+        "output": "{\n    \"Response\": {\n        \"EndTime\": \"2022-03-24 16:12:47\",\n        \"RequestId\": \"e7ffa51c-7e37-4254-9b56-65e0583cbe42\",\n        \"StartTime\": \"2022-03-24 16:12:47\"\n    }\n}",
+        "title": "无"
+      }
+    ],
     "DescribeDCDBInstanceDetail": [
       {
         "document": "查询分布式实例 dcdbt-21dfpcv1 的详细信息",

tccli/services/emr/emr_client.py

@@ -1213,6 +1213,58 @@ def doAddUsersForUserManager(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyAutoRenewFlag(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.ModifyAutoRenewFlagRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyAutoRenewFlag(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 doModifyAutoScaleStrategy(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2547,6 +2599,7 @@ ACTION_MAP = {
     "DescribeUsersForUserManager": doDescribeUsersForUserManager,
     "DeleteUserManagerUserList": doDeleteUserManagerUserList,
     "AddUsersForUserManager": doAddUsersForUserManager,
+    "ModifyAutoRenewFlag": doModifyAutoRenewFlag,
     "ModifyAutoScaleStrategy": doModifyAutoScaleStrategy,
     "DeleteAutoScaleStrategy": doDeleteAutoScaleStrategy,
     "DescribeEmrApplicationStatics": doDescribeEmrApplicationStatics,

tccli/services/emr/v20190103/api.json

@@ -231,6 +231,13 @@
       "output": "InquiryPriceUpdateInstanceResponse",
       "status": "online"
     },
+    "ModifyAutoRenewFlag": {
+      "document": "前提：预付费集群\n资源级别开启或关闭自动续费",
+      "input": "ModifyAutoRenewFlagRequest",
+      "name": "开启关闭自动续费接口",
+      "output": "ModifyAutoRenewFlagResponse",
+      "status": "online"
+    },
     "ModifyAutoScaleStrategy": {
       "document": "修改自动扩缩容规则",
       "input": "ModifyAutoScaleStrategyRequest",
@@ -7877,6 +7884,51 @@
       ],
       "usage": "both"
     },
+    "ModifyAutoRenewFlagRequest": {
+      "document": "ModifyAutoRenewFlag请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "集群ID",
+          "example": "emr-djj13azf",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "实例ID",
+          "example": "[emr-vm-4slr7ad7,emr--vm-daa23n1]",
+          "member": "string",
+          "name": "ResourceIds",
+          "required": true,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "NOTIFY_AND_MANUAL_RENEW：表示通知即将过期，但不自动续费  NOTIFY_AND_AUTO_RENEW：表示通知即将过期，而且自动续费  DISABLE_NOTIFY_AND_MANUAL_RENEW：表示不通知即将过期，也不自动续费。",
+          "example": "NOTIFY_AND_MANUAL_RENEW",
+          "member": "string",
+          "name": "RenewFlag",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "ModifyAutoRenewFlagResponse": {
+      "document": "ModifyAutoRenewFlag返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ModifyAutoScaleStrategyRequest": {
       "document": "ModifyAutoScaleStrategy请求参数结构体",
       "members": [

tccli/services/emr/v20190103/examples.json

@@ -270,6 +270,14 @@
         "title": "变配询价"
       }
     ],
+    "ModifyAutoRenewFlag": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: emr.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyAutoRenewFlag\n<公共请求参数>\n\n{\n    \"InstanceId\": \"emr-xxxxx\",\n    \"ResourceIds\": [\n        \"emr-vm-xxxx1\",\n        \"emr-vm-xxxx2\",\n        \"emr-vm-xxxx3\"\n    ],\n    \"RenewFlag\": \"NOTIFY_AND_MANUAL_RENEW\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"4d701c1e-8507-47e1-8c69-a8f06a236f24\"\n    }\n}",
+        "title": "开启关闭自动续费接口"
+      }
+    ],
     "ModifyAutoScaleStrategy": [
       {
         "document": "修改扩缩容规则",

tccli/services/es/es_client.py

@@ -329,6 +329,58 @@ def doDescribeServerlessSpaces(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doInstallInstanceModel(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.EsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.InstallInstanceModelRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.InstallInstanceModel(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 doDescribeUserCosSnapshotList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2894,6 +2946,7 @@ ACTION_MAP = {
     "GetRequestTargetNodeTypes": doGetRequestTargetNodeTypes,
     "StopLogstashPipelines": doStopLogstashPipelines,
     "DescribeServerlessSpaces": doDescribeServerlessSpaces,
+    "InstallInstanceModel": doInstallInstanceModel,
     "DescribeUserCosSnapshotList": doDescribeUserCosSnapshotList,
     "DeleteInstance": doDeleteInstance,
     "GetDiagnoseSettings": doGetDiagnoseSettings,

tccli/services/es/v20180416/api.json

@@ -238,6 +238,13 @@
       "output": "InquirePriceRenewInstanceResponse",
       "status": "online"
     },
+    "InstallInstanceModel": {
+      "document": "ES集群安装模型接口",
+      "input": "InstallInstanceModelRequest",
+      "name": "安装ES集群模型",
+      "output": "InstallInstanceModelResponse",
+      "status": "online"
+    },
     "ModifyEsVipSecurityGroup": {
       "document": "修改绑定VIP的安全组，传安全组id列表",
       "input": "ModifyEsVipSecurityGroupRequest",
@@ -5299,6 +5306,62 @@
       ],
       "type": "object"
     },
+    "InstallInstanceModelRequest": {
+      "document": "InstallInstanceModel请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例ID",
+          "example": "es-xxxxxxxx",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "客户上传到自己cos的地址列表",
+          "example": "[\"cos1\", \"cos2\"]",
+          "member": "string",
+          "name": "UsrCosModelUrlList",
+          "required": false,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "InstallInstanceModelResponse": {
+      "document": "InstallInstanceModel返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "发起异步流程的flowId",
+          "example": "1111111",
+          "member": "string",
+          "name": "FlowId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "调用接口的错误信息",
+          "example": "\"\"",
+          "member": "string",
+          "name": "ErrMsg",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "InstanceInfo": {
       "document": "实例详细信息",
       "members": [

tccli/services/es/v20180416/examples.json

@@ -272,6 +272,14 @@
         "title": "ES集群实例续费询价"
       }
     ],
+    "InstallInstanceModel": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: es.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: InstallInstanceModel\n<公共请求参数>\n\n{\n    \"InstanceId\": \"abc\",\n    \"UsrCosModelUrlList\": [\n        \"abc\"\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"d6c1d15f-5eab-11ef-9b1d-525400a23f29\",\n        \"FlowId\": \"17279\"\n    }\n}",
+        "title": "安装模型调用示例"
+      }
+    ],
     "ModifyEsVipSecurityGroup": [
       {
         "document": "修改集群VIP绑定的安全组信息",