from invirt.config import structs as config
dhcp_options = {'domain_name_server': ','.join(config.dhcp.dns),
- 'ip_address_lease_time': config.dhcp.leasetime if config.dhcp.has_key('leasetime') else 60*60*24}
+ 'ip_address_lease_time': config.dhcp.get('leasetime', 60*60*24)}
class DhcpBackend:
def __init__(self, queue):
s.syslog(s.LOG_ERR, "Interface is %s" % (intf))
# Don't perform "other" actions if the machine isn't running
other_action = n.other_action if n.other_action and intf else ''
- if other_action == 'renumber' or other_action == 'renumber_dhcp':
+ if other_action in ('renumber', 'renumber_dhcp'):
(n.ip, n.netmask, n.gateway, n.other_ip, n.other_netmask,
n.other_gateway) = (
n.other_ip, n.other_netmask, n.other_gateway, n.ip,