Skip to content

The template.instantiate method should return the new vm id #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sysradium merged 2 commits into from
Mar 1, 2017
Merged

The template.instantiate method should return the new vm id #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf6ce9
the template.instantiate method now returns the new id
glasslion Feb 27, 2017
22c60ee
add tests for template.instantiate's return value
glasslion Feb 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion oca/template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def instantiate(self, name='', pending=False, extra_template=''):
``extra_template``
A string containing an extra template to be merged with the one being instantiated
"""
self.client.call(VmTemplate.METHODS['instantiate'], self.id, name, pending, extra_template)
return self.client.call(VmTemplate.METHODS['instantiate'], self.id, name, pending, extra_template)

def __repr__(self):
return '<oca.VmTemplate("%s")>' % self.name
Expand Down
16 changes: 8 additions & 8 deletions oca/tests/test_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,30 +52,30 @@ def test_chown(self):
'1', 2, 3)

def test_instantiate_with_default_name(self):
self.client.call = Mock()
self.client.call = Mock(return_value=4)
template = oca.VmTemplate(self.xml, self.client)
template.instantiate()
assert template.instantiate() == 4
self.client.call.assert_called_once_with('template.instantiate',
'1', '', False, '')

def test_instantiate_with_custom_name(self):
self.client.call = Mock()
self.client.call = Mock(return_value=5)
template = oca.VmTemplate(self.xml, self.client)
template.instantiate('asd')
assert template.instantiate('asd') == 5
self.client.call.assert_called_once_with('template.instantiate',
'1', 'asd', False, '')

def test_instantiate_with_default_name_and_context(self):
self.client.call = Mock()
self.client.call = Mock(return_value=6)
template = oca.VmTemplate(self.xml, self.client)
template.instantiate('', False, 'VCPU=4')
assert template.instantiate('', False, 'VCPU=4') == 6
self.client.call.assert_called_once_with('template.instantiate',
'1', '', False, 'VCPU=4')

def test_instantiate_with_custom_name_and_context(self):
self.client.call = Mock()
self.client.call = Mock(return_value=7)
template = oca.VmTemplate(self.xml, self.client)
template.instantiate('asd', False, 'VCPU=4')
assert template.instantiate('asd', False, 'VCPU=4') == 7
self.client.call.assert_called_once_with('template.instantiate',
'1', 'asd', False, 'VCPU=4')

Expand Down