388a97ef6d
This patch introduces "--user-flags" option which enable to add user
original CLI or config file options for their own Ryu applications.
Usage Example)
$ cat user_flags.py
from ryu import cfg
CONF = cfg.CONF
CONF.register_cli_opts([
cfg.StrOpt(
'user-cli-opt', default=None,
help='user original CLI option'),
])
$ ryu-manager --user-flags user_flags.py user_app.py
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
119 lines
3.5 KiB
Python
Executable File
119 lines
3.5 KiB
Python
Executable File
#!/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.
|
|
|
|
import os
|
|
import sys
|
|
|
|
from ryu.lib import hub
|
|
hub.patch(thread=False)
|
|
|
|
from ryu import cfg
|
|
|
|
import logging
|
|
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'),
|
|
cfg.StrOpt('pid-file', default=None, help='pid file name'),
|
|
cfg.BoolOpt('enable-debugger', default=False,
|
|
help='don\'t overwrite Python standard threading library'
|
|
'(use only for debugging)'),
|
|
cfg.StrOpt('user-flags', default=None,
|
|
help='Additional flags file for user applications'),
|
|
])
|
|
|
|
|
|
def _parse_user_flags():
|
|
"""
|
|
Parses user-flags file and loads it to register user defined options.
|
|
"""
|
|
try:
|
|
idx = list(sys.argv).index('--user-flags')
|
|
user_flags_file = sys.argv[idx + 1]
|
|
except (ValueError, IndexError):
|
|
user_flags_file = ''
|
|
|
|
if user_flags_file and os.path.isfile(user_flags_file):
|
|
from ryu.utils import _import_module_file
|
|
_import_module_file(user_flags_file)
|
|
|
|
|
|
def main(args=None, prog=None):
|
|
_parse_user_flags()
|
|
try:
|
|
CONF(args=args, prog=prog,
|
|
project='ryu', version='ryu-manager %s' % version,
|
|
default_config_files=['/usr/local/etc/ryu/ryu.conf'])
|
|
except cfg.ConfigFilesNotFoundError:
|
|
CONF(args=args, prog=prog,
|
|
project='ryu', version='ryu-manager %s' % version)
|
|
|
|
log.init_log()
|
|
logger = logging.getLogger(__name__)
|
|
|
|
if CONF.enable_debugger:
|
|
msg = 'debugging is available (--enable-debugger option is turned on)'
|
|
logger.info(msg)
|
|
else:
|
|
hub.patch(thread=True)
|
|
|
|
if CONF.pid_file:
|
|
with open(CONF.pid_file, 'w') as pid_file:
|
|
pid_file.write(str(os.getpid()))
|
|
|
|
app_lists = CONF.app_lists + CONF.app
|
|
# keep old behavior, run ofp if no application is specified.
|
|
if not app_lists:
|
|
app_lists = ['ryu.controller.ofp_handler']
|
|
|
|
app_mgr = AppManager.get_instance()
|
|
app_mgr.load_apps(app_lists)
|
|
contexts = app_mgr.create_contexts()
|
|
services = []
|
|
services.extend(app_mgr.instantiate_apps(**contexts))
|
|
|
|
webapp = wsgi.start_service(app_mgr)
|
|
if webapp:
|
|
thr = hub.spawn(webapp)
|
|
services.append(thr)
|
|
|
|
try:
|
|
hub.joinall(services)
|
|
except KeyboardInterrupt:
|
|
logger.debug("Keyboard Interrupt received. "
|
|
"Closing RYU application manager...")
|
|
finally:
|
|
app_mgr.close()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|