openstack/nova
Code Issues Proposed changes

Merge "Fixed incorrect names/comments for API version 2.18"

Browse Source
This commit is contained in:
Jenkins 2016-01-26 14:16:20 +00:00 committed by Gerrit Code Review
commit 3310430f9e
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/auth.py
View File

@ -74,7 +74,7 @@ class NoAuthMiddleware(NoAuthMiddlewareBase):
return self.base_call(req, True, always_admin=False) return self.base_call(req, True, always_admin=False)
class NoAuthMiddlewareV2_17(NoAuthMiddlewareBase): class NoAuthMiddlewareV2_18(NoAuthMiddlewareBase):
"""Return a fake token if one isn't specified. """Return a fake token if one isn't specified.
This provides a version of the middleware which does not add This provides a version of the middleware which does not add

2
nova/tests/functional/api_paste_fixture.py
View File

@ -63,5 +63,5 @@ class ApiPasteNoProjectId(ApiPasteV21Fixture):
"paste.filter_factory = nova.api.openstack.auth:" "paste.filter_factory = nova.api.openstack.auth:"
"NoAuthMiddleware.factory", "NoAuthMiddleware.factory",
"paste.filter_factory = nova.api.openstack.auth:" "paste.filter_factory = nova.api.openstack.auth:"
"NoAuthMiddlewareV2_17.factory") "NoAuthMiddlewareV2_18.factory")
target_file.write(line) target_file.write(line)

2
nova/tests/functional/api_sample_tests/api_sample_base.py
View File

@ -84,7 +84,7 @@ class ApiSampleTestBaseV21(testscenarios.WithScenarios,
'_legacy_v2_code': True, '_legacy_v2_code': True,
'_additional_fixtures': [ '_additional_fixtures': [
api_paste_fixture.ApiPasteLegacyV2Fixture]}), api_paste_fixture.ApiPasteLegacyV2Fixture]}),
# test v2.16 code without project id # test v2.18 code without project id
('v2_1_noproject_id', { ('v2_1_noproject_id', {
'api_major_version': 'v2.1', 'api_major_version': 'v2.1',
'_project_id': False, '_project_id': False,

2
nova/tests/unit/api/openstack/compute/test_auth.py
View File

@ -35,7 +35,7 @@ class TestNoAuthMiddleware(testscenarios.WithScenarios, test.NoDBTestCase):
'auth_middleware': auth.NoAuthMiddleware}), 'auth_middleware': auth.NoAuthMiddleware}),
('no_project_id', { ('no_project_id', {
'expected_url': 'http://localhost/v2.1', 'expected_url': 'http://localhost/v2.1',
'auth_middleware': auth.NoAuthMiddlewareV2_17}), 'auth_middleware': auth.NoAuthMiddlewareV2_18}),
] ]
def setUp(self): def setUp(self):

2
releasenotes/notes/optional_project_id-6aebf1cb394d498f.yaml
View File

@ -1,7 +1,7 @@
--- ---
features: features:
- Provides API 2.17, which makes the use of project_ids in API urls - Provides API 2.18, which makes the use of project_ids in API urls
optional. optional.
upgrade: upgrade: