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

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1291.1'
+__version__ = '3.0.1293.1'

tccli/services/__init__.py

@@ -183,6 +183,9 @@ SERVICE_VERSIONS = {
     "cfw": [
         "2019-09-04"
     ],
+    "chc": [
+        "2023-04-18"
+    ],
     "chdfs": [
         "2020-11-12",
         "2019-07-18"

tccli/services/advisor/v20200721/api.json

@@ -27,33 +27,33 @@
       "members": [
         {
           "disabled": false,
-          "document": "警告条件ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "警告条件ID",
           "example": "1",
           "member": "uint64",
           "name": "ConditionId",
-          "required": true,
+          "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "警告级别，2:中风险，3:高风险\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "警告级别，2:中风险，3:高风险",
           "example": "2",
           "member": "uint64",
           "name": "Level",
-          "required": true,
+          "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "警告级别描述\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "警告级别描述",
           "example": "中风险",
           "member": "string",
           "name": "LevelDesc",
-          "required": true,
+          "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
@@ -61,7 +61,7 @@
           "example": "Redis 实例未跨可用区部署",
           "member": "string",
           "name": "Desc",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         }
@@ -78,13 +78,13 @@
       "members": [
         {
           "disabled": false,
-          "document": "评估项列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项列表",
           "example": "无",
           "member": "Strategies",
           "name": "Strategies",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
@@ -155,7 +155,7 @@
           "example": "无",
           "member": "RiskFieldsDesc",
           "name": "RiskFieldsDesc",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -165,7 +165,7 @@
           "example": "1",
           "member": "uint64",
           "name": "StrategyId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -175,17 +175,17 @@
           "example": "10",
           "member": "uint64",
           "name": "RiskTotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
         {
           "disabled": false,
           "document": "风险实例详情列表，需要json decode\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "[{\\\"AppId\\\":12345678,\\\"IgnoreType\\\":\\\"\\\",\\\"Level\\\":\\\"2\\\",\\\"RiskDays\\\":1,\\\"conditionID\\\":8018},{\\\"AppId\\\":12345678,\\\"IgnoreType\\\":\\\"\\\",\\\"Level\\\":\\\"2\\\",\\\"RiskDays\\\":1,\\\"conditionID\\\":8018}]",
           "member": "string",
           "name": "Risks",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -195,7 +195,7 @@
           "example": "10",
           "member": "uint64",
           "name": "ResourceCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -287,93 +287,93 @@
       "members": [
         {
           "disabled": false,
-          "document": "评估项ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项ID",
           "example": "1",
           "member": "uint64",
           "name": "StrategyId",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "评估项名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项名称",
           "example": "云数据库（Redis）跨可用区部署",
           "member": "string",
           "name": "Name",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "评估项描述\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项描述",
           "example": "检查 Redis 实例是否跨可用区部署，如果实例未跨可用区部署，当实例出现可用区级别的灾难故障时，可能造成实例无法访问风险",
           "member": "string",
           "name": "Desc",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "评估项对应产品ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项对应产品ID",
           "example": "redis",
           "member": "string",
           "name": "Product",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "评估项对应产品名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项对应产品名称",
           "example": "云数据库（Redis）",
           "member": "string",
           "name": "ProductDesc",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "评估项优化建议\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项优化建议",
           "example": "如果业务有较高容灾需求，建议采用跨可用区部署方案，提升业务可靠性，[跨可用区分布操作指引](https://cloud.tenc",
           "member": "string",
           "name": "Repair",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "评估项类别ID\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项类别ID",
           "example": "2",
           "member": "uint64",
           "name": "GroupId",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "评估项类别名称\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项类别名称",
           "example": "可靠",
           "member": "string",
           "name": "GroupName",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "评估项风险列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "评估项风险列表",
           "example": "[{\"ConditionId\":178,\"Level\":2,\"LevelDesc\":\"中风险\",\"Desc\":\"Redis 实例",
           "member": "Conditions",
           "name": "Conditions",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         }
       ],
       "usage": "out"

tccli/services/advisor/v20200721/examples.json

@@ -4,7 +4,7 @@
       {
         "document": "",
         "input": "POST / HTTP/1.1\nHost: advisor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeStrategies\n<公共请求参数>\n\n{}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"111\",\n        \"Strategies\": [\n            {\n                \"StrategyId\": 131,\n                \"Name\": \"云数据库（Redis）跨可用区部署\",\n                \"Desc\": \"检查 Redis 实例是否跨可用区部署，如果实例未跨可用区部署，当实例出现可用区级别的灾难故障时，可能造成实例无法访问风险\",\n                \"Product\": \"redis\",\n                \"ProductDesc\": \"云数据库（Redis）\",\n                \"Repair\": \"如果业务有较高容灾需求，建议采用跨可用区部署方案，提升业务可靠性，[跨可用区分布操作指引](https://cloud.tencent.com/document/product/239/51113)\",\n                \"GroupId\": 2,\n                \"GroupName\": \"可靠\",\n                \"Conditions\": [\n                    {\n                        \"ConditionId\": 178,\n                        \"Level\": 2,\n                        \"LevelDesc\": \"中风险\",\n                        \"Desc\": \"Redis 实例未跨可用区部署\"\n                    }\n                ]\n            },\n            {\n                \"StrategyId\": 235,\n                \"Name\": \"云数据库（Redis）使用基础网络\",\n                \"Desc\": \"检查 Redis 是否使用基础网络\",\n                \"Product\": \"redis\",\n                \"ProductDesc\": \"云数据库（Redis）\",\n                \"Repair\": \"建议更换为私有网络，私有网络是一块逻辑隔离的网络空间，基础网络是腾讯云上所有用户的公共网络资源池\",\n                \"GroupId\": 2,\n                \"GroupName\": \"可靠\",\n                \"Conditions\": [\n                    {\n                        \"ConditionId\": 307,\n                        \"Level\": 2,\n                        \"LevelDesc\": \"中风险\",\n                        \"Desc\": \"实例使用基础网络\"\n                    }\n                ]\n            }\n        ]\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"\",\n        \"Strategies\": [\n            {\n                \"StrategyId\": 131,\n                \"Name\": \"云数据库（Redis）跨可用区部署\",\n                \"Desc\": \"检查 Redis 实例是否跨可用区部署，如果实例未跨可用区部署，当实例出现可用区级别的灾难故障时，可能造成实例无法访问风险\",\n                \"Product\": \"redis\",\n                \"ProductDesc\": \"云数据库（Redis）\",\n                \"Repair\": \"如果业务有较高容灾需求，建议采用跨可用区部署方案，提升业务可靠性，[跨可用区分布操作指引](https://cloud.tencent.com/document/product/239/51113)\",\n                \"GroupId\": 2,\n                \"GroupName\": \"可靠\",\n                \"Conditions\": [\n                    {\n                        \"ConditionId\": 178,\n                        \"Level\": 2,\n                        \"LevelDesc\": \"中风险\",\n                        \"Desc\": \"Redis 实例未跨可用区部署\"\n                    }\n                ]\n            },\n            {\n                \"StrategyId\": 235,\n                \"Name\": \"云数据库（Redis）使用基础网络\",\n                \"Desc\": \"检查 Redis 是否使用基础网络\",\n                \"Product\": \"redis\",\n                \"ProductDesc\": \"云数据库（Redis）\",\n                \"Repair\": \"建议更换为私有网络，私有网络是一块逻辑隔离的网络空间，基础网络是腾讯云上所有用户的公共网络资源池\",\n                \"GroupId\": 2,\n                \"GroupName\": \"可靠\",\n                \"Conditions\": [\n                    {\n                        \"ConditionId\": 307,\n                        \"Level\": 2,\n                        \"LevelDesc\": \"中风险\",\n                        \"Desc\": \"实例使用基础网络\"\n                    }\n                ]\n            }\n        ]\n    }\n}",
         "title": "查询评估项信息"
       }
     ],
@@ -12,7 +12,7 @@
       {
         "document": "",
         "input": "POST / HTTP/1.1\nHost: advisor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeTaskStrategyRisks\n<公共请求参数>\n\n{\n    \"StrategyId\": 9\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"111\",\n        \"RiskFieldsDesc\": [\n            {\n                \"Field\": \"InstanceId\",\n                \"FieldName\": \"ID\",\n                \"FieldType\": \"string\",\n                \"FieldDict\": {}\n            },\n            {\n                \"Field\": \"InstanceName\",\n                \"FieldName\": \"名称\",\n                \"FieldType\": \"string\",\n                \"FieldDict\": {}\n            },\n            {\n                \"Field\": \"InstanceState\",\n                \"FieldName\": \"状态\",\n                \"FieldType\": \"string\",\n                \"FieldDict\": {}\n            },\n            {\n                \"Field\": \"Zone\",\n                \"FieldName\": \"可用区\",\n                \"FieldType\": \"string\",\n                \"FieldDict\": {}\n            },\n            {\n                \"Field\": \"PrivateIPAddresses\",\n                \"FieldName\": \"IP地址(内)\",\n                \"FieldType\": \"stringSlice\",\n                \"FieldDict\": {}\n            },\n            {\n                \"Field\": \"PublicIPAddresses\",\n                \"FieldName\": \"IP地址(公)\",\n                \"FieldType\": \"stringSlice\",\n                \"FieldDict\": {}\n            },\n            {\n                \"Field\": \"Region\",\n                \"FieldName\": \"地域\",\n                \"FieldType\": \"string\",\n                \"FieldDict\": {}\n            },\n            {\n                \"Field\": \"Tags\",\n                \"FieldName\": \"标签\",\n                \"FieldType\": \"tags\",\n                \"FieldDict\": {}\n            }\n        ],\n        \"RiskTotalCount\": 3,\n        \"ResourceCount\": 10,\n        \"Risks\": \"[{\\\"InstanceId\\\":\\\"ins-xxx1\\\",\\\"InstanceName\\\":\\\"xxx1\\\",\\\"InstanceState\\\":\\\"RUNNING\\\",\\\"PrivateIPAddresses\\\":[\\\"1.17.64.2\\\"],\\\"PublicIPAddresses\\\":null,\\\"Region\\\":\\\"ap-shanghai\\\",\\\"Tags\\\":null,\\\"Zone\\\":\\\"ap-shanghai-2\\\"},{\\\"InstanceId\\\":\\\"ins-xxx2\\\",\\\"InstanceName\\\":\\\"xxx2\\\",\\\"InstanceState\\\":\\\"RUNNING\\\",\\\"PrivateIPAddresses\\\":[\\\"1.17.64.11\\\"],\\\"PublicIPAddresses\\\":null,\\\"Region\\\":\\\"ap-shanghai\\\",\\\"Tags\\\":null,\\\"Zone\\\":\\\"ap-shanghai-2\\\"}]\",\n        \"StrategyId\": 9\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"aa-bb-cc-dd\",\n        \"RiskFieldsDesc\": [\n            {\n                \"Field\": \"Level\",\n                \"FieldName\": \"风险等级\",\n                \"FieldType\": \"string\",\n                \"FieldDict\": [\n                    {\n                        \"Key\": \"3\",\n                        \"Value\": \"高风险\"\n                    },\n                    {\n                        \"Key\": \"2\",\n                        \"Value\": \"中风险\"\n                    }\n                ]\n            },\n            {\n                \"Field\": \"AppId\",\n                \"FieldName\": \"appid\",\n                \"FieldType\": \"int\",\n                \"FieldDict\": null\n            },\n            {\n                \"Field\": \"RiskDays\",\n                \"FieldName\": \"风险持续天数\",\n                \"FieldType\": \"int\",\n                \"FieldDict\": null\n            },\n            {\n                \"Field\": \"conditionID\",\n                \"FieldName\": \"条件ID\",\n                \"FieldType\": \"int\",\n                \"FieldDict\": null\n            }\n        ],\n        \"RiskTotalCount\": 3,\n        \"ResourceCount\": 10,\n        \"Risks\": \"[{\\\"InstanceId\\\":\\\"ins-xxx1\\\",\\\"InstanceName\\\":\\\"xxx1\\\",\\\"InstanceState\\\":\\\"RUNNING\\\",\\\"PrivateIPAddresses\\\":[\\\"1.17.64.2\\\"],\\\"PublicIPAddresses\\\":null,\\\"Region\\\":\\\"ap-shanghai\\\",\\\"Tags\\\":null,\\\"Zone\\\":\\\"ap-shanghai-2\\\"},{\\\"InstanceId\\\":\\\"ins-xxx2\\\",\\\"InstanceName\\\":\\\"xxx2\\\",\\\"InstanceState\\\":\\\"RUNNING\\\",\\\"PrivateIPAddresses\\\":[\\\"1.17.64.11\\\"],\\\"PublicIPAddresses\\\":null,\\\"Region\\\":\\\"ap-shanghai\\\",\\\"Tags\\\":null,\\\"Zone\\\":\\\"ap-shanghai-2\\\"}]\",\n        \"StrategyId\": 9\n    }\n}",
         "title": "查询评估项风险实例列表"
       }
     ]

tccli/services/antiddos/antiddos_client.py

@@ -537,58 +537,6 @@ def doDescribeCcBlackWhiteIpList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeBlackWhiteIpList(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.AntiddosClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeBlackWhiteIpListRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DescribeBlackWhiteIpList(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 doDescribeCCLevelList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4541,58 +4489,6 @@ def doDeleteCcBlackWhiteIpList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeListProtectThresholdConfig(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.AntiddosClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeListProtectThresholdConfigRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DescribeListProtectThresholdConfig(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 doDeleteCCPrecisionPolicy(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4905,7 +4801,7 @@ def doCreateWaterPrintKey(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteCCRequestLimitPolicy(args, parsed_globals):
+def doModifyDDoSGeoIPBlockConfig(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -4934,11 +4830,11 @@ def doDeleteCCRequestLimitPolicy(args, parsed_globals):
     client = mod.AntiddosClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteCCRequestLimitPolicyRequest()
+    model = models.ModifyDDoSGeoIPBlockConfigRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DeleteCCRequestLimitPolicy(model)
+        rsp = client.ModifyDDoSGeoIPBlockConfig(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -4957,7 +4853,7 @@ def doDeleteCCRequestLimitPolicy(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyDDoSGeoIPBlockConfig(args, parsed_globals):
+def doDeleteCCRequestLimitPolicy(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -4986,11 +4882,11 @@ def doModifyDDoSGeoIPBlockConfig(args, parsed_globals):
     client = mod.AntiddosClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyDDoSGeoIPBlockConfigRequest()
+    model = models.DeleteCCRequestLimitPolicyRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyDDoSGeoIPBlockConfig(model)
+        rsp = client.DeleteCCRequestLimitPolicy(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5030,7 +4926,6 @@ ACTION_MAP = {
     "DescribeDDoSConnectLimitList": doDescribeDDoSConnectLimitList,
     "DescribeNewL7RulesErrHealth": doDescribeNewL7RulesErrHealth,
     "DescribeCcBlackWhiteIpList": doDescribeCcBlackWhiteIpList,
-    "DescribeBlackWhiteIpList": doDescribeBlackWhiteIpList,
     "DescribeCCLevelList": doDescribeCCLevelList,
     "CreateCCPrecisionPolicy": doCreateCCPrecisionPolicy,
     "DescribeCCThresholdList": doDescribeCCThresholdList,
@@ -5107,15 +5002,14 @@ ACTION_MAP = {
     "CreateDDoSBlackWhiteIpList": doCreateDDoSBlackWhiteIpList,
     "DescribeCCTrend": doDescribeCCTrend,
     "DeleteCcBlackWhiteIpList": doDeleteCcBlackWhiteIpList,
-    "DescribeListProtectThresholdConfig": doDescribeListProtectThresholdConfig,
     "DeleteCCPrecisionPolicy": doDeleteCCPrecisionPolicy,
     "DescribeDDoSBlackWhiteIpList": doDescribeDDoSBlackWhiteIpList,
     "CreateDDoSConnectLimit": doCreateDDoSConnectLimit,
     "CreateDDoSGeoIPBlockConfig": doCreateDDoSGeoIPBlockConfig,
     "DescribeCcGeoIPBlockConfigList": doDescribeCcGeoIPBlockConfigList,
     "CreateWaterPrintKey": doCreateWaterPrintKey,
-    "DeleteCCRequestLimitPolicy": doDeleteCCRequestLimitPolicy,
     "ModifyDDoSGeoIPBlockConfig": doModifyDDoSGeoIPBlockConfig,
+    "DeleteCCRequestLimitPolicy": doDeleteCCRequestLimitPolicy,
 
 }