diff --git a/doc/source/conf.py b/doc/source/conf.py index 603daf26b..c1d68b824 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -12,6 +12,8 @@ # All configuration values have a default; values that are commented out # serve to show the default. +from __future__ import unicode_literals + import os import sys import pbr.version @@ -49,8 +51,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'python-keystoneclient' -copyright = u'OpenStack Contributors' +project = 'python-keystoneclient' +copyright = 'OpenStack Contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -100,11 +102,11 @@ pygments_style = 'sphinx' #modindex_common_prefix = [] # Grouping the document tree for man pages. -# List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual' +# List of tuples 'sourcefile', 'target', 'title', 'Authors name', 'manual' man_pages = [ - ('man/keystone', 'keystone', u'Client for OpenStack Identity API', - [u'OpenStack Contributors'], 1), + ('man/keystone', 'keystone', 'Client for OpenStack Identity API', + ['OpenStack Contributors'], 1), ] # -- Options for HTML output -------------------------------------------------- @@ -196,8 +198,8 @@ htmlhelp_basename = 'python-keystoneclientdoc' # . latex_documents = [ ('index', 'python-keystoneclient.tex', - u'python-keystoneclient Documentation', - u'Nebula Inc, based on work by Rackspace and Jacob Kaplan-Moss', + 'python-keystoneclient Documentation', + 'Nebula Inc, based on work by Rackspace and Jacob Kaplan-Moss', 'manual'), ] diff --git a/tests/test_ec2utils.py b/tests/test_ec2utils.py index 7bed90ef8..361396d76 100644 --- a/tests/test_ec2utils.py +++ b/tests/test_ec2utils.py @@ -14,6 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + import testtools from keystoneclient.contrib.ec2 import utils @@ -86,7 +88,7 @@ class Ec2SignerTest(testtools.TestCase): credentials = {'host': '127.0.0.1', 'verb': 'GET', 'path': '/v1/', - 'params': {'SignatureVersion': u'2', + 'params': {'SignatureVersion': '2', 'AWSAccessKeyId': self.access}} signature = self.signer.generate(credentials) expected = 'odsGmT811GffUO0Eu13Pq+xTzKNIjJ6NhgZU74tYX/w=' @@ -97,7 +99,7 @@ class Ec2SignerTest(testtools.TestCase): credentials = {'host': '127.0.0.1', 'verb': 'GET', 'path': '/v1/', - 'params': {'SignatureVersion': u'2', + 'params': {'SignatureVersion': '2', 'AWSAccessKeyId': self.access}} self.signer.hmac_256 = None signature = self.signer.generate(credentials) diff --git a/tests/v2_0/client_fixtures.py b/tests/v2_0/client_fixtures.py index b2f06db16..5735fd49f 100644 --- a/tests/v2_0/client_fixtures.py +++ b/tests/v2_0/client_fixtures.py @@ -12,166 +12,169 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + + UNSCOPED_TOKEN = { - u'access': {u'serviceCatalog': {}, - u'token': {u'expires': u'2012-10-03T16:58:01Z', - u'id': u'3e2813b7ba0b4006840c3825860b86ed'}, - u'user': {u'id': u'c4da488862bd435c9e6c0275a0d0e49a', - u'name': u'exampleuser', - u'roles': [], - u'roles_links': [], - u'username': u'exampleuser'} - } + 'access': {'serviceCatalog': {}, + 'token': {'expires': '2012-10-03T16:58:01Z', + 'id': '3e2813b7ba0b4006840c3825860b86ed'}, + 'user': {'id': 'c4da488862bd435c9e6c0275a0d0e49a', + 'name': 'exampleuser', + 'roles': [], + 'roles_links': [], + 'username': 'exampleuser'} + } } PROJECT_SCOPED_TOKEN = { - u'access': { - u'serviceCatalog': [{ - u'endpoints': [{ - u'adminURL': u'http://admin:8776/v1/225da22d3ce34b15877ea70b2a575f58', - u'internalURL': - u'http://internal:8776/v1/225da22d3ce34b15877ea70b2a575f58', - u'publicURL': - u'http://public.com:8776/v1/225da22d3ce34b15877ea70b2a575f58', - u'region': u'RegionOne' + 'access': { + 'serviceCatalog': [{ + 'endpoints': [{ + 'adminURL': 'http://admin:8776/v1/225da22d3ce34b15877ea70b2a575f58', + 'internalURL': + 'http://internal:8776/v1/225da22d3ce34b15877ea70b2a575f58', + 'publicURL': + 'http://public.com:8776/v1/225da22d3ce34b15877ea70b2a575f58', + 'region': 'RegionOne' }], - u'endpoints_links': [], - u'name': u'Volume Service', - u'type': u'volume'}, - {u'endpoints': [{ - u'adminURL': u'http://admin:9292/v1', - u'internalURL': u'http://internal:9292/v1', - u'publicURL': u'http://public.com:9292/v1', - u'region': u'RegionOne'}], - u'endpoints_links': [], - u'name': u'Image Service', - u'type': u'image'}, - {u'endpoints': [{ -u'adminURL': u'http://admin:8774/v2/225da22d3ce34b15877ea70b2a575f58', -u'internalURL': u'http://internal:8774/v2/225da22d3ce34b15877ea70b2a575f58', -u'publicURL': u'http://public.com:8774/v2/225da22d3ce34b15877ea70b2a575f58', -u'region': u'RegionOne'}], - u'endpoints_links': [], - u'name': u'Compute Service', - u'type': u'compute'}, - {u'endpoints': [{ -u'adminURL': u'http://admin:8773/services/Admin', -u'internalURL': u'http://internal:8773/services/Cloud', -u'publicURL': u'http://public.com:8773/services/Cloud', -u'region': u'RegionOne'}], - u'endpoints_links': [], - u'name': u'EC2 Service', - u'type': u'ec2'}, - {u'endpoints': [{ -u'adminURL': u'http://admin:35357/v2.0', -u'internalURL': u'http://internal:5000/v2.0', -u'publicURL': u'http://public.com:5000/v2.0', -u'region': u'RegionOne'}], - u'endpoints_links': [], - u'name': u'Identity Service', - u'type': u'identity'}], - u'token': {u'expires': u'2012-10-03T16:53:36Z', - u'id': u'04c7d5ffaeef485f9dc69c06db285bdb', - u'tenant': {u'description': u'', - u'enabled': True, - u'id': u'225da22d3ce34b15877ea70b2a575f58', - u'name': u'exampleproject'}}, - u'user': {u'id': u'c4da488862bd435c9e6c0275a0d0e49a', - u'name': u'exampleuser', - u'roles': [{u'id': u'edc12489faa74ee0aca0b8a0b4d74a74', - u'name': u'Member'}], - u'roles_links': [], - u'username': u'exampleuser'} + 'endpoints_links': [], + 'name': 'Volume Service', + 'type': 'volume'}, + {'endpoints': [{ + 'adminURL': 'http://admin:9292/v1', + 'internalURL': 'http://internal:9292/v1', + 'publicURL': 'http://public.com:9292/v1', + 'region': 'RegionOne'}], + 'endpoints_links': [], + 'name': 'Image Service', + 'type': 'image'}, + {'endpoints': [{ +'adminURL': 'http://admin:8774/v2/225da22d3ce34b15877ea70b2a575f58', +'internalURL': 'http://internal:8774/v2/225da22d3ce34b15877ea70b2a575f58', +'publicURL': 'http://public.com:8774/v2/225da22d3ce34b15877ea70b2a575f58', +'region': 'RegionOne'}], + 'endpoints_links': [], + 'name': 'Compute Service', + 'type': 'compute'}, + {'endpoints': [{ +'adminURL': 'http://admin:8773/services/Admin', +'internalURL': 'http://internal:8773/services/Cloud', +'publicURL': 'http://public.com:8773/services/Cloud', +'region': 'RegionOne'}], + 'endpoints_links': [], + 'name': 'EC2 Service', + 'type': 'ec2'}, + {'endpoints': [{ +'adminURL': 'http://admin:35357/v2.0', +'internalURL': 'http://internal:5000/v2.0', +'publicURL': 'http://public.com:5000/v2.0', +'region': 'RegionOne'}], + 'endpoints_links': [], + 'name': 'Identity Service', + 'type': 'identity'}], + 'token': {'expires': '2012-10-03T16:53:36Z', + 'id': '04c7d5ffaeef485f9dc69c06db285bdb', + 'tenant': {'description': '', + 'enabled': True, + 'id': '225da22d3ce34b15877ea70b2a575f58', + 'name': 'exampleproject'}}, + 'user': {'id': 'c4da488862bd435c9e6c0275a0d0e49a', + 'name': 'exampleuser', + 'roles': [{'id': 'edc12489faa74ee0aca0b8a0b4d74a74', + 'name': 'Member'}], + 'roles_links': [], + 'username': 'exampleuser'} } } AUTH_RESPONSE_BODY = { - u'access': { - u'token': { - u'id': u'ab48a9efdfedb23ty3494', - u'expires': u'2010-11-01T03:32:15-05:00', - u'tenant': { - u'id': u'345', - u'name': u'My Project' + 'access': { + 'token': { + 'id': 'ab48a9efdfedb23ty3494', + 'expires': '2010-11-01T03:32:15-05:00', + 'tenant': { + 'id': '345', + 'name': 'My Project' } }, - u'user': { - u'id': u'123', - u'name': u'jqsmith', - u'roles': [{ - u'id': u'234', - u'name': u'compute:admin' + 'user': { + 'id': '123', + 'name': 'jqsmith', + 'roles': [{ + 'id': '234', + 'name': 'compute:admin' }, { - u'id': u'235', - u'name': u'object-store:admin', - u'tenantId': u'1' + 'id': '235', + 'name': 'object-store:admin', + 'tenantId': '1' }], - u'roles_links': [] + 'roles_links': [] }, - u'serviceCatalog': [{ - u'name': u'Cloud Servers', - u'type': u'compute', - u'endpoints': [{ - u'tenantId': u'1', - u'publicURL': u'https://compute.north.host/v1/1234', - u'internalURL': u'https://compute.north.host/v1/1234', - u'region': u'North', - u'versionId': u'1.0', - u'versionInfo': u'https://compute.north.host/v1.0/', - u'versionList': u'https://compute.north.host/u' + 'serviceCatalog': [{ + 'name': 'Cloud Servers', + 'type': 'compute', + 'endpoints': [{ + 'tenantId': '1', + 'publicURL': 'https://compute.north.host/v1/1234', + 'internalURL': 'https://compute.north.host/v1/1234', + 'region': 'North', + 'versionId': '1.0', + 'versionInfo': 'https://compute.north.host/v1.0/', + 'versionList': 'https://compute.north.host/' }, { - u'tenantId': u'2', - u'publicURL': u'https://compute.north.host/v1.1/3456', - u'internalURL': u'https://compute.north.host/v1.1/3456', - u'region': u'North', - u'versionId': u'1.1', - u'versionInfo': u'https://compute.north.host/v1.1/', - u'versionList': u'https://compute.north.host/u' + 'tenantId': '2', + 'publicURL': 'https://compute.north.host/v1.1/3456', + 'internalURL': 'https://compute.north.host/v1.1/3456', + 'region': 'North', + 'versionId': '1.1', + 'versionInfo': 'https://compute.north.host/v1.1/', + 'versionList': 'https://compute.north.host/' }], - u'endpoints_links': [] + 'endpoints_links': [] }, { - u'name': u'Cloud Files', - u'type': u'object-store', - u'endpoints': [{ - u'tenantId': u'11', - u'publicURL': u'https://swift.north.host/v1/blah', - u'internalURL': u'https://swift.north.host/v1/blah', - u'region': u'South', - u'versionId': u'1.0', - u'versionInfo': u'uri', - u'versionList': u'uri' + 'name': 'Cloud Files', + 'type': 'object-store', + 'endpoints': [{ + 'tenantId': '11', + 'publicURL': 'https://swift.north.host/v1/blah', + 'internalURL': 'https://swift.north.host/v1/blah', + 'region': 'South', + 'versionId': '1.0', + 'versionInfo': 'uri', + 'versionList': 'uri' }, { - u'tenantId': u'2', - u'publicURL': u'https://swift.north.host/v1.1/blah', - u'internalURL': u'https://compute.north.host/v1.1/blah', - u'region': u'South', - u'versionId': u'1.1', - u'versionInfo': u'https://swift.north.host/v1.1/', - u'versionList': u'https://swift.north.host/' + 'tenantId': '2', + 'publicURL': 'https://swift.north.host/v1.1/blah', + 'internalURL': 'https://compute.north.host/v1.1/blah', + 'region': 'South', + 'versionId': '1.1', + 'versionInfo': 'https://swift.north.host/v1.1/', + 'versionList': 'https://swift.north.host/' }], - u'endpoints_links': [{ - u'rel': u'next', - u'href': u'https://identity.north.host/v2.0/' - u'endpoints?marker=2' + 'endpoints_links': [{ + 'rel': 'next', + 'href': 'https://identity.north.host/v2.0/' + 'endpoints?marker=2' }] }, { - u'name': u'Image Servers', - u'type': u'image', - u'endpoints': [{ - u'publicURL': u'https://image.north.host/v1/', - u'internalURL': u'https://image-internal.north.host/v1/', - u'region': u'North' + 'name': 'Image Servers', + 'type': 'image', + 'endpoints': [{ + 'publicURL': 'https://image.north.host/v1/', + 'internalURL': 'https://image-internal.north.host/v1/', + 'region': 'North' }, { - u'publicURL': u'https://image.south.host/v1/', - u'internalURL': u'https://image-internal.south.host/v1/', - u'region': u'South' + 'publicURL': 'https://image.south.host/v1/', + 'internalURL': 'https://image-internal.south.host/v1/', + 'region': 'South' }], - u'endpoints_links': [] + 'endpoints_links': [] }], - u'serviceCatalog_links': [{ - u'rel': u'next', - u'href': (u'https://identity.host/v2.0/endpoints?' - u'session=2hfh8Ar&marker=2') + 'serviceCatalog_links': [{ + 'rel': 'next', + 'href': ('https://identity.host/v2.0/endpoints?' + 'session=2hfh8Ar&marker=2') }] } } diff --git a/tests/v3/client_fixtures.py b/tests/v3/client_fixtures.py index 245594459..72cb10e91 100644 --- a/tests/v3/client_fixtures.py +++ b/tests/v3/client_fixtures.py @@ -12,248 +12,251 @@ # License for the specific language governing permissions and limitations # under the License. +from __future__ import unicode_literals + + UNSCOPED_TOKEN = { - u'token': { - u'methods': [ - u'password' + 'token': { + 'methods': [ + 'password' ], - u'catalog': {}, - u'expires_at': u'2010-11-01T03:32:15-05:00', - u'user': { - u'domain': { - u'id': u'4e6893b7ba0b4006840c3845660b86ed', - u'name': u'exampledomain' + 'catalog': {}, + 'expires_at': '2010-11-01T03:32:15-05:00', + 'user': { + 'domain': { + 'id': '4e6893b7ba0b4006840c3845660b86ed', + 'name': 'exampledomain' }, - u'id': u'c4da488862bd435c9e6c0275a0d0e49a', - u'name': u'exampleuser', + 'id': 'c4da488862bd435c9e6c0275a0d0e49a', + 'name': 'exampleuser', } } } DOMAIN_SCOPED_TOKEN = { - u'token': { - u'methods': [ - u'password' + 'token': { + 'methods': [ + 'password' ], - u'catalog': {}, - u'expires_at': u'2010-11-01T03:32:15-05:00', - u'user': { - u'domain': { - u'id': u'4e6893b7ba0b4006840c3845660b86ed', - u'name': u'exampledomain' + 'catalog': {}, + 'expires_at': '2010-11-01T03:32:15-05:00', + 'user': { + 'domain': { + 'id': '4e6893b7ba0b4006840c3845660b86ed', + 'name': 'exampledomain' }, - u'id': u'c4da488862bd435c9e6c0275a0d0e49a', - u'name': u'exampleuser', + 'id': 'c4da488862bd435c9e6c0275a0d0e49a', + 'name': 'exampleuser', }, - u'domain': { - u'id': u'8e9283b7ba0b1038840c3842058b86ab', - u'name': u'anotherdomain' + 'domain': { + 'id': '8e9283b7ba0b1038840c3842058b86ab', + 'name': 'anotherdomain' }, } } PROJECT_SCOPED_TOKEN = { - u'token': { - u'methods': [ - u'password' + 'token': { + 'methods': [ + 'password' ], - u'catalog': [{ - u'endpoints': [{ - u'url': - u'http://public.com:8776/v1/225da22d3ce34b15877ea70b2a575f58', - u'region': u'RegionOne', - u'interface': u'public' + 'catalog': [{ + 'endpoints': [{ + 'url': + 'http://public.com:8776/v1/225da22d3ce34b15877ea70b2a575f58', + 'region': 'RegionOne', + 'interface': 'public' }, { - u'url': - u'http://internal:8776/v1/225da22d3ce34b15877ea70b2a575f58', - u'region': u'RegionOne', - u'interface': u'internal' + 'url': + 'http://internal:8776/v1/225da22d3ce34b15877ea70b2a575f58', + 'region': 'RegionOne', + 'interface': 'internal' }, { - u'url': - u'http://admin:8776/v1/225da22d3ce34b15877ea70b2a575f58', - u'region': u'RegionOne', - u'interface': u'admin' + 'url': + 'http://admin:8776/v1/225da22d3ce34b15877ea70b2a575f58', + 'region': 'RegionOne', + 'interface': 'admin' }], - u'type': u'volume' + 'type': 'volume' }, { - u'endpoints': [{ - u'url': u'http://public.com:9292/v1', - u'region': u'RegionOne', - u'interface': u'public' + 'endpoints': [{ + 'url': 'http://public.com:9292/v1', + 'region': 'RegionOne', + 'interface': 'public' }, { - u'url': u'http://internal:9292/v1', - u'region': u'RegionOne', - u'interface': u'internal' + 'url': 'http://internal:9292/v1', + 'region': 'RegionOne', + 'interface': 'internal' }, { - u'url': u'http://admin:9292/v1', - u'region': u'RegionOne', - u'interface': u'admin' + 'url': 'http://admin:9292/v1', + 'region': 'RegionOne', + 'interface': 'admin' }], - u'type': u'image' + 'type': 'image' }, { - u'endpoints': [{ - u'url': - u'http://public.com:8774/v2/225da22d3ce34b15877ea70b2a575f58', - u'region': u'RegionOne', - u'interface': u'public' + 'endpoints': [{ + 'url': + 'http://public.com:8774/v2/225da22d3ce34b15877ea70b2a575f58', + 'region': 'RegionOne', + 'interface': 'public' }, { - u'url': - u'http://internal:8774/v2/225da22d3ce34b15877ea70b2a575f58', - u'region': u'RegionOne', - u'interface': u'internal' + 'url': + 'http://internal:8774/v2/225da22d3ce34b15877ea70b2a575f58', + 'region': 'RegionOne', + 'interface': 'internal' }, { - u'url': - u'http://admin:8774/v2/225da22d3ce34b15877ea70b2a575f58', - u'region': u'RegionOne', - u'interface': u'admin' + 'url': + 'http://admin:8774/v2/225da22d3ce34b15877ea70b2a575f58', + 'region': 'RegionOne', + 'interface': 'admin' }], - u'type': u'compute' + 'type': 'compute' }, { - u'endpoints': [{ - u'url': u'http://public.com:8773/services/Cloud', - u'region': u'RegionOne', - u'interface': u'public' + 'endpoints': [{ + 'url': 'http://public.com:8773/services/Cloud', + 'region': 'RegionOne', + 'interface': 'public' }, { - u'url': u'http://internal:8773/services/Cloud', - u'region': u'RegionOne', - u'interface': u'internal' + 'url': 'http://internal:8773/services/Cloud', + 'region': 'RegionOne', + 'interface': 'internal' }, { - u'url': u'http://admin:8773/services/Admin', - u'region': u'RegionOne', - u'interface': u'admin' + 'url': 'http://admin:8773/services/Admin', + 'region': 'RegionOne', + 'interface': 'admin' }], - u'type': u'ec2' + 'type': 'ec2' }, { - u'endpoints': [{ - u'url': u'http://public.com:5000/v3', - u'region': u'RegionOne', - u'interface': u'public' + 'endpoints': [{ + 'url': 'http://public.com:5000/v3', + 'region': 'RegionOne', + 'interface': 'public' }, { - u'url': u'http://internal:5000/v3', - u'region': u'RegionOne', - u'interface': u'internal' + 'url': 'http://internal:5000/v3', + 'region': 'RegionOne', + 'interface': 'internal' }, { - u'url': u'http://admin:35357/v3', - u'region': u'RegionOne', - u'interface': u'admin' + 'url': 'http://admin:35357/v3', + 'region': 'RegionOne', + 'interface': 'admin' }], - u'type': u'identity' + 'type': 'identity' }], - u'expires_at': u'2010-11-01T03:32:15-05:00', - u'user': { - u'domain': { - u'id': u'4e6893b7ba0b4006840c3845660b86ed', - u'name': u'exampledomain' + 'expires_at': '2010-11-01T03:32:15-05:00', + 'user': { + 'domain': { + 'id': '4e6893b7ba0b4006840c3845660b86ed', + 'name': 'exampledomain' }, - u'id': u'c4da488862bd435c9e6c0275a0d0e49a', - u'name': u'exampleuser', + 'id': 'c4da488862bd435c9e6c0275a0d0e49a', + 'name': 'exampleuser', }, - u'project': { - u'domain': { - u'id': u'4e6893b7ba0b4006840c3845660b86ed', - u'name': u'exampledomain' + 'project': { + 'domain': { + 'id': '4e6893b7ba0b4006840c3845660b86ed', + 'name': 'exampledomain' }, - u'id': u'225da22d3ce34b15877ea70b2a575f58', - u'name': u'exampleproject', + 'id': '225da22d3ce34b15877ea70b2a575f58', + 'name': 'exampleproject', }, } } AUTH_RESPONSE_HEADERS = { - u'X-Subject-Token': u'3e2813b7ba0b4006840c3825860b86ed' + 'X-Subject-Token': '3e2813b7ba0b4006840c3825860b86ed' } AUTH_RESPONSE_BODY = { - u'token': { - u'methods': [ - u'password' + 'token': { + 'methods': [ + 'password' ], - u'expires_at': u'2010-11-01T03:32:15-05:00', - u'project': { - u'domain': { - u'id': u'123', - u'name': u'aDomain' + 'expires_at': '2010-11-01T03:32:15-05:00', + 'project': { + 'domain': { + 'id': '123', + 'name': 'aDomain' }, - u'id': u'345', - u'name': u'aTenant' + 'id': '345', + 'name': 'aTenant' }, - u'user': { - u'domain': { - u'id': u'1', - u'name': u'aDomain' + 'user': { + 'domain': { + 'id': '1', + 'name': 'aDomain' }, - u'id': u'567', - u'name': u'test' + 'id': '567', + 'name': 'test' }, - u'issued_at': u'2010-10-31T03:32:15-05:00', - u'catalog': [{ - u'endpoints': [{ - u'url': u'https://compute.north.host/novapi/public', - u'region': u'North', - u'interface': u'public' + 'issued_at': '2010-10-31T03:32:15-05:00', + 'catalog': [{ + 'endpoints': [{ + 'url': 'https://compute.north.host/novapi/public', + 'region': 'North', + 'interface': 'public' }, { - u'url': u'https://compute.north.host/novapi/internal', - u'region': u'North', - u'interface': u'internal' + 'url': 'https://compute.north.host/novapi/internal', + 'region': 'North', + 'interface': 'internal' }, { - u'url': u'https://compute.north.host/novapi/admin', - u'region': u'North', - u'interface': u'admin' + 'url': 'https://compute.north.host/novapi/admin', + 'region': 'North', + 'interface': 'admin' }], - u'type': u'compute' + 'type': 'compute' }, { - u'endpoints': [{ - u'url': u'http://swift.north.host/swiftapi/public', - u'region': u'South', - u'interface': u'public' + 'endpoints': [{ + 'url': 'http://swift.north.host/swiftapi/public', + 'region': 'South', + 'interface': 'public' }, { - u'url': u'http://swift.north.host/swiftapi/internal', - u'region': u'South', - u'interface': u'internal' + 'url': 'http://swift.north.host/swiftapi/internal', + 'region': 'South', + 'interface': 'internal' }, { - u'url': u'http://swift.north.host/swiftapi/admin', - u'region': u'South', - u'interface': u'admin' + 'url': 'http://swift.north.host/swiftapi/admin', + 'region': 'South', + 'interface': 'admin' }], - u'type': u'object-store' + 'type': 'object-store' }, { - u'endpoints': [{ - u'url': u'http://glance.north.host/glanceapi/public', - u'region': u'North', - u'interface': u'public' + 'endpoints': [{ + 'url': 'http://glance.north.host/glanceapi/public', + 'region': 'North', + 'interface': 'public' }, { - u'url': u'http://glance.north.host/glanceapi/internal', - u'region': u'North', - u'interface': u'internal' + 'url': 'http://glance.north.host/glanceapi/internal', + 'region': 'North', + 'interface': 'internal' }, { - u'url': u'http://glance.north.host/glanceapi/admin', - u'region': u'North', - u'interface': u'admin' + 'url': 'http://glance.north.host/glanceapi/admin', + 'region': 'North', + 'interface': 'admin' }, { - u'url': u'http://glance.south.host/glanceapi/public', - u'region': u'South', - u'interface': u'public' + 'url': 'http://glance.south.host/glanceapi/public', + 'region': 'South', + 'interface': 'public' }, { - u'url': u'http://glance.south.host/glanceapi/internal', - u'region': u'South', - u'interface': u'internal' + 'url': 'http://glance.south.host/glanceapi/internal', + 'region': 'South', + 'interface': 'internal' }, { - u'url': u'http://glance.south.host/glanceapi/admin', - u'region': u'South', - u'interface': u'admin' + 'url': 'http://glance.south.host/glanceapi/admin', + 'region': 'South', + 'interface': 'admin' }], - u'type': u'image' + 'type': 'image' }] } } TRUST_TOKEN = { - u'token': { - u'methods': [ - u'password' + 'token': { + 'methods': [ + 'password' ], - u'catalog': {}, - u'expires_at': u'2010-11-01T03:32:15-05:00', + 'catalog': {}, + 'expires_at': '2010-11-01T03:32:15-05:00', "OS-TRUST:trust": { "id": "fe0aef", "impersonation": False, @@ -273,13 +276,13 @@ TRUST_TOKEN = { } } }, - u'user': { - u'domain': { - u'id': u'4e6893b7ba0b4006840c3845660b86ed', - u'name': u'exampledomain' + 'user': { + 'domain': { + 'id': '4e6893b7ba0b4006840c3845660b86ed', + 'name': 'exampledomain' }, - u'id': u'0ca8f6', - u'name': u'exampleuser', + 'id': '0ca8f6', + 'name': 'exampleuser', } } }