move get_fqdn to onedns.utils module
parent
7f2a3ca8a8
commit
ec8c1902ab
|
@ -8,6 +8,8 @@ from dnslib import dns
|
|||
|
||||
from IPy import IP
|
||||
|
||||
from onedns import utils
|
||||
|
||||
|
||||
class DynamicResolver(server.BaseResolver):
|
||||
"""
|
||||
|
@ -55,12 +57,7 @@ class DynamicResolver(server.BaseResolver):
|
|||
self._add_reverse(ip, name)
|
||||
|
||||
def _get_fqdn(self, name):
|
||||
if not name.endswith(self.domain):
|
||||
if name.endswith('.'):
|
||||
return name + self.domain
|
||||
else:
|
||||
return '.'.join([name, self.domain])
|
||||
return name
|
||||
return utils.get_fqdn(name, self.domain)
|
||||
|
||||
def _add_forward(self, name, ip):
|
||||
f = dnslib.RR(rname=dnslib.DNSLabel(self._get_fqdn(name)),
|
||||
|
|
|
@ -3,6 +3,15 @@ import os
|
|||
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):
|
||||
tups_list = []
|
||||
for i in d:
|
||||
|
|
Loading…
Reference in New Issue