Author: tomaz
Date: Wed Jun 22 10:29:12 2011
New Revision: 1138384
URL: http://svn.apache.org/viewvc?rev=1138384&view=rev
Log:
Fix gogrid loadbalancer driver and test so it works with Python 2.5.
Modified:
libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py
libcloud/trunk/test/loadbalancer/test_gogrid.py
Modified: libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py?rev=1138384&r1=1138383&r2=1138384&view=diff
==============================================================================
--- libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py (original)
+++ libcloud/trunk/libcloud/loadbalancer/drivers/gogrid.py Wed Jun 22 10:29:12
2011
@@ -112,7 +112,7 @@ class GoGridLBDriver(BaseGoGridDriver, D
try:
resp = self.connection.request('/api/grid/loadbalancer/delete',
method='POST', params={'id': balancer.id})
- except Exception as err:
+ except Exception, err:
if "Update request for LoadBalancer" in str(err):
raise LibcloudLBImmutableError("Cannot delete immutable
object",
GoGridLBDriver)
@@ -171,7 +171,7 @@ class GoGridLBDriver(BaseGoGridDriver, D
return self.connection.request('/api/grid/loadbalancer/edit',
method='POST',
params=params)
- except Exception as err:
+ except Exception, err:
if "Update already pending" in str(err):
raise LibcloudLBImmutableError("Balancer is immutable",
GoGridLBDriver)
Modified: libcloud/trunk/test/loadbalancer/test_gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_gogrid.py?rev=1138384&r1=1138383&r2=1138384&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_gogrid.py (original)
+++ libcloud/trunk/test/loadbalancer/test_gogrid.py Wed Jun 22 10:29:12 2011
@@ -16,7 +16,7 @@
import httplib
import sys
import unittest
-from urlparse import urlparse, parse_qsl
+from urlparse import urlparse
from libcloud.common.types import LibcloudError
from libcloud.loadbalancer.base import LoadBalancer, Member, Algorithm
@@ -129,8 +129,8 @@ class GoGridLBMockHttp(MockHttpTestCase)
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
def _api_grid_loadbalancer_add(self, method, url, body, headers):
- qs = dict(parse_qsl(urlparse(url).query))
- self.assertEqual(qs['loadbalancer.type'], 'round robin')
+ query = urlparse(url).query
+ self.assertTrue(query.find('loadbalancer.type=round+robin') != -1)
body = self.fixtures.load('loadbalancer_add.json')
return (httplib.OK, body, {}, httplib.responses[httplib.OK])
