Update Rackspace DNS tests.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7c915538 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7c915538 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7c915538 Branch: refs/heads/make_rackspace_drivers_multi_datacenter_aware Commit: 7c915538d58c2e13beb3696885f794d5901655aa Parents: 7e827a3 Author: Tomaz Muraus <[email protected]> Authored: Sun Jun 23 08:29:59 2013 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Sun Jun 23 08:29:59 2013 +0200 ---------------------------------------------------------------------- .../dns/fixtures/rackspace/_v2_0__auth.json | 138 +++++++++++++++++++ .../test/dns/fixtures/rackspace/auth_2_0.json | 71 ---------- libcloud/test/dns/test_rackspace.py | 25 +--- 3 files changed, 143 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/7c915538/libcloud/test/dns/fixtures/rackspace/_v2_0__auth.json ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/fixtures/rackspace/_v2_0__auth.json b/libcloud/test/dns/fixtures/rackspace/_v2_0__auth.json new file mode 100644 index 0000000..5f68001 --- /dev/null +++ b/libcloud/test/dns/fixtures/rackspace/_v2_0__auth.json @@ -0,0 +1,138 @@ +{ + "access": { + "token": { + "id": "aaaaaaaaaaaa-bbb-cccccccccccccc", + "expires": "2011-11-23T21:00:14.000-06:00" + }, + "serviceCatalog": [ + { + "endpoints": [ + { + "region": "ORD", + "tenantId": "MossoCloudFS_11111-111111111-1111111111-1111111", + "publicURL": "https://cdn.clouddrive.com/v1/MossoCloudFS";, + "version": { + "versionInfo": "https://cdn2.clouddrive.com/v1/";, + "versionList": "https://cdn2.clouddrive.com/";, + "versionId": "1" + } + }, + { + "region": "LON", + "tenantId": "MossoCloudFS_11111-111111111-1111111111-1111111", + "publicURL": "https://cdn.clouddrive.com/v1/MossoCloudFS";, + "version": { + "versionInfo": "https://cdn2.clouddrive.com/v1/";, + "versionList": "https://cdn2.clouddrive.com/";, + "versionId": "1" + } + } + + ], + "name": "cloudFilesCDN", + "type": "object-store" + }, + { + "endpoints": [ + { + "region": "ORD", + "tenantId": "MossoCloudFS_11111-111111111-1111111111-1111111", + "publicURL": "https://storage4.ord1.clouddrive.com/v1/MossoCloudFS";, + "internalURL": "https://snet-storage101.ord1.clouddrive.com/v1/MossoCloudFS_11111-111111111-1111111111-1111111"; + }, + { + "region": "LON", + "tenantId": "MossoCloudFS_11111-111111111-1111111111-1111111", + "publicURL": "https://storage4.lon1.clouddrive.com/v1/MossoCloudFS";, + "internalURL": "https://snet-storage101.lon1.clouddrive.com/v1/MossoCloudFS_11111-111111111-1111111111-1111111"; + } + ], + "name": "cloudFiles", + "type": "object-store" + }, + { + "endpoints": [ + { + "tenantId": "1337", + "publicURL": "https://servers.api.rackspacecloud.com/v1.0/1337";, + "version": { + "versionInfo": "https://servers.api.rackspacecloud.com/v1.0/";, + "versionList": "https://servers.api.rackspacecloud.com/";, + "versionId": "1.0" + } + } + ], + "name": "cloudServers", + "type": "compute" + }, + { + "endpoints": [ + { + "region": "RegionOne", + "tenantId": "1337", + "publicURL": "https://127.0.0.1/v2/1337";, + "versionInfo": "https://127.0.0.1/v2/";, + "versionList": "https://127.0.0.1/";, + "versionId": "2" + } + ], + "name": "nova", + "type": "compute" + }, + { + "endpoints": [ + { + "region": "DFW", + "tenantId": "613469", + "publicURL": "https://dfw.servers.api.rackspacecloud.com/v2/1337";, + "versionInfo": "https://dfw.servers.api.rackspacecloud.com/v2/";, + "versionList": "https://dfw.servers.api.rackspacecloud.com/";, + "versionId": "2" + }, + { + "region": "ORD", + "tenantId": "613469", + "publicURL": "https://ord.servers.api.rackspacecloud.com/v2/1337";, + "versionInfo": "https://ord.servers.api.rackspacecloud.com/v2/";, + "versionList": "https://ord.servers.api.rackspacecloud.com/";, + "versionId": "2" + } + ], + "name": "cloudServersOpenStack", + "type": "compute" + }, + { + "endpoints": [ + { + "region": "DFW", + "tenantId": "1337", + "publicURL": "https://preprod.dfw.servers.api.rackspacecloud.com/v2/1337"; + } + ], + "name": "cloudServersPreprod", + "type": "compute" + }, + { + "name": "cloudDNS", + "endpoints": [ + { + "tenantId": "11111", + "publicURL": "https://dns.api.rackspacecloud.com/v1.0/11111"; + } + ], + "type": "rax:dns" + } + ], + "user": { + "id": "7", + "roles": [ + { + "id": "identity:default", + "description": "Default Role.", + "name": "identity:default" + } + ], + "name": "testuser" + } + } +} http://git-wip-us.apache.org/repos/asf/libcloud/blob/7c915538/libcloud/test/dns/fixtures/rackspace/auth_2_0.json ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/fixtures/rackspace/auth_2_0.json b/libcloud/test/dns/fixtures/rackspace/auth_2_0.json deleted file mode 100644 index 05edc47..0000000 --- a/libcloud/test/dns/fixtures/rackspace/auth_2_0.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "access": { - "token": { - "id": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - "expires": "2012-03-14T08:10:14.000-05:00" - }, - "serviceCatalog": [ - { - "endpoints": [ - { - "region": "DFW", - "tenantId": "MossoCloudFS_bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", - "publicURL": "https://storage101.dfw1.clouddrive.com/v1/MossoCloudFS_bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";, - "internalURL": "https://snet-storage101.dfw1.clouddrive.com/v1/MossoCloudFS_bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; - } - ], - "name": "cloudFiles", - "type": "object-store" - }, - { - "endpoints": [ - { - "region": "DFW", - "tenantId": "11111", - "publicURL": "https://dfw.servers.api.rackspacecloud.com/v2/11111";, - "versionInfo": "https://dfw.servers.api.rackspacecloud.com/v2/";, - "versionList": "https://dfw.servers.api.rackspacecloud.com/";, - "versionId": "2" - } - ], - "name": "cloudServersOpenStack", - "type": "compute" - }, - { - "endpoints": [ - { - "tenantId": "11111", - "publicURL": "https://servers.api.rackspacecloud.com/v1.0/11111";, - "versionInfo": "https://servers.api.rackspacecloud.com/v1.0/";, - "versionList": "https://servers.api.rackspacecloud.com/";, - "versionId": "1.0" - } - ], - "name": "cloudServers", - "type": "compute" - }, - { - "endpoints": [ - { - "region": "DFW", - "tenantId": "MossoCloudFS_bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", - "publicURL": "https://cdn1.clouddrive.com/v1/MossoCloudFS_bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; - } - ], - "name": "cloudFilesCDN", - "type": "object-store" - } - ], - "user": { - "id": "9586", - "roles": [ - { - "id": "identity:default", - "description": "Default Role.", - "name": "identity:default" - } - ], - "name": "libclouduser" - } - } -} http://git-wip-us.apache.org/repos/asf/libcloud/blob/7c915538/libcloud/test/dns/test_rackspace.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_rackspace.py b/libcloud/test/dns/test_rackspace.py index ab61a20..ab01dd3 100644 --- a/libcloud/test/dns/test_rackspace.py +++ b/libcloud/test/dns/test_rackspace.py @@ -30,6 +30,7 @@ from libcloud.test.secrets import DNS_PARAMS_RACKSPACE class RackspaceUSTests(unittest.TestCase): klass = RackspaceUSDNSDriver + endpoint_url = 'https://dns.api.rackspacecloud.com/v1.0/11111' def setUp(self): self.klass.connectionCls.conn_classes = ( @@ -70,8 +71,7 @@ class RackspaceUSTests(unittest.TestCase): driver = self.klass(*DNS_PARAMS_RACKSPACE, **kwargs) driver.connection._populate_hosts_and_request_paths() - self.assertEquals('https://dns.api.rackspacecloud.com/v1.0/11111', - driver.connection.get_endpoint()) + self.assertEquals(self.endpoint_url, driver.connection.get_endpoint()) def test_list_record_types(self): record_types = self.driver.list_record_types() @@ -310,31 +310,16 @@ class RackspaceUSTests(unittest.TestCase): 'foo.bar') -class RackspaceUK1Tests(RackspaceUSTests): +class RackspaceUKTests(RackspaceUSTests): klass = RackspaceUKDNSDriver - + endpoint_url = 'https://lon.dns.api.rackspacecloud.com/v1.0/11111' class RackspaceMockHttp(MockHttp): fixtures = DNSFileFixtures('rackspace') base_headers = {'content-type': 'application/json'} - - def _v1_1_auth(self, method, url, body, headers): - body = self.fixtures.load('auth_1_1.json') - # fake auth token response - headers = {'content-length': '657', 'vary': 'Accept,Accept-Encoding', - 'server': 'Apache/2.2.13 (Red Hat)', - 'connection': 'Keep-Alive', - 'date': 'Sat, 29 Oct 2011 19:29:45 GMT', - 'content-type': 'application/json'} - return (httplib.OK, body, headers, - httplib.responses[httplib.OK]) - def _v2_0_tokens(self, method, url, body, headers): - body = self.fixtures.load('auth_2_0.json') - headers = { - 'content-type': 'application/json' - } + body = self.fixtures.load('_v2_0__auth.json') return (httplib.OK, body, headers, httplib.responses[httplib.OK])
