tccli 3.0.1312.1__py2.py3-none-any.whl → 3.0.1314.1__py2.py3-none-any.whl

tccli/services/tbaas/tbaas_client.py

@@ -537,58 +537,6 @@ def doDownloadUserCert(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doGetLatesdTransactionList(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.TbaasClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.GetLatesdTransactionListRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.GetLatesdTransactionList(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 doApplyUserCert(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1338,7 +1286,6 @@ ACTION_MAP = {
     "GetClusterSummary": doGetClusterSummary,
     "GetLatestTransactionList": doGetLatestTransactionList,
     "DownloadUserCert": doDownloadUserCert,
-    "GetLatesdTransactionList": doGetLatesdTransactionList,
     "ApplyUserCert": doApplyUserCert,
     "InvokeChainMakerContract": doInvokeChainMakerContract,
     "GetInvokeTx": doGetInvokeTx,

tccli/services/tbaas/v20180416/api.json

@@ -63,13 +63,6 @@
       "output": "GetInvokeTxResponse",
       "status": "online"
     },
-    "GetLatesdTransactionList": {
-      "document": "获取最新交易列表（已废弃）",
-      "input": "GetLatesdTransactionListRequest",
-      "name": "获取最新交易列表（已废弃）",
-      "output": "GetLatesdTransactionListResponse",
-      "status": "online"
-    },
     "GetLatestTransactionList": {
       "document": "获取fabric最新交易列表",
       "input": "GetLatestTransactionListRequest",
@@ -1496,132 +1489,6 @@
       ],
       "type": "object"
     },
-    "GetLatesdTransactionListRequest": {
-      "document": "GetLatesdTransactionList请求参数结构体",
-      "members": [
-        {
-          "disabled": false,
-          "document": "模块名称，固定字段：transaction",
-          "example": "transaction",
-          "member": "string",
-          "name": "Module",
-          "required": true,
-          "type": "string"
-        },
-        {
-          "disabled": false,
-          "document": "操作名称，固定字段：latest_transaction_list",
-          "example": "latest_transaction_list",
-          "member": "string",
-          "name": "Operation",
-          "required": true,
-          "type": "string"
-        },
-        {
-          "disabled": false,
-          "document": "组织ID，固定字段：0",
-          "example": "0",
-          "member": "uint64",
-          "name": "GroupId",
-          "required": true,
-          "type": "int"
-        },
-        {
-          "disabled": false,
-          "document": "通道ID，固定字段：0",
-          "example": "0",
-          "member": "uint64",
-          "name": "ChannelId",
-          "required": true,
-          "type": "int"
-        },
-        {
-          "disabled": false,
-          "document": "获取的最新交易的区块数量，取值范围1~5",
-          "example": "5",
-          "member": "uint64",
-          "name": "LatestBlockNumber",
-          "required": true,
-          "type": "int"
-        },
-        {
-          "disabled": false,
-          "document": "调用接口的组织名称，可以在组织管理列表中获取当前组织的名称",
-          "example": "liulanOrg",
-          "member": "string",
-          "name": "GroupName",
-          "required": true,
-          "type": "string"
-        },
-        {
-          "disabled": false,
-          "document": "需要查询的通道名称，可在通道详情或列表中获取",
-          "example": "kylotst",
-          "member": "string",
-          "name": "ChannelName",
-          "required": true,
-          "type": "string"
-        },
-        {
-          "disabled": false,
-          "document": "区块链网络ID，可在区块链网络详情或列表中获取",
-          "example": "251005746bc0f03q8u93j",
-          "member": "string",
-          "name": "ClusterId",
-          "required": true,
-          "type": "string"
-        },
-        {
-          "disabled": false,
-          "document": "需要获取的起始交易偏移",
-          "example": "0",
-          "member": "uint64",
-          "name": "Offset",
-          "required": false,
-          "type": "int"
-        },
-        {
-          "disabled": false,
-          "document": "需要获取的交易数量",
-          "example": "10",
-          "member": "uint64",
-          "name": "Limit",
-          "required": false,
-          "type": "int"
-        }
-      ],
-      "type": "object"
-    },
-    "GetLatesdTransactionListResponse": {
-      "document": "GetLatesdTransactionList返回参数结构体",
-      "members": [
-        {
-          "disabled": false,
-          "document": "交易总数量",
-          "example": "5",
-          "member": "uint64",
-          "name": "TotalCount",
-          "type": "int",
-          "value_allowed_null": false
-        },
-        {
-          "disabled": false,
-          "document": "交易列表",
-          "example": "无",
-          "member": "TransactionItem",
-          "name": "TransactionList",
-          "type": "list",
-          "value_allowed_null": false
-        },
-        {
-          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
-          "member": "string",
-          "name": "RequestId",
-          "type": "string"
-        }
-      ],
-      "type": "object"
-    },
     "GetLatestTransactionListRequest": {
       "document": "GetLatestTransactionList请求参数结构体",
       "members": [

tccli/services/tbaas/v20180416/examples.json

@@ -72,14 +72,6 @@
         "title": "查询异步模式下Invoke接口的调用结果"
       }
     ],
-    "GetLatesdTransactionList": [
-      {
-        "document": "获取最新5个区块的交易列表",
-        "input": "https://tbaas.tencentcloudapi.com/?Action=GetLatesdTransactionList\n&Module=transaction\n&Operation=latest_transaction_list\n&GroupId=0\n&ChannelId=0\n&LatestBlockNumber=5\n&GroupName=liulanOrg\n&ChannelName=kylotst\n&ClusterId=251005746bc0f03q8u93j\n&Offset=0\n&Limit=10\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"68cd2009-6a2b-481e-850e-08522a546221\",\n        \"TotalCount\": 5,\n        \"TransactionList\": [\n            {\n                \"BlockHeight\": 6,\n                \"BlockId\": 5,\n                \"CreateOrgName\": \"liulanOrg\",\n                \"CreateTime\": \"2019-04-24 11:39:52\",\n                \"TransactionHash\": \"da6a44da08bda02fb94b2b3fb684350a7f636044f348dbed9804f1dc143d2a01\",\n                \"TransactionId\": \"4ea1f77d1c2622f6672e37c611a0542dc9e21b15298b03de4127df454a17a457\",\n                \"TransactionStatus\": \"VALID\",\n                \"TransactionType\": \"ENDORSER_TRANSACTION\"\n            },\n            {\n                \"BlockHeight\": 5,\n                \"BlockId\": 4,\n                \"CreateOrgName\": \"liulanOrg\",\n                \"CreateTime\": \"2019-04-24 11:39:25\",\n                \"TransactionHash\": \"6e8a88088e1c0b111f7ff0f74e7891a15c5c32cd1fa68d8e5f8d11637fd4ca04\",\n                \"TransactionId\": \"9f2e40a4443d9928ed9b8266e893ac90ed00381227994281833ecd4393d40b15\",\n                \"TransactionStatus\": \"VALID\",\n                \"TransactionType\": \"ENDORSER_TRANSACTION\"\n            },\n            {\n                \"BlockHeight\": 4,\n                \"BlockId\": 3,\n                \"CreateOrgName\": \"liulanOrg\",\n                \"CreateTime\": \"2019-04-23 19:15:59\",\n                \"TransactionHash\": \"421234c8ad48052f202a262f1fe739b963831c423b2d0028ba7496eca837cac9\",\n                \"TransactionId\": \"bf2cdfd82a7b9a9a5ce135ef41687f3f04496c41575e2994fae99b58bec80754\",\n                \"TransactionStatus\": \"VALID\",\n                \"TransactionType\": \"ENDORSER_TRANSACTION\"\n            },\n            {\n                \"BlockHeight\": 3,\n                \"BlockId\": 2,\n                \"CreateOrgName\": \"liulanOrg\",\n                \"CreateTime\": \"2019-04-23 19:14:23\",\n                \"TransactionHash\": \"57407887234a4645c7b339aea5e94d3cf5f017f5eb05037a2c12fecf9d4fd6ae\",\n                \"TransactionId\": \"71594843087d3435c2aa74f69d9d995ed97fff4951778b86956c2c069691fb54\",\n                \"TransactionStatus\": \"VALID\",\n                \"TransactionType\": \"ENDORSER_TRANSACTION\"\n            },\n            {\n                \"BlockHeight\": 2,\n                \"BlockId\": 1,\n                \"CreateOrgName\": \"liulanOrg\",\n                \"CreateTime\": \"2019-04-23 14:34:29\",\n                \"TransactionHash\": \"9d798fe9f0eeaf5193ec1f9dc21e930bf3232820ddc1db18625b9f02bd35f54a\",\n                \"TransactionId\": \"4ee11735f87b34673ea88c162e71b20fb71f798e89231e45bc0fbc6b9f09d02c\",\n                \"TransactionStatus\": \"VALID\",\n                \"TransactionType\": \"ENDORSER_TRANSACTION\"\n            }\n        ]\n    }\n}",
-        "title": "获取最新5个区块的交易列表"
-      }
-    ],
     "GetLatestTransactionList": [
       {
         "document": "获取fabric最新交易列表",

tccli/services/teo/teo_client.py

@@ -4491,6 +4491,58 @@ def doDescribeCustomErrorPages(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribePlans(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.TeoClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribePlansRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribePlans(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 doDeleteLoadBalancer(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7502,6 +7554,7 @@ ACTION_MAP = {
     "ModifyFunctionRule": doModifyFunctionRule,
     "DescribeAvailablePlans": doDescribeAvailablePlans,
     "DescribeCustomErrorPages": doDescribeCustomErrorPages,
+    "DescribePlans": doDescribePlans,
     "DeleteLoadBalancer": doDeleteLoadBalancer,
     "DeleteContentIdentifier": doDeleteContentIdentifier,
     "DescribeRulesSetting": doDescribeRulesSetting,