openstack/nova
Code Issues Proposed changes

Merge "Fix unicode key of azcache can't be stored to memcache"

Browse Source
This commit is contained in:
Jenkins
2013-09-02 11:31:22 +00:00
committed by Gerrit Code Review
parent c844a0b175 6e047e0b87
commit 45405e1a47
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/availability_zones.py
View File

@@ -58,7 +58,7 @@ def reset_cache():
def _make_cache_key(host):
return "azcache-%s" % host
return "azcache-%s" % host.encode('utf-8')
def set_availability_zones(context, services):

10
nova/tests/test_availability_zones.py
View File

@@ -107,6 +107,16 @@ class AvailabilityZoneTestCases(test.TestCase):
self._destroy_service(service)
def test_set_availability_zone_unicode_key(self):
"""Test set availability zone cache key is unicode."""
service = self._create_service_with_topic('network', self.host)
services = db.service_get_all(self.context)
new_service = az.set_availability_zones(self.context, services)[0]
self.assertEquals(type(services[0]['host']), unicode)
cached_key = az._make_cache_key(services[0]['host'])
self.assertEquals(type(cached_key), str)
self._destroy_service(service)
def test_set_availability_zone_not_compute_service(self):
"""Test not compute service get right availability zone."""
service = self._create_service_with_topic('network', self.host)