Author: tomaz
Date: Sat Mar 23 04:41:17 2013
New Revision: 1460095
URL: http://svn.apache.org/r1460095
Log:
Backport commit 1460093 from trunk.
Modified:
libcloud/branches/0.12.x/ (props changed)
libcloud/branches/0.12.x/CHANGES
libcloud/branches/0.12.x/libcloud/compute/drivers/softlayer.py
libcloud/branches/0.12.x/libcloud/test/compute/test_softlayer.py
Propchange: libcloud/branches/0.12.x/
------------------------------------------------------------------------------
Merged /libcloud/trunk:r1460093
Modified: libcloud/branches/0.12.x/CHANGES
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/CHANGES?rev=1460095&r1=1460094&r2=1460095&view=diff
==============================================================================
--- libcloud/branches/0.12.x/CHANGES (original)
+++ libcloud/branches/0.12.x/CHANGES Sat Mar 23 04:41:17 2013
@@ -1,5 +1,13 @@
-*- coding: utf-8 -*-
+Changes with Apache Libcloud in development:
+
+ *) Compute
+
+ - Fix a regression in Softlayer driver caused by the xmlrpclib changes.
+ (LIBCLOUD-310)
+ [Jason Johnson]
+
Changes with Apache Libcloud 0.12.3:
*) General
Modified: libcloud/branches/0.12.x/libcloud/compute/drivers/softlayer.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/compute/drivers/softlayer.py?rev=1460095&r1=1460094&r2=1460095&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/compute/drivers/softlayer.py (original)
+++ libcloud/branches/0.12.x/libcloud/compute/drivers/softlayer.py Sat Mar 23
04:41:17 2013
@@ -108,7 +108,8 @@ class SoftLayerResponse(XMLRPCResponse):
class SoftLayerConnection(XMLRPCConnection, ConnectionUserAndKey):
responseCls = SoftLayerResponse
- endpoint = '/xmlrpc/v3/'
+ host = 'api.softlayer.com'
+ endpoint = '/xmlrpc/v3'
def request(self, service, method, *args, **kwargs):
headers = {}
Modified: libcloud/branches/0.12.x/libcloud/test/compute/test_softlayer.py
URL:
http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/test/compute/test_softlayer.py?rev=1460095&r1=1460094&r2=1460095&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/test/compute/test_softlayer.py (original)
+++ libcloud/branches/0.12.x/libcloud/test/compute/test_softlayer.py Sat Mar 23
04:41:17 2013
@@ -143,24 +143,24 @@ class SoftLayerMockHttp(MockHttp):
meth_name = "%s_%s" % (url, meth_name)
return getattr(self, meth_name)(method, url, body, headers)
- def _xmlrpc_v3__SoftLayer_Virtual_Guest_getCreateObjectOptions(
+ def _xmlrpc_v3_SoftLayer_Virtual_Guest_getCreateObjectOptions(
self, method, url, body, headers):
body = self.fixtures.load(
'v3__SoftLayer_Virtual_Guest_getCreateObjectOptions.xml')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
- def _xmlrpc_v3__SoftLayer_Account_getVirtualGuests(
+ def _xmlrpc_v3_SoftLayer_Account_getVirtualGuests(
self, method, url, body, headers):
body = self.fixtures.load('v3_SoftLayer_Account_getVirtualGuests.xml')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
- def _xmlrpc_v3__SoftLayer_Location_Datacenter_getDatacenters(
+ def _xmlrpc_v3_SoftLayer_Location_Datacenter_getDatacenters(
self, method, url, body, headers):
body = self.fixtures.load(
'v3_SoftLayer_Location_Datacenter_getDatacenters.xml')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
- def _xmlrpc_v3__SoftLayer_Virtual_Guest_createObject(
+ def _xmlrpc_v3_SoftLayer_Virtual_Guest_createObject(
self, method, url, body, headers):
fixture = {
None: 'v3__SoftLayer_Virtual_Guest_createObject.xml',
@@ -170,18 +170,18 @@ class SoftLayerMockHttp(MockHttp):
body = self.fixtures.load(fixture)
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
- def _xmlrpc_v3__SoftLayer_Virtual_Guest_getObject(
+ def _xmlrpc_v3_SoftLayer_Virtual_Guest_getObject(
self, method, url, body, headers):
body = self.fixtures.load(
'v3__SoftLayer_Virtual_Guest_getObject.xml')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
- def _xmlrpc_v3__SoftLayer_Virtual_Guest_rebootSoft(
+ def _xmlrpc_v3_SoftLayer_Virtual_Guest_rebootSoft(
self, method, url, body, headers):
body = self.fixtures.load('empty.xml')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
- def _xmlrpc_v3__SoftLayer_Virtual_Guest_deleteObject(
+ def _xmlrpc_v3_SoftLayer_Virtual_Guest_deleteObject(
self, method, url, body, headers):
body = self.fixtures.load('empty.xml')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
