pvl/hosts/config.py
author Tero Marttila <tero.marttila@aalto.fi>
Mon, 02 Mar 2015 18:08:30 +0200
changeset 690 517527835381
parent 663 8a9de457bb59
child 692 34f25380d0e7
permissions -rw-r--r--
pvl.hosts.config: fix handling of mixed boot=... boot.foo=... independent of dict ordering
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     1
"""
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     2
    Load Hosts from config files.
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     3
"""
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     4
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     5
import configobj
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     6
import logging; log = logging.getLogger('pvl.hosts')
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     7
import optparse
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     8
import os.path
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
     9
import pvl.args
460
c93adfce8ae9 pvl.hosts.config: fix pvl.dns.generate usage
Tero Marttila <tero.marttila@aalto.fi>
parents: 451
diff changeset
    10
import pvl.dns
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    11
import sys
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    12
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    13
from pvl.hosts.host import Host
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    14
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    15
def optparser (parser):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    16
    hosts = optparse.OptionGroup(parser, "Hosts config files")
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    17
    hosts.add_option('--hosts-charset',         metavar='CHARSET',  default='utf-8', 
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    18
            help="Encoding used for host files")
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    19
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    20
    hosts.add_option('--hosts-domain',          metavar='DOMAIN',
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    21
            help="Default domain for hosts. Default uses config file basename")
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    22
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    23
    hosts.add_option('--hosts-include',         metavar='PATH',
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    24
            help="Optional path for hosts includes, in addition to the host config dir")
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    25
    
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    26
    return hosts
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    27
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    28
class HostConfigError (Exception):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    29
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    30
        Generic error for file path.
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    31
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    32
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    33
    def __init__ (self, config, error):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    34
        self.config = config
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    35
        self.error = error
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    36
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    37
    def __str__ (self):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    38
        return "{self.config}: {self.error}".format(self=self)        
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    39
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    40
class HostConfigObjError (Exception):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    41
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    42
        An error from ConfigObj for a config file path.
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    43
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    44
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    45
    def __init__ (self, config, error):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    46
        self.config = config
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    47
        self.error = error
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    48
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    49
        self.line_contents = error.line
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    50
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    51
    def __str__ (self):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    52
        return "{self.config}:{self.error.line_number}: {self.error.message}".format(self=self)        
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    53
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    54
def parse_expand(name):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    55
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    56
        Parse a name containing an optional expansion part.
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    57
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    58
            name:           hostname containing optional "{...}" part
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    59
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    60
        Returns (name, range or None).
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    61
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    62
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    63
    if '{' in name:
447
6f0357759e9b pvl.hosts: fixup and document host expansion
Tero Marttila <tero.marttila@aalto.fi>
parents: 442
diff changeset
    64
        # consume the first {...} token as the range
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    65
        pre, name = name.split('{', 1)
447
6f0357759e9b pvl.hosts: fixup and document host expansion
Tero Marttila <tero.marttila@aalto.fi>
parents: 442
diff changeset
    66
        range, post = name.split('}', 1)
6f0357759e9b pvl.hosts: fixup and document host expansion
Tero Marttila <tero.marttila@aalto.fi>
parents: 442
diff changeset
    67
        
6f0357759e9b pvl.hosts: fixup and document host expansion
Tero Marttila <tero.marttila@aalto.fi>
parents: 442
diff changeset
    68
        # if there's a second {...} token, it will be re-composed into ${...}
6f0357759e9b pvl.hosts: fixup and document host expansion
Tero Marttila <tero.marttila@aalto.fi>
parents: 442
diff changeset
    69
        name = pre + "$" + post
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    70
        
449
a19438b781d5 pvl.hosts.config: cleanup apply_host_config
Tero Marttila <tero.marttila@aalto.fi>
parents: 447
diff changeset
    71
        # TODO: raise HostConfigError
460
c93adfce8ae9 pvl.hosts.config: fix pvl.dns.generate usage
Tero Marttila <tero.marttila@aalto.fi>
parents: 451
diff changeset
    72
        range = pvl.dns.parse_generate_range(range)
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    73
    else:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    74
        range = None
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    75
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    76
    return name, range
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
    77
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    78
def parse_config_field(field):
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
    79
    """
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
    80
        Parse structured config fields.
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    81
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    82
            [<extension> ":"] <field> ["." <instance>]
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
    83
    """
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
    84
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    85
    if ':' in field :
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    86
        extension, field = field.split(':', 1)
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    87
    else:
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    88
        extension = None
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
    89
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    90
    if '.' in field :
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    91
        field, instance = field.split('.')
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    92
    else :
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    93
        instance = None
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    94
    
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    95
    return extension, field, instance
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
    96
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    97
def apply_host (name, domain, config):
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
    98
    """
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
    99
        Return Host from an (expanded) config section.
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   100
            
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   101
            name        - (expanded) name of host
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   102
            domain      - domain for host
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   103
            config      - host config fields to parse
661
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   104
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   105
        Fields can either be scalar string values, or instance'd dicts. If a field has both a non-instance'd value and instance'd values,
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   106
        the non-instance'd value will be use instance=None:
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   107
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   108
        Raises ValueError.
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   109
    """
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   110
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   111
    fields = { }
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   112
    extensions = fields['extensions'] = { }
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   113
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   114
    for field, value in config.iteritems():
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   115
        extension, field, instance = parse_config_field(field)
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   116
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   117
        if extension:
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   118
            f = extensions.setdefault(extension, {})
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   119
        else:
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   120
            f = fields
451
d302b4957b07 pvl.hosts.config: fix apply_host override error handling
Tero Marttila <tero.marttila@aalto.fi>
parents: 450
diff changeset
   121
690
517527835381 pvl.hosts.config: fix handling of mixed boot=... boot.foo=... independent of dict ordering
Tero Marttila <tero.marttila@aalto.fi>
parents: 663
diff changeset
   122
        log.debug("%s@%s: %s:%s.%s = %r", name, domain, extension, field, instance, value)
517527835381 pvl.hosts.config: fix handling of mixed boot=... boot.foo=... independent of dict ordering
Tero Marttila <tero.marttila@aalto.fi>
parents: 663
diff changeset
   123
661
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   124
        if instance:
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   125
            if field not in f:
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   126
                f[field] = { }
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   127
            elif not isinstance(f[field], dict):
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   128
                # convert to dict
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   129
                f[field] = {None: f[field]}
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   130
            
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   131
            f[field][instance] = value
690
517527835381 pvl.hosts.config: fix handling of mixed boot=... boot.foo=... independent of dict ordering
Tero Marttila <tero.marttila@aalto.fi>
parents: 663
diff changeset
   132
        elif field in f:
517527835381 pvl.hosts.config: fix handling of mixed boot=... boot.foo=... independent of dict ordering
Tero Marttila <tero.marttila@aalto.fi>
parents: 663
diff changeset
   133
            f[field][None] = value
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   134
        else:
661
15946375b154 pvl.hosts.config: support ethernet = ... + ethernet.ethX = ...
Tero Marttila <terom@paivola.fi>
parents: 518
diff changeset
   135
            f[field] = value
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   136
    
450
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   137
    return Host.build(name, domain, **fields)
1d86e3909678 pvl.hosts: cleanup host config parsing
Tero Marttila <tero.marttila@aalto.fi>
parents: 449
diff changeset
   138
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   139
def apply_hosts (parent, name, config):
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   140
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   141
        Yield Hosts from a given config section.
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   142
            
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   143
            parent      - parent filename/section containing this host item, or None.
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   144
                          used for domain
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   145
            name        - name of the section (or file) containing this host item.
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   146
                          used for hostname
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   147
            config      - host parameters to parse
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   148
        
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   149
        Raises ValueError.
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   150
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   151
    
503
a56456f901e8 pvl.hosts: deprecate [host] domain= with [host@domain]
Tero Marttila <tero.marttila@aalto.fi>
parents: 489
diff changeset
   152
    if '@' in name:
a56456f901e8 pvl.hosts: deprecate [host] domain= with [host@domain]
Tero Marttila <tero.marttila@aalto.fi>
parents: 489
diff changeset
   153
        name, domain = name.split('@', 1)
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   154
        log.debug("%s: using explicit domain: %s", name, domain)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   155
    elif '.' in name:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   156
        log.debug("%s: using as fqdn without domain", name)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   157
        domain = None
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   158
    elif parent:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   159
        log.debug("%s: default domain to section: %s", name, parent)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   160
        domain = parent
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   161
    else:
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   162
        # XXX: impossible?
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   163
        raise ValueError("no domain given")
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   164
    
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   165
    # expand?
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   166
    name, range = parse_expand(name)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   167
    
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   168
    if range:
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   169
        generate_name = pvl.dns.parse_generate_field(name)
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   170
        
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   171
        # expand all fields
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   172
        generate_config = {field: pvl.dns.parse_generate_field(value) for field, value in config.iteritems()}
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   173
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   174
        for i in range:
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   175
            yield apply_host(generate_name(i), domain, 
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   176
                    {field: value(i) for field, value in generate_config.iteritems()},
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   177
            )
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   178
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   179
    else:
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   180
        # single host
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   181
        yield apply_host(name, domain, config)
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   182
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   183
def parse_config_includes (options, config_path, includes, **opts):
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   184
    """
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   185
        Yield file paths from a given config's include=... value
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   186
    """
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   187
    
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   188
    # relative
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   189
    include_paths = [os.path.dirname(config_path)]
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   190
    
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   191
    if options.hosts_include:
518
cd152d6bad32 pvl.hosts.config: test and fix includes path
Tero Marttila <tero.marttila@aalto.fi>
parents: 517
diff changeset
   192
        include_paths.append(options.hosts_include)
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   193
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   194
    for include in includes:
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   195
        for include_path in include_paths:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   196
            path = os.path.join(include_path, include)
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   197
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   198
            if os.path.exists(path):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   199
                break
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   200
        else:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   201
            raise HostConfigError(config_path, "Unable to find include {include} in include path: {include_path}".format(
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   202
                    include=include,
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   203
                    include_path=' '.join(include_paths),
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   204
            ))
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   205
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   206
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   207
        log.info("%s: include: %s", config_path, path)
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   208
        yield path
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   209
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   210
def apply_hosts_configs (options, path, name, config, parent=None, defaults={}):
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   211
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   212
        Load hosts from a configobj.Section (which can be the top-level ConfigObj).
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   213
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   214
            options         global options
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   215
            path            filesystem path of file (for errors)
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   216
            name            name of this section/file
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   217
            config          configobj.Section
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   218
            parent          parent section from included files or --hosts-domain
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   219
            defaults        hierarchial section defaults
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   220
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   221
    
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   222
    # items in this section
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   223
    section = dict(defaults)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   224
    for scalar in config.scalars:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   225
        section[scalar] = config[scalar]
507
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   226
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   227
    # process includes?
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   228
    if 'include' in section:
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   229
        includes = section.pop('include').split()
507
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   230
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   231
        includes = list(parse_config_includes(options, path, includes))
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   232
507
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   233
        # within our domain context
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   234
        for host in apply_hosts_files(options, includes, parent=name):
507
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   235
            yield host
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   236
    else:
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   237
        includes = None
507
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   238
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   239
    if config.sections:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   240
        # this is a top-level section that includes hosts
511
99043eab9140 pvl.hosts.config: change nested domains to be relative to parent domain, not absolute
Tero Marttila <tero.marttila@aalto.fi>
parents: 510
diff changeset
   241
        if parent:
99043eab9140 pvl.hosts.config: change nested domains to be relative to parent domain, not absolute
Tero Marttila <tero.marttila@aalto.fi>
parents: 510
diff changeset
   242
            log.info("%s: @%s@%s", path, name, parent)
99043eab9140 pvl.hosts.config: change nested domains to be relative to parent domain, not absolute
Tero Marttila <tero.marttila@aalto.fi>
parents: 510
diff changeset
   243
99043eab9140 pvl.hosts.config: change nested domains to be relative to parent domain, not absolute
Tero Marttila <tero.marttila@aalto.fi>
parents: 510
diff changeset
   244
            name = pvl.dns.join(name, parent)
99043eab9140 pvl.hosts.config: change nested domains to be relative to parent domain, not absolute
Tero Marttila <tero.marttila@aalto.fi>
parents: 510
diff changeset
   245
        else:
99043eab9140 pvl.hosts.config: change nested domains to be relative to parent domain, not absolute
Tero Marttila <tero.marttila@aalto.fi>
parents: 510
diff changeset
   246
            log.info("%s: @%s", path, name)
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   247
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   248
        # recurse until we hit a scalar-only section representing a host
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   249
        for section_name in config.sections:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   250
            log.debug("%s: %s: %s", path, name, section_name)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   251
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   252
            for host in apply_hosts_configs(options, path, section_name, config[section_name], parent=name, defaults=section):
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   253
                yield host
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   254
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   255
    elif parent:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   256
        # this is a host section
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   257
        log.debug("%s: %s@%s", path, name, parent)
449
a19438b781d5 pvl.hosts.config: cleanup apply_host_config
Tero Marttila <tero.marttila@aalto.fi>
parents: 447
diff changeset
   258
        
a19438b781d5 pvl.hosts.config: cleanup apply_host_config
Tero Marttila <tero.marttila@aalto.fi>
parents: 447
diff changeset
   259
        try:
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   260
            for host in apply_hosts(parent, name, section):
449
a19438b781d5 pvl.hosts.config: cleanup apply_host_config
Tero Marttila <tero.marttila@aalto.fi>
parents: 447
diff changeset
   261
                log.info("%s: %s", path, host)
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   262
449
a19438b781d5 pvl.hosts.config: cleanup apply_host_config
Tero Marttila <tero.marttila@aalto.fi>
parents: 447
diff changeset
   263
                yield host
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   264
        
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   265
        except ValueError as error:
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   266
            log.exception("%s: %s: %s", path, parent, name)
449
a19438b781d5 pvl.hosts.config: cleanup apply_host_config
Tero Marttila <tero.marttila@aalto.fi>
parents: 447
diff changeset
   267
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   268
            raise HostConfigError(path, "{parent}: {name}: {error}".format(parent=parent, name=name, error=error))
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   269
507
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   270
    elif includes:
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   271
        # includes-only zone
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   272
        pass
e3a32f4dff54 pvl.hosts.config: document includes, fix include-only zone, and test
Tero Marttila <tero.marttila@aalto.fi>
parents: 504
diff changeset
   273
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   274
    elif section:
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   275
        raise HostConfigError(path, "Top-level hosts are only allowed in included confs")
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   276
    else:
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   277
        # empty file
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   278
        log.info("%s: skip empty conf", path)
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   279
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   280
def apply_hosts_config (options, file, **opts):
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   281
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   282
        Load Hosts from a file path.
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   283
            
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   284
            file            - opened file object, with .name attribute
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   285
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   286
        Raises
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   287
            HostConfigError
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   288
            HostConfigObjError
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   289
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   290
   
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   291
    # use file basename as default domain
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   292
    path = file.name
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   293
    name = os.path.basename(path)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   294
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   295
    try:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   296
        config = configobj.ConfigObj(file,
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   297
                raise_errors    = True, # raise ConfigPObjError immediately
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   298
                interpolation   = 'Template',
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   299
                encoding        = options.hosts_charset,
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   300
        )
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   301
    except configobj.ConfigObjError as ex:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   302
        raise HostConfigObjError(path, ex)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   303
    
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   304
    return apply_hosts_configs(options, path, name, config, **opts)
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   305
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   306
def apply_hosts_file (options, path, **opts):
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   307
    """
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   308
        Load Hosts from a file path.
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   309
    """
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   310
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   311
    try:
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   312
        file = open(path)
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   313
    except IOError as ex:
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   314
        raise HostConfigError(path, ex.strerror)
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   315
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   316
    for host in apply_hosts_config(options, file, **opts):
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   317
        yield host
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   318
513
3b45b4fd5102 pvl.hosts.config: revert apply_hosts_directory to treat directory contents as a flat namespace without any parent=basname(directory) magic
Tero Marttila <tero.marttila@aalto.fi>
parents: 511
diff changeset
   319
def apply_hosts_directory (options, root, **opts):
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   320
    """
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   321
        Load Hosts from a directory, loading each file within the directory.
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   322
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   323
        Skips .dotfiles.
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   324
    """
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   325
663
8a9de457bb59 pvl.hosts.config: sort directory items for stable host ordering
Tero Marttila <terom@paivola.fi>
parents: 661
diff changeset
   326
    for name in sorted(os.listdir(root)):
513
3b45b4fd5102 pvl.hosts.config: revert apply_hosts_directory to treat directory contents as a flat namespace without any parent=basname(directory) magic
Tero Marttila <tero.marttila@aalto.fi>
parents: 511
diff changeset
   327
        path = os.path.join(root, name)
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   328
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   329
        if name.startswith('.'):
513
3b45b4fd5102 pvl.hosts.config: revert apply_hosts_directory to treat directory contents as a flat namespace without any parent=basname(directory) magic
Tero Marttila <tero.marttila@aalto.fi>
parents: 511
diff changeset
   330
            log.debug("%s: skip dotfile: %s", root, name)
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   331
            continue
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   332
513
3b45b4fd5102 pvl.hosts.config: revert apply_hosts_directory to treat directory contents as a flat namespace without any parent=basname(directory) magic
Tero Marttila <tero.marttila@aalto.fi>
parents: 511
diff changeset
   333
        if os.path.isdir(path):
3b45b4fd5102 pvl.hosts.config: revert apply_hosts_directory to treat directory contents as a flat namespace without any parent=basname(directory) magic
Tero Marttila <tero.marttila@aalto.fi>
parents: 511
diff changeset
   334
            log.debug("%s: skip directory: %s", root, name)
3b45b4fd5102 pvl.hosts.config: revert apply_hosts_directory to treat directory contents as a flat namespace without any parent=basname(directory) magic
Tero Marttila <tero.marttila@aalto.fi>
parents: 511
diff changeset
   335
            continue
3b45b4fd5102 pvl.hosts.config: revert apply_hosts_directory to treat directory contents as a flat namespace without any parent=basname(directory) magic
Tero Marttila <tero.marttila@aalto.fi>
parents: 511
diff changeset
   336
3b45b4fd5102 pvl.hosts.config: revert apply_hosts_directory to treat directory contents as a flat namespace without any parent=basname(directory) magic
Tero Marttila <tero.marttila@aalto.fi>
parents: 511
diff changeset
   337
        for host in apply_hosts_file(options, path, **opts):
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   338
            yield host
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   339
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   340
def apply_hosts_files (options, files, **opts):
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   341
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   342
        Load Hosts from files.
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   343
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   344
            files:[str]     list of filesystem paths, which may be directories or files
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   345
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   346
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   347
    for path in files:
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   348
        if os.path.isdir(path):
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   349
            for host in apply_hosts_directory(options, path, **opts):
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   350
                yield host
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   351
        else:
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   352
            for host in apply_hosts_file(options, path, **opts):
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   353
                yield host
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   354
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   355
def apply (options, args):
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   356
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   357
        Load Hosts from arguments.
489
7f1bd12e0d54 pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 460
diff changeset
   358
7f1bd12e0d54 pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 460
diff changeset
   359
        Exits with status=2 if loading the confs fails.
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   360
    """
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   361
    
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   362
    try:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   363
        # load hosts from configs
504
ee0a3dcacb95 pvl.hosts.config: refactor
Tero Marttila <tero.marttila@aalto.fi>
parents: 503
diff changeset
   364
        hosts = list(apply_hosts_files(options, args))
440
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   365
    except HostConfigObjError as error:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   366
        log.error("%s", error)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   367
        log.error("\t%s", error.line_contents)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   368
        sys.exit(2)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   369
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   370
    except HostConfigError as error:
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   371
        log.error("%s", error)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   372
        sys.exit(2)
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   373
1d755df7bf97 pvl.hosts: refactor as a package; cleanup pvl.hosts.config with some basic tests
Tero Marttila <tero.marttila@aalto.fi>
parents:
diff changeset
   374
    # stable ordering
489
7f1bd12e0d54 pvl.hosts-reverse: move options out of pvl.hosts.zone
Tero Marttila <tero.marttila@aalto.fi>
parents: 460
diff changeset
   375
    return sorted(hosts, key=Host.sort_key)
510
368a568412ed pvl.hosts.config: support direct directory hosts, using the directory name as the parent
Tero Marttila <tero.marttila@aalto.fi>
parents: 507
diff changeset
   376