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)