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 <[email protected]> --- bin/ryu-manager | 2 +- ryu/app/tunnel_port_updater.py | 2 +- ryu/app/wsgi.py | 4 ++-- ryu/controller/controller.py | 12 ++++++------ ryu/flags.py | 18 +++++++++--------- ryu/lib/ovs/bridge.py | 2 +- ryu/log.py | 12 ++++++------ 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bin/ryu-manager b/bin/ryu-manager index 454c7f4..f154bfe 100755 --- a/bin/ryu-manager +++ b/bin/ryu-manager @@ -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') diff --git a/ryu/app/tunnel_port_updater.py b/ryu/app/tunnel_port_updater.py index 7d02a8a..6f01ae5 100644 --- a/ryu/app/tunnel_port_updater.py +++ b/ryu/app/tunnel_port_updater.py @@ -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') ]) diff --git a/ryu/app/wsgi.py b/ryu/app/wsgi.py index 16ed3eb..3779b08 100644 --- a/ryu/app/wsgi.py +++ b/ryu/app/wsgi.py @@ -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]+' diff --git a/ryu/controller/controller.py b/ryu/controller/controller.py index ae2b1a9..6e4d15b 100644 --- a/ryu/controller/controller.py +++ b/ryu/controller/controller.py @@ -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') ]) diff --git a/ryu/flags.py b/ryu/flags.py index b09e4d8..b4e55d0 100644 --- a/ryu/flags.py +++ b/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') ]) diff --git a/ryu/lib/ovs/bridge.py b/ryu/lib/ovs/bridge.py index af3def1..4556e04 100644 --- a/ryu/lib/ovs/bridge.py +++ b/ryu/lib/ovs/bridge.py @@ -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') ]) diff --git a/ryu/log.py b/ryu/log.py index 7d673ca..db88ee7 100644 --- a/ryu/log.py +++ b/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') ]) -- 1.7.12 ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
