openstack/cinder
Code Issues Proposed changes

Merge "Fix connection_info field in VolumeAttachment object"

Browse Source
This commit is contained in:
Jenkins 2017-06-27 10:27:50 +00:00 committed by Gerrit Code Review
commit 8840e85a9c
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/objects/fields.py
View File

@ -163,3 +163,7 @@ class VolumeAttachStatus(BaseCinderEnum):
class VolumeAttachStatusField(BaseEnumField):
AUTO_TYPE = VolumeAttachStatus()
class DictOfNullableField(fields.AutoTypedField):
AUTO_TYPE = fields.Dict(fields.FieldType(), nullable=True)

2
cinder/objects/volume_attachment.py
View File

@ -50,7 +50,7 @@ class VolumeAttachment(base.CinderPersistentObject, base.CinderObject,
'attach_mode': fields.StringField(nullable=True),
'volume': fields.ObjectField('Volume', nullable=False),
'connection_info': fields.DictOfNullableStringsField(nullable=True)
'connection_info': c_fields.DictOfNullableField(nullable=True)
}
@property

6
cinder/tests/unit/attachments/test_attachments_api.py
View File

@ -62,7 +62,8 @@ class AttachmentManagerTestCase(test.TestCase):
mock_policy):
"""Test attachment_create with connector."""
volume_params = {'status': 'available'}
connection_info = {'fake_key': 'fake_value'}
connection_info = {'fake_key': 'fake_value',
'fake_key2': ['fake_value1', 'fake_value2']}
mock_rpc_attachment_update.return_value = connection_info
vref = tests_utils.create_volume(self.context, **volume_params)
@ -112,7 +113,8 @@ class AttachmentManagerTestCase(test.TestCase):
mock_policy):
"""Test attachment_delete."""
volume_params = {'status': 'available'}
connection_info = {'fake_key': 'fake_value'}
connection_info = {'fake_key': 'fake_value',
'fake_key2': ['fake_value1', 'fake_value2']}
mock_rpc_attachment_update.return_value = connection_info
vref = tests_utils.create_volume(self.context, **volume_params)