Skip to content

Commit d64dd11

Browse files
author
BitsAdmin
committed
Merge branch 'escloud-Python-2023-01-01-online-1020-2025_03_13_14_20_27' into 'integration_2025-03-20_798327825666'
feat: [development task] ESCloud-1020-Python (1094123) See merge request iaasng/volcengine-python-sdk!543
2 parents 1e06e6a + 86487f1 commit d64dd11

9 files changed

+224
-151
lines changed

‎volcenginesdkescloud/__init__.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
from volcenginesdkescloud.models.modify_charge_code_response import ModifyChargeCodeResponse
7575
from volcenginesdkescloud.models.modify_deletion_protection_request import ModifyDeletionProtectionRequest
7676
from volcenginesdkescloud.models.modify_deletion_protection_response import ModifyDeletionProtectionResponse
77-
from volcenginesdkescloud.models.modify_ip_whitelist_request import ModifyIpWhitelistRequest
78-
from volcenginesdkescloud.models.modify_ip_whitelist_response import ModifyIpWhitelistResponse
77+
from volcenginesdkescloud.models.modify_ip_allow_list_request import ModifyIpAllowListRequest
78+
from volcenginesdkescloud.models.modify_ip_allow_list_response import ModifyIpAllowListResponse
7979
from volcenginesdkescloud.models.modify_maintenance_setting_request import ModifyMaintenanceSettingRequest
8080
from volcenginesdkescloud.models.modify_maintenance_setting_response import ModifyMaintenanceSettingResponse
8181
from volcenginesdkescloud.models.modify_node_spec_in_one_step_request import ModifyNodeSpecInOneStepRequest
@@ -116,6 +116,7 @@
116116
from volcenginesdkescloud.models.tag_filter_for_list_tags_for_resources_input import TagFilterForListTagsForResourcesInput
117117
from volcenginesdkescloud.models.tag_for_create_instance_in_one_step_input import TagForCreateInstanceInOneStepInput
118118
from volcenginesdkescloud.models.tag_for_create_instance_input import TagForCreateInstanceInput
119+
from volcenginesdkescloud.models.tag_for_describe_instances_input import TagForDescribeInstancesInput
119120
from volcenginesdkescloud.models.tag_for_tag_resources_input import TagForTagResourcesInput
120121
from volcenginesdkescloud.models.tag_kvs_for_describe_instance_output import TagKvsForDescribeInstanceOutput
121122
from volcenginesdkescloud.models.tag_kvs_for_describe_instances_output import TagKvsForDescribeInstancesOutput

‎volcenginesdkescloud/api/escloud_api.py‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,38 +1100,38 @@ def modify_deletion_protection_with_http_info(self, body, **kwargs): # noqa: E5
11001100
_request_timeout=params.get('_request_timeout'),
11011101
collection_formats=collection_formats)
11021102

1103-
def modify_ip_whitelist(self, body, **kwargs): # noqa: E501
1104-
"""modify_ip_whitelist # noqa: E501
1103+
def modify_ip_allow_list(self, body, **kwargs): # noqa: E501
1104+
"""modify_ip_allow_list # noqa: E501
11051105
11061106
This method makes a synchronous HTTP request by default. To make an
11071107
asynchronous HTTP request, please pass async_req=True
1108-
>>> thread = api.modify_ip_whitelist(body, async_req=True)
1108+
>>> thread = api.modify_ip_allow_list(body, async_req=True)
11091109
>>> result = thread.get()
11101110
11111111
:param async_req bool
1112-
:param ModifyIpWhitelistRequest body: (required)
1113-
:return: ModifyIpWhitelistResponse
1112+
:param ModifyIpAllowListRequest body: (required)
1113+
:return: ModifyIpAllowListResponse
11141114
If the method is called asynchronously,
11151115
returns the request thread.
11161116
"""
11171117
kwargs['_return_http_data_only'] = True
11181118
if kwargs.get('async_req'):
1119-
return self.modify_ip_whitelist_with_http_info(body, **kwargs) # noqa: E501
1119+
return self.modify_ip_allow_list_with_http_info(body, **kwargs) # noqa: E501
11201120
else:
1121-
(data) = self.modify_ip_whitelist_with_http_info(body, **kwargs) # noqa: E501
1121+
(data) = self.modify_ip_allow_list_with_http_info(body, **kwargs) # noqa: E501
11221122
return data
11231123

1124-
def modify_ip_whitelist_with_http_info(self, body, **kwargs): # noqa: E501
1125-
"""modify_ip_whitelist # noqa: E501
1124+
def modify_ip_allow_list_with_http_info(self, body, **kwargs): # noqa: E501
1125+
"""modify_ip_allow_list # noqa: E501
11261126
11271127
This method makes a synchronous HTTP request by default. To make an
11281128
asynchronous HTTP request, please pass async_req=True
1129-
>>> thread = api.modify_ip_whitelist_with_http_info(body, async_req=True)
1129+
>>> thread = api.modify_ip_allow_list_with_http_info(body, async_req=True)
11301130
>>> result = thread.get()
11311131
11321132
:param async_req bool
1133-
:param ModifyIpWhitelistRequest body: (required)
1134-
:return: ModifyIpWhitelistResponse
1133+
:param ModifyIpAllowListRequest body: (required)
1134+
:return: ModifyIpAllowListResponse
11351135
If the method is called asynchronously,
11361136
returns the request thread.
11371137
"""
@@ -1147,14 +1147,14 @@ def modify_ip_whitelist_with_http_info(self, body, **kwargs): # noqa: E501
11471147
if key not in all_params:
11481148
raise TypeError(
11491149
"Got an unexpected keyword argument '%s'"
1150-
" to method modify_ip_whitelist" % key
1150+
" to method modify_ip_allow_list" % key
11511151
)
11521152
params[key] = val
11531153
del params['kwargs']
11541154
# verify the required parameter 'body' is set
11551155
if self.api_client.client_side_validation and ('body' not in params or
11561156
params['body'] is None): # noqa: E501
1157-
raise ValueError("Missing the required parameter `body` when calling `modify_ip_whitelist`") # noqa: E501
1157+
raise ValueError("Missing the required parameter `body` when calling `modify_ip_allow_list`") # noqa: E501
11581158

11591159
collection_formats = {}
11601160

@@ -1182,14 +1182,14 @@ def modify_ip_whitelist_with_http_info(self, body, **kwargs): # noqa: E501
11821182
auth_settings = ['volcengineSign'] # noqa: E501
11831183

11841184
return self.api_client.call_api(
1185-
'/ModifyIpWhitelist/2023-01-01/escloud/post/application_json/', 'POST',
1185+
'/ModifyIpAllowList/2023-01-01/escloud/post/application_json/', 'POST',
11861186
path_params,
11871187
query_params,
11881188
header_params,
11891189
body=body_params,
11901190
post_params=form_params,
11911191
files=local_var_files,
1192-
response_type='ModifyIpWhitelistResponse', # noqa: E501
1192+
response_type='ModifyIpAllowListResponse', # noqa: E501
11931193
auth_settings=auth_settings,
11941194
async_req=params.get('async_req'),
11951195
_return_http_data_only=params.get('_return_http_data_only'),

‎volcenginesdkescloud/models/__init__.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
from volcenginesdkescloud.models.modify_charge_code_response import ModifyChargeCodeResponse
7171
from volcenginesdkescloud.models.modify_deletion_protection_request import ModifyDeletionProtectionRequest
7272
from volcenginesdkescloud.models.modify_deletion_protection_response import ModifyDeletionProtectionResponse
73-
from volcenginesdkescloud.models.modify_ip_whitelist_request import ModifyIpWhitelistRequest
74-
from volcenginesdkescloud.models.modify_ip_whitelist_response import ModifyIpWhitelistResponse
73+
from volcenginesdkescloud.models.modify_ip_allow_list_request import ModifyIpAllowListRequest
74+
from volcenginesdkescloud.models.modify_ip_allow_list_response import ModifyIpAllowListResponse
7575
from volcenginesdkescloud.models.modify_maintenance_setting_request import ModifyMaintenanceSettingRequest
7676
from volcenginesdkescloud.models.modify_maintenance_setting_response import ModifyMaintenanceSettingResponse
7777
from volcenginesdkescloud.models.modify_node_spec_in_one_step_request import ModifyNodeSpecInOneStepRequest
@@ -112,6 +112,7 @@
112112
from volcenginesdkescloud.models.tag_filter_for_list_tags_for_resources_input import TagFilterForListTagsForResourcesInput
113113
from volcenginesdkescloud.models.tag_for_create_instance_in_one_step_input import TagForCreateInstanceInOneStepInput
114114
from volcenginesdkescloud.models.tag_for_create_instance_input import TagForCreateInstanceInput
115+
from volcenginesdkescloud.models.tag_for_describe_instances_input import TagForDescribeInstancesInput
115116
from volcenginesdkescloud.models.tag_for_tag_resources_input import TagForTagResourcesInput
116117
from volcenginesdkescloud.models.tag_kvs_for_describe_instance_output import TagKvsForDescribeInstanceOutput
117118
from volcenginesdkescloud.models.tag_kvs_for_describe_instances_output import TagKvsForDescribeInstancesOutput

‎volcenginesdkescloud/models/instance_configuration_for_create_instance_in_one_step_input.py‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class InstanceConfigurationForCreateInstanceInOneStepInput(object):
3838
'charge_type': 'str',
3939
'configuration_code': 'str',
4040
'deletion_protection': 'bool',
41-
'enable_cerebro': 'bool',
4241
'enable_https': 'bool',
4342
'enable_pure_master': 'bool',
4443
'instance_name': 'str',
@@ -59,7 +58,6 @@ class InstanceConfigurationForCreateInstanceInOneStepInput(object):
5958
'charge_type': 'ChargeType',
6059
'configuration_code': 'ConfigurationCode',
6160
'deletion_protection': 'DeletionProtection',
62-
'enable_cerebro': 'EnableCerebro',
6361
'enable_https': 'EnableHttps',
6462
'enable_pure_master': 'EnablePureMaster',
6563
'instance_name': 'InstanceName',
@@ -74,7 +72,7 @@ class InstanceConfigurationForCreateInstanceInOneStepInput(object):
7472
'zone_id': 'ZoneId'
7573
}
7674

77-
def __init__(self, admin_password=None, auto_renew=None, charge_type=None, configuration_code=None, deletion_protection=None, enable_cerebro=None, enable_https=None, enable_pure_master=None, instance_name=None, network_specs=None, node_specs_assigns=None, period=None, project_name=None, region_id=None, subnet=None, vpc=None, version=None, zone_id=None, _configuration=None): # noqa: E501
75+
def __init__(self, admin_password=None, auto_renew=None, charge_type=None, configuration_code=None, deletion_protection=None, enable_https=None, enable_pure_master=None, instance_name=None, network_specs=None, node_specs_assigns=None, period=None, project_name=None, region_id=None, subnet=None, vpc=None, version=None, zone_id=None, _configuration=None): # noqa: E501
7876
"""InstanceConfigurationForCreateInstanceInOneStepInput - a model defined in Swagger""" # noqa: E501
7977
if _configuration is None:
8078
_configuration = Configuration()
@@ -85,7 +83,6 @@ def __init__(self, admin_password=None, auto_renew=None, charge_type=None, confi
8583
self._charge_type = None
8684
self._configuration_code = None
8785
self._deletion_protection = None
88-
self._enable_cerebro = None
8986
self._enable_https = None
9087
self._enable_pure_master = None
9188
self._instance_name = None
@@ -110,8 +107,6 @@ def __init__(self, admin_password=None, auto_renew=None, charge_type=None, confi
110107
self.configuration_code = configuration_code
111108
if deletion_protection is not None:
112109
self.deletion_protection = deletion_protection
113-
if enable_cerebro is not None:
114-
self.enable_cerebro = enable_cerebro
115110
if enable_https is not None:
116111
self.enable_https = enable_https
117112
if enable_pure_master is not None:
@@ -249,27 +244,6 @@ def deletion_protection(self, deletion_protection):
249244

250245
self._deletion_protection = deletion_protection
251246

252-
@property
253-
def enable_cerebro(self):
254-
"""Gets the enable_cerebro of this InstanceConfigurationForCreateInstanceInOneStepInput. # noqa: E501
255-
256-
257-
:return: The enable_cerebro of this InstanceConfigurationForCreateInstanceInOneStepInput. # noqa: E501
258-
:rtype: bool
259-
"""
260-
return self._enable_cerebro
261-
262-
@enable_cerebro.setter
263-
def enable_cerebro(self, enable_cerebro):
264-
"""Sets the enable_cerebro of this InstanceConfigurationForCreateInstanceInOneStepInput.
265-
266-
267-
:param enable_cerebro: The enable_cerebro of this InstanceConfigurationForCreateInstanceInOneStepInput. # noqa: E501
268-
:type: bool
269-
"""
270-
271-
self._enable_cerebro = enable_cerebro
272-
273247
@property
274248
def enable_https(self):
275249
"""Gets the enable_https of this InstanceConfigurationForCreateInstanceInOneStepInput. # noqa: E501

‎volcenginesdkescloud/models/instance_configuration_for_create_instance_input.py‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class InstanceConfigurationForCreateInstanceInput(object):
3838
'charge_type': 'str',
3939
'configuration_code': 'str',
4040
'deletion_protection': 'bool',
41-
'enable_cerebro': 'bool',
4241
'enable_https': 'bool',
4342
'enable_pure_master': 'bool',
4443
'instance_name': 'str',
@@ -59,7 +58,6 @@ class InstanceConfigurationForCreateInstanceInput(object):
5958
'charge_type': 'ChargeType',
6059
'configuration_code': 'ConfigurationCode',
6160
'deletion_protection': 'DeletionProtection',
62-
'enable_cerebro': 'EnableCerebro',
6361
'enable_https': 'EnableHttps',
6462
'enable_pure_master': 'EnablePureMaster',
6563
'instance_name': 'InstanceName',
@@ -74,7 +72,7 @@ class InstanceConfigurationForCreateInstanceInput(object):
7472
'zone_id': 'ZoneId'
7573
}
7674

77-
def __init__(self, admin_password=None, auto_renew=None, charge_type=None, configuration_code=None, deletion_protection=None, enable_cerebro=None, enable_https=None, enable_pure_master=None, instance_name=None, network_specs=None, node_specs_assigns=None, period=None, project_name=None, region_id=None, subnet=None, vpc=None, version=None, zone_id=None, _configuration=None): # noqa: E501
75+
def __init__(self, admin_password=None, auto_renew=None, charge_type=None, configuration_code=None, deletion_protection=None, enable_https=None, enable_pure_master=None, instance_name=None, network_specs=None, node_specs_assigns=None, period=None, project_name=None, region_id=None, subnet=None, vpc=None, version=None, zone_id=None, _configuration=None): # noqa: E501
7876
"""InstanceConfigurationForCreateInstanceInput - a model defined in Swagger""" # noqa: E501
7977
if _configuration is None:
8078
_configuration = Configuration()
@@ -85,7 +83,6 @@ def __init__(self, admin_password=None, auto_renew=None, charge_type=None, confi
8583
self._charge_type = None
8684
self._configuration_code = None
8785
self._deletion_protection = None
88-
self._enable_cerebro = None
8986
self._enable_https = None
9087
self._enable_pure_master = None
9188
self._instance_name = None
@@ -110,8 +107,6 @@ def __init__(self, admin_password=None, auto_renew=None, charge_type=None, confi
110107
self.configuration_code = configuration_code
111108
if deletion_protection is not None:
112109
self.deletion_protection = deletion_protection
113-
if enable_cerebro is not None:
114-
self.enable_cerebro = enable_cerebro
115110
if enable_https is not None:
116111
self.enable_https = enable_https
117112
if enable_pure_master is not None:
@@ -249,27 +244,6 @@ def deletion_protection(self, deletion_protection):
249244

250245
self._deletion_protection = deletion_protection
251246

252-
@property
253-
def enable_cerebro(self):
254-
"""Gets the enable_cerebro of this InstanceConfigurationForCreateInstanceInput. # noqa: E501
255-
256-
257-
:return: The enable_cerebro of this InstanceConfigurationForCreateInstanceInput. # noqa: E501
258-
:rtype: bool
259-
"""
260-
return self._enable_cerebro
261-
262-
@enable_cerebro.setter
263-
def enable_cerebro(self, enable_cerebro):
264-
"""Sets the enable_cerebro of this InstanceConfigurationForCreateInstanceInput.
265-
266-
267-
:param enable_cerebro: The enable_cerebro of this InstanceConfigurationForCreateInstanceInput. # noqa: E501
268-
:type: bool
269-
"""
270-
271-
self._enable_cerebro = enable_cerebro
272-
273247
@property
274248
def enable_https(self):
275249
"""Gets the enable_https of this InstanceConfigurationForCreateInstanceInput. # noqa: E501

0 commit comments

Comments
 (0)