From 92b2e10f726cbf124b21f169497d8f43662bfed6 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 16 Jul 2014 13:34:21 +0400 Subject: [PATCH] Move middleware package to api package All middlewares could be used only for api stuff, so, moving them to the api package. Change-Id: I1303f4b3c3bd2a8b4a883d86ba4f91aba92496e0 --- sahara/{ => api}/middleware/__init__.py | 0 sahara/{ => api}/middleware/auth_valid.py | 0 sahara/{ => api}/middleware/log_exchange.py | 0 sahara/main.py | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename sahara/{ => api}/middleware/__init__.py (100%) rename sahara/{ => api}/middleware/auth_valid.py (100%) rename sahara/{ => api}/middleware/log_exchange.py (100%) diff --git a/sahara/middleware/__init__.py b/sahara/api/middleware/__init__.py similarity index 100% rename from sahara/middleware/__init__.py rename to sahara/api/middleware/__init__.py diff --git a/sahara/middleware/auth_valid.py b/sahara/api/middleware/auth_valid.py similarity index 100% rename from sahara/middleware/auth_valid.py rename to sahara/api/middleware/auth_valid.py diff --git a/sahara/middleware/log_exchange.py b/sahara/api/middleware/log_exchange.py similarity index 100% rename from sahara/middleware/log_exchange.py rename to sahara/api/middleware/log_exchange.py diff --git a/sahara/main.py b/sahara/main.py index 91873a4c..fafbe21b 100644 --- a/sahara/main.py +++ b/sahara/main.py @@ -22,14 +22,14 @@ import stevedore from werkzeug import exceptions as werkzeug_exceptions from sahara.api import acl +from sahara.api.middleware import auth_valid +from sahara.api.middleware import log_exchange from sahara.api import v10 as api_v10 from sahara.api import v11 as api_v11 from sahara import config from sahara import context from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.middleware import auth_valid -from sahara.middleware import log_exchange from sahara.openstack.common import log from sahara.plugins import base as plugins_base from sahara.service import api as service_api