Skip to content

Commit

Permalink
Merge 3b746f8 into 516da9a
Browse files Browse the repository at this point in the history
  • Loading branch information
trinopoty authored Dec 4, 2019
2 parents 516da9a + 3b746f8 commit d64f1b3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions lexicon/providers/linode.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def _authenticate(self):
self.domain_id = None
payload = self._get('domain.list')
for domain in payload['DATA']:
if domain['DOMAIN'] == self.domain:
if domain['DOMAIN'].lower() == self.domain.lower():
self.domain_id = domain['DOMAINID']
if self.domain_id is None:
raise Exception('Domain not found')
Expand All @@ -38,7 +38,7 @@ def _create_record(self, rtype, name, content):
if not self._list_records(rtype, name, content):
self._get('domain.resource.create', query_params={
'DomainID': self.domain_id,
'Name': self._relative_name(name),
'Name': self._relative_name(name).lower(),
'Type': rtype,
'Target': content,
'TTL_sec': 0
Expand All @@ -57,9 +57,9 @@ def _list_records(self, rtype=None, name=None, content=None):
resource_list = [
resource for resource in resource_list if resource['TYPE'] == rtype]
if name:
cmp_name = self._relative_name(name.lower())
cmp_name = self._relative_name(name).lower()
resource_list = [
resource for resource in resource_list if resource['NAME'] == cmp_name]
resource for resource in resource_list if resource['NAME'].lower() == cmp_name]
if content:
resource_list = [
resource for resource in resource_list if resource['TARGET'] == content]
Expand All @@ -69,7 +69,7 @@ def _list_records(self, rtype=None, name=None, content=None):
processed_records.append({
'id': resource['RESOURCEID'],
'type': resource['TYPE'],
'name': self._full_name(resource['NAME']),
'name': self._full_name(resource['NAME']).lower(),
'ttl': resource['TTL_SEC'],
'content': resource['TARGET']
})
Expand Down
12 changes: 6 additions & 6 deletions lexicon/providers/linode4.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def _authenticate(self):
self.domain_id = None
payload = self._get('domains', query_params={
'filter': {
'domain': self.domain
'domain': self.domain.lower()
}
})
if payload['data']:
Expand All @@ -40,7 +40,7 @@ def _authenticate(self):
def _create_record(self, rtype, name, content):
if not self._list_records(rtype, name, content):
if name:
name = self._relative_name(name)
name = self._relative_name(name).lower()

self._post('domains/{0}/records'.format(self.domain_id), data={
'name': name,
Expand All @@ -58,7 +58,7 @@ def _list_records(self, rtype=None, name=None, content=None):
resources_url = "domains/{0}/records".format(self.domain_id)

if name:
name = self._relative_name(name)
name = self._relative_name(name).lower()

processed_records = []

Expand All @@ -75,7 +75,7 @@ def _list_records(self, rtype=None, name=None, content=None):
resource for resource in resource_list if resource['type'] == rtype]
if name:
resource_list = [resource for resource in resource_list if self._relative_name(
resource['name']) == name]
resource['name']).lower() == name]
if content:
resource_list = [
resource for resource in resource_list if resource['target'] == content]
Expand All @@ -84,7 +84,7 @@ def _list_records(self, rtype=None, name=None, content=None):
processed_records.append({
'id': resource['id'],
'type': resource['type'],
'name': self._full_name(resource['name']),
'name': self._full_name(resource['name']).lower(),
'ttl': resource['ttl_sec'],
'content': resource['target']
})
Expand All @@ -101,7 +101,7 @@ def _update_record(self, identifier, rtype=None, name=None, content=None):
LOGGER.debug('update_record: %s', identifier)

if name:
name = self._relative_name(name)
name = self._relative_name(name).lower()

url = 'domains/{0}/records/{1}'.format(self.domain_id, identifier)
self._put(url, data={
Expand Down

0 comments on commit d64f1b3

Please sign in to comment.