From fd11b4264da0cef395788b0e0ee12c86cb65ec41 Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Mon, 20 Oct 2014 11:19:02 +1100 Subject: [PATCH] Remove superfluous except/re-raise This exception code catches all exceptions, and then always raises them again. More interestingly, it uses excutils.save_and_reraise_exception incorrectly (outside a `with` statement), which triggers the pylint test designed to catch exactly this. Change-Id: Iab9d69944cbae5257682ac65ff2b8fba3ef7017e --- .../l3_router/brocade/l3_router_plugin.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/neutron/services/l3_router/brocade/l3_router_plugin.py b/neutron/services/l3_router/brocade/l3_router_plugin.py index 56428c8c2..1826b83a6 100644 --- a/neutron/services/l3_router/brocade/l3_router_plugin.py +++ b/neutron/services/l3_router/brocade/l3_router_plugin.py @@ -101,15 +101,13 @@ class BrocadeSVIPlugin(router.L3RouterPlugin): """ delete a vrf on NOS device.""" router = super(BrocadeSVIPlugin, self).get_router(context, router_id) super(BrocadeSVIPlugin, self).delete_router(context, router_id) - try: - switch = self._switch - self._driver.delete_router(switch['address'], - switch['username'], - switch['password'], - switch['rbridge_id'], - str(router['id'])) - except Exception: - excutils.save_and_reraise_exception() + + switch = self._switch + self._driver.delete_router(switch['address'], + switch['username'], + switch['password'], + switch['rbridge_id'], + str(router['id'])) def add_router_interface(self, context, router_id, interface_info): """creates svi on NOS device and assigns ip addres to SVI.""" -- 2.45.2