tccli 3.0.1386.1__py2.py3-none-any.whl → 3.0.1388.1__py2.py3-none-any.whl

tccli/services/gs/gs_client.py

@@ -797,6 +797,58 @@ def doDeleteAndroidInstanceImages(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDistributeFileToAndroidInstances(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.GsClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DistributeFileToAndroidInstancesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DistributeFileToAndroidInstances(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 doDescribeAndroidInstanceTasksStatus(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2461,7 +2513,7 @@ def doStopPublishStream(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDistributeFileToAndroidInstances(args, parsed_globals):
+def doDisconnectAndroidInstance(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2490,11 +2542,11 @@ def doDistributeFileToAndroidInstances(args, parsed_globals):
     client = mod.GsClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DistributeFileToAndroidInstancesRequest()
+    model = models.DisconnectAndroidInstanceRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DistributeFileToAndroidInstances(model)
+        rsp = client.DisconnectAndroidInstance(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -3943,6 +3995,7 @@ ACTION_MAP = {
     "ModifyAndroidInstancesProperties": doModifyAndroidInstancesProperties,
     "ModifyAndroidInstancesInformation": doModifyAndroidInstancesInformation,
     "DeleteAndroidInstanceImages": doDeleteAndroidInstanceImages,
+    "DistributeFileToAndroidInstances": doDistributeFileToAndroidInstances,
     "DescribeAndroidInstanceTasksStatus": doDescribeAndroidInstanceTasksStatus,
     "CreateAndroidInstances": doCreateAndroidInstances,
     "RebootAndroidInstances": doRebootAndroidInstances,
@@ -3975,7 +4028,7 @@ ACTION_MAP = {
     "ModifyAndroidInstanceResolution": doModifyAndroidInstanceResolution,
     "ConnectAndroidInstance": doConnectAndroidInstance,
     "StopPublishStream": doStopPublishStream,
-    "DistributeFileToAndroidInstances": doDistributeFileToAndroidInstances,
+    "DisconnectAndroidInstance": doDisconnectAndroidInstance,
     "CreateAndroidInstanceSSH": doCreateAndroidInstanceSSH,
     "InstallAndroidInstancesAppWithURL": doInstallAndroidInstancesAppWithURL,
     "RebootAndroidInstanceHosts": doRebootAndroidInstanceHosts,

tccli/services/gs/v20191118/api.json

@@ -224,6 +224,13 @@
       "output": "DisableAndroidInstancesAppResponse",
       "status": "online"
     },
+    "DisconnectAndroidInstance": {
+      "document": "断开安卓实例",
+      "input": "DisconnectAndroidInstanceRequest",
+      "name": "断开安卓实例",
+      "output": "DisconnectAndroidInstanceResponse",
+      "status": "online"
+    },
     "DistributeFileToAndroidInstances": {
       "document": "将一个文件批量分发到多个实例，一次接口调用触发一次文件分发，一次文件分发只会从公网下载一次，然后文件会走内网分发到实例列表中的实例。",
       "input": "DistributeFileToAndroidInstancesRequest",
@@ -3650,6 +3657,33 @@
       ],
       "type": "object"
     },
+    "DisconnectAndroidInstanceRequest": {
+      "document": "DisconnectAndroidInstance请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "实例ID",
+          "example": "cai-1a2b",
+          "member": "string",
+          "name": "AndroidInstanceId",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DisconnectAndroidInstanceResponse": {
+      "document": "DisconnectAndroidInstance返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DistributeFileToAndroidInstancesRequest": {
       "document": "DistributeFileToAndroidInstances请求参数结构体",
       "members": [

tccli/services/gs/v20191118/examples.json

@@ -262,6 +262,14 @@
         "title": "示例"
       }
     ],
+    "DisconnectAndroidInstance": [
+      {
+        "document": "示例",
+        "input": "POST / HTTP/1.1\nHost: gs.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DisconnectAndroidInstance\n<公共请求参数>\n\n{\n    \"AndroidInstanceId\": \"cai-251006279-ea99qn24o1p\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"2cc56de7-c1f7-4d66-9c91-5fd48d32e61f\"\n    }\n}",
+        "title": "示例"
+      }
+    ],
     "DistributeFileToAndroidInstances": [
       {
         "document": "示例",