openstack
/
nova
Code Issues Proposed changes

Merge "Use SensitiveStringField for BlockDeviceMapping.connection_info"

This commit is contained in:
Jenkins 2016-03-10 14:22:40 +00:00 committed by Gerrit Code Review
parent 8dac1e46e3 db50aaca0a
commit 681f584186
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/objects/block_device.py
View File

@ -80,7 +80,7 @@ class BlockDeviceMapping(base.NovaPersistentObject, base.NovaObject,
'volume_size': fields.IntegerField(nullable=True),
'image_id': fields.StringField(nullable=True),
'no_device': fields.BooleanField(default=False),
'connection_info': fields.StringField(nullable=True),
'connection_info': fields.SensitiveStringField(nullable=True),
}
@staticmethod

1
nova/objects/fields.py
View File

@ -43,6 +43,7 @@ IntegerField = fields.IntegerField
UUIDField = fields.UUIDField
FloatField = fields.FloatField
StringField = fields.StringField
SensitiveStringField = fields.SensitiveStringField
EnumField = fields.EnumField
DateTimeField = fields.DateTimeField
DictOfStringsField = fields.DictOfStringsField

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

@ -1103,7 +1103,7 @@ object_data = {
'AggregateList': '1.2-fb6e19f3c3a3186b04eceb98b5dadbfa',
'BandwidthUsage': '1.2-c6e4c779c7f40f2407e3d70022e3cd1c',
'BandwidthUsageList': '1.2-5fe7475ada6fe62413cbfcc06ec70746',
'BlockDeviceMapping': '1.16-12319f6f47f740a67a88a23f7c7ee6ef',
'BlockDeviceMapping': '1.16-f0c172e902bc62f1cac05b17d7be7688',
'BlockDeviceMappingList': '1.17-1e568eecb91d06d4112db9fd656de235',
'BuildRequest': '1.0-e4ca475cabb07f73d8176f661afe8c55',
'CellMapping': '1.0-7f1a7e85a22bbb7559fc730ab658b9bd',