openstack
/
ironic
Code Issues Proposed changes

Fix attribute name of cinder volume 

This patch fixes the name of UUID of a cinder volume object. The
correct attribute is not 'uuid', but 'id'.

Change-Id: Ie054be643e1925bd8c2333b3b1ecd2988cc9eeaa
Partial-Bug: #1559691
This commit is contained in:
Hironori Shiina 2017-05-12 14:19:23 +09:00
parent 623eaa01a0
commit 703b8898e3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/common/cinder.py
View File

@ -252,7 +252,7 @@ def attach_volumes(task, volume_list, connector):
# NOTE(jtaryma): Actual connection info of already connected
# volume will be provided by nova. Adding this dictionary to
# 'connected' list so it contains also already connected volumes.
connection = {'data': {'ironic_volume_uuid': volume.uuid,
connection = {'data': {'ironic_volume_uuid': volume.id,
'volume_id': volume_id},
'already_attached': True}
connected.append(connection)
@ -280,7 +280,7 @@ def attach_volumes(task, volume_list, connector):
if 'volume_id' not in connection['data']:
connection['data']['volume_id'] = volume_id
connection['data']['ironic_volume_uuid'] = volume.uuid
connection['data']['ironic_volume_uuid'] = volume.id
connected.append(connection)
LOG.info('Successfully initialized volume %(vol_id)s for '

10
ironic/tests/unit/common/test_cinder.py
View File

@ -209,7 +209,7 @@ class TestCinderActions(db_base.DbTestCase):
connector = {'foo': 'bar'}
mock_create_meta.return_value = {'bar': 'baz'}
mock_is_attached.return_value = False
mock_get.return_value = mock.Mock(attachments=[], uuid='000-001')
mock_get.return_value = mock.Mock(attachments=[], id='000-001')
mock_init.return_value = {
'driver_volume_type': 'iscsi',
@ -261,9 +261,9 @@ class TestCinderActions(db_base.DbTestCase):
connector = {'foo': 'bar'}
mock_create_meta.return_value = {'bar': 'baz'}
mock_get.side_effect = [
mock.Mock(attachments=[], uuid='000-000'),
mock.Mock(attachments=[], id='000-000'),
mock.Mock(attachments=[{'server_id': self.node.uuid}],
uuid='000-001')
id='000-001')
]
mock_init.return_value = {
@ -415,7 +415,7 @@ class TestCinderActions(db_base.DbTestCase):
connector = {'foo': 'bar'}
mock_create_meta.return_value = {'bar': 'baz'}
mock_is_attached.return_value = False
mock_get.return_value = mock.Mock(attachments=[], uuid='000-003')
mock_get.return_value = mock.Mock(attachments=[], id='000-003')
mock_init.return_value = {
'driver_volume_type': 'iscsi',
'data': {
@ -465,7 +465,7 @@ class TestCinderActions(db_base.DbTestCase):
connector = {'foo': 'bar'}
mock_create_meta.return_value = {'bar': 'baz'}
mock_is_attached.return_value = False
mock_get.return_value = mock.Mock(attachments=[], uuid='000-000')
mock_get.return_value = mock.Mock(attachments=[], id='000-000')
mock_init.return_value = {
'driver_volume_type': 'iscsi',
'data': {