tccli 3.0.1119.1__py2.py3-none-any.whl → 3.0.1121.1__py2.py3-none-any.whl

tccli/services/monitor/v20180724/api.json

@@ -8378,7 +8378,7 @@
           "example": "无",
           "member": "GrafanaInstanceInfo",
           "name": "InstanceSet",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -8388,7 +8388,7 @@
           "example": "10",
           "member": "int64",
           "name": "TotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -8398,7 +8398,7 @@
           "example": "无",
           "member": "GrafanaInstanceInfo",
           "name": "Instances",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -11129,6 +11129,7 @@
           "example": "prom-xxx",
           "member": "string",
           "name": "Instances",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },

tccli/services/monitor/v20180724/examples.json

@@ -690,7 +690,7 @@
       {
         "document": "",
         "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeGrafanaInstances\n<公共请求参数>\n\n{\n    \"Limit\": 20,\n    \"Offset\": 0,\n    \"TagFilters\": [\n        {\n            \"Key\": \"tagKeyTest\",\n            \"Value\": \"tagValueTest\"\n        }\n    ],\n    \"InstanceStatus\": [\n        2\n    ],\n    \"InstanceName\": \"test\",\n    \"InstanceIds\": [\n        \"grafana-abcdefgh\"\n    ]\n}",
-        "output": "{\n    \"Response\": {\n        \"InstanceSet\": [\n            {\n                \"InstanceStatus\": 0,\n                \"VpcId\": \"xx\",\n                \"RootUrl\": \"xx\",\n                \"Version\": \"xx\",\n                \"Zone\": \"xx\",\n                \"TagSpecification\": [\n                    {\n                        \"Value\": \"xx\",\n                        \"Key\": \"xx\"\n                    }\n                ],\n                \"InstanceId\": \"xx\",\n                \"SubnetIds\": [\n                    \"xx\"\n                ],\n                \"RegionId\": 0,\n                \"InstanceChargeType\": 0,\n                \"InternalUrl\": \"xx\",\n                \"VpcName\": \"xx\",\n                \"EnableSSOCamCheck\": true,\n                \"SubnetName\": \"xx\",\n                \"InternetUrl\": \"xx\",\n                \"EnableSSO\": true,\n                \"InstanceName\": \"xx\",\n                \"Region\": \"xx\",\n                \"CreatedAt\": \"2020-09-22 00:00:00\"\n            }\n        ],\n        \"TotalCount\": 1,\n        \"RequestId\": \"xx\",\n        \"Instances\": [\n            {\n                \"InstanceStatus\": 0,\n                \"VpcId\": \"xx\",\n                \"RootUrl\": \"xx\",\n                \"Version\": \"xx\",\n                \"Zone\": \"xx\",\n                \"TagSpecification\": [\n                    {\n                        \"Value\": \"xx\",\n                        \"Key\": \"xx\"\n                    }\n                ],\n                \"InstanceId\": \"xx\",\n                \"SubnetIds\": [\n                    \"xx\"\n                ],\n                \"RegionId\": 0,\n                \"InstanceChargeType\": 0,\n                \"InternalUrl\": \"xx\",\n                \"VpcName\": \"xx\",\n                \"EnableSSOCamCheck\": true,\n                \"SubnetName\": \"xx\",\n                \"InternetUrl\": \"xx\",\n                \"EnableSSO\": true,\n                \"InstanceName\": \"xx\",\n                \"Region\": \"xx\",\n                \"CreatedAt\": \"2020-09-22 00:00:00\"\n            }\n        ]\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"InstanceSet\": [\n            {\n                \"InstanceName\": \"abc\",\n                \"InstanceId\": \"abc\",\n                \"Region\": \"abc\",\n                \"VpcId\": \"abc\",\n                \"SubnetIds\": [\n                    \"abc\"\n                ],\n                \"InternetUrl\": \"abc\",\n                \"InternalUrl\": \"abc\",\n                \"CreatedAt\": \"2020-09-22 00:00:00\",\n                \"InstanceStatus\": 0,\n                \"TagSpecification\": [\n                    {\n                        \"Key\": \"abc\",\n                        \"Value\": \"abc\"\n                    }\n                ],\n                \"Zone\": \"abc\",\n                \"InstanceChargeType\": 0,\n                \"VpcName\": \"abc\",\n                \"SubnetName\": \"abc\",\n                \"RegionId\": 0,\n                \"RootUrl\": \"abc\",\n                \"EnableSSO\": true,\n                \"Version\": \"abc\",\n                \"EnableSSOCamCheck\": true\n            }\n        ],\n        \"TotalCount\": 0,\n        \"Instances\": [\n            {\n                \"InstanceName\": \"abc\",\n                \"InstanceId\": \"abc\",\n                \"Region\": \"abc\",\n                \"VpcId\": \"abc\",\n                \"SubnetIds\": [\n                    \"abc\"\n                ],\n                \"InternetUrl\": \"abc\",\n                \"InternalUrl\": \"abc\",\n                \"CreatedAt\": \"2020-09-22 00:00:00\",\n                \"InstanceStatus\": 0,\n                \"TagSpecification\": [\n                    {\n                        \"Key\": \"abc\",\n                        \"Value\": \"abc\"\n                    }\n                ],\n                \"Zone\": \"abc\",\n                \"InstanceChargeType\": 0,\n                \"VpcName\": \"abc\",\n                \"SubnetName\": \"abc\",\n                \"RegionId\": 0,\n                \"RootUrl\": \"abc\",\n                \"EnableSSO\": true,\n                \"Version\": \"abc\",\n                \"EnableSSOCamCheck\": true\n            }\n        ],\n        \"RequestId\": \"abc\"\n    }\n}",
         "title": "列出 Grafana 服务"
       }
     ],

tccli/services/oceanus/v20190422/api.json

@@ -831,6 +831,36 @@
           "output_required": false,
           "type": "int",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "2 独享集群\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2",
+          "member": "int64",
+          "name": "Type",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "子eks集群\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "SubEks",
+          "name": "SubEks",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "上级集群\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "AgentSerialId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"
@@ -844,7 +874,7 @@
           "example": "cluster-sdhd0vtz",
           "member": "string",
           "name": "ClusterId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -854,7 +884,7 @@
           "example": "MyClusterName",
           "member": "string",
           "name": "Name",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -864,7 +894,7 @@
           "example": "ap-beijing",
           "member": "string",
           "name": "Region",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -874,7 +904,7 @@
           "example": "ap-beijing-2",
           "member": "string",
           "name": "Zone",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -884,7 +914,7 @@
           "example": "3435324",
           "member": "int64",
           "name": "AppId",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -894,7 +924,7 @@
           "example": "123456",
           "member": "string",
           "name": "OwnerUin",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -904,7 +934,7 @@
           "example": "123456",
           "member": "string",
           "name": "CreatorUin",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -914,7 +944,7 @@
           "example": "2",
           "member": "int64",
           "name": "CuNum",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -924,7 +954,7 @@
           "example": "2",
           "member": "int64",
           "name": "CuMem",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -934,7 +964,7 @@
           "example": "2",
           "member": "int64",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -944,7 +974,7 @@
           "example": "description",
           "member": "string",
           "name": "StatusDesc",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -954,7 +984,7 @@
           "example": "xxxx-xx-xx-xxxx",
           "member": "string",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -964,7 +994,7 @@
           "example": "xxxx-xx-xx-xxxx",
           "member": "string",
           "name": "UpdateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -974,7 +1004,7 @@
           "example": "remark",
           "member": "string",
           "name": "Remark",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -984,7 +1014,7 @@
           "example": "2",
           "member": "int64",
           "name": "NetEnvironmentType",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -994,7 +1024,7 @@
           "example": "1",
           "member": "int64",
           "name": "FreeCuNum",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -1004,7 +1034,7 @@
           "example": "2.5",
           "member": "float",
           "name": "FreeCu",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
@@ -1014,7 +1044,7 @@
           "example": "2.5",
           "member": "float",
           "name": "RunningCu",
-          "required": false,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
@@ -1024,9 +1054,19 @@
           "example": "0",
           "member": "int64",
           "name": "PayMode",
-          "required": false,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "弹性\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "{}",
+          "member": "SubEks",
+          "name": "SubEks",
+          "output_required": false,
+          "type": "object",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"
@@ -6952,6 +6992,67 @@
       ],
       "type": "object"
     },
+    "SubEks": {
+      "document": "混合计费",
+      "members": [
+        {
+          "disabled": false,
+          "document": "集群id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "cluster-xxx",
+          "member": "string",
+          "name": "SerialId",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "cu数\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "20",
+          "member": "int64",
+          "name": "CuNum",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "状态\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2",
+          "member": "int64",
+          "name": "Status",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "状态描述\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "running",
+          "member": "string",
+          "name": "StatusDesc",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "运行cu\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "0.5",
+          "member": "float",
+          "name": "RunningCu",
+          "output_required": false,
+          "required": false,
+          "type": "float",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "both"
+    },
     "SubFolderInfo": {
       "document": "子目录信息",
       "members": [

tccli/services/redis/v20180412/api.json

@@ -6075,127 +6075,127 @@
           "example": "无",
           "member": "string",
           "name": "Name",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "实例运行时节点 ID。",
-          "example": "无",
+          "example": "e5966d041f179fcdd1dd91d0f57f105a073a52cb",
           "member": "string",
           "name": "RunId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "集群角色。\n- 0：master。\n- 1：slave。",
-          "example": "无",
+          "example": "0",
           "member": "int64",
           "name": "Role",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点状态。\n- 0：readwrite,。\n- 1：read。\n- 2：backup。",
-          "example": "无",
+          "example": "1",
           "member": "int64",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "服务状态。\n0-down。\n1-on",
-          "example": "无",
+          "example": "1",
           "member": "int64",
           "name": "Connected",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点创建时间。",
-          "example": "无",
+          "example": "1717138477",
           "member": "string",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点下线时间。",
-          "example": "无",
+          "example": "1717139065",
           "member": "string",
           "name": "DownTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点 Slot 分布区间。",
-          "example": "无",
+          "example": "[\"0-16383\"]",
           "member": "string",
           "name": "Slots",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点 Key分布。",
-          "example": "无",
+          "example": "35140102",
           "member": "int64",
           "name": "Keys",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点 QPS。分片节点每秒执行次数。单位：次/秒。",
-          "example": "无",
+          "example": "0",
           "member": "int64",
           "name": "Qps",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点 QPS 倾斜度。",
-          "example": "无",
+          "example": "0",
           "member": "float",
           "name": "QpsSlope",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点存储。",
-          "example": "无",
+          "example": "64",
           "member": "int64",
           "name": "Storage",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "节点存储倾斜度。",
-          "example": "无",
+          "example": "0",
           "member": "float",
           "name": "StorageSlope",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         }

tccli/services/tcss/v20201101/api.json

@@ -9170,6 +9170,15 @@
           "name": "ScanEndTime",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "排除扫描的镜像",
+          "example": "无",
+          "member": "string",
+          "name": "ExcludeImages",
+          "required": false,
+          "type": "list"
         }
       ],
       "type": "object"
@@ -17046,6 +17055,16 @@
           "type": "string",
           "value_allowed_null": false
         },
+        {
+          "disabled": false,
+          "document": "排除的扫描镜像\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "ExcludeImages",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
           "member": "string",
@@ -21387,6 +21406,16 @@
           "type": "list",
           "value_allowed_null": false
         },
+        {
+          "disabled": false,
+          "document": "排除的镜像资产id\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "uint64",
+          "name": "ExcludeImageAssetIds",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
           "member": "string",
@@ -41279,6 +41308,15 @@
           "name": "Namespace",
           "required": false,
           "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "排除的镜像资产id",
+          "example": "无",
+          "member": "uint64",
+          "name": "ExcludeImageAssetIds",
+          "required": false,
+          "type": "list"
         }
       ],
       "type": "object"

tccli/services/trocket/trocket_client.py

@@ -1629,6 +1629,58 @@ def doDeleteTopic(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeFusionInstanceList(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.TrocketClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeFusionInstanceListRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeFusionInstanceList(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 doDescribeMQTTInstanceCert(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2451,6 +2503,7 @@ ACTION_MAP = {
     "DeleteMQTTTopic": doDeleteMQTTTopic,
     "DescribeInstance": doDescribeInstance,
     "DeleteTopic": doDeleteTopic,
+    "DescribeFusionInstanceList": doDescribeFusionInstanceList,
     "DescribeMQTTInstanceCert": doDescribeMQTTInstanceCert,
     "ModifyMQTTInstanceCertBinding": doModifyMQTTInstanceCertBinding,
     "DescribeMQTTInstanceList": doDescribeMQTTInstanceList,