openstack/deb-python-openstacksdk
Code Issues Proposed changes

Add more detail to method not supported exception

Browse Source 
Add more detail to method not supported exception including
module and class name.  Previously, the exception would just
give the method name which wasn't very useful.

Change-Id: I838fb31bd5177f58df4a384796551747bbcfaa5d
This commit is contained in:
TerryHowe
2015-04-16 08:35:59 -06:00
parent d607fd3904
commit 6738b86047
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openstack/exceptions.py
View File

@@ -82,7 +82,10 @@ class NotFoundException(HttpException):
class MethodNotSupported(SDKException):
"""The resource does not support this operation type."""
pass
def __init__(self, cls, method):
msg = ('The %s method is not supported for %s.%s' %
(method, cls.__module__, cls.__name__))
super(Exception, self).__init__(msg)
class DuplicateResource(SDKException):

12
openstack/resource.py
View File

@@ -499,7 +499,7 @@ class Resource(collections.MutableMapping):
:data:`Resource.allow_create` is not set to ``True``.
"""
if not cls.allow_create:
raise exceptions.MethodNotSupported('create')
raise exceptions.MethodNotSupported(cls, 'create')
# Convert attributes from Resource types into their ids.
attrs = cls._convert_ids(attrs)
@@ -561,7 +561,7 @@ class Resource(collections.MutableMapping):
:data:`Resource.allow_retrieve` is not set to ``True``.
"""
if not cls.allow_retrieve:
raise exceptions.MethodNotSupported('retrieve')
raise exceptions.MethodNotSupported(cls, 'retrieve')
if path_args:
url = cls.base_path % path_args
@@ -637,7 +637,7 @@ class Resource(collections.MutableMapping):
:data:`Resource.allow_head` is not set to ``True``.
"""
if not cls.allow_head:
raise exceptions.MethodNotSupported('head')
raise exceptions.MethodNotSupported(cls, 'head')
if path_args:
url = cls.base_path % path_args
@@ -702,7 +702,7 @@ class Resource(collections.MutableMapping):
:data:`Resource.allow_update` is not set to ``True``.
"""
if not cls.allow_update:
raise exceptions.MethodNotSupported('update')
raise exceptions.MethodNotSupported(cls, 'update')
# Convert attributes from Resource types into their ids.
attrs = cls._convert_ids(attrs)
@@ -772,7 +772,7 @@ class Resource(collections.MutableMapping):
:data:`Resource.allow_delete` is not set to ``True``.
"""
if not cls.allow_delete:
raise exceptions.MethodNotSupported('delete')
raise exceptions.MethodNotSupported(cls, 'delete')
if path_args:
url = cls.base_path % path_args
@@ -834,7 +834,7 @@ class Resource(collections.MutableMapping):
:data:`Resource.allow_list` is not set to ``True``.
"""
if not cls.allow_list:
raise exceptions.MethodNotSupported('list')
raise exceptions.MethodNotSupported(cls, 'list')
more_data = True

8
openstack/tests/unit/test_exceptions.py
View File

@@ -15,6 +15,14 @@ import testtools
from openstack import exceptions
class Test_Exception(testtools.TestCase):
def test_method_not_supported(self):
exc = exceptions.MethodNotSupported(self.__class__, 'list')
expected = ('The list method is not supported for ' +
'openstack.tests.unit.test_exceptions.Test_Exception')
self.assertEqual(expected, str(exc))
class Test_HttpException(testtools.TestCase):
def setUp(self):