x
/
deb-oslo.versionedobjects
Code Issues Proposed changes

Merge "Add a pci address field"

This commit is contained in:
Jenkins 2016-06-07 07:48:35 +00:00 committed by Gerrit Code Review
parent be2038f255 bb43887282
commit cccbcf9fbd
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
oslo_versionedobjects/fields.py
View File

@ -344,6 +344,19 @@ class MACAddress(FieldType):
raise ValueError(_LE("Malformed MAC %s"), value)
class PCIAddress(FieldType):
_REGEX = re.compile(r'^[0-9a-f]{4}:[0-9a-f]{2}:[0-1][0-9a-f].[0-7]$')
@staticmethod
def coerce(obj, attr, value):
if isinstance(value, six.string_types):
newvalue = value.lower()
if PCIAddress._REGEX.match(newvalue):
return newvalue
raise ValueError(_LE("Malformed PCI address %s"), value)
class Integer(FieldType):
@staticmethod
def coerce(obj, attr, value):
@ -839,6 +852,10 @@ class MACAddressField(AutoTypedField):
AUTO_TYPE = MACAddress()
class PCIAddressField(AutoTypedField):
AUTO_TYPE = PCIAddress()
class IntegerField(AutoTypedField):
AUTO_TYPE = Integer()

21
oslo_versionedobjects/tests/test_fields.py
View File

@ -191,6 +191,27 @@ class TestMACAddress(TestField):
self.from_primitive_values = self.coerce_good_values[0:1]
class TestPCIAddress(TestField):
def setUp(self):
super(TestPCIAddress, self).setUp()
self.field = fields.PCIAddressField()
self.coerce_good_values = [
('0000:02:00.0', '0000:02:00.0'),
('FFFF:FF:1F.7', 'ffff:ff:1f.7'),
('fFfF:fF:1F.7', 'ffff:ff:1f.7'),
]
self.coerce_bad_values = [
'000:02:00.0', # Too short
'00000:02:00.0', # Too long
'FFFF:FF:2F.7', # Bad slot
'FFFF:GF:1F.7', # Bad octal
1123123, # Number
{}, # dict
]
self.to_primitive_values = self.coerce_good_values[0:1]
self.from_primitive_values = self.coerce_good_values[0:1]
class TestUUID(TestField):
def setUp(self):
super(TestUUID, self).setUp()