From 2d2b9463275d1272e23fb2fe7972b7e5b3a8d471 Mon Sep 17 00:00:00 2001 From: Quentin Smith Date: Mon, 12 Jan 2009 21:27:39 -0500 Subject: [PATCH] Show hostnames for every NIC svn path=/trunk/packages/invirt-web/; revision=1976 --- code/main.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/code/main.py b/code/main.py index 3a89eea..908d7cd 100755 --- a/code/main.py +++ b/code/main.py @@ -269,13 +269,16 @@ def getHostname(nic): XXX this should be merged with the similar logic in DNS and DHCP. """ - if nic.hostname and '.' in nic.hostname: - return nic.hostname + if nic.hostname: + hostname = nic.hostname elif nic.machine: - return nic.machine.name + '.' + config.dns.domains[0] + hostname = nic.machine.name else: return None - + if '.' in hostname: + return hostname + else: + return hostname + '.' + config.dns.domains[0] def getNicInfo(data_dict, machine): """Helper function for info, get data on nics for a machine. @@ -291,8 +294,7 @@ def getNicInfo(data_dict, machine): nic_fields = [] for i in range(len(machine.nics)): nic_fields.extend([(x % i, y % i) for x, y in nic_fields_template]) - if not i: - data_dict['nic%s_hostname' % i] = getHostname(machine.nics[i]) + data_dict['nic%s_hostname' % i] = getHostname(machine.nics[i]) data_dict['nic%s_mac' % i] = machine.nics[i].mac_addr data_dict['nic%s_ip' % i] = machine.nics[i].ip if len(machine.nics) == 1: -- 1.7.9.5