summaryrefslogtreecommitdiffhomepage
path: root/bin
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2012-10-12 11:16:19 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2012-11-03 15:02:57 +0900
commit0ae9c296877d2f5e6284adde86cfcbe40d04ac36 (patch)
tree97c6510c793774d6296ecf386da0bf591fff6974 /bin
parent6eeddaa2a43c86f9c431330125be001ff062698a (diff)
prepare contrib directory which holds third party library
- create ryu/contrib directory - adjust module load path for third party library and prioritize our own copy than system's - teach ryu-manager ryu/contrib - run_tests.sh: exclude contrib dir for pep8 third party files will be included under ryu/contrib. Third party files aren't suitable to our pep8 check because they aren't under our control. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ryu-manager6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/ryu-manager b/bin/ryu-manager
index 4d6c4908..002cc590 100755
--- a/bin/ryu-manager
+++ b/bin/ryu-manager
@@ -33,6 +33,12 @@ 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
+
FLAGS = gflags.FLAGS
gflags.DEFINE_bool('version', False, 'output version information and exit')