Skip to content

Commit 14a714f

Browse files
TerryHoweTerryHowe
committed
Volume v2 list does not show server name
The volume v2 list was using the volume id rather than the server id. Change-Id: Ibe03d34b5b503af2d00202dabd640f796449cf9a Closes-Bug: #1489954
1 parent f142516 commit 14a714f

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

‎openstackclient/tests/volume/v2/fakes.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
import copy
1616
import mock
1717

18-
from openstackclient.tests.compute.v2 import fakes as compute_fakes
1918
from openstackclient.tests import fakes
2019
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
2120
from openstackclient.tests.image.v2 import fakes as image_fakes
2221
from openstackclient.tests import utils
2322

24-
volume_attachment_server = copy.deepcopy(compute_fakes.SERVER)
25-
volume_attachment_server['device'] = 'device'
23+
volume_attachment_server = {
24+
'device': '/dev/ice',
25+
'server_id': '1233',
26+
}
2627

2728
volume_id = "ce26708d-a7f8-4b4b-9861-4a80256615a6"
2829
volume_name = "fake_volume"

‎openstackclient/tests/volume/v2/test_volume.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ def test_volume_list_no_options(self):
548548
]
549549
self.assertEqual(collist, columns)
550550

551-
server = volume_fakes.volume_attachment_server['id']
551+
server = volume_fakes.volume_attachment_server['server_id']
552552
device = volume_fakes.volume_attachment_server['device']
553553
msg = 'Attached to %s on %s ' % (server, device)
554554
datalist = ((
@@ -583,7 +583,7 @@ def test_volume_list_all_projects_option(self):
583583
]
584584
self.assertEqual(collist, columns)
585585

586-
server = volume_fakes.volume_attachment_server['id']
586+
server = volume_fakes.volume_attachment_server['server_id']
587587
device = volume_fakes.volume_attachment_server['device']
588588
msg = 'Attached to %s on %s ' % (server, device)
589589
datalist = ((
@@ -618,7 +618,7 @@ def test_volume_list_name(self):
618618
)
619619
self.assertEqual(collist, tuple(columns))
620620

621-
server = volume_fakes.volume_attachment_server['id']
621+
server = volume_fakes.volume_attachment_server['server_id']
622622
device = volume_fakes.volume_attachment_server['device']
623623
msg = 'Attached to %s on %s ' % (server, device)
624624

@@ -654,7 +654,7 @@ def test_volume_list_status(self):
654654
)
655655
self.assertEqual(collist, tuple(columns))
656656

657-
server = volume_fakes.volume_attachment_server['id']
657+
server = volume_fakes.volume_attachment_server['server_id']
658658
device = volume_fakes.volume_attachment_server['device']
659659
msg = 'Attached to %s on %s ' % (server, device)
660660
datalist = ((
@@ -693,7 +693,7 @@ def test_volume_list_long(self):
693693
]
694694
self.assertEqual(collist, columns)
695695

696-
server = volume_fakes.volume_attachment_server['id']
696+
server = volume_fakes.volume_attachment_server['server_id']
697697
device = volume_fakes.volume_attachment_server['device']
698698
msg = 'Attached to %s on %s ' % (server, device)
699699
datalist = ((

‎openstackclient/volume/v2/volume.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def _format_attach(attachments):
238238

239239
msg = ''
240240
for attachment in attachments:
241-
server = attachment['id']
241+
server = attachment['server_id']
242242
if server in server_cache:
243243
server = server_cache[server].name
244244
device = attachment['device']

0 commit comments

Comments
 (0)