From 98b949646c3c0b6f15d139961737f76fec0983d3 Mon Sep 17 00:00:00 2001 From: Christian Rohmann <christian.rohmann@inovex.de> Date: Thu, 3 Aug 2023 16:35:32 +0200 Subject: [PATCH] Add is_incremental to ListVolumeBackup It's of interest which backups are incremental or full. Returning this information as a column to the list of backups. Change-Id: I766330228634d5db678df11c23877077a3635372 --- openstackclient/tests/unit/volume/v2/fakes.py | 1 + .../tests/unit/volume/v2/test_volume_backup.py | 3 +++ openstackclient/volume/v2/volume_backup.py | 18 ++++++++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/openstackclient/tests/unit/volume/v2/fakes.py b/openstackclient/tests/unit/volume/v2/fakes.py index 5f9b9af4a4..a74ecda226 100644 --- a/openstackclient/tests/unit/volume/v2/fakes.py +++ b/openstackclient/tests/unit/volume/v2/fakes.py @@ -520,6 +520,7 @@ def create_one_backup(attrs=None): "object_count": None, "container": 'container-' + uuid.uuid4().hex, "size": random.randint(1, 20), + "is_incremental": False, "status": "error", "availability_zone": 'zone' + uuid.uuid4().hex, } diff --git a/openstackclient/tests/unit/volume/v2/test_volume_backup.py b/openstackclient/tests/unit/volume/v2/test_volume_backup.py index 206fcbe721..e802a75406 100644 --- a/openstackclient/tests/unit/volume/v2/test_volume_backup.py +++ b/openstackclient/tests/unit/volume/v2/test_volume_backup.py @@ -356,6 +356,7 @@ class TestBackupList(TestBackup): 'Description', 'Status', 'Size', + 'Incremental', ) columns_long = columns + ( 'Availability Zone', @@ -372,6 +373,7 @@ class TestBackupList(TestBackup): b.description, b.status, b.size, + b.is_incremental, ) ) data_long = [] @@ -383,6 +385,7 @@ class TestBackupList(TestBackup): b.description, b.status, b.size, + b.is_incremental, b.availability_zone, volume_backup.VolumeIdColumn(b.volume_id), b.container, diff --git a/openstackclient/volume/v2/volume_backup.py b/openstackclient/volume/v2/volume_backup.py index b3f5c250ec..6cacc7fa59 100644 --- a/openstackclient/volume/v2/volume_backup.py +++ b/openstackclient/volume/v2/volume_backup.py @@ -309,8 +309,22 @@ class ListVolumeBackup(command.Lister): def take_action(self, parsed_args): volume_client = self.app.client_manager.sdk_connection.volume - columns = ('id', 'name', 'description', 'status', 'size') - column_headers = ('ID', 'Name', 'Description', 'Status', 'Size') + columns = ( + 'id', + 'name', + 'description', + 'status', + 'size', + 'is_incremental', + ) + column_headers = ( + 'ID', + 'Name', + 'Description', + 'Status', + 'Size', + 'Incremental', + ) if parsed_args.long: columns += ('availability_zone', 'volume_id', 'container') column_headers += ('Availability Zone', 'Volume', 'Container')