move registration of quantum adapter into quantum adapter module.
Good for modularization.
Signed-off-by: Isaku Yamahata <yamah...@valinux.co.jp>
---
ryu/app/quantum_adapter.py | 23 +++++++++++++++++++++++
ryu/flags.py | 26 ++++----------------------
2 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/ryu/app/quantum_adapter.py b/ryu/app/quantum_adapter.py
index b77451f..6e5edb5 100644
--- a/ryu/app/quantum_adapter.py
+++ b/ryu/app/quantum_adapter.py
@@ -39,6 +39,29 @@ from ryu.lib.quantum_ifaces import QuantumIfaces
CONF = cfg.CONF
+CONF.register_cli_opts([
+ # app/quantum_adapter
+ cfg.StrOpt('quantum-url', default='http://localhost:9696',
+ help='URL for connecting to quantum'),
+ cfg.IntOpt('quantum-url-timeout', default=30,
+ help='timeout value for connecting to quantum in seconds'),
+ cfg.StrOpt('quantum-admin-username', default='quantum',
+ help='username for connecting to quantum in admin context'),
+ 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',
+ help='tenant name for connecting to quantum in admin context'),
+ 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',
+ help='auth strategy for connecting to quantum in admin'
+ 'context'),
+ cfg.StrOpt('quantum-controller-addr', default=None,
+ help='openflow method:address:port to set controller of'
+ 'ovs bridge')
+])
+
+
def _get_auth_token(logger):
httpclient = q_client.HTTPClient(
username=CONF.quantum_admin_username,
diff --git a/ryu/flags.py b/ryu/flags.py
index 110fb54..a318c34 100644
--- a/ryu/flags.py
+++ b/ryu/flags.py
@@ -28,6 +28,7 @@ def _register_cli_options(module_name):
pass
+_register_cli_options('ryu.app.quantum_adapter')
_register_cli_options('ryu.app.wsgi')
_register_cli_options('ryu.log')
_register_cli_options('ryu.topology.switches')
@@ -37,25 +38,6 @@ _register_cli_options('ryu.topology.switches')
# global options
CONF = cfg.CONF
-
-CONF.register_cli_opts([
- # app/quantum_adapter
- cfg.StrOpt('quantum-url', default='http://localhost:9696',
- help='URL for connecting to quantum'),
- cfg.IntOpt('quantum-url-timeout', default=30,
- help='timeout value for connecting to quantum in seconds'),
- cfg.StrOpt('quantum-admin-username', default='quantum',
- help='username for connecting to quantum in admin context'),
- 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',
- help='tenant name for connecting to quantum in admin context'),
- 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',
- help='auth strategy for connecting to quantum in admin'
- 'context'),
- cfg.StrOpt('quantum-controller-addr', default=None,
- help='openflow method:address:port to set controller of'
- 'ovs bridge')
-])
+# nothing yet
+# CONF.register_cli_options(...)
+# CONF.register_options(...)
--
1.7.10.4
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
_______________________________________________
Ryu-devel mailing list
Ryu-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ryu-devel
