From 14707dd54624b347c88c3621f81de437f017a221 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Tue, 18 Nov 2014 12:39:52 -0700 Subject: [PATCH] Create a ReST API entrypoint This creates a server entrypoint for running the Pecan+WSME infrastructure. Change-Id: I58bdeea7971f0f562e3d7a5542740283cb910a7b --- magnum/api/app.py | 28 +++++++++++++++++++- magnum/api/config.py | 29 +++++++++++++++++++++ magnum/cmd/__init__.py | 0 magnum/cmd/api.py | 54 +++++++++++++++++++++++++++++++++++++++ magnum/common/__init__.py | 0 magnum/common/service.py | 23 +++++++++++++++++ setup.cfg | 4 +++ 7 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 magnum/api/config.py create mode 100644 magnum/cmd/__init__.py create mode 100644 magnum/cmd/api.py create mode 100644 magnum/common/__init__.py create mode 100644 magnum/common/service.py diff --git a/magnum/api/app.py b/magnum/api/app.py index a342061503..3274ff7401 100644 --- a/magnum/api/app.py +++ b/magnum/api/app.py @@ -10,12 +10,38 @@ # See the License for the specific language governing permissions and # limitations under the License. +from oslo.config import cfg import pecan +from magnum.api import config as api_config from magnum.api import model +# Register options for the service +API_SERVICE_OPTS = [ + cfg.IntOpt('port', + default=9511, + help='The port for the magnum API server'), + cfg.StrOpt('host', + default='127.0.0.1', + help='The listen IP for the magnum API server') +] -def setup_app(config): +CONF = cfg.CONF +opt_group = cfg.OptGroup(name='api', + title='Options for the magnum-api service') +CONF.register_group(opt_group) +CONF.register_opts(API_SERVICE_OPTS, opt_group) + + +def get_pecan_config(): + # Set up the pecan configuration + filename = api_config.__file__.replace('.pyc', '.py') + return pecan.configuration.conf_from_file(filename) + + +def setup_app(config=None): + if not config: + config = get_pecan_config() model.init_model() app_conf = dict(config.app) diff --git a/magnum/api/config.py b/magnum/api/config.py new file mode 100644 index 0000000000..ba7319fbb3 --- /dev/null +++ b/magnum/api/config.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# +# Copyright 2013 - Noorul Islam K M +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# Pecan Application Configurations +app = { + 'root': 'magnum.api.controllers.root.RootController', + 'modules': ['magnum.api'], + 'debug': False +} + +# Custom Configurations must be in Python dictionary format:: +# +# foo = {'bar':'baz'} +# +# All configurations are accessible at:: +# pecan.conf diff --git a/magnum/cmd/__init__.py b/magnum/cmd/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/magnum/cmd/api.py b/magnum/cmd/api.py new file mode 100644 index 0000000000..d340b625cf --- /dev/null +++ b/magnum/cmd/api.py @@ -0,0 +1,54 @@ +# Copyright 2013 - Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +"""Starter script for the Magnum API service.""" + +import logging as std_logging +import os +import sys +from wsgiref import simple_server + +from oslo.config import cfg + +from magnum.api import app as api_app +from magnum.common import service +from magnum.openstack.common._i18n import _ +from magnum.openstack.common import log as logging + + +LOG = logging.getLogger(__name__) + + +def main(): + service.prepare_service(sys.argv) + + app = api_app.setup_app() + + # Create the WSGI server and start it + host, port = cfg.CONF.api.host, cfg.CONF.api.port + srv = simple_server.make_server(host, port, app) + + LOG.info(_('Starting server in PID %s') % os.getpid()) + LOG.debug("Configuration:") + cfg.CONF.log_opt_values(LOG, std_logging.DEBUG) + + if host == '0.0.0.0': + LOG.info(_('serving on 0.0.0.0:%(port)s, ' + 'view at http://127.0.0.1:%(port)s') % + dict(port=port)) + else: + LOG.info(_('serving on http://%(host)s:%(port)s') % + dict(host=host, port=port)) + + srv.serve_forever() diff --git a/magnum/common/__init__.py b/magnum/common/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/magnum/common/service.py b/magnum/common/service.py new file mode 100644 index 0000000000..0b102a2049 --- /dev/null +++ b/magnum/common/service.py @@ -0,0 +1,23 @@ +# Copyright 2013 - Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from oslo.config import cfg + +from magnum.openstack.common import log as logging + + +def prepare_service(argv=[]): + cfg.CONF(argv[1:], project='magnum') + logging.setup('magnum') + # may make sense to load DB here diff --git a/setup.cfg b/setup.cfg index fe941dff52..f13743245c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,5 +46,9 @@ keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg output_file = magnum/locale/magnum.pot +[entry_points] +console_scripts = + magnum-api = magnum.cmd.api:main + [wheel] universal = 1