change --foo_bar options to --foo-bar
rename options. (s/_/-/) according to Isaku Yamahata, this makes us look similar to openstack. caveat: no backward compat is provided. you need to update both of config files and cli options. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
parent
be17cd3fbd
commit
4523b1b64c
|
@ -45,7 +45,7 @@ from ryu.controller import controller
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_cli_opts([
|
||||
cfg.ListOpt('app_lists', default=[],
|
||||
cfg.ListOpt('app-lists', default=[],
|
||||
help='application module name to run'),
|
||||
cfg.MultiStrOpt('app', positional=True, default=[],
|
||||
help='application module name to run')
|
||||
|
|
|
@ -35,7 +35,7 @@ from ryu.lib.ovs import bridge as ovs_bridge
|
|||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts([
|
||||
cfg.StrOpt('tunnel_type', default='gre',
|
||||
cfg.StrOpt('tunnel-type', default='gre',
|
||||
help='tunnel type for ovs tunnel port')
|
||||
])
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@ LOG = logging.getLogger('ryu.app.wsgi')
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_cli_opts([
|
||||
cfg.StrOpt('wsapi_host', default='', help='webapp listen host'),
|
||||
cfg.IntOpt('wsapi_port', default=8080, help='webapp listen port')
|
||||
cfg.StrOpt('wsapi-host', default='', help='webapp listen host'),
|
||||
cfg.IntOpt('wsapi-port', default=8080, help='webapp listen port')
|
||||
])
|
||||
|
||||
HEX_PATTERN = r'0x[0-9a-z]+'
|
||||
|
|
|
@ -44,14 +44,14 @@ LOG = logging.getLogger('ryu.controller.controller')
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_cli_opts([
|
||||
cfg.StrOpt('ofp_listen_host', default='', help='openflow listen host'),
|
||||
cfg.IntOpt('ofp_tcp_listen_port', default=ofproto_common.OFP_TCP_PORT,
|
||||
cfg.StrOpt('ofp-listen-host', default='', help='openflow listen host'),
|
||||
cfg.IntOpt('ofp-tcp-listen-port', default=ofproto_common.OFP_TCP_PORT,
|
||||
help='openflow tcp listen port'),
|
||||
cfg.IntOpt('ofp_ssl_listen_port', default=ofproto_common.OFP_SSL_PORT,
|
||||
cfg.IntOpt('ofp-ssl-listen-port', default=ofproto_common.OFP_SSL_PORT,
|
||||
help='openflow ssl listen port'),
|
||||
cfg.StrOpt('ctl_privkey', default=None, help='controller private key'),
|
||||
cfg.StrOpt('ctl_cert', default=None, help='controller certificate'),
|
||||
cfg.StrOpt('ca_certs', default=None, help='CA certificates')
|
||||
cfg.StrOpt('ctl-privkey', default=None, help='controller private key'),
|
||||
cfg.StrOpt('ctl-cert', default=None, help='controller certificate'),
|
||||
cfg.StrOpt('ca-certs', default=None, help='CA certificates')
|
||||
])
|
||||
|
||||
|
||||
|
|
18
ryu/flags.py
18
ryu/flags.py
|
@ -23,24 +23,24 @@ CONF = cfg.CONF
|
|||
|
||||
CONF.register_cli_opts([
|
||||
# GLOBAL flags
|
||||
cfg.BoolOpt('monkey_patch', default=False, help='do monkey patch'),
|
||||
cfg.BoolOpt('monkey-patch', default=False, help='do monkey patch'),
|
||||
# app/quantum_adapter
|
||||
cfg.StrOpt('quantum_url', default='http://localhost:9696',
|
||||
cfg.StrOpt('quantum-url', default='http://localhost:9696',
|
||||
help='URL for connecting to quantum'),
|
||||
cfg.IntOpt('quantum_url_timeout', default=30,
|
||||
cfg.IntOpt('quantum-url-timeout', default=30,
|
||||
help='timeout value for connecting to quantum in seconds'),
|
||||
cfg.StrOpt('quantum_admin_username', default='quantum',
|
||||
cfg.StrOpt('quantum-admin-username', default='quantum',
|
||||
help='username for connecting to quantum in admin context'),
|
||||
cfg.StrOpt('quantum_admin_password', default='service_password',
|
||||
cfg.StrOpt('quantum-admin-password', default='service_password',
|
||||
help='password for connecting to quantum in admin context'),
|
||||
cfg.StrOpt('quantum_admin_tenant_name', default='service',
|
||||
cfg.StrOpt('quantum-admin-tenant-name', default='service',
|
||||
help='tenant name for connecting to quantum in admin context'),
|
||||
cfg.StrOpt('quantum_admin_auth_url', default='http://localhost:5000/v2.0',
|
||||
cfg.StrOpt('quantum-admin-auth-url', default='http://localhost:5000/v2.0',
|
||||
help='auth url for connecting to quantum in admin context'),
|
||||
cfg.StrOpt('quantum_auth_strategy', default='keystone',
|
||||
cfg.StrOpt('quantum-auth-strategy', default='keystone',
|
||||
help='auth strategy for connecting to quantum in admin'
|
||||
'context'),
|
||||
cfg.StrOpt('quantum_controller_addr', default=None,
|
||||
cfg.StrOpt('quantum-controller-addr', default=None,
|
||||
help='openflow method:address:port to set controller of'
|
||||
'ovs bridge')
|
||||
])
|
||||
|
|
|
@ -30,7 +30,7 @@ LOG = logging.getLogger(__name__)
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts([
|
||||
cfg.IntOpt('ovsdb_timeout', default=2, help='ovsdb timeout')
|
||||
cfg.IntOpt('ovsdb-timeout', default=2, help='ovsdb timeout')
|
||||
])
|
||||
|
||||
|
||||
|
|
12
ryu/log.py
12
ryu/log.py
|
@ -25,13 +25,13 @@ import sys
|
|||
CONF = cfg.CONF
|
||||
|
||||
CONF.register_cli_opts([
|
||||
cfg.IntOpt('default_log_level', default=None, help='default log level'),
|
||||
cfg.IntOpt('default-log-level', default=None, help='default log level'),
|
||||
cfg.BoolOpt('verbose', default=False, help='show debug output'),
|
||||
cfg.BoolOpt('use_stderr', default=True, help='log to standard error'),
|
||||
cfg.StrOpt('use_syslog', default=False, help='output to syslog'),
|
||||
cfg.StrOpt('log_dir', default=None, help='log file directory'),
|
||||
cfg.StrOpt('log_file', default=None, help='log file name'),
|
||||
cfg.StrOpt('log_file_mode', default='0644',
|
||||
cfg.BoolOpt('use-stderr', default=True, help='log to standard error'),
|
||||
cfg.StrOpt('use-syslog', default=False, help='output to syslog'),
|
||||
cfg.StrOpt('log-dir', default=None, help='log file directory'),
|
||||
cfg.StrOpt('log-file', default=None, help='log file name'),
|
||||
cfg.StrOpt('log-file-mode', default='0644',
|
||||
help='default log file permission')
|
||||
])
|
||||
|
||||
|
|
Loading…
Reference in New Issue