author | Tero Marttila <terom@paivola.fi> |
Tue, 18 Mar 2014 21:24:18 +0200 | |
changeset 396 | dea2635763e6 |
parent 385 | 01d31fda75ab |
child 412 | b557b472ffa1 |
permissions | -rw-r--r-- |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
1 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
2 |
Host definitions. |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
3 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
4 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
5 |
import pvl.args |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
6 |
import pvl.dns.zone |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
7 |
|
381
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
8 |
import collections |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
9 |
import configobj |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
10 |
import ipaddr |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
11 |
import optparse |
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
12 |
import os.path |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
13 |
|
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
14 |
import logging; log = logging.getLogger('pvl.hosts') |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
15 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
16 |
def optparser (parser) : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
17 |
hosts = optparse.OptionGroup(parser, "Hosts input") |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
18 |
hosts.add_option('--hosts-charset', metavar='CHARSET', default='utf-8', |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
19 |
help="Encoding used for host files") |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
20 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
21 |
hosts.add_option('--hosts-domain', metavar='DOMAIN', |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
22 |
help="Default domain for hosts") |
334
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
23 |
|
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
24 |
hosts.add_option('--hosts-include', metavar='PATH', |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
25 |
help="Optional path for hosts includes, beyond host config dir") |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
26 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
27 |
return hosts |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
28 |
|
334
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
29 |
class HostError (Exception) : |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
30 |
pass |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
31 |
|
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
32 |
class HostConfigError (HostError) : |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
33 |
pass |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
34 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
35 |
class Host (object) : |
308
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
36 |
# the label used for alias4/6 hosts |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
37 |
ALIAS4_FMT = '{host}-ipv4' |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
38 |
ALIAS6_FMT = '{host}-ipv6' |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
39 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
40 |
@classmethod |
344
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
41 |
def expand (cls, options, range, host, domain, ip, forward=None, reverse=None, **opts) : |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
42 |
host = pvl.dns.zone.parse_generate_field(host) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
43 |
ip = pvl.dns.zone.parse_generate_field(ip) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
44 |
|
344
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
45 |
if forward is not None : |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
46 |
_forward = pvl.dns.zone.parse_generate_field(forward) |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
47 |
else : |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
48 |
_forward = lambda i: forward |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
49 |
|
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
50 |
if reverse is not None : |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
51 |
_reverse = pvl.dns.zone.parse_generate_field(reverse) |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
52 |
else : |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
53 |
_reverse = lambda i: reverse |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
54 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
55 |
for i in range : |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
56 |
yield cls.build(options, host(i), domain, |
344
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
57 |
ip = ip(i), |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
58 |
forward = _forward(i), |
70799ad5928d
pvl.hosts: also expand forward/reverse fields..
Tero Marttila <terom@paivola.fi>
parents:
337
diff
changeset
|
59 |
reverse = _reverse(i), |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
60 |
**opts |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
61 |
) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
62 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
63 |
@classmethod |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
64 |
def config (cls, options, host, section=None, domain=None, ip=None, **extra) : |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
65 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
66 |
Yield Hosts from a config section's scalars. |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
67 |
|
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
68 |
options - pvl.args Options |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
69 |
host - the name of the section (or file) containing this host item. |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
70 |
section - the parent section containing this host item, or None |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
71 |
used for domain |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
72 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
73 |
|
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
74 |
if domain : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
75 |
log.debug("%s: explicit domain: %s", host, domain) |
337
23b3c0661189
pvl.hosts: handle fqdn hosts correctly as not having a domain
Tero Marttila <terom@paivola.fi>
parents:
334
diff
changeset
|
76 |
elif '.' in host : |
23b3c0661189
pvl.hosts: handle fqdn hosts correctly as not having a domain
Tero Marttila <terom@paivola.fi>
parents:
334
diff
changeset
|
77 |
log.debug("%s: using as fqdn without domain", host) |
23b3c0661189
pvl.hosts: handle fqdn hosts correctly as not having a domain
Tero Marttila <terom@paivola.fi>
parents:
334
diff
changeset
|
78 |
domain = None |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
79 |
elif options.hosts_domain : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
80 |
log.debug("%s: default domain to --hots-domain: %s", host, options.hosts_domain) |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
81 |
domain = options.hosts_domain |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
82 |
elif section : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
83 |
log.debug("%s: default domain to section: %s", host, section) |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
84 |
domain = section |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
85 |
else : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
86 |
raise ValueError("%s: no domain given" % (host, )) |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
87 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
88 |
if '{' in host : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
89 |
pre, host = host.split('{', 1) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
90 |
range, post = host.rsplit('}', 1) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
91 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
92 |
range = pvl.dns.zone.parse_generate_range(range) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
93 |
host = pre + "$" + post |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
94 |
|
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
95 |
for host in cls.expand(options, range, host, domain, ip, **extra) : |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
96 |
yield host |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
97 |
else : |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
98 |
yield cls.build(options, host, domain, ip=ip, **extra) |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
99 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
100 |
@classmethod |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
101 |
def build (cls, options, host, domain, |
385
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
102 |
ip=None, ip6=None, owner=None, location=None, |
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
103 |
alias=None, alias4=None, alias6=None, |
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
104 |
forward=None, reverse=None, |
383
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
105 |
down=None, |
385
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
106 |
boot=None, |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
107 |
**extra) : |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
108 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
109 |
Return a Host from a config section's scalars. |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
110 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
111 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
112 |
|
305
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
113 |
if alias : |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
114 |
alias = alias.split() |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
115 |
else : |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
116 |
alias = () |
308
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
117 |
|
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
118 |
if alias4 : |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
119 |
alias4 = alias4.split() |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
120 |
else : |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
121 |
alias4 = () |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
122 |
|
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
123 |
if alias6 : |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
124 |
alias6 = alias6.split() |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
125 |
else : |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
126 |
alias6 = () |
305
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
127 |
|
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
128 |
ethernet = { } |
381
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
129 |
extensions = collections.defaultdict(dict) |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
130 |
|
305
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
131 |
for field, value in extra.iteritems() : |
381
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
132 |
if ':' in field : |
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
133 |
extension, field = field.split(':', 1) |
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
134 |
|
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
135 |
extensions[extension][field] = value |
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
136 |
|
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
137 |
continue |
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
138 |
|
305
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
139 |
if '.' in field : |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
140 |
field, instance = field.split('.') |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
141 |
else : |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
142 |
instance = None |
381
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
143 |
|
305
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
144 |
if field == 'ethernet' : |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
145 |
if instance : |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
146 |
ethernet[instance] = value |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
147 |
else : |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
148 |
for eth in value.split() : |
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
149 |
ethernet[len(ethernet)] = eth |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
150 |
else : |
306
a1bdb4499c7a
pvl.hots: fix Host.build Unknown host field error
Tero Marttila <terom@paivola.fi>
parents:
305
diff
changeset
|
151 |
raise ValueError("%s: Unknown host field: %s=%s" % (host, field, value)) |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
152 |
|
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
153 |
|
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
154 |
if forward is None : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
155 |
# normal zone |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
156 |
pass |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
157 |
elif forward : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
158 |
# alias to external zone |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
159 |
pass |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
160 |
else : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
161 |
# omit |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
162 |
forward = False |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
163 |
|
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
164 |
if reverse is None : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
165 |
# normal zone |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
166 |
pass |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
167 |
elif reverse : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
168 |
# alias to external zone |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
169 |
pass |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
170 |
else : |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
171 |
# omit |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
172 |
reverse = False |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
173 |
|
383
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
174 |
if down : |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
175 |
down = True |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
176 |
else : |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
177 |
down = None |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
178 |
|
385
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
179 |
if not location : |
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
180 |
location = None |
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
181 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
182 |
return cls(host, |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
183 |
domain = domain, |
282
63135113fe01
pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents:
277
diff
changeset
|
184 |
ip = ipaddr.IPv4Address(ip) if ip else None, |
63135113fe01
pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents:
277
diff
changeset
|
185 |
ip6 = ipaddr.IPv6Address(ip6) if ip6 else None, |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
186 |
ethernet = ethernet, |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
187 |
alias = alias, |
308
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
188 |
alias4 = alias4, |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
189 |
alias6 = alias6, |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
190 |
owner = owner, |
385
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
191 |
location = location, |
282
63135113fe01
pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents:
277
diff
changeset
|
192 |
boot = boot, |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
193 |
forward = forward, |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
194 |
reverse = reverse, |
383
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
195 |
down = down, |
381
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
196 |
|
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
197 |
**extensions |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
198 |
) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
199 |
|
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
200 |
def __init__ (self, host, |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
201 |
domain=None, |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
202 |
ip=None, ip6=None, |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
203 |
ethernet={ }, |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
204 |
alias=(), |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
205 |
owner=None, |
385
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
206 |
location=None, |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
207 |
boot=None, |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
208 |
alias4=None, alias6=None, |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
209 |
forward=None, reverse=None, |
383
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
210 |
down=None, |
381
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
211 |
**extensions |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
212 |
) : |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
213 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
214 |
host - str |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
215 |
domain - str |
282
63135113fe01
pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents:
277
diff
changeset
|
216 |
ip - ipaddr.IPv4Address |
63135113fe01
pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents:
277
diff
changeset
|
217 |
ip6 - ipaddr.IPv6Address |
305
e85c95e757eb
pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents:
299
diff
changeset
|
218 |
ethernet - { index: ethernet } |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
219 |
alias - list |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
220 |
owner - str: LDAP uid |
385
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
221 |
location - name |
308
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
222 |
alias4 - list (CNAME -> A) |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
223 |
alias6 - list (CNAME -> AAAA) |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
224 |
forward - generate forward records, or CNAME into given zone |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
225 |
reverse - generate reverse records, or CNAME into given zone |
383
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
226 |
down - not online |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
227 |
""" |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
228 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
229 |
self.host = host |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
230 |
self.domain = domain |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
231 |
self.ip = ip |
282
63135113fe01
pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents:
277
diff
changeset
|
232 |
self.ip6 = ip6 |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
233 |
self.ethernet = ethernet |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
234 |
self.alias = alias |
308
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
235 |
self.alias4 = alias4 |
08176bed21e3
pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents:
307
diff
changeset
|
236 |
self.alias6 = alias6 |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
237 |
self.owner = owner |
385
01d31fda75ab
pvl.hosts: add support for explicit location = ... field
Tero Marttila <terom@paivola.fi>
parents:
383
diff
changeset
|
238 |
self.location = location |
282
63135113fe01
pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents:
277
diff
changeset
|
239 |
self.boot = boot |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
240 |
self.forward = forward |
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
241 |
self.reverse = reverse |
383
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
242 |
self.down = down |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
243 |
|
381
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
244 |
self.extensions = extensions |
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
245 |
|
299
df653511caf9
pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents:
290
diff
changeset
|
246 |
def fqdn (self) : |
df653511caf9
pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents:
290
diff
changeset
|
247 |
if '.' in self.host : |
df653511caf9
pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents:
290
diff
changeset
|
248 |
return self.host + '.' |
df653511caf9
pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents:
290
diff
changeset
|
249 |
elif self.domain : |
df653511caf9
pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents:
290
diff
changeset
|
250 |
return pvl.dns.zone.fqdn(self.host, self.domain) |
df653511caf9
pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents:
290
diff
changeset
|
251 |
else : |
df653511caf9
pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents:
290
diff
changeset
|
252 |
raise ValueError("%s: have no fqdn/domain" % (self, )) |
381
6fe465ce6d52
pvl.hosts: support foo:bar = ... extension fields
Tero Marttila <terom@paivola.fi>
parents:
344
diff
changeset
|
253 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
254 |
def __str__ (self) : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
255 |
return str(self.host) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
256 |
|
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
257 |
def apply_host_includes (options, config_path, include) : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
258 |
""" |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
259 |
Yield files from a given config's include=... value |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
260 |
""" |
334
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
261 |
|
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
262 |
if options.hosts_include : |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
263 |
include_paths = (os.path.dirname(config_path), options.hosts_include) |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
264 |
else : |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
265 |
include_paths = (os.path.dirname(config_path), ) |
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
266 |
|
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
267 |
for include in include.split() : |
334
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
268 |
for include_path in include_paths : |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
269 |
path = os.path.join(include_path, include) |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
270 |
if os.path.exists(path) : |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
271 |
break |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
272 |
else : |
19da67d71506
pvl.hosts: --hosts-include path support
Tero Marttila <terom@paivola.fi>
parents:
333
diff
changeset
|
273 |
raise HostConfigError(config_path, "Unable to find include %s in include path: %s" % (include, ' '.join(include_paths))) |
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
274 |
|
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
275 |
if include.endswith('/') : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
276 |
for name in os.listdir(path) : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
277 |
file_path = os.path.join(path, name) |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
278 |
|
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
279 |
if name.startswith('.') : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
280 |
pass |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
281 |
elif not os.path.exists(file_path) : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
282 |
log.warn("%s: skip nonexistant include: %s", config_path, file_path) |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
283 |
else : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
284 |
log.info("%s: include: %s", config_path, file_path) |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
285 |
yield open(file_path) |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
286 |
|
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
287 |
else : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
288 |
log.info("%s: include: %s", config_path, path) |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
289 |
yield open(path) |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
290 |
|
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
291 |
def apply_hosts_config (options, path, name, config, defaults={}, parent=None) : |
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
292 |
""" |
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
293 |
Load hosts from a ConfigObj section. |
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
294 |
""" |
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
295 |
|
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
296 |
scalars = dict((scalar, config[scalar]) for scalar in config.scalars) |
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
297 |
|
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
298 |
if config.sections : |
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
299 |
# includes? |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
300 |
for file in apply_host_includes(options, path, scalars.pop('include', '')) : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
301 |
# within our domain context |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
302 |
for host in apply_hosts_file(options, file, parent=name) : |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
303 |
yield host |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
304 |
|
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
305 |
# recurse; this is a domain meta-section |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
306 |
params = dict(defaults) |
307
cc645622024e
pvl.hosts.apply_hosts_config() fix domain-section scalar override
Tero Marttila <terom@paivola.fi>
parents:
306
diff
changeset
|
307 |
params.update(**scalars) # override |
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
308 |
|
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
309 |
log.debug("%s: %s -> %s", path, parent, name) |
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
310 |
|
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
311 |
for section in config.sections : |
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
312 |
for host in apply_hosts_config(options, path, section, config[section], params, name) : |
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
313 |
yield host |
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
314 |
|
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
315 |
elif name : |
290
9e626c1e935d
pvl.hosts: fix config domain-section name handling
Tero Marttila <terom@paivola.fi>
parents:
287
diff
changeset
|
316 |
params = dict(defaults, **scalars) |
9e626c1e935d
pvl.hosts: fix config domain-section name handling
Tero Marttila <terom@paivola.fi>
parents:
287
diff
changeset
|
317 |
|
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
318 |
log.debug("%s: %s: %s", path, parent, name) |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
319 |
|
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
320 |
# this is a host section |
331
9dda6a0e9826
pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents:
308
diff
changeset
|
321 |
for host in Host.config(options, name, parent, **params) : |
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
322 |
yield host |
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
323 |
|
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
324 |
else : |
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
325 |
raise ValueError("No sections in config") |
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
326 |
|
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
327 |
|
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
328 |
def apply_hosts_file (options, file, parent=None) : |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
329 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
330 |
Load Hosts from a file. |
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
331 |
|
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
332 |
""" |
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
333 |
|
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
334 |
# use file basename as default |
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
335 |
path = file.name |
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
336 |
name = os.path.basename(path) |
383
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
337 |
|
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
338 |
try : |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
339 |
config = configobj.ConfigObj(file, |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
340 |
encoding = options.hosts_charset, |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
341 |
) |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
342 |
except configobj.ParseError as ex : |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
343 |
raise HostConfigError("%s:%d: %s" % (path, ex.line_number, ex)) |
87b49aa52b3d
pvl.hosts: better reporting of ParseErrors (with filename:line), and implement down = ... setting
Tero Marttila <terom@paivola.fi>
parents:
381
diff
changeset
|
344 |
|
287
968130f21270
pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents:
282
diff
changeset
|
345 |
|
333
7d2601368142
pvl.hosts: implement support for domain-level include=...
Tero Marttila <terom@paivola.fi>
parents:
331
diff
changeset
|
346 |
return apply_hosts_config(options, path, name, config, parent=parent) |
277
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
347 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
348 |
def apply_hosts (options, files) : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
349 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
350 |
Load Hosts from files. |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
351 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
352 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
353 |
for file in files : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
354 |
for host in apply_hosts_file(options, file) : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
355 |
yield host |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
356 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
357 |
def sort_hosts (options, hosts) : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
358 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
359 |
Yields hosts with a sorting key. |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
360 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
361 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
362 |
for host in hosts : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
363 |
if host.ip : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
364 |
sort = host.ip |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
365 |
else : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
366 |
# sorts first |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
367 |
sort = ipaddr.IPAddress(0) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
368 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
369 |
yield sort, host |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
370 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
371 |
def apply (options, args) : |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
372 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
373 |
Load Hosts from arguments. |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
374 |
""" |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
375 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
376 |
# without unicode |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
377 |
files = pvl.args.apply_files(args, 'r') |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
378 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
379 |
# load configs |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
380 |
hosts = apply_hosts(options, files) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
381 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
382 |
# sort |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
383 |
hosts = list(sort_hosts(options, hosts)) |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
384 |
hosts.sort() |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
385 |
hosts = [host for sort, host in hosts] |
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
386 |
|
5f0b67ba454f
...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff
changeset
|
387 |
return hosts |