From cfa7c91f0b84a45372cb7254bf459370f35faf1b Mon Sep 17 00:00:00 2001 From: Yoshihiro Kaneko Date: Wed, 10 Jul 2013 21:34:16 +0900 Subject: [PATCH] app/quantum_adapter: fix missing change to neutron Signed-off-by: Yoshihiro Kaneko Signed-off-by: FUJITA Tomonori --- ryu/app/quantum_adapter.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ryu/app/quantum_adapter.py b/ryu/app/quantum_adapter.py index 7a072beb..2ead71f9 100644 --- a/ryu/app/quantum_adapter.py +++ b/ryu/app/quantum_adapter.py @@ -20,10 +20,14 @@ import logging try: from neutronclient import client as q_client from neutronclient.common import exceptions as q_exc + from neutronclient.common.exceptions import (NeutronClientException as + client_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.common.exceptions import (QuantumClientException as + client_exc) from quantumclient.v2_0 import client as q_clientv2 from ryu.app import conf_switch_key as cs_key @@ -223,7 +227,7 @@ class OVSSwitch(object): try: self.q_api.update_port(port.ext_ids['iface-id'], body) - except (q_exc.ConnectionFailed, q_exc.QuantumClientException) as e: + except (q_exc.ConnectionFailed, client_exc) as e: self.logger.error("quantum update port failed: %s", e) # TODO: When authentication failure occurred, # it should get auth token again