Skip to content

Commit 1da3e48

Browse files
committed
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
1 parent f037161 commit 1da3e48

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

glance/api/versions.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,36 +79,36 @@ def build_version_object(version, path, status):
7979
version_objs = []
8080
if CONF.image_cache_dir:
8181
version_objs.extend([
82-
build_version_object(2.16, 'v2', 'CURRENT'),
83-
build_version_object(2.15, 'v2', 'SUPPORTED'),
84-
build_version_object(2.14, 'v2', 'SUPPORTED'),
82+
build_version_object('2.16', 'v2', 'CURRENT'),
83+
build_version_object('2.15', 'v2', 'SUPPORTED'),
84+
build_version_object('2.14', 'v2', 'SUPPORTED'),
8585
])
8686
else:
8787
version_objs.extend([
88-
build_version_object(2.15, 'v2', 'CURRENT'),
88+
build_version_object('2.15', 'v2', 'CURRENT'),
8989
])
9090
if CONF.enabled_backends:
9191
version_objs.extend([
92-
build_version_object(2.13, 'v2', 'SUPPORTED'),
93-
build_version_object(2.12, 'v2', 'SUPPORTED'),
94-
build_version_object(2.11, 'v2', 'SUPPORTED'),
92+
build_version_object('2.13', 'v2', 'SUPPORTED'),
93+
build_version_object('2.12', 'v2', 'SUPPORTED'),
94+
build_version_object('2.11', 'v2', 'SUPPORTED'),
9595
build_version_object('2.10', 'v2', 'SUPPORTED'),
96-
build_version_object(2.9, 'v2', 'SUPPORTED'),
97-
build_version_object(2.8, 'v2', 'SUPPORTED'),
96+
build_version_object('2.9', 'v2', 'SUPPORTED'),
97+
build_version_object('2.8', 'v2', 'SUPPORTED'),
9898
])
9999
else:
100100
version_objs.extend([
101-
build_version_object(2.9, 'v2', 'SUPPORTED'),
101+
build_version_object('2.9', 'v2', 'SUPPORTED'),
102102
])
103103
version_objs.extend([
104-
build_version_object(2.7, 'v2', 'SUPPORTED'),
105-
build_version_object(2.6, 'v2', 'SUPPORTED'),
106-
build_version_object(2.5, 'v2', 'SUPPORTED'),
107-
build_version_object(2.4, 'v2', 'SUPPORTED'),
108-
build_version_object(2.3, 'v2', 'SUPPORTED'),
109-
build_version_object(2.2, 'v2', 'SUPPORTED'),
110-
build_version_object(2.1, 'v2', 'SUPPORTED'),
111-
build_version_object(2.0, 'v2', 'SUPPORTED'),
104+
build_version_object('2.7', 'v2', 'SUPPORTED'),
105+
build_version_object('2.6', 'v2', 'SUPPORTED'),
106+
build_version_object('2.5', 'v2', 'SUPPORTED'),
107+
build_version_object('2.4', 'v2', 'SUPPORTED'),
108+
build_version_object('2.3', 'v2', 'SUPPORTED'),
109+
build_version_object('2.2', 'v2', 'SUPPORTED'),
110+
build_version_object('2.1', 'v2', 'SUPPORTED'),
111+
build_version_object('2.0', 'v2', 'SUPPORTED'),
112112
])
113113

114114
status = explicit and http.client.OK or http.client.MULTIPLE_CHOICES

0 commit comments

Comments
 (0)