Author: pquerna
Date: Tue Sep 20 23:20:07 2011
New Revision: 1173422
URL: http://svn.apache.org/viewvc?rev=1173422&view=rev
Log:
Rename existing OpenStack drivers and connections to OpenStack_1_0. Keep
Rackspace driver pegged to 1.0. This lets us prepare for OpenStack 1.1 support.
Modified:
libcloud/trunk/libcloud/compute/drivers/openstack.py
libcloud/trunk/libcloud/compute/drivers/rackspace.py
libcloud/trunk/libcloud/compute/providers.py
libcloud/trunk/test/compute/test_openstack.py
Modified: libcloud/trunk/libcloud/compute/drivers/openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/openstack.py?rev=1173422&r1=1173421&r2=1173422&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/openstack.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/openstack.py Tue Sep 20 23:20:07
2011
@@ -32,14 +32,14 @@ from libcloud.compute.base import NodeSi
from libcloud.common.openstack import OpenStackBaseConnection
__all__ = [
- 'OpenStackResponse',
- 'OpenStackConnection',
- 'OpenStackNodeDriver',
- 'OpenStackSharedIpGroup',
- 'OpenStackNodeIpAddresses',
+ 'OpenStack_1_0_Response',
+ 'OpenStack_1_0_Connection',
+ 'OpenStack_1_0_NodeDriver',
+ 'OpenStack_1_0_SharedIpGroup',
+ 'OpenStack_1_0_NodeIpAddresses',
]
-class OpenStackResponse(Response):
+class OpenStack_1_0_Response(Response):
def success(self):
i = int(self.status)
@@ -58,7 +58,7 @@ class OpenStackResponse(Response):
raise MalformedResponseError(
'Failed to parse XML',
body=self.body,
- driver=OpenStackNodeDriver)
+ driver=OpenStack_1_0_NodeDriver)
else:
return self.body
@@ -70,7 +70,7 @@ class OpenStackResponse(Response):
except:
raise MalformedResponseError(
"Failed to parse XML",
- body=self.body, driver=OpenStackNodeDriver)
+ body=self.body, driver=OpenStack_1_0_NodeDriver)
try:
text = "; ".join([err.text or ''
for err in
@@ -81,9 +81,9 @@ class OpenStackResponse(Response):
return '%s %s %s' % (self.status, self.error, text)
-class OpenStackConnection(OpenStackBaseConnection):
+class OpenStack_1_0_Connection(OpenStackBaseConnection):
- responseCls = OpenStackResponse
+ responseCls = OpenStack_1_0_Response
_url_key = "server_url"
XML_NAMESPACE = 'http://docs.rackspacecloud.com/servers/api/v1.0'
@@ -91,7 +91,7 @@ class OpenStackConnection(OpenStackBaseC
ex_force_base_url=None,
ex_force_auth_url=None,
ex_force_auth_version=None):
- super(OpenStackConnection, self).__init__(
+ super(OpenStack_1_0_Connection, self).__init__(
user_id, key, host=host, port=port,
ex_force_base_url=ex_force_base_url,
ex_force_auth_url=ex_force_auth_url,
@@ -110,14 +110,14 @@ class OpenStackConnection(OpenStackBaseC
headers = {'Content-Type': 'application/xml; charset=UTF-8'}
if method == "GET":
params['cache-busting'] = os.urandom(8).encode('hex')
- return super(OpenStackConnection, self).request(
+ return super(OpenStack_1_0_Connection, self).request(
action=action,
params=params, data=data,
method=method, headers=headers
)
-class OpenStackNodeDriver(NodeDriver):
+class OpenStack_1_0_NodeDriver(NodeDriver):
"""
OpenStack node driver.
@@ -127,7 +127,7 @@ class OpenStackNodeDriver(NodeDriver):
- imageId: id of image
- flavorId: id of flavor
"""
- connectionCls = OpenStackConnection
+ connectionCls = OpenStack_1_0_Connection
type = Provider.OPENSTACK
api_name = 'openstack'
name = 'OpenStack'
@@ -156,7 +156,7 @@ class OpenStackNodeDriver(NodeDriver):
self._ex_force_auth_url = kwargs.pop('ex_force_auth_url', None)
self._ex_force_auth_version = kwargs.pop('ex_force_auth_version', None)
self.XML_NAMESPACE = self.connectionCls.XML_NAMESPACE
- super(OpenStackNodeDriver, self).__init__(*args, **kwargs)
+ super(OpenStack_1_0_NodeDriver, self).__init__(*args, **kwargs)
def _ex_connection_class_kwargs(self):
rv = {}
@@ -626,12 +626,12 @@ class OpenStackNodeDriver(NodeDriver):
for s in self._findall(servers_el[0], 'server')]
else:
servers = None
- return OpenStackSharedIpGroup(id=el.get('id'),
+ return OpenStack_1_0_SharedIpGroup(id=el.get('id'),
name=el.get('name'),
servers=servers)
def _to_ip_addresses(self, el):
- return OpenStackNodeIpAddresses(
+ return OpenStack_1_0_NodeIpAddresses(
[ip.get('addr') for ip in
self._findall(self._findall(el, 'public')[0], 'ip')],
[ip.get('addr') for ip in
@@ -647,7 +647,7 @@ class OpenStackNodeDriver(NodeDriver):
size_id=size_id)
-class OpenStackSharedIpGroup(object):
+class OpenStack_1_0_SharedIpGroup(object):
"""
Shared IP group info.
"""
@@ -658,7 +658,7 @@ class OpenStackSharedIpGroup(object):
self.servers = servers
-class OpenStackNodeIpAddresses(object):
+class OpenStack_1_0_NodeIpAddresses(object):
"""
List of public and private IP addresses of a Node.
"""
Modified: libcloud/trunk/libcloud/compute/drivers/rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/rackspace.py?rev=1173422&r1=1173421&r2=1173422&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/rackspace.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/rackspace.py Tue Sep 20 23:20:07
2011
@@ -17,23 +17,23 @@ Rackspace driver
"""
from libcloud.compute.types import Provider
from libcloud.compute.base import NodeLocation
-from libcloud.compute.drivers.openstack import OpenStackConnection,
OpenStackNodeDriver, OpenStackResponse
+from libcloud.compute.drivers.openstack import OpenStack_1_0_Connection,
OpenStack_1_0_NodeDriver, OpenStack_1_0_Response
from libcloud.common.rackspace import (
AUTH_URL_US, AUTH_URL_UK)
-class RackspaceConnection(OpenStackConnection):
+class RackspaceConnection(OpenStack_1_0_Connection):
"""
Connection class for the Rackspace driver
"""
- responseCls = OpenStackResponse
+ responseCls = OpenStack_1_0_Response
auth_url = AUTH_URL_US
XML_NAMESPACE = 'http://docs.rackspacecloud.com/servers/api/v1.0'
-class RackspaceNodeDriver(OpenStackNodeDriver):
+class RackspaceNodeDriver(OpenStack_1_0_NodeDriver):
name = 'Rackspace'
connectionCls = RackspaceConnection
type = Provider.RACKSPACE
Modified: libcloud/trunk/libcloud/compute/providers.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/providers.py?rev=1173422&r1=1173421&r2=1173422&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/providers.py (original)
+++ libcloud/trunk/libcloud/compute/providers.py Tue Sep 20 23:20:07 2011
@@ -88,7 +88,7 @@ DRIVERS = {
Provider.OPSOURCE:
('libcloud.compute.drivers.opsource', 'OpsourceNodeDriver'),
Provider.OPENSTACK:
- ('libcloud.compute.drivers.openstack', 'OpenStackNodeDriver'),
+ ('libcloud.compute.drivers.openstack', 'OpenStack_1_0_NodeDriver'),
Provider.NINEFOLD:
('libcloud.compute.drivers.ninefold', 'NinefoldNodeDriver'),
}
Modified: libcloud/trunk/test/compute/test_openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/compute/test_openstack.py?rev=1173422&r1=1173421&r2=1173422&view=diff
==============================================================================
--- libcloud/trunk/test/compute/test_openstack.py (original)
+++ libcloud/trunk/test/compute/test_openstack.py Tue Sep 20 23:20:07 2011
@@ -17,7 +17,7 @@ import unittest
import httplib
from libcloud.common.types import InvalidCredsError, MalformedResponseError
-from libcloud.compute.drivers.rackspace import OpenStackNodeDriver,
OpenStackResponse
+from libcloud.compute.drivers.rackspace import OpenStack_1_0_NodeDriver,
OpenStack_1_0_Response
from libcloud.compute.base import Node, NodeImage, NodeSize
from libcloud.pricing import set_pricing, clear_pricing_data
@@ -33,7 +33,7 @@ class OpenStackResponseTestCase(unittest
def test_simple_xml_content_type_handling(self):
http_response = MockResponse(200, OpenStackResponseTestCase.XML,
headers={'content-type': 'application/xml'})
- body = OpenStackResponse(http_response).parse_body()
+ body = OpenStack_1_0_Response(http_response).parse_body()
self.assertTrue(hasattr(body, 'tag'), "Body should be parsed as XML")
@@ -41,7 +41,7 @@ class OpenStackResponseTestCase(unittest
http_response = MockResponse(200,
OpenStackResponseTestCase.XML,
headers={'content-type':
'application/xml; charset=UTF-8'})
- body = OpenStackResponse(http_response).parse_body()
+ body = OpenStack_1_0_Response(http_response).parse_body()
self.assertTrue(hasattr(body, 'tag'), "Body should be parsed as XML")
@@ -49,7 +49,7 @@ class OpenStackResponseTestCase(unittest
RESPONSE_BODY = "Accepted"
http_response = MockResponse(202, RESPONSE_BODY,
headers={'content-type': 'text/html'})
- body = OpenStackResponse(http_response).parse_body()
+ body = OpenStack_1_0_Response(http_response).parse_body()
self.assertEqual(body, RESPONSE_BODY, "Non-XML body should be returned
as is")
@@ -57,7 +57,7 @@ class OpenStackResponseTestCase(unittest
class OpenStackTests(unittest.TestCase, TestCaseMixin):
should_list_locations = False
- driver_type = OpenStackNodeDriver
+ driver_type = OpenStack_1_0_NodeDriver
driver_args = OPENSTACK_PARAMS
@classmethod
