X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=f4d6f8f0a6044f7e98cb31b0c186bd450607be53;hb=e3ab5c3450f682b1315726fce8add6f5eddd872f;hp=3875477f39e21d1791df4b50e0879b006d5a3c9b;hpb=dd06ca86db1bb06ea5a4a6296a448b34301ed7a5;p=plstackapi.git
diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 3875477..f4d6f8f 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -8,7 +8,7 @@ from django import forms
from django.utils.safestring import mark_safe
from django.contrib.auth.admin import UserAdmin
from django.contrib.admin.widgets import FilteredSelectMultiple
-from django.contrib.auth.forms import ReadOnlyPasswordHashField
+from django.contrib.auth.forms import ReadOnlyPasswordHashField, AdminPasswordChangeForm
from django.contrib.auth.signals import user_logged_in
from django.utils import timezone
from django.contrib.contenttypes import generic
@@ -16,25 +16,88 @@ from suit.widgets import LinkedSelect
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse, NoReverseMatch
-import django_evolution
+# this block of stuff is needed for UserAdmin
+from django.db import transaction
+from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_protect
+from django.views.decorators.debug import sensitive_post_parameters
+csrf_protect_m = method_decorator(csrf_protect)
+sensitive_post_parameters_m = method_decorator(sensitive_post_parameters())
+
+import django_evolution
+
+def backend_icon(obj): # backend_status, enacted, updated):
+ #return "%s %s %s" % (str(obj.updated), str(obj.enacted), str(obj.backend_status))
+ if (obj.enacted is not None) and obj.enacted >= obj.updated:
+ return '
'
+ else:
+ if obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
+ return '
' % obj.backend_status
+ else:
+ return '
' % obj.backend_status
+
+def backend_text(obj):
+ icon = backend_icon(obj)
+ if (obj.enacted is not None) and obj.enacted >= obj.updated:
+ return "%s %s" % (icon, "successfully enacted") # enacted on %s" % str(obj.enacted))
+ else:
+ return "%s %s" % (icon, obj.backend_status)
+
+class PlainTextWidget(forms.HiddenInput):
+ input_type = 'hidden'
+
+ def render(self, name, value, attrs=None):
+ if value is None:
+ value = ''
+ return mark_safe(str(value) + super(PlainTextWidget, self).render(name, value, attrs))
-class ReadOnlyAwareAdmin(admin.ModelAdmin):
+class PermissionCheckingAdmin(admin.ModelAdmin):
+ # call save_by_user and delete_by_user instead of save and delete
def has_add_permission(self, request, obj=None):
return (not self.__user_is_readonly(request))
-
+
def has_delete_permission(self, request, obj=None):
return (not self.__user_is_readonly(request))
def save_model(self, request, obj, form, change):
if self.__user_is_readonly(request):
+ # this 'if' might be redundant if save_by_user is implemented right
raise PermissionDenied
- #pass
- else:
- return super(ReadOnlyAwareAdmin, self).save_model(request, obj, form, change)
+
+ obj.caller = request.user
+ # update openstack connection to use this site/tenant
+ obj.save_by_user(request.user)
+
+ def delete_model(self, request, obj):
+ obj.delete_by_user(request.user)
+
+ def save_formset(self, request, form, formset, change):
+ instances = formset.save(commit=False)
+ for instance in instances:
+ instance.save_by_user(request.user)
+
+ # BUG in django 1.7? Objects are not deleted by formset.save if
+ # commit is False. So let's delete them ourselves.
+ #
+ # code from forms/models.py save_existing_objects()
+ try:
+ forms_to_delete = formset.deleted_forms
+ except AttributeError:
+ forms_to_delete = []
+ if formset.initial_forms:
+ for form in formset.initial_forms:
+ obj = form.instance
+ if form in forms_to_delete:
+ if obj.pk is None:
+ continue
+ formset.deleted_objects.append(obj)
+ obj.delete()
+
+ formset.save_m2m()
def get_actions(self,request):
- actions = super(ReadOnlyAwareAdmin,self).get_actions(request)
+ actions = super(PermissionCheckingAdmin,self).get_actions(request)
if self.__user_is_readonly(request):
if 'delete_selected' in actions:
@@ -43,33 +106,58 @@ class ReadOnlyAwareAdmin(admin.ModelAdmin):
return actions
def change_view(self,request,object_id, extra_context=None):
-
if self.__user_is_readonly(request):
- self.readonly_fields=self.user_readonly_fields
- self.inlines = self.user_readonly_inlines
+ if not hasattr(self, "readonly_save"):
+ # save the original readonly fields
+ self.readonly_save = self.readonly_fields
+ self.inlines_save = self.inlines
+ if hasattr(self, "user_readonly_fields"):
+ self.readonly_fields=self.user_readonly_fields
+ if hasattr(self, "user_readonly_inlines"):
+ self.inlines = self.user_readonly_inlines
+ else:
+ if hasattr(self, "readonly_save"):
+ # restore the original readonly fields
+ self.readonly_fields = self.readonly_save
+ if hasattr(self, "inlines_save"):
+ self.inlines = self.inlines_save
try:
- return super(ReadOnlyAwareAdmin, self).change_view(request, object_id, extra_context=extra_context)
+ return super(PermissionCheckingAdmin, self).change_view(request, object_id, extra_context=extra_context)
except PermissionDenied:
pass
if request.method == 'POST':
raise PermissionDenied
request.readonly = True
- return super(ReadOnlyAwareAdmin, self).change_view(request, object_id, extra_context=extra_context)
-
+ return super(PermissionCheckingAdmin, self).change_view(request, object_id, extra_context=extra_context)
def __user_is_readonly(self, request):
return request.user.isReadOnlyUser()
-class SingletonAdmin (admin.ModelAdmin):
+ def backend_status_text(self, obj):
+ return mark_safe(backend_text(obj))
+
+ def backend_status_icon(self, obj):
+ return mark_safe(backend_icon(obj))
+ backend_status_icon.short_description = ""
+
+class ReadOnlyAwareAdmin(PermissionCheckingAdmin):
+ pass
+
+class PlanetStackBaseAdmin(ReadOnlyAwareAdmin):
+ save_on_top = False
+
+class SingletonAdmin (ReadOnlyAwareAdmin):
def has_add_permission(self, request):
+ if not super(SingletonAdmin, self).has_add_permission(request):
+ return False
+
num_objects = self.model.objects.count()
if num_objects >= 1:
return False
else:
return True
-
class PlStackTabularInline(admin.TabularInline):
def __init__(self, *args, **kwargs):
super(PlStackTabularInline, self).__init__(*args, **kwargs)
@@ -137,44 +225,46 @@ class PlStackTabularInline(admin.TabularInline):
selflink.allow_tags = True
selflink.short_description = "Details"
-class ReadOnlyTabularInline(PlStackTabularInline):
- can_delete = False
+ def has_add_permission(self, request):
+ return not request.user.isReadOnlyUser()
def get_readonly_fields(self, request, obj=None):
- return self.fields
-
+ readonly_fields = list(self.readonly_fields)[:]
+ if request.user.isReadOnlyUser():
+ for field in self.fields:
+ if not field in readonly_fields:
+ readonly_fields.append(field)
+ return readonly_fields
+
+ def backend_status_icon(self, obj):
+ return mark_safe(backend_icon(obj))
+ backend_status_icon.short_description = ""
+
+class PlStackGenericTabularInline(generic.GenericTabularInline):
def has_add_permission(self, request):
- return False
+ return not request.user.isReadOnlyUser()
-class ReservationROInline(ReadOnlyTabularInline):
- model = Reservation
- extra = 0
- suit_classes = 'suit-tab suit-tab-reservations'
- fields = ['startTime','slice','duration']
+ def get_readonly_fields(self, request, obj=None):
+ readonly_fields = list(self.readonly_fields)[:]
+ if request.user.isReadOnlyUser():
+ for field in self.fields:
+ if not field in readonly_fields:
+ readonly_fields.append(field)
+ return readonly_fields
+
+ def backend_status_icon(self, obj):
+ return mark_safe(backend_icon(obj))
+ backend_status_icon.short_description = ""
class ReservationInline(PlStackTabularInline):
model = Reservation
extra = 0
suit_classes = 'suit-tab suit-tab-reservations'
-
+
def queryset(self, request):
return Reservation.select_by_user(request.user)
-class TagROInline(generic.GenericTabularInline):
- model = Tag
- extra = 0
- suit_classes = 'suit-tab suit-tab-tags'
- can_delete = False
- fields = ['service', 'name', 'value']
-
- def get_readonly_fields(self, request, obj=None):
- return self.fields
-
- def has_add_permission(self, request):
- return False
-
-
-class TagInline(generic.GenericTabularInline):
+class TagInline(PlStackGenericTabularInline):
model = Tag
extra = 0
suit_classes = 'suit-tab suit-tab-tags'
@@ -188,6 +278,8 @@ class NetworkLookerUpper:
the ip address for that network.
"""
+ byNetworkName = {} # class variable
+
def __init__(self, name):
self.short_description = name
self.__name__ = name
@@ -203,59 +295,37 @@ class NetworkLookerUpper:
def __str__(self):
return self.network_name
-class SliverROInline(ReadOnlyTabularInline):
- model = Sliver
- fields = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']
- suit_classes = 'suit-tab suit-tab-slivers'
+ @staticmethod
+ def get(network_name):
+ """ We want to make sure we alwars return the same NetworkLookerUpper
+ because sometimes django will cause them to be instantiated multiple
+ times (and we don't want different ones in form.fields vs
+ SliverInline.readonly_fields).
+ """
+ if network_name not in NetworkLookerUpper.byNetworkName:
+ NetworkLookerUpper.byNetworkName[network_name] = NetworkLookerUpper(network_name)
+ return NetworkLookerUpper.byNetworkName[network_name]
class SliverInline(PlStackTabularInline):
model = Sliver
- fields = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']
+ fields = ['backend_status_icon', 'all_ips_string', 'instance_name', 'slice', 'deploymentNetwork', 'flavor', 'image', 'node']
extra = 0
- readonly_fields = ['ip', 'instance_name']
+ readonly_fields = ['backend_status_icon', 'all_ips_string', 'instance_name']
suit_classes = 'suit-tab suit-tab-slivers'
def queryset(self, request):
return Sliver.select_by_user(request.user)
-# Note this is breaking in the admin.py when trying to use an inline to add a node/image
-# def _declared_fieldsets(self):
-# # Return None so django will call get_fieldsets and we can insert our
-# # dynamic fields
-# return None
-#
-# def get_readonly_fields(self, request, obj=None):
-# readonly_fields = super(SliverInline, self).get_readonly_fields(request, obj)
-#
-# # Lookup the networks that are bound to the slivers, and add those
-# # network names to the list of readonly fields.
-#
-# for sliver in obj.slivers.all():
-# for nbs in sliver.networksliver_set.all():
-# if nbs.ip:
-# network_name = nbs.network.name
-# if network_name not in [str(x) for x in readonly_fields]:
-# readonly_fields.append(NetworkLookerUpper(network_name))
-#
-# return readonly_fields
-#
-# def get_fieldsets(self, request, obj=None):
-# form = self.get_formset(request, obj).form
-# # fields = the read/write files + the read-only fields
-# fields = self.fields
-# for fieldName in self.get_readonly_fields(request,obj):
-# if not fieldName in fields:
-# fields.append(fieldName)
-#
-# return [(None, {'fields': fields})]
-
-
-
-class SiteROInline(ReadOnlyTabularInline):
- model = Site
- extra = 0
- fields = ['name', 'login_base', 'site_url', 'enabled']
- suit_classes = 'suit-tab suit-tab-sites'
+ def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
+ if db_field.name == 'deploymentNetwork':
+ kwargs['queryset'] = Deployment.select_by_acl(request.user)
+ kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_deployment_changed(this);"})
+ elif db_field.name == 'flavor':
+ kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_flavor_changed(this);"})
+
+ field = super(SliverInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
+
+ return field
class SiteInline(PlStackTabularInline):
model = Site
@@ -265,74 +335,49 @@ class SiteInline(PlStackTabularInline):
def queryset(self, request):
return Site.select_by_user(request.user)
-class UserROInline(ReadOnlyTabularInline):
- model = User
- fields = ['email', 'firstname', 'lastname']
- extra = 0
- suit_classes = 'suit-tab suit-tab-users'
-
class UserInline(PlStackTabularInline):
model = User
- fields = ['email', 'firstname', 'lastname']
+ fields = ['backend_status_icon', 'email', 'firstname', 'lastname']
+ readonly_fields = ('backend_status_icon', )
extra = 0
suit_classes = 'suit-tab suit-tab-users'
def queryset(self, request):
return User.select_by_user(request.user)
-class SliceROInline(ReadOnlyTabularInline):
- model = Slice
- suit_classes = 'suit-tab suit-tab-slices'
- fields = ['name','site', 'serviceClass', 'service']
-
class SliceInline(PlStackTabularInline):
model = Slice
- fields = ['name','site', 'serviceClass', 'service']
+ fields = ['backend_status_icon', 'name', 'site', 'serviceClass', 'service']
+ readonly_fields = ('backend_status_icon', )
extra = 0
suit_classes = 'suit-tab suit-tab-slices'
def queryset(self, request):
return Slice.select_by_user(request.user)
-class NodeROInline(ReadOnlyTabularInline):
- model = Node
- extra = 0
- suit_classes = 'suit-tab suit-tab-nodes'
- fields = ['name','deployment']
-
class NodeInline(PlStackTabularInline):
model = Node
extra = 0
suit_classes = 'suit-tab suit-tab-nodes'
- fields = ['name','deployment']
-
-class DeploymentPrivilegeROInline(ReadOnlyTabularInline):
- model = DeploymentPrivilege
- extra = 0
- suit_classes = 'suit-tab suit-tab-deploymentprivileges'
- fields = ['user','role']
+ fields = ['backend_status_icon', 'name','deployment','site']
+ readonly_fields = ('backend_status_icon', )
class DeploymentPrivilegeInline(PlStackTabularInline):
model = DeploymentPrivilege
extra = 0
suit_classes = 'suit-tab suit-tab-deploymentprivileges'
- fields = ['user','role']
+ fields = ['backend_status_icon', 'user','role','deployment']
+ readonly_fields = ('backend_status_icon', )
def queryset(self, request):
return DeploymentPrivilege.select_by_user(request.user)
-#CLEANUP DOUBLE SitePrivilegeInline
-class SitePrivilegeROInline(ReadOnlyTabularInline):
- model = SitePrivilege
- extra = 0
- suit_classes = 'suit-tab suit-tab-siteprivileges'
- fields = ['user','site', 'role']
-
class SitePrivilegeInline(PlStackTabularInline):
model = SitePrivilege
extra = 0
suit_classes = 'suit-tab suit-tab-siteprivileges'
- fields = ['user','site', 'role']
+ fields = ['backend_status_icon', 'user','site', 'role']
+ readonly_fields = ('backend_status_icon', )
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'site':
@@ -345,19 +390,12 @@ class SitePrivilegeInline(PlStackTabularInline):
def queryset(self, request):
return SitePrivilege.select_by_user(request.user)
-class SiteDeploymentROInline(ReadOnlyTabularInline):
- model = SiteDeployments
- #model = Site.deployments.through
- extra = 0
- suit_classes = 'suit-tab suit-tab-sitedeployments'
- fields = ['deployment','site']
-
class SiteDeploymentInline(PlStackTabularInline):
model = SiteDeployments
- #model = Site.deployments.through
extra = 0
suit_classes = 'suit-tab suit-tab-deployments'
- fields = ['deployment','site']
+ fields = ['backend_status_icon', 'deployment','site']
+ readonly_fields = ('backend_status_icon', )
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'site':
@@ -371,37 +409,24 @@ class SiteDeploymentInline(PlStackTabularInline):
return SiteDeployments.select_by_user(request.user)
-class SlicePrivilegeROInline(ReadOnlyTabularInline):
- model = SlicePrivilege
- extra = 0
- suit_classes = 'suit-tab suit-tab-sliceprivileges'
- fields = ['user', 'slice', 'role']
-
class SlicePrivilegeInline(PlStackTabularInline):
model = SlicePrivilege
suit_classes = 'suit-tab suit-tab-sliceprivileges'
extra = 0
- fields = ('user', 'slice','role')
+ fields = ('backend_status_icon', 'user', 'slice', 'role')
+ readonly_fields = ('backend_status_icon', )
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'slice':
- kwargs['queryset'] = Slice.select_by_user(request.user)
+ kwargs['queryset'] = Slice.select_by_user(request.user)
if db_field.name == 'user':
- kwargs['queryset'] = User.select_by_user(request.user)
+ kwargs['queryset'] = User.select_by_user(request.user)
return super(SlicePrivilegeInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
return SlicePrivilege.select_by_user(request.user)
-class SliceNetworkROInline(ReadOnlyTabularInline):
- model = Network.slices.through
- extra = 0
- verbose_name = "Network Connection"
- verbose_name_plural = "Network Connections"
- suit_classes = 'suit-tab suit-tab-slicenetworks'
- fields = ['network']
-
class SliceNetworkInline(PlStackTabularInline):
model = Network.slices.through
selflink_fieldname = "network"
@@ -409,31 +434,17 @@ class SliceNetworkInline(PlStackTabularInline):
verbose_name = "Network Connection"
verbose_name_plural = "Network Connections"
suit_classes = 'suit-tab suit-tab-slicenetworks'
+ fields = ['backend_status_icon', 'network']
+ readonly_fields = ('backend_status_icon', )
-class PlainTextWidget(forms.HiddenInput):
- input_type = 'hidden'
-
- def render(self, name, value, attrs=None):
- if value is None:
- value = ''
- return mark_safe(str(value) + super(PlainTextWidget, self).render(name, value, attrs))
-
-class PlanetStackBaseAdmin(ReadOnlyAwareAdmin):
- save_on_top = False
-
- def save_model(self, request, obj, form, change):
- obj.caller = request.user
- # update openstack connection to use this site/tenant
- obj.save_by_user(request.user)
-
- def delete_model(self, request, obj):
- obj.delete_by_user(request.user)
-
- def save_formset(self, request, form, formset, change):
- instances = formset.save(commit=False)
- for instance in instances:
- instance.save_by_user(request.user)
- formset.save_m2m()
+class ImageDeploymentsInline(PlStackTabularInline):
+ model = ImageDeployments
+ extra = 0
+ verbose_name = "Image Deployments"
+ verbose_name_plural = "Image Deployments"
+ suit_classes = 'suit-tab suit-tab-imagedeployments'
+ fields = ['backend_status_icon', 'image', 'deployment', 'glance_image_id']
+ readonly_fields = ['backend_status_icon', 'glance_image_id']
class SliceRoleAdmin(PlanetStackBaseAdmin):
model = SliceRole
@@ -447,54 +458,134 @@ class DeploymentAdminForm(forms.ModelForm):
sites = forms.ModelMultipleChoiceField(
queryset=Site.objects.all(),
required=False,
+ help_text="Select which sites are allowed to host nodes in this deployment",
widget=FilteredSelectMultiple(
verbose_name=('Sites'), is_stacked=False
)
)
+ images = forms.ModelMultipleChoiceField(
+ queryset=Image.objects.all(),
+ required=False,
+ help_text="Select which images should be deployed on this deployment",
+ widget=FilteredSelectMultiple(
+ verbose_name=('Images'), is_stacked=False
+ )
+ )
+ flavors = forms.ModelMultipleChoiceField(
+ queryset=Flavor.objects.all(),
+ required=False,
+ help_text="Select which flavors should be usable on this deployment",
+ widget=FilteredSelectMultiple(
+ verbose_name=('Flavors'), is_stacked=False
+ )
+ )
class Meta:
model = Deployment
+ many_to_many = ["flavors",]
def __init__(self, *args, **kwargs):
+ request = kwargs.pop('request', None)
super(DeploymentAdminForm, self).__init__(*args, **kwargs)
+ self.fields['accessControl'].initial = "allow site " + request.user.site.name
+
if self.instance and self.instance.pk:
- self.fields['sites'].initial = self.instance.site_set.all()
- self.fields['sites'].initial = self.instance.sites.all()
+ self.fields['sites'].initial = [x.site for x in self.instance.sitedeployments_set.all()]
+ self.fields['images'].initial = [x.image for x in self.instance.imagedeployments_set.all()]
+ self.fields['flavors'].initial = self.instance.flavors.all()
+
+ def manipulate_m2m_objs(self, this_obj, selected_objs, all_relations, relation_class, local_attrname, foreign_attrname):
+ """ helper function for handling m2m relations from the MultipleChoiceField
+
+ this_obj: the source object we want to link from
+
+ selected_objs: a list of destination objects we want to link to
+
+ all_relations: the full set of relations involving this_obj, including ones we don't want
+
+ relation_class: the class that implements the relation from source to dest
+
+ local_attrname: field name representing this_obj in relation_class
+
+ foreign_attrname: field name representing selected_objs in relation_class
+
+ This function will remove all newobjclass relations from this_obj
+ that are not contained in selected_objs, and add any relations that
+ are in selected_objs but don't exist in the data model yet.
+ """
+
+ existing_dest_objs = []
+ for relation in list(all_relations):
+ if getattr(relation, foreign_attrname) not in selected_objs:
+ #print "deleting site", sdp.site
+ relation.delete()
+ else:
+ existing_dest_objs.append(getattr(relation, foreign_attrname))
+
+ for dest_obj in selected_objs:
+ if dest_obj not in existing_dest_objs:
+ #print "adding site", site
+ kwargs = {foreign_attrname: dest_obj, local_attrname: this_obj}
+ relation = relation_class(**kwargs)
+ relation.save()
def save(self, commit=True):
deployment = super(DeploymentAdminForm, self).save(commit=False)
+ deployment.flavors = self.cleaned_data['flavors']
+
if commit:
deployment.save()
if deployment.pk:
- deployment.sites = self.cleaned_data['sites']
- self.save_m2m()
+ # save_m2m() doesn't seem to work with 'through' relations. So we
+ # create/destroy the through models ourselves. There has to be
+ # a better way...
+
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments_set.all(), SiteDeployments, "deployment", "site")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments_set.all(), ImageDeployments, "deployment", "image")
+
+ self.save_m2m()
return deployment
+class DeploymentAdminROForm(DeploymentAdminForm):
+ def save(self, commit=True):
+ raise PermissionDenied
+
class SiteAssocInline(PlStackTabularInline):
model = Site.deployments.through
extra = 0
suit_classes = 'suit-tab suit-tab-sites'
class DeploymentAdmin(PlanetStackBaseAdmin):
- form = DeploymentAdminForm
model = Deployment
- fieldList = ['name','sites']
+ fieldList = ['backend_status_text', 'name', 'availability_zone', 'sites', 'images', 'flavors', 'accessControl']
fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})]
- inlines = [DeploymentPrivilegeInline,NodeInline,TagInline]
+ inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentsInline]
+ list_display = ['backend_status_icon', 'name']
+ list_display_links = ('backend_status_icon', 'name', )
+ readonly_fields = ('backend_status_text', )
- user_readonly_inlines = [DeploymentPrivilegeROInline,NodeROInline,TagROInline]
user_readonly_fields = ['name']
- suit_form_tabs =(('sites','Deployment Details'),('nodes','Nodes'),('deploymentprivileges','Privileges'),('tags','Tags'))
+ suit_form_tabs =(('sites','Deployment Details'),('nodes','Nodes'),('deploymentprivileges','Privileges'),('tags','Tags')) # ,('imagedeployments','Images'))
-class ServiceAttrAsTabROInline(ReadOnlyTabularInline):
- model = ServiceAttribute
- fields = ['name','value']
- extra = 0
- suit_classes = 'suit-tab suit-tab-serviceattrs'
+ def get_form(self, request, obj=None, **kwargs):
+ if request.user.isReadOnlyUser():
+ kwargs["form"] = DeploymentAdminROForm
+ else:
+ kwargs["form"] = DeploymentAdminForm
+ adminForm = super(DeploymentAdmin,self).get_form(request, obj, **kwargs)
+
+ # from stackexchange: pass the request object into the form
+
+ class AdminFormMetaClass(adminForm):
+ def __new__(cls, *args, **kwargs):
+ kwargs['request'] = request
+ return adminForm(*args, **kwargs)
+
+ return AdminFormMetaClass
class ServiceAttrAsTabInline(PlStackTabularInline):
model = ServiceAttribute
@@ -503,13 +594,14 @@ class ServiceAttrAsTabInline(PlStackTabularInline):
suit_classes = 'suit-tab suit-tab-serviceattrs'
class ServiceAdmin(PlanetStackBaseAdmin):
- list_display = ("name","description","versionNumber","enabled","published")
- fieldList = ["name","description","versionNumber","enabled","published"]
+ list_display = ("backend_status_icon","name","description","versionNumber","enabled","published")
+ list_display_links = ('backend_status_icon', 'name', )
+ fieldList = ["backend_status_text","name","description","versionNumber","enabled","published"]
fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']})]
inlines = [ServiceAttrAsTabInline,SliceInline]
+ readonly_fields = ('backend_status_text', )
user_readonly_fields = fieldList
- user_readonly_inlines = [ServiceAttrAsTabROInline,SliceROInline]
suit_form_tabs =(('general', 'Service Details'),
('slices','Slices'),
@@ -517,7 +609,7 @@ class ServiceAdmin(PlanetStackBaseAdmin):
)
class SiteAdmin(PlanetStackBaseAdmin):
- fieldList = ['name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location']
+ fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location']
fieldsets = [
(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}),
#('Deployment Networks', {'fields': ['deployments'], 'classes':['suit-tab suit-tab-deployments']}),
@@ -527,21 +619,20 @@ class SiteAdmin(PlanetStackBaseAdmin):
('siteprivileges','Privileges'),
('deployments','Deployments'),
('slices','Slices'),
- ('nodes','Nodes'),
+ ('nodes','Nodes'),
('tags','Tags'),
)
- readonly_fields = ['accountLink']
+ readonly_fields = ['backend_status_text', 'accountLink']
user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base', 'accountLink']
- user_readonly_inlines = [SliceROInline,UserROInline,TagROInline, NodeROInline, SitePrivilegeROInline,SiteDeploymentROInline]
- list_display = ('name', 'login_base','site_url', 'enabled')
+ list_display = ('backend_status_icon', 'name', 'login_base','site_url', 'enabled')
+ list_display_links = ('backend_status_icon', 'name', )
filter_horizontal = ('deployments',)
inlines = [SliceInline,UserInline,TagInline, NodeInline, SitePrivilegeInline, SiteDeploymentInline]
search_fields = ['name']
def queryset(self, request):
- #print dir(UserInline)
return Site.select_by_user(request.user)
def get_formsets(self, request, obj=None):
@@ -582,11 +673,13 @@ class SiteAdmin(PlanetStackBaseAdmin):
class SitePrivilegeAdmin(PlanetStackBaseAdmin):
- fieldList = ['user', 'site', 'role']
+ fieldList = ['backend_status_text', 'user', 'site', 'role']
fieldsets = [
(None, {'fields': fieldList, 'classes':['collapse']})
]
- list_display = ('user', 'site', 'role')
+ readonly_fields = ('backend_status_text', )
+ list_display = ('backend_status_icon', 'user', 'site', 'role')
+ list_display_links = list_display
user_readonly_fields = fieldList
user_readonly_inlines = []
@@ -629,18 +722,28 @@ class SliceForm(forms.ModelForm):
class Meta:
model = Slice
widgets = {
- 'service': LinkedSelect
+ 'service': LinkedSelect
}
+ def clean(self):
+ cleaned_data = super(SliceForm, self).clean()
+ name = cleaned_data.get('name')
+ site_id = cleaned_data.get('site')
+ site = Slice.objects.get(id=site_id)
+ if not name.startswith(site.login_base):
+ raise forms.ValidationError('slice name must begin with %s' % site.login_base)
+ return cleaned_data
+
class SliceAdmin(PlanetStackBaseAdmin):
form = SliceForm
- fieldList = ['name', 'site', 'serviceClass', 'enabled','description', 'service', 'slice_url']
+ fieldList = ['backend_status_text', 'site', 'name', 'serviceClass', 'enabled','description', 'service', 'slice_url', 'max_slivers']
fieldsets = [('Slice Details', {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}),]
- list_display = ('name', 'site','serviceClass', 'slice_url')
+ readonly_fields = ('backend_status_text', )
+ list_display = ('backend_status_icon', 'name', 'site','serviceClass', 'slice_url', 'max_slivers')
+ list_display_links = ('backend_status_icon', 'name', )
inlines = [SlicePrivilegeInline,SliverInline, TagInline, ReservationInline,SliceNetworkInline]
user_readonly_fields = fieldList
- user_readonly_inlines = [SlicePrivilegeROInline,SliverROInline,TagROInline, ReservationROInline, SliceNetworkROInline]
suit_form_tabs =(('general', 'Slice Details'),
('slicenetworks','Networks'),
@@ -650,10 +753,36 @@ class SliceAdmin(PlanetStackBaseAdmin):
('reservations','Reservations'),
)
+ def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
+ deployment_nodes = []
+ for node in Node.objects.all():
+ deployment_nodes.append( (node.deployment.id, node.id, node.name) )
+
+ deployment_flavors = []
+ for flavor in Flavor.objects.all():
+ for deployment in flavor.deployments.all():
+ deployment_flavors.append( (deployment.id, flavor.id, flavor.name) )
+
+ deployment_images = []
+ for image in Image.objects.all():
+ for imageDeployment in image.imagedeployments_set.all():
+ deployment_images.append( (imageDeployment.deployment.id, image.id, image.name) )
+
+ site_login_bases = []
+ for site in Site.objects.all():
+ site_login_bases.append((site.id, site.login_base))
+
+ context["deployment_nodes"] = deployment_nodes
+ context["deployment_flavors"] = deployment_flavors
+ context["deployment_images"] = deployment_images
+ context["site_login_bases"] = site_login_bases
+ return super(SliceAdmin, self).render_change_form(request, context, add, change, form_url, obj)
+
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'site':
kwargs['queryset'] = Site.select_by_user(request.user)
-
+ kwargs['widget'] = forms.Select(attrs={'onChange': "update_slice_prefix(this, $($(this).closest('fieldset')[0]).find('.field-name input')[0].id)"})
+
return super(SliceAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
@@ -672,9 +801,11 @@ class SliceAdmin(PlanetStackBaseAdmin):
class SlicePrivilegeAdmin(PlanetStackBaseAdmin):
fieldsets = [
- (None, {'fields': ['user', 'slice', 'role']})
+ (None, {'fields': ['backend_status_text', 'user', 'slice', 'role']})
]
- list_display = ('user', 'slice', 'role')
+ readonly_fields = ('backend_status_text', )
+ list_display = ('backend_status_icon', 'user', 'slice', 'role')
+ list_display_links = list_display
user_readonly_fields = ['user', 'slice', 'role']
user_readonly_inlines = []
@@ -696,32 +827,35 @@ class SlicePrivilegeAdmin(PlanetStackBaseAdmin):
def save_model(self, request, obj, form, change):
# update openstack connection to use this site/tenant
auth = request.session.get('auth', {})
- auth['tenant'] = obj.slice.name
+ auth['tenant'] = obj.slice.slicename
obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
obj.save()
def delete_model(self, request, obj):
# update openstack connection to use this site/tenant
auth = request.session.get('auth', {})
- auth['tenant'] = obj.slice.name
+ auth['tenant'] = obj.slice.slicename
obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
obj.delete()
class ImageAdmin(PlanetStackBaseAdmin):
- fieldsets = [('Image Details',
- {'fields': ['image_id', 'name', 'disk_format', 'container_format'],
+ fieldsets = [('Image Details',
+ {'fields': ['backend_status_text', 'name', 'disk_format', 'container_format'],
'classes': ['suit-tab suit-tab-general']})
]
+ readonly_fields = ('backend_status_text', )
- suit_form_tabs =(('general','Image Details'),('slivers','Slivers'))
+ suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'))
+
+ inlines = [SliverInline, ImageDeploymentsInline]
+
+ user_readonly_fields = ['name', 'disk_format', 'container_format']
+
+ list_display = ['backend_status_icon', 'name']
+ list_display_links = ('backend_status_icon', 'name', )
- inlines = [SliverInline]
-
- user_readonly_fields = ['image_id', 'name', 'disk_format', 'container_format']
- user_readonly_inlines = [SliverROInline]
-
class NodeForm(forms.ModelForm):
class Meta:
widgets = {
@@ -731,11 +865,13 @@ class NodeForm(forms.ModelForm):
class NodeAdmin(PlanetStackBaseAdmin):
form = NodeForm
- list_display = ('name', 'site', 'deployment')
+ list_display = ('backend_status_icon', 'name', 'site', 'deployment')
+ list_display_links = ('backend_status_icon', 'name', )
list_filter = ('deployment',)
inlines = [TagInline,SliverInline]
- fieldsets = [('Node Details', {'fields': ['name','site','deployment'], 'classes':['suit-tab suit-tab-details']})]
+ fieldsets = [('Node Details', {'fields': ['backend_status_text', 'name','site','deployment'], 'classes':['suit-tab suit-tab-details']})]
+ readonly_fields = ('backend_status_text', )
user_readonly_fields = ['name','site','deployment']
user_readonly_inlines = [TagInline,SliverInline]
@@ -758,16 +894,19 @@ class SliverForm(forms.ModelForm):
}
class TagAdmin(PlanetStackBaseAdmin):
- list_display = ['service', 'name', 'value', 'content_type', 'content_object',]
+ list_display = ['backend_status_icon', 'service', 'name', 'value', 'content_type', 'content_object',]
+ list_display_links = list_display
user_readonly_fields = ['service', 'name', 'value', 'content_type', 'content_object',]
user_readonly_inlines = []
class SliverAdmin(PlanetStackBaseAdmin):
form = SliverForm
fieldsets = [
- ('Sliver Details', {'fields': ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'numberCores', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
+ ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
]
- list_display = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']
+ readonly_fields = ('backend_status_text', )
+ list_display = ['backend_status_icon', 'ip', 'instance_name', 'slice', 'flavor', 'image', 'node', 'deploymentNetwork']
+ list_display_links = ('backend_status_icon', 'ip',)
suit_form_tabs =(('general', 'Sliver Details'),
('tags','Tags'),
@@ -775,8 +914,7 @@ class SliverAdmin(PlanetStackBaseAdmin):
inlines = [TagInline]
- user_readonly_fields = ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'numberCores', 'image']
- user_readonly_inlines = [TagROInline]
+ user_readonly_fields = ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image']
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'slice':
@@ -785,7 +923,7 @@ class SliverAdmin(PlanetStackBaseAdmin):
return super(SliverAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
- # admins can see all slivers. Users can only see slivers of
+ # admins can see all slivers. Users can only see slivers of
# the slices they belong to.
return Sliver.select_by_user(request.user)
@@ -793,16 +931,19 @@ class SliverAdmin(PlanetStackBaseAdmin):
def get_formsets(self, request, obj=None):
# make some fields read only if we are updating an existing record
if obj == None:
- #self.readonly_fields = ('ip', 'instance_name')
- self.readonly_fields = ()
+ #self.readonly_fields = ('ip', 'instance_name')
+ self.readonly_fields = ('backend_status_text')
else:
- self.readonly_fields = ()
- #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
+ self.readonly_fields = ('backend_status_text')
+ #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
for inline in self.get_inline_instances(request, obj):
# hide MyInline in the add view
if obj is None:
continue
+ if isinstance(inline, SliverInline):
+ inline.model.caller = request.user
+ yield inline.get_formset(request, obj)
#def save_model(self, request, obj, form, change):
# # update openstack connection to use this site/tenant
@@ -864,28 +1005,38 @@ class UserChangeForm(forms.ModelForm):
# field does not have access to the initial value
return self.initial["password"]
-class UserAdmin(UserAdmin):
+class UserDashboardViewInline(PlStackTabularInline):
+ model = UserDashboardView
+ extra = 0
+ suit_classes = 'suit-tab suit-tab-dashboards'
+ fields = ['user', 'dashboardView', 'order']
+
+class UserAdmin(PlanetStackBaseAdmin):
class Meta:
app_label = "core"
+ add_form_template = 'admin/auth/user/add_form.html'
+ change_user_password_template = None
+
# The forms to add and change user instances
form = UserChangeForm
add_form = UserCreationForm
+ change_password_form = AdminPasswordChangeForm
# The fields to be used in displaying the User model.
# These override the definitions on the base UserAdmin
# that reference specific fields on auth.User.
list_display = ('email', 'firstname', 'lastname', 'site', 'last_login')
- #list_display = ('email', 'username','firstname', 'lastname', 'is_admin', 'last_login')
list_filter = ('site',)
- inlines = [SlicePrivilegeInline,SitePrivilegeInline,DeploymentPrivilegeInline]
+ inlines = [SlicePrivilegeInline,SitePrivilegeInline,DeploymentPrivilegeInline,UserDashboardViewInline]
- fieldListLoginDetails = ['email','site','password','is_readonly','is_amin','public_key']
+ fieldListLoginDetails = ['backend_status_text', 'email','site','password','is_active','is_readonly','is_admin','public_key']
fieldListContactInfo = ['firstname','lastname','phone','timezone']
fieldsets = (
- ('Login Details', {'fields': ['email', 'site','password', 'is_readonly', 'is_admin', 'public_key'], 'classes':['suit-tab suit-tab-general']}),
+ ('Login Details', {'fields': ['backend_status_text', 'email', 'site','password', 'is_active', 'is_readonly', 'is_admin', 'public_key'], 'classes':['suit-tab suit-tab-general']}),
('Contact Information', {'fields': ('firstname','lastname','phone', 'timezone'), 'classes':['suit-tab suit-tab-contact']}),
+ #('Dashboard Views', {'fields': ('dashboards',), 'classes':['suit-tab suit-tab-dashboards']}),
#('Important dates', {'fields': ('last_login',)}),
)
add_fieldsets = (
@@ -894,14 +1045,19 @@ class UserAdmin(UserAdmin):
'fields': ('email', 'firstname', 'lastname', 'is_readonly', 'phone', 'public_key','password1', 'password2')}
),
)
+ readonly_fields = ('backend_status_text', )
search_fields = ('email',)
ordering = ('email',)
filter_horizontal = ()
- user_readonly_fields = fieldListLoginDetails
- user_readonly_inlines = [SlicePrivilegeROInline,SitePrivilegeROInline,DeploymentPrivilegeROInline]
+ user_readonly_fields = fieldListLoginDetails + fieldListContactInfo
- suit_form_tabs =(('general','Login Details'),('contact','Contact Information'),('sliceprivileges','Slice Privileges'),('siteprivileges','Site Privileges'),('deploymentprivileges','Deployment Privileges'))
+ suit_form_tabs =(('general','Login Details'),
+ ('contact','Contact Information'),
+ ('sliceprivileges','Slice Privileges'),
+ ('siteprivileges','Site Privileges'),
+ ('deploymentprivileges','Deployment Privileges'),
+ ('dashboards','Dashboard Views'))
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'site':
@@ -909,67 +1065,157 @@ class UserAdmin(UserAdmin):
return super(UserAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
- def has_add_permission(self, request, obj=None):
- return (not self.__user_is_readonly(request))
-
- def has_delete_permission(self, request, obj=None):
- return (not self.__user_is_readonly(request))
-
- def get_actions(self,request):
- actions = super(UserAdmin,self).get_actions(request)
-
- if self.__user_is_readonly(request):
- if 'delete_selected' in actions:
- del actions['delete_selected']
-
- return actions
-
- def change_view(self,request,object_id, extra_context=None):
-
- if self.__user_is_readonly(request):
- self.readonly_fields=self.user_readonly_fields
- self.inlines = self.user_readonly_inlines
- try:
- return super(UserAdmin, self).change_view(request, object_id, extra_context=extra_context)
- except PermissionDenied:
- pass
- if request.method == 'POST':
- raise PermissionDenied
- request.readonly = True
- return super(UserAdmin, self).change_view(request, object_id, extra_context=extra_context)
-
- def __user_is_readonly(self, request):
- #groups = [x.name for x in request.user.groups.all() ]
- #return "readonly" in groups
- return request.user.isReadOnlyUser()
-
def queryset(self, request):
return User.select_by_user(request.user)
+ # ------------------------------------------------------------------------
+ # stuff copied from ModelAdmin.UserAdmin
+ # ------------------------------------------------------------------------
+ def get_fieldsets(self, request, obj=None):
+ if not obj:
+ return self.add_fieldsets
+ return super(UserAdmin, self).get_fieldsets(request, obj)
+ def get_form(self, request, obj=None, **kwargs):
+ """
+ Use special form during user creation
+ """
+ defaults = {}
+ if obj is None:
+ defaults['form'] = self.add_form
+ defaults.update(kwargs)
+ return super(UserAdmin, self).get_form(request, obj, **defaults)
+
+ def get_urls(self):
+ from django.conf.urls import patterns
+ return patterns('',
+ (r'^(\d+)/password/$',
+ self.admin_site.admin_view(self.user_change_password))
+ ) + super(UserAdmin, self).get_urls()
+
+ def lookup_allowed(self, lookup, value):
+ # See #20078: we don't want to allow any lookups involving passwords.
+ if lookup.startswith('password'):
+ return False
+ return super(UserAdmin, self).lookup_allowed(lookup, value)
+
+ @sensitive_post_parameters_m
+ @csrf_protect_m
+ @transaction.atomic
+ def add_view(self, request, form_url='', extra_context=None):
+ # It's an error for a user to have add permission but NOT change
+ # permission for users. If we allowed such users to add users, they
+ # could create superusers, which would mean they would essentially have
+ # the permission to change users. To avoid the problem entirely, we
+ # disallow users from adding users if they don't have change
+ # permission.
+ if not self.has_change_permission(request):
+ if self.has_add_permission(request) and settings.DEBUG:
+ # Raise Http404 in debug mode so that the user gets a helpful
+ # error message.
+ raise Http404(
+ 'Your user does not have the "Change user" permission. In '
+ 'order to add users, Django requires that your user '
+ 'account have both the "Add user" and "Change user" '
+ 'permissions set.')
+ raise PermissionDenied
+ if extra_context is None:
+ extra_context = {}
+ username_field = self.model._meta.get_field(self.model.USERNAME_FIELD)
+ defaults = {
+ 'auto_populated_fields': (),
+ 'username_help_text': username_field.help_text,
+ }
+ extra_context.update(defaults)
+ return super(UserAdmin, self).add_view(request, form_url,
+ extra_context)
+
+ @sensitive_post_parameters_m
+ def user_change_password(self, request, id, form_url=''):
+ if not self.has_change_permission(request):
+ raise PermissionDenied
+ user = get_object_or_404(self.get_queryset(request), pk=id)
+ if request.method == 'POST':
+ form = self.change_password_form(user, request.POST)
+ if form.is_valid():
+ form.save()
+ change_message = self.construct_change_message(request, form, None)
+ self.log_change(request, user, change_message)
+ msg = ugettext('Password changed successfully.')
+ messages.success(request, msg)
+ update_session_auth_hash(request, form.user)
+ return HttpResponseRedirect('..')
+ else:
+ form = self.change_password_form(user)
+
+ fieldsets = [(None, {'fields': list(form.base_fields)})]
+ adminForm = admin.helpers.AdminForm(form, fieldsets, {})
+
+ context = {
+ 'title': _('Change password: %s') % escape(user.get_username()),
+ 'adminForm': adminForm,
+ 'form_url': form_url,
+ 'form': form,
+ 'is_popup': (IS_POPUP_VAR in request.POST or
+ IS_POPUP_VAR in request.GET),
+ 'add': True,
+ 'change': False,
+ 'has_delete_permission': False,
+ 'has_change_permission': True,
+ 'has_absolute_url': False,
+ 'opts': self.model._meta,
+ 'original': user,
+ 'save_as': False,
+ 'show_save': True,
+ }
+ context.update(admin.site.each_context())
+ return TemplateResponse(request,
+ self.change_user_password_template or
+ 'admin/auth/user/change_password.html',
+ context, current_app=self.admin_site.name)
+
+ def response_add(self, request, obj, post_url_continue=None):
+ """
+ Determines the HttpResponse for the add_view stage. It mostly defers to
+ its superclass implementation but is customized because the User model
+ has a slightly different workflow.
+ """
+ # We should allow further modification of the user just added i.e. the
+ # 'Save' button should behave like the 'Save and continue editing'
+ # button except in two scenarios:
+ # * The user has pressed the 'Save and add another' button
+ # * We are adding a user in a popup
+ if '_addanother' not in request.POST and IS_POPUP_VAR not in request.POST:
+ request.POST['_continue'] = 1
+ return super(UserAdmin, self).response_add(request, obj,
+ post_url_continue)
+
+ # ------------------------------------------------------------------------
+ # end stuff copied from ModelAdmin.UserAdmin
+ # ------------------------------------------------------------------------
+
+
+class DashboardViewAdmin(PlanetStackBaseAdmin):
+ fieldsets = [('Dashboard View Details',
+ {'fields': ['backend_status_text', 'name', 'url'],
+ 'classes': ['suit-tab suit-tab-general']})
+ ]
+ readonly_fields = ('backend_status_text', )
-class ServiceResourceROInline(ReadOnlyTabularInline):
- model = ServiceResource
- extra = 0
- fields = ['serviceClass', 'name', 'maxUnitsDeployment', 'maxUnitsNode', 'maxDuration', 'bucketInRate', 'bucketMaxSize', 'cost', 'calendarReservable']
+ suit_form_tabs =(('general','Dashboard View Details'),)
class ServiceResourceInline(PlStackTabularInline):
model = ServiceResource
extra = 0
class ServiceClassAdmin(PlanetStackBaseAdmin):
- list_display = ('name', 'commitment', 'membershipFee')
+ list_display = ('backend_status_icon', 'name', 'commitment', 'membershipFee')
+ list_display_links = ('backend_status_icon', 'name', )
inlines = [ServiceResourceInline]
user_readonly_fields = ['name', 'commitment', 'membershipFee']
user_readonly_inlines = []
-class ReservedResourceROInline(ReadOnlyTabularInline):
- model = ReservedResource
- extra = 0
- fields = ['sliver', 'resource','quantity','reservationSet']
- suit_classes = 'suit-tab suit-tab-reservedresources'
-
class ReservedResourceInline(PlStackTabularInline):
model = ReservedResource
extra = 0
@@ -1050,15 +1296,15 @@ class ReservationAddRefreshForm(ReservationAddForm):
return False
class ReservationAdmin(PlanetStackBaseAdmin):
- fieldList = ['slice', 'startTime', 'duration']
+ fieldList = ['backend_status_text', 'slice', 'startTime', 'duration']
fieldsets = [('Reservation Details', {'fields': fieldList, 'classes': ['suit-tab suit-tab-general']})]
+ readonly_fields = ('backend_status_text', )
list_display = ('startTime', 'duration')
form = ReservationAddForm
suit_form_tabs = (('general','Reservation Details'), ('reservedresources','Reserved Resources'))
inlines = [ReservedResourceInline]
- user_readonly_inlines = [ReservedResourceROInline]
user_readonly_fields = fieldList
def add_view(self, request, form_url='', extra_context=None):
@@ -1111,24 +1357,17 @@ class ReservationAdmin(PlanetStackBaseAdmin):
return Reservation.select_by_user(request.user)
class NetworkParameterTypeAdmin(PlanetStackBaseAdmin):
- list_display = ("name", )
+ list_display = ("backend_status_icon", "name", )
+ list_display_links = ('backend_status_icon', 'name', )
user_readonly_fields = ['name']
user_readonly_inlines = []
class RouterAdmin(PlanetStackBaseAdmin):
- list_display = ("name", )
+ list_display = ("backend_status_icon", "name", )
+ list_display_links = ('backend_status_icon', 'name', )
user_readonly_fields = ['name']
user_readonly_inlines = []
-class RouterROInline(ReadOnlyTabularInline):
- model = Router.networks.through
- extra = 0
- verbose_name_plural = "Routers"
- verbose_name = "Router"
- suit_classes = 'suit-tab suit-tab-routers'
-
- fields = ['name', 'owner', 'permittedNetworks', 'networks']
-
class RouterInline(PlStackTabularInline):
model = Router.networks.through
extra = 0
@@ -1136,31 +1375,18 @@ class RouterInline(PlStackTabularInline):
verbose_name = "Router"
suit_classes = 'suit-tab suit-tab-routers'
-class NetworkParameterROInline(ReadOnlyTabularInline):
- model = NetworkParameter
- extra = 1
- verbose_name_plural = "Parameters"
- verbose_name = "Parameter"
- suit_classes = 'suit-tab suit-tab-netparams'
- fields = ['parameter', 'value', 'content_type', 'object_id', 'content_object']
-
-class NetworkParameterInline(generic.GenericTabularInline):
+class NetworkParameterInline(PlStackGenericTabularInline):
model = NetworkParameter
- extra = 1
+ extra = 0
verbose_name_plural = "Parameters"
verbose_name = "Parameter"
suit_classes = 'suit-tab suit-tab-netparams'
-
-class NetworkSliversROInline(ReadOnlyTabularInline):
- fields = ['network', 'sliver', 'ip', 'port_id']
- model = NetworkSliver
- extra = 0
- verbose_name_plural = "Slivers"
- verbose_name = "Sliver"
- suit_classes = 'suit-tab suit-tab-networkslivers'
+ fields = ['backend_status_icon', 'parameter', 'value']
+ readonly_fields = ('backend_status_icon', )
class NetworkSliversInline(PlStackTabularInline):
- readonly_fields = ("ip", )
+ fields = ['backend_status_icon', 'network','sliver','ip']
+ readonly_fields = ("backend_status_icon", "ip", )
model = NetworkSliver
selflink_fieldname = "sliver"
extra = 0
@@ -1168,14 +1394,6 @@ class NetworkSliversInline(PlStackTabularInline):
verbose_name = "Sliver"
suit_classes = 'suit-tab suit-tab-networkslivers'
-class NetworkSlicesROInline(ReadOnlyTabularInline):
- model = NetworkSlice
- extra = 0
- verbose_name_plural = "Slices"
- verbose_name = "Slice"
- suit_classes = 'suit-tab suit-tab-networkslices'
- fields = ['network','slice']
-
class NetworkSlicesInline(PlStackTabularInline):
model = NetworkSlice
selflink_fieldname = "slice"
@@ -1183,18 +1401,21 @@ class NetworkSlicesInline(PlStackTabularInline):
verbose_name_plural = "Slices"
verbose_name = "Slice"
suit_classes = 'suit-tab suit-tab-networkslices'
+ fields = ['backend_status_icon', 'network','slice']
+ readonly_fields = ('backend_status_icon', )
class NetworkAdmin(PlanetStackBaseAdmin):
- list_display = ("name", "subnet", "ports", "labels")
+ list_display = ("backend_status_icon", "name", "subnet", "ports", "labels")
+ list_display_links = ('backend_status_icon', 'name', )
readonly_fields = ("subnet", )
inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline]
fieldsets = [
- (None, {'fields': ['name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'], 'classes':['suit-tab suit-tab-general']}),]
+ (None, {'fields': ['backend_status_text', 'name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'], 'classes':['suit-tab suit-tab-general']}),]
+ readonly_fields = ('backend_status_text', )
user_readonly_fields = ['name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet']
- user_readonly_inlines = [NetworkParameterROInline, NetworkSliversROInline, NetworkSlicesROInline, RouterROInline]
suit_form_tabs =(
('general','Network Details'),
@@ -1204,10 +1425,17 @@ class NetworkAdmin(PlanetStackBaseAdmin):
('routers','Routers'),
)
class NetworkTemplateAdmin(PlanetStackBaseAdmin):
- list_display = ("name", "guaranteedBandwidth", "visibility")
+ list_display = ("backend_status_icon", "name", "guaranteedBandwidth", "visibility")
+ list_display_links = ('backend_status_icon', 'name', )
user_readonly_fields = ["name", "guaranteedBandwidth", "visibility"]
user_readonly_inlines = []
+class FlavorAdmin(PlanetStackBaseAdmin):
+ list_display = ("backend_status_icon", "name", "flavor", "order", "default")
+ list_display_links = ("backend_status_icon", "name")
+ user_readonly_fields = ("name", "flavor")
+ fields = ("name", "description", "flavor", "order", "default")
+
# register a signal that caches the user's credentials when they log in
def cache_credentials(sender, user, request, **kwds):
auth = {'username': request.POST['username'],
@@ -1326,7 +1554,6 @@ class AccountAdmin(admin.ModelAdmin):
dollar_total_invoices = dollar_field("total_invoices", "Total Invoices")
dollar_total_payments = dollar_field("total_payments", "Total Payments")
-
# Now register the new UserAdmin...
admin.site.register(User, UserAdmin)
# ... and, since we're not using Django's builtin permissions,
@@ -1368,4 +1595,6 @@ if True:
#admin.site.register(SitePrivilege, SitePrivilegeAdmin)
admin.site.register(Sliver, SliverAdmin)
admin.site.register(Image, ImageAdmin)
+ admin.site.register(DashboardView, DashboardViewAdmin)
+ admin.site.register(Flavor, FlavorAdmin)