ucloud-sdk-python3 0.11.120__tar.gz → 0.11.122__tar.gz

{ucloud_sdk_python3-0.11.120 → ucloud_sdk_python3-0.11.122}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.120
+Version: 0.11.122
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,18 +31,18 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Provides-Extra: dev
-Requires-Dist: black; extra == "dev"
-Requires-Dist: requests; extra == "dev"
 Requires-Dist: requests_mock; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: flake8>=3.6.0; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: requests; extra == "dev"
 Requires-Dist: pytest>=4.6; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: requests; extra == "ci"
 Requires-Dist: requests_mock; extra == "ci"
-Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: flake8>=3.6.0; extra == "ci"
+Requires-Dist: sphinx; extra == "ci"
+Requires-Dist: requests; extra == "ci"
 Requires-Dist: pytest>=4.6; extra == "ci"
 Requires-Dist: pytest-cov; extra == "ci"
 

{ucloud_sdk_python3-0.11.120 → ucloud_sdk_python3-0.11.122}/ucloud/services/cloudwatch/client.py

@@ -270,19 +270,6 @@ class CloudWatchClient(Client):
 
         **Response Model**
 
-        **ConversionRule**
-        - **ConversionFactor** (int) - 转换因子
-        - **From** (str) - 来源
-        - **To** (str) - 目标
-
-
-        **MetricUnitConfig**
-        - **ConversionFactor** (int) - 转换因子
-        - **ConversionRules** (list) - 见 **ConversionRule** 模型定义
-        - **UnitCnNames** (list) - 指标中文名列表
-        - **UnitEnNames** (list) - 指标英文名列表
-
-
         **MetricUnit**
         - **ConversionFactor** (int) - 转换因子
         - **CreatedAt** (str) - 创建时间
@@ -315,6 +302,19 @@ class CloudWatchClient(Client):
         - **UpdatedBy** (str) - 修改者
 
 
+        **ConversionRule**
+        - **ConversionFactor** (int) - 转换因子
+        - **From** (str) - 来源
+        - **To** (str) - 目标
+
+
+        **MetricUnitConfig**
+        - **ConversionFactor** (int) - 转换因子
+        - **ConversionRules** (list) - 见 **ConversionRule** 模型定义
+        - **UnitCnNames** (list) - 指标中文名列表
+        - **UnitEnNames** (list) - 指标英文名列表
+
+
         **GetProductMetricsRespData**
         - **List** (list) - 见 **Metirc** 模型定义
         - **Total** (int) - 查询结果总数
@@ -361,8 +361,13 @@ class CloudWatchClient(Client):
 
         **Response Model**
 
+        **ContentAttrItem**
+        - **Key** (str) - 键
+        - **Value** (str) - 值
+
+
         **AlertRecord**
-        - **ContentAttrList** (list) - 产品相关的额外属性列表
+        - **ContentAttrList** (list) - 见 **ContentAttrItem** 模型定义
         - **EndAt** (int) - 告警结束时间
         - **Level** (str) - 告警等级
         - **MetricID** (int) - 指标id
@@ -651,15 +656,14 @@ class CloudWatchClient(Client):
 
         **Response Model**
 
-        **ObjectType**
-        - **Id** (int) - ID
-        - **Metas** (str) - {type: spec|basic, key:string, name: string}[] -> JSON字符串
-        - **ObjectType** (str) - 资源类型ID
-        - **ObjectTypeKey** (str) - 资源类型
-        - **ProductCNName** (str) - 产品中文名称
-        - **ProductENName** (str) - 产品英文名称
-        - **ProductName** (str) - 产品名称
-        - **ProductName1** (str) - 产品子名称
+        **TagEntry**
+        - **KeyList** (list) - 标签候选值列表
+        - **TagName** (str) - 标签名称
+
+
+        **TagListItem**
+        - **Tag** (str) - 标签名
+        - **TagValue** (str) - 标签值
 
 
         **MetricSample**
@@ -670,7 +674,7 @@ class CloudWatchClient(Client):
         **MetricResult**
         - **ResourceId** (str) - 资源的短id
         - **ResourceName** (str) - 资源名称
-        - **TagList** (list) - 资源标签列表。每项为 TagListItem：Tag（标签名）和 TagValue（标签值）。
+        - **TagList** (list) - 见 **TagListItem** 模型定义
         - **Values** (list) - 见 **MetricSample** 模型定义
 
 
@@ -679,7 +683,7 @@ class CloudWatchClient(Client):
         - **ErrMsg** (str) - 该指标查询的状态说明
         - **Metric** (str) - 指标名
         - **Results** (list) - 见 **MetricResult** 模型定义
-        - **TagEntries** (list) - 见 **ObjectType** 模型定义
+        - **TagEntries** (list) - 见 **TagEntry** 模型定义
 
 
         **QueryMetricDataResp**
@@ -723,26 +727,24 @@ class CloudWatchClient(Client):
 
         **Response Model**
 
+        **LabelAttrItem**
+        - **Key** (str) - 键
+        - **Value** (str) - 值
+
+
+        **TagListItem**
+        - **Tag** (str) - 标签名
+        - **TagValue** (str) - 标签值
+
+
         **MetricSample**
         - **Timestamp** (int) - 时间戳
         - **Value** (float) - 样本值
 
 
-        **Product**
-        - **Id** (int) - ID
-        - **Metas** (str) - {Type: 1|2, Key:string, Name: string}[] -> JSON字符串
-        - **ProductChName** (str) - 产品中文名称
-        - **ProductEnName** (str) - 产品英文名称
-        - **ProductGroup** (str) - 产品分组
-        - **ProductKey** (str) - 资源类型唯一key
-        - **ProductName** (str) - 产品名称
-        - **ProductName1** (str) - 产品子名称
-        - **ProductType** (int) - 资源类型ID
-
-
         **MetricSingleSample**
         - **Metric** (str) - 指标名
-        - **TagsList** (list) - 见 **Product** 模型定义
+        - **TagsList** (list) - 见 **TagListItem** 模型定义
         - **Value** (dict) - 见 **MetricSample** 模型定义
 
 
@@ -751,9 +753,14 @@ class CloudWatchClient(Client):
         - **MetricValues** (list) - 见 **MetricSingleSample** 模型定义
 
 
+        **ResourceExtendAttrItem**
+        - **Key** (str) - 键
+        - **Value** (str) - 值
+
+
         **ResourceSummary**
         - **CompanyId** (int) - 公司id
-        - **LabelAttrList** (list) - 见 **ResourceMonitorItem** 模型定义
+        - **LabelAttrList** (list) - 见 **LabelAttrItem** 模型定义
         - **MonitorAttr** (list) - 见 **ResourceMonitorItem** 模型定义
         - **Name** (str) - 资源名称
         - **OrganizationId** (int) - 项目id
@@ -761,7 +768,7 @@ class CloudWatchClient(Client):
         - **ProjectId** (int) - 项目id
         - **Region** (str) - 地域
         - **RegionCN** (str) - 地域中文名
-        - **ResourceExtendAttrList** (list) - 见 **ResourceMonitorItem** 模型定义
+        - **ResourceExtendAttrList** (list) - 见 **ResourceExtendAttrItem** 模型定义
         - **ResourceId** (str) - 资源id
         - **Status** (int) - 资源状态
         - **Zone** (str) - 可用区

{ucloud_sdk_python3-0.11.120 → ucloud_sdk_python3-0.11.122}/ucloud/services/cloudwatch/schemas/models.py

@@ -48,6 +48,31 @@ class GetMetricDataAggregationMethodRespSchema(schema.ResponseSchema):
     }
 
 
+class ConversionRuleSchema(schema.ResponseSchema):
+    """ConversionRule - 指标单位转换规则"""
+
+    fields = {
+        "ConversionFactor": fields.Int(
+            required=False, load_from="ConversionFactor"
+        ),
+        "From": fields.Str(required=False, load_from="From"),
+        "To": fields.Str(required=False, load_from="To"),
+    }
+
+
+class MetricUnitConfigSchema(schema.ResponseSchema):
+    """MetricUnitConfig - 指标单位配置"""
+
+    fields = {
+        "ConversionFactor": fields.Int(
+            required=False, load_from="ConversionFactor"
+        ),
+        "ConversionRules": fields.List(ConversionRuleSchema()),
+        "UnitCnNames": fields.List(fields.Str()),
+        "UnitEnNames": fields.List(fields.Str()),
+    }
+
+
 class MetricUnitSchema(schema.ResponseSchema):
     """MetricUnit - 指标单位"""
 
@@ -90,31 +115,6 @@ class MetircSchema(schema.ResponseSchema):
     }
 
 
-class ConversionRuleSchema(schema.ResponseSchema):
-    """ConversionRule - 指标单位转换规则"""
-
-    fields = {
-        "ConversionFactor": fields.Int(
-            required=False, load_from="ConversionFactor"
-        ),
-        "From": fields.Str(required=False, load_from="From"),
-        "To": fields.Str(required=False, load_from="To"),
-    }
-
-
-class MetricUnitConfigSchema(schema.ResponseSchema):
-    """MetricUnitConfig - 指标单位配置"""
-
-    fields = {
-        "ConversionFactor": fields.Int(
-            required=False, load_from="ConversionFactor"
-        ),
-        "ConversionRules": fields.List(ConversionRuleSchema()),
-        "UnitCnNames": fields.List(fields.Str()),
-        "UnitEnNames": fields.List(fields.Str()),
-    }
-
-
 class GetProductMetricsRespDataSchema(schema.ResponseSchema):
     """GetProductMetricsRespData - 产品指标查询结果"""
 
@@ -125,11 +125,20 @@ class GetProductMetricsRespDataSchema(schema.ResponseSchema):
     }
 
 
+class ContentAttrItemSchema(schema.ResponseSchema):
+    """ContentAttrItem - 告警内容属性项"""
+
+    fields = {
+        "Key": fields.Str(required=False, load_from="Key"),
+        "Value": fields.Str(required=False, load_from="Value"),
+    }
+
+
 class AlertRecordSchema(schema.ResponseSchema):
     """AlertRecord - 告警记录模型"""
 
     fields = {
-        "ContentAttrList": fields.List(fields.Str()),
+        "ContentAttrList": fields.List(ContentAttrItemSchema()),
         "EndAt": fields.Int(required=False, load_from="EndAt"),
         "Level": fields.Str(required=False, load_from="Level"),
         "MetricID": fields.Int(required=False, load_from="MetricID"),
@@ -252,6 +261,24 @@ class ListMonitorProductSchema(schema.ResponseSchema):
     }
 
 
+class TagEntrySchema(schema.ResponseSchema):
+    """TagEntry - 标签条目"""
+
+    fields = {
+        "KeyList": fields.List(fields.Str()),
+        "TagName": fields.Str(required=False, load_from="TagName"),
+    }
+
+
+class TagListItemSchema(schema.ResponseSchema):
+    """TagListItem - 标签键值项"""
+
+    fields = {
+        "Tag": fields.Str(required=False, load_from="Tag"),
+        "TagValue": fields.Str(required=False, load_from="TagValue"),
+    }
+
+
 class MetricSampleSchema(schema.ResponseSchema):
     """MetricSample - 指标数据点（代码结构体：MetricPoint）"""
 
@@ -267,26 +294,11 @@ class MetricResultSchema(schema.ResponseSchema):
     fields = {
         "ResourceId": fields.Str(required=False, load_from="ResourceId"),
         "ResourceName": fields.Str(required=False, load_from="ResourceName"),
-        "TagList": fields.List(fields.Int()),
+        "TagList": fields.List(TagListItemSchema()),
         "Values": fields.List(MetricSampleSchema()),
     }
 
 
-class ObjectTypeSchema(schema.ResponseSchema):
-    """ObjectType -"""
-
-    fields = {
-        "Id": fields.Int(required=False, load_from="Id"),
-        "Metas": fields.Str(required=False, load_from="Metas"),
-        "ObjectType": fields.Str(required=False, load_from="ObjectType"),
-        "ObjectTypeKey": fields.Str(required=False, load_from="ObjectTypeKey"),
-        "ProductCNName": fields.Str(required=False, load_from="ProductCNName"),
-        "ProductENName": fields.Str(required=False, load_from="ProductENName"),
-        "ProductName": fields.Str(required=False, load_from="ProductName"),
-        "ProductName1": fields.Str(required=False, load_from="ProductName1"),
-    }
-
-
 class QueryMetricDataRespItemSchema(schema.ResponseSchema):
     """QueryMetricDataRespItem - 单个监控指标的查询结果"""
 
@@ -295,7 +307,7 @@ class QueryMetricDataRespItemSchema(schema.ResponseSchema):
         "ErrMsg": fields.Str(required=False, load_from="ErrMsg"),
         "Metric": fields.Str(required=False, load_from="Metric"),
         "Results": fields.List(MetricResultSchema()),
-        "TagEntries": fields.List(ObjectTypeSchema()),
+        "TagEntries": fields.List(TagEntrySchema()),
     }
 
 
@@ -308,12 +320,30 @@ class QueryMetricDataRespSchema(schema.ResponseSchema):
     }
 
 
+class LabelAttrItemSchema(schema.ResponseSchema):
+    """LabelAttrItem - 标签扩展属性项"""
+
+    fields = {
+        "Key": fields.Str(required=False, load_from="Key"),
+        "Value": fields.Str(required=False, load_from="Value"),
+    }
+
+
+class ResourceExtendAttrItemSchema(schema.ResponseSchema):
+    """ResourceExtendAttrItem - 资源扩展属性项"""
+
+    fields = {
+        "Key": fields.Str(required=False, load_from="Key"),
+        "Value": fields.Str(required=False, load_from="Value"),
+    }
+
+
 class MetricSingleSampleSchema(schema.ResponseSchema):
     """MetricSingleSample - 指标单个样本点结果"""
 
     fields = {
         "Metric": fields.Str(required=False, load_from="Metric"),
-        "TagsList": fields.List(ProductSchema()),
+        "TagsList": fields.List(TagListItemSchema()),
         "Value": MetricSampleSchema(),
     }
 
@@ -332,7 +362,7 @@ class ResourceSummarySchema(schema.ResponseSchema):
 
     fields = {
         "CompanyId": fields.Int(required=False, load_from="CompanyId"),
-        "LabelAttrList": fields.List(ResourceMonitorItemSchema()),
+        "LabelAttrList": fields.List(LabelAttrItemSchema()),
         "MonitorAttr": fields.List(ResourceMonitorItemSchema()),
         "Name": fields.Str(required=False, load_from="Name"),
         "OrganizationId": fields.Int(
@@ -342,7 +372,7 @@ class ResourceSummarySchema(schema.ResponseSchema):
         "ProjectId": fields.Int(required=False, load_from="ProjectId"),
         "Region": fields.Str(required=False, load_from="Region"),
         "RegionCN": fields.Str(required=False, load_from="RegionCN"),
-        "ResourceExtendAttrList": fields.List(ResourceMonitorItemSchema()),
+        "ResourceExtendAttrList": fields.List(ResourceExtendAttrItemSchema()),
         "ResourceId": fields.Str(required=False, load_from="ResourceId"),
         "Status": fields.Int(required=False, load_from="Status"),
         "Zone": fields.Str(required=False, load_from="Zone"),

{ucloud_sdk_python3-0.11.120 → ucloud_sdk_python3-0.11.122}/ucloud/services/udb/client.py

@@ -871,9 +871,11 @@ class UDBClient(Client):
         - **ReplicationDelaySeconds** (int) -
         - **Role** (str) -
         - **SSDType** (str) -
+        - **SpecificationClass** (str) -
         - **SpecificationType** (int) -
         - **SrcDBId** (str) -
         - **State** (str) -
+        - **StorageClass** (str) -
         - **SubnetId** (str) -
         - **SystemFileSize** (float) -
         - **Tag** (str) -
@@ -886,6 +888,7 @@ class UDBClient(Client):
 
         **UDBInstanceSet**
         - **AdminUser** (str) -
+        - **AutoRenew** (int) -
         - **BackupBeginTime** (int) -
         - **BackupBlacklist** (str) -
         - **BackupCount** (int) -
@@ -908,6 +911,7 @@ class UDBClient(Client):
         - **DiskUsedSize** (float) -
         - **EnableSSL** (int) -
         - **ExpiredTime** (int) -
+        - **ForceEncryption** (int) -
         - **IPv6Address** (str) -
         - **InstanceMode** (str) -
         - **InstanceType** (str) -
@@ -922,9 +926,11 @@ class UDBClient(Client):
         - **Role** (str) -
         - **SSDType** (str) -
         - **SSLExpirationTime** (int) -
+        - **SpecificationClass** (str) -
         - **SpecificationType** (int) -
         - **SrcDBId** (str) -
         - **State** (str) -
+        - **StorageClass** (str) -
         - **SubnetId** (str) -
         - **SystemFileSize** (float) -
         - **Tag** (str) -
@@ -1218,6 +1224,11 @@ class UDBClient(Client):
 
         **Response Model**
 
+        **UFileDataSet**
+        - **Bucket** (str) - bucket名称
+        - **TokenID** (str) - Ufile的令牌tokenid
+
+
         **UDBSlaveInstanceSet**
         - **AdminUser** (str) - 管理员帐户名，默认root
         - **BackupBeginTime** (int) - 备份策略，不可修改，开始时间，单位小时计，默认3点
@@ -1263,11 +1274,6 @@ class UDBClient(Client):
         - **Zone** (str) - 可用区
 
 
-        **UFileDataSet**
-        - **Bucket** (str) - bucket名称
-        - **TokenID** (str) - Ufile的令牌tokenid
-
-
         **UDBInstanceSet**
         - **AdminUser** (str) - 管理员帐户名，默认root
         - **AutoRenew** (int) - 0 不自动续费， 1 自动续费
@@ -1510,7 +1516,7 @@ class UDBClient(Client):
         - **Region** (str) - (Config) 地域。 参见  `地域和可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
         - **DBTypeId** (str) - (Required) UDB实例的DB版本字符串
         - **DiskSpace** (int) - (Required) 磁盘空间(GB),暂时支持20(GB) - 3000(GB), 输入不带单位
-        - **MemoryLimit** (int) - (Required) 内存限制(MB)，单位为MB.目前支持：2000-96000
+        - **MemoryLimit** (int) - (Required) 内存限制(MB)，目前支持2000‑96000，按1000进制(1GB=1000MB)计算
         - **Zone** (str) - (Required) 可用区。参见  `可用区列表 <https://docs.ucloud.cn/api/summary/regionlist>`_
         - **CPU** (int) - CPU个数，如果db类型为sqlserver，则为必填参数
         - **ChargeType** (str) - Year，按年付费； Month，按月付费 Dynamic，按需付费（需开启权限) Trial，试用（需开启权限）默认为月付

ucloud_sdk_python3-0.11.122/ucloud/version.py

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

{ucloud_sdk_python3-0.11.120 → ucloud_sdk_python3-0.11.122}/ucloud_sdk_python3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ucloud-sdk-python3
-Version: 0.11.120
+Version: 0.11.122
 Summary: UCloud Service Development Kit - Python
 Home-page: https://github.com/ucloud/ucloud-sdk-python3
 Author: ucloud
@@ -31,18 +31,18 @@ Provides-Extra: doc
 Requires-Dist: requests; extra == "doc"
 Requires-Dist: sphinx; extra == "doc"
 Provides-Extra: dev
-Requires-Dist: black; extra == "dev"
-Requires-Dist: requests; extra == "dev"
 Requires-Dist: requests_mock; extra == "dev"
-Requires-Dist: sphinx; extra == "dev"
 Requires-Dist: flake8>=3.6.0; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: requests; extra == "dev"
 Requires-Dist: pytest>=4.6; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: ci
-Requires-Dist: requests; extra == "ci"
 Requires-Dist: requests_mock; extra == "ci"
-Requires-Dist: sphinx; extra == "ci"
 Requires-Dist: flake8>=3.6.0; extra == "ci"
+Requires-Dist: sphinx; extra == "ci"
+Requires-Dist: requests; extra == "ci"
 Requires-Dist: pytest>=4.6; extra == "ci"
 Requires-Dist: pytest-cov; extra == "ci"
 

ucloud_sdk_python3-0.11.120/ucloud/version.py

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