created separate 'image_name' field to allow user to specify desired VM through TOSCA;
if 'default' used for 'image_name', will use slice's default image
Change-Id: I2cc286c91915fdb8ca24c949ad25255841b8c15f
(cherry picked from commit 22afba8579f13386982d8043109c99b53c0c01af)
diff --git a/xos/models.py b/xos/models.py
index 0c185e6..e49a93f 100644
--- a/xos/models.py
+++ b/xos/models.py
@@ -1,6 +1,6 @@
# models.py - ExampleService Models
-from core.models import Service, TenantWithContainer
+from core.models import Service, TenantWithContainer, Image
from django.db import models, transaction
@@ -29,8 +29,8 @@
verbose_name = "VMME Service Tenant"
tenant_message = models.CharField(max_length=254, help_text="vMME message")
+ image_name = models.CharField(max_length=254, help_text="Name of VM image")
- #default_attributes = {"tenant_message": "New vMME Component"} will this work?
def __init__(self, *args, **kwargs):
vmme_services = VMMEService.get_service_objects().all()
if vmme_services:
@@ -45,6 +45,15 @@
self.cleanup_container()
super(VMMETenant, self).delete(*args, **kwargs)
+ @property
+ def image(self):
+ img = self.image_name.strip()
+ if img.lower() != "default":
+ return Image.objects.get(name=img)
+ else:
+ return super(VMMETenant, self).image
+
+
def model_policy_vmmetenant(pk):
with transaction.atomic():