openstack/python-ironicclient
Code Issues Proposed changes

Merge "Raise on NodeManager get when invalid identifier provided"

Browse Source
This commit is contained in:
Jenkins
2017-01-09 17:36:30 +00:00
committed by Gerrit Code Review
parent 2fd05f3cf3 b227a39912
commit a07cbc9074
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ironicclient/common/base.py
View File

@@ -72,8 +72,14 @@ class Manager(object):
:param resource_id: Identifier of the resource. :param resource_id: Identifier of the resource.
:param fields: List of specific fields to be returned. :param fields: List of specific fields to be returned.
:raises exc.ValidationError: For invalid resource_id arg value.
""" """
if not resource_id:
raise exc.ValidationError(
"The identifier argument is invalid. "
"Value provided: {!r}".format(resource_id))
if fields is not None: if fields is not None:
resource_id = '%s?fields=' % resource_id resource_id = '%s?fields=' % resource_id
resource_id += ','.join(fields) resource_id += ','.join(fields)

6
ironicclient/tests/unit/common/test_base.py
View File

@@ -131,6 +131,12 @@ class ManagerTestCase(testtools.TestCase):
self.assertEqual(resource_id, resource.uuid) self.assertEqual(resource_id, resource.uuid)
self.assertEqual(TESTABLE_RESOURCE['attribute1'], resource.attribute1) self.assertEqual(TESTABLE_RESOURCE['attribute1'], resource.attribute1)
def test__get_invalid_resource_id_raises(self):
resource_ids = [[], {}, False, '', 0, None, ()]
for resource_id in resource_ids:
self.assertRaises(exc.ValidationError, self.manager._get,
resource_id=resource_id)
def test__get_as_dict(self): def test__get_as_dict(self):
resource_id = TESTABLE_RESOURCE['uuid'] resource_id = TESTABLE_RESOURCE['uuid']
resource = self.manager._get_as_dict(resource_id) resource = self.manager._get_as_dict(resource_id)