
Introduces a mechanism for switching between API versions, and implements it in a proof-of-concept fashion for the Keystone v3 API. Converts the existing Users and Projects API methods to use it. This changed some method signatures, and therefore altered a number of views and tests. However, all code related to the version cahnges is contained in the api.keystone module. This seems like a sane process going forwards. Future TODOs are marked in the code, including auto-detection of API versions and better endpoint URL construction. Partially implements blueprint api-capability-detection Change-Id: Ied04200fe6c257aac2241d36628965a3bb6658b9
61 lines
2.3 KiB
Python
61 lines
2.3 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012, Nachi Ueno, NTT MCL, 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 mox import IsA
|
|
from django import http
|
|
from django.core.urlresolvers import reverse
|
|
|
|
from openstack_dashboard import api
|
|
from openstack_dashboard.dashboards.project.routers import tests as r_test
|
|
from openstack_dashboard.test import helpers as test
|
|
|
|
|
|
class RouterTests(test.BaseAdminViewTests, r_test.RouterTests):
|
|
DASHBOARD = 'admin'
|
|
INDEX_URL = reverse('horizon:%s:routers:index' % DASHBOARD)
|
|
DETAIL_PATH = 'horizon:%s:routers:detail' % DASHBOARD
|
|
|
|
@test.create_stubs({api.quantum: ('router_list', 'network_list'),
|
|
api.keystone: ('tenant_list',)})
|
|
def test_index(self):
|
|
tenants = self.tenants.list()
|
|
api.quantum.router_list(
|
|
IsA(http.HttpRequest),
|
|
search_opts=None).AndReturn(self.routers.list())
|
|
api.keystone.tenant_list(IsA(http.HttpRequest)).AndReturn(tenants)
|
|
self._mock_external_network_list()
|
|
|
|
self.mox.ReplayAll()
|
|
|
|
res = self.client.get(self.INDEX_URL)
|
|
|
|
self.assertTemplateUsed(res, '%s/routers/index.html' % self.DASHBOARD)
|
|
routers = res.context['table'].data
|
|
self.assertItemsEqual(routers, self.routers.list())
|
|
|
|
@test.create_stubs({api.quantum: ('router_list',),
|
|
api.keystone: ('tenant_list',)})
|
|
def test_index_router_list_exception(self):
|
|
api.quantum.router_list(
|
|
IsA(http.HttpRequest),
|
|
search_opts=None).AndRaise(self.exceptions.quantum)
|
|
self.mox.ReplayAll()
|
|
|
|
res = self.client.get(self.INDEX_URL)
|
|
|
|
self.assertTemplateUsed(res, '%s/routers/index.html' % self.DASHBOARD)
|
|
self.assertEqual(len(res.context['table'].data), 0)
|
|
self.assertMessageCount(res, error=1)
|