27e6f6f7f8
Add support for Cinder API /v3 endpoint. A couple of unit tests for /v3 endpoint were added to v3/test_shell.py to ensure that the v3 shell works, and to also test that modules work with: from cinderclient.v2.availability_zones import * syntax. Change-Id: I6ae0ada221bebb4ab1850d9c99b10fcbb585201f Implements: https://blueprints.launchpad.net/python-cinderclient/+spec/add-v3-endpoint-support
91 lines
3.5 KiB
Python
91 lines
3.5 KiB
Python
# Copyright (c) 2011 OpenStack Foundation
|
|
# Copyright 2011, Piston Cloud Computing, Inc.
|
|
#
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
|
|
import cinderclient.exceptions
|
|
|
|
|
|
class ServiceCatalog(object):
|
|
"""Helper methods for dealing with a Keystone Service Catalog."""
|
|
|
|
def __init__(self, resource_dict):
|
|
self.catalog = resource_dict
|
|
|
|
def get_token(self):
|
|
return self.catalog['access']['token']['id']
|
|
|
|
def url_for(self, attr=None, filter_value=None,
|
|
service_type=None, endpoint_type='publicURL',
|
|
service_name=None, volume_service_name=None):
|
|
"""Fetch the public URL from the Compute service for
|
|
a particular endpoint attribute. If none given, return
|
|
the first. See tests for sample service catalog.
|
|
"""
|
|
matching_endpoints = []
|
|
if 'endpoints' in self.catalog:
|
|
# We have a bastardized service catalog. Treat it special. :/
|
|
for endpoint in self.catalog['endpoints']:
|
|
if not filter_value or endpoint[attr] == filter_value:
|
|
matching_endpoints.append(endpoint)
|
|
if not matching_endpoints:
|
|
raise cinderclient.exceptions.EndpointNotFound()
|
|
|
|
# We don't always get a service catalog back ...
|
|
if 'serviceCatalog' not in self.catalog['access']:
|
|
return None
|
|
|
|
# Full catalog ...
|
|
catalog = self.catalog['access']['serviceCatalog']
|
|
|
|
for service in catalog:
|
|
|
|
# NOTE(thingee): For backwards compatibility, if they have v2
|
|
# enabled and the service_type is set to 'volume', go ahead and
|
|
# accept that.
|
|
skip_service_type_check = False
|
|
if (service_type in ('volumev2', 'volumev3') and
|
|
service['type'] == 'volume'):
|
|
version = service['endpoints'][0]['publicURL'].split('/')[3]
|
|
if version in ('v2', 'v3'):
|
|
skip_service_type_check = True
|
|
|
|
if (not skip_service_type_check
|
|
and service.get("type") != service_type):
|
|
continue
|
|
|
|
if (volume_service_name and service_type in
|
|
('volume', 'volumev2', 'volumev3')
|
|
and service.get('name') != volume_service_name):
|
|
continue
|
|
|
|
endpoints = service['endpoints']
|
|
for endpoint in endpoints:
|
|
if not filter_value or endpoint.get(attr) == filter_value:
|
|
endpoint["serviceName"] = service.get("name")
|
|
matching_endpoints.append(endpoint)
|
|
|
|
if not matching_endpoints:
|
|
raise cinderclient.exceptions.EndpointNotFound()
|
|
elif len(matching_endpoints) > 1:
|
|
try:
|
|
eplist = [ep[attr] for ep in matching_endpoints]
|
|
except KeyError:
|
|
eplist = matching_endpoints
|
|
raise cinderclient.exceptions.AmbiguousEndpoints(endpoints=eplist)
|
|
else:
|
|
return matching_endpoints[0][endpoint_type]
|