Merge branch 'redis-Python-2020-12-07-online-653-2024_09_14_15_42_58' into 'integration_2024-09-19_444650009346'

feat: [development task] redis-653-python (786054)

See merge request iaasng/volcengine-python-sdk!388

Author: BitsAdmin

meta.json

@@ -1,4 +1,4 @@
 {
-	"lasted": "1.0.101",
-	"meta_commit": "9ca8a0040fd89b4ef1103574282b9660b4932bcc"
+	"lasted": "1.0.102",
+	"meta_commit": "736ef0e470f4f2a067f29a610676d5aab334b10c"
 }

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages  # noqa: H301
 
 NAME = "volcengine-python-sdk"
-VERSION = "1.0.101"
+VERSION = "1.0.102"
 # To install the library, run the following
 #
 # python setup.py install

volcenginesdkcore/api_client.py

@@ -67,7 +67,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'volcstack-python-sdk/1.0.101'
+        self.user_agent = 'volcstack-python-sdk/1.0.102'
         self.client_side_validation = configuration.client_side_validation
 
     def __del__(self):

volcenginesdkcore/configuration.py

@@ -221,5 +221,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 0.1.0\n"\
-               "SDK Package Version: 1.0.101".\
+               "SDK Package Version: 1.0.102".\
                format(env=sys.platform, pyversion=sys.version)

volcenginesdkredis/__init__.py

@@ -102,6 +102,7 @@
 from volcenginesdkredis.models.increase_db_instance_node_number_response import IncreaseDBInstanceNodeNumberResponse
 from volcenginesdkredis.models.instance_detail_for_describe_backups_output import InstanceDetailForDescribeBackupsOutput
 from volcenginesdkredis.models.instance_for_describe_db_instances_output import InstanceForDescribeDBInstancesOutput
+from volcenginesdkredis.models.instance_info_for_describe_backups_output import InstanceInfoForDescribeBackupsOutput
 from volcenginesdkredis.models.instance_shard_for_describe_db_instance_shards_output import InstanceShardForDescribeDBInstanceShardsOutput
 from volcenginesdkredis.models.list_db_account_request import ListDBAccountRequest
 from volcenginesdkredis.models.list_db_account_response import ListDBAccountResponse
@@ -149,6 +150,7 @@
 from volcenginesdkredis.models.restore_db_instance_request import RestoreDBInstanceRequest
 from volcenginesdkredis.models.restore_db_instance_response import RestoreDBInstanceResponse
 from volcenginesdkredis.models.server_node_for_describe_db_instance_shards_output import ServerNodeForDescribeDBInstanceShardsOutput
+from volcenginesdkredis.models.shard_list_for_describe_backups_output import ShardListForDescribeBackupsOutput
 from volcenginesdkredis.models.slow_query_for_describe_slow_logs_output import SlowQueryForDescribeSlowLogsOutput
 from volcenginesdkredis.models.start_continuous_backup_request import StartContinuousBackupRequest
 from volcenginesdkredis.models.start_continuous_backup_response import StartContinuousBackupResponse

volcenginesdkredis/models/__init__.py

@@ -98,6 +98,7 @@
 from volcenginesdkredis.models.increase_db_instance_node_number_response import IncreaseDBInstanceNodeNumberResponse
 from volcenginesdkredis.models.instance_detail_for_describe_backups_output import InstanceDetailForDescribeBackupsOutput
 from volcenginesdkredis.models.instance_for_describe_db_instances_output import InstanceForDescribeDBInstancesOutput
+from volcenginesdkredis.models.instance_info_for_describe_backups_output import InstanceInfoForDescribeBackupsOutput
 from volcenginesdkredis.models.instance_shard_for_describe_db_instance_shards_output import InstanceShardForDescribeDBInstanceShardsOutput
 from volcenginesdkredis.models.list_db_account_request import ListDBAccountRequest
 from volcenginesdkredis.models.list_db_account_response import ListDBAccountResponse
@@ -145,6 +146,7 @@
 from volcenginesdkredis.models.restore_db_instance_request import RestoreDBInstanceRequest
 from volcenginesdkredis.models.restore_db_instance_response import RestoreDBInstanceResponse
 from volcenginesdkredis.models.server_node_for_describe_db_instance_shards_output import ServerNodeForDescribeDBInstanceShardsOutput
+from volcenginesdkredis.models.shard_list_for_describe_backups_output import ShardListForDescribeBackupsOutput
 from volcenginesdkredis.models.slow_query_for_describe_slow_logs_output import SlowQueryForDescribeSlowLogsOutput
 from volcenginesdkredis.models.start_continuous_backup_request import StartContinuousBackupRequest
 from volcenginesdkredis.models.start_continuous_backup_response import StartContinuousBackupResponse

volcenginesdkredis/models/backup_for_describe_backups_output.py

@@ -38,8 +38,8 @@ class BackupForDescribeBackupsOutput(object):
         'backup_strategy': 'str',
         'backup_type': 'str',
         'end_time': 'str',
-        'instance_detail': 'InstanceDetailForDescribeBackupsOutput',
         'instance_id': 'str',
+        'instance_info': 'InstanceInfoForDescribeBackupsOutput',
         'project_name': 'str',
         'size': 'int',
         'start_time': 'str',
@@ -53,16 +53,16 @@ class BackupForDescribeBackupsOutput(object):
         'backup_strategy': 'BackupStrategy',
         'backup_type': 'BackupType',
         'end_time': 'EndTime',
-        'instance_detail': 'InstanceDetail',
         'instance_id': 'InstanceId',
+        'instance_info': 'InstanceInfo',
         'project_name': 'ProjectName',
         'size': 'Size',
         'start_time': 'StartTime',
         'status': 'Status',
         'ttl': 'TTL'
     }
 
-    def __init__(self, backup_point_id=None, backup_point_name=None, backup_strategy=None, backup_type=None, end_time=None, instance_detail=None, instance_id=None, project_name=None, size=None, start_time=None, status=None, ttl=None, _configuration=None):  # noqa: E501
+    def __init__(self, backup_point_id=None, backup_point_name=None, backup_strategy=None, backup_type=None, end_time=None, instance_id=None, instance_info=None, project_name=None, size=None, start_time=None, status=None, ttl=None, _configuration=None):  # noqa: E501
         """BackupForDescribeBackupsOutput - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
@@ -73,8 +73,8 @@ def __init__(self, backup_point_id=None, backup_point_name=None, backup_strategy
         self._backup_strategy = None
         self._backup_type = None
         self._end_time = None
-        self._instance_detail = None
         self._instance_id = None
+        self._instance_info = None
         self._project_name = None
         self._size = None
         self._start_time = None
@@ -92,10 +92,10 @@ def __init__(self, backup_point_id=None, backup_point_name=None, backup_strategy
             self.backup_type = backup_type
         if end_time is not None:
             self.end_time = end_time
-        if instance_detail is not None:
-            self.instance_detail = instance_detail
         if instance_id is not None:
             self.instance_id = instance_id
+        if instance_info is not None:
+            self.instance_info = instance_info
         if project_name is not None:
             self.project_name = project_name
         if size is not None:
@@ -212,27 +212,6 @@ def end_time(self, end_time):
 
         self._end_time = end_time
 
-    @property
-    def instance_detail(self):
-        """Gets the instance_detail of this BackupForDescribeBackupsOutput.  # noqa: E501
-
-
-        :return: The instance_detail of this BackupForDescribeBackupsOutput.  # noqa: E501
-        :rtype: InstanceDetailForDescribeBackupsOutput
-        """
-        return self._instance_detail
-
-    @instance_detail.setter
-    def instance_detail(self, instance_detail):
-        """Sets the instance_detail of this BackupForDescribeBackupsOutput.
-
-
-        :param instance_detail: The instance_detail of this BackupForDescribeBackupsOutput.  # noqa: E501
-        :type: InstanceDetailForDescribeBackupsOutput
-        """
-
-        self._instance_detail = instance_detail
-
     @property
     def instance_id(self):
         """Gets the instance_id of this BackupForDescribeBackupsOutput.  # noqa: E501
@@ -254,6 +233,27 @@ def instance_id(self, instance_id):
 
         self._instance_id = instance_id
 
+    @property
+    def instance_info(self):
+        """Gets the instance_info of this BackupForDescribeBackupsOutput.  # noqa: E501
+
+
+        :return: The instance_info of this BackupForDescribeBackupsOutput.  # noqa: E501
+        :rtype: InstanceInfoForDescribeBackupsOutput
+        """
+        return self._instance_info
+
+    @instance_info.setter
+    def instance_info(self, instance_info):
+        """Sets the instance_info of this BackupForDescribeBackupsOutput.
+
+
+        :param instance_info: The instance_info of this BackupForDescribeBackupsOutput.  # noqa: E501
+        :type: InstanceInfoForDescribeBackupsOutput
+        """
+
+        self._instance_info = instance_info
+
     @property
     def project_name(self):
         """Gets the project_name of this BackupForDescribeBackupsOutput.  # noqa: E501

volcenginesdkredis/models/describe_backups_request.py

@@ -33,6 +33,7 @@ class DescribeBackupsRequest(object):
                             and the value is json key in definition.
     """
     swagger_types = {
+        'backup_point_id': 'str',
         'backup_point_name': 'str',
         'backup_strategy_list': 'list[str]',
         'end_time': 'str',
@@ -45,6 +46,7 @@ class DescribeBackupsRequest(object):
     }
 
     attribute_map = {
+        'backup_point_id': 'BackupPointId',
         'backup_point_name': 'BackupPointName',
         'backup_strategy_list': 'BackupStrategyList',
         'end_time': 'EndTime',
@@ -56,12 +58,13 @@ class DescribeBackupsRequest(object):
         'start_time': 'StartTime'
     }
 
-    def __init__(self, backup_point_name=None, backup_strategy_list=None, end_time=None, instance_id=None, page_number=None, page_size=None, project_name=None, scope=None, start_time=None, _configuration=None):  # noqa: E501
+    def __init__(self, backup_point_id=None, backup_point_name=None, backup_strategy_list=None, end_time=None, instance_id=None, page_number=None, page_size=None, project_name=None, scope=None, start_time=None, _configuration=None):  # noqa: E501
         """DescribeBackupsRequest - a model defined in Swagger"""  # noqa: E501
         if _configuration is None:
             _configuration = Configuration()
         self._configuration = _configuration
 
+        self._backup_point_id = None
         self._backup_point_name = None
         self._backup_strategy_list = None
         self._end_time = None
@@ -73,6 +76,8 @@ def __init__(self, backup_point_name=None, backup_strategy_list=None, end_time=N
         self._start_time = None
         self.discriminator = None
 
+        if backup_point_id is not None:
+            self.backup_point_id = backup_point_id
         if backup_point_name is not None:
             self.backup_point_name = backup_point_name
         if backup_strategy_list is not None:
@@ -92,6 +97,27 @@ def __init__(self, backup_point_name=None, backup_strategy_list=None, end_time=N
         if start_time is not None:
             self.start_time = start_time
 
+    @property
+    def backup_point_id(self):
+        """Gets the backup_point_id of this DescribeBackupsRequest.  # noqa: E501
+
+
+        :return: The backup_point_id of this DescribeBackupsRequest.  # noqa: E501
+        :rtype: str
+        """
+        return self._backup_point_id
+
+    @backup_point_id.setter
+    def backup_point_id(self, backup_point_id):
+        """Sets the backup_point_id of this DescribeBackupsRequest.
+
+
+        :param backup_point_id: The backup_point_id of this DescribeBackupsRequest.  # noqa: E501
+        :type: str
+        """
+
+        self._backup_point_id = backup_point_id
+
     @property
     def backup_point_name(self):
         """Gets the backup_point_name of this DescribeBackupsRequest.  # noqa: E501
@@ -257,7 +283,7 @@ def scope(self, scope):
         :param scope: The scope of this DescribeBackupsRequest.  # noqa: E501
         :type: str
         """
-        allowed_values = ["OneInstance", "AccountInstances"]  # noqa: E501
+        allowed_values = ["OneInstance", "DestroyedInstances", "AccountInstances"]  # noqa: E501
         if (self._configuration.client_side_validation and
                 scope not in allowed_values):
             raise ValueError(