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

Author: BitsAdmin

volcenginesdkecs/.DS_Store

@@ -191,6 +191,7 @@
 from volcenginesdkecs.models.gpu_for_describe_spot_advice_input import GpuForDescribeSpotAdviceInput
 from volcenginesdkecs.models.hpc_cluster_for_describe_hpc_clusters_output import HpcClusterForDescribeHpcClustersOutput
 from volcenginesdkecs.models.image_for_describe_images_output import ImageForDescribeImagesOutput
+from volcenginesdkecs.models.import_data_volume_for_import_image_input import ImportDataVolumeForImportImageInput
 from volcenginesdkecs.models.import_image_request import ImportImageRequest
 from volcenginesdkecs.models.import_image_response import ImportImageResponse
 from volcenginesdkecs.models.import_key_pair_request import ImportKeyPairRequest
@@ -289,6 +290,8 @@
 from volcenginesdkecs.models.renew_dedicated_host_response import RenewDedicatedHostResponse
 from volcenginesdkecs.models.renew_instance_request import RenewInstanceRequest
 from volcenginesdkecs.models.renew_instance_response import RenewInstanceResponse
+from volcenginesdkecs.models.repair_image_request import RepairImageRequest
+from volcenginesdkecs.models.repair_image_response import RepairImageResponse
 from volcenginesdkecs.models.replace_system_volume_request import ReplaceSystemVolumeRequest
 from volcenginesdkecs.models.replace_system_volume_response import ReplaceSystemVolumeResponse
 from volcenginesdkecs.models.reserved_instance_for_describe_reserved_instances_output import ReservedInstanceForDescribeReservedInstancesOutput
@@ -357,6 +360,7 @@
 from volcenginesdkecs.models.upgrade_cloud_assistants_response import UpgradeCloudAssistantsResponse
 from volcenginesdkecs.models.volume_for_create_scheduled_instances_input import VolumeForCreateScheduledInstancesInput
 from volcenginesdkecs.models.volume_for_describe_instance_types_output import VolumeForDescribeInstanceTypesOutput
+from volcenginesdkecs.models.volume_for_describe_instances_output import VolumeForDescribeInstancesOutput
 from volcenginesdkecs.models.volume_for_describe_scheduled_instances_output import VolumeForDescribeScheduledInstancesOutput
 from volcenginesdkecs.models.volume_for_run_instances_input import VolumeForRunInstancesInput
 from volcenginesdkecs.models.zone_for_describe_zones_output import ZoneForDescribeZonesOutput

volcenginesdkecs/__init__.py

@@ -8860,6 +8860,103 @@ def renew_instance_with_http_info(self, body, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
+    def repair_image(self, body, **kwargs):  # noqa: E501
+        """repair_image  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.repair_image(body, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param RepairImageRequest body: (required)
+        :return: RepairImageResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+        kwargs['_return_http_data_only'] = True
+        if kwargs.get('async_req'):
+            return self.repair_image_with_http_info(body, **kwargs)  # noqa: E501
+        else:
+            (data) = self.repair_image_with_http_info(body, **kwargs)  # noqa: E501
+            return data
+
+    def repair_image_with_http_info(self, body, **kwargs):  # noqa: E501
+        """repair_image  # noqa: E501
+
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+        >>> thread = api.repair_image_with_http_info(body, async_req=True)
+        >>> result = thread.get()
+
+        :param async_req bool
+        :param RepairImageRequest body: (required)
+        :return: RepairImageResponse
+                 If the method is called asynchronously,
+                 returns the request thread.
+        """
+
+        all_params = ['body']  # noqa: E501
+        all_params.append('async_req')
+        all_params.append('_return_http_data_only')
+        all_params.append('_preload_content')
+        all_params.append('_request_timeout')
+
+        params = locals()
+        for key, val in six.iteritems(params['kwargs']):
+            if key not in all_params:
+                raise TypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method repair_image" % key
+                )
+            params[key] = val
+        del params['kwargs']
+        # verify the required parameter 'body' is set
+        if self.api_client.client_side_validation and ('body' not in params or
+                                                       params['body'] is None):  # noqa: E501
+            raise ValueError("Missing the required parameter `body` when calling `repair_image`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'body' in params:
+            body_params = params['body']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['application/json'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['text/plain'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = ['volcengineSign']  # noqa: E501
+
+        return self.api_client.call_api(
+            '/RepairImage/2020-04-01/ecs/get/text_plain/', 'GET',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_type='RepairImageResponse',  # noqa: E501
+            auth_settings=auth_settings,
+            async_req=params.get('async_req'),
+            _return_http_data_only=params.get('_return_http_data_only'),
+            _preload_content=params.get('_preload_content', True),
+            _request_timeout=params.get('_request_timeout'),
+            collection_formats=collection_formats)
+
     def replace_system_volume(self, body, **kwargs):  # noqa: E501
         """replace_system_volume  # noqa: E501
 

volcenginesdkecs/api/ecs_api.py

@@ -187,6 +187,7 @@
 from volcenginesdkecs.models.gpu_for_describe_spot_advice_input import GpuForDescribeSpotAdviceInput
 from volcenginesdkecs.models.hpc_cluster_for_describe_hpc_clusters_output import HpcClusterForDescribeHpcClustersOutput
 from volcenginesdkecs.models.image_for_describe_images_output import ImageForDescribeImagesOutput
+from volcenginesdkecs.models.import_data_volume_for_import_image_input import ImportDataVolumeForImportImageInput
 from volcenginesdkecs.models.import_image_request import ImportImageRequest
 from volcenginesdkecs.models.import_image_response import ImportImageResponse
 from volcenginesdkecs.models.import_key_pair_request import ImportKeyPairRequest
@@ -285,6 +286,8 @@
 from volcenginesdkecs.models.renew_dedicated_host_response import RenewDedicatedHostResponse
 from volcenginesdkecs.models.renew_instance_request import RenewInstanceRequest
 from volcenginesdkecs.models.renew_instance_response import RenewInstanceResponse
+from volcenginesdkecs.models.repair_image_request import RepairImageRequest
+from volcenginesdkecs.models.repair_image_response import RepairImageResponse
 from volcenginesdkecs.models.replace_system_volume_request import ReplaceSystemVolumeRequest
 from volcenginesdkecs.models.replace_system_volume_response import ReplaceSystemVolumeResponse
 from volcenginesdkecs.models.reserved_instance_for_describe_reserved_instances_output import ReservedInstanceForDescribeReservedInstancesOutput
@@ -353,6 +356,7 @@
 from volcenginesdkecs.models.upgrade_cloud_assistants_response import UpgradeCloudAssistantsResponse
 from volcenginesdkecs.models.volume_for_create_scheduled_instances_input import VolumeForCreateScheduledInstancesInput
 from volcenginesdkecs.models.volume_for_describe_instance_types_output import VolumeForDescribeInstanceTypesOutput
+from volcenginesdkecs.models.volume_for_describe_instances_output import VolumeForDescribeInstancesOutput
 from volcenginesdkecs.models.volume_for_describe_scheduled_instances_output import VolumeForDescribeScheduledInstancesOutput
 from volcenginesdkecs.models.volume_for_run_instances_input import VolumeForRunInstancesInput
 from volcenginesdkecs.models.zone_for_describe_zones_output import ZoneForDescribeZonesOutput

volcenginesdkecs/models/__init__.py

@@ -37,6 +37,7 @@ class CreateScheduledInstancesRequest(object):
         'client_token': 'str',
         'count': 'int',
         'cpu_max_frequency': 'float',
+        'deletion_protection': 'bool',
         'delivery_type': 'str',
         'description': 'str',
         'dry_run': 'bool',
@@ -72,6 +73,7 @@ class CreateScheduledInstancesRequest(object):
         'client_token': 'ClientToken',
         'count': 'Count',
         'cpu_max_frequency': 'CpuMaxFrequency',
+        'deletion_protection': 'DeletionProtection',
         'delivery_type': 'DeliveryType',
         'description': 'Description',
         'dry_run': 'DryRun',
@@ -102,7 +104,7 @@ class CreateScheduledInstancesRequest(object):
         'zone_id': 'ZoneId'
     }
 
-    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
+    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
         """CreateScheduledInstancesRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -112,6 +114,7 @@ def __init__(self, auto_release_at=None, client_token=None, count=None, cpu_max_
         self._client_token = None
         self._count = None
         self._cpu_max_frequency = None
+        self._deletion_protection = None
         self._delivery_type = None
         self._description = None
         self._dry_run = None
@@ -150,6 +153,8 @@ def __init__(self, auto_release_at=None, client_token=None, count=None, cpu_max_
             self.count = count
         if cpu_max_frequency is not None:
             self.cpu_max_frequency = cpu_max_frequency
+        if deletion_protection is not None:
+            self.deletion_protection = deletion_protection
         if delivery_type is not None:
             self.delivery_type = delivery_type
         if description is not None:
@@ -286,6 +291,27 @@ def cpu_max_frequency(self, cpu_max_frequency):
 
         self._cpu_max_frequency = cpu_max_frequency
 
+    @property
+    def deletion_protection(self):
+        """Gets the deletion_protection of this CreateScheduledInstancesRequest.  # noqa: E501
+
+
+        :return: The deletion_protection of this CreateScheduledInstancesRequest.  # noqa: E501
+        :rtype: bool
+        """
+        return self._deletion_protection
+
+    @deletion_protection.setter
+    def deletion_protection(self, deletion_protection):
+        """Sets the deletion_protection of this CreateScheduledInstancesRequest.
+
+
+        :param deletion_protection: The deletion_protection of this CreateScheduledInstancesRequest.  # noqa: E501
+        :type: bool
+        """
+
+        self._deletion_protection = deletion_protection
+
     @property
     def delivery_type(self):
         """Gets the delivery_type of this CreateScheduledInstancesRequest.  # noqa: E501

volcenginesdkecs/models/create_scheduled_instances_request.py

@@ -33,6 +33,7 @@ class DescribeInstancesRequest(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'affinity_group_ids': 'list[str]',
         'dedicated_host_cluster_id': 'str',
         'dedicated_host_id': 'str',
         'deployment_set_group_numbers': 'list[int]',
@@ -59,6 +60,7 @@ class DescribeInstancesRequest(object):
     }
 
     attribute_map = {
+        'affinity_group_ids': 'AffinityGroupIds',
         'dedicated_host_cluster_id': 'DedicatedHostClusterId',
         'dedicated_host_id': 'DedicatedHostId',
         'deployment_set_group_numbers': 'DeploymentSetGroupNumbers',
@@ -84,12 +86,13 @@ class DescribeInstancesRequest(object):
         'zone_id': 'ZoneId'
     }
 
-    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
+    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
         """DescribeInstancesRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._affinity_group_ids = None
         self._dedicated_host_cluster_id = None
         self._dedicated_host_id = None
         self._deployment_set_group_numbers = None
@@ -115,6 +118,8 @@ def __init__(self, dedicated_host_cluster_id=None, dedicated_host_id=None, deplo
         self._zone_id = None
         self.discriminator = None
 
+        if affinity_group_ids is not None:
+            self.affinity_group_ids = affinity_group_ids
         if dedicated_host_cluster_id is not None:
             self.dedicated_host_cluster_id = dedicated_host_cluster_id
         if dedicated_host_id is not None:
@@ -162,6 +167,27 @@ def __init__(self, dedicated_host_cluster_id=None, dedicated_host_id=None, deplo
         if zone_id is not None:
             self.zone_id = zone_id
 
+    @property
+    def affinity_group_ids(self):
+        """Gets the affinity_group_ids of this DescribeInstancesRequest.  # noqa: E501
+
+
+        :return: The affinity_group_ids of this DescribeInstancesRequest.  # noqa: E501
+        :rtype: list[str]
+        """
+        return self._affinity_group_ids
+
+    @affinity_group_ids.setter
+    def affinity_group_ids(self, affinity_group_ids):
+        """Sets the affinity_group_ids of this DescribeInstancesRequest.
+
+
+        :param affinity_group_ids: The affinity_group_ids of this DescribeInstancesRequest.  # noqa: E501
+        :type: list[str]
+        """
+
+        self._affinity_group_ids = affinity_group_ids
+
     @property
     def dedicated_host_cluster_id(self):
         """Gets the dedicated_host_cluster_id of this DescribeInstancesRequest.  # noqa: E501