Skip to content

Commit 8f98648

Browse files
liuweiwei-xyzliuweiwei-xyz
committed
Merge branch 'integration_2024-06-27_307512335362' into 'master'
merge branch integration_2024-06-27_307512335362 into master See merge request iaasng/volcengine-python-sdk!334
2 parents f98f285 + 44f87da commit 8f98648

17 files changed

+219
-32
lines changed

‎meta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "1.0.89",
3-
"meta_commit": "daee4996c2a9d1fb908eeaabcace8611ebae30f3"
2+
"lasted": "1.0.90",
3+
"meta_commit": "1e242413fd0d6b70b2f1df162d783c0ea00dfbe2"
44
}

‎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.89"
6+
VERSION = "1.0.90"
77
# To install the library, run the following
88
#
99
# python setup.py install

‎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.89'
70+
self.user_agent = 'volcstack-python-sdk/1.0.90'
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.89".\
224+
"SDK Package Version: 1.0.90".\
225225
format(env=sys.platform, pyversion=sys.version)

‎volcenginesdkfilenas/models/create_file_system_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def file_system_type(self, file_system_type):
248248
"""
249249
if self._configuration.client_side_validation and file_system_type is None:
250250
raise ValueError("Invalid value for `file_system_type`, must not be `None`") # noqa: E501
251-
allowed_values = ["Extreme"] # noqa: E501
251+
allowed_values = ["Extreme", "Capacity", "Cache"] # noqa: E501
252252
if (self._configuration.client_side_validation and
253253
file_system_type not in allowed_values):
254254
raise ValueError(

‎volcenginesdkfilenas/models/create_permission_group_request.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ def __init__(self, description=None, file_system_type=None, permission_group_nam
5757

5858
if description is not None:
5959
self.description = description
60-
self.file_system_type = file_system_type
60+
if file_system_type is not None:
61+
self.file_system_type = file_system_type
6162
self.permission_group_name = permission_group_name
6263

6364
@property
@@ -99,9 +100,7 @@ def file_system_type(self, file_system_type):
99100
:param file_system_type: The file_system_type of this CreatePermissionGroupRequest. # noqa: E501
100101
:type: str
101102
"""
102-
if self._configuration.client_side_validation and file_system_type is None:
103-
raise ValueError("Invalid value for `file_system_type`, must not be `None`") # noqa: E501
104-
allowed_values = ["Extreme"] # noqa: E501
103+
allowed_values = ["Extreme", "Capacity", "Cache"] # noqa: E501
105104
if (self._configuration.client_side_validation and
106105
file_system_type not in allowed_values):
107106
raise ValueError(

‎volcenginesdkfilenas/models/describe_permission_groups_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def file_system_type(self, file_system_type):
8686
"""
8787
if self._configuration.client_side_validation and file_system_type is None:
8888
raise ValueError("Invalid value for `file_system_type`, must not be `None`") # noqa: E501
89-
allowed_values = ["Extreme"] # noqa: E501
89+
allowed_values = ["Extreme", "Capacity", "Cache"] # noqa: E501
9090
if (self._configuration.client_side_validation and
9191
file_system_type not in allowed_values):
9292
raise ValueError(

‎volcenginesdkfilenas/models/describe_permission_rules_request.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ def __init__(self, file_system_type=None, permission_group_id=None, _configurati
5252
self._permission_group_id = None
5353
self.discriminator = None
5454

55-
self.file_system_type = file_system_type
55+
if file_system_type is not None:
56+
self.file_system_type = file_system_type
5657
self.permission_group_id = permission_group_id
5758

5859
@property
@@ -73,9 +74,7 @@ def file_system_type(self, file_system_type):
7374
:param file_system_type: The file_system_type of this DescribePermissionRulesRequest. # noqa: E501
7475
:type: str
7576
"""
76-
if self._configuration.client_side_validation and file_system_type is None:
77-
raise ValueError("Invalid value for `file_system_type`, must not be `None`") # noqa: E501
78-
allowed_values = ["Extreme"] # noqa: E501
77+
allowed_values = ["Extreme", "Capacity", "Cache"] # noqa: E501
7978
if (self._configuration.client_side_validation and
8079
file_system_type not in allowed_values):
8180
raise ValueError(

‎volcenginesdkfilenas/models/update_file_system_request.py

Lines changed: 105 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ class UpdateFileSystemRequest(object):
3333
and the value is json key in definition.
3434
"""
3535
swagger_types = {
36+
'auto_expand': 'bool',
37+
'auto_expand_limit': 'int',
38+
'auto_expand_step': 'int',
39+
'auto_expand_threshold': 'int',
3640
'description': 'str',
3741
'file_system_id': 'str',
3842
'file_system_name': 'str',
@@ -41,26 +45,42 @@ class UpdateFileSystemRequest(object):
4145
}
4246

4347
attribute_map = {
48+
'auto_expand': 'AutoExpand',
49+
'auto_expand_limit': 'AutoExpandLimit',
50+
'auto_expand_step': 'AutoExpandStep',
51+
'auto_expand_threshold': 'AutoExpandThreshold',
4452
'description': 'Description',
4553
'file_system_id': 'FileSystemId',
4654
'file_system_name': 'FileSystemName',
4755
'project_name': 'ProjectName',
4856
'tags': 'Tags'
4957
}
5058

51-
def __init__(self, description=None, file_system_id=None, file_system_name=None, project_name=None, tags=None, _configuration=None): # noqa: E501
59+
def __init__(self, auto_expand=None, auto_expand_limit=None, auto_expand_step=None, auto_expand_threshold=None, description=None, file_system_id=None, file_system_name=None, project_name=None, tags=None, _configuration=None): # noqa: E501
5260
"""UpdateFileSystemRequest - a model defined in Swagger""" # noqa: E501
5361
if _configuration is None:
5462
_configuration = Configuration()
5563
self._configuration = _configuration
5664

65+
self._auto_expand = None
66+
self._auto_expand_limit = None
67+
self._auto_expand_step = None
68+
self._auto_expand_threshold = None
5769
self._description = None
5870
self._file_system_id = None
5971
self._file_system_name = None
6072
self._project_name = None
6173
self._tags = None
6274
self.discriminator = None
6375

76+
if auto_expand is not None:
77+
self.auto_expand = auto_expand
78+
if auto_expand_limit is not None:
79+
self.auto_expand_limit = auto_expand_limit
80+
if auto_expand_step is not None:
81+
self.auto_expand_step = auto_expand_step
82+
if auto_expand_threshold is not None:
83+
self.auto_expand_threshold = auto_expand_threshold
6484
if description is not None:
6585
self.description = description
6686
self.file_system_id = file_system_id
@@ -71,6 +91,90 @@ def __init__(self, description=None, file_system_id=None, file_system_name=None,
7191
if tags is not None:
7292
self.tags = tags
7393

94+
@property
95+
def auto_expand(self):
96+
"""Gets the auto_expand of this UpdateFileSystemRequest. # noqa: E501
97+
98+
99+
:return: The auto_expand of this UpdateFileSystemRequest. # noqa: E501
100+
:rtype: bool
101+
"""
102+
return self._auto_expand
103+
104+
@auto_expand.setter
105+
def auto_expand(self, auto_expand):
106+
"""Sets the auto_expand of this UpdateFileSystemRequest.
107+
108+
109+
:param auto_expand: The auto_expand of this UpdateFileSystemRequest. # noqa: E501
110+
:type: bool
111+
"""
112+
113+
self._auto_expand = auto_expand
114+
115+
@property
116+
def auto_expand_limit(self):
117+
"""Gets the auto_expand_limit of this UpdateFileSystemRequest. # noqa: E501
118+
119+
120+
:return: The auto_expand_limit of this UpdateFileSystemRequest. # noqa: E501
121+
:rtype: int
122+
"""
123+
return self._auto_expand_limit
124+
125+
@auto_expand_limit.setter
126+
def auto_expand_limit(self, auto_expand_limit):
127+
"""Sets the auto_expand_limit of this UpdateFileSystemRequest.
128+
129+
130+
:param auto_expand_limit: The auto_expand_limit of this UpdateFileSystemRequest. # noqa: E501
131+
:type: int
132+
"""
133+
134+
self._auto_expand_limit = auto_expand_limit
135+
136+
@property
137+
def auto_expand_step(self):
138+
"""Gets the auto_expand_step of this UpdateFileSystemRequest. # noqa: E501
139+
140+
141+
:return: The auto_expand_step of this UpdateFileSystemRequest. # noqa: E501
142+
:rtype: int
143+
"""
144+
return self._auto_expand_step
145+
146+
@auto_expand_step.setter
147+
def auto_expand_step(self, auto_expand_step):
148+
"""Sets the auto_expand_step of this UpdateFileSystemRequest.
149+
150+
151+
:param auto_expand_step: The auto_expand_step of this UpdateFileSystemRequest. # noqa: E501
152+
:type: int
153+
"""
154+
155+
self._auto_expand_step = auto_expand_step
156+
157+
@property
158+
def auto_expand_threshold(self):
159+
"""Gets the auto_expand_threshold of this UpdateFileSystemRequest. # noqa: E501
160+
161+
162+
:return: The auto_expand_threshold of this UpdateFileSystemRequest. # noqa: E501
163+
:rtype: int
164+
"""
165+
return self._auto_expand_threshold
166+
167+
@auto_expand_threshold.setter
168+
def auto_expand_threshold(self, auto_expand_threshold):
169+
"""Sets the auto_expand_threshold of this UpdateFileSystemRequest.
170+
171+
172+
:param auto_expand_threshold: The auto_expand_threshold of this UpdateFileSystemRequest. # noqa: E501
173+
:type: int
174+
"""
175+
176+
self._auto_expand_threshold = auto_expand_threshold
177+
74178
@property
75179
def description(self):
76180
"""Gets the description of this UpdateFileSystemRequest. # noqa: E501

‎volcenginesdkfilenas/models/update_permission_group_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def file_system_type(self, file_system_type):
106106
"""
107107
if self._configuration.client_side_validation and file_system_type is None:
108108
raise ValueError("Invalid value for `file_system_type`, must not be `None`") # noqa: E501
109-
allowed_values = ["Extreme"] # noqa: E501
109+
allowed_values = ["Extreme", "Capacity", "Cache"] # noqa: E501
110110
if (self._configuration.client_side_validation and
111111
file_system_type not in allowed_values):
112112
raise ValueError(

‎volcenginesdkfilenas/models/update_permission_rule_request.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def file_system_type(self, file_system_type):
8181
"""
8282
if self._configuration.client_side_validation and file_system_type is None:
8383
raise ValueError("Invalid value for `file_system_type`, must not be `None`") # noqa: E501
84-
allowed_values = ["Extreme"] # noqa: E501
84+
allowed_values = ["Extreme", "Capacity", "Cache"] # noqa: E501
8585
if (self._configuration.client_side_validation and
8686
file_system_type not in allowed_values):
8787
raise ValueError(

‎volcenginesdkfilenas/models/zone_for_describe_zones_output.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,6 @@ def status(self, status):
106106
:param status: The status of this ZoneForDescribeZonesOutput. # noqa: E501
107107
:type: str
108108
"""
109-
allowed_values = ["OnSale", "SoldOut", "UnSold"] # noqa: E501
110-
if (self._configuration.client_side_validation and
111-
status not in allowed_values):
112-
raise ValueError(
113-
"Invalid value for `status` ({0}), must be one of {1}" # noqa: E501
114-
.format(status, allowed_values)
115-
)
116109

117110
self._status = status
118111

‎volcenginesdkvke/models/data_volume_for_create_node_pool_input.py

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,35 +33,68 @@ class DataVolumeForCreateNodePoolInput(object):
3333
and the value is json key in definition.
3434
"""
3535
swagger_types = {
36+
'file_system': 'str',
3637
'mount_point': 'str',
3738
'size': 'int',
3839
'type': 'str'
3940
}
4041

4142
attribute_map = {
43+
'file_system': 'FileSystem',
4244
'mount_point': 'MountPoint',
4345
'size': 'Size',
4446
'type': 'Type'
4547
}
4648

47-
def __init__(self, mount_point=None, size=None, type=None, _configuration=None): # noqa: E501
49+
def __init__(self, file_system=None, mount_point=None, size=None, type=None, _configuration=None): # noqa: E501
4850
"""DataVolumeForCreateNodePoolInput - a model defined in Swagger""" # noqa: E501
4951
if _configuration is None:
5052
_configuration = Configuration()
5153
self._configuration = _configuration
5254

55+
self._file_system = None
5356
self._mount_point = None
5457
self._size = None
5558
self._type = None
5659
self.discriminator = None
5760

61+
if file_system is not None:
62+
self.file_system = file_system
5863
if mount_point is not None:
5964
self.mount_point = mount_point
6065
if size is not None:
6166
self.size = size
6267
if type is not None:
6368
self.type = type
6469

70+
@property
71+
def file_system(self):
72+
"""Gets the file_system of this DataVolumeForCreateNodePoolInput. # noqa: E501
73+
74+
75+
:return: The file_system of this DataVolumeForCreateNodePoolInput. # noqa: E501
76+
:rtype: str
77+
"""
78+
return self._file_system
79+
80+
@file_system.setter
81+
def file_system(self, file_system):
82+
"""Sets the file_system of this DataVolumeForCreateNodePoolInput.
83+
84+
85+
:param file_system: The file_system of this DataVolumeForCreateNodePoolInput. # noqa: E501
86+
:type: str
87+
"""
88+
allowed_values = ["Ext4", "Xfs"] # noqa: E501
89+
if (self._configuration.client_side_validation and
90+
file_system not in allowed_values):
91+
raise ValueError(
92+
"Invalid value for `file_system` ({0}), must be one of {1}" # noqa: E501
93+
.format(file_system, allowed_values)
94+
)
95+
96+
self._file_system = file_system
97+
6598
@property
6699
def mount_point(self):
67100
"""Gets the mount_point of this DataVolumeForCreateNodePoolInput. # noqa: E501
@@ -122,7 +155,7 @@ def type(self, type):
122155
:param type: The type of this DataVolumeForCreateNodePoolInput. # noqa: E501
123156
:type: str
124157
"""
125-
allowed_values = ["ESSD_PL0", "ESSD_FlexPL", "ESSD_PL1", "ESSD", "PTSSD"] # noqa: E501
158+
allowed_values = ["ESSD_PL0", "ESSD_FlexPL"] # noqa: E501
126159
if (self._configuration.client_side_validation and
127160
type not in allowed_values):
128161
raise ValueError(

0 commit comments

Comments
 (0)