Skip to content

Commit 9a19961

Browse files
author
BitsAdmin
committed
Merge branch 'rds_mssql-Python-2022-01-01-online-619-2024_08_13_22_06_31' into 'integration_2024-09-26_456241000194'
feat: [development task] rds_mssql-619-Python (793791) See merge request iaasng/volcengine-python-sdk!392
2 parents 7dc5ef5 + e529a21 commit 9a19961

File tree

5 files changed

+144
-20
lines changed

5 files changed

+144
-20
lines changed

volcenginesdkrdsmssql/models/describe_backups_request.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,10 @@ def __init__(self, backup_end_time=None, backup_id=None, backup_start_time=None,
7676
if backup_type is not None:
7777
self.backup_type = backup_type
7878
self.instance_id = instance_id
79-
self.page_number = page_number
80-
self.page_size = page_size
79+
if page_number is not None:
80+
self.page_number = page_number
81+
if page_size is not None:
82+
self.page_size = page_size
8183

8284
@property
8385
def backup_end_time(self):
@@ -204,8 +206,6 @@ def page_number(self, page_number):
204206
:param page_number: The page_number of this DescribeBackupsRequest. # noqa: E501
205207
:type: int
206208
"""
207-
if self._configuration.client_side_validation and page_number is None:
208-
raise ValueError("Invalid value for `page_number`, must not be `None`") # noqa: E501
209209

210210
self._page_number = page_number
211211

@@ -227,8 +227,6 @@ def page_size(self, page_size):
227227
:param page_size: The page_size of this DescribeBackupsRequest. # noqa: E501
228228
:type: int
229229
"""
230-
if self._configuration.client_side_validation and page_size is None:
231-
raise ValueError("Invalid value for `page_size`, must not be `None`") # noqa: E501
232230

233231
self._page_size = page_size
234232

volcenginesdkrdsmssql/models/describe_db_instances_request.py

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,14 @@ class DescribeDBInstancesRequest(object):
3737
'create_time_end': 'str',
3838
'create_time_start': 'str',
3939
'db_engine_version': 'str',
40+
'instance_category': 'str',
4041
'instance_id': 'str',
4142
'instance_name': 'str',
4243
'instance_status': 'str',
4344
'instance_type': 'str',
4445
'page_number': 'int',
4546
'page_size': 'int',
47+
'primary_instance_id': 'str',
4648
'tag_filters': 'list[TagFilterForDescribeDBInstancesInput]',
4749
'zone_id': 'str'
4850
}
@@ -52,17 +54,19 @@ class DescribeDBInstancesRequest(object):
5254
'create_time_end': 'CreateTimeEnd',
5355
'create_time_start': 'CreateTimeStart',
5456
'db_engine_version': 'DBEngineVersion',
57+
'instance_category': 'InstanceCategory',
5558
'instance_id': 'InstanceId',
5659
'instance_name': 'InstanceName',
5760
'instance_status': 'InstanceStatus',
5861
'instance_type': 'InstanceType',
5962
'page_number': 'PageNumber',
6063
'page_size': 'PageSize',
64+
'primary_instance_id': 'PrimaryInstanceId',
6165
'tag_filters': 'TagFilters',
6266
'zone_id': 'ZoneId'
6367
}
6468

65-
def __init__(self, charge_type=None, create_time_end=None, create_time_start=None, db_engine_version=None, instance_id=None, instance_name=None, instance_status=None, instance_type=None, page_number=None, page_size=None, tag_filters=None, zone_id=None, _configuration=None): # noqa: E501
69+
def __init__(self, charge_type=None, create_time_end=None, create_time_start=None, db_engine_version=None, instance_category=None, instance_id=None, instance_name=None, instance_status=None, instance_type=None, page_number=None, page_size=None, primary_instance_id=None, tag_filters=None, zone_id=None, _configuration=None): # noqa: E501
6670
"""DescribeDBInstancesRequest - a model defined in Swagger""" # noqa: E501
6771
if _configuration is None:
6872
_configuration = Configuration()
@@ -72,12 +76,14 @@ def __init__(self, charge_type=None, create_time_end=None, create_time_start=Non
7276
self._create_time_end = None
7377
self._create_time_start = None
7478
self._db_engine_version = None
79+
self._instance_category = None
7580
self._instance_id = None
7681
self._instance_name = None
7782
self._instance_status = None
7883
self._instance_type = None
7984
self._page_number = None
8085
self._page_size = None
86+
self._primary_instance_id = None
8187
self._tag_filters = None
8288
self._zone_id = None
8389
self.discriminator = None
@@ -90,6 +96,8 @@ def __init__(self, charge_type=None, create_time_end=None, create_time_start=Non
9096
self.create_time_start = create_time_start
9197
if db_engine_version is not None:
9298
self.db_engine_version = db_engine_version
99+
if instance_category is not None:
100+
self.instance_category = instance_category
93101
if instance_id is not None:
94102
self.instance_id = instance_id
95103
if instance_name is not None:
@@ -102,6 +110,8 @@ def __init__(self, charge_type=None, create_time_end=None, create_time_start=Non
102110
self.page_number = page_number
103111
if page_size is not None:
104112
self.page_size = page_size
113+
if primary_instance_id is not None:
114+
self.primary_instance_id = primary_instance_id
105115
if tag_filters is not None:
106116
self.tag_filters = tag_filters
107117
if zone_id is not None:
@@ -191,6 +201,27 @@ def db_engine_version(self, db_engine_version):
191201

192202
self._db_engine_version = db_engine_version
193203

204+
@property
205+
def instance_category(self):
206+
"""Gets the instance_category of this DescribeDBInstancesRequest. # noqa: E501
207+
208+
209+
:return: The instance_category of this DescribeDBInstancesRequest. # noqa: E501
210+
:rtype: str
211+
"""
212+
return self._instance_category
213+
214+
@instance_category.setter
215+
def instance_category(self, instance_category):
216+
"""Sets the instance_category of this DescribeDBInstancesRequest.
217+
218+
219+
:param instance_category: The instance_category of this DescribeDBInstancesRequest. # noqa: E501
220+
:type: str
221+
"""
222+
223+
self._instance_category = instance_category
224+
194225
@property
195226
def instance_id(self):
196227
"""Gets the instance_id of this DescribeDBInstancesRequest. # noqa: E501
@@ -317,6 +348,27 @@ def page_size(self, page_size):
317348

318349
self._page_size = page_size
319350

351+
@property
352+
def primary_instance_id(self):
353+
"""Gets the primary_instance_id of this DescribeDBInstancesRequest. # noqa: E501
354+
355+
356+
:return: The primary_instance_id of this DescribeDBInstancesRequest. # noqa: E501
357+
:rtype: str
358+
"""
359+
return self._primary_instance_id
360+
361+
@primary_instance_id.setter
362+
def primary_instance_id(self, primary_instance_id):
363+
"""Sets the primary_instance_id of this DescribeDBInstancesRequest.
364+
365+
366+
:param primary_instance_id: The primary_instance_id of this DescribeDBInstancesRequest. # noqa: E501
367+
:type: str
368+
"""
369+
370+
self._primary_instance_id = primary_instance_id
371+
320372
@property
321373
def tag_filters(self):
322374
"""Gets the tag_filters of this DescribeDBInstancesRequest. # noqa: E501

volcenginesdkrdsmssql/models/describe_tos_restore_task_detail_request.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ def __init__(self, page_number=None, page_size=None, restore_task_id=None, _conf
5555
self._restore_task_id = None
5656
self.discriminator = None
5757

58-
self.page_number = page_number
59-
self.page_size = page_size
58+
if page_number is not None:
59+
self.page_number = page_number
60+
if page_size is not None:
61+
self.page_size = page_size
6062
self.restore_task_id = restore_task_id
6163

6264
@property
@@ -77,8 +79,6 @@ def page_number(self, page_number):
7779
:param page_number: The page_number of this DescribeTosRestoreTaskDetailRequest. # noqa: E501
7880
:type: int
7981
"""
80-
if self._configuration.client_side_validation and page_number is None:
81-
raise ValueError("Invalid value for `page_number`, must not be `None`") # noqa: E501
8282

8383
self._page_number = page_number
8484

@@ -100,8 +100,6 @@ def page_size(self, page_size):
100100
:param page_size: The page_size of this DescribeTosRestoreTaskDetailRequest. # noqa: E501
101101
:type: int
102102
"""
103-
if self._configuration.client_side_validation and page_size is None:
104-
raise ValueError("Invalid value for `page_size`, must not be `None`") # noqa: E501
105103

106104
self._page_size = page_size
107105

volcenginesdkrdsmssql/models/describe_tos_restore_tasks_request.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ def __init__(self, instance_id=None, instance_name=None, page_number=None, page_
6868
self.instance_id = instance_id
6969
if instance_name is not None:
7070
self.instance_name = instance_name
71-
self.page_number = page_number
72-
self.page_size = page_size
71+
if page_number is not None:
72+
self.page_number = page_number
73+
if page_size is not None:
74+
self.page_size = page_size
7375
if query_end_time is not None:
7476
self.query_end_time = query_end_time
7577
if query_start_time is not None:
@@ -135,8 +137,6 @@ def page_number(self, page_number):
135137
:param page_number: The page_number of this DescribeTosRestoreTasksRequest. # noqa: E501
136138
:type: int
137139
"""
138-
if self._configuration.client_side_validation and page_number is None:
139-
raise ValueError("Invalid value for `page_number`, must not be `None`") # noqa: E501
140140

141141
self._page_number = page_number
142142

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

164162
self._page_size = page_size
165163

volcenginesdkrdsmssql/models/instances_info_for_describe_db_instances_output.py

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,17 @@ class InstancesInfoForDescribeDBInstancesOutput(object):
3636
'charge_detail': 'ChargeDetailForDescribeDBInstancesOutput',
3737
'create_time': 'str',
3838
'db_engine_version': 'str',
39+
'instance_category': 'str',
3940
'instance_id': 'str',
4041
'instance_name': 'str',
4142
'instance_status': 'str',
4243
'instance_type': 'str',
4344
'node_detail_info': 'list[NodeDetailInfoForDescribeDBInstancesOutput]',
4445
'node_spec': 'str',
4546
'port': 'str',
47+
'primary_instance_id': 'str',
4648
'project_name': 'str',
49+
'read_only_number': 'int',
4750
'region_id': 'str',
4851
'server_collation': 'str',
4952
'storage_space': 'int',
@@ -58,14 +61,17 @@ class InstancesInfoForDescribeDBInstancesOutput(object):
5861
'charge_detail': 'ChargeDetail',
5962
'create_time': 'CreateTime',
6063
'db_engine_version': 'DBEngineVersion',
64+
'instance_category': 'InstanceCategory',
6165
'instance_id': 'InstanceId',
6266
'instance_name': 'InstanceName',
6367
'instance_status': 'InstanceStatus',
6468
'instance_type': 'InstanceType',
6569
'node_detail_info': 'NodeDetailInfo',
6670
'node_spec': 'NodeSpec',
6771
'port': 'Port',
72+
'primary_instance_id': 'PrimaryInstanceId',
6873
'project_name': 'ProjectName',
74+
'read_only_number': 'ReadOnlyNumber',
6975
'region_id': 'RegionId',
7076
'server_collation': 'ServerCollation',
7177
'storage_space': 'StorageSpace',
@@ -76,7 +82,7 @@ class InstancesInfoForDescribeDBInstancesOutput(object):
7682
'zone_id': 'ZoneId'
7783
}
7884

79-
def __init__(self, charge_detail=None, create_time=None, db_engine_version=None, instance_id=None, instance_name=None, instance_status=None, instance_type=None, node_detail_info=None, node_spec=None, port=None, project_name=None, region_id=None, server_collation=None, storage_space=None, storage_type=None, subnet_id=None, time_zone=None, vpc_id=None, zone_id=None, _configuration=None): # noqa: E501
85+
def __init__(self, charge_detail=None, create_time=None, db_engine_version=None, instance_category=None, instance_id=None, instance_name=None, instance_status=None, instance_type=None, node_detail_info=None, node_spec=None, port=None, primary_instance_id=None, project_name=None, read_only_number=None, region_id=None, server_collation=None, storage_space=None, storage_type=None, subnet_id=None, time_zone=None, vpc_id=None, zone_id=None, _configuration=None): # noqa: E501
8086
"""InstancesInfoForDescribeDBInstancesOutput - a model defined in Swagger""" # noqa: E501
8187
if _configuration is None:
8288
_configuration = Configuration()
@@ -85,14 +91,17 @@ def __init__(self, charge_detail=None, create_time=None, db_engine_version=None,
8591
self._charge_detail = None
8692
self._create_time = None
8793
self._db_engine_version = None
94+
self._instance_category = None
8895
self._instance_id = None
8996
self._instance_name = None
9097
self._instance_status = None
9198
self._instance_type = None
9299
self._node_detail_info = None
93100
self._node_spec = None
94101
self._port = None
102+
self._primary_instance_id = None
95103
self._project_name = None
104+
self._read_only_number = None
96105
self._region_id = None
97106
self._server_collation = None
98107
self._storage_space = None
@@ -109,6 +118,8 @@ def __init__(self, charge_detail=None, create_time=None, db_engine_version=None,
109118
self.create_time = create_time
110119
if db_engine_version is not None:
111120
self.db_engine_version = db_engine_version
121+
if instance_category is not None:
122+
self.instance_category = instance_category
112123
if instance_id is not None:
113124
self.instance_id = instance_id
114125
if instance_name is not None:
@@ -123,8 +134,12 @@ def __init__(self, charge_detail=None, create_time=None, db_engine_version=None,
123134
self.node_spec = node_spec
124135
if port is not None:
125136
self.port = port
137+
if primary_instance_id is not None:
138+
self.primary_instance_id = primary_instance_id
126139
if project_name is not None:
127140
self.project_name = project_name
141+
if read_only_number is not None:
142+
self.read_only_number = read_only_number
128143
if region_id is not None:
129144
self.region_id = region_id
130145
if server_collation is not None:
@@ -205,6 +220,27 @@ def db_engine_version(self, db_engine_version):
205220

206221
self._db_engine_version = db_engine_version
207222

223+
@property
224+
def instance_category(self):
225+
"""Gets the instance_category of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
226+
227+
228+
:return: The instance_category of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
229+
:rtype: str
230+
"""
231+
return self._instance_category
232+
233+
@instance_category.setter
234+
def instance_category(self, instance_category):
235+
"""Sets the instance_category of this InstancesInfoForDescribeDBInstancesOutput.
236+
237+
238+
:param instance_category: The instance_category of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
239+
:type: str
240+
"""
241+
242+
self._instance_category = instance_category
243+
208244
@property
209245
def instance_id(self):
210246
"""Gets the instance_id of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
@@ -352,6 +388,27 @@ def port(self, port):
352388

353389
self._port = port
354390

391+
@property
392+
def primary_instance_id(self):
393+
"""Gets the primary_instance_id of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
394+
395+
396+
:return: The primary_instance_id of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
397+
:rtype: str
398+
"""
399+
return self._primary_instance_id
400+
401+
@primary_instance_id.setter
402+
def primary_instance_id(self, primary_instance_id):
403+
"""Sets the primary_instance_id of this InstancesInfoForDescribeDBInstancesOutput.
404+
405+
406+
:param primary_instance_id: The primary_instance_id of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
407+
:type: str
408+
"""
409+
410+
self._primary_instance_id = primary_instance_id
411+
355412
@property
356413
def project_name(self):
357414
"""Gets the project_name of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
@@ -373,6 +430,27 @@ def project_name(self, project_name):
373430

374431
self._project_name = project_name
375432

433+
@property
434+
def read_only_number(self):
435+
"""Gets the read_only_number of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
436+
437+
438+
:return: The read_only_number of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
439+
:rtype: int
440+
"""
441+
return self._read_only_number
442+
443+
@read_only_number.setter
444+
def read_only_number(self, read_only_number):
445+
"""Sets the read_only_number of this InstancesInfoForDescribeDBInstancesOutput.
446+
447+
448+
:param read_only_number: The read_only_number of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501
449+
:type: int
450+
"""
451+
452+
self._read_only_number = read_only_number
453+
376454
@property
377455
def region_id(self):
378456
"""Gets the region_id of this InstancesInfoForDescribeDBInstancesOutput. # noqa: E501

0 commit comments

Comments
 (0)