diff options
| author | wanghao <wanghao749@huawei.com> | 2015-02-27 12:09:49 +0800 |
|---|---|---|
| committer | wanghao <wanghao749@huawei.com> | 2015-03-09 16:56:16 +0800 |
| commit | 72bcebf88ef8b5f7a6b1d712b0e9328e5447af8f (patch) | |
| tree | a6abe284dd060a14390b4b7b13ec8f33043de42b | |
| parent | 490f03b48a231d9dfdf4c351f8fba72982e46a70 (diff) | |
| download | cinder-72bcebf88ef8b5f7a6b1d712b0e9328e5447af8f.tar.gz | |
Fix the unicode encode error when create volume
Using six.text_type(value) to set image_name to
avoid UnicodeEncodeError.
Change-Id: I30542df18f31a3e07cb4b9a61521ebded62ffbc4
Closes-Bug: #1426203
| -rw-r--r-- | cinder/db/sqlalchemy/api.py | 3 | ||||
| -rw-r--r-- | cinder/tests/test_db_api.py | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py index 1a1bbe118..cda4602ec 100644 --- a/cinder/db/sqlalchemy/api.py +++ b/cinder/db/sqlalchemy/api.py @@ -2862,8 +2862,7 @@ def volume_glance_metadata_create(context, volume_id, key, value): vol_glance_metadata = models.VolumeGlanceMetadata() vol_glance_metadata.volume_id = volume_id vol_glance_metadata.key = key - vol_glance_metadata.value = str(value) - + vol_glance_metadata.value = six.text_type(value) session.add(vol_glance_metadata) return diff --git a/cinder/tests/test_db_api.py b/cinder/tests/test_db_api.py index e94007726..a95e4cd29 100644 --- a/cinder/tests/test_db_api.py +++ b/cinder/tests/test_db_api.py @@ -890,6 +890,17 @@ class DBAPIVolumeTestCase(BaseTest): metadata.pop('c') self.assertEqual(metadata, db.volume_metadata_get(self.ctxt, 1)) + def test_volume_glance_metadata_create(self): + volume = db.volume_create(self.ctxt, {'host': 'h1'}) + db.volume_glance_metadata_create(self.ctxt, volume['id'], + 'image_name', + u'\xe4\xbd\xa0\xe5\xa5\xbd') + glance_meta = db.volume_glance_metadata_get(self.ctxt, volume['id']) + for meta_entry in glance_meta: + if meta_entry.key == 'image_name': + image_name = meta_entry.value + self.assertEqual(u'\xe4\xbd\xa0\xe5\xa5\xbd', image_name) + class DBAPISnapshotTestCase(BaseTest): |