From 3edf6db1b06eb626f463f1b6ff86cd4fd5a61adf Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Wed, 10 Jul 2013 21:34:15 +0900 Subject: [PATCH] app/quantum_adapter: project rename quantum -> neutron Catch up for rename from quantumclient to neutronclient. Signed-off-by: Isaku Yamahata Signed-off-by: FUJITA Tomonori --- 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 eca13606..7a072beb 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