ucloud-sdk-python3 0.11.134__tar.gz → 0.11.135__tar.gz

{ucloud_sdk_python3-0.11.134 → ucloud_sdk_python3-0.11.135}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.134
+Version: 0.11.135
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,20 +31,20 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Provides-Extra: dev
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: black; extra == "dev"
-Requires-Dist: flake8>=3.6.0; extra == "dev"
 Requires-Dist: pytest>=4.6; extra == "dev"
-Requires-Dist: requests; extra == "dev"
+Requires-Dist: black; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: requests_mock; extra == "dev"
+Requires-Dist: flake8>=3.6.0; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: requests; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: sphinx; extra == "ci"
-Requires-Dist: pytest-cov; extra == "ci"
 Requires-Dist: pytest>=4.6; extra == "ci"
+Requires-Dist: sphinx; extra == "ci"
+Requires-Dist: requests_mock; extra == "ci"
 Requires-Dist: flake8>=3.6.0; extra == "ci"
+Requires-Dist: pytest-cov; extra == "ci"
 Requires-Dist: requests; extra == "ci"
-Requires-Dist: requests_mock; extra == "ci"
 
 <p align="center">
     <img src="https://ucloud-sdk.dl.ufileos.com/logos%2Flogo-mini.png" />

{ucloud_sdk_python3-0.11.134 → ucloud_sdk_python3-0.11.135}/ucloud/services/sandbox/client.py

@@ -125,6 +125,11 @@ class SandboxClient(Client):
 
         **Response Model**
 
+        **SiteResource**
+        - **CPU** (int) - CPU核心
+        - **MemoryMB** (int) - 内存占用MB
+
+
         **SiteIPAccess**
         - **IPList** (list) - IP 列表
         - **Mode** (str) - IP限制模式"":不限制IP“allow”:自定义白名单“deny”:自定义黑名单
@@ -136,13 +141,14 @@ class SandboxClient(Client):
         - **CustomDomain** (str) - 自定义域名
         - **CustomDomainError** (str) - 自定义域名签发错误信息
         - **CustomDomainStatus** (str) - 自定义域名签发状态
-        - **Envs** (list) - 站点环境变量。格式：key=value
+        - **Envs** (list) - 站点环境变量。格式：["key=value"]
         - **Host** (str) - 站点访问地址
         - **ID** (str) - 站点ID
         - **IPAccess** (dict) - 见 **SiteIPAccess** 模型定义
         - **KeyID** (str) - 站点Key ID
         - **Name** (str) - 名称
         - **Ready** (bool) - 是否就绪
+        - **Resource** (dict) - 见 **SiteResource** 模型定义
         - **SandboxID** (str) - 沙箱ID
         - **UpdateTime** (int) - 更新时间
 

{ucloud_sdk_python3-0.11.134 → ucloud_sdk_python3-0.11.135}/ucloud/services/sandbox/schemas/models.py

@@ -12,6 +12,15 @@ class SiteIPAccessSchema(schema.ResponseSchema):
     }
 
 
+class SiteResourceSchema(schema.ResponseSchema):
+    """SiteResource - 站点资源"""
+
+    fields = {
+        "CPU": fields.Int(required=True, load_from="CPU"),
+        "MemoryMB": fields.Int(required=True, load_from="MemoryMB"),
+    }
+
+
 class SiteSchema(schema.ResponseSchema):
     """Site - 站点空间"""
 

{ucloud_sdk_python3-0.11.134 → ucloud_sdk_python3-0.11.135}/ucloud/services/vpc/client.py

@@ -1590,17 +1590,17 @@ class VPCClient(Client):
 
         **Response Model**
 
-        **NatGWIPResInfo**
-        - **EIP** (str) - 外网IP
-        - **OperatorName** (str) - IP的运营商信息
-
-
         **NatGatewaySubnetSet**
         - **Subnet** (str) - 子网网段
         - **SubnetName** (str) - 子网名字
         - **SubnetworkId** (str) - 子网id
 
 
+        **NatGWIPResInfo**
+        - **EIP** (str) - 外网IP
+        - **OperatorName** (str) - IP的运营商信息
+
+
         **NatGatewayIPSet**
         - **Bandwidth** (int) - 带宽
         - **BandwidthType** (str) - EIP带宽类型
@@ -1912,9 +1912,14 @@ class VPCClient(Client):
 
         **Response Model**
 
-        **UNIQuotaInfo**
-        - **PrivateIpCount** (int) - 网卡拥有的内网IP数量
-        - **PrivateIpQuota** (int) - 网卡内网IP配额
+        **UNIIpInfo**
+        - **IpAddr** (list) - ip 地址
+        - **IpType** (str) - ip类型 SecondaryIp/PrimaryIp
+
+
+        **FwInfo**
+        - **Id** (str) - 防火墙资源 ID
+        - **Name** (str) - 防火墙资源名称
 
 
         **SimpleIPv6AddressInfo**
@@ -1923,22 +1928,17 @@ class VPCClient(Client):
         - **IPv6Id** (str) - IPv6 资源 ID
 
 
+        **UNIQuotaInfo**
+        - **PrivateIpCount** (int) - 网卡拥有的内网IP数量
+        - **PrivateIpQuota** (int) - 网卡内网IP配额
+
+
         **SecGroup**
         - **Name** (str) - 安全组名称
         - **Priority** (int) - 关联优先级
         - **SecGroupId** (str) - 安全组ID
 
 
-        **UNIIpInfo**
-        - **IpAddr** (list) - ip 地址
-        - **IpType** (str) - ip类型 SecondaryIp/PrimaryIp
-
-
-        **FwInfo**
-        - **Id** (str) - 防火墙资源 ID
-        - **Name** (str) - 防火墙资源名称
-
-
         **NetworkInterface**
         - **AttachInstanceId** (str) - 绑定实例资源ID
         - **CreateTime** (int) - 创建时间
@@ -1959,7 +1959,7 @@ class VPCClient(Client):
         - **Netmask** (str) - 内网IP掩码
         - **OperatorName** (str) - 运营商
         - **PrivateIp** (list) - 见 **UNIIpInfo** 模型定义
-        - **PrivateIpLimit** (list) - 见 **UNIQuotaInfo** 模型定义
+        - **PrivateIpLimit** (dict) - 见 **UNIQuotaInfo** 模型定义
         - **PrivateIpSet** (list) - 关联内网IP。当前一个网卡仅支持绑定一个内网IP
         - **Remark** (str) - 备注
         - **SecGroup** (list) - 见 **SecGroup** 模型定义
@@ -2506,17 +2506,17 @@ class VPCClient(Client):
 
         **Response Model**
 
+        **VPCNetworkInfo**
+        - **Network** (str) - vpc地址空间
+        - **SubnetCount** (int) - 地址空间中子网数量
+
+
         **IPv6NetworkInfo**
         - **IPv6Network** (str) - IPv6网段
         - **IPv6SubnetCount** (int) - IPv6子网数量
         - **OperatorName** (str) - 类型
 
 
-        **VPCNetworkInfo**
-        - **Network** (str) - vpc地址空间
-        - **SubnetCount** (int) - 地址空间中子网数量
-
-
         **VPCInfo**
         - **CreateTime** (int) - 创建时间
         - **IPv6Network** (str) - VPC关联的IPv6网段

{ucloud_sdk_python3-0.11.134 → ucloud_sdk_python3-0.11.135}/ucloud/services/vpc/schemas/models.py

@@ -235,24 +235,6 @@ class AclInfoSchema(schema.ResponseSchema):
     }
 
 
-class UNIIpInfoSchema(schema.ResponseSchema):
-    """UNIIpInfo - 虚拟网卡内网IP信息"""
-
-    fields = {
-        "IpAddr": fields.List(fields.Str()),
-        "IpType": fields.Str(required=False, load_from="IpType"),
-    }
-
-
-class FwInfoSchema(schema.ResponseSchema):
-    """FwInfo - 防火墙信息"""
-
-    fields = {
-        "Id": fields.Str(required=False, load_from="Id"),
-        "Name": fields.Str(required=False, load_from="Name"),
-    }
-
-
 class SimpleIPv6AddressInfoSchema(schema.ResponseSchema):
     """SimpleIPv6AddressInfo -"""
 
@@ -276,6 +258,15 @@ class UNIQuotaInfoSchema(schema.ResponseSchema):
     }
 
 
+class UNIIpInfoSchema(schema.ResponseSchema):
+    """UNIIpInfo - 虚拟网卡内网IP信息"""
+
+    fields = {
+        "IpAddr": fields.List(fields.Str()),
+        "IpType": fields.Str(required=False, load_from="IpType"),
+    }
+
+
 class SecGroupSchema(schema.ResponseSchema):
     """SecGroup - UNI关联的安全组信息"""
 
@@ -286,6 +277,15 @@ class SecGroupSchema(schema.ResponseSchema):
     }
 
 
+class FwInfoSchema(schema.ResponseSchema):
+    """FwInfo - 防火墙信息"""
+
+    fields = {
+        "Id": fields.Str(required=False, load_from="Id"),
+        "Name": fields.Str(required=False, load_from="Name"),
+    }
+
+
 class NetworkInterfaceSchema(schema.ResponseSchema):
     """NetworkInterface - 虚拟网卡信息"""
 
@@ -313,7 +313,7 @@ class NetworkInterfaceSchema(schema.ResponseSchema):
         "Netmask": fields.Str(required=False, load_from="Netmask"),
         "OperatorName": fields.Str(required=True, load_from="OperatorName"),
         "PrivateIp": fields.List(UNIIpInfoSchema()),
-        "PrivateIpLimit": fields.List(UNIQuotaInfoSchema()),
+        "PrivateIpLimit": UNIQuotaInfoSchema(),
         "PrivateIpSet": fields.List(fields.Str()),
         "Remark": fields.Str(required=False, load_from="Remark"),
         "SecGroup": fields.List(SecGroupSchema()),
@@ -566,15 +566,6 @@ class VIPDetailSetSchema(schema.ResponseSchema):
     }
 
 
-class VPCNetworkInfoSchema(schema.ResponseSchema):
-    """VPCNetworkInfo - vpc地址空间信息"""
-
-    fields = {
-        "Network": fields.Str(required=False, load_from="Network"),
-        "SubnetCount": fields.Int(required=False, load_from="SubnetCount"),
-    }
-
-
 class IPv6NetworkInfoSchema(schema.ResponseSchema):
     """IPv6NetworkInfo -"""
 
@@ -587,6 +578,15 @@ class IPv6NetworkInfoSchema(schema.ResponseSchema):
     }
 
 
+class VPCNetworkInfoSchema(schema.ResponseSchema):
+    """VPCNetworkInfo - vpc地址空间信息"""
+
+    fields = {
+        "Network": fields.Str(required=False, load_from="Network"),
+        "SubnetCount": fields.Int(required=False, load_from="SubnetCount"),
+    }
+
+
 class VPCInfoSchema(schema.ResponseSchema):
     """VPCInfo - VPC信息"""
 

ucloud_sdk_python3-0.11.135/ucloud/version.py

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

{ucloud_sdk_python3-0.11.134 → ucloud_sdk_python3-0.11.135}/ucloud_sdk_python3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.134
+Version: 0.11.135
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,20 +31,20 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Provides-Extra: dev
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: black; extra == "dev"
-Requires-Dist: flake8>=3.6.0; extra == "dev"
 Requires-Dist: pytest>=4.6; extra == "dev"
-Requires-Dist: requests; extra == "dev"
+Requires-Dist: black; extra == "dev"
 Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: requests_mock; extra == "dev"
+Requires-Dist: flake8>=3.6.0; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: requests; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: sphinx; extra == "ci"
-Requires-Dist: pytest-cov; extra == "ci"
 Requires-Dist: pytest>=4.6; extra == "ci"
+Requires-Dist: sphinx; extra == "ci"
+Requires-Dist: requests_mock; extra == "ci"
 Requires-Dist: flake8>=3.6.0; extra == "ci"
+Requires-Dist: pytest-cov; extra == "ci"
 Requires-Dist: requests; extra == "ci"
-Requires-Dist: requests_mock; extra == "ci"
 
 <p align="center">
     <img src="https://ucloud-sdk.dl.ufileos.com/logos%2Flogo-mini.png" />

ucloud_sdk_python3-0.11.134/ucloud/version.py

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