pvl/hosts.py
author Tero Marttila <terom@paivola.fi>
Sun, 22 Dec 2013 17:25:09 +0200
changeset 331 9dda6a0e9826
parent 308 08176bed21e3
child 333 7d2601368142
permissions -rw-r--r--
pvl.hosts: implement forward/reverse to delegate to a different zone
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
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     8
import configobj
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
     9
import ipaddr
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    10
import optparse
287
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
    11
import os.path
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    12
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    13
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
    14
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    15
def optparser (parser) :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    16
    hosts = optparse.OptionGroup(parser, "Hosts input")
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    17
    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
    18
            help="Encoding used for host files")
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    19
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    20
    hosts.add_option('--hosts-domain',          metavar='DOMAIN',
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    21
            help="Default domain for hosts")
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    22
    
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    23
    return hosts
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    24
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    25
class Host (object) :
308
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    26
    # 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
    27
    ALIAS4_FMT = '{host}-ipv4'
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    28
    ALIAS6_FMT = '{host}-ipv6'
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    29
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    30
    @classmethod
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    31
    def expand (cls, options, range, host, domain, ip, **opts) :
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    32
        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
    33
        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
    34
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    35
        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
    36
            yield cls.build(options, host(i), domain,
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    37
                    ip  = ip(i),
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    38
                    **opts
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    39
            )
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    40
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    41
    @classmethod
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    42
    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
    43
        """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    44
            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
    45
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    46
                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
    47
                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
    48
                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
    49
                              used for domain
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    50
        """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    51
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    52
        if domain :
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    53
            log.debug("%s: explicit domain: %s", host, domain)
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    54
        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
    55
            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
    56
            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
    57
        elif section :
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    58
            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
    59
            domain = section
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    60
        elif '.' in host :
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    61
            log.debug("%s: using as fqdn without domain", host)
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    62
            domain = None
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    63
        else :
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    64
            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
    65
 
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    66
        if '{' in host :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    67
            pre, host = host.split('{', 1)
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    68
            range, post = host.rsplit('}', 1)
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    69
            
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    70
            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
    71
            host = pre + "$" + post
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    72
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    73
            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
    74
                yield host
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    75
        else :
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    76
            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
    77
    
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    78
    @classmethod
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    79
    def build (cls, options, host, domain,
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    80
            ip=None, ip6=None, owner=None, boot=None, alias=None, alias4=None, alias6=None, forward=None, reverse=None,
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
    81
            **extra) :
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    82
        """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    83
            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
    84
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    85
        """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
    86
305
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
    87
        if alias :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
    88
            alias = alias.split()
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
    89
        else :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
    90
            alias = ()
308
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    91
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    92
        if alias4 :
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    93
            alias4 = alias4.split()
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    94
        else :
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    95
            alias4 = ()
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    96
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    97
        if alias6 :
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    98
            alias6 = alias6.split()
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
    99
        else :
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
   100
            alias6 = ()
305
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   101
        
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   102
        ethernet = { }
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   103
305
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   104
        for field, value in extra.iteritems() :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   105
            if '.' in field :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   106
                field, instance = field.split('.')
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   107
            else :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   108
                instance = None
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   109
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   110
            if field == 'ethernet' :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   111
                if instance :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   112
                    ethernet[instance] = value
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   113
                else :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   114
                    for eth in value.split() :
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   115
                        ethernet[len(ethernet)] = eth
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   116
            else :
306
a1bdb4499c7a pvl.hots: fix Host.build Unknown host field error
Tero Marttila <terom@paivola.fi>
parents: 305
diff changeset
   117
                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
   118
        
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   119
       
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   120
        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
   121
            # normal zone
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   122
            pass
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   123
        elif forward :
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   124
            # 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
   125
            pass
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   126
        else :
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   127
            # omit
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   128
            forward = False
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   129
        
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   130
        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
   131
            # normal zone
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   132
            pass
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   133
        elif reverse :
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   134
            # 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
   135
            pass
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   136
        else :
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   137
            # omit
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   138
            reverse = False
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   139
       
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   140
        return cls(host,
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   141
                domain      = domain,
282
63135113fe01 pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents: 277
diff changeset
   142
                ip          = ipaddr.IPv4Address(ip) if ip else None,
63135113fe01 pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents: 277
diff changeset
   143
                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
   144
                ethernet    = ethernet,
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   145
                alias       = alias,
308
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
   146
                alias4      = alias4,
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
   147
                alias6      = alias6,
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   148
                owner       = owner,
282
63135113fe01 pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents: 277
diff changeset
   149
                boot        = boot,
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   150
                forward     = forward,
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   151
                reverse     = reverse,
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   152
        )
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   153
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   154
    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
   155
            domain=None,
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   156
            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
   157
            ethernet={ },
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   158
            alias=(),
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   159
            owner=None,
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   160
            boot=None,
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   161
            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
   162
            forward=None, reverse=None,
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   163
    ) :
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   164
        """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   165
            host        - str
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   166
            domain      - str
282
63135113fe01 pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents: 277
diff changeset
   167
            ip          - ipaddr.IPv4Address
63135113fe01 pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents: 277
diff changeset
   168
            ip6         - ipaddr.IPv6Address
305
e85c95e757eb pvl.hosts: support new alias/ethernet field format
Tero Marttila <terom@paivola.fi>
parents: 299
diff changeset
   169
            ethernet    - { index: ethernet }
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   170
            alias       - list
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   171
            owner       - str: LDAP uid
308
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
   172
            alias4      - list (CNAME -> A)
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
   173
            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
   174
            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
   175
            reverse     - generate reverse records, or CNAME into given zone
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   176
        """
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   177
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   178
        self.host = host
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   179
        self.domain = domain
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   180
        self.ip = ip
282
63135113fe01 pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents: 277
diff changeset
   181
        self.ip6 = ip6
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   182
        self.ethernet = ethernet
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   183
        self.alias = alias
308
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
   184
        self.alias4 = alias4
08176bed21e3 pvl.hosts: support alias4/6=... for A/AAAA CNAMES
Tero Marttila <terom@paivola.fi>
parents: 307
diff changeset
   185
        self.alias6 = alias6
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   186
        self.owner = owner
282
63135113fe01 pvl.hosts: ip6, boot support
Tero Marttila <terom@paivola.fi>
parents: 277
diff changeset
   187
        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
   188
        self.forward = forward
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   189
        self.reverse = reverse
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   190
299
df653511caf9 pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents: 290
diff changeset
   191
    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
   192
        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
   193
            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
   194
        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
   195
            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
   196
        else :
df653511caf9 pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents: 290
diff changeset
   197
            raise ValueError("%s: have no fqdn/domain" % (self, ))
df653511caf9 pvl.hosts.Host.fqnd(): assume any host with a . is a fqdn
Tero Marttila <terom@paivola.fi>
parents: 290
diff changeset
   198
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   199
    def __str__ (self) :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   200
        return str(self.host)
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   201
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   202
def apply_hosts_config (options, config, name, defaults={}, parent=None) :
287
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   203
    """
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   204
        Load hosts from a ConfigObj section.
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   205
    """
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   206
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   207
    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
   208
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   209
    if config.sections :
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   210
        # 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
   211
        params = dict(defaults)
307
cc645622024e pvl.hosts.apply_hosts_config() fix domain-section scalar override
Tero Marttila <terom@paivola.fi>
parents: 306
diff changeset
   212
        params.update(**scalars) # override
287
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   213
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   214
        for section in config.sections :
331
9dda6a0e9826 pvl.hosts: implement forward/reverse to delegate to a different zone
Tero Marttila <terom@paivola.fi>
parents: 308
diff changeset
   215
            for host in apply_hosts_config(options, config[section], section, params, name) :
287
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   216
                yield host
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   217
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   218
    elif name :
290
9e626c1e935d pvl.hosts: fix config domain-section name handling
Tero Marttila <terom@paivola.fi>
parents: 287
diff changeset
   219
        params = dict(defaults, **scalars)
9e626c1e935d pvl.hosts: fix config domain-section name handling
Tero Marttila <terom@paivola.fi>
parents: 287
diff changeset
   220
287
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   221
        # 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
   222
        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
   223
            yield host
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   224
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   225
    else :
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   226
        raise ValueError("No sections in config")
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   227
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   228
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   229
def apply_hosts_file (options, file) :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   230
    """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   231
        Load Hosts from a file.
287
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   232
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   233
    """
287
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   234
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   235
    config = configobj.ConfigObj(file,
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   236
            encoding    = options.hosts_charset,
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   237
    )
287
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   238
    
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   239
    # use file basename as default
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   240
    name = os.path.basename(file.name)
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   241
    
968130f21270 pvl.hosts: support domain-sections
Tero Marttila <terom@paivola.fi>
parents: 282
diff changeset
   242
    return apply_hosts_config(options, config, name)
277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   243
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   244
def apply_hosts (options, files) :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   245
    """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   246
        Load Hosts from files.
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   247
    """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   248
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   249
    for file in files :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   250
        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
   251
            yield host
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   252
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   253
def sort_hosts (options, hosts) :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   254
    """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   255
        Yields hosts with a sorting key.
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   256
    """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   257
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   258
    for host in hosts :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   259
        if host.ip :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   260
            sort = host.ip
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   261
        else :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   262
            # sorts first
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   263
            sort = ipaddr.IPAddress(0)
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   264
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   265
        yield sort, host
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   266
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   267
def apply (options, args) :
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   268
    """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   269
        Load Hosts from arguments.
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   270
    """
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   271
    
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   272
    # without unicode
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   273
    files = pvl.args.apply_files(args, 'r')
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   274
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   275
    # load configs
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   276
    hosts = apply_hosts(options, files)
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   277
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   278
    # sort
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   279
    hosts = list(sort_hosts(options, hosts))
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   280
    hosts.sort()
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   281
    hosts = [host for sort, host in hosts]
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   282
    
5f0b67ba454f ...add missing pvl.hosts, with dynamic hosts support
Tero Marttila <terom@paivola.fi>
parents:
diff changeset
   283
    return hosts