summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIWASE Yusuke <iwase.yusuke0@gmail.com>2016-10-20 16:48:07 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2016-10-25 16:21:38 +0900
commit57480316354618c2a987eece86e9f560e68dfe01 (patch)
tree9876d9e02b8331c611fe536146141c5b8103abf4
parent4d1bfc8585cde9c6a517957be3f0a31b1527566e (diff)
ovs: Revert ovs module path
Because contrib.ovs has been removed, we no longer need to update the path for loading ovs module. Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/lib/ovs/db_client.py7
-rw-r--r--ryu/lib/ovs/vsctl.py9
2 files changed, 5 insertions, 11 deletions
diff --git a/ryu/lib/ovs/db_client.py b/ryu/lib/ovs/db_client.py
index 5b414d18..b3662940 100644
--- a/ryu/lib/ovs/db_client.py
+++ b/ryu/lib/ovs/db_client.py
@@ -17,11 +17,8 @@
import logging
import os
-import ryu.contrib
-ryu.contrib.update_module_path()
-
-from ovs import (jsonrpc,
- stream)
+from ovs import jsonrpc
+from ovs import stream
from ovs import util as ovs_util
from ovs.db import schema
diff --git a/ryu/lib/ovs/vsctl.py b/ryu/lib/ovs/vsctl.py
index 289ca82c..c32de646 100644
--- a/ryu/lib/ovs/vsctl.py
+++ b/ryu/lib/ovs/vsctl.py
@@ -25,15 +25,12 @@ import six
import sys
import weakref
-import ryu.contrib
-ryu.contrib.update_module_path()
-
import ovs.db.data
import ovs.db.types
import ovs.poller
-from ovs import (jsonrpc,
- ovsuuid,
- stream)
+from ovs import jsonrpc
+from ovs import ovsuuid
+from ovs import stream
from ovs.db import idl
from ryu.lib import hub