X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=9c7cc5466eb2de1103527bdbaaa7a714f1a1fabf;hb=bf1153a32d6f27291dd7a3238bc1a9451e9d6154;hp=58e9689ffe0045d2124c41b2a7bbfc5635f2c130;hpb=3de3e37d4f6357b80c6f238d6a07cd67342224b0;p=plstackapi.git diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 58e9689..9c7cc54 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -9,7 +9,9 @@ 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.signals import user_logged_in +from django.contrib.auth.signals import user_logged_in +from django.utils import timezone +import django_evolution class ReadonlyTabularInline(admin.TabularInline): @@ -64,6 +66,10 @@ class SliceMembershipInline(admin.TabularInline): model = SliceMembership extra = 0 +class SliceTagInline(admin.TabularInline): + model = SliceTag + extra = 0 + class PlainTextWidget(forms.HiddenInput): input_type = 'hidden' @@ -99,7 +105,7 @@ class RoleAdmin(OSModelAdmin): list_display = ('role_type',) -class DeploymentNetworkAdminForm(forms.ModelForm): +class DeploymentAdminForm(forms.ModelForm): sites = forms.ModelMultipleChoiceField( queryset=Site.objects.all(), required=False, @@ -108,16 +114,16 @@ class DeploymentNetworkAdminForm(forms.ModelForm): ) ) class Meta: - model = DeploymentNetwork + model = Deployment def __init__(self, *args, **kwargs): - super(DeploymentNetworkAdminForm, self).__init__(*args, **kwargs) + super(DeploymentAdminForm, self).__init__(*args, **kwargs) if self.instance and self.instance.pk: self.fields['sites'].initial = self.instance.sites.all() def save(self, commit=True): - deploymentNetwork = super(DeploymentNetworkAdminForm, self).save(commit=False) + deploymentNetwork = super(DeploymentAdminForm, self).save(commit=False) if commit: deploymentNetwork.save() @@ -127,8 +133,8 @@ class DeploymentNetworkAdminForm(forms.ModelForm): return deploymentNetwork -class DeploymentNetworkAdmin(PlanetStackBaseAdmin): - form = DeploymentNetworkAdminForm +class DeploymentAdmin(PlanetStackBaseAdmin): + form = DeploymentAdminForm inlines = [NodeInline,SliverInline] def get_formsets(self, request, obj=None): @@ -222,12 +228,12 @@ class KeyAdmin(OSModelAdmin): # qs = super(KeyAdmin, self).queryset(request) #else: # qs = Key.objects.filter(user=request.user) - #return qs - + #return qs + class SliceAdmin(OSModelAdmin): fields = ['name', 'site', 'serviceClass', 'description', 'slice_url'] list_display = ('name', 'site','serviceClass', 'slice_url') - inlines = [SliverInline, SliceMembershipInline] + inlines = [SliverInline, SliceMembershipInline, SliceTagInline] def queryset(self, request): # admins can see all keys. Users can only see slices they belong to. @@ -297,8 +303,8 @@ class ImageAdmin(admin.ModelAdmin): fields = ['image_id', 'name', 'disk_format', 'container_format'] class NodeAdmin(admin.ModelAdmin): - list_display = ('name', 'site', 'deploymentNetwork') - list_filter = ('deploymentNetwork',) + list_display = ('name', 'site', 'deployment') + list_filter = ('deployment',) class SliverForm(forms.ModelForm): @@ -337,7 +343,8 @@ class SliverAdmin(PlanetStackBaseAdmin): #self.readonly_fields = ('ip', 'instance_name') self.readonly_fields = () else: - self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key') + self.readonly_fields = () + #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key') for inline in self.get_inline_instances(request, obj): # hide MyInline in the add view @@ -423,14 +430,14 @@ class UserAdmin(UserAdmin, OSModelAdmin): list_filter = ('site',) inlines = [SitePrivilegeInline, SliceMembershipInline] fieldsets = ( - (None, {'fields': ('email', 'password', 'site')}), + (None, {'fields': ('email', 'password', 'site', 'is_admin', 'timezone')}), ('Personal info', {'fields': ('firstname','lastname','phone', 'key')}), #('Important dates', {'fields': ('last_login',)}), ) add_fieldsets = ( (None, { 'classes': ('wide',), - 'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'key','password1', 'password2')} + 'fields': ('email', 'firstname', 'lastname', 'phone', 'site', 'key','password1', 'password2', 'is_admin')} ), ) search_fields = ('email',) @@ -445,8 +452,124 @@ class ServiceClassAdmin(admin.ModelAdmin): list_display = ('name', 'commitment', 'membershipFee') inlines = [ServiceResourceInline] -class ServiceResourceAdmin(admin.ModelAdmin): - list_display = ('serviceClass', 'name', 'cost', 'calendarReservable', 'maxUnitsDeployment', 'maxUnitsNode') +class ReservedResourceInline(admin.TabularInline): + model = ReservedResource + extra = 0 + + def formfield_for_foreignkey(self, db_field, request=None, **kwargs): + field = super(ReservedResourceInline, self).formfield_for_foreignkey(db_field, request, **kwargs) + + if db_field.name == 'resource': + # restrict resources to those that the slice's service class allows + if request._slice is not None: + field.queryset = field.queryset.filter(serviceClass = request._slice.serviceClass, calendarReservable=True) + if len(field.queryset) > 0: + field.initial = field.queryset.all()[0] + else: + field.queryset = field.queryset.none() + elif db_field.name == 'sliver': + # restrict slivers to those that belong to the slice + if request._slice is not None: + field.queryset = field.queryset.filter(slice = request._slice) + else: + field.queryset = field.queryset.none() + + return field + +class ReservationChangeForm(forms.ModelForm): + class Meta: + model = Reservation + +class ReservationAddForm(forms.ModelForm): + slice = forms.ModelChoiceField(queryset=Slice.objects.all(), widget=forms.Select(attrs={"onChange":"document.getElementById('id_refresh').value=1; submit()"})) + refresh = forms.CharField(widget=forms.HiddenInput()) + + class Media: + css = {'all': ('planetstack.css',)} # .field-refresh { display: none; } + + def clean_slice(self): + slice = self.cleaned_data.get("slice") + x = ServiceResource.objects.filter(serviceClass = slice.serviceClass, calendarReservable=True) + if len(x) == 0: + raise forms.ValidationError("The slice you selected does not have a service class that allows reservations") + return slice + + class Meta: + model = Reservation + +class ReservationAddRefreshForm(ReservationAddForm): + """ This form is displayed when the Reservation Form receives an update + from the Slice dropdown onChange handler. It doesn't validate the + data and doesn't save the data. This will cause the form to be + redrawn. + """ + + """ don't validate anything other than slice """ + dont_validate_fields = ("startTime", "duration") + + def full_clean(self): + result = super(ReservationAddForm, self).full_clean() + + for fieldname in self.dont_validate_fields: + if fieldname in self._errors: + del self._errors[fieldname] + + return result + + """ don't save anything """ + def is_valid(self): + return False + +class ReservationAdmin(admin.ModelAdmin): + list_display = ('startTime', 'duration') + inlines = [ReservedResourceInline] + form = ReservationAddForm + + def add_view(self, request, form_url='', extra_context=None): + timezone.activate(request.user.timezone) + request._refresh = False + request._slice = None + if request.method == 'POST': + # "refresh" will be set to "1" if the form was submitted due to + # a change in the Slice dropdown. + if request.POST.get("refresh","1") == "1": + request._refresh = True + request.POST["refresh"] = "0" + + # Keep track of the slice that was selected, so the + # reservedResource inline can filter items for the slice. + request._slice = request.POST.get("slice",None) + if (request._slice is not None): + request._slice = Slice.objects.get(id=request._slice) + + result = super(ReservationAdmin, self).add_view(request, form_url, extra_context) + return result + + def changelist_view(self, request, extra_context = None): + timezone.activate(request.user.timezone) + return super(ReservationAdmin, self).changelist_view(request, extra_context) + + def get_form(self, request, obj=None, **kwargs): + request._obj_ = obj + if obj is not None: + # For changes, set request._slice to the slice already set in the + # object. + request._slice = obj.slice + self.form = ReservationChangeForm + else: + if getattr(request, "_refresh", False): + self.form = ReservationAddRefreshForm + else: + self.form = ReservationAddForm + return super(ReservationAdmin, self).get_form(request, obj, **kwargs) + + def get_readonly_fields(self, request, obj=None): + if (obj is not None): + # Prevent slice from being changed after the reservation has been + # created. + return ['slice'] + else: + return [] # register a signal that caches the user's credentials when they log in def cache_credentials(sender, user, request, **kwds): @@ -461,17 +584,30 @@ admin.site.register(User, UserAdmin) # unregister the Group model from admin. admin.site.unregister(Group) +#Do not show django evolution in the admin interface +from django_evolution.models import Version, Evolution +admin.site.unregister(Version) +admin.site.unregister(Evolution) + + +# When debugging it is often easier to see all the classes, but for regular use +# only the top-levels should be displayed +showAll = False + +admin.site.register(Deployment, DeploymentAdmin) admin.site.register(Site, SiteAdmin) -admin.site.register(SitePrivilege, SitePrivilegeAdmin) admin.site.register(Slice, SliceAdmin) -admin.site.register(SliceMembership, SliceMembershipAdmin) #admin.site.register(Subnet) -admin.site.register(Image, ImageAdmin) -admin.site.register(Node, NodeAdmin) -admin.site.register(Sliver, SliverAdmin) admin.site.register(Key, KeyAdmin) -admin.site.register(Role, RoleAdmin) -admin.site.register(DeploymentNetwork, DeploymentNetworkAdmin) -admin.site.register(ServiceClass, ServiceClassAdmin) -admin.site.register(ServiceResource, ServiceResourceAdmin) + + +if showAll: + admin.site.register(Node, NodeAdmin) + admin.site.register(SliceMembership, SliceMembershipAdmin) + admin.site.register(SitePrivilege, SitePrivilegeAdmin) + admin.site.register(Role, RoleAdmin) + admin.site.register(Sliver, SliverAdmin) + admin.site.register(ServiceClass, ServiceClassAdmin) + admin.site.register(Reservation, ReservationAdmin) + admin.site.register(Image, ImageAdmin)