From 83282bc5e133d8cd1718df524c1fa06add130b8a Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Thu, 24 Sep 2015 23:39:37 -0400
Subject: [PATCH] attempt to find resource by listing
add a last-ditch effort to find the resource in question by
listing all the resources and doing a simply match for name and
id. if no match is found then raise an error, if the list call
is unsuccessful, raise the same error. we have failed this city.
Closes-Bug: #1501362
Change-Id: I0d3d7002e9ac47b17b1ef1a5534406c85b1fc753
---
openstackclient/common/utils.py | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py
index 7a5d33e3b0..51e2a2f9ca 100644
--- a/openstackclient/common/utils.py
+++ b/openstackclient/common/utils.py
@@ -121,8 +121,24 @@ def find_resource(manager, name_or_id, **kwargs):
(manager.resource_class.__name__.lower(), name_or_id)
raise exceptions.CommandError(msg)
else:
- msg = "Could not find resource %s" % name_or_id
- raise exceptions.CommandError(msg)
+ pass
+
+ try:
+ for resource in manager.list():
+ # short circuit and return the first match
+ if (resource.get('id') == name_or_id or
+ resource.get('name') == name_or_id):
+ return resource
+ else:
+ # we found no match, keep going to bomb out
+ pass
+ except Exception:
+ # in case the list fails for some reason
+ pass
+
+ # if we hit here, we've failed, report back this error:
+ msg = "Could not find resource %s" % name_or_id
+ raise exceptions.CommandError(msg)
def format_dict(data):