From: Isaku Yamahata <[email protected]>

Catch up for rename from quantumclient to neutronclient.

Signed-off-by: Isaku Yamahata <[email protected]>
---
 ryu/app/quantum_adapter.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ryu/app/quantum_adapter.py b/ryu/app/quantum_adapter.py
index eca1360..7a072be 100644
--- a/ryu/app/quantum_adapter.py
+++ b/ryu/app/quantum_adapter.py
@@ -17,9 +17,14 @@
 from oslo.config import cfg
 import logging
 
-from quantumclient import client as q_client
-from quantumclient.common import exceptions as q_exc
-from quantumclient.v2_0 import client as q_clientv2
+try:
+    from neutronclient import client as q_client
+    from neutronclient.common import exceptions as q_exc
+    from neutronclient.v2_0 import client as q_clientv2
+except ImportError:
+    from quantumclient import client as q_client
+    from quantumclient.common import exceptions as q_exc
+    from quantumclient.v2_0 import client as q_clientv2
 
 from ryu.app import conf_switch_key as cs_key
 from ryu.app import rest_nw_id
-- 
1.7.9.5


------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Ryu-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ryu-devel

Reply via email to