Merge 'filenas-Python-2022-01-01-online-2428-2026_03_26_16_31_47' into 'integration_2026-04-02_1133150144002'

feat: [development task] FileNAS-2428-Python (2246478)

See merge request: !1130

Author: BitsAdmin

volcenginesdkfilenas/__init__.py

@@ -43,8 +43,6 @@
 from volcenginesdkfilenas.models.create_permission_group_response import CreatePermissionGroupResponse
 from volcenginesdkfilenas.models.create_pre_signed_url_request import CreatePreSignedUrlRequest
 from volcenginesdkfilenas.models.create_pre_signed_url_response import CreatePreSignedUrlResponse
-from volcenginesdkfilenas.models.create_reserved_capacity_request import CreateReservedCapacityRequest
-from volcenginesdkfilenas.models.create_reserved_capacity_response import CreateReservedCapacityResponse
 from volcenginesdkfilenas.models.create_snapshot_request import CreateSnapshotRequest
 from volcenginesdkfilenas.models.create_snapshot_response import CreateSnapshotResponse
 from volcenginesdkfilenas.models.data_flow_for_describe_data_flows_output import DataFlowForDescribeDataFlowsOutput
@@ -61,6 +59,10 @@
 from volcenginesdkfilenas.models.delete_mount_point_response import DeleteMountPointResponse
 from volcenginesdkfilenas.models.delete_permission_group_request import DeletePermissionGroupRequest
 from volcenginesdkfilenas.models.delete_permission_group_response import DeletePermissionGroupResponse
+from volcenginesdkfilenas.models.delete_policy_for_create_data_flow_task_input import DeletePolicyForCreateDataFlowTaskInput
+from volcenginesdkfilenas.models.delete_policy_for_describe_data_flow_tasks_output import DeletePolicyForDescribeDataFlowTasksOutput
+from volcenginesdkfilenas.models.delete_rule_info_for_create_data_flow_task_input import DeleteRuleInfoForCreateDataFlowTaskInput
+from volcenginesdkfilenas.models.delete_rule_info_for_describe_data_flow_tasks_output import DeleteRuleInfoForDescribeDataFlowTasksOutput
 from volcenginesdkfilenas.models.delete_snapshot_request import DeleteSnapshotRequest
 from volcenginesdkfilenas.models.delete_snapshot_response import DeleteSnapshotResponse
 from volcenginesdkfilenas.models.describe_access_points_request import DescribeAccessPointsRequest
@@ -87,8 +89,6 @@
 from volcenginesdkfilenas.models.describe_permission_rules_response import DescribePermissionRulesResponse
 from volcenginesdkfilenas.models.describe_regions_request import DescribeRegionsRequest
 from volcenginesdkfilenas.models.describe_regions_response import DescribeRegionsResponse
-from volcenginesdkfilenas.models.describe_reserved_capacitys_request import DescribeReservedCapacitysRequest
-from volcenginesdkfilenas.models.describe_reserved_capacitys_response import DescribeReservedCapacitysResponse
 from volcenginesdkfilenas.models.describe_snapshots_request import DescribeSnapshotsRequest
 from volcenginesdkfilenas.models.describe_snapshots_response import DescribeSnapshotsResponse
 from volcenginesdkfilenas.models.describe_zones_request import DescribeZonesRequest
@@ -143,7 +143,6 @@
 from volcenginesdkfilenas.models.posix_user_for_create_access_point_input import PosixUserForCreateAccessPointInput
 from volcenginesdkfilenas.models.posix_user_for_describe_access_points_output import PosixUserForDescribeAccessPointsOutput
 from volcenginesdkfilenas.models.region_for_describe_regions_output import RegionForDescribeRegionsOutput
-from volcenginesdkfilenas.models.reserved_capacity_for_describe_reserved_capacitys_output import ReservedCapacityForDescribeReservedCapacitysOutput
 from volcenginesdkfilenas.models.root_path_permission_for_create_access_point_input import RootPathPermissionForCreateAccessPointInput
 from volcenginesdkfilenas.models.root_path_permission_for_describe_access_points_output import RootPathPermissionForDescribeAccessPointsOutput
 from volcenginesdkfilenas.models.sale_for_describe_zones_output import SaleForDescribeZonesOutput

volcenginesdkfilenas/api/filenas_api.py

@@ -906,103 +906,6 @@ def create_pre_signed_url_with_http_info(self, body, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def create_reserved_capacity(self, body, **kwargs):  # noqa: E501
-        """create_reserved_capacity  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_reserved_capacity(body, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param CreateReservedCapacityRequest body: (required)
-        :return: CreateReservedCapacityResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.create_reserved_capacity_with_http_info(body, **kwargs)  # noqa: E501
-        else:
-            (data) = self.create_reserved_capacity_with_http_info(body, **kwargs)  # noqa: E501
-            return data
-
-    def create_reserved_capacity_with_http_info(self, body, **kwargs):  # noqa: E501
-        """create_reserved_capacity  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.create_reserved_capacity_with_http_info(body, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param CreateReservedCapacityRequest body: (required)
-        :return: CreateReservedCapacityResponse
-                 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 create_reserved_capacity" % 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 `create_reserved_capacity`")  # 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
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['volcengineSign']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/CreateReservedCapacity/2022-01-01/filenas/post/application_json/', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='CreateReservedCapacityResponse',  # 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 create_snapshot(self, body, **kwargs):  # noqa: E501
         """create_snapshot  # noqa: E501
 
@@ -2943,103 +2846,6 @@ def describe_regions_with_http_info(self, body, **kwargs):  # noqa: E501
             _request_timeout=params.get('_request_timeout'),
             collection_formats=collection_formats)
 
-    def describe_reserved_capacitys(self, body, **kwargs):  # noqa: E501
-        """describe_reserved_capacitys  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.describe_reserved_capacitys(body, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param DescribeReservedCapacitysRequest body: (required)
-        :return: DescribeReservedCapacitysResponse
-                 If the method is called asynchronously,
-                 returns the request thread.
-        """
-        kwargs['_return_http_data_only'] = True
-        if kwargs.get('async_req'):
-            return self.describe_reserved_capacitys_with_http_info(body, **kwargs)  # noqa: E501
-        else:
-            (data) = self.describe_reserved_capacitys_with_http_info(body, **kwargs)  # noqa: E501
-            return data
-
-    def describe_reserved_capacitys_with_http_info(self, body, **kwargs):  # noqa: E501
-        """describe_reserved_capacitys  # noqa: E501
-
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-        >>> thread = api.describe_reserved_capacitys_with_http_info(body, async_req=True)
-        >>> result = thread.get()
-
-        :param async_req bool
-        :param DescribeReservedCapacitysRequest body: (required)
-        :return: DescribeReservedCapacitysResponse
-                 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 describe_reserved_capacitys" % 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 `describe_reserved_capacitys`")  # 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
-            ['application/json'])  # noqa: E501
-
-        # Authentication setting
-        auth_settings = ['volcengineSign']  # noqa: E501
-
-        return self.api_client.call_api(
-            '/DescribeReservedCapacitys/2022-01-01/filenas/post/application_json/', 'POST',
-            path_params,
-            query_params,
-            header_params,
-            body=body_params,
-            post_params=form_params,
-            files=local_var_files,
-            response_type='DescribeReservedCapacitysResponse',  # 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 describe_snapshots(self, body, **kwargs):  # noqa: E501
         """describe_snapshots  # noqa: E501
 

volcenginesdkfilenas/models/__init__.py

@@ -39,8 +39,6 @@
 from volcenginesdkfilenas.models.create_permission_group_response import CreatePermissionGroupResponse
 from volcenginesdkfilenas.models.create_pre_signed_url_request import CreatePreSignedUrlRequest
 from volcenginesdkfilenas.models.create_pre_signed_url_response import CreatePreSignedUrlResponse
-from volcenginesdkfilenas.models.create_reserved_capacity_request import CreateReservedCapacityRequest
-from volcenginesdkfilenas.models.create_reserved_capacity_response import CreateReservedCapacityResponse
 from volcenginesdkfilenas.models.create_snapshot_request import CreateSnapshotRequest
 from volcenginesdkfilenas.models.create_snapshot_response import CreateSnapshotResponse
 from volcenginesdkfilenas.models.data_flow_for_describe_data_flows_output import DataFlowForDescribeDataFlowsOutput
@@ -57,6 +55,10 @@
 from volcenginesdkfilenas.models.delete_mount_point_response import DeleteMountPointResponse
 from volcenginesdkfilenas.models.delete_permission_group_request import DeletePermissionGroupRequest
 from volcenginesdkfilenas.models.delete_permission_group_response import DeletePermissionGroupResponse
+from volcenginesdkfilenas.models.delete_policy_for_create_data_flow_task_input import DeletePolicyForCreateDataFlowTaskInput
+from volcenginesdkfilenas.models.delete_policy_for_describe_data_flow_tasks_output import DeletePolicyForDescribeDataFlowTasksOutput
+from volcenginesdkfilenas.models.delete_rule_info_for_create_data_flow_task_input import DeleteRuleInfoForCreateDataFlowTaskInput
+from volcenginesdkfilenas.models.delete_rule_info_for_describe_data_flow_tasks_output import DeleteRuleInfoForDescribeDataFlowTasksOutput
 from volcenginesdkfilenas.models.delete_snapshot_request import DeleteSnapshotRequest
 from volcenginesdkfilenas.models.delete_snapshot_response import DeleteSnapshotResponse
 from volcenginesdkfilenas.models.describe_access_points_request import DescribeAccessPointsRequest
@@ -83,8 +85,6 @@
 from volcenginesdkfilenas.models.describe_permission_rules_response import DescribePermissionRulesResponse
 from volcenginesdkfilenas.models.describe_regions_request import DescribeRegionsRequest
 from volcenginesdkfilenas.models.describe_regions_response import DescribeRegionsResponse
-from volcenginesdkfilenas.models.describe_reserved_capacitys_request import DescribeReservedCapacitysRequest
-from volcenginesdkfilenas.models.describe_reserved_capacitys_response import DescribeReservedCapacitysResponse
 from volcenginesdkfilenas.models.describe_snapshots_request import DescribeSnapshotsRequest
 from volcenginesdkfilenas.models.describe_snapshots_response import DescribeSnapshotsResponse
 from volcenginesdkfilenas.models.describe_zones_request import DescribeZonesRequest
@@ -139,7 +139,6 @@
 from volcenginesdkfilenas.models.posix_user_for_create_access_point_input import PosixUserForCreateAccessPointInput
 from volcenginesdkfilenas.models.posix_user_for_describe_access_points_output import PosixUserForDescribeAccessPointsOutput
 from volcenginesdkfilenas.models.region_for_describe_regions_output import RegionForDescribeRegionsOutput
-from volcenginesdkfilenas.models.reserved_capacity_for_describe_reserved_capacitys_output import ReservedCapacityForDescribeReservedCapacitysOutput
 from volcenginesdkfilenas.models.root_path_permission_for_create_access_point_input import RootPathPermissionForCreateAccessPointInput
 from volcenginesdkfilenas.models.root_path_permission_for_describe_access_points_output import RootPathPermissionForDescribeAccessPointsOutput
 from volcenginesdkfilenas.models.sale_for_describe_zones_output import SaleForDescribeZonesOutput

volcenginesdkfilenas/models/create_data_flow_task_request.py

@@ -36,6 +36,7 @@ class CreateDataFlowTaskRequest(object):
         'bucket_name': 'str',
         'bucket_prefix': 'str',
         'data_flow_id': 'str',
+        'delete_policy': 'DeletePolicyForCreateDataFlowTaskInput',
         'entry_list_file_bucket': 'str',
         'entry_list_file_key': 'str',
         'entry_list_file_name': 'str',
@@ -53,6 +54,7 @@ class CreateDataFlowTaskRequest(object):
         'bucket_name': 'BucketName',
         'bucket_prefix': 'BucketPrefix',
         'data_flow_id': 'DataFlowId',
+        'delete_policy': 'DeletePolicy',
         'entry_list_file_bucket': 'EntryListFileBucket',
         'entry_list_file_key': 'EntryListFileKey',
         'entry_list_file_name': 'EntryListFileName',
@@ -66,7 +68,7 @@ class CreateDataFlowTaskRequest(object):
         'type': 'Type'
     }
 
-    def __init__(self, bucket_name=None, bucket_prefix=None, data_flow_id=None, entry_list_file_bucket=None, entry_list_file_key=None, entry_list_file_name=None, evict_policy=None, export_policy=None, file_system_id=None, file_system_path=None, import_policy=None, same_name_file_policy=None, src_id=None, type=None, _configuration=None):  # noqa: E501
+    def __init__(self, bucket_name=None, bucket_prefix=None, data_flow_id=None, delete_policy=None, entry_list_file_bucket=None, entry_list_file_key=None, entry_list_file_name=None, evict_policy=None, export_policy=None, file_system_id=None, file_system_path=None, import_policy=None, same_name_file_policy=None, src_id=None, type=None, _configuration=None):  # noqa: E501
         """CreateDataFlowTaskRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -75,6 +77,7 @@ def __init__(self, bucket_name=None, bucket_prefix=None, data_flow_id=None, entr
         self._bucket_name = None
         self._bucket_prefix = None
         self._data_flow_id = None
+        self._delete_policy = None
         self._entry_list_file_bucket = None
         self._entry_list_file_key = None
         self._entry_list_file_name = None
@@ -94,6 +97,8 @@ def __init__(self, bucket_name=None, bucket_prefix=None, data_flow_id=None, entr
             self.bucket_prefix = bucket_prefix
         if data_flow_id is not None:
             self.data_flow_id = data_flow_id
+        if delete_policy is not None:
+            self.delete_policy = delete_policy
         if entry_list_file_bucket is not None:
             self.entry_list_file_bucket = entry_list_file_bucket
         if entry_list_file_key is not None:
@@ -180,6 +185,27 @@ def data_flow_id(self, data_flow_id):
 
         self._data_flow_id = data_flow_id
 
+    @property
+    def delete_policy(self):
+        """Gets the delete_policy of this CreateDataFlowTaskRequest.  # noqa: E501
+
+
+        :return: The delete_policy of this CreateDataFlowTaskRequest.  # noqa: E501
+        :rtype: DeletePolicyForCreateDataFlowTaskInput
+        """
+        return self._delete_policy
+
+    @delete_policy.setter
+    def delete_policy(self, delete_policy):
+        """Sets the delete_policy of this CreateDataFlowTaskRequest.
+
+
+        :param delete_policy: The delete_policy of this CreateDataFlowTaskRequest.  # noqa: E501
+        :type: DeletePolicyForCreateDataFlowTaskInput
+        """
+
+        self._delete_policy = delete_policy
+
     @property
     def entry_list_file_bucket(self):
         """Gets the entry_list_file_bucket of this CreateDataFlowTaskRequest.  # noqa: E501
@@ -415,7 +441,7 @@ def type(self, type):
         :param type: The type of this CreateDataFlowTaskRequest.  # noqa: E501
         :type: str
         """
-        allowed_values = ["Import", "Export", "Evict"]  # noqa: E501
+        allowed_values = ["Import", "Export", "Evict", "Delete"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 type not in allowed_values):
             raise ValueError(