from suit.widgets import LinkedSelect
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse, NoReverseMatch
+from cgi import escape as html_escape
import django_evolution
import threading
if obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
return '<span style="min-width:16px;" title="%s"><img src="/static/admin/img/icon_clock.gif"></span>' % obj.backend_status
else:
- return '<span style="min-width:16px;" title="%s"><img src="/static/admin/img/icon_error.gif"></span>' % obj.backend_status
+ return '<span style="min-width:16px;" title="%s"><img src="/static/admin/img/icon_error.gif"></span>' % html_escape(obj.backend_status, quote=True)
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))
+ return "%s %s" % (icon, "successfully enacted")
else:
- return "%s %s" % (icon, obj.backend_status)
+ return "%s %s" % (icon, html_escape(obj.backend_status, quote=True))
class PlainTextWidget(forms.HiddenInput):
input_type = 'hidden'
return mark_safe(backend_icon(obj))
backend_status_icon.short_description = ""
+ def get_form(self, request, obj=None, **kwargs):
+ # Save obj and request in thread-local storage, so suit_form_tabs can
+ # use it to determine whether we're in edit or add mode, and can
+ # determine whether the user is an admin.
+ _thread_locals.request = request
+ _thread_locals.obj = obj
+ return super(PermissionCheckingAdminMixin, self).get_form(request, obj, **kwargs)
+
+ def get_inline_instances(self, request, obj=None):
+ inlines = super(PermissionCheckingAdminMixin, self).get_inline_instances(request, obj)
+
+ # inlines that should only be shown to an admin user
+ if request.user.is_admin:
+ for inline_class in getattr(self, "admin_inlines", []):
+ inlines.append(inline_class(self.model, self.admin_site))
+
+ return inlines
+
class ReadOnlyAwareAdmin(PermissionCheckingAdminMixin, admin.ModelAdmin):
# Note: Make sure PermissionCheckingAdminMixin is listed before
# admin.ModelAdmin in the class declaration.
return SitePrivilege.select_by_user(request.user)
class SiteDeploymentInline(PlStackTabularInline):
- model = SiteDeployments
+ model = SiteDeployment
extra = 0
suit_classes = 'suit-tab suit-tab-deployments'
fields = ['backend_status_icon', 'deployment','site']
return super(SiteDeploymentInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
- return SiteDeployments.select_by_user(request.user)
+ return SiteDeployment.select_by_user(request.user)
class SlicePrivilegeInline(PlStackTabularInline):
fields = ['backend_status_icon', 'network']
readonly_fields = ('backend_status_icon', )
-class ImageDeploymentsInline(PlStackTabularInline):
- model = ImageDeployments
+class ImageDeploymentInline(PlStackTabularInline):
+ model = ImageDeployment
extra = 0
verbose_name = "Image Deployments"
verbose_name_plural = "Image Deployments"
# 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.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments_set.all(), SiteDeployment, "deployment", "site")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments_set.all(), ImageDeployment, "deployment", "image")
self.save_m2m()
model = Deployment
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] # ,ImageDeploymentsInline]
+ inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentInline]
list_display = ['backend_status_icon', 'name']
list_display_links = ('backend_status_icon', 'name', )
readonly_fields = ('backend_status_text', )
def queryset(self, request):
return Site.select_by_user(request.user)
- def get_formsets(self, request, obj=None):
- for inline in self.get_inline_instances(request, obj):
- # hide MyInline in the add view
- if obj is None:
- continue
- if isinstance(inline, SliceInline):
- inline.model.caller = request.user
- yield inline.get_formset(request, obj)
-
def get_formsets(self, request, obj=None):
for inline in self.get_inline_instances(request, obj):
# hide MyInline in the add view
cleaned_data = super(SliceForm, self).clean()
name = cleaned_data.get('name')
site = cleaned_data.get('site')
+ slice_id = self.instance.id
+ if not site and slice_id:
+ site = Slice.objects.get(id=slice_id).site
if (not isinstance(site,Site)):
# previous code indicates 'site' could be a site_id and not a site?
site = Slice.objects.get(id=site.id)
raise forms.ValidationError('slice name must begin with %s' % site.login_base)
return cleaned_data
+class SliceDeploymentInline(PlStackTabularInline):
+ model = SliceDeployment
+ extra = 0
+ verbose_name = "Slice Deployment"
+ verbose_name_plural = "Slice Deployments"
+ suit_classes = 'suit-tab suit-tab-admin-only'
+ fields = ['backend_status_icon', 'deployment', 'tenant_id']
+ readonly_fields = ('backend_status_icon', )
+
class SliceAdmin(PlanetStackBaseAdmin):
form = SliceForm
fieldList = ['backend_status_text', 'site', 'name', 'serviceClass', 'enabled','description', 'service', 'slice_url', 'max_slivers']
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]
+ admin_inlines = [SliceDeploymentInline]
user_readonly_fields = fieldList
- suit_form_tabs =(('general', 'Slice Details'),
- ('slicenetworks','Networks'),
- ('sliceprivileges','Privileges'),
- ('slivers','Slivers'),
- ('tags','Tags'),
- ('reservations','Reservations'),
- )
+ @property
+ def suit_form_tabs(self):
+ tabs =[('general', 'Slice Details'),
+ ('slicenetworks','Networks'),
+ ('sliceprivileges','Privileges'),
+ ('slivers','Slivers'),
+ ('tags','Tags'),
+ ('reservations','Reservations'),
+ ]
+
+ request=getattr(_thread_locals, "request", None)
+ if request and request.user.is_admin:
+ tabs.append( ('admin-only', 'Admin-Only') )
+
+ return tabs
+
+ def add_view(self, request, form_url='', extra_context=None):
+ # revert to default read-only fields
+ self.readonly_fields = ('backend_status_text',)
+ return super(SliceAdmin, self).add_view(request, form_url, extra_context=extra_context)
+
+ def change_view(self, request, object_id, form_url='', extra_context=None):
+ print object_id
+ # cannot change the site of an existing slice so make the site field read only
+ if object_id:
+ self.readonly_fields = ('backend_status_text','site')
+ return super(SliceAdmin, self).change_view(request, object_id, form_url)
def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
deployment_nodes = []
inline.model.caller = request.user
yield inline.get_formset(request, obj)
- def save_model(self, request, obj, form, change):
- obj.save()
- # create default public slice networks
- public_net = Network(
- name = obj.name+'-public',
- template = NetworkTemplate.objects.get(name='Public dedicated IPv4'),
- owner = obj
- )
- public_net.save()
- public_slice_net = NetworkSlice(network=public_net, slice=obj)
- public_slice_net.save()
- # create default private slice networks
- private_net = Network(
- name = obj.name+'-private',
- template = NetworkTemplate.objects.get(name='Private'),
- owner = obj
- )
- private_net.save()
- private_slice_net = NetworkSlice(network=private_net, slice=obj)
- private_slice_net.save()
-
-
-
class SlicePrivilegeAdmin(PlanetStackBaseAdmin):
fieldsets = [
(None, {'fields': ['backend_status_text', 'user', 'slice', 'role']})
suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'))
- inlines = [SliverInline, ImageDeploymentsInline]
+ inlines = [SliverInline, ImageDeploymentInline]
user_readonly_fields = ['name', 'disk_format', 'container_format']
# make some fields read only if we are updating an existing record
if obj == None:
#self.readonly_fields = ('ip', 'instance_name')
- self.readonly_fields = ('backend_status_text')
+ self.readonly_fields = ('backend_status_text',)
else:
- self.readonly_fields = ('backend_status_text')
+ self.readonly_fields = ('backend_status_text',)
#self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
for inline in self.get_inline_instances(request, obj):
user_readonly_fields = fieldListLoginDetails + fieldListContactInfo
- def get_form(self, request, obj=None):
- # Save obj in thread-local storage, so suit_form_tabs can use it to
- # determine whether we're in edit or add mode.
- _thread_locals.request = request
- _thread_locals.obj = obj
- return super(UserAdmin, self).get_form(request, obj)
-
@property
def suit_form_tabs(self):
if getattr(_thread_locals, "obj", None) is None:
fields = ['backend_status_icon', 'network','slice']
readonly_fields = ('backend_status_icon', )
+class NetworkDeploymentsInline(PlStackTabularInline):
+ model = NetworkDeployments
+ extra = 0
+ verbose_name_plural = "Network Deployments"
+ verbose_name = "Network Deployment"
+ suit_classes = 'suit-tab suit-tab-admin-only'
+ fields = ['backend_status_icon', 'deployment','net_id','subnet_id']
+ readonly_fields = ('backend_status_icon', )
+
class NetworkAdmin(PlanetStackBaseAdmin):
list_display = ("backend_status_icon", "name", "subnet", "ports", "labels")
list_display_links = ('backend_status_icon', 'name', )
readonly_fields = ("subnet", )
inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline]
+ admin_inlines = [NetworkDeploymentsInline]
fieldsets = [
(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']
- suit_form_tabs =(
- ('general','Network Details'),
- ('netparams', 'Parameters'),
- ('networkslivers','Slivers'),
- ('networkslices','Slices'),
- ('routers','Routers'),
- )
+ @property
+ def suit_form_tabs(self):
+ tabs=[('general','Network Details'),
+ ('netparams', 'Parameters'),
+ ('networkslivers','Slivers'),
+ ('networkslices','Slices'),
+ ('routers','Routers'),
+ ]
+
+ request=getattr(_thread_locals, "request", None)
+ if request and request.user.is_admin:
+ tabs.append( ('admin-only', 'Admin-Only') )
+
+ return tabs
+
+
class NetworkTemplateAdmin(PlanetStackBaseAdmin):
list_display = ("backend_status_icon", "name", "guaranteedBandwidth", "visibility")
list_display_links = ('backend_status_icon', 'name', )