Author: tomaz
Date: Sat Jun 23 18:27:51 2012
New Revision: 1353171
URL: http://svn.apache.org/viewvc?rev=1353171&view=rev
Log:
Forgot to add those changes.
Added:
libcloud/trunk/test/compute/fixtures/openstack/_v2_0__auth_lon.json
Modified:
libcloud/trunk/test/compute/test_rackspacenova.py
Added: libcloud/trunk/test/compute/fixtures/openstack/_v2_0__auth_lon.json
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/fixtures/openstack/_v2_0__auth_lon.json?rev=1353171&view=auto
==============================================================================
--- libcloud/trunk/test/compute/fixtures/openstack/_v2_0__auth_lon.json (added)
+++ libcloud/trunk/test/compute/fixtures/openstack/_v2_0__auth_lon.json Sat Jun
23 18:27:51 2012
@@ -0,0 +1,103 @@
+{
+ "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://cdn2.clouddrive.com/v1/MossoCloudFS_11111-111111111-1111111111-1111111";,
+ "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://storage101.ord1.clouddrive.com/v1/MossoCloudFS_11111-111111111-1111111111-1111111";,
+ "internalURL":
"https://snet-storage101.ord1.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": "LON",
+ "tenantId": "613469",
+ "publicURL":
"https://lon.servers.api.rackspacecloud.com/v2/1337";,
+ "versionInfo":
"https://lon.servers.api.rackspacecloud.com/v2/";,
+ "versionList":
"https://lon.servers.api.rackspacecloud.com/";,
+ "versionId": "2"
+ }
+ ],
+ "name": "cloudServersOpenStack",
+ "type": "compute"
+ },
+ {
+ "endpoints": [
+ {
+ "region": "LON",
+ "tenantId": "1337",
+ "publicURL":
"https://preprod.lon.servers.api.rackspacecloud.com/v2/1337";
+ }
+ ],
+ "name": "cloudServersPreprod",
+ "type": "compute"
+ }
+ ],
+ "user": {
+ "id": "7",
+ "roles": [
+ {
+ "id": "identity:default",
+ "description": "Default Role.",
+ "name": "identity:default"
+ }
+ ],
+ "name": "testuser"
+ }
+ }
+}
Modified: libcloud/trunk/test/compute/test_rackspacenova.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_rackspacenova.py?rev=1353171&r1=1353170&r2=1353171&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_rackspacenova.py (original)
+++ libcloud/trunk/test/compute/test_rackspacenova.py Sat Jun 23 18:27:51 2012
@@ -48,6 +48,13 @@ class RackspaceNovaLonMockHttp(Rackspace
return (httplib.OK, body, self.json_content_headers,
httplib.responses[httplib.OK])
+class RackspaceNovaLonMockHttp(RackspaceNovaMockHttp):
+
+ def _v2_0_tokens(self, method, url, body, headers):
+ body = self.auth_fixtures.load('_v2_0__auth_lon.json')
+ return (httplib.OK, body, self.json_content_headers,
httplib.responses[httplib.OK])
+
+
class RackspaceNovaBetaTests(OpenStack_1_1_Tests):
driver_klass = RackspaceNovaBetaNodeDriver
@@ -120,5 +127,29 @@ class RackspaceNovaLonTests(OpenStack_1_
self.assertEqual('https://lon.servers.api.rackspacecloud.com/v2/1337',
self.driver.connection.get_endpoint())
+class RackspaceNovaLonTests(OpenStack_1_1_Tests):
+
+ driver_klass = RackspaceNovaLonNodeDriver
+ driver_type = RackspaceNovaLonNodeDriver
+ driver_args = RACKSPACE_NOVA_PARAMS + ('1.1',)
+ driver_kwargs = {'ex_force_auth_version': '2.0'}
+
+ @classmethod
+ def create_driver(self):
+ return self.driver_type(*self.driver_args, **self.driver_kwargs)
+
+ def setUp(self):
+ self.driver_klass.connectionCls.conn_classes =
(RackspaceNovaLonMockHttp, RackspaceNovaLonMockHttp)
+ self.driver_klass.connectionCls.auth_url =
"https://lon.auth.api.example.com/v2.0/";
+ self.driver = self.create_driver()
+ # normally authentication happens lazily, but we force it here
+ self.driver.connection._populate_hosts_and_request_paths()
+ clear_pricing_data()
+ self.node = self.driver.list_nodes()[1]
+
+ def test_service_catalog(self):
+ self.assertEqual('https://lon.servers.api.rackspacecloud.com/v2/1337',
self.driver.connection.get_endpoint())
+
+
if __name__ == '__main__':
sys.exit(unittest.main())
