tccli 3.0.1287.1__py2.py3-none-any.whl → 3.0.1289.1__py2.py3-none-any.whl

tccli/services/cfg/v20210820/examples.json

@@ -36,7 +36,7 @@
       {
         "document": "",
         "input": "POST / HTTP/1.1\nHost: cfg.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeActionFieldConfigList\n<公共请求参数>\n\n{\n    \"ObjectTypeId\": \"1\",\n    \"ActionIds\": [\n        \"1\"\n    ]\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"f3433a9a-e8fd-40b9-88e7-dd8b3f1a181f\",\n        \"Common\": [\n            {\n                \"ActionId\": 1,\n                \"ActionName\": \"关机\",\n                \"ConfigDetail\": [\n                    {\n                        \"Type\": \"input\",\n                        \"Lable\": \"动作别名\",\n                        \"Field\": \"AliasTitle\",\n                        \"DefaultValue\": \"\",\n                        \"Config\": \"{}\",\n                        \"Required\": 0,\n                        \"Validate\": \"{}\",\n                        \"Visible\": \"{}\"\n                    },\n                    {\n                        \"Type\": \"number\",\n                        \"Lable\": \"前置等待时间(s)\",\n                        \"Field\": \"PreTimeWait\",\n                        \"DefaultValue\": \"0\",\n                        \"Config\": \"{\\\"max\\\": 86400, \\\"min\\\": 0, \\\"tooltip\\\": \\\"仅限用于自动推进模式\\\"}\",\n                        \"Required\": 1,\n                        \"Validate\": \"{}\",\n                        \"Visible\": \"{}\"\n                    },\n                    {\n                        \"Type\": \"number\",\n                        \"Lable\": \"后置等待时间(s)\",\n                        \"Field\": \"AfterTimeWait\",\n                        \"DefaultValue\": \"0\",\n                        \"Config\": \"{\\\"max\\\": 86400, \\\"min\\\": 0, \\\"tooltip\\\": \\\"仅限用于自动推进模式\\\"}\",\n                        \"Required\": 1,\n                        \"Validate\": \"{}\",\n                        \"Visible\": \"{}\"\n                    },\n                    {\n                        \"Type\": \"number\",\n                        \"Lable\": \"动作超时时间(s)\",\n                        \"Field\": \"ActionTimeout\",\n                        \"DefaultValue\": \"1800\",\n                        \"Config\": \"{\\\"max\\\": 86400, \\\"min\\\": 0, \\\"tooltip\\\": \\\"动作的超时时间\\\"}\",\n                        \"Required\": 1,\n                        \"Validate\": \"{}\",\n                        \"Visible\": \"{}\"\n                    }\n                ]\n            }\n        ],\n        \"Results\": []\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"f3433a9a-e8fd-40b9-88e7-dd8b3f1a181f\",\n        \"Common\": [\n            {\n                \"ActionId\": 1,\n                \"ActionName\": \"关机\",\n                \"ConfigDetail\": [\n                    {\n                        \"Type\": \"number\",\n                        \"Lable\": \"动作超时时间(s)\",\n                        \"Field\": \"ActionTimeout\",\n                        \"DefaultValue\": \"1800\",\n                        \"Config\": \"{\\\"max\\\": 86400, \\\"min\\\": 0, \\\"tooltip\\\": \\\"动作的超时时间\\\"}\",\n                        \"Required\": 1,\n                        \"Validate\": \"{\\\"op\\\": \\\"==\\\", \\\"value\\\": \\\"指定个数重启\\\", \\\"relatedField\\\": \\\"reboot_mod\\\"}\",\n                        \"Visible\": \"{\\\"op\\\": \\\"<\\\", \\\"type\\\": \\\"need_insert\\\", \\\"value\\\": 0, \\\"relatedField\\\": \\\"ActionTimeout\\\"}\"\n                    }\n                ]\n            }\n        ],\n        \"Results\": []\n    }\n}",
         "title": "示例"
       }
     ],

tccli/services/cfs/v20190719/api.json

@@ -933,7 +933,7 @@
         {
           "disabled": false,
           "document": "私有网络（VPC） ID，若网络类型选择的是VPC，该字段为必填。",
-          "example": "123",
+          "example": "6235990",
           "member": "string",
           "name": "VpcId",
           "required": false,

tccli/services/clb/v20180317/api.json

@@ -169,7 +169,7 @@
       "status": "online"
     },
     "DeregisterFunctionTargets": {
-      "document": "DeregisterFunctionTargets 接口用来将一个云函数从负载均衡的转发规则上解绑，对于七层监听器，还需通过 LocationId 或 Domain+Url 指定转发规则。\n本接口为异步接口，本接口返回成功后需以返回的 RequestID 为入参，调用 [DescribeTaskStatus](https://cloud.tencent.com/document/product/214/30683) 接口查询本次任务是否成功。\n<br/>限制说明：\n\n- 仅广州、深圳金融、上海、上海金融、北京、成都、中国香港、新加坡、孟买、东京、硅谷地域支持绑定 SCF。\n- 仅标准账户类型支持绑定 SCF，传统账户类型不支持。建议升级为标准账户类型，详情可参见 [账户类型升级说明](https://cloud.tencent.com/document/product/1199/49090)。\n- 传统型负载均衡不支持绑定 SCF。\n- 基础网络类型不支持绑定 SCF。\n- CLB 默认支持绑定同地域下的所有 SCF，可支持跨 VPC 绑定 SCF，不支持跨地域绑定。\n- 目前仅 IPv4、IPv6 NAT64 版本的负载均衡支持绑定 SCF，IPv6 版本的暂不支持。\n- 仅七层（HTTP、HTTPS）监听器支持绑定 SCF，四层（TCP、UDP、TCP SSL）监听器和七层 QUIC 监听器不支持。\n- CLB 绑定 SCF 仅支持绑定“Event 函数”类型的云函数。",
+      "document": "DeregisterFunctionTargets 接口用来将一个云函数从负载均衡的转发规则上解绑，对于七层监听器，还需通过 LocationId 或 Domain+Url 指定转发规则。\n本接口为异步接口，本接口返回成功后需以返回的 RequestID 为入参，调用 [DescribeTaskStatus](https://cloud.tencent.com/document/product/214/30683) 接口查询本次任务是否成功。\n<br/>限制说明：\n\n- 仅广州、深圳金融、上海、上海金融、北京、成都、中国香港、新加坡、东京、硅谷地域支持绑定 SCF。\n- 仅标准账户类型支持绑定 SCF，传统账户类型不支持。建议升级为标准账户类型，详情可参见 [账户类型升级说明](https://cloud.tencent.com/document/product/1199/49090)。\n- 传统型负载均衡不支持绑定 SCF。\n- 基础网络类型不支持绑定 SCF。\n- CLB 默认支持绑定同地域下的所有 SCF，可支持跨 VPC 绑定 SCF，不支持跨地域绑定。\n- 目前仅 IPv4、IPv6 NAT64 版本的负载均衡支持绑定 SCF，IPv6 版本的暂不支持。\n- 仅七层（HTTP、HTTPS）监听器支持绑定 SCF，四层（TCP、UDP、TCP SSL）监听器和七层 QUIC 监听器不支持。\n- CLB 绑定 SCF 仅支持绑定“Event 函数”类型的云函数。",
       "input": "DeregisterFunctionTargetsRequest",
       "name": "将云函数从转发规则上解绑",
       "output": "DeregisterFunctionTargetsResponse",
@@ -568,7 +568,7 @@
       "status": "online"
     },
     "RegisterFunctionTargets": {
-      "document": "RegisterFunctionTargets 接口用来将一个云函数绑定到负载均衡的7层转发规则，在此之前您需要先行创建相关的7层监听器（HTTP、HTTPS）和转发规则。\n本接口为异步接口，本接口返回成功后需以返回的RequestID为入参，调用DescribeTaskStatus接口查询本次任务是否成功。<br/>\n限制说明：\n- 仅广州、深圳金融、上海、上海金融、北京、成都、中国香港、新加坡、孟买、东京、硅谷地域支持绑定 SCF。\n- 仅标准账户类型支持绑定 SCF，传统账户类型不支持。建议升级为标准账户类型，详情可参见 [账户类型升级说明](https://cloud.tencent.com/document/product/1199/49090)。 \n- 传统型负载均衡不支持绑定 SCF。\n- 基础网络类型不支持绑定 SCF。\n- CLB 默认支持绑定同地域下的所有 SCF，可支持跨 VPC 绑定 SCF，不支持跨地域绑定。\n- 目前仅 IPv4、IPv6 NAT64 版本的负载均衡支持绑定 SCF，IPv6 版本的暂不支持。\n- 仅七层（HTTP、HTTPS）监听器支持绑定 SCF，四层（TCP、UDP、TCP SSL）监听器和七层 QUIC 监听器不支持。\n- CLB 绑定 SCF 仅支持绑定“Event 函数”类型的云函数。",
+      "document": "RegisterFunctionTargets 接口用来将一个云函数绑定到负载均衡的7层转发规则，在此之前您需要先行创建相关的7层监听器（HTTP、HTTPS）和转发规则。\n本接口为异步接口，本接口返回成功后需以返回的RequestID为入参，调用DescribeTaskStatus接口查询本次任务是否成功。<br/>\n限制说明：\n- 仅广州、深圳金融、上海、上海金融、北京、成都、中国香港、新加坡、东京、硅谷地域支持绑定 SCF。\n- 仅标准账户类型支持绑定 SCF，传统账户类型不支持。建议升级为标准账户类型，详情可参见 [账户类型升级说明](https://cloud.tencent.com/document/product/1199/49090)。 \n- 传统型负载均衡不支持绑定 SCF。\n- 基础网络类型不支持绑定 SCF。\n- CLB 默认支持绑定同地域下的所有 SCF，可支持跨 VPC 绑定 SCF，不支持跨地域绑定。\n- 目前仅 IPv4、IPv6 NAT64 版本的负载均衡支持绑定 SCF，IPv6 版本的暂不支持。\n- 仅七层（HTTP、HTTPS）监听器支持绑定 SCF，四层（TCP、UDP、TCP SSL）监听器和七层 QUIC 监听器不支持。\n- CLB 绑定 SCF 仅支持绑定“Event 函数”类型的云函数。",
       "input": "RegisterFunctionTargetsRequest",
       "name": "绑定云函数到转发规则上",
       "output": "RegisterFunctionTargetsResponse",

tccli/services/cvm/cvm_client.py

@@ -1317,6 +1317,58 @@ def doDescribeImageSharePermission(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeInstancesAttributes(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.CvmClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeInstancesAttributesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeInstancesAttributes(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 doDescribeRegions(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -5305,6 +5357,7 @@ ACTION_MAP = {
     "DisassociateSecurityGroups": doDisassociateSecurityGroups,
     "RemoveChcDeployVpc": doRemoveChcDeployVpc,
     "DescribeImageSharePermission": doDescribeImageSharePermission,
+    "DescribeInstancesAttributes": doDescribeInstancesAttributes,
     "DescribeRegions": doDescribeRegions,
     "DescribeInstancesModification": doDescribeInstancesModification,
     "CreateKeyPair": doCreateKeyPair,

tccli/services/cvm/v20170312/api.json

@@ -259,6 +259,13 @@
       "output": "DescribeInstancesActionTimerResponse",
       "status": "online"
     },
+    "DescribeInstancesAttributes": {
+      "document": "获取指定实例的属性，目前支持查询实例自定义数据User-Data。",
+      "input": "DescribeInstancesAttributesRequest",
+      "name": "批量获取指定实例属性",
+      "output": "DescribeInstancesAttributesResponse",
+      "status": "online"
+    },
     "DescribeInstancesModification": {
       "document": "本接口 (DescribeInstancesModification) 用于查询指定实例支持调整的机型配置。",
       "input": "DescribeInstancesModificationRequest",
@@ -1041,6 +1048,23 @@
       ],
       "type": "object"
     },
+    "Attribute": {
+      "document": "属性信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例的自定义数据。",
+          "example": "TXlVc2VyRGF0YQo=\t",
+          "member": "string",
+          "name": "UserData",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "ChargePrepaid": {
       "document": "描述预付费模式，即包年包月相关参数。包括购买时长和自动续费逻辑等。",
       "members": [
@@ -3974,6 +3998,52 @@
       ],
       "type": "object"
     },
+    "DescribeInstancesAttributesRequest": {
+      "document": "DescribeInstancesAttributes请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "需要获取的实例属性。可选值：\nUserData: 实例自定义数据",
+          "example": "[\"UserData\"]",
+          "member": "string",
+          "name": "Attributes",
+          "required": true,
+          "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "实例ID列表",
+          "example": "[\"ins-lyxxskp2\"]",
+          "member": "string",
+          "name": "InstanceIds",
+          "required": true,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeInstancesAttributesResponse": {
+      "document": "DescribeInstancesAttributes返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "指定的实例属性列表",
+          "example": "无",
+          "member": "InstanceAttribute",
+          "name": "InstanceSet",
+          "output_required": true,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeInstancesModificationRequest": {
       "document": "DescribeInstancesModification请求参数结构体",
       "members": [
@@ -4785,13 +4855,13 @@
         },
         {
           "disabled": false,
-          "document": "查询返回的维修任务列表。\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "NA",
+          "document": "查询返回的维修任务列表。",
+          "example": "无",
           "member": "RepairTaskInfo",
           "name": "RepairTaskInfoSet",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
@@ -5169,13 +5239,22 @@
           "type": "string"
         },
         {
-          "disabled": false,
-          "document": "是否强制关机",
+          "disabled": true,
+          "document": "是否强制关机。本参数已弃用，推荐使用StopType，不可以与参数StopType同时使用。",
           "example": "False",
           "member": "bool",
           "name": "ForceStop",
           "required": false,
           "type": "bool"
+        },
+        {
+          "disabled": false,
+          "document": "实例的关闭模式。取值范围：<br><li>SOFT_FIRST：表示在正常关闭失败后进行强制关闭</li><br><li>HARD：直接强制关闭</li><br><li>SOFT：仅软关机</li><br>默认取值：SOFT。",
+          "example": "HARD",
+          "member": "string",
+          "name": "StopType",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -7495,6 +7574,32 @@
       ],
       "usage": "out"
     },
+    "InstanceAttribute": {
+      "document": "实例属性",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例 ID。",
+          "example": "ins-lyxxskp2",
+          "member": "string",
+          "name": "InstanceId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "实例属性信息。",
+          "example": "无",
+          "member": "Attribute",
+          "name": "Attributes",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "InstanceChargePrepaid": {
       "document": "描述了实例的计费模式",
       "members": [

tccli/services/cvm/v20170312/examples.json

@@ -320,6 +320,14 @@
         "title": "查询定时任务"
       }
     ],
+    "DescribeInstancesAttributes": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: cvm.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeInstancesAttributes\n<公共请求参数>\n\n{\n    \"Attributes\": [\n        \"UserData\"\n    ],\n    \"InstanceIds\": [\n        \"ins-pgklxcq0\"\n    ]\n}",
+        "output": "{\n    \"Response\": {\n        \"InstanceSet\": [\n            {\n                \"Attributes\": {\n                    \"UserData\": \"TXlVc2VyRGF0YQo=\"\n                },\n                \"InstanceId\": \"ins-pgklxcq0\"\n            }\n        ],\n        \"RequestId\": \"bd249418-331b-43c7-b872-3ae94fe84af9\"\n    }\n}",
+        "title": "查询指定实例列表的实例属性"
+      }
+    ],
     "DescribeInstancesModification": [
       {
         "document": "查询指定实例支持调整的机型配置",

tccli/services/cwp/v20180228/api.json

@@ -5983,7 +5983,7 @@
         },
         {
           "disabled": false,
-          "document": "防护级别：0基础版，1专业版，2旗舰版，3普惠版",
+          "document": "防护级别：0基础版，1专业版，2旗舰版，3轻量版",
           "example": "1",
           "member": "uint64",
           "name": "ProtectLevel",
@@ -14584,7 +14584,7 @@
         },
         {
           "disabled": false,
-          "document": "备份模式： 0按周，1按天",
+          "document": "备份模式： 0按周，1按天，2不备份",
           "example": "1",
           "member": "uint64",
           "name": "BackupType",
@@ -25085,7 +25085,7 @@
         },
         {
           "disabled": false,
-          "document": "过滤条件：\n<li>Version - String  是否必填：否 - 当前防护版本（ PRO_VERSION：专业版 | BASIC_VERSION：基础版 | Flagship：旗舰版 | ProtectedMachines：专业版+旗舰版） | BASIC_PROPOST_GENERAL_DISCOUNT：普惠版+专业版按量计费+基础版主机 | UnFlagship：专业版预付费+专业版后付费+基础版+普惠版</li>",
+          "document": "过滤条件：<li>Version - String  是否必填：否 - 当前防护版本（ PRO_VERSION：专业版 | BASIC_VERSION：基础版 | Flagship：旗舰版 | ProtectedMachines：专业版+旗舰版） | BASIC_PROPOST_GENERAL_DISCOUNT：轻量版+专业版按量计费+基础版主机 | UnFlagship：专业版预付费+专业版后付费+基础版+轻量版</li>",
           "example": "[{\"Name\": \"Version\", \"Values\": [\"UnFlag****\"]}]",
           "member": "Filters",
           "name": "Filters",
@@ -25101,7 +25101,7 @@
         {
           "disabled": false,
           "document": "有效的机器信息列表：机器名称、机器公网/内网ip、机器标签",
-          "example": "[{\"MachineName\": \"KISYUN-TXGZ-BZRDP.G01-64****\", \"MachinePublicIp\": \"10.0.1****\", \"MachinePrivateIp\": \"10.244.64****\", \"MachineTag\": null, \"CloudTags\": [{\"TagKey\": \"Use\", \"TagValue\": \"Produc****\"}], \"Quuid\": \"cb28d31e-b727-424d-bd9c-b8cff56a****\", \"Uuid\": \"cb28d31e-b727-424d-bd9c-b8cff56a****\", \"KernelVersion\": \"1.0.1\", \"MachineStatus\": \"OFFLINE\", \"LicenseOrder\": {\"LicenseId\": 0, \"LicenseType\": 0, \"SourceType\": 0, \"ResourceId\": \"\", \"Status\": 0}, \"VulNum\": 0, \"InstanceID\": \"ins-pgja****\", \"CloudFrom\": 0}]",
+          "example": "无",
           "member": "EffectiveMachineInfo",
           "name": "EffectiveMachineInfoList",
           "output_required": true,
@@ -25684,7 +25684,7 @@
         },
         {
           "disabled": false,
-          "document": "普惠版总授权数(有效订单的授权数)",
+          "document": "轻量版总授权数(有效订单的授权数)",
           "example": "0",
           "member": "uint64",
           "name": "CwpVersionLicenseCnt",
@@ -25910,7 +25910,7 @@
         },
         {
           "disabled": false,
-          "document": "普惠版 配置信息",
+          "document": "轻量版 配置信息",
           "example": "1",
           "member": "VersionWhiteConfig",
           "name": "PrattWhitney",
@@ -27025,7 +27025,7 @@
         },
         {
           "disabled": false,
-          "document": "已防护普惠版机器数（Lighthouse机器）",
+          "document": "已防护轻量机器数（Lighthouse机器）",
           "example": "0",
           "member": "uint64",
           "name": "LHGeneralDiscountCnt",
@@ -27291,7 +27291,7 @@
         },
         {
           "disabled": false,
-          "document": "防护版本：BASIC_VERSION 基础版，PRO_VERSION 专业版，Flagship 旗舰版，GENERAL_DISCOUNT 普惠版",
+          "document": "防护版本：BASIC_VERSION 基础版，PRO_VERSION 专业版，Flagship 旗舰版，GENERAL_DISCOUNT 轻量版",
           "example": "BASIC_VERSION",
           "member": "string",
           "name": "ProtectType",
@@ -29823,6 +29823,24 @@
           "name": "By",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "事件创建起始时间",
+          "example": "2025-02-10 16:00:01",
+          "member": "string",
+          "name": "CreateBeginTime",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "事件创建结束时间",
+          "example": "2025-02-10 16:00:01",
+          "member": "string",
+          "name": "CreateEndTime",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -29833,7 +29851,7 @@
         {
           "disabled": false,
           "document": "事件列表",
-          "example": "[             {                 \"Id\": 10001,                 \"CreateTime\": \"2024-05-14 11:01:02\",                 \"ModifyTime\": \"2024-07-19 17:59:03\",                 \"Quuid\": \"1c26308c-5493-4eaf-a817-112ec25f4991\",                 \"Uuid\": \"1c26308c-5493-4eaf-a817-112ec25f4991\",                 \"Status\": 2,                 \"BaitFilePath\": \"/home/.yjfile/121hcXh.doc\",                 \"FilePath\": \"/usr/bin/bash\",                 \"FileMd5\": \"708c8760385810080c4d17fa84d325ca\",                 \"FileSize\": 964536,                 \"Pid\": 32254,                 \"PidParam\": \"bash -c echo \\\"Csip data test\\\" >> /home/.yjfile/121hcXh.doc  1>&2\",                 \"Type\": 0,                 \"PsTree\": \"W3sicGlkIjozMjI1NCwiZXhlIjoiL3Vzci9iaW4vYmFzaCIsImNtZGxpbmUiOiJiYXNoIC1jIGVjaG8gXCJDc2lwIGRhdGEgdGVzdFwiIFx1MDAzZVx1MDAzZSAvaG9tZS8ueWpmaWxlLzEyMWhjWGguZG9jICAxXHUwMDNlXHUwMDI2MiIsImFjY291bnQiOiIwOjAiLCJzdGFydF90aW1lIjoxNzE1NjU1NjYyLCJleGVfcGVybSI6Ii1yd3hyLXhyLXgiLCJleGVfbXRpbWUiOjE1ODU3MDc0NTEsInNlc3Npb25pZCI6MzIyNTQsInNzaF9zb3VyY2UiOiIxMTMuMTA4Ljc3LjUzOjM5NjIyIiwic3NoX3NlcnZpY2UiOiIxNzIuMTYuNDkuMTA0OjIyIn0seyJwaWQiOjMyMjUyLCJleGUiOiIvdXNyL3NiaW4vc3NoZCIsImNtZGxpbmUiOiIvdXNyL3NiaW4vc3NoZCAtRCAtUiIsImFjY291bnQiOiIwOjAiLCJzdGFydF90aW1lIjoxNzE1NjU1NjYxLCJleGVfcGVybSI6Ii1yd3hyLXhyLXgiLCJleGVfbXRpbWUiOjE2OTExNjQ4NTIsInNlc3Npb25pZCI6MzIyNTJ9XQ==\",                 \"ProcessStartTime\": \"2024-05-14 11:01:02\",                 \"InstanceId\": \"ins-qwea\",                 \"HostName\": \"机器名称\",                 \"StrategyId\": 10001,                 \"StrategyName\": \"测试勿动\",                 \"HostIp\": \"1.1.1.1\",                 \"WanIp\": \"1.1.1.1\",                 \"SnapshotNum\": 45             }         ]",
+          "example": "[             {                 \"Id\": 10001,                 \"CreateTime\": \"2024-05-14 11:01:02\"            }         ]",
           "member": "RansomDefenseEvent",
           "name": "List",
           "output_required": true,
@@ -31835,7 +31853,7 @@
         },
         {
           "disabled": false,
-          "document": "为空默认扫描全部专业版、旗舰版、普惠版主机，不为空只扫描选中主机",
+          "document": "为空默认扫描全部专业版、旗舰版、轻量版主机，不为空只扫描选中主机",
           "example": "[\"d99a1b46-cc2d-4633-a11f-4a7663d25***\"]",
           "member": "string",
           "name": "Uuids",
@@ -33676,7 +33694,7 @@
         },
         {
           "disabled": false,
-          "document": "普惠版数量",
+          "document": "轻量版数量",
           "example": "1",
           "member": "uint64",
           "name": "GeneralVersionNum",
@@ -42441,6 +42459,36 @@
           "output_required": true,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "主机类型",
+          "example": "CVM",
+          "member": "string",
+          "name": "MachineType",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "可用区名称",
+          "example": "ap-beijing",
+          "member": "string",
+          "name": "RegionName",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "可用区ID",
+          "example": "17",
+          "member": "uint64",
+          "name": "RegionId",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -44368,7 +44416,7 @@
         },
         {
           "disabled": false,
-          "document": "防护版本：BASIC_VERSION 基础版， PRO_VERSION 专业版，Flagship 旗舰版，GENERAL_DISCOUNT 普惠版",
+          "document": "防护版本：BASIC_VERSION 基础版， PRO_VERSION 专业版，Flagship 旗舰版，GENERAL_DISCOUNT 轻量版",
           "example": "BASIC_VERSION",
           "member": "string",
           "name": "ProtectType",
@@ -44888,7 +44936,7 @@
         },
         {
           "disabled": false,
-          "document": "防护版本 BASIC_VERSION 基础版， PRO_VERSION 专业版，Flagship 旗舰版，GENERAL_DISCOUNT 普惠版.",
+          "document": "防护版本 BASIC_VERSION 基础版， PRO_VERSION 专业版，Flagship 旗舰版，GENERAL_DISCOUNT 轻量版.",
           "example": "BASIC_VERSION",
           "member": "string",
           "name": "ProtectType",
@@ -49357,7 +49405,7 @@
         },
         {
           "disabled": false,
-          "document": "机器付费版本，0 基础版，1专业版，2旗舰版，3普惠版",
+          "document": "机器付费版本，0 基础版，1专业版，2旗舰版，3轻量版",
           "example": "1",
           "member": "uint64",
           "name": "PayVersion",
@@ -49504,7 +49552,7 @@
         {
           "disabled": false,
           "document": "攻击数据包",
-          "example": "POST /wls-wsat/CoordinatorPortType HTTP/1.1\r\nX-Stgw-Time: 1730212752.801\r\nHost: h2.lghd111.com\r\nX-Client-Proto: https\r\nX-Forwarded-Proto: https\r\nX-Client-Proto-Ver: HTTP/1.1\r\nX-Real-IP: 180.184.132.93\r\nX-Forwarded-For: 223.160.168.205, 180.184.132.93\r\nConnection: keep-alive\r\nContent-Length: 602131\r\nX-Bd-Tlb-Waf-Token: 760b7cc634ab0dc34e478204cbf9d5d7\r\nUser-Agent: Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.2309.372 Safari/537.36\r\nCmd: whoami\r\nContent-Type: text/xml\r\nAccept-Encoding: gzip\r\nX-Client-Scheme: https\r\nX-Real-Port: 59809\r\nX-Waf-RequestId: 68f116341c0029caf481ddf6cec16bd1\r\nX-Waf-Account-Id: 2102099106\r\nX-TLB-Cluster: antiddos_shanghai1\r\nX-TLB-Server-Addr: 192.168.0.173\r\nX-TT-LOGID: 20241029223911B8C44E08BB016F27DA08\r\n\r\n<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<soapenv:Envelope\n    xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"\n    xmlns:wsa=\"http://www.w3.org/2005/08/addressing\"\n    xmlns:asy=\"http://www.bea.com/async/AsyncResponseService\">\n    <soapenv:Header>\n        <wsa:Action/>\n        <wsa:RelatesTo/>\n        <asy:onAsyncDelivery/>\n        <work:WorkContext\n            xmlns:work=\"http://bea.com/2004/06/soap/workarea/\">\n            <class>\n                <string>oracle.toplink.internal.sessions.UnitOfWorkChangeSet</string>\n                <void>\n                    <array class=\"byte\" length=\"5010\">\n                        <void index=\"0\">\n                            <byte>-84</byte>\n                        </void>\n                        <void index=\"1\">\n                            <byte>-19</byte>\n                        </void>\n                        <void index=\"2\">\n                            <byte>0</byte>\n                        </void>\n                        <void index=\"3\">\n                            <byte>5</byte>\n                        </void>\n                        <void index=\"4\">\n                            <byte>115</byte>\n                        </void>\n                        <void index=\"5\">\n                            <byte>114</byte>\n                        </void>\n                        <void index=\"6\">\n                            <byte>0</byte>\n                        </void>\n                        <void index=\"7\">\n                            <byte>23</byte>\n                        </void>\n                        <void index=\"8\">\n                            <byte>106</byte>\n                        </void>\n                        <void index=\"9\">\n                            <byte>97</byte>\n                        </void>\n                        <void index=\"10\">\n                            <byte>118</byte>\n                        </void>\n                        <void index=\"11\">\n                            <byte>97</byte>\n                        </vo****",
+          "example": "POST /wls-wsat/CoordinatorPortType HTTP/1.1X-Stgw-Time: 1730212752.801Host: h2.lghd111.comX-Client-Proto: httpsX-Forwarded-Proto: httpsX-Client-Proto-Ver: HTTP/1.1X-Real-IP: 180.184.132.93X-Forwarded-For: 223.160.168.205",
           "member": "string",
           "name": "NetPayload",
           "output_required": true,
@@ -49573,7 +49621,7 @@
         },
         {
           "disabled": false,
-          "document": "机器付费版本，0 基础版，1专业版，2旗舰版，3普惠版",
+          "document": "机器付费版本，0 基础版，1专业版，2旗舰版，3轻量版",
           "example": "1",
           "member": "uint64",
           "name": "PayVersion",
@@ -49624,7 +49672,7 @@
         {
           "disabled": false,
           "document": "进程树,需要用base64 解码",
-          "example": "W3sicGlkIjoyODc0MCwiZXhlIjoiL3Vzci9iaW4vY3VybCIsImFjY291bnQiOiIwOjAiLCJjbWRsaW5lIjoiY3VybCAtcyAtTCBodHRwczovL2Rvd25sb2FkLmMzcG9vbC5vcmcveG1yaWdfc2V0dXAvcmF3L21hc3Rlci91bmluc3RhbGxfYzNwb29sX21pbmVyLnNoIiwic3NoX3NlcnZpY2UiOiIxMC4xMC42LjE0OjIyIiwic3NoX3NvdXJjZSI6IjE4My4xNC4yOS42NTozMDM4MyIsInN0YXJ0X3RpbWUiOjE3MzA0MzA1NTN9LHsicGlkIjoyODczNiwiZXhlIjoiL3Vzci9iaW4vYmFzaCIsImFjY291bnQiOiIwOjAiLCJjbWRsaW5lIjoiYmFzaCAuL3h4bC1qb2IvZXhlY3V0b3IvZ2x1ZXNvdXJjZS8xODc5NzhfMTE2OTg5NzkxMTEwLnNoIGRlbW9Kb2JIYW5kbGVyIDAgMCIsInNzaF9zZXJ2aWNlIjoiMTAuMTAuNi4xNDoyMiIsInNzaF9zb3VyY2UiOiIxODMuMTQuMjkuNjU6MzAzODMiLCJzdGFydF90aW1lIjoxNzMwNDMwNTUzfSx7InBpZCI6MTU5NjgsImV4ZSI6Ii9kYXRhL2pkay0xNy4wLjguMSsxL2Jpbi9qYXZhIiwiYWNjb3VudCI6IjA6MCIsImNtZGxpbmUiOiJqYXZhIC1YbXg1MTJtIC1YbXMxMjhtIC1Yc3M1MTJrIC1qYXIgLS1hZGQtb3BlbnMgamF2YS5iYXNlL2phdmEubGFuZy5yZWZsZWN0PUFMTC1VTk5BTUVEIC0tYWRkLW9wZW5zIGphdmEuYmFzZS9qYXZhLmxhbmc9QUxMLVVOTkFNRUQgL2RhdGEvYXBpL3Nob3AvY29uc3VtZXIvY29uc3VtZXItMS4wLjIuMi5qYXIiLCJzc2hfc2VydmljZSI6IjEwLjEwLjYuMTQ6MjIiLCJzc2hfc291cmNlIjoiMTgzLjE0LjI5LjY1OjMwMzgzIiwic3RhcnRfdGltZSI6MTczMDE4NTEyM30seyJwaWQiOjEsImV4ZSI6Ii91c3IvbGliL3N5c3RlbWQvc3lzdGVtZCIsImFjY291bnQiOiIwOjAiLCJjbWRsaW5lIjoiL3Vzci9saWIvc3lzdGVtZC9zeXN0ZW1kIC0tc3dpdGNoZWQtcm9vdCAtLXN5c3RlbSAtLWRlc2VyaWFsaXplIDIyIiwic3RhcnRfdGltZSI6MTcxNzA1NTg4****",
+          "example": "YW*jZA==",
           "member": "string",
           "name": "HostOpProcessTree",
           "output_required": false,
@@ -51328,7 +51376,7 @@
         },
         {
           "disabled": false,
-          "document": "备份状态：0备份中，1正常，2、3失败，4快照已过期，9快照已删除",
+          "document": "备份状态：0备份中，1正常，2、3失败，4快照已过期，5快照数量超出限制，9快照已删除",
           "example": "1",
           "member": "uint64",
           "name": "BackupStatus",
@@ -51782,6 +51830,16 @@
           "output_required": true,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "主机类型",
+          "example": "CVM",
+          "member": "string",
+          "name": "MachineType",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -51871,7 +51929,7 @@
         },
         {
           "disabled": false,
-          "document": "备份模式： 0按周，1按天",
+          "document": "备份模式： 0按周，1按天，2不备份",
           "example": "0",
           "member": "uint64",
           "name": "BackupType",
@@ -52313,13 +52371,23 @@
         },
         {
           "disabled": false,
-          "document": "版本信息：0-基础版 1-专业版 2-旗舰版 3-普惠版",
+          "document": "版本信息：0-基础版 1-专业版 2-旗舰版 3-轻量版",
           "example": "1",
           "member": "uint64",
           "name": "HostVersion",
           "output_required": true,
           "type": "int",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "机器所属专区类型 CVM 云服务器, BM 黑石, ECM 边缘计算, LH 轻量应用服务器 ,Other 混合云专区",
+          "example": "CVM",
+          "member": "string",
+          "name": "MachineType",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -52449,7 +52517,7 @@
         },
         {
           "disabled": false,
-          "document": "版本信息：0-基础版 1-专业版 2-旗舰版 3-普惠版",
+          "document": "版本信息：0-基础版 1-专业版 2-旗舰版 3-轻量版",
           "example": "0",
           "member": "uint64",
           "name": "HostVersion",
@@ -52466,6 +52534,16 @@
           "output_required": true,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "机器所属专区类型 CVM 云服务器, BM 黑石, ECM 边缘计算, LH 轻量应用服务器 ,Other 混合云专区",
+          "example": "CVM",
+          "member": "string",
+          "name": "MachineType",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -55066,7 +55144,7 @@
         },
         {
           "disabled": false,
-          "document": "为空默认扫描全部专业版、旗舰版、普惠版主机，不为空只扫描选中主机",
+          "document": "为空默认扫描全部专业版、旗舰版、轻量版主机，不为空只扫描选中主机",
           "example": "['']",
           "member": "string",
           "name": "Uuids",
@@ -58366,7 +58444,7 @@
         },
         {
           "disabled": false,
-          "document": "0 专业版,1 旗舰版,2 LH普惠版（仅限LH使用）,3  CVM普惠版（仅限CVM使用）",
+          "document": "0 专业版,1 旗舰版,2 LH轻量版（仅限LH使用）,3  CVM轻量版（仅限CVM使用）",
           "example": "1",
           "member": "int64",
           "name": "UpgradeType",
@@ -59168,7 +59246,7 @@
         },
         {
           "disabled": false,
-          "document": "版本信息：0-基础版 1-专业版 2-旗舰版 3-普惠版",
+          "document": "版本信息：0-基础版 1-专业版 2-旗舰版 3-轻量版",
           "example": "1",
           "member": "uint64",
           "name": "HostVersion",