--- a/pvl/hosts/config.py Wed Feb 25 14:22:37 2015 +0200
+++ b/pvl/hosts/config.py Wed Feb 25 14:22:49 2015 +0200
@@ -7,6 +7,7 @@
import optparse
import os.path
import pvl.args
+import pvl.dns
import sys
from pvl.hosts.host import Host
@@ -55,10 +56,10 @@
Expand a templated host item.
"""
- name = pvl.dns.zone.parse_generate_field(name)
+ name = pvl.dns.parse_generate_field(name)
# expand all fields
- params = {param: pvl.dns.zone.parse_generate_field(value) for param, value in params.iteritems()}
+ params = {param: pvl.dns.parse_generate_field(value) for param, value in params.iteritems()}
for i in range:
yield name(i), {param: value(i) for param, value in params.iteritems()}
@@ -81,7 +82,7 @@
name = pre + "$" + post
# TODO: raise HostConfigError
- range = pvl.dns.zone.parse_generate_range(range)
+ range = pvl.dns.parse_generate_range(range)
else:
range = None