Author: tomaz
Date: Sat Nov 5 17:02:46 2011
New Revision: 1197990
URL: http://svn.apache.org/viewvc?rev=1197990&view=rev
Log:
Change base LoadBalancer API to use keyword arguments. Also add tests for
LoadBalancer class methods.
Modified:
libcloud/trunk/libcloud/loadbalancer/base.py
libcloud/trunk/test/loadbalancer/test_gogrid.py
Modified: libcloud/trunk/libcloud/loadbalancer/base.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/loadbalancer/base.py?rev=1197990&r1=1197989&r2=1197990&view=diff
==============================================================================
--- libcloud/trunk/libcloud/loadbalancer/base.py (original)
+++ libcloud/trunk/libcloud/loadbalancer/base.py Sat Nov 5 17:02:46 2011
@@ -55,16 +55,19 @@ class LoadBalancer(object):
self.driver = driver
def attach_compute_node(self, node):
- return self.driver.balancer_attach_compute_node(self, node)
+ return self.driver.balancer_attach_compute_node(balancer=self,
+ node=node)
def attach_member(self, member):
- return self.driver.balancer_attach_member(self, member)
+ return self.driver.balancer_attach_member(balancer=self,
+ member=member)
def detach_member(self, member):
- return self.driver.balancer_detach_member(self, member)
+ return self.driver.balancer_detach_member(balancer=self,
+ member=member)
def list_members(self):
- return self.driver.balancer_list_members(self)
+ return self.driver.balancer_list_members(balancer=self)
def __repr__(self):
return ('<LoadBalancer: id=%s, name=%s, state=%s>' % (self.id,
Modified: libcloud/trunk/test/loadbalancer/test_gogrid.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_gogrid.py?rev=1197990&r1=1197989&r2=1197990&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_gogrid.py (original)
+++ libcloud/trunk/test/loadbalancer/test_gogrid.py Sat Nov 5 17:02:46 2011
@@ -94,14 +94,16 @@ class GoGridTests(unittest.TestCase):
def test_balancer_list_members(self):
balancer = self.driver.get_balancer(balancer_id='23530')
- members = balancer.list_members()
+ members1 = self.driver.balancer_list_members(balancer=balancer)
+ members2 = balancer.list_members()
expected_members = set([u'10.0.0.78:80', u'10.0.0.77:80',
u'10.0.0.76:80'])
- self.assertEquals(len(members), 3)
+ self.assertEquals(len(members1), 3)
+ self.assertEquals(len(members2), 3)
self.assertEquals(expected_members,
- set(["%s:%s" % (member.ip, member.port) for member in
members]))
+ set(["%s:%s" % (member.ip, member.port) for member in
members1]))
def test_balancer_attach_compute_node(self):
balancer = LoadBalancer(23530, None, None, None, None, self.driver)
@@ -116,20 +118,25 @@ class GoGridTests(unittest.TestCase):
self.assertEquals(member2.port, 80)
def test_balancer_attach_member(self):
- balancer = LoadBalancer(23530, None, None, None, None, None)
- member = self.driver.balancer_attach_member(balancer,
- Member(None, ip='10.0.0.75', port='80'))
+ balancer = LoadBalancer(23530, None, None, None, None, self.driver)
+ member = Member(None, ip='10.0.0.75', port='80')
+ member1 = self.driver.balancer_attach_member(balancer, member=member)
+ member2 = balancer.attach_member(member=member)
- self.assertEquals(member.ip, '10.0.0.75')
- self.assertEquals(member.port, 80)
+ self.assertEquals(member1.ip, '10.0.0.75')
+ self.assertEquals(member1.port, 80)
+ self.assertEquals(member2.ip, '10.0.0.75')
+ self.assertEquals(member2.port, 80)
def test_balancer_detach_member(self):
- balancer = LoadBalancer(23530, None, None, None, None, None)
+ balancer = LoadBalancer(23530, None, None, None, None, self.driver)
member = self.driver.balancer_list_members(balancer)[0]
- ret = self.driver.balancer_detach_member(balancer, member)
+ ret1 = self.driver.balancer_detach_member(balancer, member)
+ ret2 = balancer.detach_member(member)
- self.assertTrue(ret)
+ self.assertTrue(ret1)
+ self.assertTrue(ret2)
class GoGridLBMockHttp(MockHttpTestCase):
fixtures = LoadBalancerFileFixtures('gogrid')
