X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=9ea1c361a1cf97fc7e6f8c1dd73a138b669ea14d;hb=9ec6bce113684daca0e658b31b5ab1ee29405eb8;hp=47f9eabb6c8a826bf342880edcd6eef085246ada;hpb=ea71c758c3d8d302b53603d94357961c65a76872;p=plstackapi.git
diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 47f9eab..9ea1c36 100644
--- a/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@ -7,7 +7,7 @@ from django.contrib.auth.models import Group
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.admin.widgets import FilteredSelectMultiple, AdminTextareaWidget
from django.contrib.auth.forms import ReadOnlyPasswordHashField, AdminPasswordChangeForm
from django.contrib.auth.signals import user_logged_in
from django.utils import timezone
@@ -15,6 +15,10 @@ from django.contrib.contenttypes import generic
from suit.widgets import LinkedSelect
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse, NoReverseMatch
+from django.utils.encoding import force_text, python_2_unicode_compatible
+from django.utils.html import conditional_escape, format_html
+from django.forms.utils import flatatt, to_current_timezone
+from cgi import escape as html_escape
import django_evolution
import threading
@@ -30,14 +34,25 @@ def backend_icon(obj): # backend_status, enacted, updated):
if obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
return '
' % obj.backend_status
else:
- return '
' % obj.backend_status
+ return '
' % 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 UploadTextareaWidget(AdminTextareaWidget):
+ def render(self, name, value, attrs=None):
+ if value is None:
+ value = ''
+ final_attrs = self.build_attrs(attrs, name=name)
+ return format_html('' \
+ '' \
+ '
' % (attrs["id"], attrs["id"], attrs["id"]),
+ flatatt(final_attrs),
+ force_text(value))
class PlainTextWidget(forms.HiddenInput):
input_type = 'hidden'
@@ -137,6 +152,24 @@ class PermissionCheckingAdminMixin(object):
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.
@@ -389,7 +422,7 @@ class SitePrivilegeInline(PlStackTabularInline):
def queryset(self, request):
return SitePrivilege.select_by_user(request.user)
-class SiteDeploymentInline(PlStackTabularInline):
+class SiteDeploymentsInline(PlStackTabularInline):
model = SiteDeployments
extra = 0
suit_classes = 'suit-tab suit-tab-deployments'
@@ -402,7 +435,7 @@ class SiteDeploymentInline(PlStackTabularInline):
if db_field.name == 'deployment':
kwargs['queryset'] = Deployment.select_by_user(request.user)
- return super(SiteDeploymentInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
+ return super(SiteDeploymentsInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
return SiteDeployments.select_by_user(request.user)
@@ -489,8 +522,8 @@ class DeploymentAdminForm(forms.ModelForm):
self.fields['accessControl'].initial = "allow site " + request.user.site.name
if self.instance and self.instance.pk:
- 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['sites'].initial = [x.site for x in self.instance.sitedeployments.all()]
+ self.fields['images'].initial = [x.image for x in self.instance.imagedeployments.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):
@@ -541,8 +574,8 @@ class DeploymentAdminForm(forms.ModelForm):
# 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.all(), SiteDeployments, "deployment", "site")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments.all(), ImageDeployments, "deployment", "image")
self.save_m2m()
@@ -628,21 +661,12 @@ class SiteAdmin(PlanetStackBaseAdmin):
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]
+ inlines = [SliceInline,UserInline,TagInline, NodeInline, SitePrivilegeInline, SiteDeploymentsInline]
search_fields = ['name']
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
@@ -728,6 +752,9 @@ class SliceForm(forms.ModelForm):
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)
@@ -756,21 +783,6 @@ class SliceAdmin(PlanetStackBaseAdmin):
user_readonly_fields = fieldList
-# suit_form_tabs =(('general', 'Slice Details'),
-# ('slicenetworks','Networks'),
-# ('sliceprivileges','Privileges'),
-# ('slivers','Slivers'),
-# ('tags','Tags'),
-# ('reservations','Reservations'),
-# )
-
- 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(SliceAdmin, self).get_form(request, obj)
-
@property
def suit_form_tabs(self):
tabs =[('general', 'Slice Details'),
@@ -786,6 +798,18 @@ class SliceAdmin(PlanetStackBaseAdmin):
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 = []
@@ -799,7 +823,7 @@ class SliceAdmin(PlanetStackBaseAdmin):
deployment_images = []
for image in Image.objects.all():
- for imageDeployment in image.imagedeployments_set.all():
+ for imageDeployment in image.imagedeployments.all():
deployment_images.append( (imageDeployment.deployment.id, image.id, image.name) )
site_login_bases = []
@@ -832,15 +856,6 @@ class SliceAdmin(PlanetStackBaseAdmin):
inline.model.caller = request.user
yield inline.get_formset(request, obj)
- def get_inline_instances(self, request, obj=None):
- inlines = super(SliceAdmin, self).get_inline_instances(request, obj)
-
- if request.user.is_admin:
- for inline_class in self.admin_inlines:
- inlines.append(inline_class(self.model, self.admin_site))
-
- return inlines
-
class SlicePrivilegeAdmin(PlanetStackBaseAdmin):
fieldsets = [
(None, {'fields': ['backend_status_text', 'user', 'slice', 'role']})
@@ -974,9 +989,9 @@ class SliverAdmin(PlanetStackBaseAdmin):
# 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):
@@ -1040,6 +1055,7 @@ class UserChangeForm(forms.ModelForm):
class Meta:
model = User
+ widgets = { 'public_key': UploadTextareaWidget, }
def clean_password(self):
# Regardless of what the user provides, return the initial value.
@@ -1093,13 +1109,6 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin):
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:
@@ -1330,31 +1339,69 @@ class NetworkSlicesInline(PlStackTabularInline):
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 NetworkForm(forms.ModelForm):
+ class Meta:
+ model = Network
+ widgets = {
+ 'topologyParameters': UploadTextareaWidget,
+ 'controllerParameters': UploadTextareaWidget,
+ }
+
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]
+
+ form=NetworkForm
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']}),]
+ (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']}),
+ (None, {'fields': ['topologyParameters', 'controllerUrl', 'controllerParameters'],
+ 'classes':['suit-tab suit-tab-sdn']}),
+ ]
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'),
+ ('sdn', 'SDN Configuration'),
+ ('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', )
user_readonly_fields = ["name", "guaranteedBandwidth", "visibility"]
user_readonly_inlines = []
+ fieldsets = [
+ (None, {'fields': ['name', 'description', 'guaranteedBandwidth', 'visibility', 'translation', 'sharedNetworkName', 'sharedNetworkId', 'topologyKind', 'controllerKind'],
+ 'classes':['suit-tab suit-tab-general']}),]
+ suit_form_tabs = (('general','Network Template Details'), )
class FlavorAdmin(PlanetStackBaseAdmin):
list_display = ("backend_status_icon", "name", "flavor", "order", "default")