Commit 5182afaa by Dudás Ádám

vm: precautionary refactor

parent 7ea37dad
...@@ -347,24 +347,17 @@ class Instance(VirtualMachineDescModel, TimeStampedModel): ...@@ -347,24 +347,17 @@ class Instance(VirtualMachineDescModel, TimeStampedModel):
Can also specify parameters as keyword arguments which should override Can also specify parameters as keyword arguments which should override
template settings. template settings.
""" """
if disks is None: disks = template.disks.all() if disks is None else disks
disks = template.disks.all()
# prepare parameters # prepare parameters
kwargs['template'] = template kwargs['template'] = template
kwargs['owner'] = owner kwargs['owner'] = owner
kwargs.setdefault('description', template.description)
kwargs.setdefault('pw', pwgen()) kwargs.setdefault('pw', pwgen())
kwargs.setdefault('num_cores', template.num_cores) ca = ['name', 'description', 'num_cores', 'ram_size', 'max_ram_size',
kwargs.setdefault('ram_size', template.ram_size) 'arch', 'priority', 'boot_menu', 'raw_data', 'lease',
kwargs.setdefault('max_ram_size', template.max_ram_size) 'access_method']
kwargs.setdefault('arch', template.arch) for attr in ca:
kwargs.setdefault('priority', template.priority) kwargs.setdefault(attr, getattr(template, attr))
kwargs.setdefault('boot_menu', template.boot_menu)
kwargs.setdefault('raw_data', template.raw_data)
kwargs.setdefault('access_method', template.access_method)
# create instance and do additional setup # create instance and do additional setup
inst = cls(**kwargs) inst = cls(**kwargs)
# save instance # save instance
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment