openstack/python-keystoneclient
Code Issues Proposed changes

Merge "fixing pep8 formatting for 1.0.1+ pep8"

Browse Source
This commit is contained in:
Jenkins
2012-08-31 00:28:20 +00:00
committed by Gerrit Code Review
parent de8622cd8e 916d4be6c2
commit 0a8c96073c
2 changed files with 55 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
tests/test_service_catalog.py
View File

@@ -19,61 +19,56 @@ SERVICE_CATALOG = {
"user": { "user": {
"id": "123", "id": "123",
"name": "jqsmith", "name": "jqsmith",
"roles": [{ "roles": [
"id": "234", {"id": "234",
"name": "compute:admin" "name": "compute:admin"},
}, {"id": "235",
{ "name": "object-store:admin",
"id": "235", "tenantId": "1"}
"name": "object-store:admin", ],
"tenantId": "1"
}],
"roles_links": [] "roles_links": []
}, },
"serviceCatalog": [{ "serviceCatalog": [{
"name": "Cloud Servers", "name": "Cloud Servers",
"type": "compute", "type": "compute",
"endpoints": [{ "endpoints": [
"tenantId": "1", {"tenantId": "1",
"publicURL": "https://compute.north.host/v1/1234", "publicURL": "https://compute.north.host/v1/1234",
"internalURL": "https://compute.north.host/v1/1234", "internalURL": "https://compute.north.host/v1/1234",
"region": "North", "region": "North",
"versionId": "1.0", "versionId": "1.0",
"versionInfo": "https://compute.north.host/v1.0/", "versionInfo": "https://compute.north.host/v1.0/",
"versionList": "https://compute.north.host/" "versionList": "https://compute.north.host/"},
}, {"tenantId": "2",
{ "publicURL": "https://compute.north.host/v1.1/3456",
"tenantId": "2", "internalURL": "https://compute.north.host/v1.1/3456",
"publicURL": "https://compute.north.host/v1.1/3456", "region": "North",
"internalURL": "https://compute.north.host/v1.1/3456", "versionId": "1.1",
"region": "North", "versionInfo": "https://compute.north.host/v1.1/",
"versionId": "1.1", "versionList": "https://compute.north.host/"}
"versionInfo": "https://compute.north.host/v1.1/", ],
"versionList": "https://compute.north.host/"
}],
"endpoints_links": [] "endpoints_links": []
}, },
{ {
"name": "Cloud Files", "name": "Cloud Files",
"type": "object-store", "type": "object-store",
"endpoints": [{ "endpoints": [
"tenantId": "11", {"tenantId": "11",
"publicURL": "https://compute.north.host/v1/blah-blah", "publicURL": "https://compute.north.host/v1/blah-blah",
"internalURL": "https://compute.north.host/v1/blah-blah", "internalURL": "https://compute.north.host/v1/blah-blah",
"region": "South", "region": "South",
"versionId": "1.0", "versionId": "1.0",
"versionInfo": "uri", "versionInfo": "uri",
"versionList": "uri" "versionList": "uri"},
}, {"tenantId": "2",
{ "publicURL": "https://compute.north.host/v1.1/blah-blah",
"tenantId": "2", "internalURL":
"publicURL": "https://compute.north.host/v1.1/blah-blah", "https://compute.north.host/v1.1/blah-blah",
"internalURL": "https://compute.north.host/v1.1/blah-blah", "region": "South",
"region": "South", "versionId": "1.1",
"versionId": "1.1", "versionInfo": "https://compute.north.host/v1.1/",
"versionInfo": "https://compute.north.host/v1.1/", "versionList": "https://compute.north.host/"}
"versionList": "https://compute.north.host/" ],
}],
"endpoints_links":[{ "endpoints_links":[{
"rel":"next", "rel":"next",
"href":"https://identity.north.host/v2.0/" "href":"https://identity.north.host/v2.0/"
@@ -95,11 +90,11 @@ class ServiceCatalogTest(utils.TestCase):
sc = service_catalog.ServiceCatalog(SERVICE_CATALOG['access']) sc = service_catalog.ServiceCatalog(SERVICE_CATALOG['access'])
self.assertEquals(sc.url_for(service_type='compute'), self.assertEquals(sc.url_for(service_type='compute'),
"https://compute.north.host/v1/1234") "https://compute.north.host/v1/1234")
self.assertEquals(sc.url_for('tenantId', '1', service_type='compute'), self.assertEquals(sc.url_for('tenantId', '1', service_type='compute'),
"https://compute.north.host/v1/1234") "https://compute.north.host/v1/1234")
self.assertEquals(sc.url_for('tenantId', '2', service_type='compute'), self.assertEquals(sc.url_for('tenantId', '2', service_type='compute'),
"https://compute.north.host/v1.1/3456") "https://compute.north.host/v1.1/3456")
self.assertRaises(exceptions.EndpointNotFound, sc.url_for, "region", self.assertRaises(exceptions.EndpointNotFound, sc.url_for, "region",
"South", service_type='compute') "South", service_type='compute')

28
tests/v2_0/test_discovery.py
View File

@@ -28,28 +28,24 @@ class DiscoverKeystoneTests(utils.UnauthenticatedTestCase):
"updated": "2011-11-19T00:00:00Z", "updated": "2011-11-19T00:00:00Z",
"links": [ "links": [
{"rel": "self", {"rel": "self",
"href": "http://127.0.0.1:5000/v2.0/", "href": "http://127.0.0.1:5000/v2.0/", },
},
{"rel": "describedby", {"rel": "describedby",
"type": "text/html", "type": "text/html",
"href": "http://docs.openstack.org/api/" "href": "http://docs.openstack.org/api/"
"openstack-identity-service/2.0/content/", "openstack-identity-service/2.0/content/", },
}, { {"rel": "describedby",
"rel": "describedby", "type": "application/pdf",
"type": "application/pdf", "href": "http://docs.openstack.org/api/"
"href": "http://docs.openstack.org/api/" "openstack-identity-service/2.0/"
"openstack-identity-service/2.0/" "identity-dev-guide-2.0.pdf", },
"identity-dev-guide-2.0.pdf", {"rel": "describedby",
}, { "type": "application/vnd.sun.wadl+xml",
"rel": "describedby", "href": "http://127.0.0.1:5000/v2.0/identity.wadl", }
"type": "application/vnd.sun.wadl+xml", ],
"href": "http://127.0.0.1:5000/v2.0/identity.wadl",
}],
"media-types": [{ "media-types": [{
"base": "application/xml", "base": "application/xml",
"type": "application/vnd.openstack.identity-v2.0+xml", "type": "application/vnd.openstack.identity-v2.0+xml",
}, }, {
{
"base": "application/json", "base": "application/json",
"type": "application/vnd.openstack.identity-v2.0+json", "type": "application/vnd.openstack.identity-v2.0+json",
}], }],