Author: pquerna
Date: Tue Sep 20 22:48:05 2011
New Revision: 1173416
URL: http://svn.apache.org/viewvc?rev=1173416&view=rev
Log:
Fix tests on trunk, correctly propogate the XML_NAMESPACE around, and for now
default openstack to the 1.0 xml ns
Modified:
libcloud/trunk/libcloud/common/openstack.py
libcloud/trunk/libcloud/compute/drivers/openstack.py
Modified: libcloud/trunk/libcloud/common/openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/common/openstack.py?rev=1173416&r1=1173415&r2=1173416&view=diff
==============================================================================
--- libcloud/trunk/libcloud/common/openstack.py (original)
+++ libcloud/trunk/libcloud/common/openstack.py Tue Sep 20 22:48:05 2011
@@ -159,7 +159,7 @@ class OpenStackBaseConnection(Connection
host=None, port=None,
ex_force_base_url=None,
ex_force_auth_url=None,
- ex_force_auth_version='1.1'):
+ ex_force_auth_version=None):
self.server_url = None
self.cdn_management_url = None
self.storage_url = None
@@ -168,6 +168,10 @@ class OpenStackBaseConnection(Connection
self._force_base_url = ex_force_base_url
self._ex_force_auth_url = ex_force_auth_url
self._auth_version = ex_force_auth_version
+
+ if not self._auth_version:
+ self._auth_version = '1.1'
+
super(OpenStackBaseConnection, self).__init__(
user_id, key)
Modified: libcloud/trunk/libcloud/compute/drivers/openstack.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/compute/drivers/openstack.py?rev=1173416&r1=1173415&r2=1173416&view=diff
==============================================================================
--- libcloud/trunk/libcloud/compute/drivers/openstack.py (original)
+++ libcloud/trunk/libcloud/compute/drivers/openstack.py Tue Sep 20 22:48:05
2011
@@ -85,6 +85,7 @@ class OpenStackConnection(OpenStackBaseC
responseCls = OpenStackResponse
_url_key = "server_url"
+ XML_NAMESPACE = 'http://docs.rackspacecloud.com/servers/api/v1.0'
def __init__(self, user_id, key, secure=True, host=None, port=None,
ex_force_base_url=None,
@@ -154,6 +155,7 @@ class OpenStackNodeDriver(NodeDriver):
self._ex_force_base_url = kwargs.pop('ex_force_base_url', None)
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)
def _ex_connection_class_kwargs(self):
