openstack
/
nova
Code Issues Proposed changes

Merge "Fix virt BDM __setattr__ and __getattr__"

This commit is contained in:
Jenkins 2014-07-22 08:02:02 +00:00 committed by Gerrit Code Review
parent db1635698c 9cea7ad36c
commit 7a1fb26c04
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/virt/test_block_device.py
View File

@ -195,8 +195,6 @@ class TestDriverBlockDevice(test.NoDBTestCase):
for passthru in test_bdm._proxy_as_attr:
self.assertEqual(getattr(test_bdm, passthru),
getattr(test_bdm._bdm_obj, passthru))
for no_pass in set(db_bdm.keys()) - test_bdm._proxy_as_attr:
self.assertRaises(AttributeError, getattr, test_bdm, no_pass)
# Make sure that all others raise _invalidType
for other_name, cls in self.driver_classes.iteritems():

6
nova/virt/block_device.py
View File

@ -101,15 +101,13 @@ class DriverBlockDevice(dict):
if name in self._proxy_as_attr:
return getattr(self._bdm_obj, name)
else:
raise AttributeError("Cannot access %s on DriverBlockDevice "
"class" % name)
super(DriverBlockDevice, self).__getattr__(name)
def __setattr__(self, name, value):
if name in self._proxy_as_attr:
return setattr(self._bdm_obj, name, value)
else:
raise AttributeError("Cannot access %s on DriverBlockDevice "
"class" % name)
super(DriverBlockDevice, self).__setattr__(name, value)
def _transform(self):
"""Transform bdm to the format that is passed to drivers."""