diff options
-rw-r--r-- | cinderclient/apiclient/base.py | 3 | ||||
-rw-r--r-- | cinderclient/tests/unit/test_base.py | 10 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cinderclient/apiclient/base.py b/cinderclient/apiclient/base.py index 3ae5dff..e1f611c 100644 --- a/cinderclient/apiclient/base.py +++ b/cinderclient/apiclient/base.py @@ -31,6 +31,7 @@ import six from six.moves.urllib import parse from cinderclient.apiclient import exceptions +from oslo_utils import encodeutils from oslo_utils import strutils @@ -496,7 +497,7 @@ class Resource(RequestIdMixin): # In this case we already defined the attribute on the class continue except UnicodeEncodeError: - pass + setattr(self, encodeutils.safe_encode(k), v) self._info[k] = v def __getattr__(self, k): diff --git a/cinderclient/tests/unit/test_base.py b/cinderclient/tests/unit/test_base.py index 91f96ba..ce8d9e4 100644 --- a/cinderclient/tests/unit/test_base.py +++ b/cinderclient/tests/unit/test_base.py @@ -48,6 +48,16 @@ class BaseTest(utils.TestCase): self.assertEqual("<Resource baz=spam, foo=bar>", repr(r)) self.assertNotIn("x_openstack_request_ids", repr(r)) + def test_add_non_ascii_attr_to_resource(self): + info = {'gigabytes_тест': -1, + 'volumes_тест': -1, + 'id': 'admin'} + + res = base.Resource(None, info) + + for key, value in info.items(): + self.assertEqual(value, getattr(res, key, None)) + def test_getid(self): self.assertEqual(4, base.getid(4)) |