From 3e79fbd56a7c7d0479e5a4e6a900af546a3d1020 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 12 Feb 2013 17:20:58 +0900 Subject: adjust import order in ryu-manager and add a comment. Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- bin/ryu-manager | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/bin/ryu-manager b/bin/ryu-manager index d53906b1..1e8d3aa6 100755 --- a/bin/ryu-manager +++ b/bin/ryu-manager @@ -20,6 +20,15 @@ import gevent from gevent import monkey monkey.patch_all() +# 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. openstack.common.cfg. +import ryu.contrib + from openstack.common import cfg import logging import sys @@ -33,12 +42,6 @@ from ryu.app import wsgi from ryu.base.app_manager import AppManager from ryu.controller import controller -# TODO: -# Right now, we have our own patched copy of ovs python bindings -# Once our modification is upstreamed and widely deployed, -# use it -import ryu.contrib - CONF = cfg.CONF CONF.register_cli_opts([ -- cgit v1.2.3