X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=93c14ee2013ebd9cab375cc34fba2896f19f2932;hb=fefc358e0de48e4feef7704b2c6010c88709719d;hp=76810f6c2d2846dd11c82a4eab3ed2fc53143a31;hpb=d351575354b2b220ebfae6d61bb8420d7bba52b8;p=plstackapi.git diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 76810f6..93c14ee 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -39,13 +39,64 @@ class TagInline(generic.GenericTabularInline): exclude = ['enacted'] extra = 1 +class NetworkLookerUpper: + """ This is a callable that looks up a network name in a sliver and returns + the ip address for that network. + """ + + def __init__(self, name): + self.short_description = name + self.__name__ = name + self.network_name = name + + def __call__(self, obj): + if obj is not None: + for nbs in obj.networksliver_set.all(): + if (nbs.network.name == self.network_name): + return nbs.ip + return "" + + def __str__(self): + return self.network_name + class SliverInline(PlStackTabularInline): model = Sliver fields = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork'] extra = 0 - #readonly_fields = ['ip', 'instance_name', 'image'] readonly_fields = ['ip', 'instance_name'] + + + 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 SiteInline(PlStackTabularInline): model = Site extra = 0 @@ -120,6 +171,12 @@ class SliceMembershipInline(PlStackTabularInline): return super(SliceMembershipInline, self).formfield_for_foreignkey(db_field, request, **kwargs) +class SliceNetworkInline(PlStackTabularInline): + model = Network.slices.through + extra = 0 + verbose_name = "Network Connection" + verbose_name_plural = "Network Connections" + class SliceTagInline(PlStackTabularInline): model = SliceTag extra = 0 @@ -142,6 +199,7 @@ class RoleAdmin(PlanetStackBaseAdmin): ] list_display = ('role_type',) + class DeploymentAdminForm(forms.ModelForm): sites = forms.ModelMultipleChoiceField( queryset=Site.objects.all(), @@ -188,8 +246,7 @@ class DeploymentAdmin(PlanetStackBaseAdmin): class SiteAdmin(PlanetStackBaseAdmin): fieldsets = [ - (None, {'fields': ['name', 'site_url', 'enabled', 'is_public', 'login_base']}), - ('Location', {'fields': ['latitude', 'longitude']}), + (None, {'fields': ['name', 'site_url', 'enabled', 'is_public', 'login_base', 'location']}), ('Deployment Networks', {'fields': ['deployments']}) ] list_display = ('name', 'login_base','site_url', 'enabled') @@ -270,7 +327,7 @@ class SitePrivilegeAdmin(PlanetStackBaseAdmin): class SliceAdmin(PlanetStackBaseAdmin): fields = ['name', 'site', 'serviceClass', 'description', 'slice_url'] list_display = ('name', 'site','serviceClass', 'slice_url') - inlines = [SliverInline, SliceMembershipInline, TagInline, SliceTagInline] + inlines = [SliverInline, SliceMembershipInline, TagInline, SliceTagInline, SliceNetworkInline] def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'site': @@ -372,6 +429,7 @@ class SliceMembershipAdmin(PlanetStackBaseAdmin): obj.os_manager = OpenStackManager(auth=auth, caller=request.user) obj.delete() + class ImageAdmin(admin.ModelAdmin): fields = ['image_id', 'name', 'disk_format', 'container_format'] @@ -380,6 +438,7 @@ class NodeAdmin(admin.ModelAdmin): list_filter = ('deployment',) inlines = [TagInline] + class SliverForm(forms.ModelForm): class Meta: model = Sliver @@ -399,9 +458,9 @@ class TagAdmin(admin.ModelAdmin): class SliverAdmin(PlanetStackBaseAdmin): form = SliverForm fieldsets = [ - ('Sliver', {'fields': ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']}) + ('Sliver', {'fields': ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']}) ] - list_display = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork'] + list_display = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork'] inlines = [TagInline] def formfield_for_foreignkey(self, db_field, request, **kwargs): @@ -486,6 +545,7 @@ class UserCreationForm(forms.ModelForm): user.save() return user + class UserChangeForm(forms.ModelForm): """A form for updating users. Includes all the fields on the user, but replaces the password field with admin's @@ -502,6 +562,7 @@ class UserChangeForm(forms.ModelForm): # field does not have access to the initial value return self.initial["password"] + class UserAdmin(UserAdmin): class Meta: app_label = "core" @@ -544,14 +605,17 @@ class UserAdmin(UserAdmin): return super(UserAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) class ServiceResourceInline(admin.TabularInline): + exclude = ['enacted'] model = ServiceResource extra = 0 class ServiceClassAdmin(admin.ModelAdmin): + exclude = ['enacted'] list_display = ('name', 'commitment', 'membershipFee') inlines = [ServiceResourceInline] class ReservedResourceInline(admin.TabularInline): + exclude = ['enacted'] model = ReservedResource extra = 0 @@ -620,6 +684,7 @@ class ReservationAddRefreshForm(ReservationAddForm): return False class ReservationAdmin(admin.ModelAdmin): + exclude = ['enacted'] list_display = ('startTime', 'duration') inlines = [ReservedResourceInline] form = ReservationAddForm @@ -670,6 +735,53 @@ class ReservationAdmin(admin.ModelAdmin): else: return [] +class NetworkParameterTypeAdmin(admin.ModelAdmin): + exclude = ['enacted'] + list_display = ("name", ) + +class RouterAdmin(admin.ModelAdmin): + exclude = ['enacted'] + list_display = ("name", ) + +class RouterInline(admin.TabularInline): + # exclude = ['enacted'] + model = Router.networks.through + extra = 0 + verbose_name_plural = "Routers" + verbose_name = "Router" + +class NetworkParameterInline(generic.GenericTabularInline): + exclude = ['enacted'] + model = NetworkParameter + extra = 1 + verbose_name_plural = "Parameters" + verbose_name = "Parameter" + +class NetworkSliversInline(admin.TabularInline): + exclude = ['enacted'] + readonly_fields = ("ip", ) + model = NetworkSliver + extra = 0 + verbose_name_plural = "Slivers" + verbose_name = "Sliver" + +class NetworkSlicesInline(admin.TabularInline): + exclude = ['enacted'] + model = NetworkSlice + extra = 0 + verbose_name_plural = "Slices" + verbose_name = "Slice" + +class NetworkAdmin(admin.ModelAdmin): + exclude = ['enacted'] + list_display = ("name", "subnet", "ports", "labels") + readonly_fields = ("subnet", ) + inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline] + +class NetworkTemplateAdmin(admin.ModelAdmin): + exclude = ['enacted'] + list_display = ("name", "guaranteedBandwidth", "visibility") + # 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'], @@ -697,6 +809,12 @@ admin.site.register(Deployment, DeploymentAdmin) admin.site.register(Site, SiteAdmin) admin.site.register(Slice, SliceAdmin) admin.site.register(Project, ProjectAdmin) +admin.site.register(ServiceClass, ServiceClassAdmin) +admin.site.register(Reservation, ReservationAdmin) +admin.site.register(Network, NetworkAdmin) +admin.site.register(Router, RouterAdmin) +admin.site.register(NetworkParameterType, NetworkParameterTypeAdmin) +admin.site.register(NetworkTemplate, NetworkTemplateAdmin) if showAll: admin.site.register(Tag, TagAdmin) @@ -705,7 +823,5 @@ if showAll: 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)