Decomposed models.py into models/ with individual files per topic. Added new admin views, consolidated/reverted views back to Generics, adjusted modeling of Site<->DeploymentNetwork to remove SiteDeploymentNetwork object
diff --git a/plstackapi/core/admin.py b/plstackapi/core/admin.py
index c3b655f..36c1bf9 100644
--- a/plstackapi/core/admin.py
+++ b/plstackapi/core/admin.py
@@ -1,18 +1,113 @@
+from plstackapi.core.models import Site
from plstackapi.core.models import *
from django.contrib import admin
+from django import forms
from django.contrib.auth.admin import UserAdmin
-from django.contrib.auth.models import User
+from django.contrib.admin.widgets import FilteredSelectMultiple
-admin.site.register(Role)
-admin.site.register(Site)
-#admin.site.register(User)
-admin.site.register(Key)
-admin.site.register(Slice)
-admin.site.register(Node)
-admin.site.register(DeploymentNetwork)
-admin.site.register(SiteDeploymentNetwork)
+
+class ReadonlyTabularInline(admin.TabularInline):
+ can_delete = False
+ extra = 0
+ editable_fields = []
+
+ def get_readonly_fields(self, request, obj=None):
+ fields = []
+ for field in self.model._meta.get_all_field_names():
+ if (not field == 'id'):
+ if (field not in self.editable_fields):
+ fields.append(field)
+ return fields
+
+ def has_add_permission(self, request):
+ return False
+
+class SliverInline(admin.TabularInline):
+ model = Sliver
+ extra = 0
+
+class SiteInline(admin.TabularInline):
+ model = Site
+ extra = 0
+
+class NodeInline(admin.TabularInline):
+ model = Node
+ extra = 0
+
+class PlanetStackBaseAdmin(admin.ModelAdmin):
+ save_on_top = False
+
+class DeploymentNetworkAdminForm(forms.ModelForm):
+ sites = forms.ModelMultipleChoiceField(
+ queryset=Site.objects.all(),
+ required=False,
+ widget=FilteredSelectMultiple(
+ verbose_name=('Sites'), is_stacked=False
+ )
+ )
+ class Meta:
+ model = DeploymentNetwork
+
+ def __init__(self, *args, **kwargs):
+ super(DeploymentNetworkAdminForm, 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)
+
+ if commit:
+ deploymentNetwork.save()
+
+ if deploymentNetwork.pk:
+ deploymentNetwork.sites = self.cleaned_data['sites']
+ self.save_m2m()
+
+ return deploymentNetwork
+
+class DeploymentNetworkAdmin(PlanetStackBaseAdmin):
+ form = DeploymentNetworkAdminForm
+ inlines = [NodeInline,]
+
+class SiteAdmin(admin.ModelAdmin):
+ fieldsets = [
+ (None, {'fields': ['name', 'site_url', 'enabled', 'is_public', 'login_base']}),
+ ('Location', {'fields': ['latitude', 'longitude']}),
+ ('Deployment Networks', {'fields': ['deployments']})
+ ]
+ list_display = ('name', 'login_base','site_url', 'enabled')
+ filter_horizontal = ('deployments',)
+ inlines = [NodeInline,]
+ search_fields = ['name']
+
+class SliceAdmin(PlanetStackBaseAdmin):
+ fields = ['name', 'site', 'instantiation', 'description', 'slice_url']
+ list_display = ('name', 'site','slice_url', 'instantiation')
+ inlines = [SliverInline]
+
+class SubnetAdmin(admin.ModelAdmin):
+ fields = ['cidr', 'ip_version', 'start', 'end', 'slice']
+
+class ImageAdmin(admin.ModelAdmin):
+ fields = ['image_id', 'name', 'disk_format', 'container_format']
+
+class NodeAdmin(admin.ModelAdmin):
+ list_display = ('name', 'site', 'deploymentNetwork')
+ list_filter = ('deploymentNetwork',)
+
+admin.site.register(Site, SiteAdmin)
+admin.site.register(SitePrivilege)
+admin.site.register(Slice, SliceAdmin)
+admin.site.register(SliceMembership)
+admin.site.register(Subnet, SubnetAdmin)
+admin.site.register(Image, ImageAdmin)
+admin.site.register(Node, NodeAdmin)
admin.site.register(Sliver)
-admin.site.register(Image)
admin.site.register(Flavor)
+admin.site.register(Key)
+admin.site.register(Role)
+admin.site.register(User)
+admin.site.register(DeploymentNetwork, DeploymentNetworkAdmin)