diff options
| author | David Hill <dhill@redhat.com> | 2023-02-21 15:44:02 -0500 |
|---|---|---|
| committer | David Hill <dhill@redhat.com> | 2023-02-22 12:46:08 -0500 |
| commit | 1da3e48fa8c7d791016ccf6b4edaba16d87a1c67 (patch) | |
| tree | f2bf8c30cd3ed4042553d4c77af61b91c0900c60 | |
| parent | f0371614d5093463ede1b846227db6473f9ece82 (diff) | |
| download | glance-1da3e48fa8c7d791016ccf6b4edaba16d87a1c67.tar.gz | |
Enclose all APIv2 versions in single quotes
When version detection broke for v2.10, only 2.10 was changed to
be enclosed between single quotes but all of them should be the same
format, a string. In this case, some of the versions are floats
and converted to strings in build_version_object which is not pretty.
Change-Id: I3f67671c4426ff7f0080ccc5bcfb69e7f386c9fc
Closes-bug: #2008116
| -rw-r--r-- | glance/api/versions.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/glance/api/versions.py b/glance/api/versions.py index ef64e83c1..76e12f938 100644 --- a/glance/api/versions.py +++ b/glance/api/versions.py @@ -79,36 +79,36 @@ class Controller(object): version_objs = [] if CONF.image_cache_dir: version_objs.extend([ - build_version_object(2.16, 'v2', 'CURRENT'), - build_version_object(2.15, 'v2', 'SUPPORTED'), - build_version_object(2.14, 'v2', 'SUPPORTED'), + build_version_object('2.16', 'v2', 'CURRENT'), + build_version_object('2.15', 'v2', 'SUPPORTED'), + build_version_object('2.14', 'v2', 'SUPPORTED'), ]) else: version_objs.extend([ - build_version_object(2.15, 'v2', 'CURRENT'), + build_version_object('2.15', 'v2', 'CURRENT'), ]) if CONF.enabled_backends: version_objs.extend([ - build_version_object(2.13, 'v2', 'SUPPORTED'), - build_version_object(2.12, 'v2', 'SUPPORTED'), - build_version_object(2.11, 'v2', 'SUPPORTED'), + build_version_object('2.13', 'v2', 'SUPPORTED'), + build_version_object('2.12', 'v2', 'SUPPORTED'), + build_version_object('2.11', 'v2', 'SUPPORTED'), build_version_object('2.10', 'v2', 'SUPPORTED'), - build_version_object(2.9, 'v2', 'SUPPORTED'), - build_version_object(2.8, 'v2', 'SUPPORTED'), + build_version_object('2.9', 'v2', 'SUPPORTED'), + build_version_object('2.8', 'v2', 'SUPPORTED'), ]) else: version_objs.extend([ - build_version_object(2.9, 'v2', 'SUPPORTED'), + build_version_object('2.9', 'v2', 'SUPPORTED'), ]) version_objs.extend([ - build_version_object(2.7, 'v2', 'SUPPORTED'), - build_version_object(2.6, 'v2', 'SUPPORTED'), - build_version_object(2.5, 'v2', 'SUPPORTED'), - build_version_object(2.4, 'v2', 'SUPPORTED'), - build_version_object(2.3, 'v2', 'SUPPORTED'), - build_version_object(2.2, 'v2', 'SUPPORTED'), - build_version_object(2.1, 'v2', 'SUPPORTED'), - build_version_object(2.0, 'v2', 'SUPPORTED'), + build_version_object('2.7', 'v2', 'SUPPORTED'), + build_version_object('2.6', 'v2', 'SUPPORTED'), + build_version_object('2.5', 'v2', 'SUPPORTED'), + build_version_object('2.4', 'v2', 'SUPPORTED'), + build_version_object('2.3', 'v2', 'SUPPORTED'), + build_version_object('2.2', 'v2', 'SUPPORTED'), + build_version_object('2.1', 'v2', 'SUPPORTED'), + build_version_object('2.0', 'v2', 'SUPPORTED'), ]) status = explicit and http.client.OK or http.client.MULTIPLE_CHOICES |