From 0db0dcd00bcbfa7cdf606ee385544b8505b4a4f2 Mon Sep 17 00:00:00 2001 From: ucloud-bot Date: Tue, 25 Aug 2026 10:03:41 +0000 Subject: [PATCH] sdk: rolling update for 0.11.123 --- docs/services.rst | 7 + ucloud/client.py | 10 + ucloud/services/cloudwatch/client.py | 46 +-- ucloud/services/cloudwatch/schemas/models.py | 76 ++--- ucloud/services/sandbox/__init__.py | 0 ucloud/services/sandbox/client.py | 279 +++++++++++++++++++ ucloud/services/sandbox/schemas/__init__.py | 0 ucloud/services/sandbox/schemas/apis.py | 209 ++++++++++++++ ucloud/services/sandbox/schemas/models.py | 37 +++ ucloud/services/uwsc/client.py | 120 ++++---- ucloud/services/uwsc/schemas/apis.py | 92 +++--- ucloud/services/uwsc/schemas/models.py | 82 +++--- ucloud/version.py | 2 +- 13 files changed, 751 insertions(+), 209 deletions(-) create mode 100644 ucloud/services/sandbox/__init__.py create mode 100644 ucloud/services/sandbox/client.py create mode 100644 ucloud/services/sandbox/schemas/__init__.py create mode 100644 ucloud/services/sandbox/schemas/apis.py create mode 100644 ucloud/services/sandbox/schemas/models.py diff --git a/docs/services.rst b/docs/services.rst index 19ad69df..cb877c1e 100644 --- a/docs/services.rst +++ b/docs/services.rst @@ -387,3 +387,10 @@ ipv6gw .. autoclass:: ucloud.services.ipv6gw.client.ipv6gwClient :members: + +sandbox +------- + +.. autoclass:: ucloud.services.sandbox.client.SandboxClient + :members: + diff --git a/ucloud/client.py b/ucloud/client.py index 4982934c..83312e59 100644 --- a/ucloud/client.py +++ b/ucloud/client.py @@ -562,6 +562,16 @@ def ipv6gw(self): self.logger, ) + def sandbox(self): + from ucloud.services.sandbox.client import SandboxClient + + return SandboxClient( + self._auto_config("sandbox"), + self.transport, + self.middleware, + self.logger, + ) + def vpc(self): from ucloud.services.vpc.client import VPCClient diff --git a/ucloud/services/cloudwatch/client.py b/ucloud/services/cloudwatch/client.py index a7fb3cc6..413c9f8d 100644 --- a/ucloud/services/cloudwatch/client.py +++ b/ucloud/services/cloudwatch/client.py @@ -270,6 +270,19 @@ def get_product_metrics( **Response Model** + **ConversionRule** + - **ConversionFactor** (int) - 转换因子 + - **From** (str) - 来源 + - **To** (str) - 目标 + + + **MetricUnitConfig** + - **ConversionFactor** (int) - 转换因子 + - **ConversionRules** (list) - 见 **ConversionRule** 模型定义 + - **UnitCnNames** (list) - 指标中文名列表 + - **UnitEnNames** (list) - 指标英文名列表 + + **MetricUnit** - **ConversionFactor** (int) - 转换因子 - **CreatedAt** (str) - 创建时间 @@ -302,19 +315,6 @@ def get_product_metrics( - **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) - 查询结果总数 @@ -661,16 +661,16 @@ def query_metric_data_set( - **TagName** (str) - 标签名称 - **TagListItem** - - **Tag** (str) - 标签名 - - **TagValue** (str) - 标签值 - - **MetricSample** - **Timestamp** (int) - 时间戳 - **Value** (float) - 样本值 + **TagListItem** + - **Tag** (str) - 标签名 + - **TagValue** (str) - 标签值 + + **MetricResult** - **ResourceId** (str) - 资源的短id - **ResourceName** (str) - 资源名称 @@ -727,11 +727,6 @@ def query_metric_data_summary( **Response Model** - **LabelAttrItem** - - **Key** (str) - 键 - - **Value** (str) - 值 - - **TagListItem** - **Tag** (str) - 标签名 - **TagValue** (str) - 标签值 @@ -758,6 +753,11 @@ def query_metric_data_summary( - **Value** (str) - 值 + **LabelAttrItem** + - **Key** (str) - 键 + - **Value** (str) - 值 + + **ResourceSummary** - **CompanyId** (int) - 公司id - **LabelAttrList** (list) - 见 **LabelAttrItem** 模型定义 diff --git a/ucloud/services/cloudwatch/schemas/models.py b/ucloud/services/cloudwatch/schemas/models.py index e5eb3b44..3440c9dc 100644 --- a/ucloud/services/cloudwatch/schemas/models.py +++ b/ucloud/services/cloudwatch/schemas/models.py @@ -48,31 +48,6 @@ 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 - 指标单位""" @@ -115,6 +90,31 @@ 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 - 产品指标查询结果""" @@ -261,15 +261,6 @@ 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 - 标签键值项""" @@ -299,6 +290,15 @@ class MetricResultSchema(schema.ResponseSchema): } +class TagEntrySchema(schema.ResponseSchema): + """TagEntry - 标签条目""" + + fields = { + "KeyList": fields.List(fields.Str()), + "TagName": fields.Str(required=False, load_from="TagName"), + } + + class QueryMetricDataRespItemSchema(schema.ResponseSchema): """QueryMetricDataRespItem - 单个监控指标的查询结果""" @@ -320,8 +320,8 @@ class QueryMetricDataRespSchema(schema.ResponseSchema): } -class LabelAttrItemSchema(schema.ResponseSchema): - """LabelAttrItem - 标签扩展属性项""" +class ResourceExtendAttrItemSchema(schema.ResponseSchema): + """ResourceExtendAttrItem - 资源扩展属性项""" fields = { "Key": fields.Str(required=False, load_from="Key"), @@ -329,8 +329,8 @@ class LabelAttrItemSchema(schema.ResponseSchema): } -class ResourceExtendAttrItemSchema(schema.ResponseSchema): - """ResourceExtendAttrItem - 资源扩展属性项""" +class LabelAttrItemSchema(schema.ResponseSchema): + """LabelAttrItem - 标签扩展属性项""" fields = { "Key": fields.Str(required=False, load_from="Key"), diff --git a/ucloud/services/sandbox/__init__.py b/ucloud/services/sandbox/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ucloud/services/sandbox/client.py b/ucloud/services/sandbox/client.py new file mode 100644 index 00000000..9e2731fc --- /dev/null +++ b/ucloud/services/sandbox/client.py @@ -0,0 +1,279 @@ +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ + +import typing + + +from ucloud.core.client import Client +from ucloud.services.sandbox.schemas import apis + + +class SandboxClient(Client): + def __init__( + self, config: dict, transport=None, middleware=None, logger=None + ): + super(SandboxClient, self).__init__( + config, transport, middleware, logger + ) + + def check_sandbox_custom_domain( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """CheckSandboxCustomDomain - 检查自定义域名 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **CustomDomain** (str) - (Required) 自定义域名 + - **TargetDomain** (str) - (Required) 目标域名 + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + - **Get** (bool) - 如果为true，则表示获取检查结果 + + **Response** + + - **Status** (str) - 检查结果Unknown:未知Checking：检查中Success：成功Timeout：超时Error：检查失败 + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.CheckSandboxCustomDomainRequestSchema().dumps(d) + + resp = self.invoke("CheckSandboxCustomDomain", d, **kwargs) + return apis.CheckSandboxCustomDomainResponseSchema().loads(resp) + + def create_sandbox_site( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """CreateSandboxSite - 创建站点空间 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **APIKey** (str) - (Required) 密钥 + - **AccessCode** (str) - (Required) 访问码 + - **KeyID** (str) - (Required) 密钥ID + - **Name** (str) - (Required) 站点空间名称 + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + - **Envs** (str) - 环境变量，格式：["key=value"] + + **Response** + + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.CreateSandboxSiteRequestSchema().dumps(d) + + # build options + kwargs["max_retries"] = 0 # ignore retry when api is not idempotent + + resp = self.invoke("CreateSandboxSite", d, **kwargs) + return apis.CreateSandboxSiteResponseSchema().loads(resp) + + def delete_sandbox_site( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """DeleteSandboxSite - 删除站点空间 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **SandboxID** (str) - (Required) 站点沙箱ID + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + + **Response** + + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.DeleteSandboxSiteRequestSchema().dumps(d) + + resp = self.invoke("DeleteSandboxSite", d, **kwargs) + return apis.DeleteSandboxSiteResponseSchema().loads(resp) + + def get_sandbox_site( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """GetSandboxSite - 获取沙箱站点 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **SandboxID** (str) - (Required) 沙箱ID + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + + **Response** + + - **Site** (dict) - 见 **Site** 模型定义 + + **Response Model** + + **SiteIPAccess** + - **IPList** (list) - IP 列表 + - **Mode** (str) - IP限制模式"":不限制IP“allow”:自定义白名单“deny”:自定义黑名单 + + + **Site** + - **AccessCode** (str) - 访问码 + - **ConnectKey** (str) - 连接密钥 + - **CustomDomain** (str) - 自定义域名 + - **CustomDomainError** (str) - 自定义域名签发错误信息 + - **CustomDomainStatus** (str) - 自定义域名签发状态 + - **Envs** (list) - 站点环境变量。格式：key=value + - **Host** (str) - 站点访问地址 + - **ID** (str) - 站点ID + - **IPAccess** (dict) - 见 **SiteIPAccess** 模型定义 + - **KeyID** (str) - 站点Key ID + - **Name** (str) - 名称 + - **Ready** (bool) - 是否就绪 + - **SandboxID** (str) - 沙箱ID + - **UpdateTime** (int) - 更新时间 + + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.GetSandboxSiteRequestSchema().dumps(d) + + resp = self.invoke("GetSandboxSite", d, **kwargs) + return apis.GetSandboxSiteResponseSchema().loads(resp) + + def list_sandbox_sites( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """ListSandboxSites - 列出站点空间 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + + **Response** + + - **CustomTargetDomain** (str) - 目标域名地址 + - **Sites** (list) - 见 **Site** 模型定义 + + **Response Model** + + **SiteIPAccess** + - **IPList** (list) - IP 列表 + - **Mode** (str) - IP限制模式"":不限制IP“allow”:自定义白名单“deny”:自定义黑名单 + + + **Site** + - **AccessCode** (str) - 访问码 + - **ConnectKey** (str) - 连接密钥 + - **CustomDomain** (str) - 自定义域名 + - **CustomDomainError** (str) - 自定义域名签发错误信息 + - **CustomDomainStatus** (str) - 自定义域名签发状态 + - **Envs** (list) - 站点环境变量。格式：["key=value"] + - **Host** (str) - 站点访问地址 + - **ID** (str) - 站点ID + - **IPAccess** (dict) - 见 **SiteIPAccess** 模型定义 + - **KeyID** (str) - 站点Key ID + - **Name** (str) - 名称 + - **Ready** (bool) - 是否就绪 + - **SandboxID** (str) - 沙箱ID + - **UpdateTime** (int) - 更新时间 + + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.ListSandboxSitesRequestSchema().dumps(d) + + resp = self.invoke("ListSandboxSites", d, **kwargs) + return apis.ListSandboxSitesResponseSchema().loads(resp) + + def update_sandbox_site( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """UpdateSandboxSite - 更新站点空间 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **SandboxID** (str) - (Required) 站点沙箱ID + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + - **APIKey** (str) - 更新站点空间API Key + - **AccessCode** (str) - 访问码 + - **Envs** (str) - 更新站点空间环境变量，格式为["Key=Value"] + - **IPAccess** (dict) - 见 **UpdateSandboxSiteParamIPAccess** 模型定义 + - **KeyID** (str) - 更新站点空间Key ID（需要和APIKey一起传） + - **Name** (str) - 更新站点空间名称 + + **Response** + + + **Request Model** + + **UpdateSandboxSiteParamIPAccess** + - **IPList** (str) - 访问限制IP，格式["192.168.1.2","192.168.1.3"] + - **Mode** (str) - 访问模式，- ""：无IP限制- "allow":白名单模式- "deny":黑名单 + + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.UpdateSandboxSiteRequestSchema().dumps(d) + + resp = self.invoke("UpdateSandboxSite", d, **kwargs) + return apis.UpdateSandboxSiteResponseSchema().loads(resp) + + def update_sandbox_site_custom_domain( + self, req: typing.Optional[dict] = None, **kwargs + ) -> dict: + """UpdateSandboxSiteCustomDomain - 更新沙箱站点自定义域名 + + **Request** + + - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ + - **CustomDomain** (str) - (Required) 自定义域名 + - **SandboxID** (str) - (Required) 沙箱ID + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ + + **Response** + + + """ + # build request + d = { + "ProjectId": self.config.project_id, + "Region": self.config.region, + } + req and d.update(req) + d = apis.UpdateSandboxSiteCustomDomainRequestSchema().dumps(d) + + resp = self.invoke("UpdateSandboxSiteCustomDomain", d, **kwargs) + return apis.UpdateSandboxSiteCustomDomainResponseSchema().loads(resp) diff --git a/ucloud/services/sandbox/schemas/__init__.py b/ucloud/services/sandbox/schemas/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/ucloud/services/sandbox/schemas/apis.py b/ucloud/services/sandbox/schemas/apis.py new file mode 100644 index 00000000..a0612559 --- /dev/null +++ b/ucloud/services/sandbox/schemas/apis.py @@ -0,0 +1,209 @@ +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ + +from ucloud.core.typesystem import schema, fields +from ucloud.services.sandbox.schemas import models + +""" sandbox API Schema +""" + + +""" +API: CheckSandboxCustomDomain + +检查自定义域名 +""" + + +class CheckSandboxCustomDomainRequestSchema(schema.RequestSchema): + """CheckSandboxCustomDomain - 检查自定义域名""" + + fields = { + "CustomDomain": fields.Str(required=True, dump_to="CustomDomain"), + "Get": fields.Bool(required=False, dump_to="Get"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "TargetDomain": fields.Str(required=True, dump_to="TargetDomain"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class CheckSandboxCustomDomainResponseSchema(schema.ResponseSchema): + """CheckSandboxCustomDomain - 检查自定义域名""" + + fields = { + "Status": fields.Str(required=True, load_from="Status"), + } + + +""" +API: CreateSandboxSite + +创建站点空间 +""" + + +class CreateSandboxSiteRequestSchema(schema.RequestSchema): + """CreateSandboxSite - 创建站点空间""" + + fields = { + "APIKey": fields.Str(required=True, dump_to="APIKey"), + "AccessCode": fields.Str(required=True, dump_to="AccessCode"), + "Envs": fields.Str(required=False, dump_to="Envs"), + "KeyID": fields.Str(required=True, dump_to="KeyID"), + "Name": fields.Str(required=True, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class CreateSandboxSiteResponseSchema(schema.ResponseSchema): + """CreateSandboxSite - 创建站点空间""" + + fields = {} + + +""" +API: DeleteSandboxSite + +删除站点空间 +""" + + +class DeleteSandboxSiteRequestSchema(schema.RequestSchema): + """DeleteSandboxSite - 删除站点空间""" + + fields = { + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SandboxID": fields.Str(required=True, dump_to="SandboxID"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class DeleteSandboxSiteResponseSchema(schema.ResponseSchema): + """DeleteSandboxSite - 删除站点空间""" + + fields = {} + + +""" +API: GetSandboxSite + +获取沙箱站点 +""" + + +class GetSandboxSiteRequestSchema(schema.RequestSchema): + """GetSandboxSite - 获取沙箱站点""" + + fields = { + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SandboxID": fields.Str(required=True, dump_to="SandboxID"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class GetSandboxSiteResponseSchema(schema.ResponseSchema): + """GetSandboxSite - 获取沙箱站点""" + + fields = { + "Site": models.SiteSchema(), + } + + +""" +API: ListSandboxSites + +列出站点空间 +""" + + +class ListSandboxSitesRequestSchema(schema.RequestSchema): + """ListSandboxSites - 列出站点空间""" + + fields = { + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class ListSandboxSitesResponseSchema(schema.ResponseSchema): + """ListSandboxSites - 列出站点空间""" + + fields = { + "CustomTargetDomain": fields.Str( + required=False, load_from="CustomTargetDomain" + ), + "Sites": fields.List( + models.SiteSchema(), required=True, load_from="Sites" + ), + } + + +""" +API: UpdateSandboxSite + +更新站点空间 +""" + + +class UpdateSandboxSiteParamIPAccessSchema(schema.RequestSchema): + """UpdateSandboxSiteParamIPAccess -""" + + fields = { + "IPList": fields.Str(required=False, dump_to="IPList"), + "Mode": fields.Str(required=False, dump_to="Mode"), + } + + +class UpdateSandboxSiteRequestSchema(schema.RequestSchema): + """UpdateSandboxSite - 更新站点空间""" + + fields = { + "APIKey": fields.Str(required=False, dump_to="APIKey"), + "AccessCode": fields.Str(required=False, dump_to="AccessCode"), + "Envs": fields.Str(required=False, dump_to="Envs"), + "IPAccess": UpdateSandboxSiteParamIPAccessSchema( + required=False, dump_to="IPAccess" + ), + "KeyID": fields.Str(required=False, dump_to="KeyID"), + "Name": fields.Str(required=False, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SandboxID": fields.Str(required=True, dump_to="SandboxID"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class UpdateSandboxSiteResponseSchema(schema.ResponseSchema): + """UpdateSandboxSite - 更新站点空间""" + + fields = {} + + +""" +API: UpdateSandboxSiteCustomDomain + +更新沙箱站点自定义域名 +""" + + +class UpdateSandboxSiteCustomDomainRequestSchema(schema.RequestSchema): + """UpdateSandboxSiteCustomDomain - 更新沙箱站点自定义域名""" + + fields = { + "CustomDomain": fields.Str(required=True, dump_to="CustomDomain"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SandboxID": fields.Str(required=True, dump_to="SandboxID"), + "Zone": fields.Str(required=True, dump_to="Zone"), + } + + +class UpdateSandboxSiteCustomDomainResponseSchema(schema.ResponseSchema): + """UpdateSandboxSiteCustomDomain - 更新沙箱站点自定义域名""" + + fields = {} diff --git a/ucloud/services/sandbox/schemas/models.py b/ucloud/services/sandbox/schemas/models.py new file mode 100644 index 00000000..1e343884 --- /dev/null +++ b/ucloud/services/sandbox/schemas/models.py @@ -0,0 +1,37 @@ +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ + +from ucloud.core.typesystem import schema, fields + + +class SiteIPAccessSchema(schema.ResponseSchema): + """SiteIPAccess - 站点空间-访问设置-IP限制""" + + fields = { + "IPList": fields.List(fields.Str()), + "Mode": fields.Str(required=False, load_from="Mode"), + } + + +class SiteSchema(schema.ResponseSchema): + """Site - 站点空间""" + + fields = { + "AccessCode": fields.Str(required=True, load_from="AccessCode"), + "ConnectKey": fields.Str(required=True, load_from="ConnectKey"), + "CustomDomain": fields.Str(required=False, load_from="CustomDomain"), + "CustomDomainError": fields.Str( + required=False, load_from="CustomDomainError" + ), + "CustomDomainStatus": fields.Str( + required=False, load_from="CustomDomainStatus" + ), + "Envs": fields.List(fields.Str()), + "Host": fields.Str(required=True, load_from="Host"), + "ID": fields.Str(required=True, load_from="ID"), + "IPAccess": SiteIPAccessSchema(), + "KeyID": fields.Str(required=True, load_from="KeyID"), + "Name": fields.Str(required=True, load_from="Name"), + "Ready": fields.Bool(required=True, load_from="Ready"), + "SandboxID": fields.Str(required=True, load_from="SandboxID"), + "UpdateTime": fields.Int(required=True, load_from="UpdateTime"), + } diff --git a/ucloud/services/uwsc/client.py b/ucloud/services/uwsc/client.py index db516193..b7ecc6e7 100644 --- a/ucloud/services/uwsc/client.py +++ b/ucloud/services/uwsc/client.py @@ -130,13 +130,6 @@ def create_ce_tunnel( **Request Model** - **CreateCETunnelParamDPDConf** - - **Action** (str) - DPD超时后的动作,Enable为1（开启）时有效。可取值为clear（断开）、restart（重试）和 trap（流量触发） - - **Delay** (int) - DPD探测间隔时间。dpdEnable为1（开启）时有效。单位为秒，默认为 10 - - **Enabled** (int) - 是否开启 DPD（对等体存活检测）功能。取值：0（关闭）、1（开启） - - **Timeout** (int) - DPD超时时间。即探测确认对端不存在需要的时间。dpdEnable为1（开启）时有效。单位为秒。取值范围为 30-60（IKEv2 默认为 0） - - **CreateCETunnelParamIKEConf** - **AuthenticationAlgorithm** (str) - IKE 认证算法，取值："md5", "sha1", "sha2-256" - **DhGroup** (str) - DH group，指定IKE交换密钥时使用的DH组。取值："1", "2", "5", "14", "15", "16" @@ -149,14 +142,6 @@ def create_ce_tunnel( - **Version** (str) - IKE 版本，取值： "ike v1"，"ike v2" - **CreateCETunnelParamBGPConf** - - **LocalAsn** (str) - Ucloud侧的自治系统号。 - - **LocalIp** (str) - 云端BGP地址。必须从BGP隧道网段内分配。 - - **PeerAsn** (str) - 对端BGP ASN号。 - - **PeerIp** (str) - 用户端BGP地址。必须从BGP隧道网段内分配。 - - **TunnelCidr** (str) - BGP隧道网段。该网段需是一个在 169.254.0.0/16 内的掩码长度为 30 的网段。 - - **CreateCETunnelParamIPSecConf** - **AuthenticationAlgorithm** (str) - 第二阶段协商的认证算法。取值：md5、sha1、sha2-256。 - **CENetwork** (list) - 需要和 VPC 互通的本地数据中心侧的网段，用于第二阶段协商。 @@ -167,6 +152,21 @@ def create_ce_tunnel( - **SALifetimeBytes** (str) - 第二阶段协商出的 SA 的生存周期。单位：字节 KB。取值范围：8000 – 20000000，默认使用SA超时时间 + **CreateCETunnelParamBGPConf** + - **LocalAsn** (str) - Ucloud侧的自治系统号。 + - **LocalIp** (str) - 云端BGP地址。必须从BGP隧道网段内分配。 + - **PeerAsn** (str) - 对端BGP ASN号。 + - **PeerIp** (str) - 用户端BGP地址。必须从BGP隧道网段内分配。 + - **TunnelCidr** (str) - BGP隧道网段。该网段需是一个在 169.254.0.0/16 内的掩码长度为 30 的网段。 + + + **CreateCETunnelParamDPDConf** + - **Action** (str) - DPD超时后的动作,Enable为1（开启）时有效。可取值为clear（断开）、restart（重试）和 trap（流量触发） + - **Delay** (int) - DPD探测间隔时间。dpdEnable为1（开启）时有效。单位为秒，默认为 10 + - **Enabled** (int) - 是否开启 DPD（对等体存活检测）功能。取值：0（关闭）、1（开启） + - **Timeout** (int) - DPD超时时间。即探测确认对端不存在需要的时间。dpdEnable为1（开启）时有效。单位为秒。取值范围为 30-60（IKEv2 默认为 0） + + """ # build request d = { @@ -516,6 +516,25 @@ def describe_ce_tunnel( **Response Model** + **IKEConf** + - **AuthenticationAlgorithm** (str) - 认证算法 + - **DhGroup** (str) - 分组信息 + - **EncryptionAlgorithm** (str) - 加密算法 + - **ExchangeMode** (str) - 协商模式 + - **LocalId** (str) - 本端标识 + - **PreSharedKey** (str) - 预共享密钥 + - **RemoteId** (str) - 对端标识 + - **SALifeTime** (str) - IKE SA的生存周期 + - **Version** (str) - 版本 + + + **DPDConf** + - **Action** (str) - DPD 行为 + - **Delay** (int) - DPD 探测间隔时间 + - **Enabled** (int) - 是否开启 DPD + - **Timeout** (int) - DPD 探测超时时间 + + **IPSecConf** - **AuthenticationAlgorithm** (str) - 认证算法 - **CENetwork** (list) - 客户网段 @@ -534,25 +553,6 @@ def describe_ce_tunnel( - **TunnelCidr** (str) - BGP隧道网段 - **DPDConf** - - **Action** (str) - DPD 行为 - - **Delay** (int) - DPD 探测间隔时间 - - **Enabled** (int) - 是否开启 DPD - - **Timeout** (int) - DPD 探测超时时间 - - - **IKEConf** - - **AuthenticationAlgorithm** (str) - 认证算法 - - **DhGroup** (str) - 分组信息 - - **EncryptionAlgorithm** (str) - 加密算法 - - **ExchangeMode** (str) - 协商模式 - - **LocalId** (str) - 本端标识 - - **PreSharedKey** (str) - 预共享密钥 - - **RemoteId** (str) - 对端标识 - - **SALifeTime** (str) - IKE SA的生存周期 - - **Version** (str) - 版本 - - **VPNTunnelInfo** - **BGPConf** (dict) - 见 **BGPConf** 模型定义 - **CloseAction** (str) - 隧道关闭后动作 @@ -743,17 +743,6 @@ def describe_popgw( **Response Model** - **UGNBWInfo** - - **UGNBWId** (str) - UGN带宽包ID - - **UGNBWName** (str) - UGN带宽包名称 - - - **UGNInfo** - - **UGNBWInfos** (list) - 见 **UGNBWInfo** 模型定义 - - **UGNId** (str) - 云联网 ID - - **UGNName** (str) - 云联网名称 - - **BWPackageInfo** - **BandWidth** (float) - 最大带宽值 - **BwId** (str) - UWAN 网关带宽 ID @@ -765,6 +754,17 @@ def describe_popgw( - **Remark** (str) - 备注 + **UGNBWInfo** + - **UGNBWId** (str) - UGN带宽包ID + - **UGNBWName** (str) - UGN带宽包名称 + + + **UGNInfo** + - **UGNBWInfos** (list) - 见 **UGNBWInfo** 模型定义 + - **UGNId** (str) - 云联网 ID + - **UGNName** (str) - 云联网名称 + + **POPGWInfo** - **BWPackageInfo** (dict) - 见 **BWPackageInfo** 模型定义 - **CENum** (int) - 客户网关数量 @@ -904,13 +904,6 @@ def update_ce_tunnel( **Request Model** - **UpdateCETunnelParamDPDConf** - - **Action** (str) - DPD超时后的动作,Enable为1（开启）时有效。可取值为clear（断开）、restart（重试）和 trap（流量触发） - - **Delay** (str) - DPD探测间隔时间。dpdEnable为1（开启）时有效。单位为秒，默认为 10 - - **Enabled** (str) - 是否开启 DPD（对等体存活检测）功能。取值：0（关闭）、1（开启） - - **Timeout** (str) - DPD超时时间。即探测确认对端不存在需要的时间。dpdEnable为1（开启）时有效。单位为秒。取值范围为 30-60（IKEv2 默认为 0） - - **UpdateCETunnelParamIKEConf** - **AuthenticationAlgorithm** (str) - IKE 认证算法，取值："md5", "sha1", "sha2-256" - **DhGroup** (str) - DH group，指定IKE交换密钥时使用的DH组。取值："1", "2", "5", "14", "15", "16" @@ -923,14 +916,6 @@ def update_ce_tunnel( - **Version** (str) - IKE 版本，取值： "ike v1"，"ike v2" - **UpdateCETunnelParamBGPConf** - - **LocalAsn** (str) - Ucloud侧的自治系统号。 - - **LocalIp** (str) - 云端BGP地址。必须从BGP隧道网段内分配。 - - **PeerAsn** (str) - 对端BGP ASN号。 - - **PeerIp** (str) - 用户端BGP地址。必须从BGP隧道网段内分配。 - - **TunnelCidr** (str) - BGP隧道网段。该网段需是一个在 169.254.0.0/16 内的掩码长度为 30 的网段。 - - **UpdateCETunnelParamIPSecConf** - **AuthenticationAlgorithm** (str) - 第二阶段协商的认证算法。取值：md5、sha1、sha2-256。 - **CENetwork** (list) - 需要和 VPC 互通的本地数据中心侧的网段，用于第二阶段协商。 @@ -941,6 +926,21 @@ def update_ce_tunnel( - **SALifetimeBytes** (str) - 第二阶段协商出的 SA 的生存周期。单位：字节 KB。取值范围：8000 – 20000000，默认使用SA超时时间 + **UpdateCETunnelParamDPDConf** + - **Action** (str) - DPD超时后的动作,Enable为1（开启）时有效。可取值为clear（断开）、restart（重试）和 trap（流量触发） + - **Delay** (str) - DPD探测间隔时间。dpdEnable为1（开启）时有效。单位为秒，默认为 10 + - **Enabled** (str) - 是否开启 DPD（对等体存活检测）功能。取值：0（关闭）、1（开启） + - **Timeout** (str) - DPD超时时间。即探测确认对端不存在需要的时间。dpdEnable为1（开启）时有效。单位为秒。取值范围为 30-60（IKEv2 默认为 0） + + + **UpdateCETunnelParamBGPConf** + - **LocalAsn** (str) - Ucloud侧的自治系统号。 + - **LocalIp** (str) - 云端BGP地址。必须从BGP隧道网段内分配。 + - **PeerAsn** (str) - 对端BGP ASN号。 + - **PeerIp** (str) - 用户端BGP地址。必须从BGP隧道网段内分配。 + - **TunnelCidr** (str) - BGP隧道网段。该网段需是一个在 169.254.0.0/16 内的掩码长度为 30 的网段。 + + """ # build request d = { diff --git a/ucloud/services/uwsc/schemas/apis.py b/ucloud/services/uwsc/schemas/apis.py index b1564f79..a03ef3ce 100644 --- a/ucloud/services/uwsc/schemas/apis.py +++ b/ucloud/services/uwsc/schemas/apis.py @@ -96,17 +96,6 @@ class CreateCEGatewayResponseSchema(schema.ResponseSchema): """ -class CreateCETunnelParamDPDConfSchema(schema.RequestSchema): - """CreateCETunnelParamDPDConf -""" - - fields = { - "Action": fields.Str(required=False, dump_to="Action"), - "Delay": fields.Int(required=False, dump_to="Delay"), - "Enabled": fields.Int(required=True, dump_to="Enabled"), - "Timeout": fields.Int(required=False, dump_to="Timeout"), - } - - class CreateCETunnelParamIKEConfSchema(schema.RequestSchema): """CreateCETunnelParamIKEConf -""" @@ -127,18 +116,6 @@ class CreateCETunnelParamIKEConfSchema(schema.RequestSchema): } -class CreateCETunnelParamBGPConfSchema(schema.RequestSchema): - """CreateCETunnelParamBGPConf -""" - - fields = { - "LocalAsn": fields.Str(required=False, dump_to="LocalAsn"), - "LocalIp": fields.Str(required=False, dump_to="LocalIp"), - "PeerAsn": fields.Str(required=False, dump_to="PeerAsn"), - "PeerIp": fields.Str(required=False, dump_to="PeerIp"), - "TunnelCidr": fields.Str(required=False, dump_to="TunnelCidr"), - } - - class CreateCETunnelParamIPSecConfSchema(schema.RequestSchema): """CreateCETunnelParamIPSecConf -""" @@ -159,6 +136,29 @@ class CreateCETunnelParamIPSecConfSchema(schema.RequestSchema): } +class CreateCETunnelParamBGPConfSchema(schema.RequestSchema): + """CreateCETunnelParamBGPConf -""" + + fields = { + "LocalAsn": fields.Str(required=False, dump_to="LocalAsn"), + "LocalIp": fields.Str(required=False, dump_to="LocalIp"), + "PeerAsn": fields.Str(required=False, dump_to="PeerAsn"), + "PeerIp": fields.Str(required=False, dump_to="PeerIp"), + "TunnelCidr": fields.Str(required=False, dump_to="TunnelCidr"), + } + + +class CreateCETunnelParamDPDConfSchema(schema.RequestSchema): + """CreateCETunnelParamDPDConf -""" + + fields = { + "Action": fields.Str(required=False, dump_to="Action"), + "Delay": fields.Int(required=False, dump_to="Delay"), + "Enabled": fields.Int(required=True, dump_to="Enabled"), + "Timeout": fields.Int(required=False, dump_to="Timeout"), + } + + class CreateCETunnelRequestSchema(schema.RequestSchema): """CreateCETunnel - 创建隧道""" @@ -722,17 +722,6 @@ class UpdateCEGatewayResponseSchema(schema.ResponseSchema): """ -class UpdateCETunnelParamDPDConfSchema(schema.RequestSchema): - """UpdateCETunnelParamDPDConf -""" - - fields = { - "Action": fields.Str(required=False, dump_to="Action"), - "Delay": fields.Str(required=False, dump_to="Delay"), - "Enabled": fields.Str(required=False, dump_to="Enabled"), - "Timeout": fields.Str(required=False, dump_to="Timeout"), - } - - class UpdateCETunnelParamIKEConfSchema(schema.RequestSchema): """UpdateCETunnelParamIKEConf -""" @@ -753,18 +742,6 @@ class UpdateCETunnelParamIKEConfSchema(schema.RequestSchema): } -class UpdateCETunnelParamBGPConfSchema(schema.RequestSchema): - """UpdateCETunnelParamBGPConf -""" - - fields = { - "LocalAsn": fields.Str(required=False, dump_to="LocalAsn"), - "LocalIp": fields.Str(required=False, dump_to="LocalIp"), - "PeerAsn": fields.Str(required=False, dump_to="PeerAsn"), - "PeerIp": fields.Str(required=False, dump_to="PeerIp"), - "TunnelCidr": fields.Str(required=False, dump_to="TunnelCidr"), - } - - class UpdateCETunnelParamIPSecConfSchema(schema.RequestSchema): """UpdateCETunnelParamIPSecConf -""" @@ -785,6 +762,29 @@ class UpdateCETunnelParamIPSecConfSchema(schema.RequestSchema): } +class UpdateCETunnelParamDPDConfSchema(schema.RequestSchema): + """UpdateCETunnelParamDPDConf -""" + + fields = { + "Action": fields.Str(required=False, dump_to="Action"), + "Delay": fields.Str(required=False, dump_to="Delay"), + "Enabled": fields.Str(required=False, dump_to="Enabled"), + "Timeout": fields.Str(required=False, dump_to="Timeout"), + } + + +class UpdateCETunnelParamBGPConfSchema(schema.RequestSchema): + """UpdateCETunnelParamBGPConf -""" + + fields = { + "LocalAsn": fields.Str(required=False, dump_to="LocalAsn"), + "LocalIp": fields.Str(required=False, dump_to="LocalIp"), + "PeerAsn": fields.Str(required=False, dump_to="PeerAsn"), + "PeerIp": fields.Str(required=False, dump_to="PeerIp"), + "TunnelCidr": fields.Str(required=False, dump_to="TunnelCidr"), + } + + class UpdateCETunnelRequestSchema(schema.RequestSchema): """UpdateCETunnel - 更新隧道配置""" diff --git a/ucloud/services/uwsc/schemas/models.py b/ucloud/services/uwsc/schemas/models.py index c8cbeacd..d30d94eb 100644 --- a/ucloud/services/uwsc/schemas/models.py +++ b/ucloud/services/uwsc/schemas/models.py @@ -21,26 +21,6 @@ class VPNInfoSchema(schema.ResponseSchema): } -class IKEConfSchema(schema.ResponseSchema): - """IKEConf - IKE配置信息""" - - fields = { - "AuthenticationAlgorithm": fields.Str( - required=False, load_from="AuthenticationAlgorithm" - ), - "DhGroup": fields.Str(required=False, load_from="DhGroup"), - "EncryptionAlgorithm": fields.Str( - required=False, load_from="EncryptionAlgorithm" - ), - "ExchangeMode": fields.Str(required=False, load_from="ExchangeMode"), - "LocalId": fields.Str(required=False, load_from="LocalId"), - "PreSharedKey": fields.Str(required=False, load_from="PreSharedKey"), - "RemoteId": fields.Str(required=False, load_from="RemoteId"), - "SALifeTime": fields.Str(required=False, load_from="SALifeTime"), - "Version": fields.Str(required=False, load_from="Version"), - } - - class IPSecConfSchema(schema.ResponseSchema): """IPSecConf - IPSec配置信息""" @@ -61,6 +41,17 @@ class IPSecConfSchema(schema.ResponseSchema): } +class DPDConfSchema(schema.ResponseSchema): + """DPDConf - DPD 配置""" + + fields = { + "Action": fields.Str(required=True, load_from="Action"), + "Delay": fields.Int(required=True, load_from="Delay"), + "Enabled": fields.Int(required=True, load_from="Enabled"), + "Timeout": fields.Int(required=True, load_from="Timeout"), + } + + class BGPConfSchema(schema.ResponseSchema): """BGPConf - CE隧道 BGP配置""" @@ -73,14 +64,23 @@ class BGPConfSchema(schema.ResponseSchema): } -class DPDConfSchema(schema.ResponseSchema): - """DPDConf - DPD 配置""" +class IKEConfSchema(schema.ResponseSchema): + """IKEConf - IKE配置信息""" fields = { - "Action": fields.Str(required=True, load_from="Action"), - "Delay": fields.Int(required=True, load_from="Delay"), - "Enabled": fields.Int(required=True, load_from="Enabled"), - "Timeout": fields.Int(required=True, load_from="Timeout"), + "AuthenticationAlgorithm": fields.Str( + required=False, load_from="AuthenticationAlgorithm" + ), + "DhGroup": fields.Str(required=False, load_from="DhGroup"), + "EncryptionAlgorithm": fields.Str( + required=False, load_from="EncryptionAlgorithm" + ), + "ExchangeMode": fields.Str(required=False, load_from="ExchangeMode"), + "LocalId": fields.Str(required=False, load_from="LocalId"), + "PreSharedKey": fields.Str(required=False, load_from="PreSharedKey"), + "RemoteId": fields.Str(required=False, load_from="RemoteId"), + "SALifeTime": fields.Str(required=False, load_from="SALifeTime"), + "Version": fields.Str(required=False, load_from="Version"), } @@ -182,6 +182,21 @@ class WhiteListInfoSchema(schema.ResponseSchema): } +class BWPackageInfoSchema(schema.ResponseSchema): + """BWPackageInfo - UWAN虚拟路由器带宽包信息""" + + fields = { + "BandWidth": fields.Float(required=False, load_from="BandWidth"), + "BwId": fields.Str(required=False, load_from="BwId"), + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "DueTime": fields.Int(required=False, load_from="DueTime"), + "Name": fields.Str(required=False, load_from="Name"), + "PayMode": fields.Str(required=False, load_from="PayMode"), + "PublicIp": fields.Str(required=False, load_from="PublicIp"), + "Remark": fields.Str(required=False, load_from="Remark"), + } + + class UGNBWInfoSchema(schema.ResponseSchema): """UGNBWInfo - UGN带宽包信息""" @@ -201,21 +216,6 @@ class UGNInfoSchema(schema.ResponseSchema): } -class BWPackageInfoSchema(schema.ResponseSchema): - """BWPackageInfo - UWAN虚拟路由器带宽包信息""" - - fields = { - "BandWidth": fields.Float(required=False, load_from="BandWidth"), - "BwId": fields.Str(required=False, load_from="BwId"), - "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "DueTime": fields.Int(required=False, load_from="DueTime"), - "Name": fields.Str(required=False, load_from="Name"), - "PayMode": fields.Str(required=False, load_from="PayMode"), - "PublicIp": fields.Str(required=False, load_from="PublicIp"), - "Remark": fields.Str(required=False, load_from="Remark"), - } - - class POPGWInfoSchema(schema.ResponseSchema): """POPGWInfo - UWAN虚拟路由器信息""" diff --git a/ucloud/version.py b/ucloud/version.py index 7fb94202..0d2df480 100644 --- a/ucloud/version.py +++ b/ucloud/version.py @@ -1 +1 @@ -version = "0.11.122" +version = "0.11.123"