Author: tomaz
Date: Wed Dec 14 19:21:46 2011
New Revision: 1214415
URL: http://svn.apache.org/viewvc?rev=1214415&view=rev
Log:
Add protocol info the Rackspace LoadBalancer object 'extra' dictionary. This
patch
has been contributed by Dave King and is part of GH-45.
Modified:
libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py
libcloud/trunk/test/loadbalancer/test_rackspace.py
Modified: libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py?rev=1214415&r1=1214414&r2=1214415&view=diff
==============================================================================
--- libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py (original)
+++ libcloud/trunk/libcloud/loadbalancer/drivers/rackspace.py Wed Dec 14
19:21:46 2011
@@ -343,6 +343,9 @@ class RackspaceLBDriver(Driver):
"ipv4PrivateSource": sourceAddresses.get("ipv4Servicenet"),
}
+ if 'protocol' in el:
+ extra['protocol'] = el['protocol']
+
if 'algorithm' in el and el["algorithm"] in
self._VALUE_TO_ALGORITHM_MAP:
extra["algorithm"] = self._value_to_algorithm(el["algorithm"])
Modified: libcloud/trunk/test/loadbalancer/test_rackspace.py
URL:
http://svn.apache.org/viewvc/libcloud/trunk/test/loadbalancer/test_rackspace.py?rev=1214415&r1=1214414&r2=1214415&view=diff
==============================================================================
--- libcloud/trunk/test/loadbalancer/test_rackspace.py (original)
+++ libcloud/trunk/test/loadbalancer/test_rackspace.py Wed Dec 14 19:21:46 2011
@@ -141,6 +141,10 @@ class RackspaceLBTests(unittest.TestCase
balancer = self.driver.get_balancer(balancer_id='8290')
self.assertEquals(balancer.extra["algorithm"], Algorithm.RANDOM)
+ def test_get_balancer_protocol(self):
+ balancer = self.driver.get_balancer(balancer_id='94695')
+ self.assertEquals(balancer.extra['protocol'], 'HTTP')
+
def test_get_balancer_weighted_round_robin_algorithm(self):
balancer = self.driver.get_balancer(balancer_id='94692')
self.assertEquals(balancer.extra["algorithm"],
