gcloud 0.0.7 → 0.1.0

data/packages/gsutil/boto/boto/route53/exception.py

@@ -1,27 +0,0 @@
-# Copyright (c) 2010 Mitch Garnaat http://garnaat.org/
-# Copyright (c) 2010, Eucalyptus Systems, Inc.
-#
-# 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.exception import BotoServerError
-
-class DNSServerError(BotoServerError):
-
-    pass

data/packages/gsutil/boto/boto/route53/hostedzone.py

@@ -1,56 +0,0 @@
-# Copyright (c) 2010 Mitch Garnaat http://garnaat.org/
-# Copyright (c) 2010, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# 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.
-#
-
-class HostedZone(object):
-
-    def __init__(self, id=None, name=None, owner=None, version=None,
-                 caller_reference=None, config=None):
-        self.id = id
-        self.name = name
-        self.owner = owner
-        self.version = version
-        self.caller_reference = caller_reference
-        self.config = config
-
-    def startElement(self, name, attrs, connection):
-        if name == 'Config':
-            self.config = Config()
-            return self.config
-        else:
-            return None
-
-    def endElement(self, name, value, connection):
-        if name == 'Id':
-            self.id = value
-        elif name == 'Name':
-            self.name = value
-        elif name == 'Owner':
-            self.owner = value
-        elif name == 'Version':
-            self.version = value
-        elif name == 'CallerReference':
-            self.caller_reference = value
-        else:
-            setattr(self, name, value)
-        

data/packages/gsutil/boto/boto/route53/record.py

@@ -1,306 +0,0 @@
-# Copyright (c) 2010 Chris Moyer http://coredumped.org/
-# Copyright (c) 2012 Mitch Garnaat http://garnaat.org/
-# Copyright (c) 2012 Amazon.com, Inc. or its affiliates.
-# All rights reserved.
-#
-# 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.
-
-RECORD_TYPES = ['A', 'AAAA', 'TXT', 'CNAME', 'MX', 'PTR', 'SRV', 'SPF']
-
-from boto.resultset import ResultSet
-class ResourceRecordSets(ResultSet):
-    """
-    A list of resource records.
-
-    :ivar hosted_zone_id: The ID of the hosted zone.
-    :ivar comment: A comment that will be stored with the change.
-    :ivar changes: A list of changes.
-    """
-
-    ChangeResourceRecordSetsBody = """<?xml version="1.0" encoding="UTF-8"?>
-    <ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2012-02-29/">
-            <ChangeBatch>
-                <Comment>%(comment)s</Comment>
-                <Changes>%(changes)s</Changes>
-            </ChangeBatch>
-        </ChangeResourceRecordSetsRequest>"""
-
-    ChangeXML = """<Change>
-        <Action>%(action)s</Action>
-        %(record)s
-    </Change>"""
-
-    def __init__(self, connection=None, hosted_zone_id=None, comment=None):
-        self.connection = connection
-        self.hosted_zone_id = hosted_zone_id
-        self.comment = comment
-        self.changes = []
-        self.next_record_name = None
-        self.next_record_type = None
-        ResultSet.__init__(self, [('ResourceRecordSet', Record)])
-
-    def __repr__(self):
-        if self.changes:
-            record_list = ','.join([c.__repr__() for c in self.changes])
-        else:
-            record_list = ','.join([record.__repr__() for record in self])
-        return '<ResourceRecordSets:%s [%s]' % (self.hosted_zone_id,
-                                                record_list)
-
-    def add_change(self, action, name, type, ttl=600,
-            alias_hosted_zone_id=None, alias_dns_name=None, identifier=None,
-            weight=None, region=None):
-        """
-        Add a change request to the set.
-
-        :type action: str
-        :param action: The action to perform ('CREATE'|'DELETE')
-
-        :type name: str
-        :param name: The name of the domain you want to perform the action on.
-
-        :type type: str
-        :param type: The DNS record type.  Valid values are:
-
-            * A
-            * AAAA
-            * CNAME
-            * MX
-            * NS
-            * PTR
-            * SOA
-            * SPF
-            * SRV
-            * TXT
-
-        :type ttl: int
-        :param ttl: The resource record cache time to live (TTL), in seconds.
-
-        :type alias_hosted_zone_id: str
-        :param alias_dns_name: *Alias resource record sets only* The value
-            of the hosted zone ID, CanonicalHostedZoneNameId, for
-            the LoadBalancer.
-
-        :type alias_dns_name: str
-        :param alias_hosted_zone_id: *Alias resource record sets only*
-            Information about the domain to which you are redirecting traffic.
-
-        :type identifier: str
-        :param identifier: *Weighted and latency-based resource record sets
-            only* An identifier that differentiates among multiple resource
-            record sets that have the same combination of DNS name and type.
-
-        :type weight: int
-        :param weight: *Weighted resource record sets only* Among resource
-            record sets that have the same combination of DNS name and type,
-            a value that determines what portion of traffic for the current
-            resource record set is routed to the associated location
-
-        :type region: str
-        :param region: *Latency-based resource record sets only* Among resource
-            record sets that have the same combination of DNS name and type,
-            a value that determines which region this should be associated with
-            for the latency-based routing
-        """
-        change = Record(name, type, ttl,
-                alias_hosted_zone_id=alias_hosted_zone_id,
-                alias_dns_name=alias_dns_name, identifier=identifier,
-                weight=weight, region=region)
-        self.changes.append([action, change])
-        return change
-
-    def add_change_record(self, action, change):
-        """Add an existing record to a change set with the specified action"""
-        self.changes.append([action, change])
-        return
-
-    def to_xml(self):
-        """Convert this ResourceRecordSet into XML
-        to be saved via the ChangeResourceRecordSetsRequest"""
-        changesXML = ""
-        for change in self.changes:
-            changeParams = {"action": change[0], "record": change[1].to_xml()}
-            changesXML += self.ChangeXML % changeParams
-        params = {"comment": self.comment, "changes": changesXML}
-        return self.ChangeResourceRecordSetsBody % params
-
-    def commit(self):
-        """Commit this change"""
-        if not self.connection:
-            import boto
-            self.connection = boto.connect_route53()
-        return self.connection.change_rrsets(self.hosted_zone_id, self.to_xml())
-
-    def endElement(self, name, value, connection):
-        """Overwritten to also add the NextRecordName and
-        NextRecordType to the base object"""
-        if name == 'NextRecordName':
-            self.next_record_name = value
-        elif name == 'NextRecordType':
-            self.next_record_type = value
-        else:
-            return ResultSet.endElement(self, name, value, connection)
-
-    def __iter__(self):
-        """Override the next function to support paging"""
-        results = ResultSet.__iter__(self)
-        while results:
-            for obj in results:
-                yield obj
-            if self.is_truncated:
-                self.is_truncated = False
-                results = self.connection.get_all_rrsets(self.hosted_zone_id, name=self.next_record_name, type=self.next_record_type)
-            else:
-                results = None
-
-
-
-class Record(object):
-    """An individual ResourceRecordSet"""
-
-    XMLBody = """<ResourceRecordSet>
-        <Name>%(name)s</Name>
-        <Type>%(type)s</Type>
-        %(weight)s
-        %(body)s
-    </ResourceRecordSet>"""
-
-    WRRBody = """
-        <SetIdentifier>%(identifier)s</SetIdentifier>
-        <Weight>%(weight)s</Weight>
-    """
-
-    RRRBody = """
-        <SetIdentifier>%(identifier)s</SetIdentifier>
-        <Region>%(region)s</Region>
-    """
-
-    ResourceRecordsBody = """
-        <TTL>%(ttl)s</TTL>
-        <ResourceRecords>
-            %(records)s
-        </ResourceRecords>"""
-
-    ResourceRecordBody = """<ResourceRecord>
-        <Value>%s</Value>
-    </ResourceRecord>"""
-
-    AliasBody = """<AliasTarget>
-        <HostedZoneId>%s</HostedZoneId>
-        <DNSName>%s</DNSName>
-    </AliasTarget>"""
-
-
-
-    def __init__(self, name=None, type=None, ttl=600, resource_records=None,
-            alias_hosted_zone_id=None, alias_dns_name=None, identifier=None,
-            weight=None, region=None):
-        self.name = name
-        self.type = type
-        self.ttl = ttl
-        if resource_records == None:
-            resource_records = []
-        self.resource_records = resource_records
-        self.alias_hosted_zone_id = alias_hosted_zone_id
-        self.alias_dns_name = alias_dns_name
-        self.identifier = identifier
-        self.weight = weight
-        self.region = region
-
-    def __repr__(self):
-        return '<Record:%s:%s:%s>' % (self.name, self.type, self.to_print())
-
-    def add_value(self, value):
-        """Add a resource record value"""
-        self.resource_records.append(value)
-
-    def set_alias(self, alias_hosted_zone_id, alias_dns_name):
-        """Make this an alias resource record set"""
-        self.alias_hosted_zone_id = alias_hosted_zone_id
-        self.alias_dns_name = alias_dns_name
-
-    def to_xml(self):
-        """Spit this resource record set out as XML"""
-        if self.alias_hosted_zone_id != None and self.alias_dns_name != None:
-            # Use alias
-            body = self.AliasBody % (self.alias_hosted_zone_id, self.alias_dns_name)
-        else:
-            # Use resource record(s)
-            records = ""
-            for r in self.resource_records:
-                records += self.ResourceRecordBody % r
-            body = self.ResourceRecordsBody % {
-                "ttl": self.ttl,
-                "records": records,
-            }
-        weight = ""
-        if self.identifier != None and self.weight != None:
-            weight = self.WRRBody % {"identifier": self.identifier, "weight":
-                    self.weight}
-        elif self.identifier != None and self.region != None:
-            weight = self.RRRBody % {"identifier": self.identifier, "region":
-                    self.region}
-        
-        params = {
-            "name": self.name,
-            "type": self.type,
-            "weight": weight,
-            "body": body,
-        }
-        return self.XMLBody % params
-
-    def to_print(self):
-        rr = ""
-        if self.alias_hosted_zone_id != None and self.alias_dns_name != None:
-            # Show alias
-            rr = 'ALIAS ' + self.alias_hosted_zone_id + ' ' + self.alias_dns_name
-        else:
-            # Show resource record(s)
-            rr =  ",".join(self.resource_records)
-
-        if self.identifier != None and self.weight != None:
-            rr += ' (WRR id=%s, w=%s)' % (self.identifier, self.weight)
-        elif self.identifier != None and self.region != None:
-            rr += ' (LBR id=%s, region=%s)' % (self.identifier, self.region)
-
-        return rr
-
-    def endElement(self, name, value, connection):
-        if name == 'Name':
-            self.name = value
-        elif name == 'Type':
-            self.type = value
-        elif name == 'TTL':
-            self.ttl = value
-        elif name == 'Value':
-            self.resource_records.append(value)
-        elif name == 'HostedZoneId':
-            self.alias_hosted_zone_id = value
-        elif name == 'DNSName':
-            self.alias_dns_name = value
-        elif name == 'SetIdentifier':
-            self.identifier = value
-        elif name == 'Weight':
-            self.weight = value
-        elif name == 'Region':
-            self.region = value
-
-    def startElement(self, name, attrs, connection):
-        return None

data/packages/gsutil/boto/boto/route53/status.py

@@ -1,42 +0,0 @@
-# Copyright (c) 2011 Blue Pines Technologies LLC, Brad Carleton
-# www.bluepines.org
-# All rights reserved.
-#
-# 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.
-
-
-class Status(object):
-    def __init__(self, route53connection, change_dict):
-        self.route53connection = route53connection
-        for key in change_dict:
-            if key == 'Id':
-                self.__setattr__(key.lower(),
-                                 change_dict[key].replace('/change/', ''))
-            else:
-                self.__setattr__(key.lower(), change_dict[key])
-
-    def update(self):
-        """ Update the status of this request."""
-        status = self.route53connection.get_change(self.id)['GetChangeResponse']['ChangeInfo']['Status']
-        self.status = status
-        return status
-
-    def __repr__(self):
-        return '<Status:%s>' % self.status

data/packages/gsutil/boto/boto/route53/zone.py

@@ -1,412 +0,0 @@
-# Copyright (c) 2011 Blue Pines Technologies LLC, Brad Carleton
-# www.bluepines.org
-# Copyright (c) 2012 42 Lines Inc., Jim Browne
-# All rights reserved.
-#
-# 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.
-
-default_ttl = 60
-
-import copy
-from boto.exception import TooManyRecordsException
-from boto.route53.record import ResourceRecordSets
-from boto.route53.status import Status
-
-
-class Zone(object):
-    """
-    A Route53 Zone.
-
-    :ivar Route53Connection route53connection
-    :ivar str Id: The ID of the hosted zone.
-    """
-    def __init__(self, route53connection, zone_dict):
-        self.route53connection = route53connection
-        for key in zone_dict:
-            if key == 'Id':
-                self.id = zone_dict['Id'].replace('/hostedzone/', '')
-            else:
-                self.__setattr__(key.lower(), zone_dict[key])
-
-    def __repr__(self):
-        return '<Zone:%s>' % self.name
-
-    def _commit(self, changes):
-        """
-        Commit a set of changes and return the ChangeInfo portion of
-        the response.
-
-        :type changes: ResourceRecordSets
-        :param changes: changes to be committed
-        """
-        response = changes.commit()
-        return response['ChangeResourceRecordSetsResponse']['ChangeInfo']
-
-    def _new_record(self, changes, resource_type, name, value, ttl, identifier,
-                   comment=""):
-        """
-        Add a CREATE change record to an existing ResourceRecordSets
-
-        :type changes: ResourceRecordSets
-        :param changes: change set to append to
-
-        :type name: str
-        :param name: The name of the resource record you want to
-            perform the action on.
-
-        :type resource_type: str
-        :param resource_type: The DNS record type
-
-        :param value: Appropriate value for resource_type
-
-        :type ttl: int
-        :param ttl: The resource record cache time to live (TTL), in seconds.
-
-        :type identifier: tuple
-        :param identifier: A tuple for setting WRR or LBR attributes.  Valid
-           forms are:
-
-           * (str, int): WRR record [e.g. ('foo',10)]
-           * (str, str): LBR record [e.g. ('foo','us-east-1')
-
-        :type comment: str
-        :param comment: A comment that will be stored with the change.
-        """
-        weight = None
-        region = None
-        if identifier is not None:
-            try:
-                int(identifier[1])
-                weight = identifier[1]
-                identifier = identifier[0]
-            except:
-                region = identifier[1]
-                identifier = identifier[0]
-        change = changes.add_change("CREATE", name, resource_type, ttl,
-                                    identifier=identifier, weight=weight,
-                                    region=region)
-        if type(value) in [list, tuple, set]:
-            for record in value:
-                change.add_value(record)
-        else:
-            change.add_value(value)
-
-    def add_record(self, resource_type, name, value, ttl=60, identifier=None,
-                   comment=""):
-        """
-        Add a new record to this Zone.  See _new_record for parameter
-        documentation.  Returns a Status object.
-        """
-        changes = ResourceRecordSets(self.route53connection, self.id, comment)
-        self._new_record(changes, resource_type, name, value, ttl, identifier,
-                         comment)
-        return Status(self.route53connection, self._commit(changes))
-
-    def update_record(self, old_record, new_value, new_ttl=None,
-                      new_identifier=None, comment=""):
-        """
-        Update an existing record in this Zone.  Returns a Status object.
-
-        :type old_record: ResourceRecord
-        :param old_record: A ResourceRecord (e.g. returned by find_records)
-
-        See _new_record for additional parameter documentation.
-        """
-        new_ttl = new_ttl or default_ttl
-        record = copy.copy(old_record)
-        changes = ResourceRecordSets(self.route53connection, self.id, comment)
-        changes.add_change_record("DELETE", record)
-        self._new_record(changes, record.type, record.name,
-                         new_value, new_ttl, new_identifier, comment)
-        return Status(self.route53connection, self._commit(changes))
-
-    def delete_record(self, record, comment=""):
-        """
-        Delete one or more records from this Zone.  Returns a Status object.
-
-        :param record: A ResourceRecord (e.g. returned by
-           find_records) or list, tuple, or set of ResourceRecords.
-
-        :type comment: str
-        :param comment: A comment that will be stored with the change.
-        """
-        changes = ResourceRecordSets(self.route53connection, self.id, comment)
-        if type(record) in [list, tuple, set]:
-            for r in record:
-                changes.add_change_record("DELETE", r)
-        else:
-            changes.add_change_record("DELETE", record)
-        return Status(self.route53connection, self._commit(changes))
-
-    def add_cname(self, name, value, ttl=None, identifier=None, comment=""):
-        """
-        Add a new CNAME record to this Zone.  See _new_record for
-        parameter documentation.  Returns a Status object.
-        """
-        ttl = ttl or default_ttl
-        name = self.route53connection._make_qualified(name)
-        value = self.route53connection._make_qualified(value)
-        return self.add_record(resource_type='CNAME',
-                               name=name,
-                               value=value,
-                               ttl=ttl,
-                               identifier=identifier,
-                               comment=comment)
-
-    def add_a(self, name, value, ttl=None, identifier=None, comment=""):
-        """
-        Add a new A record to this Zone.  See _new_record for
-        parameter documentation.  Returns a Status object.
-        """
-        ttl = ttl or default_ttl
-        name = self.route53connection._make_qualified(name)
-        return self.add_record(resource_type='A',
-                               name=name,
-                               value=value,
-                               ttl=ttl,
-                               identifier=identifier,
-                               comment=comment)
-
-    def add_mx(self, name, records, ttl=None, identifier=None, comment=""):
-        """
-        Add a new MX record to this Zone.  See _new_record for
-        parameter documentation.  Returns a Status object.
-        """
-        ttl = ttl or default_ttl
-        records = self.route53connection._make_qualified(records)
-        return self.add_record(resource_type='MX',
-                               name=name,
-                               value=records,
-                               ttl=ttl,
-                               identifier=identifier,
-                               comment=comment)
-
-    def find_records(self, name, type, desired=1, all=False, identifier=None):
-        """
-        Search this Zone for records that match given parameters.
-        Returns None if no results, a ResourceRecord if one result, or
-        a ResourceRecordSets if more than one result.
-
-        :type name: str
-        :param name: The name of the records should match this parameter
-
-        :type type: str
-        :param type: The type of the records should match this parameter
-
-        :type desired: int
-        :param desired: The number of desired results.  If the number of
-           matching records in the Zone exceeds the value of this parameter,
-           throw TooManyRecordsException
-
-        :type all: Boolean
-        :param all: If true return all records that match name, type, and
-          identifier parameters
-
-        :type identifier: Tuple
-        :param identifier: A tuple specifying WRR or LBR attributes.  Valid
-           forms are:
-
-           * (str, int): WRR record [e.g. ('foo',10)]
-           * (str, str): LBR record [e.g. ('foo','us-east-1')
-
-        """
-        name = self.route53connection._make_qualified(name)
-        returned = self.route53connection.get_all_rrsets(self.id, name=name,
-                                                         type=type)
-
-        # name/type for get_all_rrsets sets the starting record; they
-        # are not a filter
-        results = [r for r in returned if r.name == name and r.type == type]
-
-        weight = None
-        region = None
-        if identifier is not None:
-            try:
-                int(identifier[1])
-                weight = identifier[1]
-            except:
-                region = identifier[1]
-
-        if weight is not None:
-            results = [r for r in results if (r.weight == weight and
-                                              r.identifier == identifier[0])]
-        if region is not None:
-            results = [r for r in results if (r.region == region and
-                                              r.identifier == identifier[0])]
-
-        if ((not all) and (len(results) > desired)):
-            message = "Search: name %s type %s" % (name, type)
-            message += "\nFound: "
-            message += ", ".join(["%s %s %s" % (r.name, r.type, r.to_print())
-                                  for r in results])
-            raise TooManyRecordsException(message)
-        elif len(results) > 1:
-            return results
-        elif len(results) == 1:
-            return results[0]
-        else:
-            return None
-
-    def get_cname(self, name, all=False):
-        """
-        Search this Zone for CNAME records that match name.
-
-        Returns a ResourceRecord.
-
-        If there is more than one match return all as a
-        ResourceRecordSets if all is True, otherwise throws
-        TooManyRecordsException.
-        """
-        return self.find_records(name, 'CNAME', all=all)
-
-    def get_a(self, name, all=False):
-        """
-        Search this Zone for A records that match name.
-
-        Returns a ResourceRecord.
-
-        If there is more than one match return all as a
-        ResourceRecordSets if all is True, otherwise throws
-        TooManyRecordsException.
-        """
-        return self.find_records(name, 'A', all=all)
-
-    def get_mx(self, name, all=False):
-        """
-        Search this Zone for MX records that match name.
-
-        Returns a ResourceRecord.
-
-        If there is more than one match return all as a
-        ResourceRecordSets if all is True, otherwise throws
-        TooManyRecordsException.
-        """
-        return self.find_records(name, 'MX', all=all)
-
-    def update_cname(self, name, value, ttl=None, identifier=None, comment=""):
-        """
-        Update the given CNAME record in this Zone to a new value, ttl,
-        and identifier.  Returns a Status object.
-
-        Will throw TooManyRecordsException is name, value does not match
-        a single record.
-        """
-        name = self.route53connection._make_qualified(name)
-        value = self.route53connection._make_qualified(value)
-        old_record = self.get_cname(name)
-        ttl = ttl or old_record.ttl
-        return self.update_record(old_record,
-                                  new_value=value,
-                                  new_ttl=ttl,
-                                  new_identifier=identifier,
-                                  comment=comment)
-
-    def update_a(self, name, value, ttl=None, identifier=None, comment=""):
-        """
-        Update the given A record in this Zone to a new value, ttl,
-        and identifier.  Returns a Status object.
-
-        Will throw TooManyRecordsException is name, value does not match
-        a single record.
-        """
-        name = self.route53connection._make_qualified(name)
-        old_record = self.get_a(name)
-        ttl = ttl or old_record.ttl
-        return self.update_record(old_record,
-                                  new_value=value,
-                                  new_ttl=ttl,
-                                  new_identifier=identifier,
-                                  comment=comment)
-
-    def update_mx(self, name, value, ttl=None, identifier=None, comment=""):
-        """
-        Update the given MX record in this Zone to a new value, ttl,
-        and identifier.  Returns a Status object.
-
-        Will throw TooManyRecordsException is name, value does not match
-        a single record.
-        """
-        name = self.route53connection._make_qualified(name)
-        value = self.route53connection._make_qualified(value)
-        old_record = self.get_mx(name)
-        ttl = ttl or old_record.ttl
-        return self.update_record(old_record,
-                                  new_value=value,
-                                  new_ttl=ttl,
-                                  new_identifier=identifier,
-                                  comment=comment)
-
-    def delete_cname(self, name, identifier=None, all=False):
-        """
-        Delete a CNAME record matching name and identifier from
-        this Zone.  Returns a Status object.
-
-        If there is more than one match delete all matching records if
-        all is True, otherwise throws TooManyRecordsException.
-        """
-        name = self.route53connection._make_qualified(name)
-        record = self.find_records(name, 'CNAME', identifier=identifier,
-                                   all=all)
-        return self.delete_record(record)
-
-    def delete_a(self, name, identifier=None, all=False):
-        """
-        Delete an A record matching name and identifier from this
-        Zone.  Returns a Status object.
-
-        If there is more than one match delete all matching records if
-        all is True, otherwise throws TooManyRecordsException.
-        """
-        name = self.route53connection._make_qualified(name)
-        record = self.find_records(name, 'A', identifier=identifier,
-                                   all=all)
-        return self.delete_record(record)
-
-    def delete_mx(self, name, identifier=None, all=False):
-        """
-        Delete an MX record matching name and identifier from this
-        Zone.  Returns a Status object.
-
-        If there is more than one match delete all matching records if
-        all is True, otherwise throws TooManyRecordsException.
-        """
-        name = self.route53connection._make_qualified(name)
-        record = self.find_records(name, 'MX', identifier=identifier,
-                                   all=all)
-        return self.delete_record(record)
-
-    def get_records(self):
-        """
-        Return a ResourceRecordsSets for all of the records in this zone.
-        """
-        return self.route53connection.get_all_rrsets(self.id)
-
-    def delete(self):
-        """
-        Request that this zone be deleted by Amazon.
-        """
-        self.route53connection.delete_hosted_zone(self.id)
-
-    def get_nameservers(self):
-        """ Get the list of nameservers for this zone."""
-        ns = self.find_records(self.name, 'NS')
-        if ns is not None:
-            ns = ns.resource_records
-        return ns