Reimplement the class method on Runner.

pull/146/head
Jeroen Hoekx 13 years ago
parent 195e6d617b
commit 746f1b92ae

@ -123,6 +123,17 @@ class Runner(object):
self._tmp_paths = {} self._tmp_paths = {}
random.seed() random.seed()
# *****************************************************
@classmethod
def parse_hosts(cls, host_list, override_hosts=None, extra_vars=None):
''' parse the host inventory file, returns (hosts, groups) '''
if override_hosts is None:
inventory = ansible.inventory.Inventory(host_list, extra_vars)
else:
inventory = ansible.inventory.Inventory(override_hosts)
return inventory.host_list, inventory.groups
# ***************************************************** # *****************************************************

@ -2,6 +2,7 @@ import os
import unittest import unittest
from ansible.inventory import Inventory from ansible.inventory import Inventory
from ansible.runner import Runner
class TestInventory(unittest.TestCase): class TestInventory(unittest.TestCase):
@ -141,3 +142,26 @@ class TestInventory(unittest.TestCase):
vars = inventory.get_variables('thor', 'simple=yes') vars = inventory.get_variables('thor', 'simple=yes')
assert vars == {"hammer":True, "simple": "yes"} assert vars == {"hammer":True, "simple": "yes"}
### Test Runner class method
def test_class_method(self):
hosts, groups = Runner.parse_hosts(self.inventory_file)
expected_hosts = ['jupiter', 'saturn', 'zeus', 'hera', 'poseidon', 'thor', 'odin', 'loki']
assert hosts == expected_hosts
expected_groups= {
'ungrouped': ['jupiter', 'saturn'],
'greek': ['zeus', 'hera', 'poseidon'],
'norse': ['thor', 'odin', 'loki']
}
assert groups == expected_groups
def test_class_override(self):
override_hosts = ['thor', 'odin']
hosts, groups = Runner.parse_hosts(self.inventory_file, override_hosts)
assert hosts == override_hosts
assert groups == { 'ungrouped': override_hosts }

Loading…
Cancel
Save