valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10839 from borgstrom/pyobjects_ids

Browse Source 
Pyobjects ids
This commit is contained in:
Thomas S Hatch 2014-02-27 15:29:06 -07:00
commit 52d3e6d83f
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
salt/utils/pyobjects.py
View File

@ -42,8 +42,8 @@ class StateRegistry(object):
def salt_data(self):
states = OrderedDict([
(id_, state())
for id_, state in self.states.iteritems()
(id_, states_)
for id_, states_ in self.states.iteritems()
])
if self.includes:
@ -51,8 +51,8 @@ class StateRegistry(object):
if self.extends:
states['extend'] = OrderedDict([
(id_, state())
for id_, state in self.extends.iteritems()
(id_, states_)
for id_, states_ in self.extends.iteritems()
])
self.empty()
@ -66,7 +66,13 @@ class StateRegistry(object):
attr = self.states
if id_ in attr:
raise DuplicateState("A state with id '%s' already exists" % id_)
if state.full_func in attr[id_]:
raise DuplicateState("A state with id '%s', type '%s' exists" % (
id_,
state.full_func
))
else:
attr[id_] = OrderedDict()
# if we have requisites in our stack then add them to the state
if len(self.requisites) > 0:
@ -75,7 +81,7 @@ class StateRegistry(object):
state.kwargs[req.requisite] = []
state.kwargs[req.requisite].append(req())
attr[id_] = state
attr[id_].update(state())
def extend(self, id_, state):
self.add(id_, state, extend=True)

34
tests/unit/pyobjects_test.py
View File

@ -13,10 +13,11 @@ from salt.minion import SMinion
from salt.renderers.pyobjects import render as pyobjects_render
from salt.utils.odict import OrderedDict
from salt.utils.pyobjects import (StateFactory, State, StateRegistry,
InvalidFunction, SaltObject)
SaltObject, InvalidFunction, DuplicateState)
test_registry = StateRegistry()
File = StateFactory('file', registry=test_registry)
Service = StateFactory('service', registry=test_registry)
pydmesg_expected = {
'file.managed': [
@ -67,7 +68,7 @@ class StateTests(TestCase):
**pydmesg_kwargs)
self.assertEqual(
test_registry.states['/usr/local/bin/pydmesg'](),
test_registry.states['/usr/local/bin/pydmesg'],
pydmesg_expected
)
@ -76,7 +77,7 @@ class StateTests(TestCase):
pydmesg = File.managed('/usr/local/bin/pydmesg', **pydmesg_kwargs)
self.assertEqual(
test_registry.states['/usr/local/bin/pydmesg'](),
test_registry.states['/usr/local/bin/pydmesg'],
pydmesg_expected
)
@ -84,7 +85,7 @@ class StateTests(TestCase):
File.managed('/tmp/something', owner='root')
self.assertEqual(
test_registry.states['/tmp/something'](),
test_registry.states['/tmp/something'],
{
'file.managed': [
{'owner': 'root'},
@ -102,7 +103,7 @@ class StateTests(TestCase):
**pydmesg_kwargs)
self.assertEqual(
test_registry.states['/usr/local/bin/pydmesg'](),
test_registry.states['/usr/local/bin/pydmesg'],
pydmesg_expected
)
@ -116,6 +117,29 @@ class StateTests(TestCase):
OrderedDict()
)
def test_duplicates(self):
def add_dup():
File.managed('dup', name='/dup')
add_dup()
self.assertRaises(DuplicateState, add_dup)
Service.running('dup', name='dup-service')
self.assertEqual(
test_registry.states,
OrderedDict([
('dup', OrderedDict([
('file.managed', [
{'name': '/dup'}
]),
('service.running', [
{'name': 'dup-service'}
])
]))
])
)
class RendererTests(TestCase):
def render(self, template):