commit 22afba8579f13386982d8043109c99b53c0c01af
author Saleil Bhat <smbhat@stanford.edu> Sat Jan 21 23:10:09 2017 -0800
committer Saleil Bhat <smbhat@stanford.edu> Mon Jan 23 18:24:41 2017 -0800
tree d14007d9252377592b3cbc48b9932ccc99e7ff44
parent c2c0d345809b4ca4fe2965b652c92b4bfdc1c6dc

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

xos/admin.py

diff --git a/xos/admin.py b/xos/admin.py
index 5877ec6..df0f636 100644
--- a/xos/admin.py
+++ b/xos/admin.py
@@ -73,6 +73,7 @@
         if self.instance:
             self.fields['creator'].initial = self.instance.creator
             self.fields['tenant_message'].initial = self.instance.tenant_message
+            self.fields['image_name'].initial = self.instance.image_name
 
         if (not self.instance) or (not self.instance.pk):
             self.fields['creator'].initial = get_request().user
@@ -82,6 +83,7 @@
     def save(self, commit=True):
         self.instance.creator = self.cleaned_data.get('creator')
         self.instance.tenant_message = self.cleaned_data.get('tenant_message')
+        self.instance.image_name = self.cleaned_data.get('image_name')
         return super(VMMETenantForm, self).save(commit=commit)
 
 
@@ -90,11 +92,11 @@
     verbose_name = "VMME Service Tenant"
     verbose_name_plural = "VMME Service Tenants"
 
-    list_display = ('id', 'backend_status_icon', 'instance', 'tenant_message')
-    list_display_links = ('backend_status_icon', 'instance', 'tenant_message', 'id')
+    list_display = ('id', 'backend_status_icon', 'instance', 'tenant_message', 'image_name')
+    list_display_links = ('backend_status_icon', 'instance', 'tenant_message', 'id', 'image_name')
 
     fieldsets = [(None, {
-        'fields': ['backend_status_text', 'kind', 'provider_service', 'instance', 'creator', 'tenant_message'],
+        'fields': ['backend_status_text', 'kind', 'provider_service', 'instance', 'creator', 'tenant_message', 'image_name'],
         'classes': ['suit-tab suit-tab-general'],
         })]