diff --git a/.pylintrc b/.pylintrc index dc887074eca..ac589900b32 100644 --- a/.pylintrc +++ b/.pylintrc @@ -80,7 +80,6 @@ disable= keyword-arg-before-vararg, too-many-function-args, unsupported-assignment-operation, - misplaced-bare-raise, not-an-iterable, unsupported-membership-test, unsupported-assignment-operation, diff --git a/cinder/volume/drivers/huawei/rest_client.py b/cinder/volume/drivers/huawei/rest_client.py index f645de2978e..e5291d46952 100644 --- a/cinder/volume/drivers/huawei/rest_client.py +++ b/cinder/volume/drivers/huawei/rest_client.py @@ -2374,7 +2374,7 @@ class RestClient(object): result = self.call(url, None, "GET", log_filter_flag=True) if result['error']['code'] != 0: - raise + raise Exception(_('Failed to get object count.')) if result.get("data"): return result.get("data").get("COUNT") diff --git a/cinder/volume/drivers/netapp/dataontap/client/api.py b/cinder/volume/drivers/netapp/dataontap/client/api.py index 31d8d276e8b..7f1c96c0065 100644 --- a/cinder/volume/drivers/netapp/dataontap/client/api.py +++ b/cinder/volume/drivers/netapp/dataontap/client/api.py @@ -348,7 +348,7 @@ class NaElement(object): if isinstance(na_element, NaElement): self._element.append(na_element._element) return - raise + raise Exception(_('Failed to add child element.')) def get_child_by_name(self, name): """Get the child element by the tag name."""