Skip to content

Commit a0d8333

Browse files
author
李严
committed
Merge branch 'mainrelease' into 'master'
Mainrelease [skipped] See merge request iaasng/volcengine-python-sdk!254
2 parents e4c9843 + 1b6bb0b commit a0d8333

File tree

66 files changed

+7343
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+7343
-244
lines changed

meta.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "1.0.56",
3-
"meta_commit": "b0988f6480f4f830fe613fd908c10c84d7d019dc"
4-
}
2+
"lasted": "1.0.57",
3+
"meta_commit": "960a7103af3085ce58e992968f67ee24a5bf7e6b"
4+
}

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from setuptools import setup, find_packages # noqa: H301
44

55
NAME = "volcengine-python-sdk"
6-
VERSION = "1.0.56"
6+
VERSION = "1.0.57"
77
# To install the library, run the following
88
#
99
# python setup.py install

volcenginesdkclb/models/create_load_balancer_request.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ def __init__(self, address_ip_version=None, client_token=None, description=None,
128128
self.load_balancer_billing_type = load_balancer_billing_type
129129
if load_balancer_name is not None:
130130
self.load_balancer_name = load_balancer_name
131-
self.load_balancer_spec = load_balancer_spec
131+
if load_balancer_spec is not None:
132+
self.load_balancer_spec = load_balancer_spec
132133
if master_zone_id is not None:
133134
self.master_zone_id = master_zone_id
134135
if modification_protection_reason is not None:
@@ -339,8 +340,6 @@ def load_balancer_spec(self, load_balancer_spec):
339340
:param load_balancer_spec: The load_balancer_spec of this CreateLoadBalancerRequest. # noqa: E501
340341
:type: str
341342
"""
342-
if self._configuration.client_side_validation and load_balancer_spec is None:
343-
raise ValueError("Invalid value for `load_balancer_spec`, must not be `None`") # noqa: E501
344343

345344
self._load_balancer_spec = load_balancer_spec
346345

volcenginesdkclb/models/listener_for_describe_listeners_output.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class ListenerForDescribeListenersOutput(object):
5050
'port': 'int',
5151
'protocol': 'str',
5252
'proxy_protocol_type': 'str',
53+
'scheduler': 'str',
5354
'server_group_id': 'str',
5455
'status': 'str',
5556
'update_time': 'str'
@@ -73,12 +74,13 @@ class ListenerForDescribeListenersOutput(object):
7374
'port': 'Port',
7475
'protocol': 'Protocol',
7576
'proxy_protocol_type': 'ProxyProtocolType',
77+
'scheduler': 'Scheduler',
7678
'server_group_id': 'ServerGroupId',
7779
'status': 'Status',
7880
'update_time': 'UpdateTime'
7981
}
8082

81-
def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None, certificate_id=None, connection_drain_enabled=None, connection_drain_timeout=None, create_time=None, enabled=None, health_check=None, listener_id=None, listener_name=None, persistence_timeout=None, persistence_type=None, port=None, protocol=None, proxy_protocol_type=None, server_group_id=None, status=None, update_time=None, _configuration=None): # noqa: E501
83+
def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None, certificate_id=None, connection_drain_enabled=None, connection_drain_timeout=None, create_time=None, enabled=None, health_check=None, listener_id=None, listener_name=None, persistence_timeout=None, persistence_type=None, port=None, protocol=None, proxy_protocol_type=None, scheduler=None, server_group_id=None, status=None, update_time=None, _configuration=None): # noqa: E501
8284
"""ListenerForDescribeListenersOutput - a model defined in Swagger""" # noqa: E501
8385
if _configuration is None:
8486
_configuration = Configuration()
@@ -101,6 +103,7 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
101103
self._port = None
102104
self._protocol = None
103105
self._proxy_protocol_type = None
106+
self._scheduler = None
104107
self._server_group_id = None
105108
self._status = None
106109
self._update_time = None
@@ -140,6 +143,8 @@ def __init__(self, acl_ids=None, acl_status=None, acl_type=None, bandwidth=None,
140143
self.protocol = protocol
141144
if proxy_protocol_type is not None:
142145
self.proxy_protocol_type = proxy_protocol_type
146+
if scheduler is not None:
147+
self.scheduler = scheduler
143148
if server_group_id is not None:
144149
self.server_group_id = server_group_id
145150
if status is not None:
@@ -504,6 +509,27 @@ def proxy_protocol_type(self, proxy_protocol_type):
504509

505510
self._proxy_protocol_type = proxy_protocol_type
506511

512+
@property
513+
def scheduler(self):
514+
"""Gets the scheduler of this ListenerForDescribeListenersOutput. # noqa: E501
515+
516+
517+
:return: The scheduler of this ListenerForDescribeListenersOutput. # noqa: E501
518+
:rtype: str
519+
"""
520+
return self._scheduler
521+
522+
@scheduler.setter
523+
def scheduler(self, scheduler):
524+
"""Sets the scheduler of this ListenerForDescribeListenersOutput.
525+
526+
527+
:param scheduler: The scheduler of this ListenerForDescribeListenersOutput. # noqa: E501
528+
:type: str
529+
"""
530+
531+
self._scheduler = scheduler
532+
507533
@property
508534
def server_group_id(self):
509535
"""Gets the server_group_id of this ListenerForDescribeListenersOutput. # noqa: E501

volcenginesdkclb/models/server_for_add_server_group_backend_servers_input.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,14 @@ def __init__(self, description=None, instance_id=None, ip=None, port=None, type=
6666

6767
if description is not None:
6868
self.description = description
69-
self.instance_id = instance_id
70-
self.ip = ip
71-
self.port = port
72-
self.type = type
69+
if instance_id is not None:
70+
self.instance_id = instance_id
71+
if ip is not None:
72+
self.ip = ip
73+
if port is not None:
74+
self.port = port
75+
if type is not None:
76+
self.type = type
7377
if weight is not None:
7478
self.weight = weight
7579

@@ -112,8 +116,6 @@ def instance_id(self, instance_id):
112116
:param instance_id: The instance_id of this ServerForAddServerGroupBackendServersInput. # noqa: E501
113117
:type: str
114118
"""
115-
if self._configuration.client_side_validation and instance_id is None:
116-
raise ValueError("Invalid value for `instance_id`, must not be `None`") # noqa: E501
117119

118120
self._instance_id = instance_id
119121

@@ -135,8 +137,6 @@ def ip(self, ip):
135137
:param ip: The ip of this ServerForAddServerGroupBackendServersInput. # noqa: E501
136138
:type: str
137139
"""
138-
if self._configuration.client_side_validation and ip is None:
139-
raise ValueError("Invalid value for `ip`, must not be `None`") # noqa: E501
140140

141141
self._ip = ip
142142

@@ -158,8 +158,6 @@ def port(self, port):
158158
:param port: The port of this ServerForAddServerGroupBackendServersInput. # noqa: E501
159159
:type: int
160160
"""
161-
if self._configuration.client_side_validation and port is None:
162-
raise ValueError("Invalid value for `port`, must not be `None`") # noqa: E501
163161

164162
self._port = port
165163

@@ -181,8 +179,6 @@ def type(self, type):
181179
:param type: The type of this ServerForAddServerGroupBackendServersInput. # noqa: E501
182180
:type: str
183181
"""
184-
if self._configuration.client_side_validation and type is None:
185-
raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501
186182

187183
self._type = type
188184

volcenginesdkclb/models/server_for_create_server_group_input.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,14 @@ def __init__(self, description=None, instance_id=None, ip=None, port=None, type=
6666

6767
if description is not None:
6868
self.description = description
69-
self.instance_id = instance_id
70-
self.ip = ip
71-
self.port = port
72-
self.type = type
69+
if instance_id is not None:
70+
self.instance_id = instance_id
71+
if ip is not None:
72+
self.ip = ip
73+
if port is not None:
74+
self.port = port
75+
if type is not None:
76+
self.type = type
7377
if weight is not None:
7478
self.weight = weight
7579

@@ -112,8 +116,6 @@ def instance_id(self, instance_id):
112116
:param instance_id: The instance_id of this ServerForCreateServerGroupInput. # noqa: E501
113117
:type: str
114118
"""
115-
if self._configuration.client_side_validation and instance_id is None:
116-
raise ValueError("Invalid value for `instance_id`, must not be `None`") # noqa: E501
117119

118120
self._instance_id = instance_id
119121

@@ -135,8 +137,6 @@ def ip(self, ip):
135137
:param ip: The ip of this ServerForCreateServerGroupInput. # noqa: E501
136138
:type: str
137139
"""
138-
if self._configuration.client_side_validation and ip is None:
139-
raise ValueError("Invalid value for `ip`, must not be `None`") # noqa: E501
140140

141141
self._ip = ip
142142

@@ -158,8 +158,6 @@ def port(self, port):
158158
:param port: The port of this ServerForCreateServerGroupInput. # noqa: E501
159159
:type: int
160160
"""
161-
if self._configuration.client_side_validation and port is None:
162-
raise ValueError("Invalid value for `port`, must not be `None`") # noqa: E501
163161

164162
self._port = port
165163

@@ -181,8 +179,6 @@ def type(self, type):
181179
:param type: The type of this ServerForCreateServerGroupInput. # noqa: E501
182180
:type: str
183181
"""
184-
if self._configuration.client_side_validation and type is None:
185-
raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501
186182

187183
self._type = type
188184

volcenginesdkclb/models/server_for_modify_server_group_attributes_input.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,12 @@ def __init__(self, description=None, port=None, server_id=None, weight=None, _co
6060

6161
if description is not None:
6262
self.description = description
63-
self.port = port
64-
self.server_id = server_id
65-
self.weight = weight
63+
if port is not None:
64+
self.port = port
65+
if server_id is not None:
66+
self.server_id = server_id
67+
if weight is not None:
68+
self.weight = weight
6669

6770
@property
6871
def description(self):
@@ -103,8 +106,6 @@ def port(self, port):
103106
:param port: The port of this ServerForModifyServerGroupAttributesInput. # noqa: E501
104107
:type: int
105108
"""
106-
if self._configuration.client_side_validation and port is None:
107-
raise ValueError("Invalid value for `port`, must not be `None`") # noqa: E501
108109

109110
self._port = port
110111

@@ -126,8 +127,6 @@ def server_id(self, server_id):
126127
:param server_id: The server_id of this ServerForModifyServerGroupAttributesInput. # noqa: E501
127128
:type: str
128129
"""
129-
if self._configuration.client_side_validation and server_id is None:
130-
raise ValueError("Invalid value for `server_id`, must not be `None`") # noqa: E501
131130

132131
self._server_id = server_id
133132

@@ -149,8 +148,6 @@ def weight(self, weight):
149148
:param weight: The weight of this ServerForModifyServerGroupAttributesInput. # noqa: E501
150149
:type: int
151150
"""
152-
if self._configuration.client_side_validation and weight is None:
153-
raise ValueError("Invalid value for `weight`, must not be `None`") # noqa: E501
154151

155152
self._weight = weight
156153

volcenginesdkcore/api_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
6767
self.default_headers[header_name] = header_value
6868
self.cookie = cookie
6969
# Set default User-Agent.
70-
self.user_agent = 'volcstack-python-sdk/1.0.56'
70+
self.user_agent = 'volcstack-python-sdk/1.0.57'
7171
self.client_side_validation = configuration.client_side_validation
7272

7373
def __del__(self):

volcenginesdkcore/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,5 @@ def to_debug_report(self):
221221
"OS: {env}\n"\
222222
"Python Version: {pyversion}\n"\
223223
"Version of the API: 0.1.0\n"\
224-
"SDK Package Version: 1.0.56".\
224+
"SDK Package Version: 1.0.57".\
225225
format(env=sys.platform, pyversion=sys.version)

0 commit comments

Comments
 (0)