openstack/os-vif
Code Issues Proposed changes

Merge "Use versionedobjects PCIAddress field"

Browse Source
This commit is contained in:
Jenkins 2017-06-19 12:40:06 +00:00 committed by Gerrit Code Review
commit b720323d61
3 changed files with 2 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
os_vif/objects/fields.py
View File

@ -12,27 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import re
from oslo_versionedobjects import fields from oslo_versionedobjects import fields
import six
class PCIAddress(fields.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("Malformed PCI address %s", value)
class PCIAddressField(fields.AutoTypedField):
AUTO_TYPE = PCIAddress()
class VIFDirectMode(fields.Enum): class VIFDirectMode(fields.Enum):

4
os_vif/objects/vif.py
View File

@ -107,7 +107,7 @@ class VIFDirect(VIFBase):
'vif_name': fields.StringField(), 'vif_name': fields.StringField(),
# The PCI address of the host device # The PCI address of the host device
'dev_address': osv_fields.PCIAddressField(), 'dev_address': fields.PCIAddressField(),
# Port connection mode # Port connection mode
'mode': osv_fields.VIFDirectModeField(), 'mode': osv_fields.VIFDirectModeField(),
@ -157,7 +157,7 @@ class VIFHostDevice(VIFBase):
'dev_type': osv_fields.VIFHostDeviceDevTypeField(), 'dev_type': osv_fields.VIFHostDeviceDevTypeField(),
# The PCI address of the host device # The PCI address of the host device
'dev_address': osv_fields.PCIAddressField(), 'dev_address': fields.PCIAddressField(),
} }

36
os_vif/tests/test_fields.py
View File

@ -1,36 +0,0 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_versionedobjects.tests import test_fields
from os_vif.objects import fields
class TestPCIAddress(test_fields.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]