From ba530a44fbb6c591647a98405b27a64809f8b3c4 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Wed, 12 Feb 2014 18:37:49 +1000 Subject: Discover should support other services Most services don't provide a 'values' element for their version definitions, however are otherwise similar. Discovery should allow that case and continue on otherwise. Change-Id: I878377a779da5c96c47603842c024059920423fd --- keystoneclient/discover.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'keystoneclient/discover.py') diff --git a/keystoneclient/discover.py b/keystoneclient/discover.py index 9c6313f..77cc00e 100644 --- a/keystoneclient/discover.py +++ b/keystoneclient/discover.py @@ -153,6 +153,13 @@ def available_versions(url, session=None, **kwargs): except (KeyError, TypeError): pass + # Most servers don't have a 'values' element so accept a simple + # versions dict if available. + try: + return body_resp['versions'] + except KeyError: + pass + # Otherwise if we query an endpoint like /v2.0 then we will get back # just the one available version. try: -- cgit v1.2.1