tccli 3.0.1366.1__py2.py3-none-any.whl → 3.0.1367.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1366.1'
+__version__ = '3.0.1367.1'

tccli/services/apm/v20210622/api.json

@@ -116,21 +116,23 @@
           "member": "string",
           "name": "Key",
           "output_required": true,
+          "required": false,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "Value 值定义",
-          "example": "CloudMonitor",
+          "example": "0.0",
           "member": "float",
           "name": "Value",
           "output_required": true,
+          "required": false,
           "type": "float",
           "value_allowed_null": false
         }
       ],
-      "usage": "out"
+      "usage": "both"
     },
     "APMKVItem": {
       "document": "APM 通用 KV 结构",
@@ -477,7 +479,7 @@
         {
           "disabled": false,
           "document": "同比结果数组，推荐使用\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "[               {                 \"Key\": \"CompareByYesterday\",                 \"Value\": \"0.0%\"               }             ]",
+          "example": "无",
           "member": "APMKVItem",
           "name": "CompareVals",
           "output_required": true,
@@ -487,7 +489,7 @@
         {
           "disabled": false,
           "document": "同比上一个周期的具体指标数值\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "[               {                 \"Key\": \"CompareByYesterday\",                 \"Value\": 8.092753335107176               }             ]",
+          "example": "无",
           "member": "APMKV",
           "name": "LastPeriodValue",
           "output_required": true,
@@ -503,6 +505,16 @@
           "output_required": true,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "指标中文名",
+          "example": "吞吐量",
+          "member": "string",
+          "name": "NameCN",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"

tccli/services/cdb/v20170320/api.json

@@ -1221,7 +1221,7 @@
   },
   "metadata": {
     "apiVersion": "2017-03-20",
-    "api_brief": "介绍如何使用API对云数据库MySQL进行操作，包括查询数据库表、查询云数据库实例任务列表、续费云数据库实例等。",
+    "api_brief": "介绍如何使用 API 对云数据库 MySQL 进行操作，包括查询数据库表、查询云数据库实例任务列表、续费云数据库实例等。",
     "serviceNameCN": "云数据库 MySQL",
     "serviceShortName": "cdb"
   },

tccli/services/cdn/v20180606/api.json

@@ -2597,16 +2597,18 @@
           "example": "off",
           "member": "string",
           "name": "FullUrlCache",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "是否忽略大小写缓存\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "是否忽略大小写缓存\non：开启\noff：关闭\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "off",
           "member": "string",
           "name": "IgnoreCase",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": true
@@ -2617,6 +2619,7 @@
           "example": "无",
           "member": "QueryStringKey",
           "name": "QueryString",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": true
@@ -2627,6 +2630,7 @@
           "example": "无",
           "member": "CookieKey",
           "name": "Cookie",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": true
@@ -2637,6 +2641,7 @@
           "example": "无",
           "member": "HeaderKey",
           "name": "Header",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": true
@@ -2647,6 +2652,7 @@
           "example": "无",
           "member": "CacheTagKey",
           "name": "CacheTag",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": true
@@ -2657,6 +2663,7 @@
           "example": "无",
           "member": "SchemeKey",
           "name": "Scheme",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": true
@@ -2667,6 +2674,7 @@
           "example": "无",
           "member": "KeyRule",
           "name": "KeyRules",
+          "output_required": true,
           "required": false,
           "type": "list",
           "value_allowed_null": true
@@ -8549,7 +8557,7 @@
         {
           "disabled": false,
           "document": "CacheType 对应类型下的匹配内容：\nfile 时填充后缀名，如 jpg、txt\ndirectory 时填充路径，如 /xxx/test\npath 时填充绝对路径，如 /xxx/test.html\nindex 时填充 /\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "jpg",
+          "example": "[\"jpg\"]",
           "member": "string",
           "name": "RulePaths",
           "output_required": true,
@@ -8581,7 +8589,7 @@
         },
         {
           "disabled": false,
-          "document": "是否忽略大小写缓存\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "是否忽略大小写缓存\non：开启\noff：关闭\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "off",
           "member": "string",
           "name": "IgnoreCase",

tccli/services/cfw/cfw_client.py

@@ -1109,58 +1109,6 @@ def doRemoveAclRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteNatFwInstance(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.CfwClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteNatFwInstanceRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DeleteNatFwInstance(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 doCreateBlockIgnoreRuleList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1941,7 +1889,7 @@ def doModifyVpcAcRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeAssetSync(args, parsed_globals):
+def doDeleteNatFwInstance(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1970,11 +1918,11 @@ def doDescribeAssetSync(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeAssetSyncRequest()
+    model = models.DeleteNatFwInstanceRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeAssetSync(model)
+        rsp = client.DeleteNatFwInstance(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2305,58 +2253,6 @@ def doDescribeNatFwInstanceWithRegion(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteAddressTemplate(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.CfwClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteAddressTemplateRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DeleteAddressTemplate(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 doCreateBlockIgnoreRuleNew(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2669,58 +2565,6 @@ def doCreateAlertCenterOmit(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateIdsWhiteRule(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.CfwClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateIdsWhiteRuleRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.CreateIdsWhiteRule(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 doDescribeVpcAcRule(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3345,7 +3189,7 @@ def doModifyAssetScan(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeleteIdsWhiteRule(args, parsed_globals):
+def doDeleteAddressTemplate(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -3374,11 +3218,11 @@ def doDeleteIdsWhiteRule(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeleteIdsWhiteRuleRequest()
+    model = models.DeleteAddressTemplateRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DeleteIdsWhiteRule(model)
+        rsp = client.DeleteAddressTemplate(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -4333,7 +4177,7 @@ def doRemoveNatAcRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeAcLists(args, parsed_globals):
+def doDescribeAssetSync(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -4362,11 +4206,11 @@ def doDescribeAcLists(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeAcListsRequest()
+    model = models.DescribeAssetSyncRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeAcLists(model)
+        rsp = client.DescribeAssetSync(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5633,7 +5477,7 @@ def doModifyAcRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeIdsWhiteRule(args, parsed_globals):
+def doModifyNatFwSwitch(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -5662,11 +5506,11 @@ def doDescribeIdsWhiteRule(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeIdsWhiteRuleRequest()
+    model = models.ModifyNatFwSwitchRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeIdsWhiteRule(model)
+        rsp = client.ModifyNatFwSwitch(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5685,7 +5529,7 @@ def doDescribeIdsWhiteRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyNatFwSwitch(args, parsed_globals):
+def doDescribeTLogIpList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -5714,11 +5558,11 @@ def doModifyNatFwSwitch(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyNatFwSwitchRequest()
+    model = models.DescribeTLogIpListRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyNatFwSwitch(model)
+        rsp = client.DescribeTLogIpList(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5737,7 +5581,7 @@ def doModifyNatFwSwitch(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeTLogIpList(args, parsed_globals):
+def doCreateAddressTemplate(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -5766,11 +5610,11 @@ def doDescribeTLogIpList(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeTLogIpListRequest()
+    model = models.CreateAddressTemplateRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeTLogIpList(model)
+        rsp = client.CreateAddressTemplate(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5789,7 +5633,7 @@ def doDescribeTLogIpList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateAddressTemplate(args, parsed_globals):
+def doAddNatAcRule(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -5818,11 +5662,11 @@ def doCreateAddressTemplate(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateAddressTemplateRequest()
+    model = models.AddNatAcRuleRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateAddressTemplate(model)
+        rsp = client.AddNatAcRule(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5841,7 +5685,7 @@ def doCreateAddressTemplate(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doAddNatAcRule(args, parsed_globals):
+def doDescribeBlockStaticList(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -5870,11 +5714,11 @@ def doAddNatAcRule(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.AddNatAcRuleRequest()
+    model = models.DescribeBlockStaticListRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.AddNatAcRule(model)
+        rsp = client.DescribeBlockStaticList(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5893,7 +5737,7 @@ def doAddNatAcRule(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeBlockStaticList(args, parsed_globals):
+def doDescribeFwEdgeIps(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -5922,11 +5766,11 @@ def doDescribeBlockStaticList(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeBlockStaticListRequest()
+    model = models.DescribeFwEdgeIpsRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeBlockStaticList(model)
+        rsp = client.DescribeFwEdgeIps(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -5945,7 +5789,7 @@ def doDescribeBlockStaticList(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeFwEdgeIps(args, parsed_globals):
+def doDescribeAcLists(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -5974,11 +5818,11 @@ def doDescribeFwEdgeIps(args, parsed_globals):
     client = mod.CfwClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeFwEdgeIpsRequest()
+    model = models.DescribeAcListsRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeFwEdgeIps(model)
+        rsp = client.DescribeAcLists(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -6029,7 +5873,6 @@ ACTION_MAP = {
     "ModifyBlockTop": doModifyBlockTop,
     "DeleteRemoteAccessDomain": doDeleteRemoteAccessDomain,
     "RemoveAclRule": doRemoveAclRule,
-    "DeleteNatFwInstance": doDeleteNatFwInstance,
     "CreateBlockIgnoreRuleList": doCreateBlockIgnoreRuleList,
     "ModifyBlockIgnoreRuleNew": doModifyBlockIgnoreRuleNew,
     "ModifyEdgeIpSwitch": doModifyEdgeIpSwitch,
@@ -6045,21 +5888,19 @@ ACTION_MAP = {
     "DeleteAllAccessControlRule": doDeleteAllAccessControlRule,
     "DescribeSecurityGroupList": doDescribeSecurityGroupList,
     "ModifyVpcAcRule": doModifyVpcAcRule,
-    "DescribeAssetSync": doDescribeAssetSync,
+    "DeleteNatFwInstance": doDeleteNatFwInstance,
     "CreateSecurityGroupRules": doCreateSecurityGroupRules,
     "DescribeDefenseSwitch": doDescribeDefenseSwitch,
     "DescribeFwGroupInstanceInfo": doDescribeFwGroupInstanceInfo,
     "ModifyNatFwVpcDnsSwitch": doModifyNatFwVpcDnsSwitch,
     "ModifySecurityGroupItemRuleStatus": doModifySecurityGroupItemRuleStatus,
     "DescribeNatFwInstanceWithRegion": doDescribeNatFwInstanceWithRegion,
-    "DeleteAddressTemplate": doDeleteAddressTemplate,
     "CreateBlockIgnoreRuleNew": doCreateBlockIgnoreRuleNew,
     "DescribeSourceAsset": doDescribeSourceAsset,
     "DeleteResourceGroup": doDeleteResourceGroup,
     "RemoveAcRule": doRemoveAcRule,
     "ModifyVpcFwSequenceRules": doModifyVpcFwSequenceRules,
     "CreateAlertCenterOmit": doCreateAlertCenterOmit,
-    "CreateIdsWhiteRule": doCreateIdsWhiteRule,
     "DescribeVpcAcRule": doDescribeVpcAcRule,
     "ModifyEnterpriseSecurityGroupRule": doModifyEnterpriseSecurityGroupRule,
     "AddAclRule": doAddAclRule,
@@ -6072,7 +5913,7 @@ ACTION_MAP = {
     "ModifyBlockIgnoreList": doModifyBlockIgnoreList,
     "CreateChooseVpcs": doCreateChooseVpcs,
     "ModifyAssetScan": doModifyAssetScan,
-    "DeleteIdsWhiteRule": doDeleteIdsWhiteRule,
+    "DeleteAddressTemplate": doDeleteAddressTemplate,
     "ModifySequenceRules": doModifySequenceRules,
     "ModifySequenceAclRules": doModifySequenceAclRules,
     "DescribeRuleOverview": doDescribeRuleOverview,
@@ -6091,7 +5932,7 @@ ACTION_MAP = {
     "DescribeCfwEips": doDescribeCfwEips,
     "DescribeBlockIgnoreList": doDescribeBlockIgnoreList,
     "RemoveNatAcRule": doRemoveNatAcRule,
-    "DescribeAcLists": doDescribeAcLists,
+    "DescribeAssetSync": doDescribeAssetSync,
     "DescribeLogStorageStatistic": doDescribeLogStorageStatistic,
     "ExpandCfwVertical": doExpandCfwVertical,
     "CreateVpcFwGroup": doCreateVpcFwGroup,
@@ -6116,13 +5957,13 @@ ACTION_MAP = {
     "DescribeResourceGroup": doDescribeResourceGroup,
     "SyncFwOperate": doSyncFwOperate,
     "ModifyAcRule": doModifyAcRule,
-    "DescribeIdsWhiteRule": doDescribeIdsWhiteRule,
     "ModifyNatFwSwitch": doModifyNatFwSwitch,
     "DescribeTLogIpList": doDescribeTLogIpList,
     "CreateAddressTemplate": doCreateAddressTemplate,
     "AddNatAcRule": doAddNatAcRule,
     "DescribeBlockStaticList": doDescribeBlockStaticList,
     "DescribeFwEdgeIps": doDescribeFwEdgeIps,
+    "DescribeAcLists": doDescribeAcLists,
 
 }