diff options
author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-08-30 14:08:46 +0900 |
---|---|---|
committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-09-02 14:41:27 +0900 |
commit | f731bc88e33e3bae160c70839dda60941d2893e6 (patch) | |
tree | 363a3e85e94d5ad65d856275334fe4c9579839e7 /bin | |
parent | 519b3026ebc096c3e9a833bee631b50c0ad0a308 (diff) |
move ryu-manager to entrypoints
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/ryu-manager | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/bin/ryu-manager b/bin/ryu-manager deleted file mode 100755 index cc1ea747..00000000 --- a/bin/ryu-manager +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (C) 2011, 2012 Nippon Telegraph and Telephone Corporation. -# Copyright (C) 2011 Isaku Yamahata <yamahata at valinux co jp> -# -# 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 ryu.lib import hub -hub.patch() - -# TODO: -# Right now, we have our own patched copy of ovs python bindings -# Once our modification is upstreamed and widely deployed, -# use it -# -# NOTE: this modifies sys.path and thus affects the following imports. -# eg. oslo.config.cfg. -import ryu.contrib - -from oslo.config import cfg -import logging -import sys - -from ryu import log -log.early_init_log(logging.DEBUG) - -from ryu import flags -from ryu import version -from ryu.app import wsgi -from ryu.base.app_manager import AppManager -from ryu.controller import controller -from ryu.topology import switches - - -CONF = cfg.CONF -CONF.register_cli_opts([ - cfg.ListOpt('app-lists', default=[], - help='application module name to run'), - cfg.MultiStrOpt('app', positional=True, default=[], - help='application module name to run') -]) - - -def main(): - try: - CONF(project='ryu', version='ryu-manager %s' % version, - default_config_files=['/usr/local/etc/ryu/ryu.conf']) - except cfg.ConfigFilesNotFoundError: - CONF(project='ryu', version='ryu-manager %s' % version) - - log.init_log() - - # always enable ofp for now. - app_lists = CONF.app_lists + CONF.app + ['ryu.controller.ofp_handler'] - - app_mgr = AppManager() - app_mgr.load_apps(app_lists) - contexts = app_mgr.create_contexts() - app_mgr.instantiate_apps(**contexts) - - services = [] - - ctlr = controller.OpenFlowController() - thr = hub.spawn(ctlr) - services.append(thr) - - webapp = wsgi.start_service(app_mgr) - if webapp: - thr = hub.spawn(webapp) - services.append(thr) - - try: - hub.joinall(services) - finally: - app_mgr.close() - - -if __name__ == "__main__": - main() |