tccli 3.0.1283.1__py2.py3-none-any.whl → 3.0.1285.1__py2.py3-none-any.whl

tccli/services/svp/v20240125/api.json

@@ -7,6 +7,13 @@
       "output": "CreateSavingPlanOrderResponse",
       "status": "online"
     },
+    "DescribeSavingPlanCoverage": {
+      "document": "查询当前用户节省计划覆盖率明细数据，如无特别说明，金额单位均为元（国内站）或者美元（国际站）。",
+      "input": "DescribeSavingPlanCoverageRequest",
+      "name": "查询节省计划覆盖率数据",
+      "output": "DescribeSavingPlanCoverageResponse",
+      "status": "online"
+    },
     "DescribeSavingPlanDeduct": {
       "document": "查询节省计划抵扣明细",
       "input": "DescribeSavingPlanDeductRequest",
@@ -145,6 +152,99 @@
       ],
       "type": "object"
     },
+    "DescribeSavingPlanCoverageRequest": {
+      "document": "DescribeSavingPlanCoverage请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "费用起始日期，格式yyyy-MM-dd",
+          "example": "2023-06-01",
+          "member": "string",
+          "name": "StartDate",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "费用结束日期，格式yyyy-MM-dd",
+          "example": "2023-06-30",
+          "member": "string",
+          "name": "EndDate",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "分页偏移量，Offset=0表示第一页，如果Limit=100，则Offset=100表示第二页，Offset=200表示第三页，以此类推",
+          "example": "0",
+          "member": "uint64",
+          "name": "Offset",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "数量，最大值为200",
+          "example": "200",
+          "member": "uint64",
+          "name": "Limit",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "取值包括1（缺省值）和2，1表示按天统计覆盖率，2表示按月统计覆盖率，此参数仅影响返回的RateSet聚合粒度，不影响返回的DetailSet",
+          "example": "1",
+          "member": "uint64",
+          "name": "PeriodType",
+          "required": false,
+          "type": "int"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeSavingPlanCoverageResponse": {
+      "document": "DescribeSavingPlanCoverage返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "节省计划覆盖率明细数据",
+          "example": "无",
+          "member": "SavingPlanCoverageDetail",
+          "name": "DetailSet",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节省计划覆盖率聚合数据",
+          "example": "无",
+          "member": "SavingPlanCoverageRate",
+          "name": "RateSet",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "查询命中的节省计划覆盖率明细数据总条数",
+          "example": "1000",
+          "member": "uint64",
+          "name": "TotalCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeSavingPlanDeductRequest": {
       "document": "DescribeSavingPlanDeduct请求参数结构体",
       "members": [
@@ -439,6 +539,225 @@
       ],
       "type": "object"
     },
+    "SavingPlanCoverageDetail": {
+      "document": "节省计划覆盖率数据",
+      "members": [
+        {
+          "disabled": false,
+          "document": "资源 ID：账单中出账对象 ID，不同产品因资源形态不同，资源内容不完全相同，如云服务器 CVM 为对应的实例 ID",
+          "example": "disk-3t7fhog0",
+          "member": "string",
+          "name": "ResourceId",
+          "output_required": true,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "地域ID",
+          "example": "1",
+          "member": "uint64",
+          "name": "RegionId",
+          "output_required": true,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "产品编码",
+          "example": "p_cynosdb",
+          "member": "string",
+          "name": "ProductCode",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "子产品编码",
+          "example": "sp_cynosdb_mysql",
+          "member": "string",
+          "name": "SubProductCode",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "费用起始日期，格式yyyy-MM-dd",
+          "example": "2023-06-01",
+          "member": "string",
+          "name": "StartDate",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "费用结束日期，格式yyyy-MM-dd，目前与StartDate相等",
+          "example": "2023-06-01",
+          "member": "string",
+          "name": "EndDate",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节省计划覆盖金额（即节省计划支付金额）",
+          "example": "1.0",
+          "member": "float",
+          "name": "SpCoveredAmount",
+          "output_required": false,
+          "required": false,
+          "type": "float",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "节省计划未覆盖金额（即优惠后总价）",
+          "example": "2.0",
+          "member": "float",
+          "name": "SpUncoveredAmount",
+          "output_required": false,
+          "required": false,
+          "type": "float",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "总支出（即节省计划未覆盖金额 + 节省计划覆盖金额）",
+          "example": "3.0",
+          "member": "float",
+          "name": "TotalRealAmount",
+          "output_required": false,
+          "required": false,
+          "type": "float",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "按量计费预期金额（即折前价 * 折扣）",
+          "example": "3.0",
+          "member": "float",
+          "name": "ExpectedAmount",
+          "output_required": false,
+          "required": false,
+          "type": "float",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "覆盖率结果，取值[0, 100]",
+          "example": "30.0",
+          "member": "float",
+          "name": "SpCoverage",
+          "output_required": false,
+          "required": false,
+          "type": "float",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "支付者昵称",
+          "example": "腾讯",
+          "member": "string",
+          "name": "PayerUinName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "使用者昵称",
+          "example": "腾讯",
+          "member": "string",
+          "name": "OwnerUinName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "支付者uin",
+          "example": "9091",
+          "member": "string",
+          "name": "PayerUin",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "计费项名称",
+          "example": "存储",
+          "member": "string",
+          "name": "SubBillingItemName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "计费细项名称",
+          "example": "cynosdb_存储_mysql\t",
+          "member": "string",
+          "name": "BillingItemName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "子产品名称",
+          "example": "TDSQL-C MySQL版",
+          "member": "string",
+          "name": "SubProductName",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
+    "SavingPlanCoverageRate": {
+      "document": "节省计划覆盖率聚合数据",
+      "members": [
+        {
+          "disabled": false,
+          "document": "聚合时间维度，按天聚合格式为yyyy-MM-dd，按月聚合格式为yyyy-MM",
+          "example": "2023-06-01",
+          "member": "string",
+          "name": "DatePoint",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "覆盖率结果，取值[0, 100]",
+          "example": "10.0",
+          "member": "float",
+          "name": "Rate",
+          "output_required": false,
+          "type": "float",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "out"
+    },
     "SavingPlanDeductDetail": {
       "document": "节省计划抵扣明细",
       "members": [

tccli/services/svp/v20240125/examples.json

@@ -8,6 +8,14 @@
         "title": "节省计划下单"
       }
     ],
+    "DescribeSavingPlanCoverage": [
+      {
+        "document": "示例",
+        "input": "POST / HTTP/1.1\nHost: svp.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeSavingPlanCoverage\n<公共请求参数>\n\n{\n    \"StartDate\": \"2024-12-01\",\n    \"EndDate\": \"2024-12-30\",\n    \"Offset\": 0,\n    \"Limit\": 1\n}",
+        "output": "{\n    \"Response\": {\n        \"DetailSet\": [\n            {\n                \"BillingItemName\": \"计费项\",\n                \"EndDate\": \"2024-12-30\",\n                \"ExpectedAmount\": -4.550174,\n                \"OwnerUinName\": \"9099账号\",\n                \"PayerUin\": \"9099\",\n                \"PayerUinName\": \"9099账号\",\n                \"ProductCode\": \"p_cbs\",\n                \"RegionId\": 1,\n                \"ResourceId\": \"billingVirtualHighPrecisionFlatAccountId_\",\n                \"SpCoverage\": 0,\n                \"SpCoveredAmount\": 0,\n                \"SpUncoveredAmount\": -4.550174,\n                \"StartDate\": \"2024-12-01\",\n                \"SubBillingItemName\": \"计费细项\",\n                \"SubProductCode\": \"sp_cbs_bssd\",\n                \"SubProductName\": \"通用型SSD云硬盘\",\n                \"TotalRealAmount\": -4.550174\n            }\n        ],\n        \"RateSet\": [\n            {\n                \"DatePoint\": \"2024-12-01\",\n                \"Rate\": 10.05\n            }\n        ],\n        \"RequestId\": \"7816cba1-60d9-4a07-8556-5b62ab8d3641\",\n        \"TotalCount\": 25\n    }\n}",
+        "title": "示例"
+      }
+    ],
     "DescribeSavingPlanDeduct": [
       {
         "document": "",

tccli/services/tdmq/tdmq_client.py

@@ -2513,58 +2513,6 @@ def doDeleteCluster(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateRocketMQVipInstance(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.TdmqClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateRocketMQVipInstanceRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.CreateRocketMQVipInstance(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 doResetRocketMQConsumerOffSet(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7557,7 +7505,7 @@ def doModifyRole(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeRabbitMQVirtualHostList(args, parsed_globals):
+def doCreateRocketMQVipInstance(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -7586,11 +7534,11 @@ def doDescribeRabbitMQVirtualHostList(args, parsed_globals):
     client = mod.TdmqClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeRabbitMQVirtualHostListRequest()
+    model = models.CreateRocketMQVipInstanceRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeRabbitMQVirtualHostList(model)
+        rsp = client.CreateRocketMQVipInstance(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -7928,7 +7876,6 @@ ACTION_MAP = {
     "DescribeCmqSubscriptionDetail": doDescribeCmqSubscriptionDetail,
     "DescribeRabbitMQVirtualHost": doDescribeRabbitMQVirtualHost,
     "DeleteCluster": doDeleteCluster,
-    "CreateRocketMQVipInstance": doCreateRocketMQVipInstance,
     "ResetRocketMQConsumerOffSet": doResetRocketMQConsumerOffSet,
     "DescribeRabbitMQPermission": doDescribeRabbitMQPermission,
     "DeleteRabbitMQPermission": doDeleteRabbitMQPermission,
@@ -8025,7 +7972,7 @@ ACTION_MAP = {
     "DescribeRocketMQPublicAccessPoint": doDescribeRocketMQPublicAccessPoint,
     "DeleteRabbitMQBinding": doDeleteRabbitMQBinding,
     "ModifyRole": doModifyRole,
-    "DescribeRabbitMQVirtualHostList": doDescribeRabbitMQVirtualHostList,
+    "CreateRocketMQVipInstance": doCreateRocketMQVipInstance,
     "DeleteRocketMQEnvironmentRoles": doDeleteRocketMQEnvironmentRoles,
     "DeleteCmqSubscribe": doDeleteCmqSubscribe,
     "DescribeAllTenants": doDescribeAllTenants,