From: Angus Lees <gus@inodes.org>
Date: Mon, 25 Aug 2014 02:02:16 +0000 (+1000)
Subject: Fix incorrect exception order in _execute_request
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b0d763e92218391aae51b205f303a4d6712d87d7;p=openstack-build%2Fneutron-build.git

Fix incorrect exception order in _execute_request

_execute_request has a list of exception handlers to log various types
of errors with more specific error messages. Unfortunately, it catches
requests.exceptions.ConnectionError before requests.exceptions.SSLError,
but ConnectionError is a superclass of SSLError so the latter is never
invoked.

This change corrects the exception handling order, and enables the
bad-except-order pylint check now that the check passes.

Change-Id: I92bacd6088de5cbc170bc5c081a1db1baeec69e7
Closes-Bug: #1360970
---

diff --git a/.pylintrc b/.pylintrc
index 0c90b4ad3..4611e192d 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -19,7 +19,6 @@ disable=
  locally-disabled,
 # "E" Error for important programming issues (likely bugs)
  access-member-before-definition,
- bad-except-order,
  bad-super-call,
  maybe-no-member,
  no-member,
diff --git a/neutron/services/loadbalancer/drivers/netscaler/ncc_client.py b/neutron/services/loadbalancer/drivers/netscaler/ncc_client.py
index 87e11fca6..b23bbb0ba 100644
--- a/neutron/services/loadbalancer/drivers/netscaler/ncc_client.py
+++ b/neutron/services/loadbalancer/drivers/netscaler/ncc_client.py
@@ -130,15 +130,15 @@ class NSClient(object):
         try:
             response = requests.request(method, url=resource_uri,
                                         headers=headers, data=body)
+        except requests.exceptions.SSLError:
+            LOG.exception(_LE("SSL error occurred while connecting to %s"),
+                          self.service_uri)
+            raise NCCException(NCCException.CONNECTION_ERROR)
         except requests.exceptions.ConnectionError:
             LOG.exception(_LE("Connection error occurred while connecting "
                               "to %s"),
                           self.service_uri)
             raise NCCException(NCCException.CONNECTION_ERROR)
-        except requests.exceptions.SSLError:
-            LOG.exception(_LE("SSL error occurred while connecting to %s"),
-                          self.service_uri)
-            raise NCCException(NCCException.CONNECTION_ERROR)
         except requests.exceptions.Timeout:
             LOG.exception(_LE("Request to %s timed out"), self.service_uri)
             raise NCCException(NCCException.CONNECTION_ERROR)