Skip to content

Commit 20604d3

Browse files
author
BitsAdmin
committed
Merge branch 'ecs-Python-2020-04-01-online-1330-2025_06_25_15_57_02' into 'integration_2025-06-26_968729939458'
feat: [development task] ecs-1330-Python (1390204) See merge request iaasng/volcengine-python-sdk!684
2 parents eae2402 + 4e19f0e commit 20604d3

17 files changed

+919
-11
lines changed

volcenginesdkecs/.DS_Store

-6 KB
Binary file not shown.

volcenginesdkecs/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
from volcenginesdkecs.models.gpu_for_describe_spot_advice_input import GpuForDescribeSpotAdviceInput
192192
from volcenginesdkecs.models.hpc_cluster_for_describe_hpc_clusters_output import HpcClusterForDescribeHpcClustersOutput
193193
from volcenginesdkecs.models.image_for_describe_images_output import ImageForDescribeImagesOutput
194+
from volcenginesdkecs.models.import_data_volume_for_import_image_input import ImportDataVolumeForImportImageInput
194195
from volcenginesdkecs.models.import_image_request import ImportImageRequest
195196
from volcenginesdkecs.models.import_image_response import ImportImageResponse
196197
from volcenginesdkecs.models.import_key_pair_request import ImportKeyPairRequest
@@ -289,6 +290,8 @@
289290
from volcenginesdkecs.models.renew_dedicated_host_response import RenewDedicatedHostResponse
290291
from volcenginesdkecs.models.renew_instance_request import RenewInstanceRequest
291292
from volcenginesdkecs.models.renew_instance_response import RenewInstanceResponse
293+
from volcenginesdkecs.models.repair_image_request import RepairImageRequest
294+
from volcenginesdkecs.models.repair_image_response import RepairImageResponse
292295
from volcenginesdkecs.models.replace_system_volume_request import ReplaceSystemVolumeRequest
293296
from volcenginesdkecs.models.replace_system_volume_response import ReplaceSystemVolumeResponse
294297
from volcenginesdkecs.models.reserved_instance_for_describe_reserved_instances_output import ReservedInstanceForDescribeReservedInstancesOutput
@@ -357,6 +360,7 @@
357360
from volcenginesdkecs.models.upgrade_cloud_assistants_response import UpgradeCloudAssistantsResponse
358361
from volcenginesdkecs.models.volume_for_create_scheduled_instances_input import VolumeForCreateScheduledInstancesInput
359362
from volcenginesdkecs.models.volume_for_describe_instance_types_output import VolumeForDescribeInstanceTypesOutput
363+
from volcenginesdkecs.models.volume_for_describe_instances_output import VolumeForDescribeInstancesOutput
360364
from volcenginesdkecs.models.volume_for_describe_scheduled_instances_output import VolumeForDescribeScheduledInstancesOutput
361365
from volcenginesdkecs.models.volume_for_run_instances_input import VolumeForRunInstancesInput
362366
from volcenginesdkecs.models.zone_for_describe_zones_output import ZoneForDescribeZonesOutput

volcenginesdkecs/api/ecs_api.py

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8860,6 +8860,103 @@ def renew_instance_with_http_info(self, body, **kwargs): # noqa: E501
88608860
_request_timeout=params.get('_request_timeout'),
88618861
collection_formats=collection_formats)
88628862

8863+
def repair_image(self, body, **kwargs): # noqa: E501
8864+
"""repair_image # noqa: E501
8865+
8866+
This method makes a synchronous HTTP request by default. To make an
8867+
asynchronous HTTP request, please pass async_req=True
8868+
>>> thread = api.repair_image(body, async_req=True)
8869+
>>> result = thread.get()
8870+
8871+
:param async_req bool
8872+
:param RepairImageRequest body: (required)
8873+
:return: RepairImageResponse
8874+
If the method is called asynchronously,
8875+
returns the request thread.
8876+
"""
8877+
kwargs['_return_http_data_only'] = True
8878+
if kwargs.get('async_req'):
8879+
return self.repair_image_with_http_info(body, **kwargs) # noqa: E501
8880+
else:
8881+
(data) = self.repair_image_with_http_info(body, **kwargs) # noqa: E501
8882+
return data
8883+
8884+
def repair_image_with_http_info(self, body, **kwargs): # noqa: E501
8885+
"""repair_image # noqa: E501
8886+
8887+
This method makes a synchronous HTTP request by default. To make an
8888+
asynchronous HTTP request, please pass async_req=True
8889+
>>> thread = api.repair_image_with_http_info(body, async_req=True)
8890+
>>> result = thread.get()
8891+
8892+
:param async_req bool
8893+
:param RepairImageRequest body: (required)
8894+
:return: RepairImageResponse
8895+
If the method is called asynchronously,
8896+
returns the request thread.
8897+
"""
8898+
8899+
all_params = ['body'] # noqa: E501
8900+
all_params.append('async_req')
8901+
all_params.append('_return_http_data_only')
8902+
all_params.append('_preload_content')
8903+
all_params.append('_request_timeout')
8904+
8905+
params = locals()
8906+
for key, val in six.iteritems(params['kwargs']):
8907+
if key not in all_params:
8908+
raise TypeError(
8909+
"Got an unexpected keyword argument '%s'"
8910+
" to method repair_image" % key
8911+
)
8912+
params[key] = val
8913+
del params['kwargs']
8914+
# verify the required parameter 'body' is set
8915+
if self.api_client.client_side_validation and ('body' not in params or
8916+
params['body'] is None): # noqa: E501
8917+
raise ValueError("Missing the required parameter `body` when calling `repair_image`") # noqa: E501
8918+
8919+
collection_formats = {}
8920+
8921+
path_params = {}
8922+
8923+
query_params = []
8924+
8925+
header_params = {}
8926+
8927+
form_params = []
8928+
local_var_files = {}
8929+
8930+
body_params = None
8931+
if 'body' in params:
8932+
body_params = params['body']
8933+
# HTTP header `Accept`
8934+
header_params['Accept'] = self.api_client.select_header_accept(
8935+
['application/json']) # noqa: E501
8936+
8937+
# HTTP header `Content-Type`
8938+
header_params['Content-Type'] = self.api_client.select_header_content_type( # noqa: E501
8939+
['text/plain']) # noqa: E501
8940+
8941+
# Authentication setting
8942+
auth_settings = ['volcengineSign'] # noqa: E501
8943+
8944+
return self.api_client.call_api(
8945+
'/RepairImage/2020-04-01/ecs/get/text_plain/', 'GET',
8946+
path_params,
8947+
query_params,
8948+
header_params,
8949+
body=body_params,
8950+
post_params=form_params,
8951+
files=local_var_files,
8952+
response_type='RepairImageResponse', # noqa: E501
8953+
auth_settings=auth_settings,
8954+
async_req=params.get('async_req'),
8955+
_return_http_data_only=params.get('_return_http_data_only'),
8956+
_preload_content=params.get('_preload_content', True),
8957+
_request_timeout=params.get('_request_timeout'),
8958+
collection_formats=collection_formats)
8959+
88638960
def replace_system_volume(self, body, **kwargs): # noqa: E501
88648961
"""replace_system_volume # noqa: E501
88658962

volcenginesdkecs/models/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
from volcenginesdkecs.models.gpu_for_describe_spot_advice_input import GpuForDescribeSpotAdviceInput
188188
from volcenginesdkecs.models.hpc_cluster_for_describe_hpc_clusters_output import HpcClusterForDescribeHpcClustersOutput
189189
from volcenginesdkecs.models.image_for_describe_images_output import ImageForDescribeImagesOutput
190+
from volcenginesdkecs.models.import_data_volume_for_import_image_input import ImportDataVolumeForImportImageInput
190191
from volcenginesdkecs.models.import_image_request import ImportImageRequest
191192
from volcenginesdkecs.models.import_image_response import ImportImageResponse
192193
from volcenginesdkecs.models.import_key_pair_request import ImportKeyPairRequest
@@ -285,6 +286,8 @@
285286
from volcenginesdkecs.models.renew_dedicated_host_response import RenewDedicatedHostResponse
286287
from volcenginesdkecs.models.renew_instance_request import RenewInstanceRequest
287288
from volcenginesdkecs.models.renew_instance_response import RenewInstanceResponse
289+
from volcenginesdkecs.models.repair_image_request import RepairImageRequest
290+
from volcenginesdkecs.models.repair_image_response import RepairImageResponse
288291
from volcenginesdkecs.models.replace_system_volume_request import ReplaceSystemVolumeRequest
289292
from volcenginesdkecs.models.replace_system_volume_response import ReplaceSystemVolumeResponse
290293
from volcenginesdkecs.models.reserved_instance_for_describe_reserved_instances_output import ReservedInstanceForDescribeReservedInstancesOutput
@@ -353,6 +356,7 @@
353356
from volcenginesdkecs.models.upgrade_cloud_assistants_response import UpgradeCloudAssistantsResponse
354357
from volcenginesdkecs.models.volume_for_create_scheduled_instances_input import VolumeForCreateScheduledInstancesInput
355358
from volcenginesdkecs.models.volume_for_describe_instance_types_output import VolumeForDescribeInstanceTypesOutput
359+
from volcenginesdkecs.models.volume_for_describe_instances_output import VolumeForDescribeInstancesOutput
356360
from volcenginesdkecs.models.volume_for_describe_scheduled_instances_output import VolumeForDescribeScheduledInstancesOutput
357361
from volcenginesdkecs.models.volume_for_run_instances_input import VolumeForRunInstancesInput
358362
from volcenginesdkecs.models.zone_for_describe_zones_output import ZoneForDescribeZonesOutput

volcenginesdkecs/models/create_scheduled_instances_request.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class CreateScheduledInstancesRequest(object):
3737
'client_token': 'str',
3838
'count': 'int',
3939
'cpu_max_frequency': 'float',
40+
'deletion_protection': 'bool',
4041
'delivery_type': 'str',
4142
'description': 'str',
4243
'dry_run': 'bool',
@@ -72,6 +73,7 @@ class CreateScheduledInstancesRequest(object):
7273
'client_token': 'ClientToken',
7374
'count': 'Count',
7475
'cpu_max_frequency': 'CpuMaxFrequency',
76+
'deletion_protection': 'DeletionProtection',
7577
'delivery_type': 'DeliveryType',
7678
'description': 'Description',
7779
'dry_run': 'DryRun',
@@ -102,7 +104,7 @@ class CreateScheduledInstancesRequest(object):
102104
'zone_id': 'ZoneId'
103105
}
104106

105-
def __init__(self, auto_release_at=None, client_token=None, count=None, cpu_max_frequency=None, delivery_type=None, description=None, dry_run=None, eip_address=None, elastic_scheduled_instance_type=None, end_delivery_at=None, hostname=None, hpc_cluster_id=None, image_id=None, install_run_command_agent=None, instance_name=None, instance_type_id=None, keep_image_credential=None, key_pair_name=None, min_count=None, network_interfaces=None, password=None, project_name=None, scheduled_instance_description=None, scheduled_instance_name=None, security_enhancement_strategy=None, start_delivery_at=None, suffix_index=None, tags=None, unique_suffix=None, user_data=None, volumes=None, zone_id=None, _configuration=None): # noqa: E501
107+
def __init__(self, auto_release_at=None, client_token=None, count=None, cpu_max_frequency=None, deletion_protection=None, delivery_type=None, description=None, dry_run=None, eip_address=None, elastic_scheduled_instance_type=None, end_delivery_at=None, hostname=None, hpc_cluster_id=None, image_id=None, install_run_command_agent=None, instance_name=None, instance_type_id=None, keep_image_credential=None, key_pair_name=None, min_count=None, network_interfaces=None, password=None, project_name=None, scheduled_instance_description=None, scheduled_instance_name=None, security_enhancement_strategy=None, start_delivery_at=None, suffix_index=None, tags=None, unique_suffix=None, user_data=None, volumes=None, zone_id=None, _configuration=None): # noqa: E501
106108
"""CreateScheduledInstancesRequest - a model defined in Swagger""" # noqa: E501
107109
if _configuration is None:
108110
_configuration = Configuration()
@@ -112,6 +114,7 @@ def __init__(self, auto_release_at=None, client_token=None, count=None, cpu_max_
112114
self._client_token = None
113115
self._count = None
114116
self._cpu_max_frequency = None
117+
self._deletion_protection = None
115118
self._delivery_type = None
116119
self._description = None
117120
self._dry_run = None
@@ -150,6 +153,8 @@ def __init__(self, auto_release_at=None, client_token=None, count=None, cpu_max_
150153
self.count = count
151154
if cpu_max_frequency is not None:
152155
self.cpu_max_frequency = cpu_max_frequency
156+
if deletion_protection is not None:
157+
self.deletion_protection = deletion_protection
153158
if delivery_type is not None:
154159
self.delivery_type = delivery_type
155160
if description is not None:
@@ -286,6 +291,27 @@ def cpu_max_frequency(self, cpu_max_frequency):
286291

287292
self._cpu_max_frequency = cpu_max_frequency
288293

294+
@property
295+
def deletion_protection(self):
296+
"""Gets the deletion_protection of this CreateScheduledInstancesRequest. # noqa: E501
297+
298+
299+
:return: The deletion_protection of this CreateScheduledInstancesRequest. # noqa: E501
300+
:rtype: bool
301+
"""
302+
return self._deletion_protection
303+
304+
@deletion_protection.setter
305+
def deletion_protection(self, deletion_protection):
306+
"""Sets the deletion_protection of this CreateScheduledInstancesRequest.
307+
308+
309+
:param deletion_protection: The deletion_protection of this CreateScheduledInstancesRequest. # noqa: E501
310+
:type: bool
311+
"""
312+
313+
self._deletion_protection = deletion_protection
314+
289315
@property
290316
def delivery_type(self):
291317
"""Gets the delivery_type of this CreateScheduledInstancesRequest. # noqa: E501

volcenginesdkecs/models/describe_instances_request.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class DescribeInstancesRequest(object):
3333
and the value is json key in definition.
3434
"""
3535
swagger_types = {
36+
'affinity_group_ids': 'list[str]',
3637
'dedicated_host_cluster_id': 'str',
3738
'dedicated_host_id': 'str',
3839
'deployment_set_group_numbers': 'list[int]',
@@ -59,6 +60,7 @@ class DescribeInstancesRequest(object):
5960
}
6061

6162
attribute_map = {
63+
'affinity_group_ids': 'AffinityGroupIds',
6264
'dedicated_host_cluster_id': 'DedicatedHostClusterId',
6365
'dedicated_host_id': 'DedicatedHostId',
6466
'deployment_set_group_numbers': 'DeploymentSetGroupNumbers',
@@ -84,12 +86,13 @@ class DescribeInstancesRequest(object):
8486
'zone_id': 'ZoneId'
8587
}
8688

87-
def __init__(self, dedicated_host_cluster_id=None, dedicated_host_id=None, deployment_set_group_numbers=None, deployment_set_ids=None, eip_addresses=None, hpc_cluster_id=None, instance_charge_type=None, instance_ids=None, instance_name=None, instance_type_families=None, instance_type_ids=None, instance_types=None, ipv6_addresses=None, key_pair_name=None, max_results=None, next_token=None, primary_ip_address=None, project_name=None, scheduled_instance_id=None, status=None, tag_filters=None, vpc_id=None, zone_id=None, _configuration=None): # noqa: E501
89+
def __init__(self, affinity_group_ids=None, dedicated_host_cluster_id=None, dedicated_host_id=None, deployment_set_group_numbers=None, deployment_set_ids=None, eip_addresses=None, hpc_cluster_id=None, instance_charge_type=None, instance_ids=None, instance_name=None, instance_type_families=None, instance_type_ids=None, instance_types=None, ipv6_addresses=None, key_pair_name=None, max_results=None, next_token=None, primary_ip_address=None, project_name=None, scheduled_instance_id=None, status=None, tag_filters=None, vpc_id=None, zone_id=None, _configuration=None): # noqa: E501
8890
"""DescribeInstancesRequest - a model defined in Swagger""" # noqa: E501
8991
if _configuration is None:
9092
_configuration = Configuration()
9193
self._configuration = _configuration
9294

95+
self._affinity_group_ids = None
9396
self._dedicated_host_cluster_id = None
9497
self._dedicated_host_id = None
9598
self._deployment_set_group_numbers = None
@@ -115,6 +118,8 @@ def __init__(self, dedicated_host_cluster_id=None, dedicated_host_id=None, deplo
115118
self._zone_id = None
116119
self.discriminator = None
117120

121+
if affinity_group_ids is not None:
122+
self.affinity_group_ids = affinity_group_ids
118123
if dedicated_host_cluster_id is not None:
119124
self.dedicated_host_cluster_id = dedicated_host_cluster_id
120125
if dedicated_host_id is not None:
@@ -162,6 +167,27 @@ def __init__(self, dedicated_host_cluster_id=None, dedicated_host_id=None, deplo
162167
if zone_id is not None:
163168
self.zone_id = zone_id
164169

170+
@property
171+
def affinity_group_ids(self):
172+
"""Gets the affinity_group_ids of this DescribeInstancesRequest. # noqa: E501
173+
174+
175+
:return: The affinity_group_ids of this DescribeInstancesRequest. # noqa: E501
176+
:rtype: list[str]
177+
"""
178+
return self._affinity_group_ids
179+
180+
@affinity_group_ids.setter
181+
def affinity_group_ids(self, affinity_group_ids):
182+
"""Sets the affinity_group_ids of this DescribeInstancesRequest.
183+
184+
185+
:param affinity_group_ids: The affinity_group_ids of this DescribeInstancesRequest. # noqa: E501
186+
:type: list[str]
187+
"""
188+
189+
self._affinity_group_ids = affinity_group_ids
190+
165191
@property
166192
def dedicated_host_cluster_id(self):
167193
"""Gets the dedicated_host_cluster_id of this DescribeInstancesRequest. # noqa: E501

0 commit comments

Comments
 (0)