Merge "Fix glance.tests.unit.v1.test_registry_client"

glance/common/client.py

@@ -384,7 +384,7 @@ class BaseClient(object):
         netloc = "%s:%d" % (self.host, self.port)
 
         if isinstance(params, dict):
-            for (key, value) in params.items():
+            for (key, value) in list(params.items()):
                 if value is None:
                     del params[key]
                     continue
@@ -411,7 +411,10 @@ class BaseClient(object):
         :returns: Dictionary with encoded headers'
                   names and values
         """
-        to_str = encodeutils.safe_encode
+        if six.PY3:
+            to_str = str
+        else:
+            to_str = encodeutils.safe_encode
         return {to_str(h): to_str(v) for h, v in six.iteritems(headers)}
 
     @handle_redirects

glance/registry/client/v1/client.py

@@ -172,7 +172,7 @@ class RegistryClient(BaseClient):
 
         encrypted_metadata = self.encrypt_metadata(image_metadata['image'])
         image_metadata['image'] = encrypted_metadata
-        body = jsonutils.dumps(image_metadata)
+        body = jsonutils.dump_as_bytes(image_metadata)
 
         res = self.do_request("POST", "/images", body=body, headers=headers)
         # Registry returns a JSONified dict(image=image_info)
@@ -191,7 +191,7 @@ class RegistryClient(BaseClient):
         encrypted_metadata = self.encrypt_metadata(image_metadata['image'])
         image_metadata['image'] = encrypted_metadata
         image_metadata['from_state'] = from_state
-        body = jsonutils.dumps(image_metadata)
+        body = jsonutils.dump_as_bytes(image_metadata)
 
         headers = {
             'Content-Type': 'application/json',
@@ -235,7 +235,7 @@ class RegistryClient(BaseClient):
               'memberships' not in member_data):
             member_data = dict(memberships=[member_data])
 
-        body = jsonutils.dumps(member_data)
+        body = jsonutils.dump_as_bytes(member_data)
 
         headers = {'Content-Type': 'application/json', }
 

glance/tests/unit/v1/test_registry_client.py

@@ -20,6 +20,7 @@ import uuid
 
 from mock import patch
 from oslo_utils import timeutils
+from six.moves import reload_module
 import testtools
 
 from glance.api.v1.images import Controller as acontroller
@@ -843,7 +844,7 @@ class TestRegistryV1ClientApi(base.IsolatedUnitTest):
         """Establish a clean test environment."""
         super(TestRegistryV1ClientApi, self).setUp()
         self.context = context.RequestContext()
-        reload(rapi)
+        reload_module(rapi)
 
     def tearDown(self):
         """Clear the test environment."""

tox.ini

@@ -79,6 +79,7 @@ commands =
     glance.tests.unit.test_store_location \
     glance.tests.unit.test_versions \
     glance.tests.unit.v1.test_registry_api \
+    glance.tests.unit.v1.test_registry_client \
     glance.tests.unit.v1.test_upload_utils \
     glance.tests.unit.v2.test_image_actions_resource \
     glance.tests.unit.v2.test_image_data_resource \