mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Separate functions for target host name and fqdn.

Browse source
This commit is contained in:
Darko Poljak 2017-06-23 20:03:28 +02:00
parent 689cac5be5
commit 00a7f4af93
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cdist/util/ipaddr.py
View file

@ -24,6 +24,12 @@ import logging
def resolve_target_addresses(host): def resolve_target_addresses(host):
host_name = resolve_target_host_name(host)
host_fqdn = resolve_target_fqdn(host)
return (host, host_name, host_fqdn)
def resolve_target_host_name(host):
log = logging.getLogger(host) log = logging.getLogger(host)
try: try:
# getaddrinfo returns a list of 5-tuples: # getaddrinfo returns a list of 5-tuples:
@ -43,7 +49,11 @@ def resolve_target_addresses(host):
", $host_name will be empty. Error is: {}".format(host, e)) ", $host_name will be empty. Error is: {}".format(host, e))
# in case of error provide empty value # in case of error provide empty value
host_name = '' host_name = ''
return host_name
def resolve_target_fqdn(host):
log = logging.getLogger(host)
try: try:
host_fqdn = socket.getfqdn(host) host_fqdn = socket.getfqdn(host)
log.debug("derived host_fqdn for host \"{}\": {}".format( log.debug("derived host_fqdn for host \"{}\": {}".format(
@ -53,8 +63,7 @@ def resolve_target_addresses(host):
", $host_fqdn will be empty. Error is: {}".format(host, e)) ", $host_fqdn will be empty. Error is: {}".format(host, e))
# in case of error provide empty value # in case of error provide empty value
host_fqdn = '' host_fqdn = ''
return host_fqdn
return (host, host_name, host_fqdn)
# check whether addr is IPv6 # check whether addr is IPv6