openstack
/
cinder
Code Issues Proposed changes

fix ConsistencyGroup volume_type_id field 

Despite its name, the 'volume_type_id' field of the
ConsistencyGroup object is not a UUIDField since the
field holds a comma separated value style list of
volume type ids rather than a single UUID.

This commit modifieds the object definition of
ConsistencyGroup to reflect the true nature of this
field.

Co-Authored-By: Cao Shufeng <caosf.fnst@cn.fujitsu.com>

Partial-Bug: #1564074
Change-Id: Ie1dc4f8a765197219f0a8ca493fd2777eaac76fa
This commit is contained in:
Tom Barron 2016-04-02 07:33:40 -04:00
parent 09fa5ab22d
commit c164613743
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/objects/consistencygroup.py
View File

@ -39,7 +39,7 @@ class ConsistencyGroup(base.CinderPersistentObject, base.CinderObject,
'availability_zone': fields.StringField(nullable=True),
'name': fields.StringField(nullable=True),
'description': fields.StringField(nullable=True),
'volume_type_id': fields.UUIDField(nullable=True),
'volume_type_id': fields.StringField(nullable=True),
'status': c_fields.ConsistencyGroupStatusField(nullable=True),
'cgsnapshot_id': fields.UUIDField(nullable=True),
'source_cgid': fields.UUIDField(nullable=True),

2
cinder/tests/unit/objects/test_objects.py
View File

@ -27,7 +27,7 @@ object_data = {
'BackupList': '1.0-24591dabe26d920ce0756fe64cd5f3aa',
'CGSnapshot': '1.0-78b91e76cb4c56e9cf5c9c41e208c05a',
'CGSnapshotList': '1.0-e8c3f4078cd0ee23487b34d173eec776',
'ConsistencyGroup': '1.2-3aeb6b25664057e8078bd6d45bf23e0a',
'ConsistencyGroup': '1.2-bcc1ee6b28840bb089d122ca4fa0cd2c',
'ConsistencyGroupList': '1.1-73916823b697dfa0c7f02508d87e0f28',
'Service': '1.3-66c8e1683f58546c54551e9ff0a3b111',
'ServiceList': '1.1-cb758b200f0a3a90efabfc5aa2ffb627',