[boto] r1332 committed - Support multiple availability zones in Autoscale code.

[codesite...@google.com]

Revision: 1332
Author: rlotun
Date: Sun Oct 25 11:01:12 2009
Log: Support multiple availability zones in Autoscale code.
http://code.google.com/p/boto/source/detail?r=1332

Modified:
/trunk/boto/ec2/autoscale/__init__.py
/trunk/boto/ec2/autoscale/group.py

=======================================
--- /trunk/boto/ec2/autoscale/__init__.py Sun Sep 20 18:05:11 2009
+++ /trunk/boto/ec2/autoscale/__init__.py Sun Oct 25 11:01:12 2009
@@ -82,9 +82,13 @@
'MaxSize' : as_group.max_size,
}
if op.startswith('Create'):
+ if as_group.availability_zones:
+ zones = self.availability_zones
+ else:
+ zones = [as_group.availability_zone]
self.build_list_params(params, as_group.load_balancers,
'LoadBalancerNames')
- self.build_list_params(params, [as_group.availability_zone],
+ self.build_list_params(params, zones,
'AvailabilityZones')
return self.get_object(op, params, Request)

@@ -146,6 +150,7 @@

req = self.get_object('CreateOrUpdateScalingTrigger', params,
Request)
+ return req

def get_all_groups(self, names=None):
"""
=======================================
--- /trunk/boto/ec2/autoscale/group.py Sun Sep 20 18:05:11 2009
+++ /trunk/boto/ec2/autoscale/group.py Sun Oct 25 11:01:12 2009
@@ -47,6 +47,7 @@
class AutoScalingGroup(object):
def __init__(self, connection=None, group_name=None,
availability_zone=None, launch_config=None,
+ availability_zones=None,
load_balancers=None, cooldown=0,
min_size=None, max_size=None):
"""
@@ -61,7 +62,13 @@
:param name: Name of autoscaling group.

:type availability_zone: str
- :param availability_zone: An availability zone.
+ :param availability_zone: An availability zone. DEPRECATED - use
the
+ availability_zones parameter, which
expects
+ a list of availability zone
+ strings
+
+ :type availability_zone: list
+ :param availability_zone: List of availability zones.

:type launch_config: str
:param launch_config: Name of launch configuration name.
@@ -97,6 +104,7 @@
lbs = load_balancers or []
self.load_balancers = ListElement(lbs)
self.availability_zone = availability_zone
+ self.availability_zones = availability_zones
self.instances = None

def __repr__(self):