From 4132ca1818e894c9e5ca9482b4a82b8baaed4377 Mon Sep 17 00:00:00 2001
From: Luan Utimura <luan.utimura@luizalabs.com>
Date: Thu, 28 Aug 2025 16:11:05 -0300
Subject: [PATCH] volume: Add missing backup_id field in tests

This change also reverts commit:
  * 5f1ffe742cd8afb2c93927ff606d88a90fd6073e

Depends-On: https://review.opendev.org/c/openstack/openstacksdk/+/958801
Change-Id: Icac78179bc324e6fbe762f8095f2cba490ef6aea
Signed-off-by: Luan Utimura <luan.utimura@luizalabs.com>
---
 openstackclient/tests/unit/volume/v3/test_volume.py | 4 ++++
 openstackclient/volume/v3/volume.py                 | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/openstackclient/tests/unit/volume/v3/test_volume.py b/openstackclient/tests/unit/volume/v3/test_volume.py
index 5fb35a067e..33dcfe5a47 100644
--- a/openstackclient/tests/unit/volume/v3/test_volume.py
+++ b/openstackclient/tests/unit/volume/v3/test_volume.py
@@ -37,6 +37,7 @@ class TestVolumeCreate(volume_fakes.TestVolume):
     columns = (
         'attachments',
         'availability_zone',
+        'backup_id',
         'bootable',
         'cluster_name',
         'consistencygroup_id',
@@ -78,6 +79,7 @@ class TestVolumeCreate(volume_fakes.TestVolume):
         self.datalist = (
             self.volume.attachments,
             self.volume.availability_zone,
+            self.volume.backup_id,
             self.volume.is_bootable,
             self.volume.cluster_name,
             self.volume.consistency_group_id,
@@ -2011,6 +2013,7 @@ class TestVolumeShow(volume_fakes.TestVolume):
         self.columns = (
             'attachments',
             'availability_zone',
+            'backup_id',
             'bootable',
             'cluster_name',
             'consistencygroup_id',
@@ -2045,6 +2048,7 @@ class TestVolumeShow(volume_fakes.TestVolume):
         self.data = (
             self.volume.attachments,
             self.volume.availability_zone,
+            self.volume.backup_id,
             self.volume.is_bootable,
             self.volume.cluster_name,
             self.volume.consistency_group_id,
diff --git a/openstackclient/volume/v3/volume.py b/openstackclient/volume/v3/volume.py
index d43a77d7b2..54dd5c7547 100644
--- a/openstackclient/volume/v3/volume.py
+++ b/openstackclient/volume/v3/volume.py
@@ -107,8 +107,6 @@ def _format_volume(volume: _volume.Volume) -> dict[str, ty.Any]:
         'os-volume-replication:extended_status',
         # unnecessary columns
         'links',
-        # temporarily ignored columns
-        'backup_id',
     }
     optional_columns = {
         # only present if part of a consistency group