openstack/ironic
Code Issues Proposed changes

Merge "Fix the message in the set_raid_config method"

Browse Source
This commit is contained in:
Jenkins 2016-11-21 21:29:32 +00:00 committed by Gerrit Code Review
commit b283a33530
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/conductor/manager.py
View File

@ -2136,7 +2136,7 @@ class ConductorManager(base_manager.BaseConductorManager):
node = task.node node = task.node
if not getattr(task.driver, 'raid', None): if not getattr(task.driver, 'raid', None):
raise exception.UnsupportedDriverExtension( raise exception.UnsupportedDriverExtension(
driver=task.driver, extension='raid') driver=task.node.driver, extension='raid')
# Operator may try to unset node.target_raid_config. So, try to # Operator may try to unset node.target_raid_config. So, try to
# validate only if it is not empty. # validate only if it is not empty.
if target_raid_config: if target_raid_config:

2
ironic/tests/unit/conductor/test_manager.py
View File

@ -27,6 +27,7 @@ import oslo_messaging as messaging
from oslo_utils import uuidutils from oslo_utils import uuidutils
from oslo_versionedobjects import base as ovo_base from oslo_versionedobjects import base as ovo_base
from oslo_versionedobjects import fields from oslo_versionedobjects import fields
import six
from ironic.common import boot_devices from ironic.common import boot_devices
from ironic.common import driver_factory from ironic.common import driver_factory
@ -3519,6 +3520,7 @@ class RaidTestCases(mgr_utils.ServiceSetUpMixin, tests_db_base.DbTestCase):
self.node.refresh() self.node.refresh()
self.assertEqual({}, self.node.target_raid_config) self.assertEqual({}, self.node.target_raid_config)
self.assertEqual(exception.UnsupportedDriverExtension, exc.exc_info[0]) self.assertEqual(exception.UnsupportedDriverExtension, exc.exc_info[0])
self.assertIn('fake', six.text_type(exc.exc_info[1]))
def test_set_target_raid_config_invalid_parameter_value(self): def test_set_target_raid_config_invalid_parameter_value(self):
# Missing raid_level in the below raid config. # Missing raid_level in the below raid config.