x/solar
Code Issues Proposed changes

Allow VirtualResource only with updates section

Browse Source
This commit is contained in:
Łukasz Oleś 2015-09-25 09:20:12 +02:00
parent 716a649b0f
commit a866f2c29b
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solar/solar/core/resource/virtual_resource.py
View File

@ -65,9 +65,9 @@ def create_resource(name, base_path, args=None, virtual_resource=None):
def create_virtual_resource(vr_name, template): def create_virtual_resource(vr_name, template):
template_resources = template['resources'] template_resources = template.get('resources', [])
template_events = template.get('events', []) template_events = template.get('events', [])
resources_to_update = template.get('updates', {}) resources_to_update = template.get('updates', [])
created_resources = create_resources(template_resources) created_resources = create_resources(template_resources)
events = parse_events(template_events) events = parse_events(template_events)

6
solar/solar/test/resource_fixtures/update.yaml.tmpl
View File

@ -1,10 +1,4 @@
id: simple_multinode id: simple_multinode
resources:
- id: node1
from: {resource_path}
values:
ip: '10.0.0.3'
updates: updates:
- id: node1 - id: node1
values: values:

12
solar/solar/test/test_virtual_resource.py
View File

@ -74,16 +74,24 @@ def test_create_virtual_resource(tmpdir):
assert len(resources) == 2 assert len(resources) == 2
def test_update(tmpdir): def test_update(tmpdir):
# XXX: make helper for it
base_path = os.path.join( base_path = os.path.join(
os.path.dirname(os.path.realpath(__file__)), os.path.dirname(os.path.realpath(__file__)),
'resource_fixtures') 'resource_fixtures')
vr_tmpl_path = os.path.join(base_path, 'update.yaml.tmpl') vr_node_tmpl_path = os.path.join(base_path, 'nodes.yaml.tmpl')
vr_update_tmpl_path = os.path.join(base_path, 'update.yaml.tmpl')
update_path = os.path.join(base_path, 'update')
node_resource_path = os.path.join(base_path, 'node') node_resource_path = os.path.join(base_path, 'node')
with open(vr_tmpl_path) as f: with open(vr_node_tmpl_path) as f:
vr_data = f.read().format(resource_path=node_resource_path) vr_data = f.read().format(resource_path=node_resource_path)
with open(vr_update_tmpl_path) as f:
update_data = f.read().format(resource_path=update_path)
vr_file = tmpdir.join('nodes.yaml') vr_file = tmpdir.join('nodes.yaml')
vr_file.write(vr_data) vr_file.write(vr_data)
update_file = tmpdir.join('update.yaml')
update_file.write(update_data)
resources = vr.create('nodes', str(vr_file)) resources = vr.create('nodes', str(vr_file))
vr.create('updates', str(update_file))
assert resources[0].args['ip'] == '10.0.0.4' assert resources[0].args['ip'] == '10.0.0.4'
def test_parse_events(good_events): def test_parse_events(good_events):