Signed-off-by: YAMAMOTO Takashi <[email protected]>
---
ryu/cmd/ofa_neutron_agent.py | 52 ++++++++------------------------------------
1 file changed, 9 insertions(+), 43 deletions(-)
diff --git a/ryu/cmd/ofa_neutron_agent.py b/ryu/cmd/ofa_neutron_agent.py
index b7dab9e..a194f0b 100755
--- a/ryu/cmd/ofa_neutron_agent.py
+++ b/ryu/cmd/ofa_neutron_agent.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-#
+
# Copyright (C) 2014 Nippon Telegraph and Telephone Corporation.
# Copyright (C) 2014 VA Linux Systems Japan K.K.
#
@@ -20,63 +20,29 @@
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 ryu import cfg
-import sys
-from neutron.openstack.common import log as os_logging
-from neutron.common import config as osn_config
+from neutron.common import config as logging_config
+from neutron.openstack.common import log as logging
-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
-LOG = os_logging.getLogger(__name__)
-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')
-])
+LOG = logging.getLogger(__name__)
def main():
- try:
- CONF(project='ryu', version='ofa_neutron_agent %s' % version,
- default_config_files=['/usr/local/etc/ryu/ryu.conf'])
- except cfg.ConfigFilesNotFoundError:
- CONF(project='ryu', version='ofa_neutron_agent %s' % version)
-
- osn_config.setup_logging(CONF)
-
- app_lists = CONF.app_lists + CONF.app
- if not app_lists:
- app_lists = ['neutron.plugins.ofagent.agent.ofa_neutron_agent']
-
+ cfg.CONF(project='ryu')
+ logging_config.setup_logging(cfg.CONF)
+ app_lists = ['neutron.plugins.ofagent.agent.ofa_neutron_agent']
app_mgr = AppManager.get_instance()
app_mgr.load_apps(app_lists)
contexts = app_mgr.create_contexts()
- services = []
- services.extend(app_mgr.instantiate_apps(**contexts))
-
+ services = app_mgr.instantiate_apps(**contexts)
webapp = wsgi.start_service(app_mgr)
if webapp:
- thr = hub.spawn(webapp)
- services.append(thr)
-
+ services.append(hub.spawn(webapp))
try:
hub.joinall(services)
finally:
--
1.8.3.1
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel
