e44bb009d3
If no region is set in Keystone, null is deserialized as None and the region has None has value, which triggers a type error when building the output string. This patch fixes that. Change-Id: I7637dc2595655cf452f38308f99fe66ac782e16d
130 lines
4.1 KiB
Python
130 lines
4.1 KiB
Python
# 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 mock
|
|
|
|
from openstackclient.identity.v3 import catalog
|
|
from openstackclient.tests import utils
|
|
|
|
|
|
class TestCatalog(utils.TestCommand):
|
|
|
|
fake_service = {
|
|
'id': 'qwertyuiop',
|
|
'type': 'compute',
|
|
'name': 'supernova',
|
|
'endpoints': [
|
|
{
|
|
'region': 'onlyone',
|
|
'url': 'https://public.example.com',
|
|
'interface': 'public',
|
|
},
|
|
{
|
|
'region_id': 'onlyone',
|
|
'url': 'https://admin.example.com',
|
|
'interface': 'admin',
|
|
},
|
|
{
|
|
'url': 'https://internal.example.com',
|
|
'interface': 'internal',
|
|
},
|
|
{
|
|
'region': None,
|
|
'url': 'https://none.example.com',
|
|
'interface': 'none',
|
|
},
|
|
],
|
|
}
|
|
|
|
def setUp(self):
|
|
super(TestCatalog, self).setUp()
|
|
|
|
self.sc_mock = mock.MagicMock()
|
|
self.sc_mock.service_catalog.get_data.return_value = [
|
|
self.fake_service,
|
|
]
|
|
|
|
self.auth_mock = mock.MagicMock()
|
|
self.app.client_manager.session = self.auth_mock
|
|
|
|
self.auth_mock.auth.get_auth_ref.return_value = self.sc_mock
|
|
|
|
|
|
class TestCatalogList(TestCatalog):
|
|
|
|
def setUp(self):
|
|
super(TestCatalogList, self).setUp()
|
|
|
|
# Get the command object to test
|
|
self.cmd = catalog.ListCatalog(self.app, None)
|
|
|
|
def test_catalog_list(self):
|
|
arglist = []
|
|
verifylist = []
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class Lister in cliff, abstract method take_action()
|
|
# returns a tuple containing the column names and an iterable
|
|
# containing the data to be listed.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
self.sc_mock.service_catalog.get_data.assert_called_with()
|
|
|
|
collist = ('Name', 'Type', 'Endpoints')
|
|
self.assertEqual(collist, columns)
|
|
datalist = ((
|
|
'supernova',
|
|
'compute',
|
|
'onlyone\n public: https://public.example.com\n'
|
|
'onlyone\n admin: https://admin.example.com\n'
|
|
'<none>\n internal: https://internal.example.com\n'
|
|
'<none>\n none: https://none.example.com\n',
|
|
), )
|
|
self.assertEqual(datalist, tuple(data))
|
|
|
|
|
|
class TestCatalogShow(TestCatalog):
|
|
|
|
def setUp(self):
|
|
super(TestCatalogShow, self).setUp()
|
|
|
|
# Get the command object to test
|
|
self.cmd = catalog.ShowCatalog(self.app, None)
|
|
|
|
def test_catalog_show(self):
|
|
arglist = [
|
|
'compute',
|
|
]
|
|
verifylist = [
|
|
('service', 'compute'),
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
|
|
|
# In base command class ShowOne in cliff, abstract method take_action()
|
|
# returns a two-part tuple with a tuple of column names and a tuple of
|
|
# data to be shown.
|
|
columns, data = self.cmd.take_action(parsed_args)
|
|
self.sc_mock.service_catalog.get_data.assert_called_with()
|
|
|
|
collist = ('endpoints', 'id', 'name', 'type')
|
|
self.assertEqual(collist, columns)
|
|
datalist = (
|
|
'onlyone\n public: https://public.example.com\nonlyone\n'
|
|
' admin: https://admin.example.com\n'
|
|
'<none>\n internal: https://internal.example.com\n'
|
|
'<none>\n none: https://none.example.com\n',
|
|
'qwertyuiop',
|
|
'supernova',
|
|
'compute',
|
|
)
|
|
self.assertEqual(datalist, data)
|