Further work on making the YAML inventory parser use the new inventory objects.
This commit is contained in:
parent
c804752835
commit
46c661b3e3
3 changed files with 132 additions and 27 deletions
|
@ -23,6 +23,7 @@ import os
|
||||||
import constants as C
|
import constants as C
|
||||||
import subprocess
|
import subprocess
|
||||||
from ansible.inventory_parser import InventoryParser
|
from ansible.inventory_parser import InventoryParser
|
||||||
|
from ansible.inventory_parser_yaml import InventoryParserYaml
|
||||||
from ansible.inventory_script import InventoryScript
|
from ansible.inventory_script import InventoryScript
|
||||||
from ansible.group import Group
|
from ansible.group import Group
|
||||||
from ansible.host import Host
|
from ansible.host import Host
|
||||||
|
@ -36,9 +37,6 @@ class Inventory(object):
|
||||||
|
|
||||||
def __init__(self, host_list=C.DEFAULT_HOST_LIST):
|
def __init__(self, host_list=C.DEFAULT_HOST_LIST):
|
||||||
|
|
||||||
# FIXME: re-support YAML inventory format
|
|
||||||
# FIXME: re-support external inventory script (?)
|
|
||||||
|
|
||||||
self.host_list = host_list
|
self.host_list = host_list
|
||||||
self.groups = []
|
self.groups = []
|
||||||
self._restriction = None
|
self._restriction = None
|
||||||
|
@ -52,8 +50,13 @@ class Inventory(object):
|
||||||
self.parser = InventoryScript(filename=host_list)
|
self.parser = InventoryScript(filename=host_list)
|
||||||
self.groups = self.parser.groups.values()
|
self.groups = self.parser.groups.values()
|
||||||
else:
|
else:
|
||||||
self.parser = InventoryParser(filename=host_list)
|
data = file(host_list).read()
|
||||||
self.groups = self.parser.groups.values()
|
if not data.startswith("---"):
|
||||||
|
self.parser = InventoryParser(filename=host_list)
|
||||||
|
self.groups = self.parser.groups.values()
|
||||||
|
else:
|
||||||
|
self.parser = InventoryParserYaml(filename=host_list)
|
||||||
|
self.groups = self.parser.groups.values()
|
||||||
|
|
||||||
def _groups_from_override_hosts(self, list):
|
def _groups_from_override_hosts(self, list):
|
||||||
# support for playbook's --override-hosts only
|
# support for playbook's --override-hosts only
|
||||||
|
|
103
lib/ansible/inventory_parser_yaml.py
Normal file
103
lib/ansible/inventory_parser_yaml.py
Normal file
|
@ -0,0 +1,103 @@
|
||||||
|
# (c) 2012, Michael DeHaan <michael.dehaan@gmail.com>
|
||||||
|
#
|
||||||
|
# This file is part of Ansible
|
||||||
|
#
|
||||||
|
# Ansible is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# Ansible is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#############################################
|
||||||
|
|
||||||
|
import constants as C
|
||||||
|
from ansible.host import Host
|
||||||
|
from ansible.group import Group
|
||||||
|
from ansible import errors
|
||||||
|
from ansible import utils
|
||||||
|
|
||||||
|
class InventoryParserYaml(object):
|
||||||
|
"""
|
||||||
|
Host inventory for ansible.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, filename=C.DEFAULT_HOST_LIST):
|
||||||
|
|
||||||
|
fh = open(filename)
|
||||||
|
data = fh.read()
|
||||||
|
fh.close()
|
||||||
|
self._hosts = {}
|
||||||
|
self._parse(data)
|
||||||
|
|
||||||
|
def _make_host(self, hostname):
|
||||||
|
if hostname in self._hosts:
|
||||||
|
return self._hosts[hostname]
|
||||||
|
else:
|
||||||
|
host = Host(hostname)
|
||||||
|
self._hosts[hostname] = host
|
||||||
|
return host
|
||||||
|
|
||||||
|
# see file 'test/yaml_hosts' for syntax
|
||||||
|
|
||||||
|
def _parse(self, data):
|
||||||
|
|
||||||
|
all = Group('all')
|
||||||
|
ungrouped = Group('ungrouped')
|
||||||
|
all.add_child_group(ungrouped)
|
||||||
|
|
||||||
|
self.groups = dict(all=all, ungrouped=ungrouped)
|
||||||
|
|
||||||
|
yaml = utils.parse_yaml(data)
|
||||||
|
for item in yaml:
|
||||||
|
|
||||||
|
if type(item) in [ str, unicode ]:
|
||||||
|
host = self._make_host(item)
|
||||||
|
ungrouped.add_host(host)
|
||||||
|
|
||||||
|
elif type(item) == dict and 'host' in item:
|
||||||
|
host = self._make_host(item['host'])
|
||||||
|
for (k,v) in item.get('vars',{}).items():
|
||||||
|
host.set_variable(k,v)
|
||||||
|
|
||||||
|
elif type(item) == dict and 'group' in item:
|
||||||
|
group = Group(item['group'])
|
||||||
|
|
||||||
|
for subresult in item.get('hosts',[]):
|
||||||
|
|
||||||
|
if type(subresult) in [ str, unicode ]:
|
||||||
|
host = self._make_host(subresult)
|
||||||
|
group.add_host(host)
|
||||||
|
elif type(subresult) == dict:
|
||||||
|
host = self._make_host(subresult['host'])
|
||||||
|
vars = subresult.get('vars',{})
|
||||||
|
if type(vars) == list:
|
||||||
|
for subitem in vars:
|
||||||
|
for (k,v) in subitem.items():
|
||||||
|
host.set_variable(k,v)
|
||||||
|
elif type(vars) == dict:
|
||||||
|
for (k,v) in subresult.get('vars',{}).items():
|
||||||
|
host.set_variable(k,v)
|
||||||
|
else:
|
||||||
|
raise errors.AnsibleError("unexpected type for variable")
|
||||||
|
group.add_host(host)
|
||||||
|
|
||||||
|
vars = item.get('vars',{})
|
||||||
|
if type(vars) == dict:
|
||||||
|
for (k,v) in item.get('vars',{}).items():
|
||||||
|
group.set_variable(k,v)
|
||||||
|
elif type(vars) == list:
|
||||||
|
for subitem in vars:
|
||||||
|
if type(subitem) != dict:
|
||||||
|
raise errors.AnsibleError("expected a dictionary")
|
||||||
|
for (k,v) in subitem.items():
|
||||||
|
group.set_variable(k,v)
|
||||||
|
|
||||||
|
self.groups[group.name] = group
|
||||||
|
all.add_child_group(group)
|
|
@ -3,7 +3,7 @@ import unittest
|
||||||
|
|
||||||
from ansible.inventory import Inventory
|
from ansible.inventory import Inventory
|
||||||
from ansible.runner import Runner
|
from ansible.runner import Runner
|
||||||
from nose.plugins.skip import SkipTest
|
# from nose.plugins.skip import SkipTest
|
||||||
|
|
||||||
class TestInventory(unittest.TestCase):
|
class TestInventory(unittest.TestCase):
|
||||||
|
|
||||||
|
@ -20,6 +20,14 @@ class TestInventory(unittest.TestCase):
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
os.chmod(self.inventory_script, 0644)
|
os.chmod(self.inventory_script, 0644)
|
||||||
|
|
||||||
|
def compare(self, left, right):
|
||||||
|
left = sorted(left)
|
||||||
|
right = sorted(right)
|
||||||
|
print left
|
||||||
|
print right
|
||||||
|
assert left == right
|
||||||
|
|
||||||
|
|
||||||
### Simple inventory format tests
|
### Simple inventory format tests
|
||||||
|
|
||||||
def simple_inventory(self):
|
def simple_inventory(self):
|
||||||
|
@ -167,47 +175,41 @@ class TestInventory(unittest.TestCase):
|
||||||
### Tests for yaml inventory file
|
### Tests for yaml inventory file
|
||||||
|
|
||||||
def test_yaml(self):
|
def test_yaml(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
hosts = inventory.list_hosts()
|
hosts = inventory.list_hosts()
|
||||||
print hosts
|
print hosts
|
||||||
expected_hosts=['jupiter', 'saturn', 'zeus', 'hera', 'poseidon', 'thor', 'odin', 'loki']
|
expected_hosts=['jupiter', 'saturn', 'zeus', 'hera', 'poseidon', 'thor', 'odin', 'loki']
|
||||||
assert hosts == expected_hosts
|
self.compare(hosts, expected_hosts)
|
||||||
|
|
||||||
def test_yaml_all(self):
|
def test_yaml_all(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
hosts = inventory.list_hosts('all')
|
hosts = inventory.list_hosts('all')
|
||||||
|
|
||||||
expected_hosts=['jupiter', 'saturn', 'zeus', 'hera', 'poseidon', 'thor', 'odin', 'loki']
|
expected_hosts=['jupiter', 'saturn', 'zeus', 'hera', 'poseidon', 'thor', 'odin', 'loki']
|
||||||
assert hosts == expected_hosts
|
self.compare(hosts, expected_hosts)
|
||||||
|
|
||||||
def test_yaml_norse(self):
|
def test_yaml_norse(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
hosts = inventory.list_hosts("norse")
|
hosts = inventory.list_hosts("norse")
|
||||||
|
|
||||||
expected_hosts=['thor', 'odin', 'loki']
|
expected_hosts=['thor', 'odin', 'loki']
|
||||||
assert hosts == expected_hosts
|
self.compare(hosts, expected_hosts)
|
||||||
|
|
||||||
def test_simple_ungrouped(self):
|
def test_simple_ungrouped(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
hosts = inventory.list_hosts("ungrouped")
|
hosts = inventory.list_hosts("ungrouped")
|
||||||
|
|
||||||
expected_hosts=['jupiter']
|
expected_hosts=['jupiter','zeus']
|
||||||
assert hosts == expected_hosts
|
self.compare(hosts, expected_hosts)
|
||||||
|
|
||||||
def test_yaml_combined(self):
|
def test_yaml_combined(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
hosts = inventory.list_hosts("norse:greek")
|
hosts = inventory.list_hosts("norse:greek")
|
||||||
|
|
||||||
expected_hosts=['zeus', 'hera', 'poseidon', 'thor', 'odin', 'loki']
|
expected_hosts=['zeus', 'hera', 'poseidon', 'thor', 'odin', 'loki']
|
||||||
assert hosts == expected_hosts
|
self.compare(hosts, expected_hosts)
|
||||||
|
|
||||||
def test_yaml_restrict(self):
|
def test_yaml_restrict(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
|
|
||||||
restricted_hosts = ['hera', 'poseidon', 'thor']
|
restricted_hosts = ['hera', 'poseidon', 'thor']
|
||||||
|
@ -216,56 +218,53 @@ class TestInventory(unittest.TestCase):
|
||||||
inventory.restrict_to(restricted_hosts)
|
inventory.restrict_to(restricted_hosts)
|
||||||
hosts = inventory.list_hosts("norse:greek")
|
hosts = inventory.list_hosts("norse:greek")
|
||||||
|
|
||||||
assert hosts == restricted_hosts
|
self.compare(hosts, restricted_hosts)
|
||||||
|
|
||||||
inventory.lift_restriction()
|
inventory.lift_restriction()
|
||||||
hosts = inventory.list_hosts("norse:greek")
|
hosts = inventory.list_hosts("norse:greek")
|
||||||
|
|
||||||
assert hosts == expected_hosts
|
self.compare(hosts, expected_hosts)
|
||||||
|
|
||||||
def test_yaml_vars(self):
|
def test_yaml_vars(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
vars = inventory.get_variables('thor')
|
vars = inventory.get_variables('thor')
|
||||||
print vars
|
|
||||||
assert vars == {'group_names': ['norse'],
|
assert vars == {'group_names': ['norse'],
|
||||||
'hammer':True,
|
'hammer':True,
|
||||||
'inventory_hostname': 'thor'}
|
'inventory_hostname': 'thor'}
|
||||||
|
|
||||||
def test_yaml_change_vars(self):
|
def test_yaml_change_vars(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
vars = inventory.get_variables('thor')
|
vars = inventory.get_variables('thor')
|
||||||
|
|
||||||
vars["hammer"] = False
|
vars["hammer"] = False
|
||||||
|
|
||||||
vars = inventory.get_variables('thor')
|
vars = inventory.get_variables('thor')
|
||||||
|
print vars
|
||||||
assert vars == {'hammer':True,
|
assert vars == {'hammer':True,
|
||||||
'inventory_hostname': 'thor',
|
'inventory_hostname': 'thor',
|
||||||
'group_names': ['norse']}
|
'group_names': ['norse']}
|
||||||
|
|
||||||
def test_yaml_host_vars(self):
|
def test_yaml_host_vars(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
vars = inventory.get_variables('saturn')
|
vars = inventory.get_variables('saturn')
|
||||||
|
|
||||||
|
print vars
|
||||||
assert vars == {'inventory_hostname': 'saturn',
|
assert vars == {'inventory_hostname': 'saturn',
|
||||||
'moon': 'titan',
|
'moon': 'titan',
|
||||||
'moon2': 'enceladus',
|
'moon2': 'enceladus',
|
||||||
'group_names': ['multiple']}
|
'group_names': ['multiple']}
|
||||||
|
|
||||||
def test_yaml_port(self):
|
def test_yaml_port(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
vars = inventory.get_variables('hera')
|
vars = inventory.get_variables('hera')
|
||||||
|
|
||||||
|
print vars
|
||||||
assert vars == {'ansible_ssh_port': 3000,
|
assert vars == {'ansible_ssh_port': 3000,
|
||||||
'inventory_hostname': 'hera',
|
'inventory_hostname': 'hera',
|
||||||
'ntp_server': 'olympus.example.com',
|
'ntp_server': 'olympus.example.com',
|
||||||
'group_names': ['greek']}
|
'group_names': ['greek']}
|
||||||
|
|
||||||
def test_yaml_multiple_groups(self):
|
def test_yaml_multiple_groups(self):
|
||||||
raise SkipTest
|
|
||||||
inventory = self.yaml_inventory()
|
inventory = self.yaml_inventory()
|
||||||
vars = inventory.get_variables('odin')
|
vars = inventory.get_variables('odin')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue