sdk: rolling update for 0.11.67 (#273)

Author: ucloud-bot

ucloud/services/pathx/client.py

@@ -1045,18 +1045,18 @@ def get_global_ssh_traffic(
 
         **Response Model**
 
-        **TrafficDailyRecently**
-        - **Day** (str) - 日期
-        - **TrafficUnitGB** (str) - 日流量(单位GB)
-        - **TrafficUnitMB** (str) - 日流量(单位MB)
-
-
         **TrafficDaily**
         - **BillingState** (str) - Yes:已扣费, No:未扣费
         - **Date** (int) - 日期
         - **Traffic** (int) - 流量（单位GB）
 
 
+        **TrafficDailyRecently**
+        - **Day** (str) - 日期
+        - **TrafficUnitGB** (str) - 日流量(单位GB)
+        - **TrafficUnitMB** (str) - 日流量(单位MB)
+
+
         """
         # build request
         d = {

ucloud/services/pathx/schemas/models.py

@@ -135,15 +135,6 @@ class SrcAreaInfoSchema(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 AccelerationAreaInfosSchema(schema.ResponseSchema):
     """AccelerationAreaInfos -"""
 
@@ -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 -"""
 
@@ -231,6 +231,15 @@ class AccelerationInfoSchema(schema.ResponseSchema):
     }
 
 
+class UGAATaskSchema(schema.ResponseSchema):
+    """UGAATask - 用户在UGAA实例下配置的多端口任务"""
+
+    fields = {
+        "Port": fields.Int(required=True, load_from="Port"),
+        "Protocol": fields.Str(required=True, load_from="Protocol"),
+    }
+
+
 class UPathSetSchema(schema.ResponseSchema):
     """UPathSet - uga关联的upath信息"""
 
@@ -246,15 +255,6 @@ class UPathSetSchema(schema.ResponseSchema):
     }
 
 
-class UGAATaskSchema(schema.ResponseSchema):
-    """UGAATask - 用户在UGAA实例下配置的多端口任务"""
-
-    fields = {
-        "Port": fields.Int(required=True, load_from="Port"),
-        "Protocol": fields.Str(required=True, load_from="Protocol"),
-    }
-
-
 class UGAL7ForwarderSchema(schema.ResponseSchema):
     """UGAL7Forwarder - UGA实例 7层转发器信息"""
 

ucloud/services/ucdn/schemas/models.py

@@ -308,6 +308,16 @@ class BandwidthTrafficInfoSchema(schema.ResponseSchema):
     }
 
 
+class CacheKeyInfoSchema(schema.ResponseSchema):
+    """CacheKeyInfo - 忽略参数缓存配置"""
+
+    fields = {
+        "Ignore": fields.Bool(required=False, load_from="Ignore"),
+        "PathPattern": fields.Str(required=False, load_from="PathPattern"),
+        "QueryString": fields.Str(required=False, load_from="QueryString"),
+    }
+
+
 class ReferConfSchema(schema.ResponseSchema):
     """ReferConf - refer配置"""
 
@@ -318,22 +328,28 @@ class ReferConfSchema(schema.ResponseSchema):
     }
 
 
-class CacheKeyInfoSchema(schema.ResponseSchema):
-    """CacheKeyInfo - 忽略参数缓存配置"""
+class CacheAllConfigSchema(schema.ResponseSchema):
+    """CacheAllConfig - 缓存相关的配置"""
 
     fields = {
-        "Ignore": fields.Bool(required=False, load_from="Ignore"),
-        "PathPattern": fields.Str(required=False, load_from="PathPattern"),
-        "QueryString": fields.Str(required=False, load_from="QueryString"),
+        "CacheHost": fields.Str(required=False, load_from="CacheHost"),
+        "CacheKeyList": fields.List(CacheKeyInfoSchema()),
+        "CacheList": fields.List(CacheConfSchema()),
+        "HttpCodeCacheList": fields.List(CacheConfSchema()),
     }
 
 
-class AccessControlConfSchema(schema.ResponseSchema):
-    """AccessControlConf - 访问控制配置参数"""
+class AdvancedConfSchema(schema.ResponseSchema):
+    """AdvancedConf - 域名高级配置"""
 
     fields = {
-        "IpBlackList": fields.List(fields.Str()),
-        "ReferConf": ReferConfSchema(),
+        "Http2Https": fields.Bool(required=False, load_from="Http2Https"),
+        "HttpClientHeader": fields.List(fields.Str()),
+        "HttpOriginHeader": fields.List(fields.Str()),
+        "QuicEnable": fields.Bool(required=False, load_from="QuicEnable"),
+        "WebSocketEnable": fields.Bool(
+            required=False, load_from="WebSocketEnable"
+        ),
     }
 
 
@@ -366,28 +382,12 @@ class OriginConfSchema(schema.ResponseSchema):
     }
 
 
-class AdvancedConfSchema(schema.ResponseSchema):
-    """AdvancedConf - 域名高级配置"""
-
-    fields = {
-        "Http2Https": fields.Bool(required=False, load_from="Http2Https"),
-        "HttpClientHeader": fields.List(fields.Str()),
-        "HttpOriginHeader": fields.List(fields.Str()),
-        "QuicEnable": fields.Bool(required=False, load_from="QuicEnable"),
-        "WebSocketEnable": fields.Bool(
-            required=False, load_from="WebSocketEnable"
-        ),
-    }
-
-
-class CacheAllConfigSchema(schema.ResponseSchema):
-    """CacheAllConfig - 缓存相关的配置"""
+class AccessControlConfSchema(schema.ResponseSchema):
+    """AccessControlConf - 访问控制配置参数"""
 
     fields = {
-        "CacheHost": fields.Str(required=False, load_from="CacheHost"),
-        "CacheKeyList": fields.List(CacheKeyInfoSchema()),
-        "CacheList": fields.List(CacheConfSchema()),
-        "HttpCodeCacheList": fields.List(CacheConfSchema()),
+        "IpBlackList": fields.List(fields.Str()),
+        "ReferConf": ReferConfSchema(),
     }
 
 

ucloud/services/uhost/client.py

@@ -13,6 +13,38 @@ def __init__(
     ):
         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/services/uhost/schemas/apis.py

@@ -8,6 +8,33 @@
 """
 
 
+"""
+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/services/uhost/schemas/models.py

@@ -40,6 +40,16 @@ class CollectionSchema(schema.ResponseSchema):
     }
 
 
+class FeatureModesSchema(schema.ResponseSchema):
+    """FeatureModes - 可以支持的模式类别"""
+
+    fields = {
+        "MinimalCpuPlatform": fields.List(fields.Str()),
+        "Name": fields.Str(required=False, load_from="Name"),
+        "RelatedToImageFeature": fields.List(fields.Str()),
+    }
+
+
 class DataDiskInfoSchema(schema.ResponseSchema):
     """DataDiskInfo - 数据盘信息"""
 
@@ -62,40 +72,29 @@ class BootDiskInfoSchema(schema.ResponseSchema):
     }
 
 
-class FeatureModesSchema(schema.ResponseSchema):
-    """FeatureModes - 可以支持的模式类别"""
+class MachineSizesSchema(schema.ResponseSchema):
+    """MachineSizes - GPU、CPU和内存信息"""
 
     fields = {
-        "MinimalCpuPlatform": fields.List(fields.Str()),
-        "Name": fields.Str(required=False, load_from="Name"),
-        "RelatedToImageFeature": fields.List(fields.Str()),
+        "Collection": fields.List(CollectionSchema()),
+        "Gpu": fields.Int(required=False, load_from="Gpu"),
     }
 
 
-class PerformanceSchema(schema.ResponseSchema):
-    """Performance - GPU的性能指标"""
+class GraphicsMemorySchema(schema.ResponseSchema):
+    """GraphicsMemory - GPU的显存指标"""
 
     fields = {
         "Rate": fields.Int(required=False, load_from="Rate"),
-        "Value": fields.Float(required=False, load_from="Value"),
-    }
-
-
-class MachineSizesSchema(schema.ResponseSchema):
-    """MachineSizes - GPU、CPU和内存信息"""
-
-    fields = {
-        "Collection": fields.List(CollectionSchema()),
-        "Gpu": fields.Int(required=False, load_from="Gpu"),
+        "Value": fields.Int(required=False, load_from="Value"),
     }
 
 
-class DisksSchema(schema.ResponseSchema):
-    """Disks - 磁盘信息"""
+class FeaturesSchema(schema.ResponseSchema):
+    """Features - 虚机可支持的特性"""
 
     fields = {
-        "BootDisk": fields.List(BootDiskInfoSchema()),
-        "DataDisk": fields.List(DataDiskInfoSchema()),
+        "Modes": fields.List(FeatureModesSchema()),
         "Name": fields.Str(required=False, load_from="Name"),
     }
 
@@ -110,20 +109,21 @@ class CpuPlatformsSchema(schema.ResponseSchema):
     }
 
 
-class GraphicsMemorySchema(schema.ResponseSchema):
-    """GraphicsMemory - GPU的显存指标"""
+class PerformanceSchema(schema.ResponseSchema):
+    """Performance - GPU的性能指标"""
 
     fields = {
         "Rate": fields.Int(required=False, load_from="Rate"),
-        "Value": fields.Int(required=False, load_from="Value"),
+        "Value": fields.Float(required=False, load_from="Value"),
     }
 
 
-class FeaturesSchema(schema.ResponseSchema):
-    """Features - 虚机可支持的特性"""
+class DisksSchema(schema.ResponseSchema):
+    """Disks - 磁盘信息"""
 
     fields = {
-        "Modes": fields.List(FeatureModesSchema()),
+        "BootDisk": fields.List(BootDiskInfoSchema()),
+        "DataDisk": fields.List(DataDiskInfoSchema()),
         "Name": fields.Str(required=False, load_from="Name"),
     }
 
@@ -223,23 +223,6 @@ class UDSetUDHostAttributeSchema(schema.ResponseSchema):
     }
 
 
-class SpotAttributeSchema(schema.ResponseSchema):
-    """SpotAttribute - 竞价实例属性"""
-
-    fields = {
-        "RecycleTime": fields.Int(required=False, load_from="RecycleTime"),
-    }
-
-
-class UHostKeyPairSchema(schema.ResponseSchema):
-    """UHostKeyPair - 主机密钥信息"""
-
-    fields = {
-        "KeyPairId": fields.Str(required=False, load_from="KeyPairId"),
-        "KeyPairState": fields.Str(required=False, load_from="KeyPairState"),
-    }
-
-
 class UHostIPSetSchema(schema.ResponseSchema):
     """UHostIPSet - DescribeUHostInstance"""
 
@@ -276,6 +259,23 @@ class UHostDiskSetSchema(schema.ResponseSchema):
     }
 
 
+class UHostKeyPairSchema(schema.ResponseSchema):
+    """UHostKeyPair - 主机密钥信息"""
+
+    fields = {
+        "KeyPairId": fields.Str(required=False, load_from="KeyPairId"),
+        "KeyPairState": fields.Str(required=False, load_from="KeyPairState"),
+    }
+
+
+class SpotAttributeSchema(schema.ResponseSchema):
+    """SpotAttribute - 竞价实例属性"""
+
+    fields = {
+        "RecycleTime": fields.Int(required=False, load_from="RecycleTime"),
+    }
+
+
 class UHostInstanceSetSchema(schema.ResponseSchema):
     """UHostInstanceSet - DescribeUHostInstance"""