3f19461a80
Removed unused admin parameter that was unused and removed tests that were no longer necessary. Added an option configuration setting SECONDARY_ENDPOINT_TYPE that will be attempted if the OPENSTACK_ENDPOINT_TYPE does not exist in the service catalog for the desired service. The primary use case for this fix is in cloud configurations where Keystone does not return all endpoint types for each service, and only does so based on the user's privilege level. Example use case would be set OPENSTACK_ENDPOINT_TYPE to 'adminURL' and set SECONDARY_ENDPOINT_TYPE to 'publicURL'. If adminURL is not available to the user, then they get the publicURL back. If SECONDARY_ENDPOINT_TYPE is not set in the settings, then the current behavior is maintained. Fixes: bug #1186379 Change-Id: Ieefb6ed5dd88e5c840ef6bad93ae87237a1b63f9
143 lines
5.0 KiB
Python
143 lines
5.0 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# Copyright 2012 Nebula, Inc.
|
|
#
|
|
# 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.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from horizon import exceptions
|
|
|
|
from openstack_dashboard.test import helpers as test
|
|
from openstack_dashboard.api import base as api_base
|
|
|
|
|
|
class APIResource(api_base.APIResourceWrapper):
|
|
""" Simple APIResource for testing """
|
|
_attrs = ['foo', 'bar', 'baz']
|
|
|
|
@staticmethod
|
|
def get_instance(innerObject=None):
|
|
if innerObject is None:
|
|
|
|
class InnerAPIResource(object):
|
|
pass
|
|
|
|
innerObject = InnerAPIResource()
|
|
innerObject.foo = 'foo'
|
|
innerObject.bar = 'bar'
|
|
return APIResource(innerObject)
|
|
|
|
|
|
class APIDict(api_base.APIDictWrapper):
|
|
""" Simple APIDict for testing """
|
|
_attrs = ['foo', 'bar', 'baz']
|
|
|
|
@staticmethod
|
|
def get_instance(innerDict=None):
|
|
if innerDict is None:
|
|
innerDict = {'foo': 'foo',
|
|
'bar': 'bar'}
|
|
return APIDict(innerDict)
|
|
|
|
|
|
# Wrapper classes that only define _attrs don't need extra testing.
|
|
class APIResourceWrapperTests(test.TestCase):
|
|
def test_get_attribute(self):
|
|
resource = APIResource.get_instance()
|
|
self.assertEqual(resource.foo, 'foo')
|
|
|
|
def test_get_invalid_attribute(self):
|
|
resource = APIResource.get_instance()
|
|
self.assertNotIn('missing', resource._attrs,
|
|
msg="Test assumption broken. Find new missing attribute")
|
|
with self.assertRaises(AttributeError):
|
|
resource.missing
|
|
|
|
def test_get_inner_missing_attribute(self):
|
|
resource = APIResource.get_instance()
|
|
with self.assertRaises(AttributeError):
|
|
resource.baz
|
|
|
|
|
|
class APIDictWrapperTests(test.TestCase):
|
|
# APIDict allows for both attribute access and dictionary style [element]
|
|
# style access. Test both
|
|
def test_get_item(self):
|
|
resource = APIDict.get_instance()
|
|
self.assertEqual(resource.foo, 'foo')
|
|
self.assertEqual(resource['foo'], 'foo')
|
|
|
|
def test_get_invalid_item(self):
|
|
resource = APIDict.get_instance()
|
|
self.assertNotIn('missing', resource._attrs,
|
|
msg="Test assumption broken. Find new missing attribute")
|
|
with self.assertRaises(AttributeError):
|
|
resource.missing
|
|
with self.assertRaises(KeyError):
|
|
resource['missing']
|
|
|
|
def test_get_inner_missing_attribute(self):
|
|
resource = APIDict.get_instance()
|
|
with self.assertRaises(AttributeError):
|
|
resource.baz
|
|
with self.assertRaises(KeyError):
|
|
resource['baz']
|
|
|
|
def test_get_with_default(self):
|
|
resource = APIDict.get_instance()
|
|
|
|
self.assertEqual(resource.get('foo'), 'foo')
|
|
|
|
self.assertIsNone(resource.get('baz'))
|
|
|
|
self.assertEqual('retValue', resource.get('baz', 'retValue'))
|
|
|
|
|
|
class ApiHelperTests(test.TestCase):
|
|
""" Tests for functions that don't use one of the api objects """
|
|
|
|
def test_url_for(self):
|
|
url = api_base.url_for(self.request, 'image')
|
|
self.assertEqual(url, 'http://public.glance.example.com:9292/v1')
|
|
|
|
url = api_base.url_for(self.request, 'image', endpoint_type='adminURL')
|
|
self.assertEqual(url, 'http://admin.glance.example.com:9292/v1')
|
|
|
|
url = api_base.url_for(self.request, 'compute')
|
|
self.assertEqual(url, 'http://public.nova.example.com:8774/v2')
|
|
|
|
url = api_base.url_for(self.request, 'compute',
|
|
endpoint_type='adminURL')
|
|
self.assertEqual(url, 'http://admin.nova.example.com:8774/v2')
|
|
|
|
url = api_base.url_for(self.request, 'volume')
|
|
self.assertEqual(url, 'http://public.nova.example.com:8776/v1')
|
|
|
|
url = api_base.url_for(self.request, 'volume',
|
|
endpoint_type="internalURL")
|
|
self.assertEqual(url, 'http://int.nova.example.com:8776/v1')
|
|
|
|
url = api_base.url_for(self.request, 'volume',
|
|
endpoint_type='adminURL')
|
|
self.assertEqual(url, 'http://admin.nova.example.com:8776/v1')
|
|
|
|
self.assertNotIn('notAnApi', self.request.user.service_catalog,
|
|
'Select a new nonexistent service catalog key')
|
|
with self.assertRaises(exceptions.ServiceCatalogException):
|
|
url = api_base.url_for(self.request, 'notAnApi')
|