Change API v1 path to explicit module
In order to prepare API v2, we need to isolate API v1 code into a separate module called climate.api.v1 Implements blueprint: pecan-wsme Change-Id: I9e968370ba9ac8d21f5c099f1b09587d9f6b821e
This commit is contained in:
parent
7e36684935
commit
e141b08a1e
@ -19,9 +19,9 @@ from keystoneclient.middleware import auth_token
|
|||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
from werkzeug import exceptions as werkzeug_exceptions
|
from werkzeug import exceptions as werkzeug_exceptions
|
||||||
|
|
||||||
from climate.api.oshosts import v1_0 as host_api_v1_0
|
from climate.api.v1.oshosts import v1_0 as host_api_v1_0
|
||||||
from climate.api import utils as api_utils
|
from climate.api.v1 import utils as api_utils
|
||||||
from climate.api import v1_0 as api_v1_0
|
from climate.api.v1 import v1_0 as api_v1_0
|
||||||
from climate.openstack.common.gettextutils import _
|
from climate.openstack.common.gettextutils import _
|
||||||
from climate.openstack.common import log
|
from climate.openstack.common import log
|
||||||
from climate.openstack.common.middleware import debug
|
from climate.openstack.common.middleware import debug
|
@ -13,9 +13,9 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from climate.api.oshosts import service
|
from climate.api.v1.oshosts import service
|
||||||
from climate.api import utils as api_utils
|
from climate.api.v1 import utils as api_utils
|
||||||
from climate.api import validation
|
from climate.api.v1 import validation
|
||||||
from climate import utils
|
from climate import utils
|
||||||
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from climate.api import service
|
from climate.api.v1 import service
|
||||||
from climate.api import utils as api_utils
|
from climate.api.v1 import utils as api_utils
|
||||||
from climate.api import validation
|
from climate.api.v1 import validation
|
||||||
from climate.openstack.common import log as logging
|
from climate.openstack.common import log as logging
|
||||||
from climate import utils
|
from climate import utils
|
||||||
|
|
@ -17,7 +17,7 @@ import functools
|
|||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from climate.api import utils as api_utils
|
from climate.api.v1 import utils as api_utils
|
||||||
from climate import exceptions
|
from climate import exceptions
|
||||||
|
|
||||||
|
|
@ -22,7 +22,7 @@ from oslo.config import cfg
|
|||||||
|
|
||||||
gettext.install('climate', unicode=1)
|
gettext.install('climate', unicode=1)
|
||||||
|
|
||||||
from climate.api import app as api_app
|
from climate.api.v1 import app as v1_app
|
||||||
from climate.openstack.common import log as logging
|
from climate.openstack.common import log as logging
|
||||||
from climate.utils import service as service_utils
|
from climate.utils import service as service_utils
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ def main():
|
|||||||
cfg.CONF(sys.argv[1:], project='climate', prog='climate-api')
|
cfg.CONF(sys.argv[1:], project='climate', prog='climate-api')
|
||||||
service_utils.prepare_service(sys.argv)
|
service_utils.prepare_service(sys.argv)
|
||||||
logging.setup("climate")
|
logging.setup("climate")
|
||||||
app = api_app.make_app()
|
app = v1_app.make_app()
|
||||||
|
|
||||||
wsgi.server(eventlet.listen((CONF.host, CONF.port), backlog=500), app)
|
wsgi.server(eventlet.listen((CONF.host, CONF.port), backlog=500), app)
|
||||||
|
|
||||||
|
0
climate/tests/api/v1/__init__.py
Normal file
0
climate/tests/api/v1/__init__.py
Normal file
0
climate/tests/api/v1/oshosts/__init__.py
Normal file
0
climate/tests/api/v1/oshosts/__init__.py
Normal file
@ -13,7 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from climate.api.oshosts import service as service_api
|
from climate.api.v1.oshosts import service as service_api
|
||||||
from climate import tests
|
from climate import tests
|
||||||
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from climate.api.oshosts import service as service_api
|
from climate.api.v1.oshosts import service as service_api
|
||||||
from climate.api.oshosts import v1_0 as api
|
from climate.api.v1.oshosts import v1_0 as api
|
||||||
from climate.api import utils as utils_api
|
from climate.api.v1 import utils as utils_api
|
||||||
from climate import tests
|
from climate import tests
|
||||||
|
|
||||||
|
|
@ -18,9 +18,9 @@ from keystoneclient.middleware import auth_token
|
|||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
from werkzeug import exceptions as werkzeug_exceptions
|
from werkzeug import exceptions as werkzeug_exceptions
|
||||||
|
|
||||||
from climate.api import app
|
from climate.api.v1 import app
|
||||||
from climate.api.oshosts import v1_0 as host_api_v1_0
|
from climate.api.v1.oshosts import v1_0 as host_api_v1_0
|
||||||
from climate.api import utils as api_utils
|
from climate.api.v1 import utils as api_utils
|
||||||
from climate import tests
|
from climate import tests
|
||||||
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from climate.api import service as service_api
|
from climate.api.v1 import service as service_api
|
||||||
from climate import tests
|
from climate import tests
|
||||||
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
import flask
|
import flask
|
||||||
|
|
||||||
from climate.api import utils
|
from climate.api.v1 import utils
|
||||||
from climate import tests
|
from climate import tests
|
||||||
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from climate.api import service as service_api
|
from climate.api.v1 import service as service_api
|
||||||
from climate.api import utils as utils_api
|
from climate.api.v1 import utils as utils_api
|
||||||
from climate.api import v1_0 as api
|
from climate.api.v1 import v1_0 as api
|
||||||
from climate import tests
|
from climate import tests
|
||||||
|
|
||||||
|
|
@ -13,9 +13,9 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
from climate.api import service as service_api
|
from climate.api.v1 import service as service_api
|
||||||
from climate.api import utils as api_utils
|
from climate.api.v1 import utils as api_utils
|
||||||
from climate.api import validation as validation_api
|
from climate.api.v1 import validation as validation_api
|
||||||
from climate import exceptions
|
from climate import exceptions
|
||||||
from climate import tests
|
from climate import tests
|
||||||
|
|
@ -231,7 +231,7 @@
|
|||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Options defined in climate.api.app
|
# Options defined in climate.api.v1.app
|
||||||
#
|
#
|
||||||
|
|
||||||
# Log request/response exchange details: environ, headers and
|
# Log request/response exchange details: environ, headers and
|
||||||
|
Loading…
Reference in New Issue
Block a user