openstack
/
cinder
Code Issues Proposed changes

Transfer creation doesn't support 'name' via xml 

Change the transfer create XML deserializer to use 'name' rather than
'display_name'. This is in line with cinderclient and the json code.

Change-Id: I97ba0c4411fe4a151261ed2f657465951bcb9d7b
Closes-Bug: #1243613
This commit is contained in:
wingwj 2013-12-14 20:00:08 +08:00 committed by Avishay Traeger
parent dc79d39b03
commit ce889d99f6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/api/contrib/volume_transfer.py
View File

@ -68,7 +68,7 @@ class CreateDeserializer(wsgi.MetadataXMLDeserializer):
transfer = {}
transfer_node = self.find_first_child_named(node, 'transfer')
attributes = ['volume_id', 'display_name']
attributes = ['volume_id', 'name']
for attr in attributes:
if transfer_node.getAttribute(attr):

4
cinder/tests/api/contrib/test_volume_transfer.py
View File

@ -264,7 +264,7 @@ class VolumeTransferAPITestCase(test.TestCase):
volume_id = self._create_volume(status='available', size=volume_size)
req = webob.Request.blank('/v2/fake/os-volume-transfer')
req.body = ('<transfer display_name="transfer-001" '
req.body = ('<transfer name="transfer-001" '
'volume_id="%s"/>' % volume_id)
req.method = 'POST'
req.headers['Content-Type'] = 'application/xml'
@ -277,7 +277,7 @@ class VolumeTransferAPITestCase(test.TestCase):
self.assertTrue(transfer.item(0).hasAttribute('id'))
self.assertTrue(transfer.item(0).hasAttribute('auth_key'))
self.assertTrue(transfer.item(0).hasAttribute('created_at'))
self.assertTrue(transfer.item(0).hasAttribute('name'))
self.assertEqual(transfer.item(0).getAttribute('name'), 'transfer-001')
self.assertTrue(transfer.item(0).hasAttribute('volume_id'))
db.volume_destroy(context.get_admin_context(), volume_id)