vitalif
/
onedns
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

move get_fqdn to onedns.utils module

master
Justin Riley 2016-08-12 11:12:11 -04:00
parent 7f2a3ca8a8
commit ec8c1902ab
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
onedns/resolver.py
View File

@ -8,6 +8,8 @@ from dnslib import dns
from IPy import IP from IPy import IP
from onedns import utils
class DynamicResolver(server.BaseResolver): class DynamicResolver(server.BaseResolver):
""" """
@ -55,12 +57,7 @@ class DynamicResolver(server.BaseResolver):
self._add_reverse(ip, name) self._add_reverse(ip, name)
def _get_fqdn(self, name): def _get_fqdn(self, name):
if not name.endswith(self.domain): return utils.get_fqdn(name, self.domain)
if name.endswith('.'):
return name + self.domain
else:
return '.'.join([name, self.domain])
return name
def _add_forward(self, name, ip): def _add_forward(self, name, ip):
f = dnslib.RR(rname=dnslib.DNSLabel(self._get_fqdn(name)), f = dnslib.RR(rname=dnslib.DNSLabel(self._get_fqdn(name)),

9
onedns/utils.py
View File

@ -3,6 +3,15 @@ import os
from onedns.logger import log from onedns.logger import log
def get_fqdn(name, domain):
if not name.endswith(domain):
if name.endswith('.'):
return name + domain
else:
return '.'.join([name, domain])
return name
def get_kwargs_from_dict(d, prefix, lower=False): def get_kwargs_from_dict(d, prefix, lower=False):
tups_list = [] tups_list = []
for i in d: for i in d: