diff options
| author | Terry Howe <terrylhowe@gmail.com> | 2014-05-22 17:38:41 -0600 |
|---|---|---|
| committer | Terry Howe <terrylhowe@gmail.com> | 2014-06-17 10:24:26 -0600 |
| commit | 0b2987fef389603b95b2ba7b788492b8baa56745 (patch) | |
| tree | 73e20c7711d383515bf0e675504d23b134c48758 /openstackclient/tests/common/test_utils.py | |
| parent | 6380b8b95918a42cee63c21b90f7d8d55854d0c8 (diff) | |
| download | python-openstackclient-0b2987fef389603b95b2ba7b788492b8baa56745.tar.gz | |
Fix find_resource for keystone and cinder
The find_resource method had two hacks in in to support cinder
and keystone and I have removed those in favor of a monkey patch
for cinder.
The find_resource method used to attempt to UUID parse the id, but
it would do a manager.get anyway. I changed it to skip the UUID
parsing. This will make things run minorly faster and it supports
LDAP for keystone.
The find_resource used to attempt to use display_name=name_or_id
when finding. This was a hack for cinder support, but it breaks
keystone because keystone totally messes up with the bogus filter
and keystone refuses to fix it.
Change-Id: I66e45a6341f704900f1d5321a0e70eac3d051665
Closes-Bug: #1306699
Diffstat (limited to 'openstackclient/tests/common/test_utils.py')
| -rw-r--r-- | openstackclient/tests/common/test_utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/tests/common/test_utils.py b/openstackclient/tests/common/test_utils.py index fbc1a926..6d75a9b5 100644 --- a/openstackclient/tests/common/test_utils.py +++ b/openstackclient/tests/common/test_utils.py @@ -117,7 +117,7 @@ class TestFindResource(test_utils.TestCase): self.assertEqual("No lego with a name or ID of 'legos' exists.", str(result)) self.manager.get.assert_called_with(self.name) - self.manager.find.assert_called_with(display_name=self.name) + self.manager.find.assert_called_with(name=self.name) def test_find_resource_find_no_unique(self): self.manager.get = mock.Mock(side_effect=Exception('Boom!')) @@ -129,4 +129,4 @@ class TestFindResource(test_utils.TestCase): self.assertEqual("More than one lego exists with the name 'legos'.", str(result)) self.manager.get.assert_called_with(self.name) - self.manager.find.assert_called_with(display_name=self.name) + self.manager.find.assert_called_with(name=self.name) |