x/vmware-nsx
Code Issues Proposed changes

Remove neutron.common.rpc.RPCException

Browse Source 
Remove RPCException, which was just mapped directly to
oslo.messaging.MessagingException for the purposes of minimizing the
impact to the code base when moving from openstack.common.rpc to
oslo.messaging.

Part of blueprint drop-rpc-compat.

Change-Id: Idc5af503f24217fbd2d982c338434c200d025521
This commit is contained in:
Russell Bryant 2014-11-07 00:21:10 +01:00
parent 46dbc4d763
commit a7bcb09df5
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/l3_agent.py
View File

@ -1896,7 +1896,7 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback,
self._queue.add(update)
self.fullsync = False
LOG.debug(_("_sync_routers_task successfully completed"))
except n_rpc.RPCException:
except messaging.MessagingException:
LOG.exception(_("Failed synchronizing routers due to RPC error"))
self.fullsync = True
except Exception:

3
neutron/agent/metadata/agent.py
View File

@ -24,6 +24,7 @@ eventlet.monkey_patch()
import httplib2
from neutronclient.v2_0 import client
from oslo.config import cfg
from oslo import messaging
import six.moves.urllib.parse as urlparse
import webob
@ -167,7 +168,7 @@ class MetadataProxyHandler(object):
if self.use_rpc:
try:
return self.plugin_rpc.get_ports(self.context, filters)
except (n_rpc.RPCException, AttributeError):
except (messaging.MessagingException, AttributeError):
# TODO(obondarev): remove fallback once RPC is proven
# to work fine with metadata agent (K or L release at most)
LOG.warning(_LW('Server does not support metadata RPC, '

1
neutron/common/rpc.py
View File

@ -275,6 +275,5 @@ def create_connection(new=True):
# exceptions
RPCException = messaging.MessagingException
RemoteError = messaging.RemoteError
MessagingTimeout = messaging.MessagingTimeout

4
neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py
View File

@ -16,6 +16,8 @@ import collections
import eventlet
import netaddr
from oslo import messaging
from neutron.common import constants as l3_constants
from neutron.common import rpc as n_rpc
from neutron.common import topics
@ -284,7 +286,7 @@ class RoutingServiceHelper():
if device_ids:
return self.plugin_rpc.get_routers(self.context,
hd_ids=device_ids)
except n_rpc.RPCException:
except messaging.MessagingException:
LOG.exception(_("RPC Error in fetching routers from plugin"))
self.fullsync = True

4
neutron/tests/unit/cisco/cfg_agent/test_routing_svc_helper.py
View File

@ -15,10 +15,10 @@
import copy
import mock
from oslo.config import cfg
from oslo import messaging
from neutron.common import config as base_config
from neutron.common import constants as l3_constants
from neutron.common import rpc as n_rpc
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.cisco.cfg_agent import cfg_agent
@ -583,7 +583,7 @@ class TestBasicRoutingOperations(base.BaseTestCase):
@mock.patch("eventlet.GreenPool.spawn_n")
def test_process_services_with_rpc_error(self, mock_spawn):
router, port = prepare_router_data()
self.plugin_api.get_routers.side_effect = n_rpc.RPCException
self.plugin_api.get_routers.side_effect = messaging.MessagingException
self.routing_helper.fullsync = False
self.routing_helper.updated_routers.add(router['id'])
self.routing_helper.process_service()