Commit d5924475 by Dudás Ádám

vm: add traits

parent d58e62b1
......@@ -2,7 +2,7 @@ from django.contrib import admin
from .models import (Instance, InstanceActivity, InstanceTemplate, Interface,
InterfaceTemplate, Lease, NamedBaseResourceConfig, Node,
NodeActivity, Trait)
......@@ -14,3 +14,4 @@
......@@ -66,6 +66,13 @@ class NamedBaseResourceConfig(BaseResourceConfigModel, TimeStampedModel):
class Trait(Model):
name = CharField(max_length=50, verbose_name=_('name'))
def __unicode__(self):
class VirtualMachineDescModel(BaseResourceConfigModel):
"""Abstract base for virtual machine describing models.
......@@ -77,6 +84,11 @@ class VirtualMachineDescModel(BaseResourceConfigModel):
'Show boot device selection menu on boot.'))
raw_data = TextField(verbose_name=_('raw_data'), blank=True, help_text=_(
'Additional libvirt domain parameters in XML format.'))
req_traits = ManyToManyField(Trait, blank=True,
help_text=_("A set of traits required for a "
"node to declare to be suitable "
"for hosting the VM."),
verbose_name=_("required traits"))
tags = TaggableManager(blank=True, verbose_name=_("tags"))
class Meta:
......@@ -102,6 +114,9 @@ class Node(TimeStampedModel):
enabled = BooleanField(verbose_name=_('enabled'), default=False,
help_text=_('Indicates whether the node can '
'be used for hosting.'))
traits = ManyToManyField(Trait, blank=True,
help_text=_("Declared traits."),
tags = TaggableManager(blank=True, verbose_name=_("tags"))
class Meta:
......@@ -350,7 +365,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
def create_from_template(cls, template, owner, disks=None, networks=None,
tags=None, **kwargs):
req_traits=None, tags=None, **kwargs):
"""Create a new instance based on an InstanceTemplate.
Can also specify parameters as keyword arguments which should override
......@@ -361,6 +376,9 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
networks = (template.interface_set.all() if networks is None
else networks)
req_traits = (template.req_traits.all() if req_traits is None
else req_traits)
tags = template.tags.all() if tags is None else tags
# prepare parameters
......@@ -390,6 +408,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
# TODO fix this port fw, private=port)
return inst
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