Merging in latest boto.

boto/ec2/elb/loadbalancer.py

 # Copyright (c) 2006-2009 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
 # SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
 from boto.ec2.elb.healthcheck import HealthCheck
 from boto.ec2.elb.listener import Listener
 from boto.ec2.elb.listelement import ListElement
 from boto.ec2.elb.policies import Policies
+from boto.ec2.elb.securitygroup import SecurityGroup
 from boto.ec2.instanceinfo import InstanceInfo
 from boto.resultset import ResultSet
 
 class LoadBalancer(object):
     """
     Represents an EC2 Load Balancer
     """
 
     def __init__(self, connection=None, name=None, endpoints=None):
         self.connection = connection
         self.name = name
         self.listeners = None
         self.health_check = None
         self.policies = None
         self.dns_name = None
         self.created_time = None
         self.instances = None
         self.availability_zones = ListElement()
+        self.canonical_hosted_zone_name = None
+        self.canonical_hosted_zone_name_id = None
+        self.source_security_group = None
 
     def __repr__(self):
         return 'LoadBalancer:%s' % self.name
 
     def startElement(self, name, attrs, connection):
         if name == 'HealthCheck':
             self.health_check = HealthCheck(self)
             return self.health_check
         elif name == 'ListenerDescriptions':
             self.listeners = ResultSet([('member', Listener)])
             return self.listeners
         elif name == 'AvailabilityZones':
             return self.availability_zones
         elif name == 'Instances':
             self.instances = ResultSet([('member', InstanceInfo)])
             return self.instances
         elif name == 'Policies':
             self.policies = Policies(self)
             return self.policies
+        elif name == 'SourceSecurityGroup':
+            self.source_security_group = SecurityGroup()
+            return self.source_security_group
         else:
             return None
 
     def endElement(self, name, value, connection):
         if name == 'LoadBalancerName':
             self.name = value
         elif name == 'DNSName':
             self.dns_name = value
         elif name == 'CreatedTime':
             self.created_time = value
         elif name == 'InstanceId':
             self.instances.append(value)
+        elif name == 'CanonicalHostedZoneName':
+            self.canonical_hosted_zone_name = value
+        elif name == 'CanonicalHostedZoneNameID':
+            self.canonical_hosted_zone_name_id = value
         else:
             setattr(self, name, value)
 
     def enable_zones(self, zones):
         """
         Enable availability zones to this Access Point.
         All zones must be in the same region as the Access Point.
 
         :type zones: string or List of strings
         :param zones: The name of the zone(s) to add.
@@ skipping 88 matching lines @@
 
     def create_cookie_stickiness_policy(self, cookie_expiration_period, policy_name):
         return self.connection.create_lb_cookie_stickiness_policy(cookie_expiration_period, self.name, policy_name)
 
     def create_app_cookie_stickiness_policy(self, name, policy_name):
         return self.connection.create_app_cookie_stickiness_policy(name, self.name, policy_name)
 
     def set_listener_SSL_certificate(self, lb_port, ssl_certificate_id):
         return self.connection.set_lb_listener_SSL_certificate(self.name, lb_port, ssl_certificate_id)