openstack/ironic
Code Issues Proposed changes

Merge "Raise InvalidPrameterValue when ipmi_terminal_port is ''"

Browse Source
This commit is contained in:
Jenkins 2015-09-07 18:23:36 +00:00 committed by Gerrit Code Review
commit 607eabde7d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/drivers/modules/ipmitool.py
View File

@ -264,7 +264,7 @@ def _parse_driver_info(node):
"value can be one of %(valid_versions)s") % "value can be one of %(valid_versions)s") %
{'version': protocol_version, 'valid_versions': valid_versions}) {'version': protocol_version, 'valid_versions': valid_versions})
if port: if port is not None:
try: try:
port = int(port) port = int(port)
except ValueError: except ValueError:

7
ironic/tests/drivers/test_ipmitool.py
View File

@ -1413,6 +1413,13 @@ class IPMIToolDriverTestCase(db_base.DbTestCase):
self.assertRaises(exception.MissingParameterValue, self.assertRaises(exception.MissingParameterValue,
task.driver.console.validate, task) task.driver.console.validate, task)
def test_console_validate_invalid_port(self):
with task_manager.acquire(
self.context, self.node.uuid, shared=True) as task:
task.node.driver_info['ipmi_terminal_port'] = ''
self.assertRaises(exception.InvalidParameterValue,
task.driver.console.validate, task)
def test_console_validate_wrong_ipmi_protocol_version(self): def test_console_validate_wrong_ipmi_protocol_version(self):
with task_manager.acquire( with task_manager.acquire(
self.context, self.node.uuid, shared=True) as task: self.context, self.node.uuid, shared=True) as task: