Repository: libcloud Updated Branches: refs/heads/trunk abb7423c3 -> e7d1882dd
Rename create_zone zone_id to domain. Ensure posta_data and priority are not overwritten. Closes #596 Signed-off-by: Tomaz Muraus <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/fe079c90 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/fe079c90 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/fe079c90 Branch: refs/heads/trunk Commit: fe079c9051237dd952e5a6743ec3af88f8bcca61 Parents: abb7423 Author: dz0ny <[email protected]> Authored: Fri Oct 9 20:13:24 2015 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Sat Oct 10 22:13:53 2015 +0200 ---------------------------------------------------------------------- libcloud/dns/drivers/vultr.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/fe079c90/libcloud/dns/drivers/vultr.py ---------------------------------------------------------------------- diff --git a/libcloud/dns/drivers/vultr.py b/libcloud/dns/drivers/vultr.py index 3b66d9f..6fa8e9d 100644 --- a/libcloud/dns/drivers/vultr.py +++ b/libcloud/dns/drivers/vultr.py @@ -158,12 +158,12 @@ class VultrDNSDriver(DNSDriver): return ret_record - def create_zone(self, zone_id, type='master', ttl=None, extra=None): + def create_zone(self, domain, type='master', ttl=None, extra=None): """ Returns a `Zone` object. - :param zone_id: Zone domain name, (e.g. example.com). - :type zone_id: ``str`` + :param domain: Zone domain name, (e.g. example.com). + :type domain: ``str`` :param type: Zone type (master / slave). :type type: ``str`` @@ -179,16 +179,16 @@ class VultrDNSDriver(DNSDriver): serverip = extra['serverip'] params = {'api_key': self.key} - data = urlencode({'domain': zone_id, 'serverip': serverip}) + data = urlencode({'domain': domain, 'serverip': serverip}) action = '/v1/dns/create_domain' zones = self.list_zones() - if self.ex_zone_exists(zone_id, zones): + if self.ex_zone_exists(domain, zones): raise ZoneAlreadyExistsError(value='', driver=self, - zone_id=zone_id) + domain=domain) self.connection.request(params=params, action=action, data=data, method='POST') - zone = Zone(id=zone_id, domain=zone_id, type=type, ttl=ttl, + zone = Zone(id=domain, domain=domain, type=type, ttl=ttl, driver=self, extra=extra) return zone @@ -228,21 +228,18 @@ class VultrDNSDriver(DNSDriver): raise RecordAlreadyExistsError(value='', driver=self, record_id=record.id) - if extra and extra.get('priority'): - priority = int(extra['priority']) - MX = self.RECORD_TYPE_MAP.get('MX') SRV = self.RECORD_TYPE_MAP.get('SRV') + if extra and extra.get('priority'): + priority = int(extra['priority']) + post_data = {'domain': zone.domain, 'name': name, - 'type': self.RECORD_TYPE_MAP.get('type'), 'data': data} + 'type': self.RECORD_TYPE_MAP.get(type), 'data': data} if type == MX or type == SRV: post_data['priority'] = priority - post_data = {'domain': zone.domain, 'name': name, - 'type': self.RECORD_TYPE_MAP.get(type), 'data': data} - encoded_data = urlencode(post_data) params = {'api_key': self.key} action = '/v1/dns/create_record'
