47423ebbb2
We have a basic implementation for a fallback mechanism that will use v1 rather than v2 when downloading schema files from glance-api fails. However, this is not sound. If the schemas are cached already, we won't check if v2 is available and fail to fallback. This patch fixes the aforementioned issue by getting the list of available versions from the server only when the API versions was not explicitly specified through the CLI. That is, for all commands that don't pass `--os-image-api-version 2`, we'll check v2's availability and we'll fallback to v1 if it isn't available. This patch also changes how we handle `/versions` calls in the client. The server has been, incorrectly, replying to requests to `/version` with a 300 error, which ended up in the client re-raising such exception. While I think 300 shouldn't raise an exception, I think we should handle that in a spearate patch. Therefore, this patch just avoids raising such exception when `/version` is explicitly called. This fallback behaviour and the check on `/versions` will be removed in future versions of the client. The later depends on this bug[0] being fixed. [0] https://bugs.launchpad.net/glance/+bug/1491350 Closes-bug: #1489381 Change-Id: Ibeba6bc86db2a97b8a2b4bd042248464cd792e5e
116 lines
4.8 KiB
Python
116 lines
4.8 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 re
|
|
|
|
from tempest_lib import exceptions
|
|
|
|
from glanceclient.tests.functional import base
|
|
|
|
|
|
class SimpleReadOnlyGlanceClientTest(base.ClientTestBase):
|
|
|
|
"""Read only functional python-glanceclient tests.
|
|
|
|
This only exercises client commands that are read only.
|
|
"""
|
|
|
|
def test_list_v1(self):
|
|
out = self.glance('--os-image-api-version 1 image-list')
|
|
endpoints = self.parser.listing(out)
|
|
self.assertTableStruct(endpoints, [
|
|
'ID', 'Name', 'Disk Format', 'Container Format',
|
|
'Size', 'Status'])
|
|
|
|
def test_list_v2(self):
|
|
out = self.glance('--os-image-api-version 2 image-list')
|
|
endpoints = self.parser.listing(out)
|
|
self.assertTableStruct(endpoints, ['ID', 'Name'])
|
|
|
|
def test_fake_action(self):
|
|
self.assertRaises(exceptions.CommandFailed,
|
|
self.glance,
|
|
'this-does-not-exist')
|
|
|
|
def test_member_list_v1(self):
|
|
tenant_name = '--tenant-id %s' % self.tenant_name
|
|
out = self.glance('--os-image-api-version 1 member-list',
|
|
params=tenant_name)
|
|
endpoints = self.parser.listing(out)
|
|
self.assertTableStruct(endpoints,
|
|
['Image ID', 'Member ID', 'Can Share'])
|
|
|
|
def test_member_list_v2(self):
|
|
try:
|
|
# NOTE(flwang): If set disk-format and container-format, Jenkins
|
|
# will raise an error said can't recognize the params, thouhg it
|
|
# works fine at local. Without the two params, Glance will
|
|
# complain. So we just catch the exception can skip it.
|
|
self.glance('--os-image-api-version 2 image-create --name temp')
|
|
except Exception:
|
|
pass
|
|
out = self.glance('--os-image-api-version 2 image-list'
|
|
' --visibility private')
|
|
image_list = self.parser.listing(out)
|
|
# NOTE(flwang): Because the member-list command of v2 is using
|
|
# image-id as required parameter, so we have to get a valid image id
|
|
# based on current environment. If there is no valid image id, we will
|
|
# pass in a fake one and expect a 404 error.
|
|
if len(image_list) > 0:
|
|
param_image_id = '--image-id %s' % image_list[0]['ID']
|
|
out = self.glance('--os-image-api-version 2 member-list',
|
|
params=param_image_id)
|
|
endpoints = self.parser.listing(out)
|
|
self.assertTableStruct(endpoints,
|
|
['Image ID', 'Member ID', 'Status'])
|
|
else:
|
|
param_image_id = '--image-id fake_image_id'
|
|
self.assertRaises(exceptions.CommandFailed,
|
|
self.glance,
|
|
'--os-image-api-version 2 member-list',
|
|
params=param_image_id)
|
|
|
|
def test_help(self):
|
|
help_text = self.glance('--os-image-api-version 2 help')
|
|
lines = help_text.split('\n')
|
|
self.assertFirstLineStartsWith(lines, 'usage: glance')
|
|
|
|
commands = []
|
|
cmds_start = lines.index('Positional arguments:')
|
|
cmds_end = lines.index('Optional arguments:')
|
|
command_pattern = re.compile('^ {4}([a-z0-9\-\_]+)')
|
|
for line in lines[cmds_start:cmds_end]:
|
|
match = command_pattern.match(line)
|
|
if match:
|
|
commands.append(match.group(1))
|
|
commands = set(commands)
|
|
wanted_commands = set(('image-create', 'image-delete', 'help',
|
|
'image-download', 'image-show', 'image-update',
|
|
'member-create', 'member-delete',
|
|
'member-list', 'image-list'))
|
|
self.assertFalse(wanted_commands - commands)
|
|
|
|
def test_version(self):
|
|
self.glance('', flags='--version')
|
|
|
|
def test_debug_list(self):
|
|
self.glance('image-list', flags='--debug')
|
|
|
|
def test_no_ssl_compression(self):
|
|
# Test deprecating this hasn't broken anything
|
|
out = self.glance('--os-image-api-version 1 '
|
|
'--no-ssl-compression image-list')
|
|
endpoints = self.parser.listing(out)
|
|
self.assertTableStruct(endpoints, [
|
|
'ID', 'Name', 'Disk Format', 'Container Format',
|
|
'Size', 'Status'])
|