ucloud-sdk-python3 0.11.65__tar.gz → 0.11.67__tar.gz

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.65
+Version: 0.11.67
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud/services/pathx/client.py

@@ -1025,6 +1025,49 @@ class PathXClient(Client):
         resp = self.invoke("GetGlobalSSHPrice", d, **kwargs)
         return apis.GetGlobalSSHPriceResponseSchema().loads(resp)
 
+    def get_global_ssh_traffic(
+        self, req: typing.Optional[dict] = None, **kwargs
+    ) -> dict:
+        """GetGlobalSSHTraffic - 获取GlobalSSH流量统计数据
+
+        **Request**
+
+        - **ProjectId** (str) - (Config) 项目ID,如org-xxxx。请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
+        - **BeginTime** (int) - (Required) 查询起始时间，如1525017600
+        - **EndTime** (int) - (Required) 查询结束时间，如1525103999
+        - **UGAId** (str) - (Required) 资源ID，如uga-as5daw
+
+        **Response**
+
+        - **DataSet** (list) - 见 **TrafficDaily** 模型定义
+        - **TrafficDailyRecently** (list) - 见 **TrafficDailyRecently** 模型定义
+        - **UGAId** (str) - 资源ID
+
+        **Response Model**
+
+        **TrafficDaily**
+        - **BillingState** (str) - Yes:已扣费, No:未扣费
+        - **Date** (int) - 日期
+        - **Traffic** (int) - 流量（单位GB）
+
+
+        **TrafficDailyRecently**
+        - **Day** (str) - 日期
+        - **TrafficUnitGB** (str) - 日流量(单位GB)
+        - **TrafficUnitMB** (str) - 日流量(单位MB)
+
+
+        """
+        # build request
+        d = {
+            "ProjectId": self.config.project_id,
+        }
+        req and d.update(req)
+        d = apis.GetGlobalSSHTrafficRequestSchema().dumps(d)
+
+        resp = self.invoke("GetGlobalSSHTraffic", d, **kwargs)
+        return apis.GetGlobalSSHTrafficResponseSchema().loads(resp)
+
     def get_global_ssh_update_price(
         self, req: typing.Optional[dict] = None, **kwargs
     ) -> dict:
@@ -1224,6 +1267,35 @@ class PathXClient(Client):
         resp = self.invoke("GetUGA3UpdatePrice", d, **kwargs)
         return apis.GetUGA3UpdatePriceResponseSchema().loads(resp)
 
+    def modify_global_ssh_origin_info(
+        self, req: typing.Optional[dict] = None, **kwargs
+    ) -> dict:
+        """ModifyGlobalSSHOriginInfo - 修改GlobalSSH 源站信息
+
+        **Request**
+
+        - **ProjectId** (str) - (Config) 项目ID,如org-xxxx。请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
+        - **InstanceId** (str) - (Required) 资源ID:ugaa-xxxxxxx
+        - **InstanceType** (str) - (Required) Free,Basic,Enterprise,Ultimate
+        - **RsIP** (str) - (Required) 被SSH访问的源站IP
+        - **Area** (str) - 填写支持SSH访问IP的地区名称，如“洛杉矶”，“新加坡”，“香港”，“东京”，“华盛顿”，“法兰克福”。Area和AreaCode两者必填一个
+        - **AreaCode** (str) - AreaCode, 区域航空港国际通用代码。Area和AreaCode两者必填一个
+
+        **Response**
+
+        - **Message** (str) - 提示信息
+
+        """
+        # build request
+        d = {
+            "ProjectId": self.config.project_id,
+        }
+        req and d.update(req)
+        d = apis.ModifyGlobalSSHOriginInfoRequestSchema().dumps(d)
+
+        resp = self.invoke("ModifyGlobalSSHOriginInfo", d, **kwargs)
+        return apis.ModifyGlobalSSHOriginInfoResponseSchema().loads(resp)
+
     def modify_global_ssh_port(
         self, req: typing.Optional[dict] = None, **kwargs
     ) -> dict:

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud/services/pathx/schemas/apis.py

@@ -754,6 +754,40 @@ class GetGlobalSSHPriceResponseSchema(schema.ResponseSchema):
     }
 
 
+"""
+API: GetGlobalSSHTraffic
+
+获取GlobalSSH流量统计数据
+"""
+
+
+class GetGlobalSSHTrafficRequestSchema(schema.RequestSchema):
+    """GetGlobalSSHTraffic - 获取GlobalSSH流量统计数据"""
+
+    fields = {
+        "BeginTime": fields.Int(required=True, dump_to="BeginTime"),
+        "EndTime": fields.Int(required=True, dump_to="EndTime"),
+        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
+        "UGAId": fields.Str(required=True, dump_to="UGAId"),
+    }
+
+
+class GetGlobalSSHTrafficResponseSchema(schema.ResponseSchema):
+    """GetGlobalSSHTraffic - 获取GlobalSSH流量统计数据"""
+
+    fields = {
+        "DataSet": fields.List(
+            models.TrafficDailySchema(), required=True, load_from="DataSet"
+        ),
+        "TrafficDailyRecently": fields.List(
+            models.TrafficDailyRecentlySchema(),
+            required=False,
+            load_from="TrafficDailyRecently",
+        ),
+        "UGAId": fields.Str(required=True, load_from="UGAId"),
+    }
+
+
 """
 API: GetGlobalSSHUpdatePrice
 
@@ -900,6 +934,34 @@ class GetUGA3UpdatePriceResponseSchema(schema.ResponseSchema):
     }
 
 
+"""
+API: ModifyGlobalSSHOriginInfo
+
+修改GlobalSSH 源站信息
+"""
+
+
+class ModifyGlobalSSHOriginInfoRequestSchema(schema.RequestSchema):
+    """ModifyGlobalSSHOriginInfo - 修改GlobalSSH 源站信息"""
+
+    fields = {
+        "Area": fields.Str(required=False, dump_to="Area"),
+        "AreaCode": fields.Str(required=False, dump_to="AreaCode"),
+        "InstanceId": fields.Str(required=True, dump_to="InstanceId"),
+        "InstanceType": fields.Str(required=True, dump_to="InstanceType"),
+        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
+        "RsIP": fields.Str(required=True, dump_to="RsIP"),
+    }
+
+
+class ModifyGlobalSSHOriginInfoResponseSchema(schema.ResponseSchema):
+    """ModifyGlobalSSHOriginInfo - 修改GlobalSSH 源站信息"""
+
+    fields = {
+        "Message": fields.Str(required=False, load_from="Message"),
+    }
+
+
 """
 API: ModifyGlobalSSHPort
 

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud/services/pathx/schemas/models.py

@@ -146,15 +146,6 @@ class AccelerationAreaInfosSchema(schema.ResponseSchema):
     }
 
 
-class OutPublicIpInfoSchema(schema.ResponseSchema):
-    """OutPublicIpInfo - 线路回源IP信息"""
-
-    fields = {
-        "Area": fields.Str(required=False, load_from="Area"),
-        "IP": fields.Str(required=False, load_from="IP"),
-    }
-
-
 class ForwardTaskSchema(schema.ResponseSchema):
     """ForwardTask -"""
 
@@ -165,6 +156,15 @@ class ForwardTaskSchema(schema.ResponseSchema):
     }
 
 
+class OutPublicIpInfoSchema(schema.ResponseSchema):
+    """OutPublicIpInfo - 线路回源IP信息"""
+
+    fields = {
+        "Area": fields.Str(required=False, load_from="Area"),
+        "IP": fields.Str(required=False, load_from="IP"),
+    }
+
+
 class ForwardInfoSchema(schema.ResponseSchema):
     """ForwardInfo -"""
 
@@ -342,6 +342,26 @@ class AlarmRulerSchema(schema.ResponseSchema):
     }
 
 
+class TrafficDailyRecentlySchema(schema.ResponseSchema):
+    """TrafficDailyRecently - 最近3个月日流量统计"""
+
+    fields = {
+        "Day": fields.Str(required=False, load_from="Day"),
+        "TrafficUnitGB": fields.Str(required=False, load_from="TrafficUnitGB"),
+        "TrafficUnitMB": fields.Str(required=False, load_from="TrafficUnitMB"),
+    }
+
+
+class TrafficDailySchema(schema.ResponseSchema):
+    """TrafficDaily -"""
+
+    fields = {
+        "BillingState": fields.Str(required=True, load_from="BillingState"),
+        "Date": fields.Int(required=True, load_from="Date"),
+        "Traffic": fields.Int(required=True, load_from="Traffic"),
+    }
+
+
 class MatricPointSchema(schema.ResponseSchema):
     """MatricPoint -"""
 

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud/services/uhost/client.py

@@ -13,6 +13,38 @@ class UHostClient(Client):
     ):
         super(UHostClient, self).__init__(config, transport, middleware, logger)
 
+    def add_uhost_to_isolation_group(
+        self, req: typing.Optional[dict] = None, **kwargs
+    ) -> dict:
+        """AddUHostToIsolationGroup - 将已有不在隔离组中的云主机添加到隔离组中
+
+        **Request**
+
+        - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
+        - **Region** (str) - (Config) 地域。 参见  `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
+        - **GroupId** (str) - (Required) 硬件隔离组id
+        - **UHostId** (str) - (Required) 主机id
+        - **Zone** (str) - (Required) 可用区。参见  `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
+
+        **Response**
+
+        - **UHostId** (str) - 主机id
+
+        """
+        # build request
+        d = {
+            "ProjectId": self.config.project_id,
+            "Region": self.config.region,
+        }
+        req and d.update(req)
+        d = apis.AddUHostToIsolationGroupRequestSchema().dumps(d)
+
+        # build options
+        kwargs["max_retries"] = 0  # ignore retry when api is not idempotent
+
+        resp = self.invoke("AddUHostToIsolationGroup", d, **kwargs)
+        return apis.AddUHostToIsolationGroupResponseSchema().loads(resp)
+
     def copy_custom_image(
         self, req: typing.Optional[dict] = None, **kwargs
     ) -> dict:

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud/services/uhost/schemas/apis.py

@@ -8,6 +8,33 @@ from ucloud.services.uhost.schemas import models
 """
 
 
+"""
+API: AddUHostToIsolationGroup
+
+将已有不在隔离组中的云主机添加到隔离组中
+"""
+
+
+class AddUHostToIsolationGroupRequestSchema(schema.RequestSchema):
+    """AddUHostToIsolationGroup - 将已有不在隔离组中的云主机添加到隔离组中"""
+
+    fields = {
+        "GroupId": fields.Str(required=True, dump_to="GroupId"),
+        "ProjectId": fields.Str(required=False, dump_to="ProjectId"),
+        "Region": fields.Str(required=True, dump_to="Region"),
+        "UHostId": fields.Str(required=True, dump_to="UHostId"),
+        "Zone": fields.Str(required=True, dump_to="Zone"),
+    }
+
+
+class AddUHostToIsolationGroupResponseSchema(schema.ResponseSchema):
+    """AddUHostToIsolationGroup - 将已有不在隔离组中的云主机添加到隔离组中"""
+
+    fields = {
+        "UHostId": fields.Str(required=False, load_from="UHostId"),
+    }
+
+
 """
 API: CopyCustomImage
 

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud/services/usms/client.py

@@ -56,12 +56,13 @@ class USMSClient(Client):
         - **ProjectId** (str) - (Config) 项目ID，不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 <https://docs.ucloud.cn/api/summary/get_project_list>`_
         - **CertificateType** (int) - (Required) 签名的资质证明文件类型，需与签名类型保持一致，说明如下：0-三证合一/企业营业执照/组织机构代码证书/社会信用代码证书；1-应用商店后台开发者管理截图；2-备案服务商的备案成功截图(含域名，网站名称，备案号)；3-公众号或小程序的管理界面截图；4-商标注册证书；5-组织机构代码证书、社会信用代码证书；
         - **Description** (str) - (Required) 短信签名申请原因
-        - **File** (str) - (Required) 短信签名的资质证明文件，需先进行base64编码格式转换，此处填写转换后的字符串。文件大小不超过4 MB
         - **SigContent** (str) - (Required) 签名内容
         - **SigPurpose** (int) - (Required) 签名用途，0-自用，1-他用；
         - **SigType** (int) - (Required) 签名类型，说明如下：0-公司或企业的全称或简称；1-App应用的全称或简称；2-工信部备案网站的全称或简称；3-公众号或小程序的全称或简称；4-商标名的全称或简称；5-政府/机关事业单位/其他单位的全称或简称；
+        - **File** (str) - 短信签名的资质证明文件，需先进行base64编码格式转换，此处填写转换后的字符串。文件大小不超过4 MB
         - **International** (bool) - 国内/国际短信。true:国际短信，false:国内短信，若不传值则默认该值为false
         - **ProxyFile** (str) - 短信签名授权委托文件，需先进行base64编码格式转换，此处填写转换后的字符串。文件大小不超过4 MB；当您是代理并使用第三方的签名时（也即SigPurpose为1-他用），该项为必填项；
+        - **QualificationId** (str) - 资质ID
 
         **Response**
 

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud/services/usms/schemas/apis.py

@@ -51,10 +51,13 @@ class CreateUSMSSignatureRequestSchema(schema.RequestSchema):
     fields = {
         "CertificateType": fields.Int(required=True, dump_to="CertificateType"),
         "Description": fields.Str(required=True, dump_to="Description"),
-        "File": fields.Str(required=True, dump_to="File"),
+        "File": fields.Str(required=False, dump_to="File"),
         "International": fields.Bool(required=False, dump_to="International"),
         "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
         "ProxyFile": fields.Str(required=False, dump_to="ProxyFile"),
+        "QualificationId": fields.Str(
+            required=False, dump_to="QualificationId"
+        ),
         "SigContent": fields.Str(required=True, dump_to="SigContent"),
         "SigPurpose": fields.Int(required=True, dump_to="SigPurpose"),
         "SigType": fields.Int(required=True, dump_to="SigType"),

ucloud-sdk-python3-0.11.67/ucloud/version.py

@@ -0,0 +1 @@
+version = "0.11.67"

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud_sdk_python3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.65
+Version: 0.11.67
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud

ucloud-sdk-python3-0.11.65/ucloud/version.py

@@ -1 +0,0 @@
-version = "0.11.65"

{ucloud-sdk-python3-0.11.65 → ucloud-sdk-python3-0.11.67}/ucloud/services/uaaa/client.py

@@ -134,16 +134,16 @@ class UAAAClient(Client):
 
         **Response Model**
 
-        **DomainInfo**
-        - **Desc** (str) - 备注信息
-        - **DomainName** (str) - 域名解析记录名称
-
-
         **DomainDetail**
         - **Info** (dict) - 见 **DomainInfo** 模型定义
         - **Redirect** (list) - 见 **DomainInfo** 模型定义
 
 
+        **DomainInfo**
+        - **Desc** (str) - 备注信息
+        - **DomainName** (str) - 域名解析记录名称
+
+
         """
         # build request
         d = {