diff --git a/masakari/api/api_version_request.py b/masakari/api/api_version_request.py index baeedb91..93e56ede 100644 --- a/masakari/api/api_version_request.py +++ b/masakari/api/api_version_request.py @@ -50,6 +50,7 @@ REST_API_VERSION_HISTORY = """REST API Version History: # support is fully merged. _MIN_API_VERSION = "1.0" _MAX_API_VERSION = "1.2" +# The default api version request if none is requested in the headers DEFAULT_API_VERSION = _MIN_API_VERSION diff --git a/masakari/api/openstack/wsgi.py b/masakari/api/openstack/wsgi.py index f1d395a6..640b2021 100644 --- a/masakari/api/openstack/wsgi.py +++ b/masakari/api/openstack/wsgi.py @@ -57,9 +57,6 @@ _METHODS_WITH_BODY = [ 'PUT', ] -# The default api version request if none is requested in the headers -DEFAULT_API_VERSION = "1.0" - # name of attribute to keep version method information VER_METHOD_ATTR = 'versioned_methods' diff --git a/masakari/tests/unit/api/openstack/fakes.py b/masakari/tests/unit/api/openstack/fakes.py index c4ac1c20..58c4c602 100644 --- a/masakari/tests/unit/api/openstack/fakes.py +++ b/masakari/tests/unit/api/openstack/fakes.py @@ -76,7 +76,7 @@ class HTTPRequest(os_wsgi.Request): kwargs['base_url'] = 'http://localhost/v1' use_admin_context = kwargs.pop('use_admin_context', False) project_id = kwargs.pop('project_id', uuidsentinel.fake_project_id) - version = kwargs.pop('version', os_wsgi.DEFAULT_API_VERSION) + version = kwargs.pop('version', api_version.DEFAULT_API_VERSION) out = os_wsgi.Request.blank(*args, **kwargs) out.environ['masakari.context'] = FakeRequestContext( user_id=uuidsentinel.fake_user_id,