diff --git a/docs/quick_start.rst b/docs/quick_start.rst index 2bcfc1d..bfc0176 100644 --- a/docs/quick_start.rst +++ b/docs/quick_start.rst @@ -53,7 +53,7 @@ You can then use your keys to create a new client of uhost service: 'Type': 'CLOUD_SSD' }], }) - except exc.UCloudException as e + except exc.UCloudException as e: print(e) else: print(resp) diff --git a/examples/uhost/main.py b/examples/uhost/main.py index 6d07e5c..5e87696 100644 --- a/examples/uhost/main.py +++ b/examples/uhost/main.py @@ -36,7 +36,7 @@ def main(): 'Memory': 1024, 'Disks': [{ 'Size': image["ImageSize"], - 'Type': 'CLOUD_NORMAL', + 'Type': 'CLOUD_SSD', 'IsBoot': 'True', }], }) diff --git a/tests/test_core/test_client.py b/tests/test_core/test_client.py index 56ceef0..9872d02 100644 --- a/tests/test_core/test_client.py +++ b/tests/test_core/test_client.py @@ -4,7 +4,7 @@ import pytest import logging from ucloud.core.client import Client -from ucloud.core.testing import env +from ucloud.testing import env logger = logging.getLogger(__name__) diff --git a/tests/test_core/test_schema.py b/tests/test_core/test_schema.py index 8611cc2..33ba2af 100644 --- a/tests/test_core/test_schema.py +++ b/tests/test_core/test_schema.py @@ -1,46 +1,131 @@ # -*- coding: utf-8 -*- import logging +import pytest +from ucloud.core import exc from ucloud.core.typesystem import fields, schema logger = logging.getLogger(__name__) -def test_array(): - class TestSchema(schema.RequestSchema): +def test_request_array(): + class Schema(schema.RequestSchema): fields = {"IP": fields.List(fields.Str())} - ret = TestSchema().dumps({"IP": ["127.0.0.1"]}) - assert ret.get("IP.0") == "127.0.0.1" - assert ret.get("IP") is None - assert ret.get("IP.1") is None + d = Schema().dumps({"IP": ["127.0.0.1"]}) + assert d == {"IP.0": "127.0.0.1"} + d = Schema().dumps({}) + assert d == {} -def test_array_model(): - class TestSchema(schema.RequestSchema): +def test_request_array_with_default(): + class Schema(schema.RequestSchema): fields = {"IP": fields.List(fields.Str(), default=["127.0.0.1"])} - class TestArrayModel(schema.RequestSchema): - fields = {"Interface": TestSchema()} + d = Schema().dumps({"IP": ["192.168.0.1"]}) + assert d == {"IP.0": "192.168.0.1"} + d = Schema().dumps({}) + assert d == {"IP.0": "127.0.0.1"} - class TestArrayModelArray(schema.RequestSchema): - fields = {"Interface": fields.List(TestSchema(), default=list)} - d = {"Interface": {"IP": ["127.0.0.1", "192.168.0.1"]}} - ret = TestArrayModel().dumps(d) - assert ret.get("Interface.IP.0") == "127.0.0.1" - assert ret.get("Interface.IP.1") == "192.168.0.1" +def test_request_object_model(): + class Schema(schema.RequestSchema): + fields = {"IP": fields.List(fields.Str())} + + class NestedObjectSchema(schema.RequestSchema): + fields = {"Interface": Schema()} + + d = NestedObjectSchema().dumps({"Interface": {"IP": ["127.0.0.1"]}}) + assert d == {"Interface.IP.0": "127.0.0.1"} + with pytest.raises(exc.ValidationException): + NestedObjectSchema().dumps({"Interface": 1}) + + +def test_request_array_model_with_default(): + class Schema(schema.RequestSchema): + fields = {"IP": fields.List(fields.Str())} + + class NestedArraySchema(schema.RequestSchema): + fields = { + "Interface": fields.List( + Schema(default=lambda: "127.0.0.1"), + default=lambda: [{"IP": ["192.168.1.1"]}], + ) + } + + d = NestedArraySchema().dumps({}) + assert d == {"Interface.0.IP.0": "192.168.1.1"} + d = {"Interface": [{"IP": ["127.0.0.1", "192.168.0.1"]}, {"IP": ["172.16.0.1"]}]} + d = NestedArraySchema().dumps(d) + assert d == { + "Interface.0.IP.0": "127.0.0.1", + "Interface.0.IP.1": "192.168.0.1", + "Interface.1.IP.0": "172.16.0.1", + } + + +def test_response_array(): + class Schema(schema.ResponseSchema): + fields = {"IP": fields.List(fields.Str())} + + d = Schema().loads({}) + assert d == {"IP": []} + d = Schema().loads({"IP": ["127.0.0.1"]}) + assert d == {"IP": ["127.0.0.1"]} + with pytest.raises(exc.ValidationException): + Schema().loads({"IP": 1}) + + +def test_response_array_with_default(): + class Schema(schema.ResponseSchema): + fields = {"IP": fields.List(fields.Str(), default=["127.0.0.1"])} + + d = Schema().dumps({"IP": ["192.168.0.1"]}) + assert d == {"IP": ["192.168.0.1"]} + d = Schema().dumps({}) + assert d == {"IP": ["127.0.0.1"]} + + +def test_response_object_model(): + class Schema(schema.ResponseSchema): + fields = {"IP": fields.List(fields.Str())} + + class NestedObjectSchema(schema.ResponseSchema): + fields = {"EIP": Schema()} + + d = NestedObjectSchema().loads({"EIP": {"IP": ["127.0.0.1"]}}) + assert d == {"EIP": {"IP": ["127.0.0.1"]}} + d = NestedObjectSchema().loads({}) + assert d == {"EIP": {"IP": []}} + + +def test_response_object_model_case_insensitive(): + class Schema(schema.ResponseSchema): + fields = {"IP": fields.List(fields.Str())} + + class NestedObjectSchema(schema.ResponseSchema): + fields = {"EIP": Schema()} + + d = NestedObjectSchema().loads({"eip": {"Ip": ["127.0.0.1"]}}) + assert d == {"EIP": {"IP": ["127.0.0.1"]}} + + +def test_response_array_model_with_default(): + class Schema(schema.ResponseSchema): + fields = {"IP": fields.List(fields.Str())} + + class NestedArraySchema(schema.ResponseSchema): + fields = { + "Interface": fields.List( + Schema(default=lambda: {"IP": ["127.0.0.1"]}), + default=lambda: [{"IP": ["192.168.1.1"]}], + ) + } + + d = NestedArraySchema().dumps({}) + assert d == {"Interface": [{"IP": ["192.168.1.1"]}]} d = {"Interface": [{"IP": ["127.0.0.1", "192.168.0.1"]}, {"IP": ["172.16.0.1"]}]} - ret = TestArrayModelArray().dumps(d) - assert ret.get("Interface.0.IP.0") == "127.0.0.1" - assert ret.get("Interface.0.IP.1") == "192.168.0.1" - assert ret.get("Interface.1.IP.0") == "172.16.0.1" - d = {} - ret = TestArrayModelArray().dumps(d) - assert ret.get("Interface") is None - d = {"Interface": [{"IP": None}]} - ret = TestArrayModelArray().dumps(d) - assert ret.get("Interface.0.IP.0") == "127.0.0.1" - d = {"Interface": [{}]} - ret = TestArrayModelArray().dumps(d) - assert ret.get("Interface.0.IP.0") == "127.0.0.1" + d = NestedArraySchema().dumps(d) + assert d == { + "Interface": [{"IP": ["127.0.0.1", "192.168.0.1"]}, {"IP": ["172.16.0.1"]}] + } diff --git a/tests/test_services/conftest.py b/tests/test_services/conftest.py new file mode 100644 index 0000000..675eaae --- /dev/null +++ b/tests/test_services/conftest.py @@ -0,0 +1,28 @@ +# -*- coding: utf-8 -*- + +import os +import pytest +from ucloud.client import Client + + +@pytest.fixture(scope="session", autouse=True) +def client(): + return Client( + { + "region": os.getenv("UCLOUD_REGION"), + "project_id": os.getenv("UCLOUD_PROJECT_ID"), + "public_key": os.getenv("UCLOUD_PUBLIC_KEY"), + "private_key": os.getenv("UCLOUD_PRIVATE_KEY"), + "max_retries": 3, + "timeout": 60, + } + ) + + +@pytest.fixture(scope="module", autouse=True) +def variables(): + return { + "Region": "cn-bj2", + "Zone": "cn-bj2-05", + "ProjectId": os.getenv("UCLOUD_PROJECT_ID"), + } diff --git a/tests/test_testing/__init__.py b/tests/test_testing/__init__.py new file mode 100644 index 0000000..4c48b5a --- /dev/null +++ b/tests/test_testing/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/tests/test_testing/test_utest.py b/tests/test_testing/test_utest.py new file mode 100644 index 0000000..d2c4135 --- /dev/null +++ b/tests/test_testing/test_utest.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- + +import pytest +from ucloud.testing import utest + + +def test_value_at_path(): + d = { + "Action": "DescribeEIPResponse", + "EIPSet": [ + { + "Resource": { + "ResourceID": "uhost-war3png3", + "ResourceName": "eip-s1-bgp", + "ResourceType": "uhost", + "Zone": "cn-bj2-05", + } + } + ], + "RetCode": 0, + "TotalBandwidth": 6, + "TotalCount": 3, + } + assert utest.value_at_path(d, "EIPSet.0.Resource.ResourceID") == "uhost-war3png3" diff --git a/ucloud/client.py b/ucloud/client.py index 7c19b09..0ed2543 100644 --- a/ucloud/client.py +++ b/ucloud/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core import client @@ -8,15 +9,10 @@ def __init__(self, config, transport=None, middleware=None): self._config = config super(Client, self).__init__(config, transport, middleware) - def umem(self): - from ucloud.services.umem.client import UMemClient - - return UMemClient(self._config, self.transport, self.middleware, self.logger) - - def unet(self): - from ucloud.services.unet.client import UNetClient + def pathx(self): + from ucloud.services.pathx.client import PathXClient - return UNetClient(self._config, self.transport, self.middleware, self.logger) + return PathXClient(self._config, self.transport, self.middleware, self.logger) def uaccount(self): from ucloud.services.uaccount.client import UAccountClient @@ -25,25 +21,40 @@ def uaccount(self): self._config, self.transport, self.middleware, self.logger ) - def udisk(self): - from ucloud.services.udisk.client import UDiskClient + def udb(self): + from ucloud.services.udb.client import UDBClient - return UDiskClient(self._config, self.transport, self.middleware, self.logger) + return UDBClient(self._config, self.transport, self.middleware, self.logger) def udpn(self): from ucloud.services.udpn.client import UDPNClient return UDPNClient(self._config, self.transport, self.middleware, self.logger) + def udisk(self): + from ucloud.services.udisk.client import UDiskClient + + return UDiskClient(self._config, self.transport, self.middleware, self.logger) + def uhost(self): from ucloud.services.uhost.client import UHostClient return UHostClient(self._config, self.transport, self.middleware, self.logger) - def pathx(self): - from ucloud.services.pathx.client import PathXClient + def ulb(self): + from ucloud.services.ulb.client import ULBClient - return PathXClient(self._config, self.transport, self.middleware, self.logger) + return ULBClient(self._config, self.transport, self.middleware, self.logger) + + def umem(self): + from ucloud.services.umem.client import UMemClient + + return UMemClient(self._config, self.transport, self.middleware, self.logger) + + def unet(self): + from ucloud.services.unet.client import UNetClient + + return UNetClient(self._config, self.transport, self.middleware, self.logger) def uphost(self): from ucloud.services.uphost.client import UPHostClient @@ -54,13 +65,3 @@ def vpc(self): from ucloud.services.vpc.client import VPCClient return VPCClient(self._config, self.transport, self.middleware, self.logger) - - def udb(self): - from ucloud.services.udb.client import UDBClient - - return UDBClient(self._config, self.transport, self.middleware, self.logger) - - def ulb(self): - from ucloud.services.ulb.client import ULBClient - - return ULBClient(self._config, self.transport, self.middleware, self.logger) diff --git a/ucloud/core/client/_client.py b/ucloud/core/client/_client.py index abead56..fe2a1f5 100644 --- a/ucloud/core/client/_client.py +++ b/ucloud/core/client/_client.py @@ -93,10 +93,10 @@ def _build_http_request(self, args): return Request( url=self.config.base_url, method="post", - json=payload, + data=payload, headers={ "User-Agent": self._build_user_agent(), - "Content-Type": "application/json", + "Content-Type": "application/x-www-form-urlencoded", }, ) @@ -106,3 +106,6 @@ def _build_user_agent(self): python_version=python_version, sdk_version=version.version ) + (self.config.user_agent or "") return user_agent + + def __repr__(self): + return "<{}('{}')>".format(self.__class__.__name__, self.config.region) diff --git a/ucloud/core/exc/_exc.py b/ucloud/core/exc/_exc.py index 83d632e..d916edd 100644 --- a/ucloud/core/exc/_exc.py +++ b/ucloud/core/exc/_exc.py @@ -26,6 +26,9 @@ def retryable(self): def __str__(self): return "{self.action} - {self.code}: {self.message}".format(self=self) + def json(self): + return {"RetCode": self.code, "Message": self.message, "Action": self.action} + class RetryTimeoutException(UCloudException): pass diff --git a/ucloud/core/typesystem/abstract.py b/ucloud/core/typesystem/abstract.py index 45603d9..d2eec8d 100644 --- a/ucloud/core/typesystem/abstract.py +++ b/ucloud/core/typesystem/abstract.py @@ -1,15 +1,24 @@ # -*- coding: utf-8 -*- +from ucloud.core import exc + class Field(object): def __init__( - self, required=False, default=None, dump_to=None, load_from=None, **kwargs + self, + required=False, + default=None, + dump_to=None, + load_from=None, + strict=None, + **kwargs ): self.required = required self.default = default self.dump_to = dump_to self.load_from = load_from self.options = kwargs + self.strict = bool(strict) def dumps(self, value, **kwargs): raise NotImplementedError @@ -17,21 +26,40 @@ def dumps(self, value, **kwargs): def loads(self, value, **kwargs): raise NotImplementedError + @staticmethod + def fail(name, expected, got): + msg = "invalid field {}, expect {}, got {}".format(name, expected, got) + raise exc.ValidationException(msg) + class Schema(object): fields = {} def __init__( - self, required=False, default=None, dump_to=None, load_from=None, **kwargs + self, + required=False, + default=dict, + dump_to=None, + load_from=None, + strict=False, + case_sensitive=False, + **kwargs ): self.required = required self.default = default self.dump_to = dump_to self.load_from = load_from self.options = kwargs + self.strict = strict + self.case_sensitive = case_sensitive def dumps(self, d): raise NotImplementedError def loads(self, d): raise NotImplementedError + + @staticmethod + def fail(name, expected, got): + msg = "invalid schema {}, expect {}, got {}".format(name, expected, got) + raise exc.ValidationException(msg) diff --git a/ucloud/core/typesystem/fields.py b/ucloud/core/typesystem/fields.py index 15a7222..71b1fde 100644 --- a/ucloud/core/typesystem/fields.py +++ b/ucloud/core/typesystem/fields.py @@ -1,130 +1,129 @@ -# -*- coding: utf-8 -*- - -import base64 -import collections -from ucloud.core.utils import compact -from ucloud.core.typesystem import abstract -from ucloud.core.exc import ValidationException - - -class List(abstract.Field): - """ array param is the custom field to parse custom param such as: - - - IP.N - - UDisk.N.Size - - NetInterface.N.EIP.Bandwidth - """ - - def __init__(self, item, required=False, **kwargs): - super(List, self).__init__(required=required, **kwargs) - self.item = item - - def dumps(self, value, name=None, **kwargs): - if not isinstance(value, collections.Iterable): - raise ValidationException( - "invalid field {}, expect list, got {}".format(name, type(value)) - ) - errors = [] - values = [] - for each in value: - try: - v = self.item.dumps(each) - except ValidationException as e: - errors.extend(e.errors) - else: - values.append(v) - if len(errors) > 0: - raise ValidationException(errors) - return values - - def loads(self, value, name=None, **kwargs): - if not isinstance(value, collections.Iterable): - raise ValidationException( - "invalid field {}, expect list, got {}".format(name, type(value)) - ) - errors = [] - values = [] - for each in value: - try: - v = self.item.loads(each) - except ValidationException as e: - errors.extend(e.errors) - else: - values.append(v) - if len(errors) > 0: - raise ValidationException(errors) - return values - - -class Str(abstract.Field): - def dumps(self, value, name=None, **kwargs): - if not isinstance(value, compact.string_types): - raise ValidationException( - "invalid field {}, expect str, got {}".format(name, type(value)) - ) - return value - - def loads(self, value, name=None, **kwargs): - if not isinstance(value, compact.string_types): - raise ValidationException( - "invalid field {}, expect str, got {}".format(name, type(value)) - ) - return value - - -class Base64(Str): - def dumps(self, value, name=None, **kwargs): - s = super(Base64, self).dumps(value, name) - return base64.b64encode(s.encode()).decode() - - def loads(self, value, name=None, **kwargs): - s = super(Base64, self).loads(value, name) - return base64.b64decode(s.encode()).decode() - - -class Int(abstract.Field): - def dumps(self, value, name=None, **kwargs): - if not isinstance(value, int): - raise ValidationException( - "invalid field {}, expect int, got {}".format(name, type(value)) - ) - return int(value) - - def loads(self, value, name=None, **kwargs): - if not isinstance(value, int): - raise ValidationException( - "invalid field {}, expect int, got {}".format(name, type(value)) - ) - return int(value) - - -class Float(abstract.Field): - def dumps(self, value, name=None, **kwargs): - if not isinstance(value, float): - raise ValidationException( - "invalid field {}, expect float, got {}".format(name, type(value)) - ) - return float(value) - - def loads(self, value, name=None, **kwargs): - if not isinstance(value, float): - raise ValidationException( - "invalid field {}, expect float, got {}".format(name, type(value)) - ) - return float(value) - - -class Bool(abstract.Field): - def dumps(self, value, name=None, **kwargs): - if not isinstance(value, bool): - raise ValidationException( - "invalid field {}, expect bool, got {}".format(name, type(value)) - ) - return bool(value) - - def loads(self, value, name=None, **kwargs): - if not isinstance(value, bool): - raise ValidationException( - "invalid field {}, expect bool, got {}".format(name, type(value)) - ) - return bool(value) +# -*- coding: utf-8 -*- + +import base64 +import collections +from ucloud.core.typesystem import abstract +from ucloud.core.exc import ValidationException + + +class List(abstract.Field): + """ array param is the custom field to parse custom param such as: + + - IP.N + - UDisk.N.Size + - NetInterface.N.EIP.Bandwidth + """ + + def __init__(self, item, default=list, **kwargs): + super(List, self).__init__(default=default, **kwargs) + self.item = item + + def dumps(self, value, name=None, **kwargs): + if not isinstance(value, collections.Iterable): + raise ValidationException( + "invalid field {}, expect list, got {}".format(name, type(value)) + ) + errors = [] + values = [] + for each in value: + try: + v = self.item.dumps(each) + except ValidationException as e: + errors.extend(e.errors) + else: + values.append(v) + if len(errors) > 0: + raise ValidationException(errors) + return values + + def loads(self, value, name=None, **kwargs): + if not isinstance(value, collections.Iterable): + raise ValidationException( + "invalid field {}, expect list, got {}".format(name, type(value)) + ) + errors = [] + values = [] + for each in value: + try: + v = self.item.loads(each) + except ValidationException as e: + errors.extend(e.errors) + else: + values.append(v) + if len(errors) > 0: + raise ValidationException(errors) + return values + + +class Str(abstract.Field): + def dumps(self, value, name=None, **kwargs): + return self._convert(value, name) + + def loads(self, value, name=None, **kwargs): + return self._convert(value, name) + + def _convert(self, value, name=None): + if self.strict and not isinstance(value, str): + self.fail(name, "str", type(value)) + try: + return unicode(value) + except ValueError: + self.fail(name, "str", type(value)) + + +class Base64(Str): + def dumps(self, value, name=None, **kwargs): + s = super(Base64, self).dumps(value, name) + return base64.b64encode(s.encode()).decode() + + def loads(self, value, name=None, **kwargs): + s = super(Base64, self).loads(value, name) + return base64.b64decode(s.encode()).decode() + + +class Int(abstract.Field): + def dumps(self, value, name=None, **kwargs): + return self._convert(value, name) + + def loads(self, value, name=None, **kwargs): + return self._convert(value, name) + + def _convert(self, value, name=None): + if self.strict and not isinstance(value, int): + self.fail(name, "int", type(value)) + try: + return int(value) + except ValueError: + self.fail(name, "int", type(value)) + + +class Float(abstract.Field): + def dumps(self, value, name=None, **kwargs): + return self._convert(value, name) + + def loads(self, value, name=None, **kwargs): + return self._convert(value, name) + + def _convert(self, value, name=None): + if self.strict and not isinstance(value, float): + self.fail(name, "float", type(value)) + try: + return float(value) + except ValueError: + self.fail(name, "float", type(value)) + + +class Bool(abstract.Field): + def dumps(self, value, name=None, **kwargs): + return self._convert(value, name) + + def loads(self, value, name=None, **kwargs): + return self._convert(value, name) + + def _convert(self, value, name=None): + if self.strict and not isinstance(value, bool): + self.fail(name, "bool", type(value)) + try: + return bool(value) + except ValueError: + self.fail(name, "bool", type(value)) diff --git a/ucloud/core/typesystem/schema.py b/ucloud/core/typesystem/schema.py index 62fe99b..d3f3c99 100644 --- a/ucloud/core/typesystem/schema.py +++ b/ucloud/core/typesystem/schema.py @@ -1,9 +1,12 @@ # -*- coding: utf-8 -*- +import logging from ucloud.core.typesystem import abstract, fields from ucloud.core.exc import ValidationException from ucloud.core.utils import compact +logger = logging.getLogger(__name__) + class Schema(abstract.Schema): fields = {} @@ -38,8 +41,18 @@ def dumps(self, d, name=None, **kwargs): def loads(self, d, name=None, **kwargs): result = {} errors = [] + if not self.case_sensitive: + d = {k.lower(): v for k, v in d.items()} for k, field in self.fields.items(): - v = d.get(field.load_from or k) + load_key = field.load_from or k + v = d.get(load_key if self.case_sensitive else load_key.lower()) + if v is None: + if field.default is None: + continue + if isinstance(field.default, compact.Callable): + v = field.default() + else: + v = field.default try: serialized = field.loads(v, name=k) except ValidationException as e: @@ -55,6 +68,10 @@ class RequestSchema(Schema): fields = {} def dumps(self, d, name=None, **kwargs): + if not isinstance(d, dict): + raise ValidationException( + "invalid field {}, expect dict, got {}".format(name, type(d)) + ) result = {} errors = [] for k, field in self.fields.items(): @@ -97,17 +114,4 @@ def dumps(self, d, name=None, **kwargs): class ResponseSchema(Schema): - def loads(self, d, name=None, **kwargs): - result = {} - errors = [] - for k, field in self.fields.items(): - v = d.get(field.load_from or k) - if v is None: - continue - try: - serialized = field.loads(v, name=k) - except ValidationException as e: - errors.extend(e.errors) - continue - result[k] = serialized - return result + pass diff --git a/ucloud/services/pathx/client.py b/ucloud/services/pathx/client.py index bea2a51..010c09e 100644 --- a/ucloud/services/pathx/client.py +++ b/ucloud/services/pathx/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.pathx.schemas import apis @@ -25,8 +26,8 @@ def create_global_ssh_instance(self, req=None, **kwargs): **Response** - - **InstanceId** (str) - 实例ID，资源唯一标识 - **AcceleratingDomain** (str) - 加速域名，访问该域名可就近接入 + - **InstanceId** (str) - 实例ID，资源唯一标识 - **Message** (str) - 提示信息 """ @@ -73,9 +74,9 @@ def describe_global_ssh_area(self, req=None, **kwargs): **GlobalSSHArea** + - **Area** (str) - GlobalSSH覆盖的地区,如香港、东京、洛杉矶等 - **AreaCode** (str) - 地区代号,以地区AirPort Code - **RegionSet** (list) - ucloud机房代号构成的数组，如["hk","us-ca"] - - **Area** (str) - GlobalSSH覆盖的地区,如香港、东京、洛杉矶等 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -100,15 +101,15 @@ def describe_global_ssh_instance(self, req=None, **kwargs): **GlobalSSHInfo** - - **TargetIP** (str) - 被SSH访问的EIP - - **Port** (int) - SSH登陆端口 - - **ChargeType** (str) - 支付周期，如Month,Year等 - **AcceleratingDomain** (str) - 加速域名 - **Area** (str) - 被SSH访问的IP所在地区 - - **Remark** (str) - 备注信息 + - **ChargeType** (str) - 支付周期，如Month,Year等 - **CreateTime** (int) - 资源创建时间戳 - **ExpireTime** (int) - 资源过期时间戳 - **InstanceId** (str) - 实例ID，资源唯一标识 + - **Port** (int) - SSH登陆端口 + - **Remark** (str) - 备注信息 + - **TargetIP** (str) - 被SSH访问的EIP """ d = {"ProjectId": self.config.project_id} diff --git a/ucloud/services/pathx/schemas/apis.py b/ucloud/services/pathx/schemas/apis.py index 8c9b0af..a6786fe 100644 --- a/ucloud/services/pathx/schemas/apis.py +++ b/ucloud/services/pathx/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.pathx.schemas import models @@ -17,15 +18,15 @@ class CreateGlobalSSHInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Area": fields.Str(required=True, dump_to="Area"), + "AreaCode": fields.Str(required=True, dump_to="AreaCode"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "CouponId": fields.Str(required=False, dump_to="CouponId"), - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Port": fields.Int(required=True, dump_to="Port"), - "AreaCode": fields.Str(required=True, dump_to="AreaCode"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), "Remark": fields.Str(required=False, dump_to="Remark"), - "Area": fields.Str(required=True, dump_to="Area"), "TargetIP": fields.Str(required=True, dump_to="TargetIP"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), } @@ -34,10 +35,10 @@ class CreateGlobalSSHInstanceResponseSchema(schema.ResponseSchema): """ fields = { - "InstanceId": fields.Str(required=True, load_from="InstanceId"), "AcceleratingDomain": fields.Str( required=False, load_from="AcceleratingDomain" ), + "InstanceId": fields.Str(required=True, load_from="InstanceId"), "Message": fields.Str(required=False, load_from="Message"), } @@ -54,8 +55,8 @@ class DeleteGlobalSSHInstanceRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "InstanceId": fields.Str(required=True, dump_to="InstanceId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), } @@ -78,8 +79,8 @@ class DescribeGlobalSSHAreaRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=False, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=False, dump_to="Region"), } @@ -107,8 +108,8 @@ class DescribeGlobalSSHInstanceRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "InstanceId": fields.Str(required=False, dump_to="InstanceId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), } @@ -135,9 +136,9 @@ class ModifyGlobalSSHPortRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "InstanceId": fields.Str(required=True, dump_to="InstanceId"), "Port": fields.Int(required=True, dump_to="Port"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), } @@ -160,8 +161,8 @@ class ModifyGlobalSSHRemarkRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "InstanceId": fields.Str(required=True, dump_to="InstanceId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Remark": fields.Str(required=False, dump_to="Remark"), } diff --git a/ucloud/services/pathx/schemas/models.py b/ucloud/services/pathx/schemas/models.py index 1e0a75f..5e724a5 100644 --- a/ucloud/services/pathx/schemas/models.py +++ b/ucloud/services/pathx/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -19,13 +20,13 @@ class GlobalSSHInfoSchema(schema.ResponseSchema): """ fields = { - "Port": fields.Int(required=True, load_from="Port"), + "AcceleratingDomain": fields.Str(required=True, load_from="AcceleratingDomain"), + "Area": fields.Str(required=True, load_from="Area"), "ChargeType": fields.Str(required=True, load_from="ChargeType"), "CreateTime": fields.Int(required=True, load_from="CreateTime"), "ExpireTime": fields.Int(required=True, load_from="ExpireTime"), "InstanceId": fields.Str(required=True, load_from="InstanceId"), - "AcceleratingDomain": fields.Str(required=True, load_from="AcceleratingDomain"), - "Area": fields.Str(required=True, load_from="Area"), - "TargetIP": fields.Str(required=True, load_from="TargetIP"), + "Port": fields.Int(required=True, load_from="Port"), "Remark": fields.Str(required=True, load_from="Remark"), + "TargetIP": fields.Str(required=True, load_from="TargetIP"), } diff --git a/ucloud/services/uaccount/client.py b/ucloud/services/uaccount/client.py index 770883a..b6ab9dc 100644 --- a/ucloud/services/uaccount/client.py +++ b/ucloud/services/uaccount/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.uaccount.schemas import apis @@ -32,7 +33,7 @@ def get_project_list(self, req=None, **kwargs): **Request** - - **IsFinance** (str) - 是否是财务账号(Yes: 是, No: 否) + - **IsFinance** (str) - 是否是财务账号 **Response** @@ -43,14 +44,14 @@ def get_project_list(self, req=None, **kwargs): **ProjectListInfo** - - **ResourceCount** (int) - 项目下资源数量 + - **CreateTime** (int) - 创建时间(Unix时间戳) + - **IsDefault** (bool) - 是否为默认项目 - **MemberCount** (int) - 项目下成员数量 - - **ProjectId** (str) - 项目ID - - **ProjectName** (str) - 项目名称 - **ParentId** (str) - 父项目ID - **ParentName** (str) - 父项目名称 - - **CreateTime** (int) - 创建时间(Unix时间戳) - - **IsDefault** (bool) - 是否为默认项目 + - **ProjectId** (str) - 项目ID + - **ProjectName** (str) - 项目名称 + - **ResourceCount** (int) - 项目下资源数量 """ d = {} @@ -73,12 +74,12 @@ def get_region(self, req=None, **kwargs): **RegionInfo** + - **BitMaps** (str) - 用户在此数据中心的权限位 + - **IsDefault** (bool) - 是否用户当前默认数据中心 - **Region** (str) - 地域名字，如cn-bj - - **Zone** (str) - 可用区名字，如cn-bj-01 - **RegionId** (int) - 数据中心ID - **RegionName** (str) - 数据中心名称 - - **IsDefault** (bool) - 是否用户当前默认数据中心 - - **BitMaps** (str) - 用户在此数据中心的权限位 + - **Zone** (str) - 可用区名字，如cn-bj-01 """ d = {} @@ -102,21 +103,21 @@ def get_user_info(self, req=None, **kwargs): **UserInfo** - **Admin** (int) - 是否超级管理员 0:否 1:是 - - **Finance** (int) - 是否有财务权限 0:否 1:是 - - **UserEmail** (str) - 用户邮箱 - - **UserType** (int) - 会员类型 - - **Province** (str) - 省份 + - **Administrator** (str) - 管理员 - **AuthState** (str) - 实名认证状态 - - **UserId** (int) - 用户Id - - **PhonePrefix** (str) - 国际号码前缀 + - **City** (str) - 城市 - **CompanyName** (str) - 公司名称 + - **Finance** (int) - 是否有财务权限 0:否 1:是 - **IndustryType** (int) - 所属行业 - - **City** (str) - 城市 + - **PhonePrefix** (str) - 国际号码前缀 + - **Province** (str) - 省份 - **UserAddress** (str) - 公司地址 - - **UserPhone** (str) - 用户手机 + - **UserEmail** (str) - 用户邮箱 + - **UserId** (int) - 用户Id - **UserName** (str) - 称呼 + - **UserPhone** (str) - 用户手机 + - **UserType** (int) - 会员类型 - **UserVersion** (int) - 是否子帐户(大于100为子帐户) - - **Administrator** (str) - 管理员 """ d = {} @@ -148,7 +149,7 @@ def terminate_project(self, req=None, **kwargs): **Request** - - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ + - **ProjectId** (str) - (Config) 项目ID，不填写为默认项目，子帐号必须填写。 **Response** diff --git a/ucloud/services/uaccount/schemas/apis.py b/ucloud/services/uaccount/schemas/apis.py index 4a74615..b3631ee 100644 --- a/ucloud/services/uaccount/schemas/apis.py +++ b/ucloud/services/uaccount/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.uaccount.schemas import models diff --git a/ucloud/services/uaccount/schemas/models.py b/ucloud/services/uaccount/schemas/models.py index a22c6d2..8279748 100644 --- a/ucloud/services/uaccount/schemas/models.py +++ b/ucloud/services/uaccount/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -8,14 +9,14 @@ class ProjectListInfoSchema(schema.ResponseSchema): """ fields = { - "ParentId": fields.Str(required=True, load_from="ParentId"), - "ParentName": fields.Str(required=True, load_from="ParentName"), "CreateTime": fields.Int(required=True, load_from="CreateTime"), "IsDefault": fields.Bool(required=True, load_from="IsDefault"), - "ResourceCount": fields.Int(required=True, load_from="ResourceCount"), "MemberCount": fields.Int(required=True, load_from="MemberCount"), + "ParentId": fields.Str(required=True, load_from="ParentId"), + "ParentName": fields.Str(required=True, load_from="ParentName"), "ProjectId": fields.Str(required=True, load_from="ProjectId"), "ProjectName": fields.Str(required=True, load_from="ProjectName"), + "ResourceCount": fields.Int(required=True, load_from="ResourceCount"), } @@ -24,12 +25,12 @@ class RegionInfoSchema(schema.ResponseSchema): """ fields = { - "RegionName": fields.Str(required=True, load_from="RegionName"), - "IsDefault": fields.Bool(required=True, load_from="IsDefault"), "BitMaps": fields.Str(required=True, load_from="BitMaps"), + "IsDefault": fields.Bool(required=True, load_from="IsDefault"), "Region": fields.Str(required=True, load_from="Region"), - "Zone": fields.Str(required=True, load_from="Zone"), "RegionId": fields.Int(required=True, load_from="RegionId"), + "RegionName": fields.Str(required=True, load_from="RegionName"), + "Zone": fields.Str(required=True, load_from="Zone"), } @@ -38,20 +39,20 @@ class UserInfoSchema(schema.ResponseSchema): """ fields = { - "UserType": fields.Int(required=True, load_from="UserType"), - "City": fields.Str(required=True, load_from="City"), - "UserVersion": fields.Int(required=True, load_from="UserVersion"), - "AuthState": fields.Str(required=True, load_from="AuthState"), - "UserEmail": fields.Str(required=True, load_from="UserEmail"), - "UserPhone": fields.Str(required=True, load_from="UserPhone"), - "PhonePrefix": fields.Str(required=True, load_from="PhonePrefix"), - "UserName": fields.Str(required=True, load_from="UserName"), - "CompanyName": fields.Str(required=True, load_from="CompanyName"), "Admin": fields.Int(required=True, load_from="Admin"), "Administrator": fields.Str(required=True, load_from="Administrator"), - "UserId": fields.Int(required=True, load_from="UserId"), + "AuthState": fields.Str(required=True, load_from="AuthState"), + "City": fields.Str(required=True, load_from="City"), + "CompanyName": fields.Str(required=True, load_from="CompanyName"), + "Finance": fields.Int(required=True, load_from="Finance"), "IndustryType": fields.Int(required=True, load_from="IndustryType"), + "PhonePrefix": fields.Str(required=True, load_from="PhonePrefix"), "Province": fields.Str(required=True, load_from="Province"), "UserAddress": fields.Str(required=True, load_from="UserAddress"), - "Finance": fields.Int(required=True, load_from="Finance"), + "UserEmail": fields.Str(required=True, load_from="UserEmail"), + "UserId": fields.Int(required=True, load_from="UserId"), + "UserName": fields.Str(required=True, load_from="UserName"), + "UserPhone": fields.Str(required=True, load_from="UserPhone"), + "UserType": fields.Int(required=True, load_from="UserType"), + "UserVersion": fields.Int(required=True, load_from="UserVersion"), } diff --git a/ucloud/services/udb/client.py b/ucloud/services/udb/client.py index 62d2d0e..9d23f60 100644 --- a/ucloud/services/udb/client.py +++ b/ucloud/services/udb/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.udb.schemas import apis @@ -469,18 +470,18 @@ def describe_udb_backup(self, req=None, **kwargs): **UDBBackupSet** - - **DBId** (str) - dbid - **BackupEndTime** (int) - 备份完成时间(Unix时间戳) - - **BackupTime** (int) - 备份时间(Unix时间戳) + - **BackupId** (int) - 备份id + - **BackupName** (str) - 备份名称 - **BackupSize** (int) - 备份文件大小(字节) + - **BackupTime** (int) - 备份时间(Unix时间戳) - **BackupType** (int) - 备份类型,取值为0或1,0表示自动，1表示手动 - - **State** (str) - 备份状态 Backuping // 备份中 Success // 备份成功 Failed // 备份失败 Expired // 备份过期 - - **ErrorInfo** (str) - 备份错误信息 - - **DBName** (str) - 对应的db名称 - **BackupZone** (str) - 跨机房高可用备库所在可用区 + - **DBId** (str) - dbid + - **DBName** (str) - 对应的db名称 + - **ErrorInfo** (str) - 备份错误信息 + - **State** (str) - 备份状态 Backuping // 备份中 Success // 备份成功 Failed // 备份失败 Expired // 备份过期 - **Zone** (str) - 备份所在可用区 - - **BackupId** (int) - 备份id - - **BackupName** (str) - 备份名称 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -557,83 +558,83 @@ def describe_udb_instance(self, req=None, **kwargs): **UDBSlaveInstanceSet** - - **VirtualIPMac** (str) - DB实例虚ip的mac地址 - - **CreateTime** (int) - DB实例创建时间，采用UTC计时时间戳 - - **SubnetId** (str) - 子网ID + - **AdminUser** (str) - 管理员帐户名，默认root + - **BackupBeginTime** (int) - 备份策略，不可修改，开始时间，单位小时计，默认3点 - **BackupBlacklist** (str) - 备份策略，备份黑名单，mongodb则不适用 - - **ModifyTime** (int) - DB实例修改时间，采用UTC计时时间戳 - - **UseSSD** (bool) - 是否使用SSD - - **InstanceTypeId** (int) - UDB数据库机型ID - - **Tag** (str) - 获取资源其他信息 - - **Zone** (str) - 可用区 - - **DBId** (str) - DB实例id - **BackupCount** (int) - 备份策略，不可修改，备份文件保留的数量，默认7次 - - **SystemFileSize** (float) - DB实例系统文件大小，单位GB - - **VPCId** (str) - VPC的ID - - **State** (str) - DB状态标记 Init：初始化中，Fail：安装失败，Starting：启动中，Running：运行，Shutdown：关闭中，Shutoff：已关闭，Delete：已删除，Upgrading：升级中，Promoting：提升为独库进行中，Recovering：恢复中，Recover fail：恢复失败 - - **SSDType** (str) - SSD类型，SATA/PCI-E - - **Role** (str) - DB实例角色，mysql区分master/slave，mongodb多种角色 + - **BackupDate** (str) - 备份日期标记位。共7位,每一位为一周中一天的备份情况 0表示关闭当天备份,1表示打开当天备份。最右边的一位 为星期天的备份开关，其余从右到左依次为星期一到星期 六的备份配置开关，每周必须至少设置两天备份。 例如：1100000 表示打开星期六和星期五的自动备份功能 + - **BackupDuration** (int) - 备份策略，一天内备份时间间隔，单位小时，默认24小时 + - **ChargeType** (str) - Year， Month， Dynamic，Trial，默认: Dynamic - **ClusterRole** (str) - 当DB类型为mongodb时，返回该实例所在集群中的角色，包括：mongos、configsrv_sccc、configsrv_csrs、shardsrv_datanode、shardsrv_arbiter，其中congfigsrv分为sccc和csrs两种模式，shardsrv分为datanode和arbiter两种模式 - - **ParamGroupId** (int) - DB实例使用的配置参数组id + - **CreateTime** (int) - DB实例创建时间，采用UTC计时时间戳 + - **DBId** (str) - DB实例id + - **DBTypeId** (str) - DB类型id，mysql/mongodb按版本细分各有一个id 目前id的取值范围为[1,7],数值对应的版本如下： 1：mysql-5.5，2：mysql-5.1，3：percona-5.5 4：mongodb-2.4，5：mongodb-2.6，6：mysql-5.6， 7：percona-5.6 - **DataFileSize** (float) - DB实例数据文件大小，单位GB - - **BackupDate** (str) - 备份日期标记位。共7位,每一位为一周中一天的备份情况 0表示关闭当天备份,1表示打开当天备份。最右边的一位 为星期天的备份开关，其余从右到左依次为星期一到星期 六的备份配置开关，每周必须至少设置两天备份。 例如：1100000 表示打开星期六和星期五的自动备份功能 + - **DiskSpace** (int) - 磁盘空间(GB), 默认根据配置机型 - **DiskUsedSize** (float) - DB实例磁盘已使用空间，单位GB - - **LogFileSize** (float) - DB实例日志文件大小，单位GB + - **ExpiredTime** (int) - DB实例过期时间，采用UTC计时时间戳 - **InstanceMode** (str) - UDB实例模式类型, 可选值如下: "Normal": 普通版UDB实例;"HA": 高可用版UDB实例 - - **DiskSpace** (int) - 磁盘空间(GB), 默认根据配置机型 - **InstanceType** (str) - UDB数据库机型 + - **InstanceTypeId** (int) - UDB数据库机型ID + - **LogFileSize** (float) - DB实例日志文件大小，单位GB + - **MemoryLimit** (int) - 内存限制(MB)，默认根据配置机型 + - **ModifyTime** (int) - DB实例修改时间，采用UTC计时时间戳 - **Name** (str) - 实例名称，至少6位 - - **BackupDuration** (int) - 备份策略，一天内备份时间间隔，单位小时，默认24小时 - - **ExpiredTime** (int) - DB实例过期时间，采用UTC计时时间戳 - - **VirtualIP** (str) - DB实例虚ip + - **ParamGroupId** (int) - DB实例使用的配置参数组id - **Port** (int) - 端口号，mysql默认3306，mongodb默认27017 - - **ChargeType** (str) - Year， Month， Dynamic，Trial，默认: Dynamic - - **BackupBeginTime** (int) - 备份策略，不可修改，开始时间，单位小时计，默认3点 - - **MemoryLimit** (int) - 内存限制(MB)，默认根据配置机型 - - **DBTypeId** (str) - DB类型id，mysql/mongodb按版本细分各有一个id 目前id的取值范围为[1,7],数值对应的版本如下： 1：mysql-5.5，2：mysql-5.1，3：percona-5.5 4：mongodb-2.4，5：mongodb-2.6，6：mysql-5.6， 7：percona-5.6 - - **AdminUser** (str) - 管理员帐户名，默认root + - **Role** (str) - DB实例角色，mysql区分master/slave，mongodb多种角色 + - **SSDType** (str) - SSD类型，SATA/PCI-E - **SrcDBId** (str) - 对mysql的slave而言是master的DBId，对master则为空， 对mongodb则是副本集id + - **State** (str) - DB状态标记 Init：初始化中，Fail：安装失败，Starting：启动中，Running：运行，Shutdown：关闭中，Shutoff：已关闭，Delete：已删除，Upgrading：升级中，Promoting：提升为独库进行中，Recovering：恢复中，Recover fail：恢复失败 + - **SubnetId** (str) - 子网ID + - **SystemFileSize** (float) - DB实例系统文件大小，单位GB + - **Tag** (str) - 获取资源其他信息 + - **UseSSD** (bool) - 是否使用SSD + - **VPCId** (str) - VPC的ID + - **VirtualIP** (str) - DB实例虚ip + - **VirtualIPMac** (str) - DB实例虚ip的mac地址 + - **Zone** (str) - 可用区 **UDBInstanceSet** - - **Role** (str) - DB实例角色，mysql区分master/slave，mongodb多种角色 - - **SubnetId** (str) - 子网ID - - **InstanceTypeId** (int) - UDB数据库机型ID + - **AdminUser** (str) - 管理员帐户名，默认root + - **BackupBeginTime** (int) - 备份策略，不可修改，开始时间，单位小时计，默认3点 + - **BackupBlacklist** (str) - 备份策略，备份黑名单，mongodb则不适用 + - **BackupCount** (int) - 备份策略，不可修改，备份文件保留的数量，默认7次 + - **BackupDate** (str) - 备份日期标记位。共7位,每一位为一周中一天的备份情况 0表示关闭当天备份,1表示打开当天备份。最右边的一位 为星期天的备份开关，其余从右到左依次为星期一到星期 六的备份配置开关，每周必须至少设置两天备份。 例如：1100000 表示打开星期六和星期五的自动备份功能 + - **BackupDuration** (int) - 备份策略，一天内备份时间间隔，单位小时，默认24小时 + - **BackupZone** (str) - 跨可用区高可用备库所在可用区 + - **ChargeType** (str) - Year， Month， Dynamic，Trial，默认: Dynamic + - **CluserRole** (str) - 当DB类型为mongodb时，返回该实例所在集群中的角色，包括：mongos、configsrv_sccc、configsrv_csrs、shardsrv_datanode、shardsrv_arbiter，其中congfigsrv分为sccc和csrs两种模式，shardsrv分为datanode和arbiter两种模式 + - **CreateTime** (int) - DB实例创建时间，采用UTC计时时间戳 + - **DBId** (str) - DB实例id + - **DBTypeId** (str) - DB类型id，mysql/mongodb按版本细分各有一个id 目前id的取值范围为[1,7],数值对应的版本如下： 1：mysql-5.5，2：mysql-5.1，3：percona-5.5 4：mongodb-2.4，5：mongodb-2.6，6：mysql-5.6， 7：percona-5.6 + - **DataFileSize** (float) - DB实例数据文件大小，单位GB + - **DataSet** (list) - 见 **UDBSlaveInstanceSet** 模型定义 - **DiskSpace** (int) - 磁盘空间(GB), 默认根据配置机型 - - **State** (str) - DB状态标记 Init：初始化中，Fail：安装失败，Starting：启动中，Running：运行，Shutdown：关闭中，Shutoff：已关闭，Delete：已删除，Upgrading：升级中，Promoting：提升为独库进行中，Recovering：恢复中，Recover fail：恢复失败 + - **DiskUsedSize** (float) - DB实例磁盘已使用空间，单位GB + - **ExpiredTime** (int) - DB实例过期时间，采用UTC计时时间戳 + - **InstanceMode** (str) - UDB实例模式类型, 可选值如下: “Normal”： 普通版UDB实例 “HA”: 高可用版UDB实例 + - **InstanceType** (str) - UDB数据库机型 + - **InstanceTypeId** (int) - UDB数据库机型ID + - **LogFileSize** (float) - DB实例日志文件大小，单位GB + - **MemoryLimit** (int) - 内存限制(MB)，默认根据配置机型 - **ModifyTime** (int) - DB实例修改时间，采用UTC计时时间戳 - - **ChargeType** (str) - Year， Month， Dynamic，Trial，默认: Dynamic + - **Name** (str) - 实例名称，至少6位 + - **ParamGroupId** (int) - DB实例使用的配置参数组id - **Port** (int) - 端口号，mysql默认3306，mongodb默认27017 + - **Role** (str) - DB实例角色，mysql区分master/slave，mongodb多种角色 + - **SSDType** (str) - SSD类型，SATA/PCI-E - **SrcDBId** (str) - 对mysql的slave而言是master的DBId，对master则为空， 对mongodb则是副本集id - - **BackupCount** (int) - 备份策略，不可修改，备份文件保留的数量，默认7次 + - **State** (str) - DB状态标记 Init：初始化中，Fail：安装失败，Starting：启动中，Running：运行，Shutdown：关闭中，Shutoff：已关闭，Delete：已删除，Upgrading：升级中，Promoting：提升为独库进行中，Recovering：恢复中，Recover fail：恢复失败 + - **SubnetId** (str) - 子网ID - **SystemFileSize** (float) - DB实例系统文件大小，单位GB - - **LogFileSize** (float) - DB实例日志文件大小，单位GB - - **Name** (str) - 实例名称，至少6位 - - **ParamGroupId** (int) - DB实例使用的配置参数组id - - **VPCId** (str) - VPC的ID - - **DataSet** (list) - 见 **UDBSlaveInstanceSet** 模型定义 - - **InstanceType** (str) - UDB数据库机型 - - **ExpiredTime** (int) - DB实例过期时间，采用UTC计时时间戳 - - **InstanceMode** (str) - UDB实例模式类型, 可选值如下: “Normal”： 普通版UDB实例 “HA”: 高可用版UDB实例 - - **BackupDuration** (int) - 备份策略，一天内备份时间间隔，单位小时，默认24小时 - - **BackupDate** (str) - 备份日期标记位。共7位,每一位为一周中一天的备份情况 0表示关闭当天备份,1表示打开当天备份。最右边的一位 为星期天的备份开关，其余从右到左依次为星期一到星期 六的备份配置开关，每周必须至少设置两天备份。 例如：1100000 表示打开星期六和星期五的自动备份功能 - - **BackupZone** (str) - 跨可用区高可用备库所在可用区 - **Tag** (str) - 获取资源其他信息 - - **BackupBeginTime** (int) - 备份策略，不可修改，开始时间，单位小时计，默认3点 - - **BackupBlacklist** (str) - 备份策略，备份黑名单，mongodb则不适用 - - **CreateTime** (int) - DB实例创建时间，采用UTC计时时间戳 - **UseSSD** (bool) - 是否使用SSD - - **DBTypeId** (str) - DB类型id，mysql/mongodb按版本细分各有一个id 目前id的取值范围为[1,7],数值对应的版本如下： 1：mysql-5.5，2：mysql-5.1，3：percona-5.5 4：mongodb-2.4，5：mongodb-2.6，6：mysql-5.6， 7：percona-5.6 + - **VPCId** (str) - VPC的ID - **VirtualIP** (str) - DB实例虚ip - **VirtualIPMac** (str) - DB实例虚ip的mac地址 - - **SSDType** (str) - SSD类型，SATA/PCI-E - - **DiskUsedSize** (float) - DB实例磁盘已使用空间，单位GB - - **AdminUser** (str) - 管理员帐户名，默认root - - **MemoryLimit** (int) - 内存限制(MB)，默认根据配置机型 - - **DataFileSize** (float) - DB实例数据文件大小，单位GB - **Zone** (str) - DB实例所在可用区 - - **CluserRole** (str) - 当DB类型为mongodb时，返回该实例所在集群中的角色，包括：mongos、configsrv_sccc、configsrv_csrs、shardsrv_datanode、shardsrv_arbiter，其中congfigsrv分为sccc和csrs两种模式，shardsrv分为datanode和arbiter两种模式 - - **DBId** (str) - DB实例id """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -655,9 +656,9 @@ def describe_udb_instance_backup_state(self, req=None, **kwargs): **Response** - - **State** (str) - 备份状态 0 Backuping // 备份中 1 Success // 备份成功 2 Failed // 备份失败 3 Expired // 备份过期 - - **BackupSize** (int) - - **BackupEndTime** (int) - + - **BackupSize** (int) - + - **State** (str) - 备份状态 0 Backuping // 备份中 1 Success // 备份成功 2 Failed // 备份失败 3 Expired // 备份过期 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -709,10 +710,10 @@ def describe_udb_instance_binlog(self, req=None, **kwargs): **UDBInstanceBinlogSet** - - **Size** (int) - Binlog文件大小 - **BeginTime** (int) - Binlog文件生成时间(时间戳) - **EndTime** (int) - Binlog文件结束时间(时间戳) - **Name** (str) - Binlog文件名 + - **Size** (int) - Binlog文件大小 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -734,8 +735,8 @@ def describe_udb_instance_binlog_backup_state(self, req=None, **kwargs): **Response** - - **State** (str) - 备份状态 0 Backuping // 备份中 1 Success // 备份成功 2 Failed // 备份失败 3 Expired // 备份过期 - **BackupSize** (int) - 备份文件大小(字节) + - **State** (str) - 备份状态 0 Backuping // 备份中 1 Success // 备份成功 2 Failed // 备份失败 3 Expired // 备份过期 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -872,16 +873,16 @@ def describe_udb_log_package(self, req=None, **kwargs): **LogPackageDataSet** + - **BackupId** (int) - 备份id + - **BackupName** (str) - 备份名称 + - **BackupSize** (int) - 备份文件大小 - **BackupTime** (int) - 备份时间 - - **State** (str) - 备份状态 Backuping // 备份中 Success // 备份成功 Failed // 备份失败 Expired // 备份过期 - - **Zone** (str) - 所在可用区 - **BackupType** (int) - 备份类型，包括2-binlog备份，3-slowlog备份 + - **BackupZone** (str) - 跨可用区高可用备库所在可用区 - **DBId** (str) - dbid - **DBName** (str) - 对应的db名称 - - **BackupZone** (str) - 跨可用区高可用备库所在可用区 - - **BackupId** (int) - 备份id - - **BackupName** (str) - 备份名称 - - **BackupSize** (int) - 备份文件大小 + - **State** (str) - 备份状态 Backuping // 备份中 Success // 备份成功 Failed // 备份失败 Expired // 备份过期 + - **Zone** (str) - 所在可用区 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -914,24 +915,24 @@ def describe_udb_param_group(self, req=None, **kwargs): **UDBParamMemberSet** - - **Key** (str) - 参数名称 - - **Value** (str) - 参数值 - - **ValueType** (int) - 参数值应用类型，取值范围为{0,10,20,30},各值 代表意义为 0-unknown、10-int、20-string、 30-bool - **AllowedVal** (str) - 允许的值(根据参数类型，用分隔符表示) - **ApplyType** (int) - 参数值应用类型,取值范围为{0,10,20}，各值代表 意义为0-unknown、10-static、20-dynamic - - **Modifiable** (bool) - 是否可更改，默认为false - **FormatType** (int) - 允许值的格式类型，取值范围为{0,10,20}，意义分 别为PVFT_UNKOWN=0,PVFT_RANGE=10, PVFT_ENUM=20 + - **Key** (str) - 参数名称 + - **Modifiable** (bool) - 是否可更改，默认为false + - **Value** (str) - 参数值 + - **ValueType** (int) - 参数值应用类型，取值范围为{0,10,20,30},各值 代表意义为 0-unknown、10-int、20-string、 30-bool **UDBParamGroupSet** - - **ParamMember** (list) - 见 **UDBParamMemberSet** 模型定义 - - **Zone** (str) - - - **RegionFlag** (bool) - - - **GroupId** (int) - 参数组id - - **GroupName** (str) - 参数组名称 - **DBTypeId** (str) - DB类型id，mysql/mongodb按版本细分各有一个id 目前id的取值范围为[1,7],数值对应的版本如下 1：mysql-5.5，2：mysql-5.1，3：percona-5.5 4：mongodb-2.4，5：mongodb-2.6，6：mysql-5.6 7：percona-5.6 - **Description** (str) - 参数组描述 + - **GroupId** (int) - 参数组id + - **GroupName** (str) - 参数组名称 - **Modifiable** (bool) - 参数组是否可修改 + - **ParamMember** (list) - 见 **UDBParamMemberSet** 模型定义 + - **RegionFlag** (bool) - + - **Zone** (str) - """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} diff --git a/ucloud/services/udb/schemas/apis.py b/ucloud/services/udb/schemas/apis.py index 55bd07e..67808ad 100644 --- a/ucloud/services/udb/schemas/apis.py +++ b/ucloud/services/udb/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.udb.schemas import models @@ -17,15 +18,15 @@ class BackupUDBInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "DBId": fields.Str(required=True, dump_to="DBId"), + "BackupMethod": fields.Str(required=False, dump_to="BackupMethod"), "BackupName": fields.Str(required=True, dump_to="BackupName"), "Blacklist": fields.Str(required=False, dump_to="Blacklist"), + "DBId": fields.Str(required=True, dump_to="DBId"), "ForceBackup": fields.Bool(required=False, dump_to="ForceBackup"), - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "UseBlacklist": fields.Bool(required=False, dump_to="UseBlacklist"), - "BackupMethod": fields.Str(required=False, dump_to="BackupMethod"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -48,12 +49,12 @@ class BackupUDBInstanceBinlogRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "DBId": fields.Str(required=True, dump_to="DBId"), "BackupFile": fields.Str(required=True, dump_to="BackupFile"), "BackupName": fields.Str(required=False, dump_to="BackupName"), + "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -77,10 +78,10 @@ class BackupUDBInstanceErrorLogRequestSchema(schema.RequestSchema): fields = { "BackupName": fields.Str(required=True, dump_to="BackupName"), + "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "DBId": fields.Str(required=True, dump_to="DBId"), } @@ -103,12 +104,12 @@ class BackupUDBInstanceSlowLogRequestSchema(schema.RequestSchema): """ fields = { + "BackupName": fields.Str(required=True, dump_to="BackupName"), "BeginTime": fields.Int(required=True, dump_to="BeginTime"), + "DBId": fields.Str(required=True, dump_to="DBId"), "EndTime": fields.Int(required=True, dump_to="EndTime"), - "BackupName": fields.Str(required=True, dump_to="BackupName"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "DBId": fields.Str(required=True, dump_to="DBId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -131,10 +132,10 @@ class CheckRecoverUDBInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SrcDBId": fields.Str(required=True, dump_to="SrcDBId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -157,9 +158,9 @@ class CheckUDBInstanceToHAAllowanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -182,12 +183,12 @@ class ClearUDBLogRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "BeforeTime": fields.Int(required=False, dump_to="BeforeTime"), "DBId": fields.Str(required=True, dump_to="DBId"), "LogType": fields.Int(required=True, dump_to="LogType"), - "BeforeTime": fields.Int(required=False, dump_to="BeforeTime"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -210,37 +211,37 @@ class CreateUDBInstanceRequestSchema(schema.RequestSchema): """ fields = { - "VPCId": fields.Str(required=False, dump_to="VPCId"), - "Region": fields.Str(required=True, dump_to="Region"), - "ParamGroupId": fields.Int(required=True, dump_to="ParamGroupId"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), - "Quantity": fields.Int(required=False, dump_to="Quantity"), - "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), - "DisableSemisync": fields.Bool(required=False, dump_to="DisableSemisync"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), + "AdminPassword": fields.Str(required=True, dump_to="AdminPassword"), + "AdminUser": fields.Str(required=False, dump_to="AdminUser"), "BackupCount": fields.Int(required=False, dump_to="BackupCount"), + "BackupDuration": fields.Int(required=False, dump_to="BackupDuration"), + "BackupId": fields.Int(required=False, dump_to="BackupId"), "BackupTime": fields.Int(required=False, dump_to="BackupTime"), - "UDBCId": fields.Str(required=False, dump_to="UDBCId"), + "BackupZone": fields.Str(required=False, dump_to="BackupZone"), + "CPU": fields.Int(required=False, dump_to="CPU"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "ClusterRole": fields.Str(required=False, dump_to="ClusterRole"), - "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), - "BackupDuration": fields.Int(required=False, dump_to="BackupDuration"), - "InstanceType": fields.Str(required=False, dump_to="InstanceType"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), - "SubnetId": fields.Str(required=False, dump_to="SubnetId"), - "Port": fields.Int(required=True, dump_to="Port"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), + "DBTypeId": fields.Str(required=True, dump_to="DBTypeId"), + "DisableSemisync": fields.Bool(required=False, dump_to="DisableSemisync"), + "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), + "HAArch": fields.Str(required=False, dump_to="HAArch"), "InstanceMode": fields.Str(required=False, dump_to="InstanceMode"), - "CPU": fields.Int(required=False, dump_to="CPU"), - "Tag": fields.Str(required=False, dump_to="Tag"), - "SSDType": fields.Str(required=False, dump_to="SSDType"), - "BackupZone": fields.Str(required=False, dump_to="BackupZone"), + "InstanceType": fields.Str(required=False, dump_to="InstanceType"), + "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), "Name": fields.Str(required=True, dump_to="Name"), - "AdminPassword": fields.Str(required=True, dump_to="AdminPassword"), - "DBTypeId": fields.Str(required=True, dump_to="DBTypeId"), - "BackupId": fields.Int(required=False, dump_to="BackupId"), + "ParamGroupId": fields.Int(required=True, dump_to="ParamGroupId"), + "Port": fields.Int(required=True, dump_to="Port"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "AdminUser": fields.Str(required=False, dump_to="AdminUser"), - "HAArch": fields.Str(required=False, dump_to="HAArch"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), + "SSDType": fields.Str(required=False, dump_to="SSDType"), + "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "UDBCId": fields.Str(required=False, dump_to="UDBCId"), + "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -263,19 +264,19 @@ class CreateUDBInstanceByRecoveryRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Name": fields.Str(required=True, dump_to="Name"), - "UDBCId": fields.Str(required=False, dump_to="UDBCId"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), - "SrcDBId": fields.Str(required=True, dump_to="SrcDBId"), - "RecoveryTime": fields.Int(required=True, dump_to="RecoveryTime"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), + "Name": fields.Str(required=True, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), - "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), + "RecoveryTime": fields.Int(required=True, dump_to="RecoveryTime"), + "Region": fields.Str(required=True, dump_to="Region"), + "SrcDBId": fields.Str(required=True, dump_to="SrcDBId"), "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "UDBCId": fields.Str(required=False, dump_to="UDBCId"), + "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -298,14 +299,14 @@ class CreateUDBParamGroupRequestSchema(schema.RequestSchema): """ fields = { - "GroupName": fields.Str(required=True, dump_to="GroupName"), - "Description": fields.Str(required=True, dump_to="Description"), - "SrcGroupId": fields.Int(required=True, dump_to="SrcGroupId"), "DBTypeId": fields.Str(required=True, dump_to="DBTypeId"), - "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), + "Description": fields.Str(required=True, dump_to="Description"), + "GroupName": fields.Str(required=True, dump_to="GroupName"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), + "SrcGroupId": fields.Int(required=True, dump_to="SrcGroupId"), "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -328,15 +329,15 @@ class CreateUDBReplicationInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Port": fields.Int(required=False, dump_to="Port"), - "IsArbiter": fields.Bool(required=False, dump_to="IsArbiter"), - "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "IsArbiter": fields.Bool(required=False, dump_to="IsArbiter"), "Name": fields.Str(required=True, dump_to="Name"), + "Port": fields.Int(required=False, dump_to="Port"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "SrcId": fields.Str(required=True, dump_to="SrcId"), + "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -359,20 +360,20 @@ class CreateUDBRouteInstanceRequestSchema(schema.RequestSchema): """ fields = { - "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "ConfigsvrId": fields.List(fields.Str()), + "CouponId": fields.Str(required=False, dump_to="CouponId"), + "DBTypeId": fields.Str(required=True, dump_to="DBTypeId"), + "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), + "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), "Name": fields.Str(required=True, dump_to="Name"), "ParamGroupId": fields.Int(required=True, dump_to="ParamGroupId"), - "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), - "Region": fields.Str(required=True, dump_to="Region"), "Port": fields.Int(required=True, dump_to="Port"), - "DBTypeId": fields.Str(required=True, dump_to="DBTypeId"), - "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), + "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), } @@ -395,20 +396,20 @@ class CreateUDBSlaveRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "SrcId": fields.Str(required=True, dump_to="SrcId"), - "Name": fields.Str(required=True, dump_to="Name"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "Port": fields.Int(required=False, dump_to="Port"), "CouponId": fields.Str(required=False, dump_to="CouponId"), + "DiskSpace": fields.Int(required=False, dump_to="DiskSpace"), + "InstanceMode": fields.Str(required=False, dump_to="InstanceMode"), "InstanceType": fields.Str(required=False, dump_to="InstanceType"), + "IsLock": fields.Bool(required=False, dump_to="IsLock"), + "MemoryLimit": fields.Int(required=False, dump_to="MemoryLimit"), + "Name": fields.Str(required=True, dump_to="Name"), + "Port": fields.Int(required=False, dump_to="Port"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), + "Region": fields.Str(required=True, dump_to="Region"), "SSDType": fields.Str(required=False, dump_to="SSDType"), - "MemoryLimit": fields.Int(required=False, dump_to="MemoryLimit"), - "InstanceMode": fields.Str(required=False, dump_to="InstanceMode"), - "DiskSpace": fields.Int(required=False, dump_to="DiskSpace"), - "IsLock": fields.Bool(required=False, dump_to="IsLock"), + "SrcId": fields.Str(required=True, dump_to="SrcId"), + "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -431,11 +432,11 @@ class DeleteUDBBackupRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "BackupId": fields.Int(required=True, dump_to="BackupId"), "BackupZone": fields.Str(required=False, dump_to="BackupZone"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -458,11 +459,11 @@ class DeleteUDBInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "UDBCId": fields.Str(required=False, dump_to="UDBCId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -485,11 +486,11 @@ class DeleteUDBLogPackageRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "BackupId": fields.Int(required=True, dump_to="BackupId"), "BackupZone": fields.Str(required=False, dump_to="BackupZone"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -513,10 +514,10 @@ class DeleteUDBParamGroupRequestSchema(schema.RequestSchema): fields = { "GroupId": fields.Int(required=True, dump_to="GroupId"), - "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -539,17 +540,17 @@ class DescribeUDBBackupRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Limit": fields.Int(required=True, dump_to="Limit"), - "ClassType": fields.Str(required=False, dump_to="ClassType"), + "BackupId": fields.Int(required=False, dump_to="BackupId"), + "BackupType": fields.Int(required=False, dump_to="BackupType"), "BeginTime": fields.Int(required=False, dump_to="BeginTime"), + "ClassType": fields.Str(required=False, dump_to="ClassType"), + "DBId": fields.Str(required=False, dump_to="DBId"), "EndTime": fields.Int(required=False, dump_to="EndTime"), - "BackupId": fields.Int(required=False, dump_to="BackupId"), + "Limit": fields.Int(required=True, dump_to="Limit"), + "Offset": fields.Int(required=True, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "Offset": fields.Int(required=True, dump_to="Offset"), - "DBId": fields.Str(required=False, dump_to="DBId"), - "BackupType": fields.Int(required=False, dump_to="BackupType"), } @@ -558,10 +559,10 @@ class DescribeUDBBackupResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSet": fields.List( models.UDBBackupSetSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -577,10 +578,10 @@ class DescribeUDBBackupBlacklistRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -603,10 +604,10 @@ class DescribeUDBBinlogBackupURLRequestSchema(schema.RequestSchema): """ fields = { + "BackupId": fields.Int(required=True, dump_to="BackupId"), + "DBId": fields.Str(required=True, dump_to="DBId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "DBId": fields.Str(required=True, dump_to="DBId"), - "BackupId": fields.Int(required=True, dump_to="BackupId"), } @@ -632,16 +633,16 @@ class DescribeUDBInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Offset": fields.Int(required=True, dump_to="Offset"), - "UDBCId": fields.Str(required=False, dump_to="UDBCId"), "ClassType": fields.Str(required=True, dump_to="ClassType"), - "Limit": fields.Int(required=True, dump_to="Limit"), "DBId": fields.Str(required=False, dump_to="DBId"), - "IsInUDBC": fields.Bool(required=False, dump_to="IsInUDBC"), "IncludeSlaves": fields.Bool(required=False, dump_to="IncludeSlaves"), + "IsInUDBC": fields.Bool(required=False, dump_to="IsInUDBC"), + "Limit": fields.Int(required=True, dump_to="Limit"), + "Offset": fields.Int(required=True, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "UDBCId": fields.Str(required=False, dump_to="UDBCId"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -669,9 +670,9 @@ class DescribeUDBInstanceBackupStateRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "BackupId": fields.Int(required=True, dump_to="BackupId"), "BackupZone": fields.Str(required=False, dump_to="BackupZone"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -682,9 +683,9 @@ class DescribeUDBInstanceBackupStateResponseSchema(schema.ResponseSchema): """ fields = { - "State": fields.Str(required=False, load_from="State"), - "BackupSize": fields.Int(required=False, load_from="BackupSize"), "BackupEndTime": fields.Int(required=False, load_from="BackupEndTime"), + "BackupSize": fields.Int(required=False, load_from="BackupSize"), + "State": fields.Str(required=False, load_from="State"), } @@ -700,9 +701,9 @@ class DescribeUDBInstanceBackupURLRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "DBId": fields.Str(required=True, dump_to="DBId"), "BackupId": fields.Int(required=True, dump_to="BackupId"), + "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -730,12 +731,12 @@ class DescribeUDBInstanceBinlogRequestSchema(schema.RequestSchema): """ fields = { - "DBId": fields.Str(required=True, dump_to="DBId"), "BeginTime": fields.Int(required=True, dump_to="BeginTime"), + "DBId": fields.Str(required=True, dump_to="DBId"), "EndTime": fields.Int(required=True, dump_to="EndTime"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -762,11 +763,11 @@ class DescribeUDBInstanceBinlogBackupStateRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "BackupId": fields.Int(required=True, dump_to="BackupId"), "BackupZone": fields.Str(required=False, dump_to="BackupZone"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -775,8 +776,8 @@ class DescribeUDBInstanceBinlogBackupStateResponseSchema(schema.ResponseSchema): """ fields = { - "State": fields.Str(required=False, load_from="State"), "BackupSize": fields.Int(required=False, load_from="BackupSize"), + "State": fields.Str(required=False, load_from="State"), } @@ -792,17 +793,17 @@ class DescribeUDBInstancePriceRequestSchema(schema.RequestSchema): """ fields = { - "Count": fields.Int(required=False, dump_to="Count"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), - "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), - "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), + "Count": fields.Int(required=False, dump_to="Count"), "DBTypeId": fields.Str(required=True, dump_to="DBTypeId"), - "Quantity": fields.Int(required=False, dump_to="Quantity"), - "SSDType": fields.Str(required=False, dump_to="SSDType"), + "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), "InstanceMode": fields.Str(required=False, dump_to="InstanceMode"), + "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), "Region": fields.Str(required=True, dump_to="Region"), + "SSDType": fields.Str(required=False, dump_to="SSDType"), + "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), "Zone": fields.Str(required=True, dump_to="Zone"), - "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), } @@ -830,9 +831,9 @@ class DescribeUDBInstanceStateRequestSchema(schema.RequestSchema): fields = { "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -855,14 +856,14 @@ class DescribeUDBInstanceUpgradePriceRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), - "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), - "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), - "SSDType": fields.Str(required=False, dump_to="SSDType"), + "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "SSDType": fields.Str(required=False, dump_to="SSDType"), + "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -885,10 +886,10 @@ class DescribeUDBLogBackupURLRequestSchema(schema.RequestSchema): """ fields = { + "BackupId": fields.Int(required=True, dump_to="BackupId"), + "DBId": fields.Str(required=True, dump_to="DBId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "DBId": fields.Str(required=True, dump_to="DBId"), - "BackupId": fields.Int(required=True, dump_to="BackupId"), } @@ -914,16 +915,16 @@ class DescribeUDBLogPackageRequestSchema(schema.RequestSchema): """ fields = { + "BeginTime": fields.Int(required=False, dump_to="BeginTime"), + "DBId": fields.Str(required=False, dump_to="DBId"), + "EndTime": fields.Int(required=False, dump_to="EndTime"), "Limit": fields.Int(required=True, dump_to="Limit"), + "Offset": fields.Int(required=True, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Type": fields.Int(required=False, dump_to="Type"), - "DBId": fields.Str(required=False, dump_to="DBId"), "Types": fields.List(fields.Int()), - "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Offset": fields.Int(required=True, dump_to="Offset"), - "BeginTime": fields.Int(required=False, dump_to="BeginTime"), - "EndTime": fields.Int(required=False, dump_to="EndTime"), } @@ -951,15 +952,15 @@ class DescribeUDBParamGroupRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "Offset": fields.Int(required=True, dump_to="Offset"), - "IsInUDBC": fields.Bool(required=False, dump_to="IsInUDBC"), - "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), "ClassType": fields.Str(required=False, dump_to="ClassType"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Limit": fields.Int(required=True, dump_to="Limit"), "GroupId": fields.Int(required=False, dump_to="GroupId"), + "IsInUDBC": fields.Bool(required=False, dump_to="IsInUDBC"), + "Limit": fields.Int(required=True, dump_to="Limit"), + "Offset": fields.Int(required=True, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -988,8 +989,8 @@ class DescribeUDBTypeRequestSchema(schema.RequestSchema): fields = { "DBClusterType": fields.Str(required=False, dump_to="DBClusterType"), - "InstanceMode": fields.Str(required=False, dump_to="InstanceMode"), "DiskType": fields.Str(required=False, dump_to="DiskType"), + "InstanceMode": fields.Str(required=False, dump_to="InstanceMode"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -1018,11 +1019,11 @@ class EditUDBBackupBlacklistRequestSchema(schema.RequestSchema): """ fields = { + "Blacklist": fields.Str(required=True, dump_to="Blacklist"), + "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "DBId": fields.Str(required=True, dump_to="DBId"), - "Blacklist": fields.Str(required=True, dump_to="Blacklist"), } @@ -1045,10 +1046,10 @@ class FetchUDBInstanceEarliestRecoverTimeRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -1071,9 +1072,9 @@ class ModifyUDBInstanceNameRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), "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=False, dump_to="Zone"), } @@ -1098,12 +1099,12 @@ class ModifyUDBInstancePasswordRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "AccountName": fields.Str(required=False, dump_to="AccountName"), "DBId": fields.Str(required=True, dump_to="DBId"), "Password": fields.Str(required=True, dump_to="Password"), - "AccountName": fields.Str(required=False, dump_to="AccountName"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -1127,8 +1128,8 @@ class PromoteUDBInstanceToHARequestSchema(schema.RequestSchema): fields = { "DBId": fields.Str(required=True, dump_to="DBId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -1151,9 +1152,9 @@ class PromoteUDBSlaveRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), "IsForce": fields.Bool(required=False, dump_to="IsForce"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -1178,19 +1179,19 @@ class ResizeUDBInstanceRequestSchema(schema.RequestSchema): """ fields = { - "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), - "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), - "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Int(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), - "StartAfterUpgrade": fields.Bool(required=False, dump_to="StartAfterUpgrade"), + "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), + "InstanceMode": fields.Str(required=False, dump_to="InstanceMode"), + "InstanceType": fields.Str(required=False, dump_to="InstanceType"), + "MemoryLimit": fields.Int(required=True, dump_to="MemoryLimit"), + "ProjectId": fields.Int(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SSDType": fields.Str(required=False, dump_to="SSDType"), + "StartAfterUpgrade": fields.Bool(required=False, dump_to="StartAfterUpgrade"), "UDBCId": fields.Str(required=False, dump_to="UDBCId"), - "InstanceType": fields.Str(required=False, dump_to="InstanceType"), - "InstanceMode": fields.Str(required=False, dump_to="InstanceMode"), + "UseSSD": fields.Bool(required=False, dump_to="UseSSD"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -1213,10 +1214,10 @@ class RestartUDBInstanceRequestSchema(schema.RequestSchema): """ fields = { + "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "DBId": fields.Str(required=True, dump_to="DBId"), } @@ -1240,9 +1241,9 @@ class StartUDBInstanceRequestSchema(schema.RequestSchema): fields = { "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -1265,11 +1266,11 @@ class StopUDBInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "DBId": fields.Str(required=True, dump_to="DBId"), "ForceToKill": fields.Bool(required=False, dump_to="ForceToKill"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -1292,12 +1293,12 @@ class SwitchUDBInstanceToHARequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "DBId": fields.Str(required=True, dump_to="DBId"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "DBId": fields.Str(required=True, dump_to="DBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Str(required=False, dump_to="Quantity"), - "Tag": fields.Str(required=False, dump_to="Tag"), "Region": fields.Str(required=True, dump_to="Region"), + "Tag": fields.Str(required=False, dump_to="Tag"), } @@ -1320,14 +1321,14 @@ class UpdateUDBInstanceBackupStrategyRequestSchema(schema.RequestSchema): """ fields = { + "BackupDate": fields.Str(required=False, dump_to="BackupDate"), "BackupMethod": fields.Str(required=False, dump_to="BackupMethod"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "DBId": fields.Str(required=True, dump_to="DBId"), "BackupTime": fields.Int(required=False, dump_to="BackupTime"), - "BackupDate": fields.Str(required=False, dump_to="BackupDate"), + "DBId": fields.Str(required=True, dump_to="DBId"), "ForceDump": fields.Bool(required=False, dump_to="ForceDump"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -1351,11 +1352,11 @@ class UpdateUDBInstanceSlaveBackupSwitchRequestSchema(schema.RequestSchema): fields = { "BackupSwitch": fields.Int(required=True, dump_to="BackupSwitch"), - "SlaveDBId": fields.Str(required=False, dump_to="SlaveDBId"), + "MasterDBId": fields.Str(required=True, dump_to="MasterDBId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "SlaveDBId": fields.Str(required=False, dump_to="SlaveDBId"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "MasterDBId": fields.Str(required=True, dump_to="MasterDBId"), } @@ -1378,15 +1379,15 @@ class UpdateUDBParamGroupRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Description": fields.Str(required=False, dump_to="Description"), "GroupId": fields.Int(required=True, dump_to="GroupId"), "Key": fields.Str(required=False, dump_to="Key"), "Name": fields.Str(required=False, dump_to="Name"), - "Description": fields.Str(required=False, dump_to="Description"), - "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), + "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), "Value": fields.Str(required=False, dump_to="Value"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -1409,15 +1410,15 @@ class UploadUDBParamGroupRequestSchema(schema.RequestSchema): """ fields = { + "Content": fields.Str(required=True, dump_to="Content"), "DBTypeId": fields.Str(required=True, dump_to="DBTypeId"), "Description": fields.Str(required=True, dump_to="Description"), - "Content": fields.Str(required=True, dump_to="Content"), + "GroupName": fields.Str(required=True, dump_to="GroupName"), "ParamGroupTypeId": fields.Int(required=False, dump_to="ParamGroupTypeId"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "GroupName": fields.Str(required=True, dump_to="GroupName"), + "Region": fields.Str(required=True, dump_to="Region"), "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), + "Zone": fields.Str(required=True, dump_to="Zone"), } diff --git a/ucloud/services/udb/schemas/models.py b/ucloud/services/udb/schemas/models.py index 846d21a..ddaa8d0 100644 --- a/ucloud/services/udb/schemas/models.py +++ b/ucloud/services/udb/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -8,18 +9,18 @@ class UDBBackupSetSchema(schema.ResponseSchema): """ fields = { - "State": fields.Str(required=False, load_from="State"), - "ErrorInfo": fields.Str(required=False, load_from="ErrorInfo"), - "Zone": fields.Str(required=False, load_from="Zone"), + "BackupEndTime": fields.Int(required=False, load_from="BackupEndTime"), "BackupId": fields.Int(required=False, load_from="BackupId"), + "BackupName": fields.Str(required=False, load_from="BackupName"), + "BackupSize": fields.Int(required=False, load_from="BackupSize"), + "BackupTime": fields.Int(required=False, load_from="BackupTime"), "BackupType": fields.Int(required=False, load_from="BackupType"), + "BackupZone": fields.Str(required=False, load_from="BackupZone"), "DBId": fields.Str(required=False, load_from="DBId"), "DBName": fields.Str(required=False, load_from="DBName"), - "BackupZone": fields.Str(required=False, load_from="BackupZone"), - "BackupEndTime": fields.Int(required=False, load_from="BackupEndTime"), - "BackupName": fields.Str(required=False, load_from="BackupName"), - "BackupTime": fields.Int(required=False, load_from="BackupTime"), - "BackupSize": fields.Int(required=False, load_from="BackupSize"), + "ErrorInfo": fields.Str(required=False, load_from="ErrorInfo"), + "State": fields.Str(required=False, load_from="State"), + "Zone": fields.Str(required=False, load_from="Zone"), } @@ -28,42 +29,42 @@ class UDBSlaveInstanceSetSchema(schema.ResponseSchema): """ fields = { + "AdminUser": fields.Str(required=False, load_from="AdminUser"), + "BackupBeginTime": fields.Int(required=False, load_from="BackupBeginTime"), + "BackupBlacklist": fields.Str(required=False, load_from="BackupBlacklist"), "BackupCount": fields.Int(required=False, load_from="BackupCount"), - "MemoryLimit": fields.Int(required=False, load_from="MemoryLimit"), - "UseSSD": fields.Bool(required=False, load_from="UseSSD"), - "DiskUsedSize": fields.Float(required=False, load_from="DiskUsedSize"), - "Zone": fields.Str(required=False, load_from="Zone"), - "ParamGroupId": fields.Int(required=False, load_from="ParamGroupId"), + "BackupDate": fields.Str(required=False, load_from="BackupDate"), + "BackupDuration": fields.Int(required=False, load_from="BackupDuration"), "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "SSDType": fields.Str(required=False, load_from="SSDType"), - "VirtualIPMac": fields.Str(required=False, load_from="VirtualIPMac"), - "SrcDBId": fields.Str(required=False, load_from="SrcDBId"), - "Role": fields.Str(required=False, load_from="Role"), - "VPCId": fields.Str(required=False, load_from="VPCId"), + "ClusterRole": fields.Str(required=False, load_from="ClusterRole"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), "DBId": fields.Str(required=False, load_from="DBId"), - "BackupBlacklist": fields.Str(required=False, load_from="BackupBlacklist"), - "DiskSpace": fields.Int(required=False, load_from="DiskSpace"), - "DataFileSize": fields.Float(required=False, load_from="DataFileSize"), - "SystemFileSize": fields.Float(required=False, load_from="SystemFileSize"), - "LogFileSize": fields.Float(required=False, load_from="LogFileSize"), - "InstanceType": fields.Str(required=False, load_from="InstanceType"), "DBTypeId": fields.Str(required=False, load_from="DBTypeId"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "State": fields.Str(required=False, load_from="State"), - "InstanceMode": fields.Str(required=False, load_from="InstanceMode"), + "DataFileSize": fields.Float(required=False, load_from="DataFileSize"), + "DiskSpace": fields.Int(required=False, load_from="DiskSpace"), + "DiskUsedSize": fields.Float(required=False, load_from="DiskUsedSize"), "ExpiredTime": fields.Int(required=False, load_from="ExpiredTime"), + "InstanceMode": fields.Str(required=False, load_from="InstanceMode"), + "InstanceType": fields.Str(required=False, load_from="InstanceType"), + "InstanceTypeId": fields.Int(required=False, load_from="InstanceTypeId"), + "LogFileSize": fields.Float(required=False, load_from="LogFileSize"), + "MemoryLimit": fields.Int(required=False, load_from="MemoryLimit"), + "ModifyTime": fields.Int(required=False, load_from="ModifyTime"), "Name": fields.Str(required=False, load_from="Name"), - "VirtualIP": fields.Str(required=False, load_from="VirtualIP"), - "BackupDuration": fields.Int(required=False, load_from="BackupDuration"), - "BackupDate": fields.Str(required=False, load_from="BackupDate"), - "AdminUser": fields.Str(required=False, load_from="AdminUser"), - "BackupBeginTime": fields.Int(required=False, load_from="BackupBeginTime"), - "ClusterRole": fields.Str(required=False, load_from="ClusterRole"), + "ParamGroupId": fields.Int(required=False, load_from="ParamGroupId"), + "Port": fields.Int(required=False, load_from="Port"), + "Role": fields.Str(required=False, load_from="Role"), + "SSDType": fields.Str(required=False, load_from="SSDType"), + "SrcDBId": fields.Str(required=False, load_from="SrcDBId"), + "State": fields.Str(required=False, load_from="State"), "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "InstanceTypeId": fields.Int(required=False, load_from="InstanceTypeId"), + "SystemFileSize": fields.Float(required=False, load_from="SystemFileSize"), "Tag": fields.Str(required=False, load_from="Tag"), - "Port": fields.Int(required=False, load_from="Port"), - "ModifyTime": fields.Int(required=False, load_from="ModifyTime"), + "UseSSD": fields.Bool(required=False, load_from="UseSSD"), + "VPCId": fields.Str(required=False, load_from="VPCId"), + "VirtualIP": fields.Str(required=False, load_from="VirtualIP"), + "VirtualIPMac": fields.Str(required=False, load_from="VirtualIPMac"), + "Zone": fields.Str(required=False, load_from="Zone"), } @@ -72,44 +73,44 @@ class UDBInstanceSetSchema(schema.ResponseSchema): """ fields = { - "Zone": fields.Str(required=False, load_from="Zone"), - "VirtualIPMac": fields.Str(required=False, load_from="VirtualIPMac"), - "BackupDate": fields.Str(required=False, load_from="BackupDate"), - "DataSet": fields.List(UDBSlaveInstanceSetSchema()), - "ParamGroupId": fields.Int(required=False, load_from="ParamGroupId"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "SSDType": fields.Str(required=False, load_from="SSDType"), - "UseSSD": fields.Bool(required=False, load_from="UseSSD"), - "Role": fields.Str(required=False, load_from="Role"), - "SystemFileSize": fields.Float(required=False, load_from="SystemFileSize"), - "BackupCount": fields.Int(required=False, load_from="BackupCount"), - "ExpiredTime": fields.Int(required=False, load_from="ExpiredTime"), - "MemoryLimit": fields.Int(required=False, load_from="MemoryLimit"), - "DiskSpace": fields.Int(required=False, load_from="DiskSpace"), - "BackupBlacklist": fields.Str(required=False, load_from="BackupBlacklist"), - "DataFileSize": fields.Float(required=False, load_from="DataFileSize"), - "VirtualIP": fields.Str(required=False, load_from="VirtualIP"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "SrcDBId": fields.Str(required=False, load_from="SrcDBId"), - "BackupBeginTime": fields.Int(required=False, load_from="BackupBeginTime"), - "ModifyTime": fields.Int(required=False, load_from="ModifyTime"), - "LogFileSize": fields.Float(required=False, load_from="LogFileSize"), - "DBTypeId": fields.Str(required=False, load_from="DBTypeId"), "AdminUser": fields.Str(required=False, load_from="AdminUser"), - "InstanceType": fields.Str(required=False, load_from="InstanceType"), + "BackupBeginTime": fields.Int(required=False, load_from="BackupBeginTime"), + "BackupBlacklist": fields.Str(required=False, load_from="BackupBlacklist"), + "BackupCount": fields.Int(required=False, load_from="BackupCount"), + "BackupDate": fields.Str(required=False, load_from="BackupDate"), "BackupDuration": fields.Int(required=False, load_from="BackupDuration"), - "DiskUsedSize": fields.Float(required=False, load_from="DiskUsedSize"), + "BackupZone": fields.Str(required=False, load_from="BackupZone"), + "ChargeType": fields.Str(required=False, load_from="ChargeType"), "CluserRole": fields.Str(required=False, load_from="CluserRole"), - "InstanceTypeId": fields.Int(required=False, load_from="InstanceTypeId"), - "Port": fields.Int(required=False, load_from="Port"), "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "BackupZone": fields.Str(required=False, load_from="BackupZone"), "DBId": fields.Str(required=False, load_from="DBId"), + "DBTypeId": fields.Str(required=False, load_from="DBTypeId"), + "DataFileSize": fields.Float(required=False, load_from="DataFileSize"), + "DataSet": fields.List(UDBSlaveInstanceSetSchema()), + "DiskSpace": fields.Int(required=False, load_from="DiskSpace"), + "DiskUsedSize": fields.Float(required=False, load_from="DiskUsedSize"), + "ExpiredTime": fields.Int(required=False, load_from="ExpiredTime"), + "InstanceMode": fields.Str(required=False, load_from="InstanceMode"), + "InstanceType": fields.Str(required=False, load_from="InstanceType"), + "InstanceTypeId": fields.Int(required=False, load_from="InstanceTypeId"), + "LogFileSize": fields.Float(required=False, load_from="LogFileSize"), + "MemoryLimit": fields.Int(required=False, load_from="MemoryLimit"), + "ModifyTime": fields.Int(required=False, load_from="ModifyTime"), "Name": fields.Str(required=False, load_from="Name"), - "Tag": fields.Str(required=False, load_from="Tag"), + "ParamGroupId": fields.Int(required=False, load_from="ParamGroupId"), + "Port": fields.Int(required=False, load_from="Port"), + "Role": fields.Str(required=False, load_from="Role"), + "SSDType": fields.Str(required=False, load_from="SSDType"), + "SrcDBId": fields.Str(required=False, load_from="SrcDBId"), "State": fields.Str(required=False, load_from="State"), - "InstanceMode": fields.Str(required=False, load_from="InstanceMode"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "SystemFileSize": fields.Float(required=False, load_from="SystemFileSize"), + "Tag": fields.Str(required=False, load_from="Tag"), + "UseSSD": fields.Bool(required=False, load_from="UseSSD"), + "VPCId": fields.Str(required=False, load_from="VPCId"), + "VirtualIP": fields.Str(required=False, load_from="VirtualIP"), + "VirtualIPMac": fields.Str(required=False, load_from="VirtualIPMac"), + "Zone": fields.Str(required=False, load_from="Zone"), } @@ -118,10 +119,10 @@ class UDBInstanceBinlogSetSchema(schema.ResponseSchema): """ fields = { - "Size": fields.Int(required=False, load_from="Size"), "BeginTime": fields.Int(required=False, load_from="BeginTime"), "EndTime": fields.Int(required=False, load_from="EndTime"), "Name": fields.Str(required=False, load_from="Name"), + "Size": fields.Int(required=False, load_from="Size"), } @@ -140,16 +141,16 @@ class LogPackageDataSetSchema(schema.ResponseSchema): """ fields = { - "DBId": fields.Str(required=False, load_from="DBId"), - "Zone": fields.Str(required=False, load_from="Zone"), "BackupId": fields.Int(required=False, load_from="BackupId"), "BackupName": fields.Str(required=False, load_from="BackupName"), + "BackupSize": fields.Int(required=False, load_from="BackupSize"), "BackupTime": fields.Int(required=False, load_from="BackupTime"), "BackupType": fields.Int(required=False, load_from="BackupType"), - "State": fields.Str(required=False, load_from="State"), - "BackupSize": fields.Int(required=False, load_from="BackupSize"), - "DBName": fields.Str(required=False, load_from="DBName"), "BackupZone": fields.Str(required=False, load_from="BackupZone"), + "DBId": fields.Str(required=False, load_from="DBId"), + "DBName": fields.Str(required=False, load_from="DBName"), + "State": fields.Str(required=False, load_from="State"), + "Zone": fields.Str(required=False, load_from="Zone"), } @@ -160,9 +161,9 @@ class UDBParamMemberSetSchema(schema.ResponseSchema): fields = { "AllowedVal": fields.Str(required=False, load_from="AllowedVal"), "ApplyType": fields.Int(required=False, load_from="ApplyType"), - "Modifiable": fields.Bool(required=False, load_from="Modifiable"), "FormatType": fields.Int(required=False, load_from="FormatType"), "Key": fields.Str(required=False, load_from="Key"), + "Modifiable": fields.Bool(required=False, load_from="Modifiable"), "Value": fields.Str(required=False, load_from="Value"), "ValueType": fields.Int(required=False, load_from="ValueType"), } @@ -173,14 +174,14 @@ class UDBParamGroupSetSchema(schema.ResponseSchema): """ fields = { + "DBTypeId": fields.Str(required=False, load_from="DBTypeId"), + "Description": fields.Str(required=False, load_from="Description"), + "GroupId": fields.Int(required=False, load_from="GroupId"), + "GroupName": fields.Str(required=False, load_from="GroupName"), "Modifiable": fields.Bool(required=False, load_from="Modifiable"), "ParamMember": fields.List(UDBParamMemberSetSchema()), - "Zone": fields.Str(required=False, load_from="Zone"), "RegionFlag": fields.Bool(required=False, load_from="RegionFlag"), - "GroupId": fields.Int(required=False, load_from="GroupId"), - "GroupName": fields.Str(required=False, load_from="GroupName"), - "DBTypeId": fields.Str(required=False, load_from="DBTypeId"), - "Description": fields.Str(required=False, load_from="Description"), + "Zone": fields.Str(required=False, load_from="Zone"), } diff --git a/ucloud/services/udisk/client.py b/ucloud/services/udisk/client.py index 48a72d2..fbfb883 100644 --- a/ucloud/services/udisk/client.py +++ b/ucloud/services/udisk/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.udisk.schemas import apis @@ -22,8 +23,8 @@ def attach_udisk(self, req=None, **kwargs): **Response** - - **UHostId** (str) - 挂载的UHost实例ID - **UDiskId** (str) - 挂载的UDisk实例ID + - **UHostId** (str) - 挂载的UHost实例ID """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -209,33 +210,33 @@ def describe_udisk(self, req=None, **kwargs): **UDiskDataSet** - - **CreateTime** (int) - 创建时间 - - **UHostId** (str) - 挂载的UHost的Id - - **ChargeType** (str) - Year,Month,Dynamic,Trial,Postpay - - **Status** (str) - 状态:Available(可用),Attaching(挂载中), InUse(已挂载), Detaching(卸载中), Initializating(分配中), Failed(创建失败),Cloning(克隆中),Restoring(恢复中),RestoreFailed(恢复失败), - - **ExpiredTime** (int) - 过期时间 - **ArkSwitchEnable** (int) - 是否支持开启方舟，1支持 ，0不支持 + - **ChargeType** (str) - Year,Month,Dynamic,Trial,Postpay - **CloneEnable** (int) - 是否支持克隆，1支持 ，0不支持 + - **CmkId** (str) - 该盘的cmk id + - **CmkIdAlias** (str) - cmk id 别名 - **CmkIdStatus** (str) - 该盘cmk的状态, Enabled(正常)，Disabled(失效)，Deleted(删除)，NoCmkId(非加密盘) - - **Zone** (str) - 可用区 - - **UHostIP** (str) - 挂载的UHost的IP - - **UDiskId** (str) - UDisk实例Id - - **IsExpire** (str) - 资源是否过期，过期:"Yes", 未过期:"No" + - **CreateTime** (int) - 创建时间 + - **DataKey** (str) - 该盘的密文密钥 + - **DeviceName** (str) - 挂载的设备名称 - **DiskType** (str) - 云硬盘类型: 普通数据盘:DataDisk,普通系统盘:SystemDisk,SSD数据盘:SSDDataDisk,RSSD数据盘:RSSDDataDisk + - **ExpiredTime** (int) - 过期时间 + - **IsExpire** (str) - 资源是否过期，过期:"Yes", 未过期:"No" + - **Name** (str) - 实例名称 + - **Size** (int) - 容量单位GB - **SnapEnable** (int) - 是否支持快照，1支持 ，0不支持 - - **UKmsMode** (str) - 是否是加密盘，是:"Yes", 否:"No" - - **CmkId** (str) - 该盘的cmk id - **SnapshotCount** (int) - 该盘快照个数 - **SnapshotLimit** (int) - 该盘快照上限 - - **Size** (int) - 容量单位GB + - **Status** (str) - 状态:Available(可用),Attaching(挂载中), InUse(已挂载), Detaching(卸载中), Initializating(分配中), Failed(创建失败),Cloning(克隆中),Restoring(恢复中),RestoreFailed(恢复失败), - **Tag** (str) - 业务组名称 - - **Version** (str) - 是否支持数据方舟，支持:"2.0", 不支持:"1.0" - **UDataArkMode** (str) - 是否开启数据方舟，开启:"Yes", 不支持:"No" - - **DataKey** (str) - 该盘的密文密钥 - - **Name** (str) - 实例名称 - - **DeviceName** (str) - 挂载的设备名称 + - **UDiskId** (str) - UDisk实例Id + - **UHostIP** (str) - 挂载的UHost的IP + - **UHostId** (str) - 挂载的UHost的Id - **UHostName** (str) - 挂载的UHost的Name - - **CmkIdAlias** (str) - cmk id 别名 + - **UKmsMode** (str) - 是否是加密盘，是:"Yes", 否:"No" + - **Version** (str) - 是否支持数据方舟，支持:"2.0", 不支持:"1.0" + - **Zone** (str) - 可用区 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -292,31 +293,31 @@ def describe_udisk_snapshot(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 根据过滤条件得到的总数 - **DataSet** (list) - 见 **UDiskSnapshotSet** 模型定义 + - **TotalCount** (int) - 根据过滤条件得到的总数 **Response Model** **UDiskSnapshotSet** - **CmkId** (str) - 该快照的cmk id - - **CmkIdStatus** (str) - 该快照cmk的状态, Enabled(正常)，Disabled(失效)，Deleted(删除)，NoCmkId(非加密盘) - - **Name** (str) - 快照名称 - - **UDiskId** (str) - 快照的源UDisk的Id - - **ExpiredTime** (int) - 过期时间 - - **Size** (int) - 容量单位GB - **CmkIdAlias** (str) - cmk id 别名 - - **IsUDiskAvailable** (bool) - 对应磁盘是否处于可用状态 - - **UHostId** (str) - 对应磁盘制作快照时所挂载的主机 + - **CmkIdStatus** (str) - 该快照cmk的状态, Enabled(正常)，Disabled(失效)，Deleted(删除)，NoCmkId(非加密盘) + - **Comment** (str) - 快照描述 + - **CreateTime** (int) - 创建时间 - **DataKey** (str) - 该快照的密文密钥 - - **Status** (str) - 快照状态，Normal:正常,Failed:失败,Creating:制作中 - **DiskType** (int) - 磁盘类型，0:数据盘，1:系统盘 - - **Comment** (str) - 快照描述 - - **Version** (str) - 快照版本 - - **UKmsMode** (str) - 是否是加密盘快照，是:"Yes", 否:"No" + - **ExpiredTime** (int) - 过期时间 + - **IsUDiskAvailable** (bool) - 对应磁盘是否处于可用状态 + - **Name** (str) - 快照名称 + - **Size** (int) - 容量单位GB - **SnapshotId** (str) - 快照Id + - **Status** (str) - 快照状态，Normal:正常,Failed:失败,Creating:制作中 + - **UDiskId** (str) - 快照的源UDisk的Id - **UDiskName** (str) - 快照的源UDisk的Name - - **CreateTime** (int) - 创建时间 + - **UHostId** (str) - 对应磁盘制作快照时所挂载的主机 + - **UKmsMode** (str) - 是否是加密盘快照，是:"Yes", 否:"No" + - **Version** (str) - 快照版本 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -362,8 +363,8 @@ def detach_udisk(self, req=None, **kwargs): **Response** - - **UHostId** (str) - 卸载的UHost实例ID - **UDiskId** (str) - 卸载的UDisk实例ID + - **UHostId** (str) - 卸载的UHost实例ID """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} diff --git a/ucloud/services/udisk/schemas/apis.py b/ucloud/services/udisk/schemas/apis.py index 727df06..6f74881 100644 --- a/ucloud/services/udisk/schemas/apis.py +++ b/ucloud/services/udisk/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.udisk.schemas import models @@ -17,12 +18,12 @@ class AttachUDiskRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), + "MultiAttach": fields.Str(required=False, dump_to="MultiAttach"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Region": fields.Str(required=True, dump_to="Region"), "UDiskId": fields.Str(required=True, dump_to="UDiskId"), - "MultiAttach": fields.Str(required=False, dump_to="MultiAttach"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -31,8 +32,8 @@ class AttachUDiskResponseSchema(schema.ResponseSchema): """ fields = { - "UHostId": fields.Str(required=False, load_from="UHostId"), "UDiskId": fields.Str(required=False, load_from="UDiskId"), + "UHostId": fields.Str(required=False, load_from="UHostId"), } @@ -48,16 +49,16 @@ class CloneUDiskRequestSchema(schema.RequestSchema): """ fields = { - "Comment": fields.Str(required=False, dump_to="Comment"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "Comment": fields.Str(required=False, dump_to="Comment"), "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Name": fields.Str(required=True, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), "SourceId": fields.Str(required=True, dump_to="SourceId"), - "Zone": fields.Str(required=True, dump_to="Zone"), "UDataArkMode": fields.Str(required=False, dump_to="UDataArkMode"), - "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -80,17 +81,17 @@ class CloneUDiskSnapshotRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Name": fields.Str(required=True, dump_to="Name"), - "Size": fields.Int(required=True, dump_to="Size"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "Comment": fields.Str(required=False, dump_to="Comment"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), + "Name": fields.Str(required=True, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), - "Zone": fields.Str(required=True, dump_to="Zone"), + "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=True, dump_to="Size"), "SourceId": fields.Str(required=True, dump_to="SourceId"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "UDataArkMode": fields.Str(required=False, dump_to="UDataArkMode"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -113,19 +114,19 @@ class CreateUDiskRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "Size": fields.Int(required=True, dump_to="Size"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "CmkId": fields.Str(required=False, dump_to="CmkId"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), + "DiskType": fields.Str(required=False, dump_to="DiskType"), + "Name": fields.Str(required=True, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=True, dump_to="Size"), "Tag": fields.Str(required=False, dump_to="Tag"), - "UKmsMode": fields.Str(required=False, dump_to="UKmsMode"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Name": fields.Str(required=True, dump_to="Name"), "UDataArkMode": fields.Str(required=False, dump_to="UDataArkMode"), - "DiskType": fields.Str(required=False, dump_to="DiskType"), - "CmkId": fields.Str(required=False, dump_to="CmkId"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), + "UKmsMode": fields.Str(required=False, dump_to="UKmsMode"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -148,14 +149,14 @@ class CreateUDiskSnapshotRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UDiskId": fields.Str(required=True, dump_to="UDiskId"), - "Name": fields.Str(required=True, dump_to="Name"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), - "Quantity": fields.Int(required=False, dump_to="Quantity"), "Comment": fields.Str(required=False, dump_to="Comment"), + "Name": fields.Str(required=True, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), + "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -180,10 +181,10 @@ class DeleteUDiskRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UDiskId": fields.Str(required=True, dump_to="UDiskId"), "Region": fields.Str(required=True, dump_to="Region"), + "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -206,11 +207,11 @@ class DeleteUDiskSnapshotRequestSchema(schema.RequestSchema): """ fields = { + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SnapshotId": fields.Str(required=True, dump_to="SnapshotId"), "UDiskId": fields.Str(required=False, dump_to="UDiskId"), - "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -233,13 +234,13 @@ class DescribeUDiskRequestSchema(schema.RequestSchema): """ fields = { - "Offset": fields.Int(required=False, dump_to="Offset"), - "Limit": fields.Int(required=False, dump_to="Limit"), "DiskType": fields.Str(required=False, dump_to="DiskType"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), + "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "UDiskId": fields.Str(required=False, dump_to="UDiskId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -248,10 +249,10 @@ class DescribeUDiskResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSet": fields.List( models.UDiskDataSetSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -267,14 +268,14 @@ class DescribeUDiskPriceRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Size": fields.Int(required=True, dump_to="Size"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), - "Quantity": fields.Int(required=False, dump_to="Quantity"), - "UDataArkMode": fields.Str(required=False, dump_to="UDataArkMode"), "DiskType": fields.Str(required=False, dump_to="DiskType"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=True, dump_to="Size"), + "UDataArkMode": fields.Str(required=False, dump_to="UDataArkMode"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -301,12 +302,12 @@ class DescribeUDiskSnapshotRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Offset": fields.Int(required=False, dump_to="Offset"), "Limit": fields.Int(required=False, dump_to="Limit"), - "UDiskId": fields.Str(required=False, dump_to="UDiskId"), - "SnapshotId": fields.Str(required=False, dump_to="SnapshotId"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "SnapshotId": fields.Str(required=False, dump_to="SnapshotId"), + "UDiskId": fields.Str(required=False, dump_to="UDiskId"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -336,12 +337,12 @@ class DescribeUDiskUpgradePriceRequestSchema(schema.RequestSchema): fields = { "DiskType": fields.Str(required=False, dump_to="DiskType"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Size": fields.Int(required=True, dump_to="Size"), "SourceId": fields.Str(required=True, dump_to="SourceId"), "UDataArkMode": fields.Str(required=True, dump_to="UDataArkMode"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -364,11 +365,11 @@ class DetachUDiskRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), - "UDiskId": fields.Str(required=True, dump_to="UDiskId"), "Region": fields.Str(required=True, dump_to="Region"), + "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -377,8 +378,8 @@ class DetachUDiskResponseSchema(schema.ResponseSchema): """ fields = { - "UHostId": fields.Str(required=False, load_from="UHostId"), "UDiskId": fields.Str(required=False, load_from="UDiskId"), + "UHostId": fields.Str(required=False, load_from="UHostId"), } @@ -394,11 +395,11 @@ class RenameUDiskRequestSchema(schema.RequestSchema): """ fields = { - "UDiskName": fields.Str(required=True, dump_to="UDiskName"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "UDiskName": fields.Str(required=True, dump_to="UDiskName"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -422,11 +423,11 @@ class ResizeUDiskRequestSchema(schema.RequestSchema): fields = { "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "Region": fields.Str(required=True, dump_to="Region"), "Size": fields.Int(required=True, dump_to="Size"), + "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -449,12 +450,12 @@ class RestoreUDiskRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "Region": fields.Str(required=True, dump_to="Region"), "SnapshotId": fields.Str(required=False, dump_to="SnapshotId"), "SnapshotTime": fields.Int(required=False, dump_to="SnapshotTime"), + "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -477,11 +478,11 @@ class SetUDiskUDataArkModeRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "Region": fields.Str(required=True, dump_to="Region"), "UDataArkMode": fields.Str(required=True, dump_to="UDataArkMode"), + "UDiskId": fields.Str(required=True, dump_to="UDiskId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } diff --git a/ucloud/services/udisk/schemas/models.py b/ucloud/services/udisk/schemas/models.py index e44f174..99481ff 100644 --- a/ucloud/services/udisk/schemas/models.py +++ b/ucloud/services/udisk/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -8,33 +9,33 @@ class UDiskDataSetSchema(schema.ResponseSchema): """ fields = { - "SnapshotLimit": fields.Int(required=False, load_from="SnapshotLimit"), "ArkSwitchEnable": fields.Int(required=False, load_from="ArkSwitchEnable"), - "Status": fields.Str(required=False, load_from="Status"), - "UHostIP": fields.Str(required=False, load_from="UHostIP"), - "SnapshotCount": fields.Int(required=False, load_from="SnapshotCount"), "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "DiskType": fields.Str(required=False, load_from="DiskType"), - "Tag": fields.Str(required=False, load_from="Tag"), - "UDataArkMode": fields.Str(required=False, load_from="UDataArkMode"), + "CloneEnable": fields.Int(required=False, load_from="CloneEnable"), "CmkId": fields.Str(required=False, load_from="CmkId"), + "CmkIdAlias": fields.Str(required=False, load_from="CmkIdAlias"), + "CmkIdStatus": fields.Str(required=False, load_from="CmkIdStatus"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "DataKey": fields.Str(required=False, load_from="DataKey"), + "DeviceName": fields.Str(required=False, load_from="DeviceName"), + "DiskType": fields.Str(required=False, load_from="DiskType"), + "ExpiredTime": fields.Int(required=False, load_from="ExpiredTime"), + "IsExpire": fields.Str(required=False, load_from="IsExpire"), + "Name": fields.Str(required=False, load_from="Name"), "Size": fields.Int(required=False, load_from="Size"), "SnapEnable": fields.Int(required=False, load_from="SnapEnable"), - "CmkIdAlias": fields.Str(required=False, load_from="CmkIdAlias"), + "SnapshotCount": fields.Int(required=False, load_from="SnapshotCount"), + "SnapshotLimit": fields.Int(required=False, load_from="SnapshotLimit"), + "Status": fields.Str(required=False, load_from="Status"), + "Tag": fields.Str(required=False, load_from="Tag"), + "UDataArkMode": fields.Str(required=False, load_from="UDataArkMode"), "UDiskId": fields.Str(required=False, load_from="UDiskId"), - "IsExpire": fields.Str(required=False, load_from="IsExpire"), - "Version": fields.Str(required=False, load_from="Version"), - "CloneEnable": fields.Int(required=False, load_from="CloneEnable"), - "Zone": fields.Str(required=False, load_from="Zone"), + "UHostIP": fields.Str(required=False, load_from="UHostIP"), + "UHostId": fields.Str(required=False, load_from="UHostId"), "UHostName": fields.Str(required=False, load_from="UHostName"), "UKmsMode": fields.Str(required=False, load_from="UKmsMode"), - "CmkIdStatus": fields.Str(required=False, load_from="CmkIdStatus"), - "Name": fields.Str(required=False, load_from="Name"), - "ExpiredTime": fields.Int(required=False, load_from="ExpiredTime"), - "UHostId": fields.Str(required=False, load_from="UHostId"), - "DeviceName": fields.Str(required=False, load_from="DeviceName"), - "DataKey": fields.Str(required=False, load_from="DataKey"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "Version": fields.Str(required=False, load_from="Version"), + "Zone": fields.Str(required=False, load_from="Zone"), } @@ -43,9 +44,9 @@ class UDiskPriceDataSetSchema(schema.ResponseSchema): """ fields = { - "Price": fields.Float(required=False, load_from="Price"), "ChargeName": fields.Str(required=False, load_from="ChargeName"), "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "Price": fields.Float(required=False, load_from="Price"), } @@ -54,22 +55,22 @@ class UDiskSnapshotSetSchema(schema.ResponseSchema): """ fields = { - "UDiskId": fields.Str(required=True, load_from="UDiskId"), - "ExpiredTime": fields.Int(required=False, load_from="ExpiredTime"), - "UHostId": fields.Str(required=False, load_from="UHostId"), - "UKmsMode": fields.Str(required=False, load_from="UKmsMode"), - "DataKey": fields.Str(required=False, load_from="DataKey"), + "CmkId": fields.Str(required=False, load_from="CmkId"), "CmkIdAlias": fields.Str(required=False, load_from="CmkIdAlias"), - "Name": fields.Str(required=True, load_from="Name"), - "Status": fields.Str(required=True, load_from="Status"), - "Comment": fields.Str(required=False, load_from="Comment"), "CmkIdStatus": fields.Str(required=False, load_from="CmkIdStatus"), - "UDiskName": fields.Str(required=True, load_from="UDiskName"), + "Comment": fields.Str(required=False, load_from="Comment"), + "CreateTime": fields.Int(required=True, load_from="CreateTime"), + "DataKey": fields.Str(required=False, load_from="DataKey"), "DiskType": fields.Int(required=True, load_from="DiskType"), + "ExpiredTime": fields.Int(required=False, load_from="ExpiredTime"), "IsUDiskAvailable": fields.Bool(required=False, load_from="IsUDiskAvailable"), - "Version": fields.Str(required=False, load_from="Version"), - "CmkId": fields.Str(required=False, load_from="CmkId"), - "SnapshotId": fields.Str(required=True, load_from="SnapshotId"), + "Name": fields.Str(required=True, load_from="Name"), "Size": fields.Int(required=True, load_from="Size"), - "CreateTime": fields.Int(required=True, load_from="CreateTime"), + "SnapshotId": fields.Str(required=True, load_from="SnapshotId"), + "Status": fields.Str(required=True, load_from="Status"), + "UDiskId": fields.Str(required=True, load_from="UDiskId"), + "UDiskName": fields.Str(required=True, load_from="UDiskName"), + "UHostId": fields.Str(required=False, load_from="UHostId"), + "UKmsMode": fields.Str(required=False, load_from="UKmsMode"), + "Version": fields.Str(required=False, load_from="Version"), } diff --git a/ucloud/services/udpn/client.py b/ucloud/services/udpn/client.py index 97838bf..86bd6ca 100644 --- a/ucloud/services/udpn/client.py +++ b/ucloud/services/udpn/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.udpn.schemas import apis @@ -47,20 +48,20 @@ def describe_udpn(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 查询到的总数量 - **DataSet** (list) - 见 **UDPNData** 模型定义 + - **TotalCount** (int) - 查询到的总数量 **Response Model** **UDPNData** + - **Bandwidth** (int) - 带宽 + - **ChargeType** (str) - 计费类型 + - **CreateTime** (int) - unix 时间戳 创建时间 - **ExpireTime** (int) - unix 时间戳 到期时间 - - **UDPNId** (str) - UDPN 资源短 ID - **Peer1** (str) - 可用区域 1 - **Peer2** (str) - 可用区域 2 - - **ChargeType** (str) - 计费类型 - - **Bandwidth** (int) - 带宽 - - **CreateTime** (int) - unix 时间戳 创建时间 + - **UDPNId** (str) - UDPN 资源短 ID """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -79,8 +80,8 @@ def get_udpn_line_list(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - DataSet中的元素个数 - **DataSet** (list) - 见 **UDPNLineSet** 模型定义 + - **TotalCount** (int) - DataSet中的元素个数 **Response Model** @@ -111,8 +112,8 @@ def get_udpn_price(self, req=None, **kwargs): **Response** - - **PurchaseValue** (int) - 资源有效期 unix 时间戳 - **Price** (float) - 专线价格 + - **PurchaseValue** (int) - 资源有效期 unix 时间戳 """ d = {"Region": self.config.region} diff --git a/ucloud/services/udpn/schemas/apis.py b/ucloud/services/udpn/schemas/apis.py index fc39f6d..59be99a 100644 --- a/ucloud/services/udpn/schemas/apis.py +++ b/ucloud/services/udpn/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.udpn.schemas import models @@ -17,14 +18,14 @@ class AllocateUDPNRequestSchema(schema.RequestSchema): """ fields = { + "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Region": fields.Str(required=False, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Peer1": fields.Str(required=True, dump_to="Peer1"), "Peer2": fields.Str(required=True, dump_to="Peer2"), - "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=False, dump_to="Region"), } @@ -47,11 +48,11 @@ class DescribeUDPNRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=False, dump_to="Region"), + "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=False, dump_to="Region"), "UDPNId": fields.Str(required=False, dump_to="UDPNId"), - "Offset": fields.Int(required=False, dump_to="Offset"), - "Limit": fields.Int(required=False, dump_to="Limit"), } @@ -60,10 +61,10 @@ class DescribeUDPNResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=True, load_from="TotalCount"), "DataSet": fields.List( models.UDPNDataSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=True, load_from="TotalCount"), } @@ -79,8 +80,8 @@ class GetUDPNLineListRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=False, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=False, dump_to="Region"), } @@ -89,10 +90,10 @@ class GetUDPNLineListResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=True, load_from="TotalCount"), "DataSet": fields.List( models.UDPNLineSetSchema(), required=True, load_from="DataSet" ), + "TotalCount": fields.Int(required=True, load_from="TotalCount"), } @@ -108,10 +109,10 @@ class GetUDPNPriceRequestSchema(schema.RequestSchema): """ fields = { - "Peer1": fields.Str(required=True, dump_to="Peer1"), - "Peer2": fields.Str(required=True, dump_to="Peer2"), "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "Peer1": fields.Str(required=True, dump_to="Peer1"), + "Peer2": fields.Str(required=True, dump_to="Peer2"), "Quantity": fields.Int(required=False, dump_to="Quantity"), "Region": fields.Str(required=False, dump_to="Region"), } @@ -122,8 +123,8 @@ class GetUDPNPriceResponseSchema(schema.ResponseSchema): """ fields = { - "PurchaseValue": fields.Int(required=True, load_from="PurchaseValue"), "Price": fields.Float(required=True, load_from="Price"), + "PurchaseValue": fields.Int(required=True, load_from="PurchaseValue"), } @@ -139,10 +140,10 @@ class GetUDPNUpgradePriceRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UDPNId": fields.Str(required=True, dump_to="UDPNId"), "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=False, dump_to="Region"), + "UDPNId": fields.Str(required=True, dump_to="UDPNId"), } @@ -165,11 +166,11 @@ class ModifyUDPNBandwidthRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=False, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UDPNId": fields.Str(required=True, dump_to="UDPNId"), "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), "CouponId": fields.Str(required=False, dump_to="CouponId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=False, dump_to="Region"), + "UDPNId": fields.Str(required=True, dump_to="UDPNId"), } @@ -192,8 +193,8 @@ class ReleaseUDPNRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=False, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=False, dump_to="Region"), "UDPNId": fields.Str(required=True, dump_to="UDPNId"), } diff --git a/ucloud/services/udpn/schemas/models.py b/ucloud/services/udpn/schemas/models.py index ffb738b..33f8015 100644 --- a/ucloud/services/udpn/schemas/models.py +++ b/ucloud/services/udpn/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -8,13 +9,13 @@ class UDPNDataSchema(schema.ResponseSchema): """ fields = { - "UDPNId": fields.Str(required=True, load_from="UDPNId"), - "Peer1": fields.Str(required=True, load_from="Peer1"), - "Peer2": fields.Str(required=True, load_from="Peer2"), - "ChargeType": fields.Str(required=True, load_from="ChargeType"), "Bandwidth": fields.Int(required=True, load_from="Bandwidth"), + "ChargeType": fields.Str(required=True, load_from="ChargeType"), "CreateTime": fields.Int(required=True, load_from="CreateTime"), "ExpireTime": fields.Int(required=True, load_from="ExpireTime"), + "Peer1": fields.Str(required=True, load_from="Peer1"), + "Peer2": fields.Str(required=True, load_from="Peer2"), + "UDPNId": fields.Str(required=True, load_from="UDPNId"), } diff --git a/ucloud/services/uhost/client.py b/ucloud/services/uhost/client.py index 5ae7056..ad8c877 100644 --- a/ucloud/services/uhost/client.py +++ b/ucloud/services/uhost/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.uhost.schemas import apis @@ -71,8 +72,8 @@ def create_uhost_instance(self, req=None, **kwargs): - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ - **AlarmTemplateId** (int) - 告警模板id，如果传了告警模板id，且告警模板id正确，则绑定告警模板。绑定告警模板失败只会在后台有日志，不会影响创建主机流程，也不会在前端报错。 - **BootDiskSpace** (int) - 【待废弃，不建议调用】系统盘大小。 单位：GB， 范围[20,100]， 步长：10 - - **CPU** (int) - 虚拟CPU核数。可选参数：1-64（可选范围与UHostType相关）。默认值: 4，只有Intel/Cascadelake支持CPU 64。 - - **ChargeType** (str) - 计费模式。枚举值为： \\ > Year，按年付费； \\ > Month，按月付费；\\ > Dynamic，按小时付费 \\ 默认为月付；\\ >Postpay ，后付费。 + - **CPU** (int) - 虚拟CPU核数。可选参数：1-64（具体机型与CPU的对应关系参照控制台）。默认值: 4。 + - **ChargeType** (str) - 计费模式。枚举值为： \\ > Year，按年付费； \\ > Month，按月付费；\\ > Dynamic，按小时付费 \\ 默认为月付 - **CouponId** (str) - 主机代金券ID。请通过DescribeCoupon接口查询，或登录用户中心查看 - **DiskPassword** (str) - 【待废弃，不建议调用】加密盘的密码。若输入此字段，自动选择加密盘。加密盘需要权限位。 - **DiskSpace** (int) - 【待废弃，不建议调用】数据盘大小。 单位：GB， 范围[0,8000]， 步长：10， 默认值：20，云盘支持0-8000；本地普通盘支持0-2000；本地SSD盘（包括所有GPU机型）支持100-1000 @@ -80,14 +81,14 @@ def create_uhost_instance(self, req=None, **kwargs): - **GPU** (int) - GPU卡核心数。仅GPU机型支持此字段（可选范围与UHostType相关） - **GpuType** (str) - GPU类型，枚举值["K80", "P40", "V100"] - **HostType** (str) - 【已废弃】宿主机类型，N2，N1 - - **HotplugFeature** (bool) - 【待废弃，不建议调用】是否开启热升级特性。True为开启，False为未开启，默认False。仅系列1云主机需要使用此字段，系列2云主机根据镜像是否支持云主机。 + - **HotplugFeature** (bool) - 是否开启热升级特性。True为开启，False为未开启，默认False。 - **InstallAgent** (str) - 【暂不支持】是否安装UGA。'yes': 安装；其他或者不填：不安装。 - **IsolationGroup** (str) - 硬件隔离组id。可通过DescribeIsolationGroup获取。 - **KeyPair** (str) - 【暂不支持】Keypair公钥，LoginMode为KeyPair时此项必须 - - **MachineType** (str) - 云主机类型，枚举值["N", "C", "G", "O"] + - **MachineType** (str) - 云主机机型（V2.0），枚举值["N", "C", "G", "O"]。参考 `云主机机型说明 `_ 。 - **MaxCount** (int) - 【批量创建主机时必填】最大创建主机数量，取值范围是[1,100]; - - **Memory** (int) - 内存大小。单位：MB。范围 ：[1024, 262144]，取值为1024的倍数（可选范围与UHostType相关）。默认值：8192 - - **MinimalCpuPlatform** (str) - 最低cpu平台，枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", "Intel/Broadwell", "Intel/Skylake", "Intel/Cascadelake"(只有O型云主机可选)] + - **Memory** (int) - 内存大小。单位：MB。范围 ：[1024, 262144]，取值为1024的倍数（可选范围参考控制台）。默认值：8192 + - **MinimalCpuPlatform** (str) - 最低cpu平台，枚举值["Intel/Auto", "Intel/IvyBridge", "Intel/Haswell", "Intel/Broadwell", "Intel/Skylake", "Intel/Cascadelake"。 - **Name** (str) - UHost实例名称。默认：UHost。请遵照 `字段规范 `_ 设定实例名称。 - **NetCapability** (str) - 网络增强。枚举值：Normal（默认），不开启; Super，开启网络增强1.0； Ultra，开启网络增强2.0（仅支持部分可用区，请参考控制台） - **NetworkId** (str) - 【已废弃】网络ID（VPC2.0情况下无需填写）。VPC1.0情况下，若不填写，代表优先选择基础网络； 若填写，代表选择子网。参见DescribeSubnet。 @@ -102,45 +103,45 @@ def create_uhost_instance(self, req=None, **kwargs): - **SubnetId** (str) - 子网 ID。默认为当前地域的默认子网。 - **Tag** (str) - 业务组。默认：Default（Default即为未分组）。请遵照 `字段规范 `_ 设定业务组。 - **TimemachineFeature** (str) - 【待废弃，不建议调用】是否开启方舟特性。Yes为开启方舟，No为关闭方舟。目前仅选择普通本地盘+普通本地盘 或 SSD云盘+普通云盘的组合支持开启方舟。 - - **UHostType** (str) - 云主机机型。参考 `云主机机型说明 `_ 。【待废弃，不建议调用】 + - **UHostType** (str) - 【建议后续不再使用】云主机机型V1.0。参考 `云主机机型说明 `_ 。 - **UserDataScript** (str) - 【暂不支持】cloudinit方式下，用户初始化脚本 - **VPCId** (str) - VPC ID。默认为当前地域的默认VPC。 **Response** - - **UHostIds** (list) - UHost实例Id集合 - **IPs** (list) - 【批量创建不会返回】IP信息 + - **UHostIds** (list) - UHost实例Id集合 **Request Model** **CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSH** - - **AreaCode** (str) - AreaCode, 区域航空港国际通用代码。Area和AreaCode两者必填一个 - - **Port** (int) - SSH端口，1-65535且不能使用80，443端口 - **Area** (str) - 填写支持SSH访问IP的地区名称，如“洛杉矶”，“新加坡”，“香港”，“东京”，“华盛顿”，“法兰克福”。Area和AreaCode两者必填一个 + - **AreaCode** (str) - GlobalSSH的。AreaCode, 区域航空港国际通用代码。Area和AreaCode两者必填一个 + - **Port** (int) - SSH端口，1-65535且不能使用80，443端口 **CreateUHostInstanceParamNetworkInterfaceEIP** + - **Bandwidth** (int) - 【如果绑定EIP这个参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式必须指定0M带宽, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下： 流量计费[1-300]，带宽计费[1-800] + - **CouponId** (str) - 当前EIP代金券id。请通过DescribeCoupon接口查询，或登录用户中心查看 + - **GlobalSSH** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSH** 模型定义 - **OperatorName** (str) - 【如果绑定EIP这个参数必填】弹性IP的线路如下: 国际: International BGP: Bgp 各地域允许的线路参数如下: cn-sh1: Bgp cn-sh2: Bgp cn-gd: Bgp cn-bj1: Bgp cn-bj2: Bgp hk: International us-ca: International th-bkk: International kr-seoul:International us-ws:International ge-fra:International sg:International tw-kh:International.其他海外线路均为 International - **PayMode** (str) - 弹性IP的计费模式. 枚举值: "Traffic", 流量计费; "Bandwidth", 带宽计费; "ShareBandwidth",共享带宽模式. "Free":免费带宽模式.默认为 "Bandwidth". - **ShareBandwidthId** (str) - 绑定的共享带宽Id，仅当PayMode为ShareBandwidth时有效 - - **CouponId** (str) - 当前EIP代金券id。请通过DescribeCoupon接口查询，或登录用户中心查看 - - **Bandwidth** (int) - 【如果绑定EIP这个参数必填】弹性IP的外网带宽, 单位为Mbps. 共享带宽模式必须指定0M带宽, 非共享带宽模式必须指定非0Mbps带宽. 各地域非共享带宽的带宽范围如下： 流量计费[1-300]，带宽计费[1-800] - - **GlobalSSH** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSH** 模型定义 - - **CreateUHostInstanceParamNetworkInterface** - - - **EIP** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceEIP** 模型定义 **CreateUHostInstanceParamDisks** - - **Type** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 - - **Encrypted** (bool) - 加密：true, 不加密: false加密必须传入对应的的KmsKeyId - - **Size** (int) - 磁盘大小，单位GB。请参考 `磁盘类型 `_ 。 - - **KmsKeyId** (str) - kms的id - - **CouponId** (str) - 云盘代金券id。不适用于系统盘/本地盘。请通过DescribeCoupon接口查询，或登录用户中心查看 - **BackupType** (str) - 磁盘备份方案。枚举值：\\ > NONE，无备份 \\ > DATAARK，数据方舟 \\ 当前磁盘支持的备份模式参考 `磁盘类型 `_ + - **CouponId** (str) - 云盘代金券id。不适用于系统盘/本地盘。请通过DescribeCoupon接口查询，或登录用户中心查看 + - **Encrypted** (bool) - 【功能仅部分可用区开放，详询技术支持】磁盘是否加密。加密：true, 不加密: false加密必须传入对应的的KmsKeyId - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 + - **KmsKeyId** (str) - 【功能仅部分可用区开放，详询技术支持】kms key id。选择加密盘时必填。 + - **Size** (int) - 磁盘大小，单位GB。请参考 `磁盘类型 `_ 。 + - **Type** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 + + **CreateUHostInstanceParamNetworkInterface** + + - **EIP** (dict) - 见 **CreateUHostInstanceParamNetworkInterfaceEIP** 模型定义 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -167,29 +168,29 @@ def describe_image(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 满足条件的镜像总数 - **ImageSet** (list) - 见 **UHostImageSet** 模型定义 + - **TotalCount** (int) - 满足条件的镜像总数 **Response Model** **UHostImageSet** - - **Vendor** (str) - 供应商（仅行业镜像将返回这个值） - - **State** (str) - 镜像状态， 可用：Available，制作中：Making， 不可用：Unavailable - - **OsName** (str) - 操作系统名称 + - **CreateTime** (int) - 创建时间，格式为Unix时间戳 + - **Features** (list) - 特殊状态标识， 目前包含NetEnhnced（网络增强1.0）, NetEnhanced_Ultra]（网络增强2.0） - **FuncType** (str) - 行业镜像类型（仅行业镜像将返回这个值） - **ImageDescription** (str) - 镜像描述 - - **Zone** (str) - 可用区，参见 `可用区列表 `_ | - **ImageId** (str) - 镜像ID - **ImageName** (str) - 镜像名称 - - **OsType** (str) - 操作系统类型：Liunx，Windows - - **Features** (list) - 特殊状态标识， 目前包含NetEnhnced（网络增强1.0）, NetEnhanced_Ultra]（网络增强2.0） - - **CreateTime** (int) - 创建时间，格式为Unix时间戳 - **ImageSize** (int) - 镜像大小 - - **MinimalCPU** (str) - 默认值为空'''。当CentOS 7.3/7.4/7.5等镜像会标记为“Broadwell” - **ImageType** (str) - 镜像类型 标准镜像：Base， 行业镜像：Business，自定义镜像：Custom - **IntegratedSoftware** (str) - 集成软件名称（仅行业镜像将返回这个值） - **Links** (str) - 介绍链接（仅行业镜像将返回这个值） + - **MinimalCPU** (str) - 默认值为空'''。当CentOS 7.3/7.4/7.5等镜像会标记为“Broadwell” + - **OsName** (str) - 操作系统名称 + - **OsType** (str) - 操作系统类型：Liunx，Windows + - **State** (str) - 镜像状态， 可用：Available，制作中：Making， 不可用：Unavailable + - **Vendor** (str) - 供应商（仅行业镜像将返回这个值） + - **Zone** (str) - 可用区，参见 `可用区列表 `_ | """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -225,60 +226,60 @@ def describe_uhost_instance(self, req=None, **kwargs): **UHostDiskSet** - **BackupType** (str) - 备份方案。若开通了数据方舟，则为DataArk - - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 + - **DiskId** (str) - 磁盘ID + - **DiskType** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 + - **Drive** (str) - 磁盘盘符 - **Encrypted** (bool) - true: 加密盘 false：非加密盘 - - **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot，数据盘: Data,网络盘：Udisk + - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 - **Name** (str) - UDisk名字（仅当磁盘是UDisk时返回） - - **Drive** (str) - 磁盘盘符 - - **DiskType** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 - - **DiskId** (str) - 磁盘ID - **Size** (int) - 磁盘大小，单位: GB + - **Type** (str) - 【建议不再使用】磁盘类型。系统盘: Boot，数据盘: Data,网络盘：Udisk **UHostIPSet** - - **IPId** (str) - IP资源ID (内网IP无对应的资源ID) - - **IP** (str) - IP地址 - **Bandwidth** (int) - IP对应的带宽, 单位: Mb (内网IP不显示带宽信息) - **Default** (str) - 是否默认的弹性网卡的信息。true: 是默认弹性网卡；其他值：不是。 - - **VPCId** (str) - IP地址对应的VPC ID（北京一当前字段为空） + - **IP** (str) - IP地址 + - **IPId** (str) - IP资源ID (内网IP无对应的资源ID) - **SubnetId** (str) - IP地址对应的子网 ID（北京一当前字段为空） - **Type** (str) - 国际: Internation，BGP: Bgp，内网: Private + - **VPCId** (str) - IP地址对应的VPC ID（北京一当前字段为空） **UHostInstanceSet** - - **UHostType** (str) - 【建议不再使用】云主机机型（旧）。参考 `云主机机型说明 `_ 。 + - **AutoRenew** (str) - 是否自动续费，自动续费：“Yes”，不自动续费：“No” + - **BasicImageId** (str) - 基础镜像ID（指当前自定义镜像的来源镜像） - **BasicImageName** (str) - 基础镜像名称（指当前自定义镜像的来源镜像） - - **OsName** (str) - 创建主机的最初来源镜像的操作系统名称（若直接通过基础镜像创建，此处返回和BasicImageName一致） - - **ImageId** (str) - 【建议不再使用】主机的系统盘ID。 - - **GPU** (int) - GPU个数 + - **BootDiskState** (str) - 系统盘状态 Normal表示初始化完成；Initializing表示在初始化。仍在初始化的系统盘无法制作镜像。 - **CPU** (int) - 虚拟CPU核数，单位: 个 - - **Memory** (int) - 内存大小，单位: MB - - **TotalDiskSpace** (int) - 总的数据盘存储空间。 - - **Zone** (str) - 可用区。参见 `可用区列表 `_ - - **Remark** (str) - 备注 - - **ExpireTime** (int) - 到期时间，格式为Unix时间戳 - - **CreateTime** (int) - 创建时间，格式为Unix时间戳 - - **LifeCycle** (str) - 主机的生命周期类型。目前仅支持Normal：普通； - **ChargeType** (str) - 计费模式，枚举值为： Year，按年付费； Month，按月付费； Dynamic，按需付费（需开启权限）； - - **NetCapability** (str) - 网络增强。Normal: 无；Super： 网络增强1.0； Ultra: 网络增强2.0 - - **BootDiskState** (str) - 系统盘状态 Normal表示初始化完成；Initializing表示在初始化。仍在初始化的系统盘无法制作镜像。 - - **IPSet** (list) - 见 **UHostIPSet** 模型定义 - - **SubnetType** (str) - 【建议不再使用】仅北京A的云主机会返回此字段。基础网络模式：Default；子网模式：Private + - **CreateTime** (int) - 创建时间，格式为Unix时间戳 + - **DiskSet** (list) - 见 **UHostDiskSet** 模型定义 + - **ExpireTime** (int) - 到期时间，格式为Unix时间戳 + - **GPU** (int) - GPU个数 - **HostType** (str) - 【建议不再使用】主机系列：N2，表示系列2；N1，表示系列1 + - **HotplugFeature** (bool) - true: 开启热升级； false，未开启热升级 + - **IPSet** (list) - 见 **UHostIPSet** 模型定义 + - **ImageId** (str) - 【建议不再使用】主机的系统盘ID。 - **IsolationGroup** (str) - 隔离组id，不在隔离组则返回"" - - **BasicImageId** (str) - 基础镜像ID（指当前自定义镜像的来源镜像） - - **Tag** (str) - 业务组名称 + - **LifeCycle** (str) - 主机的生命周期类型。目前仅支持Normal：普通； + - **MachineType** (str) - 云主机机型（新）。参考 `云主机机型说明 `_ 。 + - **Memory** (int) - 内存大小，单位: MB - **Name** (str) - UHost实例名称 - - **TimemachineFeature** (str) - 【建议不再使用】数据方舟模式。枚举值：\\ > Yes: 开启方舟； \\ > no，未开启方舟 + - **NetCapability** (str) - 网络增强。Normal: 无；Super： 网络增强1.0； Ultra: 网络增强2.0 + - **NetworkState** (str) - 【建议不再使用】网络状态。 连接：Connected， 断开：NotConnected + - **OsName** (str) - 创建主机的最初来源镜像的操作系统名称（若直接通过基础镜像创建，此处返回和BasicImageName一致） - **OsType** (str) - 操作系统类别。返回"Linux"或者"Windows" - - **MachineType** (str) - 云主机机型（新）。参考 `云主机机型说明 `_ 。 + - **Remark** (str) - 备注 + - **State** (str) - 实例状态，枚举值：\\ >初始化: Initializing; \\ >启动中: Starting; \\> 运行中: Running; \\> 关机中: Stopping; \\ >关机: Stopped \\ >安装失败: Install Fail; \\ >重启中: Rebooting - **StorageType** (str) - 【建议不再使用】主机磁盘类型。 枚举值为：\\ > LocalDisk，本地磁盘; \\ > UDisk 云盘。\\只要有一块磁盘为本地盘，即返回LocalDisk。 - - **AutoRenew** (str) - 是否自动续费，自动续费：“Yes”，不自动续费：“No” - - **NetworkState** (str) - 【建议不再使用】网络状态。 连接：Connected， 断开：NotConnected - - **HotplugFeature** (bool) - true: 开启热升级； false，未开启热升级 + - **SubnetType** (str) - 【建议不再使用】仅北京A的云主机会返回此字段。基础网络模式：Default；子网模式：Private + - **Tag** (str) - 业务组名称 + - **TimemachineFeature** (str) - 【建议不再使用】数据方舟模式。枚举值：\\ > Yes: 开启方舟； \\ > no，未开启方舟 + - **TotalDiskSpace** (int) - 总的数据盘存储空间。 - **UHostId** (str) - UHost实例ID - - **State** (str) - 实例状态，枚举值：\\ >初始化: Initializing; \\ >启动中: Starting; \\> 运行中: Running; \\> 关机中: Stopping; \\ >关机: Stopped \\ >安装失败: Install Fail; \\ >重启中: Rebooting - - **DiskSet** (list) - 见 **UHostDiskSet** 模型定义 + - **UHostType** (str) - 【建议不再使用】云主机机型（旧）。参考 `云主机机型说明 `_ 。 + - **Zone** (str) - 可用区。参见 `可用区列表 `_ """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -298,16 +299,16 @@ def describe_uhost_tags(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 已有主机的业务组总个数 - **TagSet** (list) - 见 **UHostTagSet** 模型定义 + - **TotalCount** (int) - 已有主机的业务组总个数 **Response Model** **UHostTagSet** - - **Zone** (str) - 可用区 - **Tag** (str) - 业务组名称 - **TotalCount** (int) - 该业务组中包含的主机个数 + - **Zone** (str) - 可用区 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -323,22 +324,22 @@ def get_uhost_instance_price(self, req=None, **kwargs): - **ProjectId** (str) - (Config) 项目ID。不填写为默认项目，子帐号必须填写。 请参考 `GetProjectList接口 `_ - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ - - **CPU** (int) - (Required) 虚拟CPU核数。可选参数：1-32（可选范围与UHostType相关）。默认值: 4 - - **Count** (int) - (Required) 【未启用】购买台数，范围[1,5] + - **CPU** (int) - (Required) CPU核数。可选参数：1-64。可选范围参照控制台。默认值: 4 + - **Count** (int) - (Required) 购买台数，范围[1,5] - **ImageId** (str) - (Required) 镜像Id，可通过 `DescribeImage `_ 获取镜像ID - - **Memory** (int) - (Required) 内存大小。单位：MB。范围 ：[1024, 262144]，取值为1024的倍数（可选范围与UHostType相关）。默认值：8192 + - **Memory** (int) - (Required) 内存大小。单位：MB。范围 ：[1024, 262144]，取值为1024的倍数（可选范围参照好控制台）。默认值：8192 - **ChargeType** (str) - 计费模式。枚举值为： \\ > Year，按年付费； \\ > Month，按月付费；\\ > Dynamic，按小时付费 \\ 默认为月付。 - **DiskSpace** (int) - 【待废弃】数据盘大小，单位: GB，范围[0,1000]，步长: 10，默认值: 0 - **Disks** (list) - 见 **GetUHostInstancePriceParamDisks** 模型定义 - - **GPU** (int) - GPU卡核心数。仅GPU机型支持此字段（可选范围与UHostType相关）。 + - **GPU** (int) - GPU卡核心数。仅GPU机型支持此字段。 - **GpuType** (str) - GPU类型，枚举值["K80", "P40", "V100"] - **LifeCycle** (int) - 【未支持】1：普通云主机；2：抢占性云主机；默认普通 - - **MachineType** (str) - 云主机类型，枚举值["N", "C", "G", "O"] - - **NetCapability** (str) - 网络增强。枚举值：Normal，不开启; Super，开启网络增强1.0; Ultra，开启网络增强2.0； 默认值为Normal。Normal和Ultra不计费。 + - **MachineType** (str) - 云主机机型（V2版本概念）。枚举值["N", "C", "G", "O"]。参考 `云主机机型说明 `_ 。 + - **NetCapability** (str) - 网络增强。枚举值：Normal，不开启; Super，开启网络增强1.0。 默认值为Normal。 - **Quantity** (int) - 购买时长。默认: 1。按小时购买(Dynamic)时无需此参数。 月付时，此参数传0，代表了购买至月末。 - **StorageType** (str) - 【待废弃】磁盘类型，同时设定系统盘和数据盘， 枚举值为：LocalDisk，本地磁盘; UDisk，云硬盘; 默认为LocalDisk 仅部分可用区支持云硬盘方式的主机存储方式，具体请查询控制台。 - **TimemachineFeature** (str) - 【待废弃】方舟机型。No，Yes。默认是No。 - - **UHostType** (str) - 云主机机型。参考 `云主机机型说明 `_ 。 + - **UHostType** (str) - 【待废弃】云主机机型（V1版本概念）。参考 `云主机机型说明 `_ 。 - **Zone** (str) - 可用区。参见 `可用区列表 `_ **Response** @@ -349,10 +350,10 @@ def get_uhost_instance_price(self, req=None, **kwargs): **GetUHostInstancePriceParamDisks** + - **BackupType** (str) - 磁盘备份方案。枚举值：\\ > NONE，无备份 \\ > DATAARK，数据方舟 \\ 当前磁盘支持的备份模式参考 `磁盘类型 `_ + - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 - **Size** (int) - 磁盘大小，单位GB。请参考 `磁盘类型 `_ 。 - **Type** (str) - 磁盘类型。请参考 `磁盘类型 `_ 。 - - **IsBoot** (str) - 是否是系统盘。枚举值：\\ > True，是系统盘 \\ > False，是数据盘（默认）。Disks数组中有且只能有一块盘是系统盘。 - - **BackupType** (str) - 磁盘备份方案。枚举值：\\ > NONE，无备份 \\ > DATAARK，数据方舟 \\ 当前磁盘支持的备份模式参考 `磁盘类型 `_ **Response Model** @@ -380,10 +381,10 @@ def get_uhost_instance_vnc_info(self, req=None, **kwargs): **Response** + - **UhostId** (str) - UHost实例ID - **VncIP** (str) - Vnc登录IP - - **VncPort** (int) - Vnc登录端口 - **VncPassword** (str) - Vnc 登录密码 - - **UhostId** (str) - UHost实例ID + - **VncPort** (int) - Vnc登录端口 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -401,10 +402,10 @@ def get_uhost_upgrade_price(self, req=None, **kwargs): - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ - **UHostId** (str) - (Required) UHost实例ID。 参见 `DescribeUHostInstance `_ 。 - **BootDiskSpace** (int) - 【待废弃】系统大小，单位: GB，范围[20,100]，步长: 10。 - - **CPU** (int) - 虚拟CPU核数。可选参数：1-32（可选范围与UHostType相关）。默认值为当前实例的CPU核数。 + - **CPU** (int) - 虚拟CPU核数。可选参数：1-64（可选范围参考控制台）。默认值为当前实例的CPU核数。 - **DiskSpace** (int) - 【待废弃】数据盘大小，单位: GB，范围[0,1000]，步长: 10， 默认值是该主机当前数据盘大小。 - **HostType** (str) - 【待废弃】主机系列，目前支持N1,N2 - - **Memory** (int) - 内存大小。单位：MB。范围 ：[1024, 262144]，取值为1024的倍数（可选范围与UHostType相关）。默认值为当前实例的内存大小。 + - **Memory** (int) - 内存大小。单位：MB。范围 ：[1024, 262144]，取值为1024的倍数（可选范围参考控制台）。默认值为当前实例的内存大小。 - **NetCapValue** (int) - 网卡升降级（1，表示升级，2表示降级，0表示不变） - **TimemachineFeature** (str) - 方舟机型。No，Yes。默认是No。 - **Zone** (str) - 可用区。参见 `可用区列表 `_ @@ -615,7 +616,7 @@ def resize_attached_disk(self, req=None, **kwargs): - **DiskId** (str) - (Required) 磁盘ID。参见 `DescribeUHostInstance `_ 返回值中的DiskSet。 - **DiskSpace** (int) - (Required) 磁盘大小，单位GB，步长为10。取值范围需大于当前磁盘大小，最大值请参考 `磁盘类型 `_ 。 - **UHostId** (str) - (Required) UHost实例ID。 参见 `DescribeUHostInstance `_ 。 - - **Zone** (str) - 可用区。参见 `可用区列表 `_ + - **Zone** (str) - (Required) 可用区。参见 `可用区列表 `_ **Response** diff --git a/ucloud/services/uhost/schemas/apis.py b/ucloud/services/uhost/schemas/apis.py index f26293f..0e28b25 100644 --- a/ucloud/services/uhost/schemas/apis.py +++ b/ucloud/services/uhost/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.uhost.schemas import models @@ -17,16 +18,16 @@ class CopyCustomImageRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SourceImageId": fields.Str(required=True, dump_to="SourceImageId"), - "TargetProjectId": fields.Str(required=True, dump_to="TargetProjectId"), - "TargetRegion": fields.Str(required=False, dump_to="TargetRegion"), - "TargetImageName": fields.Str(required=False, dump_to="TargetImageName"), "TargetImageDescription": fields.Str( required=False, dump_to="TargetImageDescription" ), + "TargetImageName": fields.Str(required=False, dump_to="TargetImageName"), + "TargetProjectId": fields.Str(required=True, dump_to="TargetProjectId"), + "TargetRegion": fields.Str(required=False, dump_to="TargetRegion"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -50,11 +51,11 @@ class CreateCustomImageRequestSchema(schema.RequestSchema): fields = { "ImageDescription": fields.Str(required=False, dump_to="ImageDescription"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), + "ImageName": fields.Str(required=True, dump_to="ImageName"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "UHostId": fields.Str(required=True, dump_to="UHostId"), - "ImageName": fields.Str(required=True, dump_to="ImageName"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -73,49 +74,49 @@ class CreateCustomImageResponseSchema(schema.ResponseSchema): class CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSHSchema(schema.RequestSchema): - """ CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSH - CreateUHostInstance + """ CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSH - """ fields = { + "Area": fields.Str(required=False, dump_to="Area"), "AreaCode": fields.Str(required=False, dump_to="AreaCode"), "Port": fields.Int(required=False, dump_to="Port"), - "Area": fields.Str(required=False, dump_to="Area"), } class CreateUHostInstanceParamNetworkInterfaceEIPSchema(schema.RequestSchema): - """ CreateUHostInstanceParamNetworkInterfaceEIP - CreateUHostInstance + """ CreateUHostInstanceParamNetworkInterfaceEIP - """ fields = { "Bandwidth": fields.Int(required=False, dump_to="Bandwidth"), - "ShareBandwidthId": fields.Str(required=False, dump_to="ShareBandwidthId"), - "OperatorName": fields.Str(required=False, dump_to="OperatorName"), "CouponId": fields.Str(required=False, dump_to="CouponId"), "GlobalSSH": CreateUHostInstanceParamNetworkInterfaceEIPGlobalSSHSchema( required=False, dump_to="GlobalSSH" ), + "OperatorName": fields.Str(required=False, dump_to="OperatorName"), "PayMode": fields.Str(required=False, dump_to="PayMode"), + "ShareBandwidthId": fields.Str(required=False, dump_to="ShareBandwidthId"), } class CreateUHostInstanceParamDisksSchema(schema.RequestSchema): - """ CreateUHostInstanceParamDisks - CreateUHostInstance + """ CreateUHostInstanceParamDisks - """ fields = { - "IsBoot": fields.Str(required=True, dump_to="IsBoot"), - "Type": fields.Str(required=True, dump_to="Type"), "BackupType": fields.Str(required=False, dump_to="BackupType"), - "Size": fields.Int(required=True, dump_to="Size"), - "Encrypted": fields.Bool(required=False, dump_to="Encrypted"), "CouponId": fields.Str(required=False, dump_to="CouponId"), + "Encrypted": fields.Bool(required=False, dump_to="Encrypted"), + "IsBoot": fields.Str(required=True, dump_to="IsBoot"), "KmsKeyId": fields.Str(required=False, dump_to="KmsKeyId"), + "Size": fields.Int(required=True, dump_to="Size"), + "Type": fields.Str(required=True, dump_to="Type"), } class CreateUHostInstanceParamNetworkInterfaceSchema(schema.RequestSchema): - """ CreateUHostInstanceParamNetworkInterface - CreateUHostInstance + """ CreateUHostInstanceParamNetworkInterface - """ fields = { @@ -130,50 +131,50 @@ class CreateUHostInstanceRequestSchema(schema.RequestSchema): """ fields = { - "PrivateIp": fields.List(fields.Str()), - "SubnetId": fields.Str(required=False, dump_to="SubnetId"), - "InstallAgent": fields.Str(required=False, dump_to="InstallAgent"), - "StorageType": fields.Str(required=False, dump_to="StorageType"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "ImageId": fields.Str(required=True, dump_to="ImageId"), - "Name": fields.Str(required=False, dump_to="Name"), + "AlarmTemplateId": fields.Int(required=False, dump_to="AlarmTemplateId"), "BootDiskSpace": fields.Int(required=False, dump_to="BootDiskSpace"), - "Quantity": fields.Int(required=False, dump_to="Quantity"), - "KeyPair": fields.Str(required=False, dump_to="KeyPair"), - "NetCapability": fields.Str(required=False, dump_to="NetCapability"), - "HostType": fields.Str(required=False, dump_to="HostType"), - "SetId": fields.Int(required=False, dump_to="SetId"), - "MachineType": fields.Str(required=False, dump_to="MachineType"), - "NetworkInterface": fields.List( - CreateUHostInstanceParamNetworkInterfaceSchema() - ), - "Password": fields.Base64(required=True, dump_to="Password"), "CPU": fields.Int(required=False, dump_to="CPU"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), - "NetworkId": fields.Str(required=False, dump_to="NetworkId"), - "GpuType": fields.Str(required=False, dump_to="GpuType"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "TimemachineFeature": fields.Str(required=False, dump_to="TimemachineFeature"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), "DiskPassword": fields.Str(required=False, dump_to="DiskPassword"), - "Memory": fields.Int(required=False, dump_to="Memory"), + "DiskSpace": fields.Int(required=False, dump_to="DiskSpace"), + "Disks": fields.List(CreateUHostInstanceParamDisksSchema()), "GPU": fields.Int(required=False, dump_to="GPU"), + "GpuType": fields.Str(required=False, dump_to="GpuType"), + "HostType": fields.Str(required=False, dump_to="HostType"), + "HotplugFeature": fields.Bool(required=False, dump_to="HotplugFeature"), + "ImageId": fields.Str(required=True, dump_to="ImageId"), + "InstallAgent": fields.Str(required=False, dump_to="InstallAgent"), "IsolationGroup": fields.Str(required=False, dump_to="IsolationGroup"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Disks": fields.List(CreateUHostInstanceParamDisksSchema()), + "KeyPair": fields.Str(required=False, dump_to="KeyPair"), "LoginMode": fields.Str(required=True, dump_to="LoginMode"), + "MachineType": fields.Str(required=False, dump_to="MachineType"), + "MaxCount": fields.Int(required=False, dump_to="MaxCount"), + "Memory": fields.Int(required=False, dump_to="Memory"), "MinimalCpuPlatform": fields.Str(required=False, dump_to="MinimalCpuPlatform"), - "Tag": fields.Str(required=False, dump_to="Tag"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "Name": fields.Str(required=False, dump_to="Name"), + "NetCapability": fields.Str(required=False, dump_to="NetCapability"), + "NetworkId": fields.Str(required=False, dump_to="NetworkId"), + "NetworkInterface": fields.List( + CreateUHostInstanceParamNetworkInterfaceSchema() + ), + "Password": fields.Base64(required=True, dump_to="Password"), + "PrivateIp": fields.List(fields.Str()), + "PrivateMac": fields.Str(required=False, dump_to="PrivateMac"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), "Region": fields.Str(required=True, dump_to="Region"), - "UHostType": fields.Str(required=False, dump_to="UHostType"), - "AlarmTemplateId": fields.Int(required=False, dump_to="AlarmTemplateId"), - "UserDataScript": fields.Str(required=False, dump_to="UserDataScript"), "ResourceType": fields.Int(required=False, dump_to="ResourceType"), - "DiskSpace": fields.Int(required=False, dump_to="DiskSpace"), - "HotplugFeature": fields.Bool(required=False, dump_to="HotplugFeature"), - "PrivateMac": fields.Str(required=False, dump_to="PrivateMac"), "SecurityGroupId": fields.Str(required=False, dump_to="SecurityGroupId"), - "MaxCount": fields.Int(required=False, dump_to="MaxCount"), + "SetId": fields.Int(required=False, dump_to="SetId"), + "StorageType": fields.Str(required=False, dump_to="StorageType"), + "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "TimemachineFeature": fields.Str(required=False, dump_to="TimemachineFeature"), + "UHostType": fields.Str(required=False, dump_to="UHostType"), + "UserDataScript": fields.Str(required=False, dump_to="UserDataScript"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -182,8 +183,8 @@ class CreateUHostInstanceResponseSchema(schema.ResponseSchema): """ fields = { - "UHostIds": fields.List(fields.Str(), required=False, load_from="UHostIds"), "IPs": fields.List(fields.Str(), required=False, load_from="IPs"), + "UHostIds": fields.List(fields.Str(), required=False, load_from="UHostIds"), } @@ -199,15 +200,15 @@ class DescribeImageRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "ImageType": fields.Str(required=False, dump_to="ImageType"), "ImageId": fields.Str(required=False, dump_to="ImageId"), + "ImageType": fields.Str(required=False, dump_to="ImageType"), + "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "OsType": fields.Str(required=False, dump_to="OsType"), "PriceSet": fields.Int(required=False, dump_to="PriceSet"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), - "OsType": fields.Str(required=False, dump_to="OsType"), - "Offset": fields.Int(required=False, dump_to="Offset"), - "Limit": fields.Int(required=False, dump_to="Limit"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -216,10 +217,10 @@ class DescribeImageResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "ImageSet": fields.List( models.UHostImageSetSchema(), required=False, load_from="ImageSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -235,17 +236,17 @@ class DescribeUHostInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "IsolationGroup": fields.Str(required=False, dump_to="IsolationGroup"), "LifeCycle": fields.Int(required=False, dump_to="LifeCycle"), - "Offset": fields.Int(required=False, dump_to="Offset"), - "Tag": fields.Str(required=False, dump_to="Tag"), "Limit": fields.Int(required=False, dump_to="Limit"), - "IsolationGroup": fields.Str(required=False, dump_to="IsolationGroup"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "Tag": fields.Str(required=False, dump_to="Tag"), "UHostIds": fields.List(fields.Str()), + "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -273,9 +274,9 @@ class DescribeUHostTagsRequestSchema(schema.RequestSchema): """ fields = { + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -284,10 +285,10 @@ class DescribeUHostTagsResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "TagSet": fields.List( models.UHostTagSetSchema(), required=False, load_from="TagSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -299,14 +300,14 @@ class DescribeUHostTagsResponseSchema(schema.ResponseSchema): class GetUHostInstancePriceParamDisksSchema(schema.RequestSchema): - """ GetUHostInstancePriceParamDisks - GetUHostInstancePrice + """ GetUHostInstancePriceParamDisks - """ fields = { "BackupType": fields.Str(required=False, dump_to="BackupType"), "IsBoot": fields.Str(required=True, dump_to="IsBoot"), - "Type": fields.Str(required=True, dump_to="Type"), "Size": fields.Int(required=True, dump_to="Size"), + "Type": fields.Str(required=True, dump_to="Type"), } @@ -315,25 +316,25 @@ class GetUHostInstancePriceRequestSchema(schema.RequestSchema): """ fields = { - "NetCapability": fields.Str(required=False, dump_to="NetCapability"), - "LifeCycle": fields.Int(required=False, dump_to="LifeCycle"), - "Quantity": fields.Int(required=False, dump_to="Quantity"), "CPU": fields.Int(required=True, dump_to="CPU"), - "Memory": fields.Int(required=True, dump_to="Memory"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), - "TimemachineFeature": fields.Str(required=False, dump_to="TimemachineFeature"), + "Count": fields.Int(required=True, dump_to="Count"), + "DiskSpace": fields.Int(required=False, dump_to="DiskSpace"), + "Disks": fields.List(GetUHostInstancePriceParamDisksSchema()), + "GPU": fields.Int(required=False, dump_to="GPU"), + "GpuType": fields.Str(required=False, dump_to="GpuType"), + "ImageId": fields.Str(required=True, dump_to="ImageId"), + "LifeCycle": fields.Int(required=False, dump_to="LifeCycle"), "MachineType": fields.Str(required=False, dump_to="MachineType"), - "Zone": fields.Str(required=False, dump_to="Zone"), + "Memory": fields.Int(required=True, dump_to="Memory"), + "NetCapability": fields.Str(required=False, dump_to="NetCapability"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "ImageId": fields.Str(required=True, dump_to="ImageId"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), "StorageType": fields.Str(required=False, dump_to="StorageType"), - "Disks": fields.List(GetUHostInstancePriceParamDisksSchema()), + "TimemachineFeature": fields.Str(required=False, dump_to="TimemachineFeature"), "UHostType": fields.Str(required=False, dump_to="UHostType"), - "GpuType": fields.Str(required=False, dump_to="GpuType"), - "Region": fields.Str(required=True, dump_to="Region"), - "Count": fields.Int(required=True, dump_to="Count"), - "GPU": fields.Int(required=False, dump_to="GPU"), - "DiskSpace": fields.Int(required=False, dump_to="DiskSpace"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -360,10 +361,10 @@ class GetUHostInstanceVncInfoRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "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=False, dump_to="Zone"), } @@ -372,10 +373,10 @@ class GetUHostInstanceVncInfoResponseSchema(schema.ResponseSchema): """ fields = { + "UhostId": fields.Str(required=False, load_from="UhostId"), "VncIP": fields.Str(required=False, load_from="VncIP"), - "VncPort": fields.Int(required=False, load_from="VncPort"), "VncPassword": fields.Str(required=False, load_from="VncPassword"), - "UhostId": fields.Str(required=False, load_from="UhostId"), + "VncPort": fields.Int(required=False, load_from="VncPort"), } @@ -391,17 +392,17 @@ class GetUHostUpgradePriceRequestSchema(schema.RequestSchema): """ fields = { - "HostType": fields.Str(required=False, dump_to="HostType"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), + "BootDiskSpace": fields.Int(required=False, dump_to="BootDiskSpace"), "CPU": fields.Int(required=False, dump_to="CPU"), - "TimemachineFeature": fields.Str(required=False, dump_to="TimemachineFeature"), - "NetCapValue": fields.Int(required=False, dump_to="NetCapValue"), "DiskSpace": fields.Int(required=False, dump_to="DiskSpace"), - "BootDiskSpace": fields.Int(required=False, dump_to="BootDiskSpace"), + "HostType": fields.Str(required=False, dump_to="HostType"), + "Memory": fields.Int(required=False, dump_to="Memory"), + "NetCapValue": fields.Int(required=False, dump_to="NetCapValue"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "TimemachineFeature": fields.Str(required=False, dump_to="TimemachineFeature"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Memory": fields.Int(required=False, dump_to="Memory"), } @@ -424,15 +425,15 @@ class ImportCustomImageRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Format": fields.Str(required=True, dump_to="Format"), "Auth": fields.Bool(required=True, dump_to="Auth"), + "Format": fields.Str(required=True, dump_to="Format"), "ImageDescription": fields.Str(required=False, dump_to="ImageDescription"), + "ImageName": fields.Str(required=True, dump_to="ImageName"), "OsName": fields.Str(required=True, dump_to="OsName"), + "OsType": fields.Str(required=True, dump_to="OsType"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), - "ImageName": fields.Str(required=True, dump_to="ImageName"), "UFileUrl": fields.Str(required=True, dump_to="UFileUrl"), - "OsType": fields.Str(required=True, dump_to="OsType"), } @@ -456,10 +457,10 @@ class ModifyUHostInstanceNameRequestSchema(schema.RequestSchema): fields = { "Name": fields.Str(required=False, dump_to="Name"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "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=False, dump_to="Zone"), } @@ -482,11 +483,11 @@ class ModifyUHostInstanceRemarkRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Region": fields.Str(required=True, dump_to="Region"), "Remark": fields.Str(required=False, dump_to="Remark"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -509,11 +510,11 @@ class ModifyUHostInstanceTagRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), - "Tag": fields.Str(required=False, dump_to="Tag"), "Region": fields.Str(required=True, dump_to="Region"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -537,8 +538,8 @@ class PoweroffUHostInstanceRequestSchema(schema.RequestSchema): fields = { "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), "Region": fields.Str(required=True, dump_to="Region"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -562,11 +563,11 @@ class RebootUHostInstanceRequestSchema(schema.RequestSchema): """ fields = { - "UHostId": fields.Str(required=True, dump_to="UHostId"), "DiskPassword": fields.Str(required=False, dump_to="DiskPassword"), + "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=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -589,16 +590,16 @@ class ReinstallUHostInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "Password": fields.Base64(required=False, dump_to="Password"), - "ImageId": fields.Str(required=False, dump_to="ImageId"), "BootDiskSpace": fields.Int(required=False, dump_to="BootDiskSpace"), + "DNSServers": fields.List(fields.Str()), + "ImageId": fields.Str(required=False, dump_to="ImageId"), + "Password": fields.Base64(required=False, dump_to="Password"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Region": fields.Str(required=True, dump_to="Region"), "ReserveDisk": fields.Str(required=False, dump_to="ReserveDisk"), "ResourceType": fields.Int(required=False, dump_to="ResourceType"), - "DNSServers": fields.List(fields.Str()), + "UHostId": fields.Str(required=True, dump_to="UHostId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -621,11 +622,11 @@ class ResetUHostInstancePasswordRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), + "Password": fields.Base64(required=True, dump_to="Password"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "UHostId": fields.Str(required=True, dump_to="UHostId"), - "Password": fields.Base64(required=True, dump_to="Password"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -649,11 +650,11 @@ class ResizeAttachedDiskRequestSchema(schema.RequestSchema): fields = { "DiskId": fields.Str(required=True, dump_to="DiskId"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), + "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "UHostId": fields.Str(required=True, dump_to="UHostId"), - "DiskSpace": fields.Int(required=True, dump_to="DiskSpace"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -676,15 +677,15 @@ class ResizeUHostInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), + "BootDiskSpace": fields.Int(required=False, dump_to="BootDiskSpace"), "CPU": fields.Int(required=False, dump_to="CPU"), "DiskSpace": fields.Int(required=False, dump_to="DiskSpace"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), "Memory": fields.Int(required=False, dump_to="Memory"), - "BootDiskSpace": fields.Int(required=False, dump_to="BootDiskSpace"), "NetCapValue": fields.Int(required=False, dump_to="NetCapValue"), + "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=False, dump_to="Zone"), } @@ -707,11 +708,11 @@ class StartUHostInstanceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), + "DiskPassword": fields.Str(required=False, dump_to="DiskPassword"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "UHostId": fields.Str(required=True, dump_to="UHostId"), - "DiskPassword": fields.Str(required=False, dump_to="DiskPassword"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -735,8 +736,8 @@ class StopUHostInstanceRequestSchema(schema.RequestSchema): fields = { "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "UHostId": fields.Str(required=True, dump_to="UHostId"), "Region": fields.Str(required=True, dump_to="Region"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -760,8 +761,8 @@ class TerminateCustomImageRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "ImageId": fields.Str(required=True, dump_to="ImageId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), } @@ -785,13 +786,13 @@ class TerminateUHostInstanceRequestSchema(schema.RequestSchema): """ fields = { - "UHostId": fields.Str(required=True, dump_to="UHostId"), "Destroy": fields.Int(required=False, dump_to="Destroy"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ReleaseEIP": fields.Bool(required=False, dump_to="ReleaseEIP"), "ReleaseUDisk": fields.Bool(required=False, dump_to="ReleaseUDisk"), - "Region": fields.Str(required=True, dump_to="Region"), + "UHostId": fields.Str(required=True, dump_to="UHostId"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -800,8 +801,8 @@ class TerminateUHostInstanceResponseSchema(schema.ResponseSchema): """ fields = { - "UHostId": fields.Str(required=False, load_from="UHostId"), "InRecycle": fields.Str(required=True, load_from="InRecycle"), + "UHostId": fields.Str(required=False, load_from="UHostId"), } @@ -818,8 +819,8 @@ class UpgradeToArkUHostInstanceRequestSchema(schema.RequestSchema): fields = { "CouponId": fields.Str(required=False, dump_to="CouponId"), - "UHostIds": fields.List(fields.Str()), "Region": fields.Str(required=True, dump_to="Region"), + "UHostIds": fields.List(fields.Str()), "Zone": fields.Str(required=True, dump_to="Zone"), } diff --git a/ucloud/services/uhost/schemas/models.py b/ucloud/services/uhost/schemas/models.py index ceacbd8..b309802 100644 --- a/ucloud/services/uhost/schemas/models.py +++ b/ucloud/services/uhost/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -8,56 +9,56 @@ class UHostImageSetSchema(schema.ResponseSchema): """ fields = { - "FuncType": fields.Str(required=False, load_from="FuncType"), "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "ImageSize": fields.Int(required=False, load_from="ImageSize"), - "ImageName": fields.Str(required=False, load_from="ImageName"), - "ImageId": fields.Str(required=False, load_from="ImageId"), - "OsName": fields.Str(required=False, load_from="OsName"), "Features": fields.List(fields.Str()), - "State": fields.Str(required=False, load_from="State"), - "MinimalCPU": fields.Str(required=False, load_from="MinimalCPU"), - "Zone": fields.Str(required=False, load_from="Zone"), - "Links": fields.Str(required=False, load_from="Links"), - "OsType": fields.Str(required=False, load_from="OsType"), + "FuncType": fields.Str(required=False, load_from="FuncType"), + "ImageDescription": fields.Str(required=False, load_from="ImageDescription"), + "ImageId": fields.Str(required=False, load_from="ImageId"), + "ImageName": fields.Str(required=False, load_from="ImageName"), + "ImageSize": fields.Int(required=False, load_from="ImageSize"), + "ImageType": fields.Str(required=False, load_from="ImageType"), "IntegratedSoftware": fields.Str( required=False, load_from="IntegratedSoftware" ), + "Links": fields.Str(required=False, load_from="Links"), + "MinimalCPU": fields.Str(required=False, load_from="MinimalCPU"), + "OsName": fields.Str(required=False, load_from="OsName"), + "OsType": fields.Str(required=False, load_from="OsType"), + "State": fields.Str(required=False, load_from="State"), "Vendor": fields.Str(required=False, load_from="Vendor"), - "ImageDescription": fields.Str(required=False, load_from="ImageDescription"), - "ImageType": fields.Str(required=False, load_from="ImageType"), + "Zone": fields.Str(required=False, load_from="Zone"), } -class UHostIPSetSchema(schema.ResponseSchema): - """ UHostIPSet - DescribeUHostInstance +class UHostDiskSetSchema(schema.ResponseSchema): + """ UHostDiskSet - DescribeUHostInstance """ fields = { - "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), - "Default": fields.Str(required=False, load_from="Default"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "BackupType": fields.Str(required=False, load_from="BackupType"), + "DiskId": fields.Str(required=False, load_from="DiskId"), + "DiskType": fields.Str(required=True, load_from="DiskType"), + "Drive": fields.Str(required=False, load_from="Drive"), + "Encrypted": fields.Bool(required=False, load_from="Encrypted"), + "IsBoot": fields.Str(required=True, load_from="IsBoot"), + "Name": fields.Str(required=False, load_from="Name"), + "Size": fields.Int(required=False, load_from="Size"), "Type": fields.Str(required=False, load_from="Type"), - "IPId": fields.Str(required=False, load_from="IPId"), - "IP": fields.Str(required=False, load_from="IP"), } -class UHostDiskSetSchema(schema.ResponseSchema): - """ UHostDiskSet - DescribeUHostInstance +class UHostIPSetSchema(schema.ResponseSchema): + """ UHostIPSet - DescribeUHostInstance """ fields = { - "DiskId": fields.Str(required=False, load_from="DiskId"), - "Size": fields.Int(required=False, load_from="Size"), - "DiskType": fields.Str(required=True, load_from="DiskType"), + "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), + "Default": fields.Str(required=False, load_from="Default"), + "IP": fields.Str(required=False, load_from="IP"), + "IPId": fields.Str(required=False, load_from="IPId"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), "Type": fields.Str(required=False, load_from="Type"), - "Name": fields.Str(required=False, load_from="Name"), - "Drive": fields.Str(required=False, load_from="Drive"), - "BackupType": fields.Str(required=False, load_from="BackupType"), - "IsBoot": fields.Str(required=True, load_from="IsBoot"), - "Encrypted": fields.Bool(required=False, load_from="Encrypted"), + "VPCId": fields.Str(required=False, load_from="VPCId"), } @@ -67,40 +68,40 @@ class UHostInstanceSetSchema(schema.ResponseSchema): fields = { "AutoRenew": fields.Str(required=False, load_from="AutoRenew"), + "BasicImageId": fields.Str(required=False, load_from="BasicImageId"), + "BasicImageName": fields.Str(required=False, load_from="BasicImageName"), + "BootDiskState": fields.Str(required=False, load_from="BootDiskState"), + "CPU": fields.Int(required=False, load_from="CPU"), + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "DiskSet": fields.List(UHostDiskSetSchema()), + "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), + "GPU": fields.Int(required=False, load_from="GPU"), + "HostType": fields.Str(required=False, load_from="HostType"), "HotplugFeature": fields.Bool(required=False, load_from="HotplugFeature"), - "LifeCycle": fields.Str(required=False, load_from="LifeCycle"), + "IPSet": fields.List(UHostIPSetSchema()), + "ImageId": fields.Str(required=False, load_from="ImageId"), "IsolationGroup": fields.Str(required=False, load_from="IsolationGroup"), + "LifeCycle": fields.Str(required=False, load_from="LifeCycle"), "MachineType": fields.Str(required=False, load_from="MachineType"), - "ImageId": fields.Str(required=False, load_from="ImageId"), - "TimemachineFeature": fields.Str( - required=False, load_from="TimemachineFeature" - ), - "SubnetType": fields.Str(required=False, load_from="SubnetType"), - "GPU": fields.Int(required=False, load_from="GPU"), - "Zone": fields.Str(required=False, load_from="Zone"), - "BasicImageName": fields.Str(required=False, load_from="BasicImageName"), - "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "CPU": fields.Int(required=False, load_from="CPU"), + "Memory": fields.Int(required=False, load_from="Memory"), + "Name": fields.Str(required=False, load_from="Name"), + "NetCapability": fields.Str(required=False, load_from="NetCapability"), + "NetworkState": fields.Str(required=False, load_from="NetworkState"), "OsName": fields.Str(required=False, load_from="OsName"), - "UHostId": fields.Str(required=False, load_from="UHostId"), + "OsType": fields.Str(required=False, load_from="OsType"), + "Remark": fields.Str(required=False, load_from="Remark"), "State": fields.Str(required=False, load_from="State"), - "IPSet": fields.List(UHostIPSetSchema()), - "NetworkState": fields.Str(required=False, load_from="NetworkState"), - "BootDiskState": fields.Str(required=False, load_from="BootDiskState"), "StorageType": fields.Str(required=False, load_from="StorageType"), - "BasicImageId": fields.Str(required=False, load_from="BasicImageId"), - "Remark": fields.Str(required=False, load_from="Remark"), - "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), - "DiskSet": fields.List(UHostDiskSetSchema()), + "SubnetType": fields.Str(required=False, load_from="SubnetType"), + "Tag": fields.Str(required=False, load_from="Tag"), + "TimemachineFeature": fields.Str( + required=False, load_from="TimemachineFeature" + ), "TotalDiskSpace": fields.Int(required=False, load_from="TotalDiskSpace"), + "UHostId": fields.Str(required=False, load_from="UHostId"), "UHostType": fields.Str(required=False, load_from="UHostType"), - "Name": fields.Str(required=False, load_from="Name"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "NetCapability": fields.Str(required=False, load_from="NetCapability"), - "Tag": fields.Str(required=False, load_from="Tag"), - "Memory": fields.Int(required=False, load_from="Memory"), - "OsType": fields.Str(required=False, load_from="OsType"), - "HostType": fields.Str(required=False, load_from="HostType"), + "Zone": fields.Str(required=False, load_from="Zone"), } diff --git a/ucloud/services/ulb/client.py b/ucloud/services/ulb/client.py index a8d9307..6fa55d9 100644 --- a/ucloud/services/ulb/client.py +++ b/ucloud/services/ulb/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.ulb.schemas import apis @@ -177,12 +178,12 @@ def create_vserver(self, req=None, **kwargs): - **Region** (str) - (Config) 地域。 参见 `地域和可用区列表 `_ - **ULBId** (str) - (Required) 负载均衡实例ID - **ClientTimeout** (int) - ListenType为RequestProxy时表示空闲连接的回收时间，单位：秒，取值范围：时(0，86400]，默认值为60；ListenType为PacketsTransmit时表示连接保持的时间，单位：秒，取值范围：[60，900]，0 表示禁用连接保持 - - **Domain** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查路径 + - **Domain** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查域名 - **FrontendPort** (int) - VServer后端端口，取值范围[1-65535]；默认值为80 - **ListenType** (str) - 监听器类型，枚举值为：RequestProxy -> 请求代理；PacketsTransmit -> 报文转发；默认为"RequestProxy" - **Method** (str) - VServer负载均衡模式，枚举值：Roundrobin -> 轮询;Source -> 源地址；ConsistentHash -> 一致性哈希；SourcePort -> 源地址（计算端口）；ConsistentHashPort -> 一致性哈希（计算端口）; WeightRoundrobin -> 加权轮询; Leastconn -> 最小连接数。ConsistentHash，SourcePort，ConsistentHashPort 只在报文转发中使用；Leastconn只在请求代理中使用；Roundrobin、Source和WeightRoundrobin在请求代理和报文转发中使用。默认为："Roundrobin" - **MonitorType** (str) - 健康检查类型，枚举值：Port -> 端口检查；Path -> 路径检查； - - **Path** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查域名 + - **Path** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查路径 - **PersistenceInfo** (str) - 根据PersistenceType确认； None和ServerInsert： 此字段无意义； UserDefined：此字段传入自定义会话保持String - **PersistenceType** (str) - VServer会话保持方式，默认关闭会话保持。枚举值：None -> 关闭；ServerInsert -> 自动生成KEY；UserDefined -> 用户自定义KEY。 - **Protocol** (str) - VServer实例的协议，请求代理模式下有 HTTP、HTTPS、TCP，报文转发下有 TCP，UDP。默认为“HTTP" @@ -293,16 +294,16 @@ def describe_ssl(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 满足条件的SSL证书总数 - **DataSet** (list) - 见 **ULBSSLSet** 模型定义 + - **TotalCount** (int) - 满足条件的SSL证书总数 **Response Model** **ULBSSLSet** - - **SSLName** (str) - SSL证书的名字 - **HashValue** (str) - - **SSLId** (str) - SSL证书的Id + - **SSLName** (str) - SSL证书的名字 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -327,98 +328,98 @@ def describe_ulb(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 满足条件的ULB总数 - **DataSet** (list) - 见 **ULBSet** 模型定义 + - **TotalCount** (int) - 满足条件的ULB总数 **Response Model** **PolicyBackendSet** - - **PrivateIP** (str) - 后端资源的内网IP - - **ResourceName** (str) - 后端资源的实例名称 - **BackendId** (str) - 所添加的后端资源在ULB中的对象ID，（为ULB系统中使用，与资源自身ID无关 - **ObjectId** (str) - 后端资源的对象ID - **Port** (int) - 所添加的后端资源服务端口 + - **PrivateIP** (str) - 后端资源的内网IP + - **ResourceName** (str) - 后端资源的实例名称 **ULBPolicySet** + - **BackendSet** (list) - 见 **PolicyBackendSet** 模型定义 + - **Match** (str) - 内容转发匹配字段;默认内容转发类型下为空。 - **PolicyId** (str) - 内容转发Id，默认内容转发类型下为空。 + - **PolicyPriority** (int) - 内容转发优先级，范围[1,9999]，数字越大优先级越高。默认内容转发规则下为0。 - **PolicyType** (str) - 内容类型，枚举值：Custom -> 客户自定义；Default -> 默认内容转发 + - **TotalCount** (int) - 默认内容转发类型下返回当前rs总数 - **Type** (str) - 内容转发匹配字段的类型，枚举值：Domain -> 域名；Path -> 路径； 默认内容转发类型下为空 - - **Match** (str) - 内容转发匹配字段;默认内容转发类型下为空。 - - **PolicyPriority** (int) - 内容转发优先级，范围[1,9999]，数字越大优先级越高。默认内容转发规则下为0。 - **VServerId** (str) - 所属VServerId - - **TotalCount** (int) - 默认内容转发类型下返回当前rs总数 - - **BackendSet** (list) - 见 **PolicyBackendSet** 模型定义 **ULBBackendSet** + - **BackendId** (str) - 后端资源实例的Id + - **Enabled** (int) - 后端提供服务的实例启用与否，枚举值：0 禁用 1 启用 + - **Port** (int) - 后端提供服务的端口 + - **PrivateIP** (str) - 后端提供服务的内网IP - **ResourceId** (str) - 资源实例的资源Id + - **ResourceName** (str) - 资源实例的资源名称 + - **ResourceType** (str) - 资源实例的类型 + - **Status** (int) - 后端提供服务的实例运行状态，枚举值：0健康检查健康状态 1 健康检查异常 - **SubResourceId** (str) - 资源绑定的虚拟网卡实例的资源Id - **SubResourceName** (str) - 资源绑定的虚拟网卡实例的资源名称 - - **SubnetId** (str) - 后端提供服务的资源所在的子网的ID - - **PrivateIP** (str) - 后端提供服务的内网IP - - **Port** (int) - 后端提供服务的端口 - - **Enabled** (int) - 后端提供服务的实例启用与否，枚举值：0 禁用 1 启用 - - **Status** (int) - 后端提供服务的实例运行状态，枚举值：0健康检查健康状态 1 健康检查异常 - - **BackendId** (str) - 后端资源实例的Id - - **ResourceType** (str) - 资源实例的类型 - - **ResourceName** (str) - 资源实例的资源名称 - **SubResourceType** (str) - 资源绑定的虚拟网卡实例的类型 + - **SubnetId** (str) - 后端提供服务的资源所在的子网的ID - **Weight** (int) - **ULBSSLSet** + - **HashValue** (str) - - **SSLId** (str) - SSL证书的Id - **SSLName** (str) - SSL证书的名字 - - **HashValue** (str) - **ULBVServerSet** - - **Path** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查域名 + - **BackendSet** (list) - 见 **ULBBackendSet** 模型定义 - **ClientTimeout** (int) - 空闲连接的回收时间，单位：秒。 - - **VServerId** (str) - VServer实例的Id - - **Protocol** (str) - VServer实例的协议。 枚举值为：HTTP，TCP，UDP，HTTPS。 - - **PersistenceInfo** (str) - 根据PersistenceType确定： None或ServerInsert，此字段为空； UserDefined，此字段展示用户自定义会话string。 + - **Domain** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查域名 + - **FrontendPort** (int) - VServer服务端口 + - **ListenType** (str) - 监听器类型，枚举值为: RequestProxy -> 请求代理；PacketsTransmit -> 报文转发 - **Method** (str) - VServer负载均衡的模式，枚举值：Roundrobin -> 轮询;Source -> 源地址；ConsistentHash -> 一致性哈希；SourcePort -> 源地址（计算端口）；ConsistentHashPort -> 一致性哈希（计算端口）。 + - **MonitorType** (str) - 健康检查类型，枚举值：Port -> 端口检查；Path -> 路径检查； + - **Path** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查路径 + - **PersistenceInfo** (str) - 根据PersistenceType确定： None或ServerInsert，此字段为空； UserDefined，此字段展示用户自定义会话string。 - **PersistenceType** (str) - VServer会话保持方式。枚举值为： None -> 关闭会话保持； ServerInsert -> 自动生成； UserDefined -> 用户自定义。 - - **Status** (int) - VServer的运行状态。枚举值： 0 -> rs全部运行正常;1 -> rs全部运行异常；2 -> rs部分运行异常。 + - **PolicySet** (list) - 见 **ULBPolicySet** 模型定义 + - **Protocol** (str) - VServer实例的协议。 枚举值为：HTTP，TCP，UDP，HTTPS。 - **SSLSet** (list) - 见 **ULBSSLSet** 模型定义 - - **BackendSet** (list) - 见 **ULBBackendSet** 模型定义 - - **MonitorType** (str) - 健康检查类型，枚举值：Port -> 端口检查；Path -> 路径检查； + - **Status** (int) - VServer的运行状态。枚举值： 0 -> rs全部运行正常;1 -> rs全部运行异常；2 -> rs部分运行异常。 + - **VServerId** (str) - VServer实例的Id - **VServerName** (str) - VServer实例的名字 - - **FrontendPort** (int) - VServer服务端口 - - **Domain** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查路径 - - **ListenType** (str) - 监听器类型，枚举值为: RequestProxy -> 请求代理；PacketsTransmit -> 报文转发 - - **PolicySet** (list) - 见 **ULBPolicySet** 模型定义 **ULBIPSet** - - **BandwidthType** (int) - 弹性IP的带宽类型，枚举值：1 表示是共享带宽，0 普通带宽类型（暂未对外开放） - **Bandwidth** (int) - 弹性IP的带宽值（暂未对外开放） - - **OperatorName** (str) - 弹性IP的运营商信息，枚举值为： Bgp：BGP IP International：国际IP + - **BandwidthType** (int) - 弹性IP的带宽类型，枚举值：1 表示是共享带宽，0 普通带宽类型（暂未对外开放） - **EIP** (str) - 弹性IP地址 - **EIPId** (str) - 弹性IP的ID + - **OperatorName** (str) - 弹性IP的运营商信息，枚举值为： Bgp：BGP IP International：国际IP **ULBSet** - - **Tag** (str) - 负载均衡的业务组名称，缺省值“Default” - **Bandwidth** (int) - 带宽 + - **BandwidthType** (int) - 带宽类型，枚举值为： 0，非共享带宽； 1，共享带宽 + - **BusinessId** (str) - ULB 所属的业务组ID - **CreateTime** (int) - ULB的创建时间，格式为Unix Timestamp - **ExpireTime** (int) - ULB的到期时间，格式为Unix Timestamp - - **Resource** (list) - ULB的详细信息列表（废弃） - - **VPCId** (str) - ULB所在的VPC的ID - - **SubnetId** (str) - ULB 为 InnerMode 时，ULB 所属的子网ID，默认为空 + - **IPSet** (list) - 见 **ULBIPSet** 模型定义 + - **Name** (str) - 负载均衡的资源名称（资源系统中），缺省值“ULB” - **PrivateIP** (str) - ULB的内网IP，当ULBType为OuterMode时，该值为空 - **Remark** (str) - 负载均衡的备注，缺省值“” - - **BandwidthType** (int) - 带宽类型，枚举值为： 0，非共享带宽； 1，共享带宽 - - **IPSet** (list) - 见 **ULBIPSet** 模型定义 - - **VServerSet** (list) - 见 **ULBVServerSet** 模型定义 - - **ULBType** (str) - ULB 的类型 - - **BusinessId** (str) - ULB 所属的业务组ID + - **Resource** (list) - ULB的详细信息列表（废弃） + - **SubnetId** (str) - ULB 为 InnerMode 时，ULB 所属的子网ID，默认为空 + - **Tag** (str) - 负载均衡的业务组名称，缺省值“Default” - **ULBId** (str) - 负载均衡的资源ID - **ULBName** (str) - 负载均衡的资源名称(内部记载，废弃) - - **Name** (str) - 负载均衡的资源名称（资源系统中），缺省值“ULB” + - **ULBType** (str) - ULB 的类型 + - **VPCId** (str) - ULB所在的VPC的ID + - **VServerSet** (list) - 见 **ULBVServerSet** 模型定义 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -441,70 +442,70 @@ def describe_vserver(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 满足条件的VServer总数 - **DataSet** (list) - 见 **ULBVServerSet** 模型定义 + - **TotalCount** (int) - 满足条件的VServer总数 **Response Model** **PolicyBackendSet** + - **BackendId** (str) - 所添加的后端资源在ULB中的对象ID，（为ULB系统中使用，与资源自身ID无关 - **ObjectId** (str) - 后端资源的对象ID - **Port** (int) - 所添加的后端资源服务端口 - **PrivateIP** (str) - 后端资源的内网IP - **ResourceName** (str) - 后端资源的实例名称 - - **BackendId** (str) - 所添加的后端资源在ULB中的对象ID，（为ULB系统中使用，与资源自身ID无关 - - **ULBBackendSet** - - - **ResourceId** (str) - 资源实例的资源Id - - **SubResourceId** (str) - 资源绑定的虚拟网卡实例的资源Id - - **SubResourceName** (str) - 资源绑定的虚拟网卡实例的资源名称 - - **SubnetId** (str) - 后端提供服务的资源所在的子网的ID - - **Status** (int) - 后端提供服务的实例运行状态，枚举值：0健康检查健康状态 1 健康检查异常 - - **BackendId** (str) - 后端资源实例的Id - - **ResourceType** (str) - 资源实例的类型 - - **ResourceName** (str) - 资源实例的资源名称 - - **SubResourceType** (str) - 资源绑定的虚拟网卡实例的类型 - - **PrivateIP** (str) - 后端提供服务的内网IP - - **Port** (int) - 后端提供服务的端口 - - **Enabled** (int) - 后端提供服务的实例启用与否，枚举值：0 禁用 1 启用 - - **Weight** (int) - **ULBSSLSet** + - **HashValue** (str) - - **SSLId** (str) - SSL证书的Id - **SSLName** (str) - SSL证书的名字 - - **HashValue** (str) - **ULBPolicySet** - - **Type** (str) - 内容转发匹配字段的类型，枚举值：Domain -> 域名；Path -> 路径； 默认内容转发类型下为空 - - **Match** (str) - 内容转发匹配字段;默认内容转发类型下为空。 - - **PolicyPriority** (int) - 内容转发优先级，范围[1,9999]，数字越大优先级越高。默认内容转发规则下为0。 - - **VServerId** (str) - 所属VServerId - - **TotalCount** (int) - 默认内容转发类型下返回当前rs总数 - **BackendSet** (list) - 见 **PolicyBackendSet** 模型定义 + - **Match** (str) - 内容转发匹配字段;默认内容转发类型下为空。 - **PolicyId** (str) - 内容转发Id，默认内容转发类型下为空。 + - **PolicyPriority** (int) - 内容转发优先级，范围[1,9999]，数字越大优先级越高。默认内容转发规则下为0。 - **PolicyType** (str) - 内容类型，枚举值：Custom -> 客户自定义；Default -> 默认内容转发 + - **TotalCount** (int) - 默认内容转发类型下返回当前rs总数 + - **Type** (str) - 内容转发匹配字段的类型，枚举值：Domain -> 域名；Path -> 路径； 默认内容转发类型下为空 + - **VServerId** (str) - 所属VServerId + + **ULBBackendSet** + + - **BackendId** (str) - 后端资源实例的Id + - **Enabled** (int) - 后端提供服务的实例启用与否，枚举值：0 禁用 1 启用 + - **Port** (int) - 后端提供服务的端口 + - **PrivateIP** (str) - 后端提供服务的内网IP + - **ResourceId** (str) - 资源实例的资源Id + - **ResourceName** (str) - 资源实例的资源名称 + - **ResourceType** (str) - 资源实例的类型 + - **Status** (int) - 后端提供服务的实例运行状态，枚举值：0健康检查健康状态 1 健康检查异常 + - **SubResourceId** (str) - 资源绑定的虚拟网卡实例的资源Id + - **SubResourceName** (str) - 资源绑定的虚拟网卡实例的资源名称 + - **SubResourceType** (str) - 资源绑定的虚拟网卡实例的类型 + - **SubnetId** (str) - 后端提供服务的资源所在的子网的ID + - **Weight** (int) - **ULBVServerSet** - **BackendSet** (list) - 见 **ULBBackendSet** 模型定义 - - **MonitorType** (str) - 健康检查类型，枚举值：Port -> 端口检查；Path -> 路径检查； - - **VServerName** (str) - VServer实例的名字 + - **ClientTimeout** (int) - 空闲连接的回收时间，单位：秒。 + - **Domain** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查域名 - **FrontendPort** (int) - VServer服务端口 + - **ListenType** (str) - 监听器类型，枚举值为: RequestProxy -> 请求代理；PacketsTransmit -> 报文转发 - **Method** (str) - VServer负载均衡的模式，枚举值：Roundrobin -> 轮询;Source -> 源地址；ConsistentHash -> 一致性哈希；SourcePort -> 源地址（计算端口）；ConsistentHashPort -> 一致性哈希（计算端口）。 + - **MonitorType** (str) - 健康检查类型，枚举值：Port -> 端口检查；Path -> 路径检查； + - **Path** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查路径 + - **PersistenceInfo** (str) - 根据PersistenceType确定： None或ServerInsert，此字段为空； UserDefined，此字段展示用户自定义会话string。 - **PersistenceType** (str) - VServer会话保持方式。枚举值为： None -> 关闭会话保持； ServerInsert -> 自动生成； UserDefined -> 用户自定义。 - - **Status** (int) - VServer的运行状态。枚举值： 0 -> rs全部运行正常;1 -> rs全部运行异常；2 -> rs部分运行异常。 - - **SSLSet** (list) - 见 **ULBSSLSet** 模型定义 - - **Domain** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查路径 - - **ListenType** (str) - 监听器类型，枚举值为: RequestProxy -> 请求代理；PacketsTransmit -> 报文转发 - **PolicySet** (list) - 见 **ULBPolicySet** 模型定义 - - **Path** (str) - 根据MonitorType确认； 当MonitorType为Port时，此字段无意义。当MonitorType为Path时，代表HTTP检查域名 - - **VServerId** (str) - VServer实例的Id - **Protocol** (str) - VServer实例的协议。 枚举值为：HTTP，TCP，UDP，HTTPS。 - - **PersistenceInfo** (str) - 根据PersistenceType确定： None或ServerInsert，此字段为空； UserDefined，此字段展示用户自定义会话string。 - - **ClientTimeout** (int) - 空闲连接的回收时间，单位：秒。 + - **SSLSet** (list) - 见 **ULBSSLSet** 模型定义 + - **Status** (int) - VServer的运行状态。枚举值： 0 -> rs全部运行正常;1 -> rs全部运行异常；2 -> rs部分运行异常。 + - **VServerId** (str) - VServer实例的Id + - **VServerName** (str) - VServer实例的名字 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} diff --git a/ucloud/services/ulb/schemas/apis.py b/ucloud/services/ulb/schemas/apis.py index 3ffaa61..5af2a38 100644 --- a/ucloud/services/ulb/schemas/apis.py +++ b/ucloud/services/ulb/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.ulb.schemas import models @@ -17,15 +18,15 @@ class AllocateBackendRequestSchema(schema.RequestSchema): """ fields = { - "ResourceType": fields.Str(required=True, dump_to="ResourceType"), + "Enabled": fields.Int(required=False, dump_to="Enabled"), "Port": fields.Int(required=False, dump_to="Port"), - "Weight": fields.Int(required=False, dump_to="Weight"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "ResourceId": fields.Str(required=True, dump_to="ResourceId"), + "ResourceType": fields.Str(required=True, dump_to="ResourceType"), "ULBId": fields.Str(required=True, dump_to="ULBId"), "VServerId": fields.Str(required=True, dump_to="VServerId"), - "ResourceId": fields.Str(required=True, dump_to="ResourceId"), - "Enabled": fields.Int(required=False, dump_to="Enabled"), + "Weight": fields.Int(required=False, dump_to="Weight"), } @@ -48,12 +49,12 @@ class AllocateBackendBatchRequestSchema(schema.RequestSchema): """ fields = { + "ApiVersion": fields.Int(required=False, dump_to="ApiVersion"), "Backends": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ULBId": fields.Str(required=True, dump_to="ULBId"), "VServerId": fields.Str(required=True, dump_to="VServerId"), - "ApiVersion": fields.Int(required=False, dump_to="ApiVersion"), } @@ -80,11 +81,11 @@ class BindSSLRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SSLId": fields.Str(required=True, dump_to="SSLId"), "ULBId": fields.Str(required=True, dump_to="ULBId"), "VServerId": fields.Str(required=True, dump_to="VServerId"), - "SSLId": fields.Str(required=True, dump_to="SSLId"), } @@ -107,11 +108,11 @@ class CreatePolicyRequestSchema(schema.RequestSchema): """ fields = { - "Match": fields.Str(required=True, dump_to="Match"), - "Type": fields.Str(required=False, dump_to="Type"), "BackendId": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), + "Match": fields.Str(required=True, dump_to="Match"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Type": fields.Str(required=False, dump_to="Type"), "ULBId": fields.Str(required=True, dump_to="ULBId"), "VServerId": fields.Str(required=True, dump_to="VServerId"), } @@ -136,14 +137,14 @@ class CreateSSLRequestSchema(schema.RequestSchema): """ fields = { + "CaCert": fields.Str(required=False, dump_to="CaCert"), + "PrivateKey": fields.Str(required=False, dump_to="PrivateKey"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SSLContent": fields.Str(required=False, dump_to="SSLContent"), "SSLName": fields.Str(required=True, dump_to="SSLName"), "SSLType": fields.Str(required=False, dump_to="SSLType"), - "SSLContent": fields.Str(required=False, dump_to="SSLContent"), "UserCert": fields.Str(required=False, dump_to="UserCert"), - "PrivateKey": fields.Str(required=False, dump_to="PrivateKey"), - "CaCert": fields.Str(required=False, dump_to="CaCert"), - "Region": fields.Str(required=True, dump_to="Region"), } @@ -166,20 +167,20 @@ class CreateULBRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Tag": fields.Str(required=False, dump_to="Tag"), - "Remark": fields.Str(required=False, dump_to="Remark"), + "BusinessId": fields.Str(required=False, dump_to="BusinessId"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "IPVersion": fields.Str(required=False, dump_to="IPVersion"), "InnerMode": fields.Str(required=False, dump_to="InnerMode"), "ListenType": fields.Str(required=False, dump_to="ListenType"), - "ULBName": fields.Str(required=False, dump_to="ULBName"), "OuterMode": fields.Str(required=False, dump_to="OuterMode"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), - "SubnetId": fields.Str(required=False, dump_to="SubnetId"), - "BusinessId": fields.Str(required=False, dump_to="BusinessId"), - "IPVersion": fields.Str(required=False, dump_to="IPVersion"), - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "PrivateIp": fields.Str(required=False, dump_to="PrivateIp"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Remark": fields.Str(required=False, dump_to="Remark"), + "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "ULBName": fields.Str(required=False, dump_to="ULBName"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), } @@ -202,20 +203,20 @@ class CreateVServerRequestSchema(schema.RequestSchema): """ fields = { - "VServerName": fields.Str(required=False, dump_to="VServerName"), - "Protocol": fields.Str(required=False, dump_to="Protocol"), - "PersistenceType": fields.Str(required=False, dump_to="PersistenceType"), - "Region": fields.Str(required=True, dump_to="Region"), - "ULBId": fields.Str(required=True, dump_to="ULBId"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "ListenType": fields.Str(required=False, dump_to="ListenType"), + "ClientTimeout": fields.Int(required=False, dump_to="ClientTimeout"), + "Domain": fields.Str(required=False, dump_to="Domain"), "FrontendPort": fields.Int(required=False, dump_to="FrontendPort"), + "ListenType": fields.Str(required=False, dump_to="ListenType"), "Method": fields.Str(required=False, dump_to="Method"), - "PersistenceInfo": fields.Str(required=False, dump_to="PersistenceInfo"), - "ClientTimeout": fields.Int(required=False, dump_to="ClientTimeout"), "MonitorType": fields.Str(required=False, dump_to="MonitorType"), - "Domain": fields.Str(required=False, dump_to="Domain"), "Path": fields.Str(required=False, dump_to="Path"), + "PersistenceInfo": fields.Str(required=False, dump_to="PersistenceInfo"), + "PersistenceType": fields.Str(required=False, dump_to="PersistenceType"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Protocol": fields.Str(required=False, dump_to="Protocol"), + "Region": fields.Str(required=True, dump_to="Region"), + "ULBId": fields.Str(required=True, dump_to="ULBId"), + "VServerName": fields.Str(required=False, dump_to="VServerName"), } @@ -238,11 +239,11 @@ class DeletePolicyRequestSchema(schema.RequestSchema): """ fields = { - "PolicyId": fields.Str(required=True, dump_to="PolicyId"), "GroupId": fields.Str(required=False, dump_to="GroupId"), - "VServerId": fields.Str(required=False, dump_to="VServerId"), - "Region": fields.Str(required=True, dump_to="Region"), + "PolicyId": fields.Str(required=True, dump_to="PolicyId"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "VServerId": fields.Str(required=False, dump_to="VServerId"), } @@ -265,9 +266,9 @@ class DeleteSSLRequestSchema(schema.RequestSchema): """ fields = { - "SSLId": fields.Str(required=True, dump_to="SSLId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SSLId": fields.Str(required=True, dump_to="SSLId"), } @@ -291,9 +292,9 @@ class DeleteULBRequestSchema(schema.RequestSchema): fields = { "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "ULBId": fields.Str(required=True, dump_to="ULBId"), - "ReleaseEip": fields.Bool(required=False, dump_to="ReleaseEip"), "Region": fields.Str(required=True, dump_to="Region"), + "ReleaseEip": fields.Bool(required=False, dump_to="ReleaseEip"), + "ULBId": fields.Str(required=True, dump_to="ULBId"), } @@ -316,8 +317,8 @@ class DeleteVServerRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ULBId": fields.Str(required=True, dump_to="ULBId"), "VServerId": fields.Str(required=True, dump_to="VServerId"), } @@ -342,11 +343,11 @@ class DescribeSSLRequestSchema(schema.RequestSchema): """ fields = { + "Limit": fields.Int(required=False, dump_to="Limit"), "Offset": fields.Int(required=False, dump_to="Offset"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SSLId": fields.Str(required=False, dump_to="SSLId"), - "Limit": fields.Int(required=False, dump_to="Limit"), } @@ -355,10 +356,10 @@ class DescribeSSLResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSet": fields.List( models.ULBSSLSetSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -374,14 +375,14 @@ class DescribeULBRequestSchema(schema.RequestSchema): """ fields = { - "ULBId": fields.Str(required=False, dump_to="ULBId"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), - "SubnetId": fields.Str(required=False, dump_to="SubnetId"), "BusinessId": fields.Str(required=False, dump_to="BusinessId"), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "Offset": fields.Int(required=False, dump_to="Offset"), "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "ULBId": fields.Str(required=False, dump_to="ULBId"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), } @@ -390,10 +391,10 @@ class DescribeULBResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSet": fields.List( models.ULBSetSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -409,12 +410,12 @@ class DescribeVServerRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "ULBId": fields.Str(required=True, dump_to="ULBId"), - "VServerId": fields.Str(required=False, dump_to="VServerId"), "Limit": fields.Int(required=False, dump_to="Limit"), "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "ULBId": fields.Str(required=True, dump_to="ULBId"), + "VServerId": fields.Str(required=False, dump_to="VServerId"), } @@ -423,10 +424,10 @@ class DescribeVServerResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSet": fields.List( models.ULBVServerSetSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -442,10 +443,10 @@ class ReleaseBackendRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "ULBId": fields.Str(required=True, dump_to="ULBId"), "BackendId": fields.Str(required=True, dump_to="BackendId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "ULBId": fields.Str(required=True, dump_to="ULBId"), } @@ -468,11 +469,11 @@ class UnbindSSLRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SSLId": fields.Str(required=True, dump_to="SSLId"), "ULBId": fields.Str(required=True, dump_to="ULBId"), "VServerId": fields.Str(required=True, dump_to="VServerId"), - "SSLId": fields.Str(required=True, dump_to="SSLId"), } @@ -495,13 +496,13 @@ class UpdateBackendAttributeRequestSchema(schema.RequestSchema): """ fields = { - "Weight": fields.Int(required=False, dump_to="Weight"), + "BackendId": fields.Str(required=True, dump_to="BackendId"), "Enabled": fields.Int(required=False, dump_to="Enabled"), - "Region": fields.Str(required=True, dump_to="Region"), + "Port": fields.Int(required=False, dump_to="Port"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ULBId": fields.Str(required=True, dump_to="ULBId"), - "BackendId": fields.Str(required=True, dump_to="BackendId"), - "Port": fields.Int(required=False, dump_to="Port"), + "Weight": fields.Int(required=False, dump_to="Weight"), } @@ -524,14 +525,14 @@ class UpdatePolicyRequestSchema(schema.RequestSchema): """ fields = { + "BackendId": fields.List(fields.Str()), + "Match": fields.Str(required=True, dump_to="Match"), + "PolicyId": fields.Str(required=True, dump_to="PolicyId"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Type": fields.Str(required=False, dump_to="Type"), "ULBId": fields.Str(required=True, dump_to="ULBId"), "VServerId": fields.Str(required=True, dump_to="VServerId"), - "Match": fields.Str(required=True, dump_to="Match"), - "Type": fields.Str(required=False, dump_to="Type"), - "Region": fields.Str(required=True, dump_to="Region"), - "BackendId": fields.List(fields.Str()), - "PolicyId": fields.Str(required=True, dump_to="PolicyId"), } @@ -554,12 +555,12 @@ class UpdateULBAttributeRequestSchema(schema.RequestSchema): """ fields = { - "ULBId": fields.Str(required=True, dump_to="ULBId"), "Name": fields.Str(required=False, dump_to="Name"), - "Tag": fields.Str(required=False, dump_to="Tag"), - "Remark": fields.Str(required=False, dump_to="Remark"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Remark": fields.Str(required=False, dump_to="Remark"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "ULBId": fields.Str(required=True, dump_to="ULBId"), } @@ -582,19 +583,19 @@ class UpdateVServerAttributeRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Method": fields.Str(required=False, dump_to="Method"), - "PersistenceInfo": fields.Str(required=False, dump_to="PersistenceInfo"), "ClientTimeout": fields.Int(required=False, dump_to="ClientTimeout"), - "MonitorType": fields.Str(required=False, dump_to="MonitorType"), "Domain": fields.Str(required=False, dump_to="Domain"), + "Method": fields.Str(required=False, dump_to="Method"), + "MonitorType": fields.Str(required=False, dump_to="MonitorType"), "Path": fields.Str(required=False, dump_to="Path"), + "PersistenceInfo": fields.Str(required=False, dump_to="PersistenceInfo"), + "PersistenceType": fields.Str(required=False, dump_to="PersistenceType"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Protocol": fields.Str(required=False, dump_to="Protocol"), + "Region": fields.Str(required=True, dump_to="Region"), "ULBId": fields.Str(required=True, dump_to="ULBId"), "VServerId": fields.Str(required=True, dump_to="VServerId"), "VServerName": fields.Str(required=False, dump_to="VServerName"), - "Protocol": fields.Str(required=False, dump_to="Protocol"), - "PersistenceType": fields.Str(required=False, dump_to="PersistenceType"), } diff --git a/ucloud/services/ulb/schemas/models.py b/ucloud/services/ulb/schemas/models.py index 20fa5af..79f5c9d 100644 --- a/ucloud/services/ulb/schemas/models.py +++ b/ucloud/services/ulb/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -18,9 +19,9 @@ class ULBSSLSetSchema(schema.ResponseSchema): """ fields = { + "HashValue": fields.Str(required=False, load_from="HashValue"), "SSLId": fields.Str(required=False, load_from="SSLId"), "SSLName": fields.Str(required=False, load_from="SSLName"), - "HashValue": fields.Str(required=False, load_from="HashValue"), } @@ -29,11 +30,11 @@ class PolicyBackendSetSchema(schema.ResponseSchema): """ fields = { + "BackendId": fields.Str(required=False, load_from="BackendId"), + "ObjectId": fields.Str(required=False, load_from="ObjectId"), "Port": fields.Int(required=False, load_from="Port"), "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), "ResourceName": fields.Str(required=False, load_from="ResourceName"), - "BackendId": fields.Str(required=False, load_from="BackendId"), - "ObjectId": fields.Str(required=False, load_from="ObjectId"), } @@ -42,19 +43,19 @@ class ULBBackendSetSchema(schema.ResponseSchema): """ fields = { - "SubResourceType": fields.Str(required=False, load_from="SubResourceType"), - "SubResourceId": fields.Str(required=False, load_from="SubResourceId"), - "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), - "Port": fields.Int(required=False, load_from="Port"), + "BackendId": fields.Str(required=False, load_from="BackendId"), "Enabled": fields.Int(required=False, load_from="Enabled"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "Weight": fields.Int(required=False, load_from="Weight"), - "ResourceType": fields.Str(required=False, load_from="ResourceType"), + "Port": fields.Int(required=False, load_from="Port"), + "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), "ResourceId": fields.Str(required=False, load_from="ResourceId"), "ResourceName": fields.Str(required=False, load_from="ResourceName"), - "SubResourceName": fields.Str(required=False, load_from="SubResourceName"), + "ResourceType": fields.Str(required=False, load_from="ResourceType"), "Status": fields.Int(required=False, load_from="Status"), - "BackendId": fields.Str(required=False, load_from="BackendId"), + "SubResourceId": fields.Str(required=False, load_from="SubResourceId"), + "SubResourceName": fields.Str(required=False, load_from="SubResourceName"), + "SubResourceType": fields.Str(required=False, load_from="SubResourceType"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "Weight": fields.Int(required=False, load_from="Weight"), } @@ -64,13 +65,13 @@ class ULBPolicySetSchema(schema.ResponseSchema): fields = { "BackendSet": fields.List(PolicyBackendSetSchema()), + "Match": fields.Str(required=False, load_from="Match"), "PolicyId": fields.Str(required=False, load_from="PolicyId"), + "PolicyPriority": fields.Int(required=False, load_from="PolicyPriority"), "PolicyType": fields.Str(required=False, load_from="PolicyType"), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), "Type": fields.Str(required=False, load_from="Type"), - "Match": fields.Str(required=False, load_from="Match"), - "PolicyPriority": fields.Int(required=False, load_from="PolicyPriority"), "VServerId": fields.Str(required=False, load_from="VServerId"), - "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -79,22 +80,22 @@ class ULBVServerSetSchema(schema.ResponseSchema): """ fields = { - "SSLSet": fields.List(ULBSSLSetSchema()), "BackendSet": fields.List(ULBBackendSetSchema()), + "ClientTimeout": fields.Int(required=False, load_from="ClientTimeout"), + "Domain": fields.Str(required=True, load_from="Domain"), + "FrontendPort": fields.Int(required=False, load_from="FrontendPort"), "ListenType": fields.Str(required=False, load_from="ListenType"), + "Method": fields.Str(required=False, load_from="Method"), "MonitorType": fields.Str(required=True, load_from="MonitorType"), "Path": fields.Str(required=True, load_from="Path"), - "Method": fields.Str(required=False, load_from="Method"), "PersistenceInfo": fields.Str(required=False, load_from="PersistenceInfo"), - "Domain": fields.Str(required=True, load_from="Domain"), "PersistenceType": fields.Str(required=False, load_from="PersistenceType"), - "Status": fields.Int(required=False, load_from="Status"), - "VServerName": fields.Str(required=False, load_from="VServerName"), + "PolicySet": fields.List(ULBPolicySetSchema()), "Protocol": fields.Str(required=False, load_from="Protocol"), - "FrontendPort": fields.Int(required=False, load_from="FrontendPort"), - "ClientTimeout": fields.Int(required=False, load_from="ClientTimeout"), + "SSLSet": fields.List(ULBSSLSetSchema()), + "Status": fields.Int(required=False, load_from="Status"), "VServerId": fields.Str(required=False, load_from="VServerId"), - "PolicySet": fields.List(ULBPolicySetSchema()), + "VServerName": fields.Str(required=False, load_from="VServerName"), } @@ -103,10 +104,10 @@ class ULBIPSetSchema(schema.ResponseSchema): """ fields = { + "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), + "BandwidthType": fields.Int(required=False, load_from="BandwidthType"), "EIP": fields.Str(required=False, load_from="EIP"), "EIPId": fields.Str(required=False, load_from="EIPId"), - "BandwidthType": fields.Int(required=False, load_from="BandwidthType"), - "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), "OperatorName": fields.Str(required=False, load_from="OperatorName"), } @@ -116,21 +117,21 @@ class ULBSetSchema(schema.ResponseSchema): """ fields = { - "Tag": fields.Str(required=False, load_from="Tag"), - "VServerSet": fields.List(ULBVServerSetSchema()), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "Remark": fields.Str(required=False, load_from="Remark"), + "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), "BandwidthType": fields.Int(required=False, load_from="BandwidthType"), + "BusinessId": fields.Str(required=False, load_from="BusinessId"), "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), + "IPSet": fields.List(ULBIPSetSchema()), + "Name": fields.Str(required=False, load_from="Name"), + "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), + "Remark": fields.Str(required=False, load_from="Remark"), "Resource": fields.List(fields.Str()), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "Tag": fields.Str(required=False, load_from="Tag"), "ULBId": fields.Str(required=False, load_from="ULBId"), "ULBName": fields.Str(required=False, load_from="ULBName"), - "Name": fields.Str(required=False, load_from="Name"), - "IPSet": fields.List(ULBIPSetSchema()), "ULBType": fields.Str(required=False, load_from="ULBType"), - "BusinessId": fields.Str(required=False, load_from="BusinessId"), - "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), + "VPCId": fields.Str(required=False, load_from="VPCId"), + "VServerSet": fields.List(ULBVServerSetSchema()), } diff --git a/ucloud/services/umem/client.py b/ucloud/services/umem/client.py index ef5c879..2754b17 100644 --- a/ucloud/services/umem/client.py +++ b/ucloud/services/umem/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.umem.schemas import apis @@ -86,7 +87,7 @@ def create_uredis_group(self, req=None, **kwargs): - **BackupId** (str) - 有此项代表从备份中创建，无代表正常创建 - **BackupTime** (int) - 自动备份开始时间,范围[0-23],默认3点 - **ChargeType** (str) - 计费模式，Year , Month, Dynamic 默认: Month - - **ConfigId** (str) - 配置ID,目前仅支持默认配置id 默认创建3.0版本 配置id:"03f58ca9-b64d-4bdd-abc7-c6b9a46fd801"，3.0版本配置ID：03f58ca9-b64d-4bdd-abc7-c6b9a46fd8013.2版本配置ID：3e45ac48-f8a2-a9q2-261d-l342dab130gf4.0版本配置ID：6c9298a3-9d7f-428c-b1d0-e87ab3b8a1ea,从备份创建为必传项 + - **ConfigId** (str) - 配置ID,目前支持 3.0版本配置ID:"03f58ca9-b64d-4bdd-abc7-c6b9a46fd801",3.2版本配置ID:"3e45ac48-f8a2-a9q2-261d-l342dab130gf", 4.0版本配置ID:"6c9298a3-9d7f-428c-b1d0-e87ab3b8a1ea",默认版本3.0,从备份创建为必传项 - **CouponId** (str) - 代金券ID - **MasterGroupId** (str) - Master Redis Group的ID，创建只读Slave时，必须填写 - **Password** (str) - 初始化密码,需要 base64 编码 @@ -227,22 +228,22 @@ def describe_umem_space(self, req=None, **kwargs): **UMemSpaceSet** + - **Address** (list) - 见 **UMemSpaceAddressSet** 模型定义 + - **ChargeType** (str) - Year, Month, Dynamic, Trial + - **CreateTime** (int) - 创建时间 - **ExpireTime** (int) - 到期时间 + - **Name** (str) - 内存空间名称 - **Protocol** (str) - 协议类型: memcache, redis - - **Size** (int) - 容量单位GB - - **Zone** (str) - 可用区，参见 `可用区列表 `_ - **RewriteTime** (int) - 运维时间0 //0点1 //1点依次类推 + - **Size** (int) - 容量单位GB - **SpaceId** (str) - 内存空间ID - - **VPCId** (str) - - - **ChargeType** (str) - Year, Month, Dynamic, Trial + - **State** (str) - Starting:创建中 Running:运行中 Fail:失败 + - **SubnetId** (str) - + - **Tag** (str) - - **Type** (str) - 空间类型:single(无热备),double(热备) - **UsedSize** (int) - 使用量单位MB - - **Tag** (str) - - - **SubnetId** (str) - - - **CreateTime** (int) - 创建时间 - - **Name** (str) - 内存空间名称 - - **State** (str) - Starting:创建中 Running:运行中 Fail:失败 - - **Address** (list) - 见 **UMemSpaceAddressSet** 模型定义 + - **VPCId** (str) - + - **Zone** (str) - 可用区，参见 `可用区列表 `_ """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -288,29 +289,29 @@ def describe_umem_cache_group(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 组的总的节点个数 - **DataSet** (list) - 见 **UMemcacheGroupSet** 模型定义 + - **TotalCount** (int) - 组的总的节点个数 **Response Model** **UMemcacheGroupSet** - - **GroupId** (str) - 组ID + - **ChargeType** (str) - 计费类型:Year,Month,Dynamic 默认Dynamic + - **ConfigId** (str) - 节点的配置ID - **CreateTime** (int) - 创建时间 (UNIX时间戳) - **ExpireTime** (int) - 过期时间 (UNIX时间戳) - - **Tag** (str) - 业务组名称 - - **SubnetId** (str) - + - **GroupId** (str) - 组ID + - **ModifyTime** (int) - 修改时间 (UNIX时间戳) + - **Name** (str) - 组名称 - **Port** (int) - 节点分配的服务端口 - **Size** (int) - 容量单位GB - - **Version** (str) - Memcache版本信息,默认为1.4.31 - - **ChargeType** (str) - 计费类型:Year,Month,Dynamic 默认Dynamic - - **ConfigId** (str) - 节点的配置ID - - **UsedSize** (int) - 使用量单位MB - **State** (str) - 状态标记 Creating // 初始化中 CreateFail // 创建失败 Deleting // 删除中 DeleteFail // 删除失败 Running // 运行 Resizing // 容量调整中 ResizeFail // 容量调整失败 Configing // 配置中 ConfigFail // 配置失败Restarting // 重启中 + - **SubnetId** (str) - + - **Tag** (str) - 业务组名称 + - **UsedSize** (int) - 使用量单位MB - **VPCId** (str) - - - **Name** (str) - 组名称 + - **Version** (str) - Memcache版本信息,默认为1.4.31 - **VirtualIP** (str) - 节点的虚拟IP地址 - - **ModifyTime** (int) - 修改时间 (UNIX时间戳) """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -385,22 +386,22 @@ def describe_uredis_backup(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 用户名下总的备份个数 - **DataSet** (list) - 见 **URedisBackupSet** 模型定义 + - **TotalCount** (int) - 用户名下总的备份个数 **Response Model** **URedisBackupSet** - - **State** (str) - 备份的状态: Backuping 备份中 Success 备份成功 Error 备份失败 Expired 备份过期 - - **Zone** (str) - 可用区，参见 `可用区列表 `_ - - **GroupId** (str) - 对应的实例ID - - **GroupName** (str) - 组名称 - - **BackupName** (str) - 备份的名称 - **BackupId** (str) - 备份ID - - **BackupTime** (int) - 备份时间 (UNIX时间戳) + - **BackupName** (str) - 备份的名称 - **BackupSize** (int) - 备份文件大小, 以字节为单位 + - **BackupTime** (int) - 备份时间 (UNIX时间戳) - **BackupType** (str) - 备份类型: Manual 手动 Auto 自动 + - **GroupId** (str) - 对应的实例ID + - **GroupName** (str) - 组名称 + - **State** (str) - 备份的状态: Backuping 备份中 Success 备份成功 Error 备份失败 Expired 备份过期 + - **Zone** (str) - 可用区，参见 `可用区列表 `_ """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -448,38 +449,39 @@ def describe_uredis_group(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 组的总的节点个数 - **DataSet** (list) - 见 **URedisGroupSet** 模型定义 + - **TotalCount** (int) - 组的总的节点个数 **Response Model** **URedisGroupSet** - - **Zone** (str) - 实例所在可用区，或者master redis所在可用区，参见 `可用区列表 `_ - - **Name** (str) - 组名称 - - **SubnetId** (str) - - - **Tag** (str) - 业务组名称 - - **VPCId** (str) - - - **GroupName** (str) - 组名称 - **AutoBackup** (str) - 是否需要自动备份,enable,disable - - **Version** (str) - Redis版本信息 - - **ChargeType** (str) - 计费类型:Year,Month,Dynamic 默认Dynamic - - **UsedSize** (int) - 使用量单位MB - **BackupTime** (int) - 组自动备份开始时间,单位小时计,范围[0-23] - - **HighAvailability** (str) - 是否开启高可用,enable,disable - - **Type** (str) - - - **Protocol** (str) - 协议 - - **MemorySize** (int) - 容量单位GB + - **ChargeType** (str) - 计费类型:Year,Month,Dynamic 默认Dynamic - **ConfigId** (str) - 节点的配置ID - - **Port** (int) - 节点分配的服务端口 - - **ExpireTime** (int) - 过期时间 (UNIX时间戳) - **CreateTime** (int) - 创建时间 (UNIX时间戳) - - **ModifyTime** (int) - 修改时间 (UNIX时间戳) + - **ExpireTime** (int) - 过期时间 (UNIX时间戳) - **GroupId** (str) - 组ID - - **VirtualIP** (str) - 节点的虚拟IP地址 + - **GroupName** (str) - 组名称 + - **HighAvailability** (str) - 是否开启高可用,enable,disable + - **MemorySize** (int) - 容量单位GB + - **ModifyTime** (int) - 修改时间 (UNIX时间戳) + - **Name** (str) - 组名称 + - **Port** (int) - 节点分配的服务端口 + - **Protocol** (str) - 协议 + - **RewriteTime** (int) - 返回运维时间 0 //0点 1 //1点 以此类推 - **Size** (int) - 容量单位GB - - **State** (str) - 状态标记 Creating // 初始化中 CreateFail // 创建失败 Deleting // 删除中 DeleteFail // 删除失败 Running // 运行 Resizing // 容量调整中 ResizeFail // 容量调整失败 Configing // 配置中 ConfigFail // 配置失败 - **SlaveZone** (str) - 跨机房URedis，slave redis所在可用区，参见 `可用区列表 `_ + - **State** (str) - 状态标记 Creating // 初始化中 CreateFail // 创建失败 Deleting // 删除中 DeleteFail // 删除失败 Running // 运行 Resizing // 容量调整中 ResizeFail // 容量调整失败 Configing // 配置中 ConfigFail // 配置失败 + - **SubnetId** (str) - + - **Tag** (str) - 业务组名称 + - **Type** (str) - + - **UsedSize** (int) - 使用量单位MB + - **VPCId** (str) - + - **Version** (str) - Redis版本信息 + - **VirtualIP** (str) - 节点的虚拟IP地址 + - **Zone** (str) - 实例所在可用区，或者master redis所在可用区，参见 `可用区列表 `_ """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} diff --git a/ucloud/services/umem/schemas/apis.py b/ucloud/services/umem/schemas/apis.py index e934cdd..0b49495 100644 --- a/ucloud/services/umem/schemas/apis.py +++ b/ucloud/services/umem/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.umem.schemas import models @@ -17,20 +18,20 @@ class CreateUMemSpaceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), - "Size": fields.Int(required=True, dump_to="Size"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), "Name": fields.Str(required=True, dump_to="Name"), + "Password": fields.Base64(required=False, dump_to="Password"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Protocol": fields.Str(required=False, dump_to="Protocol"), "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=True, dump_to="Size"), "SubnetId": fields.Str(required=False, dump_to="SubnetId"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "Tag": fields.Str(required=False, dump_to="Tag"), - "Protocol": fields.Str(required=False, dump_to="Protocol"), "Type": fields.Str(required=False, dump_to="Type"), - "Password": fields.Base64(required=False, dump_to="Password"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -53,20 +54,20 @@ class CreateUMemcacheGroupRequestSchema(schema.RequestSchema): """ fields = { - "Protocol": fields.Str(required=False, dump_to="Protocol"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "ConfigId": fields.Str(required=False, dump_to="ConfigId"), "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "Size": fields.Int(required=False, dump_to="Size"), + "Name": fields.Str(required=True, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Protocol": fields.Str(required=False, dump_to="Protocol"), "Quantity": fields.Int(required=False, dump_to="Quantity"), "Region": fields.Str(required=True, dump_to="Region"), - "ConfigId": fields.Str(required=False, dump_to="ConfigId"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), - "Tag": fields.Str(required=False, dump_to="Tag"), + "Size": fields.Int(required=False, dump_to="Size"), "SubnetId": fields.Str(required=False, dump_to="SubnetId"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Name": fields.Str(required=True, dump_to="Name"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), "Version": fields.Str(required=False, dump_to="Version"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -89,26 +90,26 @@ class CreateURedisGroupRequestSchema(schema.RequestSchema): """ fields = { - "Size": fields.Int(required=False, dump_to="Size"), - "Version": fields.Str(required=False, dump_to="Version"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), - "SlaveZone": fields.Str(required=False, dump_to="SlaveZone"), - "Name": fields.Str(required=True, dump_to="Name"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), + "AutoBackup": fields.Str(required=False, dump_to="AutoBackup"), + "BackupId": fields.Str(required=False, dump_to="BackupId"), "BackupTime": fields.Int(required=False, dump_to="BackupTime"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "ConfigId": fields.Str(required=False, dump_to="ConfigId"), - "Quantity": fields.Int(required=False, dump_to="Quantity"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), + "HighAvailability": fields.Str(required=True, dump_to="HighAvailability"), "MasterGroupId": fields.Str(required=False, dump_to="MasterGroupId"), - "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "Name": fields.Str(required=True, dump_to="Name"), "Password": fields.Base64(required=False, dump_to="Password"), - "BackupId": fields.Str(required=False, dump_to="BackupId"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "HighAvailability": fields.Str(required=True, dump_to="HighAvailability"), - "AutoBackup": fields.Str(required=False, dump_to="AutoBackup"), + "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=False, dump_to="Size"), + "SlaveZone": fields.Str(required=False, dump_to="SlaveZone"), + "SubnetId": fields.Str(required=False, dump_to="SubnetId"), "Tag": fields.Str(required=False, dump_to="Tag"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Version": fields.Str(required=False, dump_to="Version"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -132,8 +133,8 @@ class DeleteUMemSpaceRequestSchema(schema.RequestSchema): fields = { "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "SpaceId": fields.Str(required=True, dump_to="SpaceId"), "Region": fields.Str(required=True, dump_to="Region"), + "SpaceId": fields.Str(required=True, dump_to="SpaceId"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -157,10 +158,10 @@ class DeleteUMemcacheGroupRequestSchema(schema.RequestSchema): """ 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"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "GroupId": fields.Str(required=True, dump_to="GroupId"), } @@ -184,8 +185,8 @@ class DeleteURedisGroupRequestSchema(schema.RequestSchema): fields = { "GroupId": fields.Str(required=True, dump_to="GroupId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -208,14 +209,14 @@ class DescribeUMemPriceRequestSchema(schema.RequestSchema): """ fields = { + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), - "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), "Size": fields.Int(required=True, dump_to="Size"), "Type": fields.Str(required=True, dump_to="Type"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -242,12 +243,12 @@ class DescribeUMemSpaceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Offset": fields.Int(required=False, dump_to="Offset"), "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SpaceId": fields.Str(required=False, dump_to="SpaceId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -275,12 +276,12 @@ class DescribeUMemUpgradePriceRequestSchema(schema.RequestSchema): """ fields = { - "Type": fields.Str(required=True, dump_to="Type"), - "SpaceId": fields.Str(required=True, dump_to="SpaceId"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Size": fields.Int(required=True, dump_to="Size"), + "SpaceId": fields.Str(required=True, dump_to="SpaceId"), + "Type": fields.Str(required=True, dump_to="Type"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -303,12 +304,12 @@ class DescribeUMemcacheGroupRequestSchema(schema.RequestSchema): """ fields = { + "GroupId": fields.Str(required=False, dump_to="GroupId"), "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "GroupId": fields.Str(required=False, dump_to="GroupId"), - "Offset": fields.Int(required=False, dump_to="Offset"), } @@ -317,10 +318,10 @@ class DescribeUMemcacheGroupResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSet": fields.List( models.UMemcacheGroupSetSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -336,13 +337,13 @@ class DescribeUMemcachePriceRequestSchema(schema.RequestSchema): """ fields = { + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), - "Type": fields.Str(required=False, dump_to="Type"), "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Size": fields.Int(required=True, dump_to="Size"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "Type": fields.Str(required=False, dump_to="Type"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -369,11 +370,11 @@ class DescribeUMemcacheUpgradePriceRequestSchema(schema.RequestSchema): """ fields = { - "Size": fields.Int(required=True, dump_to="Size"), "GroupId": fields.Str(required=True, dump_to="GroupId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=True, dump_to="Size"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -396,10 +397,10 @@ class DescribeURedisBackupRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Offset": fields.Int(required=False, dump_to="Offset"), - "Limit": fields.Int(required=False, dump_to="Limit"), "GroupId": fields.Str(required=False, dump_to="GroupId"), + "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), } @@ -409,10 +410,10 @@ class DescribeURedisBackupResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSet": fields.List( models.URedisBackupSetSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -428,12 +429,12 @@ class DescribeURedisBackupURLRequestSchema(schema.RequestSchema): """ fields = { - "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "BackupId": fields.Str(required=True, dump_to="BackupId"), "GroupId": fields.Str(required=True, dump_to="GroupId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -442,9 +443,9 @@ class DescribeURedisBackupURLResponseSchema(schema.ResponseSchema): """ fields = { + "BackupPath": fields.Str(required=False, load_from="BackupPath"), "BackupURL": fields.Str(required=False, load_from="BackupURL"), "InnerBackupPath": fields.Str(required=False, load_from="InnerBackupPath"), - "BackupPath": fields.Str(required=False, load_from="BackupPath"), } @@ -460,12 +461,12 @@ class DescribeURedisGroupRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "GroupId": fields.Str(required=False, dump_to="GroupId"), - "Offset": fields.Int(required=False, dump_to="Offset"), "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -495,13 +496,13 @@ class DescribeURedisPriceRequestSchema(schema.RequestSchema): fields = { "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "ProductType": fields.Str(required=False, dump_to="ProductType"), - "Type": fields.Str(required=False, dump_to="Type"), - "Size": fields.Int(required=True, dump_to="Size"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), - "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), "Region": fields.Str(required=True, dump_to="Region"), + "RegionFlag": fields.Bool(required=False, dump_to="RegionFlag"), + "Size": fields.Int(required=True, dump_to="Size"), + "Type": fields.Str(required=False, dump_to="Type"), "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -529,11 +530,11 @@ class DescribeURedisUpgradePriceRequestSchema(schema.RequestSchema): fields = { "GroupId": fields.Str(required=True, dump_to="GroupId"), - "Type": fields.Str(required=False, dump_to="Type"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Size": fields.Int(required=True, dump_to="Size"), + "Type": fields.Str(required=False, dump_to="Type"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -556,10 +557,10 @@ class GetUMemSpaceStateRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "SpaceId": fields.Str(required=True, dump_to="SpaceId"), "Region": fields.Str(required=True, dump_to="Region"), + "SpaceId": fields.Str(required=True, dump_to="SpaceId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -582,11 +583,11 @@ class ModifyUMemSpaceNameRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), + "Name": fields.Str(required=True, dump_to="Name"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SpaceId": fields.Str(required=True, dump_to="SpaceId"), - "Name": fields.Str(required=True, dump_to="Name"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -609,11 +610,11 @@ class ModifyURedisGroupNameRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "GroupId": fields.Str(required=True, dump_to="GroupId"), "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=False, dump_to="Zone"), } @@ -636,11 +637,11 @@ class ResizeUDredisSpaceRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "SpaceId": fields.Str(required=True, dump_to="SpaceId"), - "Size": fields.Int(required=True, dump_to="Size"), "CouponId": fields.Str(required=False, dump_to="CouponId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=True, dump_to="Size"), + "SpaceId": fields.Str(required=True, dump_to="SpaceId"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -664,13 +665,13 @@ class ResizeUMemSpaceRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "SpaceId": fields.Str(required=True, dump_to="SpaceId"), - "Size": fields.Int(required=True, dump_to="Size"), - "Type": fields.Str(required=False, dump_to="Type"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "CouponId": fields.Str(required=False, dump_to="CouponId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=True, dump_to="Size"), + "SpaceId": fields.Str(required=True, dump_to="SpaceId"), + "Type": fields.Str(required=False, dump_to="Type"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -694,14 +695,14 @@ class ResizeURedisGroupRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "GroupId": fields.Str(required=True, dump_to="GroupId"), - "Size": fields.Int(required=True, dump_to="Size"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), - "Type": fields.Str(required=False, dump_to="Type"), "CouponId": fields.Int(required=False, dump_to="CouponId"), + "GroupId": fields.Str(required=True, dump_to="GroupId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "Size": fields.Int(required=True, dump_to="Size"), + "Type": fields.Str(required=False, dump_to="Type"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -724,10 +725,10 @@ class RestartUMemcacheGroupRequestSchema(schema.RequestSchema): """ 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"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "GroupId": fields.Str(required=True, dump_to="GroupId"), } diff --git a/ucloud/services/umem/schemas/models.py b/ucloud/services/umem/schemas/models.py index b15972e..3c4a9ac 100644 --- a/ucloud/services/umem/schemas/models.py +++ b/ucloud/services/umem/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -28,22 +29,22 @@ class UMemSpaceSetSchema(schema.ResponseSchema): """ fields = { - "RewriteTime": fields.Int(required=True, load_from="RewriteTime"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "Address": fields.List(UMemSpaceAddressSetSchema()), + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), + "Name": fields.Str(required=False, load_from="Name"), "Protocol": fields.Str(required=False, load_from="Protocol"), - "UsedSize": fields.Int(required=False, load_from="UsedSize"), - "SpaceId": fields.Str(required=False, load_from="SpaceId"), - "Type": fields.Str(required=False, load_from="Type"), + "RewriteTime": fields.Int(required=True, load_from="RewriteTime"), "Size": fields.Int(required=False, load_from="Size"), + "SpaceId": fields.Str(required=False, load_from="SpaceId"), "State": fields.Str(required=False, load_from="State"), - "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "Address": fields.List(UMemSpaceAddressSetSchema()), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), "Tag": fields.Str(required=True, load_from="Tag"), - "Zone": fields.Str(required=False, load_from="Zone"), + "Type": fields.Str(required=False, load_from="Type"), + "UsedSize": fields.Int(required=False, load_from="UsedSize"), "VPCId": fields.Str(required=False, load_from="VPCId"), - "Name": fields.Str(required=False, load_from="Name"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), + "Zone": fields.Str(required=False, load_from="Zone"), } @@ -52,22 +53,22 @@ class UMemcacheGroupSetSchema(schema.ResponseSchema): """ fields = { + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "ConfigId": fields.Str(required=False, load_from="ConfigId"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), "GroupId": fields.Str(required=False, load_from="GroupId"), "ModifyTime": fields.Int(required=False, load_from="ModifyTime"), - "VirtualIP": fields.Str(required=False, load_from="VirtualIP"), - "Version": fields.Str(required=False, load_from="Version"), - "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), - "Tag": fields.Str(required=False, load_from="Tag"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), "Name": fields.Str(required=False, load_from="Name"), - "ConfigId": fields.Str(required=False, load_from="ConfigId"), "Port": fields.Int(required=False, load_from="Port"), "Size": fields.Int(required=False, load_from="Size"), - "UsedSize": fields.Int(required=False, load_from="UsedSize"), "State": fields.Str(required=False, load_from="State"), - "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "Tag": fields.Str(required=False, load_from="Tag"), + "UsedSize": fields.Int(required=False, load_from="UsedSize"), + "VPCId": fields.Str(required=False, load_from="VPCId"), + "Version": fields.Str(required=False, load_from="Version"), + "VirtualIP": fields.Str(required=False, load_from="VirtualIP"), } @@ -86,15 +87,15 @@ class URedisBackupSetSchema(schema.ResponseSchema): """ fields = { - "GroupName": fields.Str(required=False, load_from="GroupName"), + "BackupId": fields.Str(required=False, load_from="BackupId"), "BackupName": fields.Str(required=False, load_from="BackupName"), "BackupSize": fields.Int(required=False, load_from="BackupSize"), + "BackupTime": fields.Int(required=False, load_from="BackupTime"), "BackupType": fields.Str(required=False, load_from="BackupType"), "GroupId": fields.Str(required=False, load_from="GroupId"), - "Zone": fields.Str(required=False, load_from="Zone"), - "BackupTime": fields.Int(required=False, load_from="BackupTime"), + "GroupName": fields.Str(required=False, load_from="GroupName"), "State": fields.Str(required=False, load_from="State"), - "BackupId": fields.Str(required=False, load_from="BackupId"), + "Zone": fields.Str(required=False, load_from="Zone"), } @@ -103,31 +104,32 @@ class URedisGroupSetSchema(schema.ResponseSchema): """ fields = { - "HighAvailability": fields.Str(required=False, load_from="HighAvailability"), + "AutoBackup": fields.Str(required=False, load_from="AutoBackup"), + "BackupTime": fields.Int(required=False, load_from="BackupTime"), + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "ConfigId": fields.Str(required=False, load_from="ConfigId"), "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "VPCId": fields.Str(required=True, load_from="VPCId"), - "Name": fields.Str(required=False, load_from="Name"), - "Type": fields.Str(required=False, load_from="Type"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), + "GroupId": fields.Str(required=False, load_from="GroupId"), + "GroupName": fields.Str(required=False, load_from="GroupName"), + "HighAvailability": fields.Str(required=False, load_from="HighAvailability"), "MemorySize": fields.Int(required=False, load_from="MemorySize"), - "Port": fields.Int(required=False, load_from="Port"), "ModifyTime": fields.Int(required=False, load_from="ModifyTime"), + "Name": fields.Str(required=False, load_from="Name"), + "Port": fields.Int(required=False, load_from="Port"), "Protocol": fields.Str(required=False, load_from="Protocol"), - "GroupName": fields.Str(required=False, load_from="GroupName"), - "VirtualIP": fields.Str(required=False, load_from="VirtualIP"), - "UsedSize": fields.Int(required=False, load_from="UsedSize"), - "AutoBackup": fields.Str(required=False, load_from="AutoBackup"), - "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), - "Zone": fields.Str(required=False, load_from="Zone"), + "RewriteTime": fields.Int(required=True, load_from="RewriteTime"), "Size": fields.Int(required=False, load_from="Size"), - "Version": fields.Str(required=False, load_from="Version"), + "SlaveZone": fields.Str(required=False, load_from="SlaveZone"), "State": fields.Str(required=False, load_from="State"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), "Tag": fields.Str(required=False, load_from="Tag"), - "SlaveZone": fields.Str(required=False, load_from="SlaveZone"), - "GroupId": fields.Str(required=False, load_from="GroupId"), - "ConfigId": fields.Str(required=False, load_from="ConfigId"), - "BackupTime": fields.Int(required=False, load_from="BackupTime"), - "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "Type": fields.Str(required=False, load_from="Type"), + "UsedSize": fields.Int(required=False, load_from="UsedSize"), + "VPCId": fields.Str(required=True, load_from="VPCId"), + "Version": fields.Str(required=False, load_from="Version"), + "VirtualIP": fields.Str(required=False, load_from="VirtualIP"), + "Zone": fields.Str(required=False, load_from="Zone"), } diff --git a/ucloud/services/unet/client.py b/ucloud/services/unet/client.py index f4726a3..b56727b 100644 --- a/ucloud/services/unet/client.py +++ b/ucloud/services/unet/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.unet.schemas import apis @@ -8,7 +9,7 @@ class UNetClient(Client): def __init__(self, config, transport=None, middleware=None, logger=None): super(UNetClient, self).__init__(config, transport, middleware, logger) - def allocate_e_ip(self, req=None, **kwargs): + def allocate_eip(self, req=None, **kwargs): """ AllocateEIP - 根据提供信息, 申请弹性IP **Request** @@ -34,13 +35,13 @@ def allocate_e_ip(self, req=None, **kwargs): **UnetEIPAddrSet** - - **OperatorName** (str) - 运营商信息如: 电信: Telecom, 联通: Unicom, 国际: International, Duplet: 双线IP（电信+联通), BGP: Bgp - **IP** (str) - IP地址 + - **OperatorName** (str) - 运营商信息如: 电信: Telecom, 联通: Unicom, 国际: International, Duplet: 双线IP（电信+联通), BGP: Bgp **UnetAllocateEIPSet** - - **EIPId** (str) - 申请到的EIP资源ID - **EIPAddr** (list) - 见 **UnetEIPAddrSet** 模型定义 + - **EIPId** (str) - 申请到的EIP资源ID """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -60,6 +61,7 @@ def allocate_share_bandwidth(self, req=None, **kwargs): - **ChargeType** (str) - (Required) 付费方式:Year 按年,Month 按月,Dynamic 按时; - **Name** (str) - (Required) 共享带宽名字 - **ShareBandwidth** (int) - (Required) 共享带宽值 + - **BwType** (str) - 共享带宽类型，ipv4或者ipv6，不传默认ipv4 - **Quantity** (int) - 购买时长 - **ShareBandwidthGuarantee** (int) - 共享带宽保底值(后付费) @@ -75,7 +77,7 @@ def allocate_share_bandwidth(self, req=None, **kwargs): resp = self.invoke("AllocateShareBandwidth", d, **kwargs) return apis.AllocateShareBandwidthResponseSchema().loads(resp) - def allocate_v_ip(self, req=None, **kwargs): + def allocate_vip(self, req=None, **kwargs): """ AllocateVIP - 根据提供信息，申请内网VIP(Virtual IP），多用于高可用程序作为漂移IP。 **Request** @@ -86,6 +88,7 @@ def allocate_v_ip(self, req=None, **kwargs): - **VPCId** (str) - (Required) 指定vip所属的VPC - **BusinessId** (str) - 业务组 - **Count** (int) - 申请数量，默认: 1 + - **Ip** (str) - 指定ip - **Name** (str) - vip名，默认为VIP - **Remark** (str) - 备注 - **Tag** (str) - 业务组名称，默认为Default @@ -112,7 +115,7 @@ def allocate_v_ip(self, req=None, **kwargs): resp = self.invoke("AllocateVIP", d, **kwargs) return apis.AllocateVIPResponseSchema().loads(resp) - def associate_e_ip_with_share_bandwidth(self, req=None, **kwargs): + def associate_eip_with_share_bandwidth(self, req=None, **kwargs): """ AssociateEIPWithShareBandwidth - 将EIP加入共享带宽 **Request** @@ -132,7 +135,7 @@ def associate_e_ip_with_share_bandwidth(self, req=None, **kwargs): resp = self.invoke("AssociateEIPWithShareBandwidth", d, **kwargs) return apis.AssociateEIPWithShareBandwidthResponseSchema().loads(resp) - def bind_e_ip(self, req=None, **kwargs): + def bind_eip(self, req=None, **kwargs): """ BindEIP - 将尚未使用的弹性IP绑定到指定的资源 **Request** @@ -259,18 +262,18 @@ def describe_bandwidth_package(self, req=None, **kwargs): **EIPAddrSet** - - **OperatorName** (str) - 运营商信息, 枚举值为: Telecom 电信; Unicom: 联通; Duplet: 双线; Bgp: BGP; International: 国际. - **IP** (str) - 弹性IP地址 + - **OperatorName** (str) - 运营商信息, 枚举值为: Telecom 电信; Unicom: 联通; Duplet: 双线; Bgp: BGP; International: 国际. **UnetBandwidthPackageSet** - **Bandwidth** (int) - 带宽包的临时带宽值, 单位Mbps - - **EIPId** (str) - 带宽包所绑定弹性IP的资源ID - - **EIPAddr** (list) - 见 **EIPAddrSet** 模型定义 - **BandwidthPackageId** (str) - 带宽包的资源ID - - **EnableTime** (int) - 生效时间, 格式为 Unix Timestamp - - **DisableTime** (int) - 失效时间, 格式为 Unix Timestamp - **CreateTime** (int) - 创建时间, 格式为 Unix Timestamp + - **DisableTime** (int) - 失效时间, 格式为 Unix Timestamp + - **EIPAddr** (list) - 见 **EIPAddrSet** 模型定义 + - **EIPId** (str) - 带宽包所绑定弹性IP的资源ID + - **EnableTime** (int) - 生效时间, 格式为 Unix Timestamp """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -292,8 +295,8 @@ def describe_bandwidth_usage(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - EIPSet中的元素个数 - **EIPSet** (list) - 见 **UnetBandwidthUsageEIPSet** 模型定义 + - **TotalCount** (int) - EIPSet中的元素个数 **Response Model** @@ -309,7 +312,7 @@ def describe_bandwidth_usage(self, req=None, **kwargs): resp = self.invoke("DescribeBandwidthUsage", d, **kwargs) return apis.DescribeBandwidthUsageResponseSchema().loads(resp) - def describe_e_ip(self, req=None, **kwargs): + def describe_eip(self, req=None, **kwargs): """ DescribeEIP - 获取弹性IP信息 **Request** @@ -322,51 +325,51 @@ def describe_e_ip(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 满足条件的弹性IP总数 - - **TotalBandwidth** (int) - 满足条件的弹性IP带宽总和, 单位Mbps - **EIPSet** (list) - 见 **UnetEIPSet** 模型定义 + - **TotalBandwidth** (int) - 满足条件的弹性IP带宽总和, 单位Mbps + - **TotalCount** (int) - 满足条件的弹性IP总数 **Response Model** + **ShareBandwidthSet** + + - **ShareBandwidth** (int) - 共享带宽带宽值 + - **ShareBandwidthId** (str) - 共享带宽ID + - **ShareBandwidthName** (str) - 共享带宽的资源名称 + **UnetEIPAddrSet** - - **OperatorName** (str) - 运营商信息如: 电信: Telecom, 联通: Unicom, 国际: International, Duplet: 双线IP（电信+联通), BGP: Bgp - **IP** (str) - IP地址 + - **OperatorName** (str) - 运营商信息如: 电信: Telecom, 联通: Unicom, 国际: International, Duplet: 双线IP（电信+联通), BGP: Bgp **UnetEIPResourceSet** - - **ResourceType** (str) - 已绑定的资源类型, 枚举值为: uhost, 云主机；natgw：NAT网关；ulb：负载均衡器；upm: 物理机; hadoophost: 大数据集群;fortresshost：堡垒机；udockhost：容器；udhost：私有专区主机；vpngw：IPSec VPN；ucdr：云灾备；dbaudit：数据库审计，uni：虚拟网卡。 - - **ResourceName** (str) - 已绑定的资源名称 + - **EIPId** (str) - 弹性IP的资源ID - **ResourceId** (str) - 已绑定资源的资源ID - - **SubResourceType** (str) - 资源绑定的虚拟网卡的类型。uni，虚拟网卡。 - - **SubResourceName** (str) - 资源绑定的虚拟网卡的名称 + - **ResourceName** (str) - 已绑定的资源名称 + - **ResourceType** (str) - 已绑定的资源类型, 枚举值为: uhost, 云主机；natgw：NAT网关；ulb：负载均衡器；upm: 物理机; hadoophost: 大数据集群;fortresshost：堡垒机；udockhost：容器；udhost：私有专区主机；vpngw：IPSec VPN；ucdr：云灾备；dbaudit：数据库审计，uni：虚拟网卡。 - **SubResourceId** (str) - 资源绑定的虚拟网卡的ID - - **EIPId** (str) - 弹性IP的资源ID - - **ShareBandwidthSet** - - - **ShareBandwidthName** (str) - 共享带宽的资源名称 - - **ShareBandwidthId** (str) - 共享带宽ID - - **ShareBandwidth** (int) - 共享带宽带宽值 + - **SubResourceName** (str) - 资源绑定的虚拟网卡的名称 + - **SubResourceType** (str) - 资源绑定的虚拟网卡的类型。uni，虚拟网卡。 **UnetEIPSet** - - **Remark** (str) - 弹性IP的备注, 缺省值为 "" - - **PayMode** (str) - 弹性IP的计费模式, 枚举值为: "Bandwidth", 带宽计费; "Traffic", 流量计费; "ShareBandwidth",共享带宽模式. 默认为 "Bandwidth". - - **Expire** (bool) - 弹性IP是否到期 + - **Bandwidth** (int) - 弹性IP的带宽, 单位为Mbps, 当BandwidthType=1时, 该处显示为共享带宽值. 当BandwidthType=0时, 该处显示这个弹性IP的带宽. + - **BandwidthType** (int) - 带宽模式, 枚举值为: 0: 非共享带宽模式, 1: 共享带宽模式 + - **ChargeType** (str) - 付费方式, 枚举值为: Year, 按年付费; Month, 按月付费; Dynamic, 按小时付费; Trial, 试用. 按小时付费和试用这两种付费模式需要开通权限. + - **CreateTime** (int) - 弹性IP的创建时间, 格式为Unix Timestamp + - **EIPAddr** (list) - 见 **UnetEIPAddrSet** 模型定义 - **EIPId** (str) - 弹性IP的资源ID - - **Status** (str) - 弹性IP的资源绑定状态, 枚举值为: used: 已绑定, free: 未绑定, freeze: 已冻结 + - **Expire** (bool) - 弹性IP是否到期 + - **ExpireTime** (int) - 弹性IP的到期时间, 格式为Unix Timestamp - **Name** (str) - 弹性IP的名称,缺省值为 "EIP" + - **PayMode** (str) - 弹性IP的计费模式, 枚举值为: "Bandwidth", 带宽计费; "Traffic", 流量计费; "ShareBandwidth",共享带宽模式. 默认为 "Bandwidth". + - **Remark** (str) - 弹性IP的备注, 缺省值为 "" + - **Resource** (dict) - 见 **UnetEIPResourceSet** 模型定义 - **ShareBandwidthSet** (dict) - 见 **ShareBandwidthSet** 模型定义 + - **Status** (str) - 弹性IP的资源绑定状态, 枚举值为: used: 已绑定, free: 未绑定, freeze: 已冻结 - **Tag** (str) - 弹性IP的业务组标识, 缺省值为 "Default" - **Weight** (int) - 外网出口权重, 默认为50, 范围[0-100] - - **ChargeType** (str) - 付费方式, 枚举值为: Year, 按年付费; Month, 按月付费; Dynamic, 按小时付费; Trial, 试用. 按小时付费和试用这两种付费模式需要开通权限. - - **CreateTime** (int) - 弹性IP的创建时间, 格式为Unix Timestamp - - **Resource** (dict) - 见 **UnetEIPResourceSet** 模型定义 - - **EIPAddr** (list) - 见 **UnetEIPAddrSet** 模型定义 - - **BandwidthType** (int) - 带宽模式, 枚举值为: 0: 非共享带宽模式, 1: 共享带宽模式 - - **Bandwidth** (int) - 弹性IP的带宽, 单位为Mbps, 当BandwidthType=1时, 该处显示为共享带宽值. 当BandwidthType=0时, 该处显示这个弹性IP的带宽. - - **ExpireTime** (int) - 弹性IP的到期时间, 格式为Unix Timestamp """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -390,31 +393,31 @@ def describe_firewall(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - - **DataSet** (list) - 见 **FirewallDataSet** 模型定义 + - **TotalCount** (int) - **Response Model** **FirewallRuleSet** - - **RuleAction** (str) - 防火墙动作 - - **Remark** (str) - 防火墙规则备注 - - **SrcIP** (str) - 源地址 + - **DstPort** (str) - 目标端口 - **Priority** (str) - 优先级 - **ProtocolType** (str) - 协议类型 - - **DstPort** (str) - 目标端口 + - **Remark** (str) - 防火墙规则备注 + - **RuleAction** (str) - 防火墙动作 + - **SrcIP** (str) - 源地址 **FirewallDataSet** - - **GroupId** (str) - 安全组ID（即将废弃） - - **Tag** (str) - 防火墙业务组 - - **Type** (str) - 防火墙组类型，枚举值为： "user defined", 用户自定义防火墙； "recommend web", 默认Web防火墙； "recommend non web", 默认非Web防火墙 - - **Rule** (list) - 见 **FirewallRuleSet** 模型定义 + - **CreateTime** (int) - 防火墙组创建时间，格式为Unix Timestamp - **FWId** (str) - 防火墙ID + - **GroupId** (str) - 安全组ID（即将废弃） - **Name** (str) - 防火墙名称 - **Remark** (str) - 防火墙备注 - **ResourceCount** (int) - 防火墙绑定资源数量 - - **CreateTime** (int) - 防火墙组创建时间，格式为Unix Timestamp + - **Rule** (list) - 见 **FirewallRuleSet** 模型定义 + - **Tag** (str) - 防火墙业务组 + - **Type** (str) - 防火墙组类型，枚举值为： "user defined", 用户自定义防火墙； "recommend web", 默认Web防火墙； "recommend non web", 默认非Web防火墙 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -443,14 +446,14 @@ def describe_firewall_resource(self, req=None, **kwargs): **ResourceSet** - - **Status** (int) - 状态 - - **Tag** (str) - 业务组 - - **Zone** (int) - 可用区 - **Name** (str) - 名称 - **PrivateIP** (str) - 内网IP - **Remark** (str) - 备注 - **ResourceID** (str) - 绑定该防火墙的资源id - **ResourceType** (str) - 绑定资源的资源类型，如"uhost","upm","umem","uhive","uvip","uredis","uhadoop","ufortress","dbaudit","udw","udocker", "umemcache" + - **Status** (int) - 状态 + - **Tag** (str) - 业务组 + - **Zone** (int) - 可用区 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -477,8 +480,8 @@ def describe_share_bandwidth(self, req=None, **kwargs): **EIPAddrSet** - - **OperatorName** (str) - 运营商信息, 枚举值为: Telecom 电信; Unicom: 联通; Duplet: 双线; Bgp: BGP; International: 国际. - **IP** (str) - 弹性IP地址 + - **OperatorName** (str) - 运营商信息, 枚举值为: Telecom 电信; Unicom: 联通; Duplet: 双线; Bgp: BGP; International: 国际. **EIPSetData** @@ -488,15 +491,15 @@ def describe_share_bandwidth(self, req=None, **kwargs): **UnetShareBandwidthSet** - - **EIPSet** (list) - 见 **EIPSetData** 模型定义 - - **Name** (str) - 共享带宽名称 - - **ShareBandwidth** (int) - 共享带宽值(预付费)/共享带宽峰值(后付费), 单位Mbps + - **BandwidthGuarantee** (int) - 共享带宽保底值(后付费) + - **ChargeType** (str) - 付费方式, 预付费:Year 按年,Month 按月,Dynamic 按需;后付费:PostPay(按月) - **CreateTime** (int) - 创建时间, 格式为Unix Timestamp + - **EIPSet** (list) - 见 **EIPSetData** 模型定义 - **ExpireTime** (int) - 过期时间, 格式为Unix Timestamp + - **Name** (str) - 共享带宽名称 - **PostPayStartTime** (int) - 共享带宽后付费开始计费时间(后付费) + - **ShareBandwidth** (int) - 共享带宽值(预付费)/共享带宽峰值(后付费), 单位Mbps - **ShareBandwidthId** (str) - 共享带宽的资源ID - - **ChargeType** (str) - 付费方式, 预付费:Year 按年,Month 按月,Dynamic 按需;后付费:PostPay(按月) - - **BandwidthGuarantee** (int) - 共享带宽保底值(后付费) """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -505,7 +508,7 @@ def describe_share_bandwidth(self, req=None, **kwargs): resp = self.invoke("DescribeShareBandwidth", d, **kwargs) return apis.DescribeShareBandwidthResponseSchema().loads(resp) - def describe_v_ip(self, req=None, **kwargs): + def describe_vip(self, req=None, **kwargs): """ DescribeVIP - 获取内网VIP详细信息 **Request** @@ -520,22 +523,22 @@ def describe_v_ip(self, req=None, **kwargs): **Response** - - **VIPSet** (list) - 见 **VIPDetailSet** 模型定义 - **DataSet** (list) - 内网VIP地址列表 - **TotalCount** (int) - vip数量 + - **VIPSet** (list) - 见 **VIPDetailSet** 模型定义 **Response Model** **VIPDetailSet** + - **CreateTime** (int) - 创建时间 + - **Name** (str) - - **RealIp** (str) - 真实主机ip - - **VIP** (str) - 虚拟ip - **SubnetId** (str) - 子网id + - **VIP** (str) - 虚拟ip + - **VIPId** (str) - 虚拟ip id - **VPCId** (str) - VPC id - - **Name** (str) - - **Zone** (str) - 地域 - - **VIPId** (str) - 虚拟ip id - - **CreateTime** (int) - 创建时间 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -544,7 +547,7 @@ def describe_v_ip(self, req=None, **kwargs): resp = self.invoke("DescribeVIP", d, **kwargs) return apis.DescribeVIPResponseSchema().loads(resp) - def disassociate_e_ip_with_share_bandwidth(self, req=None, **kwargs): + def disassociate_eip_with_share_bandwidth(self, req=None, **kwargs): """ DisassociateEIPWithShareBandwidth - 将EIP移出共享带宽 **Request** @@ -566,7 +569,7 @@ def disassociate_e_ip_with_share_bandwidth(self, req=None, **kwargs): resp = self.invoke("DisassociateEIPWithShareBandwidth", d, **kwargs) return apis.DisassociateEIPWithShareBandwidthResponseSchema().loads(resp) - def get_e_ip_pay_mode(self, req=None, **kwargs): + def get_eip_pay_mode(self, req=None, **kwargs): """ GetEIPPayMode - 获取弹性IP计费模式 **Request** @@ -583,8 +586,8 @@ def get_e_ip_pay_mode(self, req=None, **kwargs): **EIPPayModeSet** - - **EIPPayMode** (str) - EIP的计费模式. 枚举值为：Bandwidth, 带宽计费;Traffic, 流量计费; "ShareBandwidth",共享带宽模式 - **EIPId** (str) - EIP的资源ID + - **EIPPayMode** (str) - EIP的计费模式. 枚举值为：Bandwidth, 带宽计费;Traffic, 流量计费; "ShareBandwidth",共享带宽模式 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -593,7 +596,7 @@ def get_e_ip_pay_mode(self, req=None, **kwargs): resp = self.invoke("GetEIPPayMode", d, **kwargs) return apis.GetEIPPayModeResponseSchema().loads(resp) - def get_e_ip_price(self, req=None, **kwargs): + def get_eip_price(self, req=None, **kwargs): """ GetEIPPrice - 获取弹性IP价格 **Request** @@ -614,9 +617,9 @@ def get_e_ip_price(self, req=None, **kwargs): **EIPPriceDetailSet** - - **PurchaseValue** (int) - 资源有效期, 以Unix Timestamp表示 - **ChargeType** (str) - 弹性IP付费方式 - **Price** (float) - 弹性IP价格, 单位"元" + - **PurchaseValue** (int) - 资源有效期, 以Unix Timestamp表示 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -625,7 +628,7 @@ def get_e_ip_price(self, req=None, **kwargs): resp = self.invoke("GetEIPPrice", d, **kwargs) return apis.GetEIPPriceResponseSchema().loads(resp) - def get_e_ip_upgrade_price(self, req=None, **kwargs): + def get_eip_upgrade_price(self, req=None, **kwargs): """ GetEIPUpgradePrice - 获取弹性IP带宽改动价格 **Request** @@ -667,7 +670,7 @@ def grant_firewall(self, req=None, **kwargs): resp = self.invoke("GrantFirewall", d, **kwargs) return apis.GrantFirewallResponseSchema().loads(resp) - def modify_e_ip_bandwidth(self, req=None, **kwargs): + def modify_eip_bandwidth(self, req=None, **kwargs): """ ModifyEIPBandwidth - 调整弹性IP的外网带宽 **Request** @@ -687,7 +690,7 @@ def modify_e_ip_bandwidth(self, req=None, **kwargs): resp = self.invoke("ModifyEIPBandwidth", d, **kwargs) return apis.ModifyEIPBandwidthResponseSchema().loads(resp) - def modify_e_ip_weight(self, req=None, **kwargs): + def modify_eip_weight(self, req=None, **kwargs): """ ModifyEIPWeight - 修改弹性IP的外网出口权重 **Request** @@ -707,7 +710,7 @@ def modify_e_ip_weight(self, req=None, **kwargs): resp = self.invoke("ModifyEIPWeight", d, **kwargs) return apis.ModifyEIPWeightResponseSchema().loads(resp) - def release_e_ip(self, req=None, **kwargs): + def release_eip(self, req=None, **kwargs): """ ReleaseEIP - 释放弹性IP资源, 所释放弹性IP必须为非绑定状态. **Request** @@ -747,7 +750,7 @@ def release_share_bandwidth(self, req=None, **kwargs): resp = self.invoke("ReleaseShareBandwidth", d, **kwargs) return apis.ReleaseShareBandwidthResponseSchema().loads(resp) - def release_v_ip(self, req=None, **kwargs): + def release_vip(self, req=None, **kwargs): """ ReleaseVIP - 释放VIP资源 **Request** @@ -787,7 +790,7 @@ def resize_share_bandwidth(self, req=None, **kwargs): resp = self.invoke("ResizeShareBandwidth", d, **kwargs) return apis.ResizeShareBandwidthResponseSchema().loads(resp) - def set_e_ip_pay_mode(self, req=None, **kwargs): + def set_eip_pay_mode(self, req=None, **kwargs): """ SetEIPPayMode - 设置弹性IP计费模式, 切换时会涉及付费/退费. **Request** @@ -808,7 +811,7 @@ def set_e_ip_pay_mode(self, req=None, **kwargs): resp = self.invoke("SetEIPPayMode", d, **kwargs) return apis.SetEIPPayModeResponseSchema().loads(resp) - def un_bind_e_ip(self, req=None, **kwargs): + def un_bind_eip(self, req=None, **kwargs): """ UnBindEIP - 将弹性IP从资源上解绑 **Request** @@ -829,7 +832,7 @@ def un_bind_e_ip(self, req=None, **kwargs): resp = self.invoke("UnBindEIP", d, **kwargs) return apis.UnBindEIPResponseSchema().loads(resp) - def update_e_ip_attribute(self, req=None, **kwargs): + def update_eip_attribute(self, req=None, **kwargs): """ UpdateEIPAttribute - 更新弹性IP名称，业务组，备注等属性字段 **Request** @@ -893,3 +896,33 @@ def update_firewall_attribute(self, req=None, **kwargs): d = apis.UpdateFirewallAttributeRequestSchema().dumps(d) resp = self.invoke("UpdateFirewallAttribute", d, **kwargs) return apis.UpdateFirewallAttributeResponseSchema().loads(resp) + + _deprecated = { + "allocate_e_ip": "allocate_eip", + "associate_e_ip_with_share_bandwidth": "associate_eip_with_share_bandwidth", + "bind_e_ip": "bind_eip", + "describe_e_ip": "describe_eip", + "disassociate_e_ip_with_share_bandwidth": "disassociate_eip_with_share_bandwidth", + "get_e_ip_pay_mode": "get_eip_pay_mode", + "get_e_ip_price": "get_eip_price", + "get_e_ip_upgrade_price": "get_eip_upgrade_price", + "modify_e_ip_bandwidth": "modify_eip_bandwidth", + "modify_e_ip_weight": "modify_eip_weight", + "release_e_ip": "release_eip", + "set_e_ip_pay_mode": "set_eip_pay_mode", + "un_bind_e_ip": "un_bind_eip", + "update_e_ip_attribute": "update_eip_attribute", + "release_v_ip": "release_vip", + "allocate_v_ip": "allocate_vip", + "describe_v_ip": "describe_vip", + } + + def __getattr__(self, item): + if item in self._deprecated: + instead_of = self._deprecated[item] + msg = "the method {} is deprecated, please use {} instead, this method will remove after 0.5.0 version" + self.logger.warning(msg.format(item, instead_of)) + return getattr(self, self._deprecated[item]) + raise AttributeError( + "'{}' object has no attribute '{}'".format(self.__class__.__name__, item) + ) diff --git a/ucloud/services/unet/schemas/apis.py b/ucloud/services/unet/schemas/apis.py index 4ebb079..97f92a7 100644 --- a/ucloud/services/unet/schemas/apis.py +++ b/ucloud/services/unet/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.unet.schemas import models @@ -17,18 +18,18 @@ class AllocateEIPRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), - "PayMode": fields.Str(required=False, dump_to="PayMode"), - "Remark": fields.Str(required=False, dump_to="Remark"), + "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "CouponId": fields.Str(required=False, dump_to="CouponId"), + "Name": fields.Str(required=False, dump_to="Name"), "OperatorName": fields.Str(required=True, dump_to="OperatorName"), - "Tag": fields.Str(required=False, dump_to="Tag"), - "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "PayMode": fields.Str(required=False, dump_to="PayMode"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), + "Remark": fields.Str(required=False, dump_to="Remark"), "ShareBandwidthId": fields.Str(required=False, dump_to="ShareBandwidthId"), - "Name": fields.Str(required=False, dump_to="Name"), + "Tag": fields.Str(required=False, dump_to="Tag"), } @@ -55,15 +56,16 @@ class AllocateShareBandwidthRequestSchema(schema.RequestSchema): """ fields = { - "ShareBandwidth": fields.Int(required=True, dump_to="ShareBandwidth"), + "BwType": fields.Str(required=False, dump_to="BwType"), + "ChargeType": fields.Str(required=True, dump_to="ChargeType"), + "Name": fields.Str(required=True, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), + "ShareBandwidth": fields.Int(required=True, dump_to="ShareBandwidth"), "ShareBandwidthGuarantee": fields.Int( required=False, dump_to="ShareBandwidthGuarantee" ), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Name": fields.Str(required=True, dump_to="Name"), - "ChargeType": fields.Str(required=True, dump_to="ChargeType"), } @@ -88,16 +90,17 @@ class AllocateVIPRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "SubnetId": fields.Str(required=True, dump_to="SubnetId"), "BusinessId": fields.Str(required=False, dump_to="BusinessId"), - "Region": fields.Str(required=True, dump_to="Region"), - "VPCId": fields.Str(required=True, dump_to="VPCId"), "Count": fields.Int(required=False, dump_to="Count"), + "Ip": fields.Str(required=False, dump_to="Ip"), "Name": fields.Str(required=False, dump_to="Name"), - "Tag": fields.Str(required=False, dump_to="Tag"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Remark": fields.Str(required=False, dump_to="Remark"), + "SubnetId": fields.Str(required=True, dump_to="SubnetId"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "VPCId": fields.Str(required=True, dump_to="VPCId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -106,10 +109,10 @@ class AllocateVIPResponseSchema(schema.ResponseSchema): """ fields = { + "DataSet": fields.List(fields.Str(), required=False, load_from="DataSet"), "VIPSet": fields.List( models.VIPSetSchema(), required=False, load_from="VIPSet" ), - "DataSet": fields.List(fields.Str(), required=False, load_from="DataSet"), } @@ -126,8 +129,8 @@ class AssociateEIPWithShareBandwidthRequestSchema(schema.RequestSchema): fields = { "EIPIds": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ShareBandwidthId": fields.Str(required=True, dump_to="ShareBandwidthId"), } @@ -151,11 +154,11 @@ class BindEIPRequestSchema(schema.RequestSchema): """ fields = { - "ResourceType": fields.Str(required=True, dump_to="ResourceType"), - "ResourceId": fields.Str(required=True, dump_to="ResourceId"), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "EIPId": fields.Str(required=True, dump_to="EIPId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "ResourceId": fields.Str(required=True, dump_to="ResourceId"), + "ResourceType": fields.Str(required=True, dump_to="ResourceType"), } @@ -179,12 +182,12 @@ class CreateBandwidthPackageRequestSchema(schema.RequestSchema): fields = { "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), + "CouponId": fields.Str(required=False, dump_to="CouponId"), "EIPId": fields.Str(required=True, dump_to="EIPId"), - "TimeRange": fields.Int(required=True, dump_to="TimeRange"), "EnableTime": fields.Int(required=False, dump_to="EnableTime"), - "CouponId": fields.Str(required=False, dump_to="CouponId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "TimeRange": fields.Int(required=True, dump_to="TimeRange"), } @@ -210,11 +213,11 @@ class CreateFirewallRequestSchema(schema.RequestSchema): fields = { "Name": fields.Str(required=True, dump_to="Name"), - "Tag": fields.Str(required=False, dump_to="Tag"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Remark": fields.Str(required=False, dump_to="Remark"), "Rule": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Tag": fields.Str(required=False, dump_to="Tag"), } @@ -238,8 +241,8 @@ class DeleteBandwidthPackageRequestSchema(schema.RequestSchema): fields = { "BandwidthPackageId": fields.Str(required=True, dump_to="BandwidthPackageId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -262,9 +265,9 @@ class DeleteFirewallRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "FWId": fields.Str(required=True, dump_to="FWId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -287,10 +290,10 @@ class DescribeBandwidthPackageRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Limit": fields.Int(required=False, dump_to="Limit"), "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -299,10 +302,10 @@ class DescribeBandwidthPackageResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSets": fields.List( models.UnetBandwidthPackageSetSchema(), required=False, load_from="DataSets" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -319,10 +322,10 @@ class DescribeBandwidthUsageRequestSchema(schema.RequestSchema): fields = { "EIPIds": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Limit": fields.Int(required=False, dump_to="Limit"), "OffSet": fields.Int(required=False, dump_to="OffSet"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -331,10 +334,10 @@ class DescribeBandwidthUsageResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "EIPSet": fields.List( models.UnetBandwidthUsageEIPSetSchema(), required=False, load_from="EIPSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -351,10 +354,10 @@ class DescribeEIPRequestSchema(schema.RequestSchema): fields = { "EIPIds": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Offset": fields.Int(required=False, dump_to="Offset"), "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -363,10 +366,10 @@ class DescribeEIPResponseSchema(schema.ResponseSchema): """ fields = { - "TotalBandwidth": fields.Int(required=False, load_from="TotalBandwidth"), "EIPSet": fields.List( models.UnetEIPSetSchema(), required=False, load_from="EIPSet" ), + "TotalBandwidth": fields.Int(required=False, load_from="TotalBandwidth"), "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -383,13 +386,13 @@ class DescribeFirewallRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "FWId": fields.Str(required=False, dump_to="FWId"), - "ResourceType": fields.Str(required=False, dump_to="ResourceType"), - "ResourceId": fields.Str(required=False, dump_to="ResourceId"), "Limit": fields.Int(required=False, dump_to="Limit"), "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "ResourceId": fields.Str(required=False, dump_to="ResourceId"), + "ResourceType": fields.Str(required=False, dump_to="ResourceType"), } @@ -417,11 +420,11 @@ class DescribeFirewallResourceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "FWId": fields.Str(required=True, dump_to="FWId"), "Limit": fields.Int(required=False, dump_to="Limit"), "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -449,9 +452,9 @@ class DescribeShareBandwidthRequestSchema(schema.RequestSchema): """ fields = { - "ShareBandwidthIds": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "ShareBandwidthIds": fields.List(fields.Str()), } @@ -479,13 +482,13 @@ class DescribeVIPRequestSchema(schema.RequestSchema): """ fields = { - "Tag": fields.Str(required=False, dump_to="Tag"), "BusinessId": fields.Str(required=False, dump_to="BusinessId"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Region": fields.Str(required=True, dump_to="Region"), "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -494,11 +497,11 @@ class DescribeVIPResponseSchema(schema.ResponseSchema): """ fields = { + "DataSet": fields.List(fields.Str(), required=False, load_from="DataSet"), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), "VIPSet": fields.List( models.VIPDetailSetSchema(), required=False, load_from="VIPSet" ), - "DataSet": fields.List(fields.Str(), required=False, load_from="DataSet"), - "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -514,12 +517,12 @@ class DisassociateEIPWithShareBandwidthRequestSchema(schema.RequestSchema): """ fields = { - "PayMode": fields.Str(required=False, dump_to="PayMode"), + "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), "EIPIds": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), + "PayMode": fields.Str(required=False, dump_to="PayMode"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ShareBandwidthId": fields.Str(required=True, dump_to="ShareBandwidthId"), - "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), } @@ -542,9 +545,9 @@ class GetEIPPayModeRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "EIPId": fields.List(fields.Str()), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -571,13 +574,13 @@ class GetEIPPriceRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "OperatorName": fields.Str(required=True, dump_to="OperatorName"), "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), + "OperatorName": fields.Str(required=True, dump_to="OperatorName"), "PayMode": fields.Str(required=False, dump_to="PayMode"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Quantity": fields.Int(required=False, dump_to="Quantity"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -605,9 +608,9 @@ class GetEIPUpgradePriceRequestSchema(schema.RequestSchema): fields = { "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "EIPId": fields.Str(required=True, dump_to="EIPId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -630,11 +633,11 @@ class GrantFirewallRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "FWId": fields.Str(required=True, dump_to="FWId"), - "ResourceType": fields.Str(required=True, dump_to="ResourceType"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ResourceId": fields.Str(required=True, dump_to="ResourceId"), + "ResourceType": fields.Str(required=True, dump_to="ResourceType"), } @@ -657,10 +660,10 @@ class ModifyEIPBandwidthRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "EIPId": fields.Str(required=True, dump_to="EIPId"), "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), + "EIPId": fields.Str(required=True, dump_to="EIPId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -683,9 +686,9 @@ class ModifyEIPWeightRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "EIPId": fields.Str(required=True, dump_to="EIPId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Weight": fields.Int(required=True, dump_to="Weight"), } @@ -709,9 +712,9 @@ class ReleaseEIPRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "EIPId": fields.Str(required=True, dump_to="EIPId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -734,11 +737,11 @@ class ReleaseShareBandwidthRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "ShareBandwidthId": fields.Str(required=True, dump_to="ShareBandwidthId"), "EIPBandwidth": fields.Int(required=True, dump_to="EIPBandwidth"), "PayMode": fields.Str(required=False, dump_to="PayMode"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "ShareBandwidthId": fields.Str(required=True, dump_to="ShareBandwidthId"), } @@ -761,10 +764,10 @@ class ReleaseVIPRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "VIPId": fields.Str(required=True, dump_to="VIPId"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -787,8 +790,8 @@ class ResizeShareBandwidthRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ShareBandwidth": fields.Int(required=True, dump_to="ShareBandwidth"), "ShareBandwidthId": fields.Str(required=True, dump_to="ShareBandwidthId"), } @@ -814,10 +817,10 @@ class SetEIPPayModeRequestSchema(schema.RequestSchema): fields = { "Bandwidth": fields.Int(required=True, dump_to="Bandwidth"), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "EIPId": fields.Str(required=True, dump_to="EIPId"), "PayMode": fields.Str(required=True, dump_to="PayMode"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), } @@ -841,10 +844,10 @@ class UnBindEIPRequestSchema(schema.RequestSchema): fields = { "EIPId": fields.Str(required=True, dump_to="EIPId"), - "ResourceType": fields.Str(required=True, dump_to="ResourceType"), - "ResourceId": fields.Str(required=True, dump_to="ResourceId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "ResourceId": fields.Str(required=True, dump_to="ResourceId"), + "ResourceType": fields.Str(required=True, dump_to="ResourceType"), } @@ -867,12 +870,12 @@ class UpdateEIPAttributeRequestSchema(schema.RequestSchema): """ fields = { - "Tag": fields.Str(required=False, dump_to="Tag"), - "Remark": fields.Str(required=False, dump_to="Remark"), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "EIPId": fields.Str(required=True, dump_to="EIPId"), "Name": fields.Str(required=False, dump_to="Name"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Remark": fields.Str(required=False, dump_to="Remark"), + "Tag": fields.Str(required=False, dump_to="Tag"), } @@ -895,10 +898,10 @@ class UpdateFirewallRequestSchema(schema.RequestSchema): """ fields = { - "Rule": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "FWId": fields.Str(required=True, dump_to="FWId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Rule": fields.List(fields.Str()), } @@ -923,10 +926,10 @@ class UpdateFirewallAttributeRequestSchema(schema.RequestSchema): fields = { "FWId": fields.Str(required=True, dump_to="FWId"), "Name": fields.Str(required=False, dump_to="Name"), - "Tag": fields.Str(required=False, dump_to="Tag"), - "Remark": fields.Str(required=False, dump_to="Remark"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Remark": fields.Str(required=False, dump_to="Remark"), + "Tag": fields.Str(required=False, dump_to="Tag"), } diff --git a/ucloud/services/unet/schemas/models.py b/ucloud/services/unet/schemas/models.py index 3a81967..6fe0231 100644 --- a/ucloud/services/unet/schemas/models.py +++ b/ucloud/services/unet/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -8,8 +9,8 @@ class UnetEIPAddrSetSchema(schema.ResponseSchema): """ fields = { - "OperatorName": fields.Str(required=False, load_from="OperatorName"), "IP": fields.Str(required=False, load_from="IP"), + "OperatorName": fields.Str(required=False, load_from="OperatorName"), } @@ -18,8 +19,8 @@ class UnetAllocateEIPSetSchema(schema.ResponseSchema): """ fields = { - "EIPId": fields.Str(required=False, load_from="EIPId"), "EIPAddr": fields.List(UnetEIPAddrSetSchema()), + "EIPId": fields.Str(required=False, load_from="EIPId"), } @@ -39,8 +40,8 @@ class EIPAddrSetSchema(schema.ResponseSchema): """ fields = { - "OperatorName": fields.Str(required=False, load_from="OperatorName"), "IP": fields.Str(required=False, load_from="IP"), + "OperatorName": fields.Str(required=False, load_from="OperatorName"), } @@ -49,15 +50,15 @@ class UnetBandwidthPackageSetSchema(schema.ResponseSchema): """ fields = { - "CreateTime": fields.Int(required=False, load_from="CreateTime"), "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), - "EIPId": fields.Str(required=False, load_from="EIPId"), - "EIPAddr": fields.List(EIPAddrSetSchema()), "BandwidthPackageId": fields.Str( required=False, load_from="BandwidthPackageId" ), - "EnableTime": fields.Int(required=False, load_from="EnableTime"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), "DisableTime": fields.Int(required=False, load_from="DisableTime"), + "EIPAddr": fields.List(EIPAddrSetSchema()), + "EIPId": fields.Str(required=False, load_from="EIPId"), + "EnableTime": fields.Int(required=False, load_from="EnableTime"), } @@ -71,55 +72,55 @@ class UnetBandwidthUsageEIPSetSchema(schema.ResponseSchema): } -class UnetEIPResourceSetSchema(schema.ResponseSchema): - """ UnetEIPResourceSet - DescribeEIP - """ - - fields = { - "ResourceName": fields.Str(required=False, load_from="ResourceName"), - "ResourceId": fields.Str(required=False, load_from="ResourceId"), - "SubResourceType": fields.Str(required=False, load_from="SubResourceType"), - "SubResourceName": fields.Str(required=False, load_from="SubResourceName"), - "SubResourceId": fields.Str(required=False, load_from="SubResourceId"), - "EIPId": fields.Str(required=False, load_from="EIPId"), - "ResourceType": fields.Str(required=False, load_from="ResourceType"), - } - - class ShareBandwidthSetSchema(schema.ResponseSchema): """ ShareBandwidthSet - DescribeEIP """ fields = { - "ShareBandwidthId": fields.Str(required=False, load_from="ShareBandwidthId"), "ShareBandwidth": fields.Int(required=False, load_from="ShareBandwidth"), + "ShareBandwidthId": fields.Str(required=False, load_from="ShareBandwidthId"), "ShareBandwidthName": fields.Str( required=False, load_from="ShareBandwidthName" ), } +class UnetEIPResourceSetSchema(schema.ResponseSchema): + """ UnetEIPResourceSet - DescribeEIP + """ + + fields = { + "EIPId": fields.Str(required=False, load_from="EIPId"), + "ResourceId": fields.Str(required=False, load_from="ResourceId"), + "ResourceName": fields.Str(required=False, load_from="ResourceName"), + "ResourceType": fields.Str(required=False, load_from="ResourceType"), + "SubResourceId": fields.Str(required=False, load_from="SubResourceId"), + "SubResourceName": fields.Str(required=False, load_from="SubResourceName"), + "SubResourceType": fields.Str(required=False, load_from="SubResourceType"), + } + + class UnetEIPSetSchema(schema.ResponseSchema): """ UnetEIPSet - DescribeEIP """ fields = { - "Resource": UnetEIPResourceSetSchema, - "PayMode": fields.Str(required=False, load_from="PayMode"), - "EIPId": fields.Str(required=False, load_from="EIPId"), "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), - "Status": fields.Str(required=False, load_from="Status"), - "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), - "Remark": fields.Str(required=False, load_from="Remark"), "BandwidthType": fields.Int(required=False, load_from="BandwidthType"), "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), "EIPAddr": fields.List(UnetEIPAddrSetSchema()), + "EIPId": fields.Str(required=False, load_from="EIPId"), + "Expire": fields.Bool(required=False, load_from="Expire"), + "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), "Name": fields.Str(required=False, load_from="Name"), + "PayMode": fields.Str(required=False, load_from="PayMode"), + "Remark": fields.Str(required=False, load_from="Remark"), + "Resource": UnetEIPResourceSetSchema(), + "ShareBandwidthSet": ShareBandwidthSetSchema(), + "Status": fields.Str(required=False, load_from="Status"), "Tag": fields.Str(required=False, load_from="Tag"), - "Expire": fields.Bool(required=False, load_from="Expire"), "Weight": fields.Int(required=False, load_from="Weight"), - "ShareBandwidthSet": ShareBandwidthSetSchema, - "CreateTime": fields.Int(required=False, load_from="CreateTime"), } @@ -128,12 +129,12 @@ class FirewallRuleSetSchema(schema.ResponseSchema): """ fields = { - "SrcIP": fields.Str(required=False, load_from="SrcIP"), + "DstPort": fields.Str(required=False, load_from="DstPort"), "Priority": fields.Str(required=False, load_from="Priority"), "ProtocolType": fields.Str(required=False, load_from="ProtocolType"), - "DstPort": fields.Str(required=False, load_from="DstPort"), - "RuleAction": fields.Str(required=False, load_from="RuleAction"), "Remark": fields.Str(required=False, load_from="Remark"), + "RuleAction": fields.Str(required=False, load_from="RuleAction"), + "SrcIP": fields.Str(required=False, load_from="SrcIP"), } @@ -142,15 +143,15 @@ class FirewallDataSetSchema(schema.ResponseSchema): """ fields = { - "Tag": fields.Str(required=False, load_from="Tag"), - "ResourceCount": fields.Int(required=False, load_from="ResourceCount"), "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "Type": fields.Str(required=False, load_from="Type"), - "Rule": fields.List(FirewallRuleSetSchema()), "FWId": fields.Str(required=True, load_from="FWId"), "GroupId": fields.Str(required=True, load_from="GroupId"), "Name": fields.Str(required=False, load_from="Name"), "Remark": fields.Str(required=False, load_from="Remark"), + "ResourceCount": fields.Int(required=False, load_from="ResourceCount"), + "Rule": fields.List(FirewallRuleSetSchema()), + "Tag": fields.Str(required=False, load_from="Tag"), + "Type": fields.Str(required=False, load_from="Type"), } @@ -159,14 +160,14 @@ class ResourceSetSchema(schema.ResponseSchema): """ fields = { - "ResourceType": fields.Str(required=False, load_from="ResourceType"), - "Status": fields.Int(required=False, load_from="Status"), - "Tag": fields.Str(required=False, load_from="Tag"), - "Zone": fields.Int(required=False, load_from="Zone"), "Name": fields.Str(required=False, load_from="Name"), "PrivateIP": fields.Str(required=False, load_from="PrivateIP"), "Remark": fields.Str(required=False, load_from="Remark"), "ResourceID": fields.Str(required=False, load_from="ResourceID"), + "ResourceType": fields.Str(required=False, load_from="ResourceType"), + "Status": fields.Int(required=False, load_from="Status"), + "Tag": fields.Str(required=False, load_from="Tag"), + "Zone": fields.Int(required=False, load_from="Zone"), } @@ -186,17 +187,17 @@ class UnetShareBandwidthSetSchema(schema.ResponseSchema): """ fields = { - "ShareBandwidthId": fields.Str(required=False, load_from="ShareBandwidthId"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), - "ShareBandwidth": fields.Int(required=False, load_from="ShareBandwidth"), - "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "EIPSet": fields.List(EIPSetDataSchema()), "BandwidthGuarantee": fields.Int( required=False, load_from="BandwidthGuarantee" ), - "PostPayStartTime": fields.Int(required=False, load_from="PostPayStartTime"), + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "EIPSet": fields.List(EIPSetDataSchema()), + "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), "Name": fields.Str(required=False, load_from="Name"), + "PostPayStartTime": fields.Int(required=False, load_from="PostPayStartTime"), + "ShareBandwidth": fields.Int(required=False, load_from="ShareBandwidth"), + "ShareBandwidthId": fields.Str(required=False, load_from="ShareBandwidthId"), } @@ -205,14 +206,14 @@ class VIPDetailSetSchema(schema.ResponseSchema): """ fields = { + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "Name": fields.Str(required=False, load_from="Name"), "RealIp": fields.Str(required=False, load_from="RealIp"), - "VIP": fields.Str(required=False, load_from="VIP"), "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "VIP": fields.Str(required=False, load_from="VIP"), + "VIPId": fields.Str(required=False, load_from="VIPId"), "VPCId": fields.Str(required=False, load_from="VPCId"), - "Name": fields.Str(required=False, load_from="Name"), "Zone": fields.Str(required=False, load_from="Zone"), - "VIPId": fields.Str(required=False, load_from="VIPId"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), } diff --git a/ucloud/services/uphost/client.py b/ucloud/services/uphost/client.py index 1f2a7ce..74a7574 100644 --- a/ucloud/services/uphost/client.py +++ b/ucloud/services/uphost/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.uphost.schemas import apis @@ -57,62 +58,62 @@ def describe_phost(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 满足条件的PHost总数 - **PHostSet** (list) - 见 **PHostSet** 模型定义 + - **TotalCount** (int) - 满足条件的PHost总数 **Response Model** + **PHostDiskSet** + + - **Count** (int) - 磁盘数量 + - **IOCap** (int) - 磁盘IO性能，单位MB/s（待废弃） + - **Name** (str) - 磁盘名称，sys/data + - **Space** (int) - 单盘大小，单位GB + - **Type** (str) - 磁盘属性 + **PHostCPUSet** - - **Count** (int) - CPU个数 - **CoreCount** (int) - CPU核数 - - **Model** (str) - CPU型号 + - **Count** (int) - CPU个数 - **Frequence** (float) - CPU主频 + - **Model** (str) - CPU型号 **PHostIPSet** - - **MACAddr** (str) - MAC地址 - **Bandwidth** (int) - IP对应带宽，单位Mb，内网IP不显示带宽信息 + - **IPAddr** (str) - IP地址， + - **IPId** (str) - IP资源ID(内网IP无资源ID)（待废弃） + - **MACAddr** (str) - MAC地址 + - **OperatorName** (str) - 国际: Internation， BGP: BGP， 内网: Private - **SubnetId** (str) - 子网ID - **VPCId** (str) - VPC ID - - **OperatorName** (str) - 国际: Internation， BGP: BGP， 内网: Private - - **IPId** (str) - IP资源ID(内网IP无资源ID)（待废弃） - - **IPAddr** (str) - IP地址， - - **PHostDiskSet** - - - **Space** (int) - 单盘大小，单位GB - - **Count** (int) - 磁盘数量 - - **Type** (str) - 磁盘属性 - - **Name** (str) - 磁盘名称，sys/data - - **IOCap** (int) - 磁盘IO性能，单位MB/s（待废弃） **PHostSet** - - **SN** (str) - 物理机序列号 - - **Remark** (str) - 物理机备注 - - **Tag** (str) - 业务组 - - **PowerState** (str) - 电源状态，on 或 off - - **PHostType** (str) - 物理机类型，参见DescribePHostMachineType返回值 + - **AutoRenew** (str) - 自动续费 + - **CPUSet** (list) - 见 **PHostCPUSet** 模型定义 + - **ChargeType** (str) - 计费模式，枚举值为： Year，按年付费； Month，按月付费； Dynamic，按需付费（需开启权限）； Trial，试用（需开启权限）默认为月付 - **Cluster** (str) - 网络环境。枚举值：千兆：1G ，万兆：10G - - **IsSupportKVM** (str) - 是否支持紧急登录 + - **Components** (str) - 组件信息（暂不支持） - **CreateTime** (int) - 创建时间 - - **ExpireTime** (int) - 到期时间 - - **Memory** (int) - 内存大小，单位：MB - **DiskSet** (list) - 见 **PHostDiskSet** 模型定义 - - **Components** (str) - 组件信息（暂不支持） - - **RaidSupported** (str) - 是否支持Raid。枚举值：Yes：支持；No：不支持。 - - **Zone** (str) - 可用区，参见 `可用区列表 `_ - - **PMStatus** (str) - 物理云主机状态。枚举值：\\ > 初始化:Initializing; \\ > 启动中：Starting； \\ > 运行中：Running；\\ > 关机中：Stopping； \\ > 安装失败：InstallFailed； \\ > 重启中：Rebooting；\\ > 关机：Stopped； - - **OSname** (str) - 操作系统名称 + - **ExpireTime** (int) - 到期时间 - **IPSet** (list) - 见 **PHostIPSet** 模型定义 - - **AutoRenew** (str) - 自动续费 - - **PHostId** (str) - PHost资源ID - - **Name** (str) - 物理机名称 - **ImageName** (str) - 镜像名称 - - **ChargeType** (str) - 计费模式，枚举值为： Year，按年付费； Month，按月付费； Dynamic，按需付费（需开启权限）； Trial，试用（需开启权限）默认为月付 - - **CPUSet** (list) - 见 **PHostCPUSet** 模型定义 + - **IsSupportKVM** (str) - 是否支持紧急登录 + - **Memory** (int) - 内存大小，单位：MB + - **Name** (str) - 物理机名称 - **OSType** (str) - 操作系统类型 + - **OSname** (str) - 操作系统名称 + - **PHostId** (str) - PHost资源ID + - **PHostType** (str) - 物理机类型，参见DescribePHostMachineType返回值 + - **PMStatus** (str) - 物理云主机状态。枚举值：\\ > 初始化:Initializing; \\ > 启动中：Starting； \\ > 运行中：Running；\\ > 关机中：Stopping； \\ > 安装失败：InstallFailed； \\ > 重启中：Rebooting；\\ > 关机：Stopped； + - **PowerState** (str) - 电源状态，on 或 off + - **RaidSupported** (str) - 是否支持Raid。枚举值：Yes：支持；No：不支持。 + - **Remark** (str) - 物理机备注 + - **SN** (str) - 物理机序列号 + - **Tag** (str) - 业务组 + - **Zone** (str) - 可用区，参见 `可用区列表 `_ """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -136,8 +137,8 @@ def describe_phost_image(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 满足条件的镜像总数 - **ImageSet** (list) - 见 **PHostImageSet** 模型定义 + - **TotalCount** (int) - 满足条件的镜像总数 **Response Model** @@ -166,8 +167,8 @@ def describe_phost_tags(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - Tag的个数 - **TagSet** (list) - 见 **PHostTagSet** 模型定义 + - **TotalCount** (int) - Tag的个数 **Response Model** @@ -205,8 +206,8 @@ def get_phost_price(self, req=None, **kwargs): **PHostPriceSet** - - **Price** (float) - 价格, 单位:元, 保留小数点后两位有效数字 - **ChargeType** (str) - Year/Month/Trial/Dynamic + - **Price** (float) - 价格, 单位:元, 保留小数点后两位有效数字 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} diff --git a/ucloud/services/uphost/schemas/apis.py b/ucloud/services/uphost/schemas/apis.py index 11d3445..31faec1 100644 --- a/ucloud/services/uphost/schemas/apis.py +++ b/ucloud/services/uphost/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.uphost.schemas import models @@ -17,24 +18,24 @@ class CreatePHostRequestSchema(schema.RequestSchema): """ fields = { - "Quantity": fields.Str(required=False, dump_to="Quantity"), - "Count": fields.Int(required=False, dump_to="Count"), - "SubnetId": fields.Str(required=False, dump_to="SubnetId"), - "Region": fields.Str(required=True, dump_to="Region"), - "Remark": fields.Str(required=False, dump_to="Remark"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), - "Type": fields.Str(required=False, dump_to="Type"), - "Tag": fields.Str(required=False, dump_to="Tag"), "ChargeType": fields.Str(required=False, dump_to="ChargeType"), "Cluster": fields.Str(required=False, dump_to="Cluster"), - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Password": fields.Str(required=True, dump_to="Password"), - "Raid": fields.Str(required=False, dump_to="Raid"), + "Count": fields.Int(required=False, dump_to="Count"), "CouponId": fields.Str(required=False, dump_to="CouponId"), "ImageId": fields.Str(required=True, dump_to="ImageId"), "Name": fields.Str(required=False, dump_to="Name"), + "Password": fields.Str(required=True, dump_to="Password"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Quantity": fields.Str(required=False, dump_to="Quantity"), + "Raid": fields.Str(required=False, dump_to="Raid"), + "Region": fields.Str(required=True, dump_to="Region"), + "Remark": fields.Str(required=False, dump_to="Remark"), "SecurityGroupId": fields.Str(required=False, dump_to="SecurityGroupId"), + "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "Type": fields.Str(required=False, dump_to="Type"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -57,12 +58,12 @@ class DescribePHostRequestSchema(schema.RequestSchema): """ fields = { + "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), "PHostId": fields.List(fields.Str()), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Offset": fields.Int(required=False, dump_to="Offset"), - "Limit": fields.Int(required=False, dump_to="Limit"), } @@ -71,10 +72,10 @@ class DescribePHostResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "PHostSet": fields.List( models.PHostSetSchema(), required=False, load_from="PHostSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -90,13 +91,13 @@ class DescribePHostImageRequestSchema(schema.RequestSchema): """ fields = { - "Zone": fields.Str(required=True, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "ImageId": fields.List(fields.Str()), "ImageType": fields.Str(required=False, dump_to="ImageType"), - "Offset": fields.Int(required=False, dump_to="Offset"), "Limit": fields.Int(required=False, dump_to="Limit"), - "ImageId": fields.List(fields.Str()), + "Offset": fields.Int(required=False, dump_to="Offset"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -105,10 +106,10 @@ class DescribePHostImageResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "ImageSet": fields.List( models.PHostImageSetSchema(), required=False, load_from="ImageSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -124,9 +125,9 @@ class DescribePHostTagsRequestSchema(schema.RequestSchema): """ fields = { + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), } @@ -135,10 +136,10 @@ class DescribePHostTagsResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "TagSet": fields.List( models.PHostTagSetSchema(), required=False, load_from="TagSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -155,13 +156,13 @@ class GetPHostPriceRequestSchema(schema.RequestSchema): fields = { "ChargeType": fields.Str(required=True, dump_to="ChargeType"), - "Quantity": fields.Int(required=True, dump_to="Quantity"), - "Type": fields.Str(required=False, dump_to="Type"), "Cluster": fields.Str(required=False, dump_to="Cluster"), + "Count": fields.Int(required=True, dump_to="Count"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Quantity": fields.Int(required=True, dump_to="Quantity"), "Region": fields.Str(required=True, dump_to="Region"), + "Type": fields.Str(required=False, dump_to="Type"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "Count": fields.Int(required=True, dump_to="Count"), } @@ -188,13 +189,13 @@ class ModifyPHostInfoRequestSchema(schema.RequestSchema): """ fields = { - "Tag": fields.Str(required=False, dump_to="Tag"), - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "PHostId": fields.Str(required=True, dump_to="PHostId"), "Name": fields.Str(required=False, dump_to="Name"), + "PHostId": fields.Str(required=True, dump_to="PHostId"), + "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Remark": fields.Str(required=False, dump_to="Remark"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -217,8 +218,8 @@ class PoweroffPHostRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "PHostId": fields.Str(required=True, dump_to="PHostId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -243,8 +244,8 @@ class RebootPHostRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "PHostId": fields.Str(required=True, dump_to="PHostId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), } @@ -269,17 +270,17 @@ class ReinstallPHostRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), + "ImageId": fields.Str(required=False, dump_to="ImageId"), + "Name": fields.Str(required=False, dump_to="Name"), "PHostId": fields.Str(required=True, dump_to="PHostId"), "Password": fields.Str(required=True, dump_to="Password"), - "Name": fields.Str(required=False, dump_to="Name"), - "ReserveDisk": fields.Str(required=False, dump_to="ReserveDisk"), - "Zone": fields.Str(required=True, dump_to="Zone"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "ImageId": fields.Str(required=False, dump_to="ImageId"), + "Raid": fields.Str(required=False, dump_to="Raid"), + "Region": fields.Str(required=True, dump_to="Region"), "Remark": fields.Str(required=False, dump_to="Remark"), + "ReserveDisk": fields.Str(required=False, dump_to="ReserveDisk"), "Tag": fields.Str(required=False, dump_to="Tag"), - "Raid": fields.Str(required=False, dump_to="Raid"), + "Zone": fields.Str(required=True, dump_to="Zone"), } @@ -303,9 +304,9 @@ class StartPHostRequestSchema(schema.RequestSchema): fields = { "PHostId": fields.Str(required=True, dump_to="PHostId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "Region": fields.Str(required=True, dump_to="Region"), "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), } @@ -328,11 +329,11 @@ class TerminatePHostRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "Zone": fields.Str(required=False, dump_to="Zone"), - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), "PHostId": fields.Str(required=True, dump_to="PHostId"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "ReleaseEIP": fields.Bool(required=False, dump_to="ReleaseEIP"), + "Zone": fields.Str(required=False, dump_to="Zone"), } diff --git a/ucloud/services/uphost/schemas/models.py b/ucloud/services/uphost/schemas/models.py index 9c01d0d..150c60b 100644 --- a/ucloud/services/uphost/schemas/models.py +++ b/ucloud/services/uphost/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -8,38 +9,38 @@ class PHostCPUSetSchema(schema.ResponseSchema): """ fields = { - "Frequence": fields.Float(required=False, load_from="Frequence"), - "Count": fields.Int(required=False, load_from="Count"), "CoreCount": fields.Int(required=False, load_from="CoreCount"), + "Count": fields.Int(required=False, load_from="Count"), + "Frequence": fields.Float(required=False, load_from="Frequence"), "Model": fields.Str(required=False, load_from="Model"), } -class PHostIPSetSchema(schema.ResponseSchema): - """ PHostIPSet - DescribePHost +class PHostDiskSetSchema(schema.ResponseSchema): + """ PHostDiskSet - GetPHostTypeInfo """ fields = { - "MACAddr": fields.Str(required=False, load_from="MACAddr"), - "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "OperatorName": fields.Str(required=False, load_from="OperatorName"), - "IPId": fields.Str(required=False, load_from="IPId"), - "IPAddr": fields.Str(required=False, load_from="IPAddr"), + "Count": fields.Int(required=False, load_from="Count"), + "IOCap": fields.Int(required=False, load_from="IOCap"), + "Name": fields.Str(required=False, load_from="Name"), + "Space": fields.Int(required=False, load_from="Space"), + "Type": fields.Str(required=False, load_from="Type"), } -class PHostDiskSetSchema(schema.ResponseSchema): - """ PHostDiskSet - GetPHostTypeInfo +class PHostIPSetSchema(schema.ResponseSchema): + """ PHostIPSet - DescribePHost """ fields = { - "Name": fields.Str(required=False, load_from="Name"), - "IOCap": fields.Int(required=False, load_from="IOCap"), - "Space": fields.Int(required=False, load_from="Space"), - "Count": fields.Int(required=False, load_from="Count"), - "Type": fields.Str(required=False, load_from="Type"), + "Bandwidth": fields.Int(required=False, load_from="Bandwidth"), + "IPAddr": fields.Str(required=False, load_from="IPAddr"), + "IPId": fields.Str(required=False, load_from="IPId"), + "MACAddr": fields.Str(required=False, load_from="MACAddr"), + "OperatorName": fields.Str(required=False, load_from="OperatorName"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), + "VPCId": fields.Str(required=False, load_from="VPCId"), } @@ -48,30 +49,30 @@ class PHostSetSchema(schema.ResponseSchema): """ fields = { + "AutoRenew": fields.Str(required=False, load_from="AutoRenew"), + "CPUSet": fields.List(PHostCPUSetSchema()), + "ChargeType": fields.Str(required=False, load_from="ChargeType"), + "Cluster": fields.Str(required=False, load_from="Cluster"), + "Components": fields.Str(required=False, load_from="Components"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), "DiskSet": fields.List(PHostDiskSetSchema()), + "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), "IPSet": fields.List(PHostIPSetSchema()), + "ImageName": fields.Str(required=False, load_from="ImageName"), "IsSupportKVM": fields.Str(required=False, load_from="IsSupportKVM"), - "RaidSupported": fields.Str(required=False, load_from="RaidSupported"), - "PowerState": fields.Str(required=False, load_from="PowerState"), + "Memory": fields.Int(required=False, load_from="Memory"), + "Name": fields.Str(required=False, load_from="Name"), + "OSType": fields.Str(required=False, load_from="OSType"), + "OSname": fields.Str(required=False, load_from="OSname"), "PHostId": fields.Str(required=False, load_from="PHostId"), + "PHostType": fields.Str(required=False, load_from="PHostType"), "PMStatus": fields.Str(required=False, load_from="PMStatus"), + "PowerState": fields.Str(required=False, load_from="PowerState"), + "RaidSupported": fields.Str(required=False, load_from="RaidSupported"), "Remark": fields.Str(required=False, load_from="Remark"), + "SN": fields.Str(required=False, load_from="SN"), "Tag": fields.Str(required=False, load_from="Tag"), - "ImageName": fields.Str(required=False, load_from="ImageName"), - "OSname": fields.Str(required=False, load_from="OSname"), - "ExpireTime": fields.Int(required=False, load_from="ExpireTime"), "Zone": fields.Str(required=False, load_from="Zone"), - "PHostType": fields.Str(required=False, load_from="PHostType"), - "Components": fields.Str(required=False, load_from="Components"), - "ChargeType": fields.Str(required=False, load_from="ChargeType"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "CPUSet": fields.List(PHostCPUSetSchema()), - "SN": fields.Str(required=False, load_from="SN"), - "Memory": fields.Int(required=False, load_from="Memory"), - "Cluster": fields.Str(required=False, load_from="Cluster"), - "AutoRenew": fields.Str(required=False, load_from="AutoRenew"), - "OSType": fields.Str(required=False, load_from="OSType"), - "Name": fields.Str(required=False, load_from="Name"), } diff --git a/ucloud/services/vpc/client.py b/ucloud/services/vpc/client.py index 04b4de0..f07b868 100644 --- a/ucloud/services/vpc/client.py +++ b/ucloud/services/vpc/client.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.client import Client from ucloud.services.vpc.schemas import apis @@ -268,24 +269,24 @@ def describe_route_table(self, req=None, **kwargs): **RouteRuleInfo** - - **RouteRuleId** (str) - 规则ID - - **RuleType** (int) - 路由规则类型（0表示系统路由，1表示自定义路由） - **DstAddr** (str) - 目的地址，比如10.10.8/24 - **NexthopId** (str) - 路由下一跳ID，比如uvnet-3eljvj - **NexthopType** (str) - 下一跳类型，比如local、vnet - **Remark** (str) - 路由规则备注 + - **RouteRuleId** (str) - 规则ID + - **RuleType** (int) - 路由规则类型（0表示系统路由，1表示自定义路由） **RouteTableInfo** - - **VPCName** (str) - vpc名称 + - **CreateTime** (int) - 创建时间戳 - **Remark** (str) - 路由表备注 - **RouteRules** (list) - 见 **RouteRuleInfo** 模型定义 - **RouteTableId** (str) - 路由表ID + - **RouteTableType** (int) - 路由表类型，1为默认，0为自定义 - **SubnetCount** (str) - 绑定了该路由表的子网数量 - - **VPCId** (str) - 路由表所属vpc - **Tag** (str) - 业务组 - - **CreateTime** (int) - 创建时间戳 - - **RouteTableType** (int) - 路由表类型，1为默认，0为自定义 + - **VPCId** (str) - 路由表所属vpc + - **VPCName** (str) - vpc名称 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -312,29 +313,29 @@ def describe_subnet(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 子网总数量 - **DataSet** (list) - 见 **SubnetInfo** 模型定义 + - **TotalCount** (int) - 子网总数量 **Response Model** **SubnetInfo** - - **Tag** (str) - 业务组 - - **Netmask** (int) - 子网掩码 - **CreateTime** (int) - 创建时间 - - **Remark** (str) - 备注 - - **Zone** (str) - 可用区名称 - - **IPv6Network** (str) - 子网关联的IPv6网段 - - **VPCName** (str) - VPC名称 - - **VPCId** (str) - VPCId - - **SubnetType** (int) - 子网类型 - - **Subnet** (str) - 子网网段 - **Gateway** (str) - 子网网关 - **HasNATGW** (bool) - 是否有natgw - - **RouteTableId** (str) - 路由表Id + - **IPv6Network** (str) - 子网关联的IPv6网段 + - **Netmask** (int) - 子网掩码 - **OperatorName** (str) - 子网关联的IPv6网段所属运营商 + - **Remark** (str) - 备注 + - **RouteTableId** (str) - 路由表Id + - **Subnet** (str) - 子网网段 - **SubnetId** (str) - 子网Id - **SubnetName** (str) - 子网名称 + - **SubnetType** (int) - 子网类型 + - **Tag** (str) - 业务组 + - **VPCId** (str) - VPCId + - **VPCName** (str) - VPC名称 + - **Zone** (str) - 可用区名称 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -357,8 +358,8 @@ def describe_subnet_resource(self, req=None, **kwargs): **Response** - - **TotalCount** (int) - 总数 - **DataSet** (list) - 见 **SubnetResource** 模型定义 + - **TotalCount** (int) - 总数 **Response Model** @@ -369,8 +370,8 @@ def describe_subnet_resource(self, req=None, **kwargs): - **Name** (str) - 资源名称 - **ResourceId** (str) - 资源Id - **ResourceType** (str) - 资源类型。对应的资源类型：UHOST，云主机；PHOST，物理云主机；ULB，负载均衡；UHADOOP_HOST，hadoop节点；UFORTRESS_HOST，堡垒机；UNATGW，NAT网关；UKAFKA，Kafka消息队列；UMEM，内存存储；DOCKER，容器集群；UDB，数据库；UDW，数据仓库；VIP，内网VIP. - - **SubResourceName** (str) - 资源绑定的虚拟网卡的实例名称 - **SubResourceId** (str) - 资源绑定的虚拟网卡的实例ID + - **SubResourceName** (str) - 资源绑定的虚拟网卡的实例名称 - **SubResourceType** (str) - 资源绑定的虚拟网卡的类型 """ @@ -405,16 +406,16 @@ def describe_vpc(self, req=None, **kwargs): **VPCInfo** - - **SubnetCount** (int) - - **CreateTime** (int) - - - **Name** (str) - - **IPv6Network** (str) - VPC关联的IPv6网段 + - **Name** (str) - + - **Network** (list) - - **NetworkInfo** (list) - 见 **VPCNetworkInfo** 模型定义 - - **UpdateTime** (int) - + - **OperatorName** (str) - VPC关联的IPv6网段所属运营商 + - **SubnetCount** (int) - - **Tag** (str) - + - **UpdateTime** (int) - - **VPCId** (str) - VPCId - - **Network** (list) - - - **OperatorName** (str) - VPC关联的IPv6网段所属运营商 """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} @@ -442,12 +443,12 @@ def describe_vpc_intercom(self, req=None, **kwargs): **VPCIntercomInfo** - - **ProjectId** (str) - 项目Id - - **Network** (list) - VPC的地址空间 - **DstRegion** (str) - 所属地域 - **Name** (str) - VPC名字 - - **VPCId** (str) - VPCId + - **Network** (list) - VPC的地址空间 + - **ProjectId** (str) - 项目Id - **Tag** (str) - 业务组（未分组显示为 Default） + - **VPCId** (str) - VPCId """ d = {"ProjectId": self.config.project_id, "Region": self.config.region} diff --git a/ucloud/services/vpc/schemas/apis.py b/ucloud/services/vpc/schemas/apis.py index 5dcc41c..1c3ce80 100644 --- a/ucloud/services/vpc/schemas/apis.py +++ b/ucloud/services/vpc/schemas/apis.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields from ucloud.services.vpc.schemas import models @@ -18,8 +19,8 @@ class AddVPCNetworkRequestSchema(schema.RequestSchema): fields = { "Network": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "VPCId": fields.Str(required=True, dump_to="VPCId"), } @@ -43,9 +44,9 @@ class AssociateRouteTableRequestSchema(schema.RequestSchema): """ fields = { - "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), "SubnetId": fields.Str(required=True, dump_to="SubnetId"), } @@ -70,8 +71,8 @@ class CloneRouteTableRequestSchema(schema.RequestSchema): fields = { "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), "Region": fields.Str(required=False, dump_to="Region"), + "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), } @@ -94,12 +95,12 @@ class CreateRouteTableRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "VPCId": fields.Str(required=True, dump_to="VPCId"), "Name": fields.Str(required=False, dump_to="Name"), - "Tag": fields.Str(required=False, dump_to="Tag"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Remark": fields.Str(required=False, dump_to="Remark"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "VPCId": fields.Str(required=True, dump_to="VPCId"), } @@ -122,14 +123,14 @@ class CreateSubnetRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), + "Netmask": fields.Int(required=False, dump_to="Netmask"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "VPCId": fields.Str(required=True, dump_to="VPCId"), + "Region": fields.Str(required=True, dump_to="Region"), + "Remark": fields.Str(required=False, dump_to="Remark"), "Subnet": fields.Str(required=True, dump_to="Subnet"), - "Netmask": fields.Int(required=False, dump_to="Netmask"), "SubnetName": fields.Str(required=False, dump_to="SubnetName"), "Tag": fields.Str(required=False, dump_to="Tag"), - "Remark": fields.Str(required=False, dump_to="Remark"), + "VPCId": fields.Str(required=True, dump_to="VPCId"), } @@ -152,13 +153,13 @@ class CreateVPCRequestSchema(schema.RequestSchema): """ fields = { - "Tag": fields.Str(required=False, dump_to="Tag"), - "Remark": fields.Str(required=False, dump_to="Remark"), - "Type": fields.Int(required=False, dump_to="Type"), + "Name": fields.Str(required=True, dump_to="Name"), "Network": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "Name": fields.Str(required=True, dump_to="Name"), + "Region": fields.Str(required=True, dump_to="Region"), + "Remark": fields.Str(required=False, dump_to="Remark"), + "Tag": fields.Str(required=False, dump_to="Tag"), + "Type": fields.Int(required=False, dump_to="Type"), } @@ -182,11 +183,11 @@ class CreateVPCIntercomRequestSchema(schema.RequestSchema): fields = { "DstProjectId": fields.Str(required=False, dump_to="DstProjectId"), - "Region": fields.Str(required=True, dump_to="Region"), + "DstRegion": fields.Str(required=False, dump_to="DstRegion"), + "DstVPCId": fields.Str(required=True, dump_to="DstVPCId"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "VPCId": fields.Str(required=True, dump_to="VPCId"), - "DstVPCId": fields.Str(required=True, dump_to="DstVPCId"), - "DstRegion": fields.Str(required=False, dump_to="DstRegion"), } @@ -209,9 +210,9 @@ class DeleteRouteTableRequestSchema(schema.RequestSchema): """ fields = { - "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), } @@ -234,9 +235,9 @@ class DeleteSubnetRequestSchema(schema.RequestSchema): """ fields = { - "SubnetId": fields.Str(required=True, dump_to="SubnetId"), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "SubnetId": fields.Str(required=True, dump_to="SubnetId"), } @@ -260,8 +261,8 @@ class DeleteVPCRequestSchema(schema.RequestSchema): fields = { "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "VPCId": fields.Str(required=True, dump_to="VPCId"), "Region": fields.Str(required=True, dump_to="Region"), + "VPCId": fields.Str(required=True, dump_to="VPCId"), } @@ -285,11 +286,11 @@ class DeleteVPCIntercomRequestSchema(schema.RequestSchema): fields = { "DstProjectId": fields.Str(required=False, dump_to="DstProjectId"), - "Region": fields.Str(required=True, dump_to="Region"), + "DstRegion": fields.Str(required=False, dump_to="DstRegion"), + "DstVPCId": fields.Str(required=True, dump_to="DstVPCId"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "VPCId": fields.Str(required=True, dump_to="VPCId"), - "DstVPCId": fields.Str(required=True, dump_to="DstVPCId"), - "DstRegion": fields.Str(required=False, dump_to="DstRegion"), } @@ -313,12 +314,12 @@ class DescribeRouteTableRequestSchema(schema.RequestSchema): fields = { "BusinessId": fields.Str(required=False, dump_to="BusinessId"), - "Region": fields.Str(required=True, dump_to="Region"), + "Limit": fields.Int(required=False, dump_to="Limit"), + "OffSet": fields.Int(required=False, dump_to="OffSet"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), + "Region": fields.Str(required=True, dump_to="Region"), "RouteTableId": fields.Str(required=False, dump_to="RouteTableId"), - "OffSet": fields.Int(required=False, dump_to="OffSet"), - "Limit": fields.Int(required=False, dump_to="Limit"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), } @@ -346,16 +347,16 @@ class DescribeSubnetRequestSchema(schema.RequestSchema): """ fields = { - "SubnetId": fields.Str(required=False, dump_to="SubnetId"), - "RouteTableId": fields.Str(required=False, dump_to="RouteTableId"), - "VPCId": fields.Str(required=False, dump_to="VPCId"), "BusinessId": fields.Str(required=False, dump_to="BusinessId"), - "SubnetIds": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), + "Limit": fields.Int(required=False, dump_to="Limit"), + "Offset": fields.Int(required=False, dump_to="Offset"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "RouteTableId": fields.Str(required=False, dump_to="RouteTableId"), + "SubnetId": fields.Str(required=False, dump_to="SubnetId"), + "SubnetIds": fields.List(fields.Str()), "Tag": fields.Str(required=False, dump_to="Tag"), - "Offset": fields.Int(required=False, dump_to="Offset"), - "Limit": fields.Int(required=False, dump_to="Limit"), + "VPCId": fields.Str(required=False, dump_to="VPCId"), } @@ -364,10 +365,10 @@ class DescribeSubnetResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=True, load_from="TotalCount"), "DataSet": fields.List( models.SubnetInfoSchema(), required=True, load_from="DataSet" ), + "TotalCount": fields.Int(required=True, load_from="TotalCount"), } @@ -383,12 +384,12 @@ class DescribeSubnetResourceRequestSchema(schema.RequestSchema): """ fields = { - "SubnetId": fields.Str(required=True, dump_to="SubnetId"), - "ResourceType": fields.Str(required=False, dump_to="ResourceType"), - "Offset": fields.Int(required=False, dump_to="Offset"), "Limit": fields.Int(required=False, dump_to="Limit"), - "Region": fields.Str(required=True, dump_to="Region"), + "Offset": fields.Int(required=False, dump_to="Offset"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), + "ResourceType": fields.Str(required=False, dump_to="ResourceType"), + "SubnetId": fields.Str(required=True, dump_to="SubnetId"), } @@ -397,10 +398,10 @@ class DescribeSubnetResourceResponseSchema(schema.ResponseSchema): """ fields = { - "TotalCount": fields.Int(required=False, load_from="TotalCount"), "DataSet": fields.List( models.SubnetResourceSchema(), required=False, load_from="DataSet" ), + "TotalCount": fields.Int(required=False, load_from="TotalCount"), } @@ -416,12 +417,12 @@ class DescribeVPCRequestSchema(schema.RequestSchema): """ fields = { - "Offset": fields.Int(required=False, dump_to="Offset"), "Limit": fields.Int(required=False, dump_to="Limit"), - "VPCIds": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), + "Offset": fields.Int(required=False, dump_to="Offset"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Tag": fields.Str(required=False, dump_to="Tag"), + "VPCIds": fields.List(fields.Str()), } @@ -448,11 +449,11 @@ class DescribeVPCIntercomRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), + "DstProjectId": fields.Str(required=False, dump_to="DstProjectId"), + "DstRegion": fields.Str(required=False, dump_to="DstRegion"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "VPCId": fields.Str(required=True, dump_to="VPCId"), - "DstRegion": fields.Str(required=False, dump_to="DstRegion"), - "DstProjectId": fields.Str(required=False, dump_to="DstProjectId"), } @@ -479,10 +480,10 @@ class ModifyRouteRuleRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), + "Region": fields.Str(required=True, dump_to="Region"), "RouteRule": fields.List(fields.Str()), + "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), } @@ -505,12 +506,12 @@ class UpdateRouteTableAttributeRequestSchema(schema.RequestSchema): """ fields = { - "ProjectId": fields.Str(required=True, dump_to="ProjectId"), - "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), "Name": fields.Str(required=False, dump_to="Name"), + "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "Remark": fields.Str(required=False, dump_to="Remark"), + "RouteTableId": fields.Str(required=True, dump_to="RouteTableId"), "Tag": fields.Str(required=False, dump_to="Tag"), - "Region": fields.Str(required=True, dump_to="Region"), } @@ -533,10 +534,10 @@ class UpdateSubnetAttributeRequestSchema(schema.RequestSchema): """ fields = { - "Region": fields.Str(required=True, dump_to="Region"), + "Name": fields.Str(required=False, dump_to="Name"), "ProjectId": fields.Str(required=False, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "SubnetId": fields.Str(required=True, dump_to="SubnetId"), - "Name": fields.Str(required=False, dump_to="Name"), "Tag": fields.Str(required=False, dump_to="Tag"), } @@ -561,8 +562,8 @@ class UpdateVPCNetworkRequestSchema(schema.RequestSchema): fields = { "Network": fields.List(fields.Str()), - "Region": fields.Str(required=True, dump_to="Region"), "ProjectId": fields.Str(required=True, dump_to="ProjectId"), + "Region": fields.Str(required=True, dump_to="Region"), "VPCId": fields.Str(required=True, dump_to="VPCId"), } diff --git a/ucloud/services/vpc/schemas/models.py b/ucloud/services/vpc/schemas/models.py index af586fa..25a0218 100644 --- a/ucloud/services/vpc/schemas/models.py +++ b/ucloud/services/vpc/schemas/models.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +""" Code is generated by ucloud-model, DO NOT EDIT IT. """ from ucloud.core.typesystem import schema, fields @@ -22,15 +23,15 @@ class RouteTableInfoSchema(schema.ResponseSchema): """ fields = { - "SubnetCount": fields.Str(required=False, load_from="SubnetCount"), - "VPCName": fields.Str(required=False, load_from="VPCName"), - "Tag": fields.Str(required=False, load_from="Tag"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "Remark": fields.Str(required=False, load_from="Remark"), "RouteRules": fields.List(RouteRuleInfoSchema()), + "RouteTableId": fields.Str(required=False, load_from="RouteTableId"), "RouteTableType": fields.Int(required=False, load_from="RouteTableType"), + "SubnetCount": fields.Str(required=False, load_from="SubnetCount"), + "Tag": fields.Str(required=False, load_from="Tag"), "VPCId": fields.Str(required=False, load_from="VPCId"), - "Remark": fields.Str(required=False, load_from="Remark"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), - "RouteTableId": fields.Str(required=False, load_from="RouteTableId"), + "VPCName": fields.Str(required=False, load_from="VPCName"), } @@ -39,22 +40,22 @@ class SubnetInfoSchema(schema.ResponseSchema): """ fields = { - "OperatorName": fields.Str(required=False, load_from="OperatorName"), - "SubnetId": fields.Str(required=False, load_from="SubnetId"), - "SubnetType": fields.Int(required=False, load_from="SubnetType"), + "CreateTime": fields.Int(required=False, load_from="CreateTime"), "Gateway": fields.Str(required=False, load_from="Gateway"), "HasNATGW": fields.Bool(required=False, load_from="HasNATGW"), - "VPCName": fields.Str(required=False, load_from="VPCName"), - "Remark": fields.Str(required=False, load_from="Remark"), - "Subnet": fields.Str(required=False, load_from="Subnet"), + "IPv6Network": fields.Str(required=False, load_from="IPv6Network"), "Netmask": fields.Int(required=False, load_from="Netmask"), + "OperatorName": fields.Str(required=False, load_from="OperatorName"), + "Remark": fields.Str(required=False, load_from="Remark"), "RouteTableId": fields.Str(required=False, load_from="RouteTableId"), - "Zone": fields.Str(required=False, load_from="Zone"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "Tag": fields.Str(required=False, load_from="Tag"), - "IPv6Network": fields.Str(required=False, load_from="IPv6Network"), + "Subnet": fields.Str(required=False, load_from="Subnet"), + "SubnetId": fields.Str(required=False, load_from="SubnetId"), "SubnetName": fields.Str(required=False, load_from="SubnetName"), - "CreateTime": fields.Int(required=False, load_from="CreateTime"), + "SubnetType": fields.Int(required=False, load_from="SubnetType"), + "Tag": fields.Str(required=False, load_from="Tag"), + "VPCId": fields.Str(required=False, load_from="VPCId"), + "VPCName": fields.Str(required=False, load_from="VPCName"), + "Zone": fields.Str(required=False, load_from="Zone"), } @@ -63,14 +64,14 @@ class SubnetResourceSchema(schema.ResponseSchema): """ fields = { - "SubResourceName": fields.Str(required=False, load_from="SubResourceName"), - "SubResourceId": fields.Str(required=False, load_from="SubResourceId"), - "SubResourceType": fields.Str(required=False, load_from="SubResourceType"), "IP": fields.Str(required=False, load_from="IP"), "IPv6Address": fields.Str(required=False, load_from="IPv6Address"), "Name": fields.Str(required=False, load_from="Name"), "ResourceId": fields.Str(required=False, load_from="ResourceId"), "ResourceType": fields.Str(required=False, load_from="ResourceType"), + "SubResourceId": fields.Str(required=False, load_from="SubResourceId"), + "SubResourceName": fields.Str(required=False, load_from="SubResourceName"), + "SubResourceType": fields.Str(required=False, load_from="SubResourceType"), } @@ -89,16 +90,16 @@ class VPCInfoSchema(schema.ResponseSchema): """ fields = { - "Network": fields.List(fields.Str()), + "CreateTime": fields.Int(required=True, load_from="CreateTime"), "IPv6Network": fields.Str(required=False, load_from="IPv6Network"), + "Name": fields.Str(required=True, load_from="Name"), + "Network": fields.List(fields.Str()), + "NetworkInfo": fields.List(VPCNetworkInfoSchema()), "OperatorName": fields.Str(required=False, load_from="OperatorName"), "SubnetCount": fields.Int(required=True, load_from="SubnetCount"), - "CreateTime": fields.Int(required=True, load_from="CreateTime"), + "Tag": fields.Str(required=True, load_from="Tag"), "UpdateTime": fields.Int(required=True, load_from="UpdateTime"), "VPCId": fields.Str(required=False, load_from="VPCId"), - "NetworkInfo": fields.List(VPCNetworkInfoSchema()), - "Tag": fields.Str(required=True, load_from="Tag"), - "Name": fields.Str(required=True, load_from="Name"), } @@ -107,10 +108,10 @@ class VPCIntercomInfoSchema(schema.ResponseSchema): """ fields = { + "DstRegion": fields.Str(required=False, load_from="DstRegion"), "Name": fields.Str(required=False, load_from="Name"), - "VPCId": fields.Str(required=False, load_from="VPCId"), - "Tag": fields.Str(required=False, load_from="Tag"), - "ProjectId": fields.Str(required=False, load_from="ProjectId"), "Network": fields.List(fields.Str()), - "DstRegion": fields.Str(required=False, load_from="DstRegion"), + "ProjectId": fields.Str(required=False, load_from="ProjectId"), + "Tag": fields.Str(required=False, load_from="Tag"), + "VPCId": fields.Str(required=False, load_from="VPCId"), } diff --git a/ucloud/testing/__init__.py b/ucloud/testing/__init__.py new file mode 100644 index 0000000..4c48b5a --- /dev/null +++ b/ucloud/testing/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*- diff --git a/ucloud/testing/env.py b/ucloud/testing/env.py new file mode 100644 index 0000000..8fa4c43 --- /dev/null +++ b/ucloud/testing/env.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- + +import os + +ACC_ENV_KEY = "USDKACC" +ACC_SKIP_REASON = "skip test for non-acc environment" + + +def get_skip_reason(): + return ACC_SKIP_REASON + + +def is_acc(): + """ check test env is acceptance testing or not """ + return os.getenv(ACC_ENV_KEY) + + +def is_ut(): + """ check test env is unit testing or not """ + return not is_acc() + + +def pre_check_env(): + """ pre check environment for testing + + NOTE: system environment variables credential is required for test environment + """ + assert os.getenv("UCLOUD_PUBLIC_KEY"), "invalid public key" + assert os.getenv("UCLOUD_PRIVATE_KEY"), "invalid private key" + assert os.getenv("UCLOUD_REGION"), "invalid region" diff --git a/ucloud/testing/funcs.py b/ucloud/testing/funcs.py new file mode 100644 index 0000000..3261236 --- /dev/null +++ b/ucloud/testing/funcs.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- + +import datetime +import time + + +def concat(*args): + """ cancat strings + + >>> concat(42, 'foo', 'bar') + '42foobar' + """ + return "".join([str(s) for s in args]) + + +def concat_without_dot(args): + """ replace blank + + >>> concat_without_dot('42foo bar') + '42foobar' + """ + return "".join([str(s) for s in args.split()]) + + +def search_value(array, origin_key, origin_value, dest_key): + """ given origin key and value,search dest_value form array by dest_key + + >>> d = [{"UHostId": "foo", "Name": "testing"}] + >>> search_value(d, "Name", "testing", "UHostId") + 'foo' + """ + arr = [i.get(dest_key, "") for i in array if i[origin_key] == origin_value] + if arr: + return arr[0] + return "" + + +def timedelta(timestamp, value, typ="days"): + """ given timestamp(10bit) and calculate relative delta time + + >>> timedelta(0, 1, "days") + 86400.0 + + :param timestamp: timestamp (round to second) + :param value: float, can as positive or negative + :param typ: days/hours + :return: timestamp + """ + value = int(value) + dt = datetime.datetime.fromtimestamp(float(timestamp)) + if typ == "days": + dt += datetime.timedelta(days=value) + elif typ == "hours": + dt += datetime.timedelta(hours=value) + return time.mktime(dt.timetuple()) + + +def get_timestamp(length=13): + """ get current timestamp string + + >>> len(str(int(get_timestamp(10)))) + 10 + + :param length: length of timestamp, can only between 0 and 16 + :return: + """ + if isinstance(length, int) and 0 < length < 17: + return float("{:.6f}".format(time.time()).replace(".", "")[:length]) + raise ValueError("timestamp length can only between 0 and 16.") diff --git a/ucloud/testing/op.py b/ucloud/testing/op.py new file mode 100644 index 0000000..681a9d0 --- /dev/null +++ b/ucloud/testing/op.py @@ -0,0 +1,198 @@ +# -*- coding: utf-8 -*- + +import re + + +def eq(value, expected): + """ value is equal to expected + """ + assert value == expected + + +def ne(value, expected): + """ value is equal to expected + """ + assert value != expected + + +def gt(value, expected): + """ value is greater than expected + """ + assert value > expected + + +def ge(value, expected): + """ value is greater than or equal to expected + """ + assert value >= expected + + +def abs_eq(value, expected): + """ value is approx equal to expected + """ + assert round(float(value), 2) == round(float(expected), 2) + + +def lt(value, expected): + """ value is less than excepted + """ + assert value < expected + + +def le(value, expected): + """ value is less than or equal to excepted + """ + assert value <= expected + + +def str_eq(value, expected): + """ value is equal to excepted as string + """ + assert str(value) == str(expected) + + +def float_eq(value, expected): + """ value is equal to excepted as float + """ + assert round(float(value), 2) == round(float(expected), 2) + + +def len_eq(value, expected): + """ length of value is equal to excepted + """ + assert isinstance(expected, int) + assert len(value) == expected + + +def len_gt(value, expected): + """ length of value is greater than excepted + """ + assert isinstance(expected, int) + assert len(value) > expected + + +def len_ge(value, expected): + """ length of value is greater than or equal to excepted + """ + assert isinstance(expected, int) + assert len(value) >= expected + + +def len_lt(value, expected): + """ length of value is less than excepted + """ + assert isinstance(expected, int) + assert len(value) < expected + + +def len_le(value, expected): + """ length of value is less than or equal to excepted + """ + assert isinstance(expected, int) + assert len(value) <= expected + + +def contains(value, expected): + """ value is contains expected + """ + assert isinstance(value, list) + assert expected in value + + +def contained_by(value, expected): + """ value is contained by expected + """ + assert isinstance(expected, list) + assert value in expected + + +def type_eq(value, expected): + assert isinstance(value, expected) + + +def regex(value, expected): + assert isinstance(expected, str) + assert isinstance(value, str) + assert re.match(expected, value) + + +def startswith(value, expected): + assert str(value).startswith(expected) + + +def endswith(value, expected): + assert str(value).endswith(expected) + + +def object_contains(value, expected): + assert str(expected) in str(value) + + +def object_not_contains(value, expected): + assert str(expected) not in str(value) + + +mapper = { + "eq": eq, + "equals": eq, + "==": eq, + "abs_eq": abs_eq, + "abs_equals": abs_eq, + "lt": lt, + "less_than": lt, + "le": le, + "less_than_or_equals": le, + "gt": gt, + "greater_than": gt, + "ge": ge, + "greater_than_or_equals": ge, + "ne": ne, + "not_equals": ne, + "str_eq": str_eq, + "string_equals": str_eq, + "float_eq": float_eq, + "float_equals": float_eq, + "len_eq": len_eq, + "length_equals": len_eq, + "count_eq": len_eq, + "len_gt": len_gt, + "count_gt": len_gt, + "length_greater_than": len_gt, + "count_greater_than": len_gt, + "len_ge": len_ge, + "count_ge": len_ge, + "length_greater_than_or_equals": len_ge, + "count_greater_than_or_equals": len_ge, + "len_lt": len_lt, + "count_lt": len_lt, + "length_less_than": len_lt, + "count_less_than": len_lt, + "len_le": len_le, + "count_le": len_le, + "length_less_than_or_equals": len_le, + "count_less_than_or_equals": len_le, + "contains": contains, + "contained_by": contained_by, + "type": type_eq, + "regex": regex, + "startswith": startswith, + "endswith": endswith, + "object_contains": object_contains, + "object_not_contains": object_not_contains, +} + + +class CompareError(Exception): + pass + + +def check(name, value, expected): + if name not in mapper: + raise CompareError("comparator {} is not found".format(name)) + try: + return mapper.get(name)(value, expected) + except AssertionError as e: + msg = "assert error, expect {} {} {}, got error {}".format( + value, name, expected, e + ) + raise CompareError(msg) diff --git a/ucloud/testing/utest.py b/ucloud/testing/utest.py new file mode 100644 index 0000000..c5323f8 --- /dev/null +++ b/ucloud/testing/utest.py @@ -0,0 +1,104 @@ +# -*- coding: utf-8 -*- + +import functools +import logging +import time +from ucloud.testing import op + +logger = logging.getLogger(__name__) + + +class ValueNotFoundError(Exception): + pass + + +def case( + max_retries=0, + retry_interval=0, + retry_for=(op.CompareError, ValueNotFoundError), + startup_delay=0, + fast_fail=False, +): + """ wrap a function as a test case + + :param max_retries: the maximum retry number by the `retry_for` exception, + it will resolve the flaky testing case + :param retry_interval: the interval between twice retrying + :param retry_for: the exceptions to retrying + :param startup_delay: the delay seconds before any action execution + :param fast_fail: if fast fail is true, the test will fail when got + unexpected exception + :return: + """ + + def deco(fn): + @functools.wraps(fn) + def wrapper(*args, **kwargs): + if startup_delay: + time.sleep(startup_delay) + for i in range(max_retries + 1): + try: + result = fn(*args, **kwargs) + except Exception as e: + if isinstance(e, retry_for) and i != max_retries: + if retry_interval: + time.sleep(retry_interval) + continue + if fast_fail: + raise e + else: + logger.exception(e) + return + else: + return result + + return wrapper + + return deco + + +def validate(resp, validators): + """ validate dict by 3-tuple (comparator, value, expected) + """ + for validator in validators: + op.check(validator[0], value_at_path(resp, validator[1]), validator[2]) + + +def value_at_path(d, path): + """ access value by object path + + >>> d = {"Data": [{"UHostId": "foo"}, {"UHostId": "bar"}]} + >>> value_at_path(d, "Data.1.UHostId") + 'bar' + + :param d: dict or list of dict + :param path: object path like `Data.1.UHostId` + :return: any value access by path + """ + if d is None: + return + indices = path.split(".") + result = d + for i, key in enumerate(indices): + if isinstance(result, list): + if not key.isdigit(): + return + if len(result) <= int(key): + msg = "{} not found".format(".".join(indices[:i])) + raise ValueNotFoundError(msg) + result = result[int(key)] + continue + if isinstance(result, dict): + result = result.get(key) + if result is None: + msg = "{} not found".format(".".join(indices[:i])) + raise ValueNotFoundError(msg) + continue + return result + + +def set_default_response(d, action): + d = d.copy() + d.setdefault("RetCode", 0) + d.setdefault("Action", "{}Response".format(action)) + return d diff --git a/ucloud/version.py b/ucloud/version.py index c2c7c8c..5045509 100644 --- a/ucloud/version.py +++ b/ucloud/version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -version = "0.1.3" +version = "0.2.0"