tccli-intl-en 3.1.17.1__tar.gz → 3.1.18.1__tar.gz

{tccli_intl_en-3.1.17.1/tccli_intl_en.egg-info → tccli_intl_en-3.1.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tccli-intl-en
-Version: 3.1.17.1
+Version: 3.1.18.1
 Summary: Universal Command Line Environment for Tencent Cloud
 Home-page: https://github.com/TencentCloud/tencentcloud-cli-intl-en.git
 Author: Tencent Cloud
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 License-File: LICENSE
-Requires-Dist: tencentcloud-sdk-python-intl-en>=3.1.17
+Requires-Dist: tencentcloud-sdk-python-intl-en>=3.1.18
 Requires-Dist: jmespath==0.10.0
 Requires-Dist: six==1.16.0
 

tccli_intl_en-3.1.18.1/tccli/__init__.py

@@ -0,0 +1 @@
+__version__ = '3.1.18.1'

{tccli_intl_en-3.1.17.1 → tccli_intl_en-3.1.18.1}/tccli/services/cdn/v20180606/api.json

@@ -43,7 +43,7 @@
       "status": "online"
     },
     "DescribeBillingData": {
-      "document": "This API is used to query billing data details.",
+      "document": "This API is used to query billing data details. \nNotes: \nDue to the impact of the billing and settlement methods, the data returned by the DescribeBillingData  has a certain delay. For hourly-billed customers, the expected delay is 3 to 5 hours. For monthly-billed customers, the expected delay is 4 to 28 hours. Before 4:00 AM  (UTC+8, excluding 4:00 AM), only data from two days prior can be queried; after 4:00 AM (including 4:00 AM), data from the previous day can be queried. \nIf you have a strong requirement for data timeliness, it is recommended to use the DescribeCdnData.",
       "input": "DescribeBillingDataRequest",
       "name": "Queries billing data",
       "output": "DescribeBillingDataResponse",
@@ -2917,30 +2917,30 @@
         {
           "disabled": false,
           "document": "Queries by the specified metric:\n`flux`: Traffic (in bytes)\n`bandwidth`: Bandwidth (in bps)\n`request`: Number of requests\n`fluxHitRate`: Traffic hit rate (in %)\n`statusCode`: Status code. The aggregate data for 2xx, 3xx, 4xx, and 5xx status codes will be returned (in entries)\n`2XX`: Returns the aggregate list of 2xx status codes and the data for status codes starting with 2 (in entries)\n`3XX`: Returns the aggregate list of 3xx status codes and the data for status codes starting with 3 (in entries)\n`4XX`: Returns the aggregate list of 4xx status codes and the data for status codes starting with 4 (in entries)\n`5XX`: Returns the aggregate list of 5xx status codes and the data for status codes starting with 5 (in entries)\nYou can also specify a status code for querying.",
-          "example": "",
+          "example": "flux",
           "member": "string",
           "name": "Metric",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "Detailed data combination",
-          "example": "",
+          "example": "无",
           "member": "TimestampData",
           "name": "DetailData",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "Aggregate data combination",
-          "example": "",
+          "example": "无",
           "member": "SummarizedData",
           "name": "SummarizedData",
-          "required": true,
+          "output_required": true,
           "type": "object",
           "value_allowed_null": false
         }
@@ -3522,7 +3522,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "Start time of the query, e.g., 2018-09-04 10:40:00.\nThe specified start time will be rounded down based on the granularity parameter `Interval`. For example, if you set the start time to 2018-09-04 10:40:00 with 1-hour granularity, the time will be rounded down to 2018-09-04 10:00:00.\nThe period between the start time and end time can be up to 90 days.",
+          "document": "Start time of the query, e.g. 2018-09-04 10:40:00.\nThe specified start time will be rounded down based on the granularity parameter `Interval`. For example, if you set the start time to 2018-09-04 10:40:00 with 1-hour granularity, the time will be rounded down to 2018-09-04 10:00:00.\nThe period between the start time and end time can be up to 90 days.",
           "example": "2018-09-04 10:40:00",
           "member": "datetime",
           "name": "StartTime",
@@ -3622,7 +3622,7 @@
           "example": "5min",
           "member": "string",
           "name": "Interval",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -3632,7 +3632,7 @@
           "example": "无",
           "member": "ResourceBillingData",
           "name": "Data",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -9925,20 +9925,20 @@
         {
           "disabled": false,
           "document": "Resource name, which is classified as follows based on different query filters:\nWhen a domain name is specified: Details of the domain name\n`multiDomains`: Aggregated details of multiple domain names\nA specific project ID: ID of the specifically queried project\n`all`: Details at the account level",
-          "example": "",
+          "example": "qq.com",
           "member": "string",
           "name": "Resource",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "Billing data details",
-          "example": "",
+          "example": "无",
           "member": "CdnData",
           "name": "BillingData",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         }
@@ -11367,20 +11367,20 @@
         {
           "disabled": false,
           "document": "Aggregation method, which can be:\n`sum`: Aggregate summation\n`max`: Maximum value. In bandwidth mode, the peak bandwidth is calculated based on the data aggregated in 5 minutes.\n`avg`: Average value",
-          "example": "",
+          "example": "sum",
           "member": "string",
           "name": "Name",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "Aggregated value",
-          "example": "",
+          "example": "1000",
           "member": "float",
           "name": "Value",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         }
@@ -11419,20 +11419,20 @@
         {
           "disabled": false,
           "document": "The start point of the sampling period. \nFor example, if the time is set to 13:35:00, and `interval` is `5min`, the data returned is collected between 13:35:00 and 13:39:59",
-          "example": "",
+          "example": "13:35:00",
           "member": "datetime",
           "name": "Time",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
           "document": "Data value",
-          "example": "",
+          "example": "100.00",
           "member": "float",
           "name": "Value",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         }

{tccli_intl_en-3.1.17.1 → tccli_intl_en-3.1.18.1}/tccli/services/cdn/v20180606/examples.json

@@ -372,4 +372,4 @@
     ]
   },
   "version": "1.0"
-}
+}

{tccli_intl_en-3.1.17.1 → tccli_intl_en-3.1.18.1}/tccli/services/lighthouse/lighthouse_client.py

@@ -1007,6 +1007,61 @@ def doImportKeyPair(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeImagesToShare(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="TC3-HMAC-SHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.LighthouseClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeImagesToShareRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeImagesToShare(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 doDescribeInstancesTrafficPackages(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1392,6 +1447,61 @@ def doDescribeBundleDiscount(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateInstances(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="TC3-HMAC-SHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.LighthouseClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateInstancesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateInstances(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 doAttachCcn(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -3812,7 +3922,7 @@ def doRebootInstances(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateInstances(args, parsed_globals):
+def doCreateInstanceSnapshot(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -3844,11 +3954,11 @@ def doCreateInstances(args, parsed_globals):
     client = mod.LighthouseClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateInstancesRequest()
+    model = models.CreateInstanceSnapshotRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateInstances(model)
+        rsp = client.CreateInstanceSnapshot(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -4087,6 +4197,61 @@ def doCreateBlueprint(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doShareBlueprintAcrossAccounts(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="TC3-HMAC-SHA256")
+    if g_param[OptionsDefine.Language]:
+        profile.language = g_param[OptionsDefine.Language]
+    mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+    client = mod.LighthouseClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ShareBlueprintAcrossAccountsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ShareBlueprintAcrossAccounts(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 doResetAttachCcn(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4142,7 +4307,7 @@ def doResetAttachCcn(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateInstanceSnapshot(args, parsed_globals):
+def doResizeDisks(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -4174,11 +4339,11 @@ def doCreateInstanceSnapshot(args, parsed_globals):
     client = mod.LighthouseClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateInstanceSnapshotRequest()
+    model = models.ResizeDisksRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateInstanceSnapshot(model)
+        rsp = client.ResizeDisks(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -4281,6 +4446,7 @@ ACTION_MAP = {
     "DescribeCcnAttachedInstances": doDescribeCcnAttachedInstances,
     "DescribeInstances": doDescribeInstances,
     "ImportKeyPair": doImportKeyPair,
+    "DescribeImagesToShare": doDescribeImagesToShare,
     "DescribeInstancesTrafficPackages": doDescribeInstancesTrafficPackages,
     "InquirePriceCreateBlueprint": doInquirePriceCreateBlueprint,
     "AttachDisks": doAttachDisks,
@@ -4288,6 +4454,7 @@ ACTION_MAP = {
     "DeleteFirewallRules": doDeleteFirewallRules,
     "DisassociateInstancesKeyPairs": doDisassociateInstancesKeyPairs,
     "DescribeBundleDiscount": doDescribeBundleDiscount,
+    "CreateInstances": doCreateInstances,
     "AttachCcn": doAttachCcn,
     "DescribeBlueprints": doDescribeBlueprints,
     "ResetInstancesPassword": doResetInstancesPassword,
@@ -4332,13 +4499,14 @@ ACTION_MAP = {
     "ModifyFirewallRuleDescription": doModifyFirewallRuleDescription,
     "DescribeDiskDiscount": doDescribeDiskDiscount,
     "RebootInstances": doRebootInstances,
-    "CreateInstances": doCreateInstances,
+    "CreateInstanceSnapshot": doCreateInstanceSnapshot,
     "ModifyImageSharePermission": doModifyImageSharePermission,
     "RenewDisks": doRenewDisks,
     "DescribeSnapshotsDeniedActions": doDescribeSnapshotsDeniedActions,
     "CreateBlueprint": doCreateBlueprint,
+    "ShareBlueprintAcrossAccounts": doShareBlueprintAcrossAccounts,
     "ResetAttachCcn": doResetAttachCcn,
-    "CreateInstanceSnapshot": doCreateInstanceSnapshot,
+    "ResizeDisks": doResizeDisks,
     "ModifyInstancesBundle": doModifyInstancesBundle,
 
 }