tccli 3.0.1215.1__py2.py3-none-any.whl → 3.0.1217.1__py2.py3-none-any.whl

tccli/services/cdz/v20221123/api.json

@@ -28,7 +28,7 @@
         {
           "disabled": false,
           "document": "Host的唯一标识uuid\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "xxxxx-xxxxx-xxxxx",
           "member": "string",
           "name": "HostUuid",
           "output_required": false,
@@ -38,7 +38,7 @@
         {
           "disabled": false,
           "document": "实例名称数组\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "['ins-xxxxxxxx']",
           "member": "string",
           "name": "InstancesInfo",
           "output_required": false,
@@ -180,7 +180,7 @@
         {
           "disabled": false,
           "document": "资源统计详情",
-          "example": "无",
+          "example": "[     {         \"Item\": \"CPU\",         \"ItemEn\": \"CPU\",         \"Unit\": \"核\",         \"UnitEn\": \"核\",         \"Total\": \"28160\",         \"Usage\": \"27920\",         \"UsageRate\": \"99.15%\",         \"Remain\": \"240\",         \"RemainRate\": \"0.85%\",         \"ThisMondayUsageRate\": \"99.15%\",         \"ThisMondayUsageGrowthRate\": \"0.00%\",         \"LastMondayUsageGrowthRate\": \"0.00%\"     } ]",
           "member": "CloudDedicatedZoneResourceStatisticsInfo",
           "name": "Statistics",
           "output_required": false,
@@ -247,7 +247,7 @@
         {
           "disabled": false,
           "document": "返回Host和Host上部署的实例信息之间的关系",
-          "example": "无",
+          "example": "[       {         \"HostUuid\": \"9e6b54d0-xxxx-xxxx-xxxx-xxxxxxxxxxxx\",         \"InstancesInfo\": [           \"ins-xxxxxxxx\"         ]       }     ]",
           "member": "CloudDedicatedZoneHostsInfo",
           "name": "CloudDedicatedZoneHostsInfoSet",
           "output_required": false,
@@ -284,13 +284,23 @@
         {
           "disabled": false,
           "document": "资源水位详情\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "无",
+          "example": "[       {         \"ProductName\": \"云服务器\",         \"SubProductName\": \"标准型S5\",         \"Statistics\": [           {             \"Item\": \"CPU\",             \"Unit\": \"核\",             \"Total\": \"41996\",             \"Usage\": \"32875\",             \"UsageRate\": \"78.28%\",             \"Remain\": \"9121\",             \"RemainRate\": \"21.72%\",             \"ThisMondayUsageRate\": \"78.33%\",             \"ThisMondayUsageGrowthRate\": \"-0.05%\",             \"LastMondayUsageGrowthRate\": \"-4.41%\"           }         ]       } ]",
           "member": "CloudDedicatedZoneResourceSummaryInfo",
           "name": "ResourceSummarySet",
           "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
+        {
+          "disabled": false,
+          "document": "资源水位扩展信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "{             \"ThisMondayLocalDate\": \"2024-11-11\",             \"LastMondayLocalDate\": \"2024-11-04\"         }",
+          "member": "ExtraInfo",
+          "name": "ExtraInfo",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": true
+        },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
           "member": "string",
@@ -299,6 +309,32 @@
         }
       ],
       "type": "object"
+    },
+    "ExtraInfo": {
+      "document": "专属可用区资源水位数据扩展信息，包含可用区当地时间等数据。",
+      "members": [
+        {
+          "disabled": false,
+          "document": "专属可用区当地时间本周一日期\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2024-01-22",
+          "member": "string",
+          "name": "ThisMondayLocalDate",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "专属可用区当地时间上周一日期\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2024-01-15",
+          "member": "string",
+          "name": "LastMondayLocalDate",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
     }
   },
   "version": "1.0"

tccli/services/cfg/v20210820/api.json

@@ -2530,6 +2530,7 @@
           "example": "1",
           "member": "int64",
           "name": "TaskGroupActionId",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": false
@@ -2540,6 +2541,7 @@
           "example": "无",
           "member": "TaskGroupInstance",
           "name": "TaskGroupInstances",
+          "output_required": true,
           "required": true,
           "type": "list",
           "value_allowed_null": false
@@ -2550,6 +2552,7 @@
           "example": "1",
           "member": "int64",
           "name": "ActionId",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": false
@@ -2560,6 +2563,7 @@
           "example": "1",
           "member": "int64",
           "name": "TaskGroupActionOrder",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": false
@@ -2570,6 +2574,7 @@
           "example": "{}",
           "member": "string",
           "name": "TaskGroupActionGeneralConfiguration",
+          "output_required": true,
           "required": true,
           "type": "string",
           "value_allowed_null": true
@@ -2580,6 +2585,7 @@
           "example": "{}",
           "member": "string",
           "name": "TaskGroupActionCustomConfiguration",
+          "output_required": true,
           "required": true,
           "type": "string",
           "value_allowed_null": true
@@ -2590,6 +2596,7 @@
           "example": "1",
           "member": "int64",
           "name": "TaskGroupActionStatus",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": false
@@ -2600,6 +2607,7 @@
           "example": "\"2021-08-17 20:05:04\"",
           "member": "string",
           "name": "TaskGroupActionCreateTime",
+          "output_required": true,
           "required": true,
           "type": "string",
           "value_allowed_null": false
@@ -2610,6 +2618,7 @@
           "example": "\"2021-08-17 20:05:04\"",
           "member": "string",
           "name": "TaskGroupActionUpdateTime",
+          "output_required": true,
           "required": true,
           "type": "string",
           "value_allowed_null": false
@@ -2620,6 +2629,7 @@
           "example": "关机",
           "member": "string",
           "name": "ActionTitle",
+          "output_required": true,
           "required": true,
           "type": "string",
           "value_allowed_null": false
@@ -2630,6 +2640,7 @@
           "example": "0",
           "member": "int64",
           "name": "TaskGroupActionStatusType",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": false
@@ -2640,6 +2651,7 @@
           "example": "123456",
           "member": "int64",
           "name": "TaskGroupActionRandomId",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": true
@@ -2650,6 +2662,7 @@
           "example": "123456",
           "member": "int64",
           "name": "TaskGroupActionRecoverId",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": true
@@ -2660,6 +2673,7 @@
           "example": "123456",
           "member": "int64",
           "name": "TaskGroupActionExecuteId",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": true
@@ -2670,6 +2684,7 @@
           "example": "0",
           "member": "int64",
           "name": "ActionApiType",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": true
@@ -2680,6 +2695,7 @@
           "example": "1",
           "member": "int64",
           "name": "ActionAttribute",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": true
@@ -2690,6 +2706,7 @@
           "example": "平台",
           "member": "string",
           "name": "ActionType",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": true
@@ -2700,6 +2717,7 @@
           "example": "true",
           "member": "bool",
           "name": "IsExecuteRedo",
+          "output_required": true,
           "required": false,
           "type": "bool",
           "value_allowed_null": true
@@ -2710,6 +2728,7 @@
           "example": "高风险",
           "member": "string",
           "name": "ActionRisk",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": true
@@ -2720,9 +2739,21 @@
           "example": "10",
           "member": "int64",
           "name": "TaskGroupActionExecuteTime",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "动作开始执行时间",
+          "example": "\"2021-08-17 20:05:04\"",
+          "member": "string",
+          "name": "TaskGroupActionStartTime",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "both"

tccli/services/cfs/v20190719/api.json

@@ -309,6 +309,42 @@
     "serviceShortName": "cfs"
   },
   "objects": {
+    "AutoScaleUpRule": {
+      "document": "自动扩容规则",
+      "members": [
+        {
+          "disabled": false,
+          "document": "自动扩容策略开启，关闭",
+          "example": "open,close",
+          "member": "string",
+          "name": "Status",
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "集群用量占比，到达这个值后开始扩容,范围[10-90]",
+          "example": "80",
+          "member": "uint64",
+          "name": "ScaleThreshold",
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "扩容后使用量跟集群总量比例,范围[1-90]",
+          "example": "90",
+          "member": "uint64",
+          "name": "TargetThreshold",
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "AutoSnapshotPolicyInfo": {
       "document": "快照策略信息",
       "members": [
@@ -2310,7 +2346,7 @@
         },
         {
           "disabled": false,
-          "document": "过滤条件。\n<br>SnapshotId - Array of String - 是否必填：否 -（过滤条件）按快照ID过滤。\n<br>SnapshotName - Array of String - 是否必填：否 -（过滤条件）按照快照名称过滤。\n<br>FileSystemId - Array of String - 是否必填：否 -（过滤条件）按文件系统ID过滤。\n<br>FsName - Array of String - 是否必填：否 -（过滤条件）按文件系统名过滤。\n<br>Status - Array of String - 是否必填：否 -（过滤条件）按按照快照状态过滤。(creating：表示创建中 | available：表示可用。| rollbacking：表示回滚。| rollbacking_new：表示由快照创建新文件系统中。\n<br>tag-key - Array of String - 是否必填：否 -（过滤条件）按照标签键进行过滤。\n<br>tag:tag-key - Array of String - 是否必填：否 -（过滤条件）按照标签键值对进行过滤。 tag-key使用具体的标签键进行替换。",
+          "document": "过滤条件。\n<br>SnapshotId - Array of String - 是否必填：否 -（过滤条件）按快照ID过滤。\n<br>SnapshotName - Array of String - 是否必填：否 -（过滤条件）按照快照名称过滤。\n<br>FileSystemId - Array of String - 是否必填：否 -（过滤条件）按文件系统ID过滤。\n<br>FsName - Array of String - 是否必填：否 -（过滤条件）按文件系统名过滤。\n<br>Status - Array of String - 是否必填：否 -（过滤条件）按照快照状态过滤\n(creating：表示创建中 | available：表示可用。| rollbacking：表示回滚。| rollbacking_new：表示由快照创建新文件系统中）\n<br>tag-key - Array of String - 是否必填：否 -（过滤条件）按照标签键进行过滤。\n<br>tag:tag-key - Array of String - 是否必填：否 -（过滤条件）按照标签键值对进行过滤。 tag-key使用具体的标签键进行替换。",
           "example": "无",
           "member": "Filter",
           "name": "Filters",
@@ -2956,6 +2992,26 @@
           "type": "float",
           "value_allowed_null": false
         },
+        {
+          "disabled": false,
+          "document": "文件系统关联的快照策略",
+          "example": "无",
+          "member": "string",
+          "name": "AutoSnapshotPolicyId",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "文件系统处理快照状态",
+          "example": "snapping",
+          "member": "string",
+          "name": "SnapStatus",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
         {
           "disabled": false,
           "document": "文件系统容量规格上限\n单位:GiB",
@@ -2995,6 +3051,26 @@
           "output_required": true,
           "type": "object",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件系统自动扩容策略\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "\"Status\":close",
+          "member": "AutoScaleUpRule",
+          "name": "AutoScaleUpRule",
+          "output_required": true,
+          "type": "object",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "文件系统版本\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "v1.0",
+          "member": "string",
+          "name": "Version",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"
@@ -4124,9 +4200,21 @@
           "example": "100",
           "member": "int64",
           "name": "TieringSizeInBytes",
+          "output_required": true,
           "required": false,
           "type": "int",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "冷存储容量",
+          "example": "100",
+          "member": "int64",
+          "name": "SecondaryTieringSizeInBytes",
+          "output_required": true,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
         }
       ],
       "usage": "both"

tccli/services/cfs/v20190719/examples.json

@@ -156,7 +156,7 @@
       {
         "document": "查询文件系统",
         "input": "POST / HTTP/1.1\nHost: cfs.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeCfsFileSystems\n<公共请求参数>\n\n{\n    \"FileSystemId\": \"cfs-12345\"\n}",
-        "output": "{\n    \"Response\": {\n        \"FileSystems\": [\n            {\n                \"CreationTime\": \"abc\",\n                \"CreationToken\": \"abc\",\n                \"FileSystemId\": \"abc\",\n                \"LifeCycleState\": \"abc\",\n                \"SizeByte\": 1,\n                \"SizeLimit\": 1,\n                \"ZoneId\": 1,\n                \"Zone\": \"abc\",\n                \"Protocol\": \"abc\",\n                \"StorageType\": \"abc\",\n                \"StorageResourcePkg\": \"abc\",\n                \"BandwidthResourcePkg\": \"abc\",\n                \"PGroup\": {\n                    \"PGroupId\": \"abc\",\n                    \"Name\": \"abc\"\n                },\n                \"FsName\": \"abc\",\n                \"Encrypted\": true,\n                \"KmsKeyId\": \"abc\",\n                \"AppId\": 0,\n                \"BandwidthLimit\": 0,\n                \"Capacity\": 1,\n                \"Tags\": [\n                    {\n                        \"TagKey\": \"abc\",\n                        \"TagValue\": \"abc\"\n                    }\n                ],\n                \"TieringState\": \"abc\",\n                \"TieringDetail\": {\n                    \"TieringSizeInBytes\": 0\n                }\n            }\n        ],\n        \"TotalCount\": 1,\n        \"RequestId\": \"abc\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"FileSystems\": [\n            {\n                \"CreationTime\": \"abc\",\n                \"CreationToken\": \"abc\",\n                \"FileSystemId\": \"abc\",\n                \"LifeCycleState\": \"abc\",\n                \"SizeByte\": 1,\n                \"SizeLimit\": 1,\n                \"ZoneId\": 1,\n                \"Zone\": \"abc\",\n                \"Protocol\": \"abc\",\n                \"StorageType\": \"abc\",\n                \"StorageResourcePkg\": \"abc\",\n                \"BandwidthResourcePkg\": \"abc\",\n                \"PGroup\": {\n                    \"PGroupId\": \"abc\",\n                    \"Name\": \"abc\"\n                },\n                \"FsName\": \"abc\",\n                \"Encrypted\": true,\n                \"KmsKeyId\": \"abc\",\n                \"AppId\": 0,\n                \"BandwidthLimit\": 0,\n                \"AutoSnapshotPolicyId\": \"abc\",\n                \"SnapStatus\": \"abc\",\n                \"Capacity\": 1,\n                \"Tags\": [\n                    {\n                        \"TagKey\": \"abc\",\n                        \"TagValue\": \"abc\"\n                    }\n                ],\n                \"TieringState\": \"abc\",\n                \"TieringDetail\": {\n                    \"TieringSizeInBytes\": 0\n                },\n                \"AutoScaleUpRule\": {\n                    \"Status\": \"abc\",\n                    \"ScaleThreshold\": 1,\n                    \"TargetThreshold\": 1\n                }\n            }\n        ],\n        \"TotalCount\": 1,\n        \"RequestId\": \"abc\"\n    }\n}",
         "title": "查询文件系统"
       }
     ],

tccli/services/cfw/cfw_client.py

@@ -3293,58 +3293,6 @@ def doCreateChooseVpcs(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeNatSwitchList(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.DescribeNatSwitchListRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DescribeNatSwitchList(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 doModifyAssetScan(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -6071,7 +6019,6 @@ ACTION_MAP = {
     "CreateAlertCenterIsolate": doCreateAlertCenterIsolate,
     "ModifyBlockIgnoreList": doModifyBlockIgnoreList,
     "CreateChooseVpcs": doCreateChooseVpcs,
-    "DescribeNatSwitchList": doDescribeNatSwitchList,
     "ModifyAssetScan": doModifyAssetScan,
     "DeleteIdsWhiteRule": doDeleteIdsWhiteRule,
     "ModifySequenceRules": doModifySequenceRules,