from django.contrib.auth.forms import ReadOnlyPasswordHashField
from django.contrib.auth.signals import user_logged_in
from django.utils import timezone
+from django.contrib.contenttypes import generic
+
import django_evolution
+class PlStackTabularInline(admin.TabularInline):
+ exclude = ['enacted']
-class ReadonlyTabularInline(admin.TabularInline):
+class ReadonlyTabularInline(PlStackTabularInline):
can_delete = False
extra = 0
editable_fields = []
def has_add_permission(self, request):
return False
-class SliverInline(admin.TabularInline):
+class TagInline(generic.GenericTabularInline):
+ model = Tag
+ exclude = ['enacted']
+ extra = 1
+
+class SliverInline(PlStackTabularInline):
model = Sliver
fields = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']
extra = 0
readonly_fields = ['ip', 'instance_name']
-class SiteInline(admin.TabularInline):
+class SiteInline(PlStackTabularInline):
model = Site
extra = 0
-class UserInline(admin.TabularInline):
+class UserInline(PlStackTabularInline):
model = User
fields = ['email', 'firstname', 'lastname']
extra = 0
-class SliceInline(admin.TabularInline):
+class SliceInline(PlStackTabularInline):
model = Slice
extra = 0
-class RoleInline(admin.TabularInline):
+class RoleInline(PlStackTabularInline):
model = Role
extra = 0
-class NodeInline(admin.TabularInline):
+class NodeInline(PlStackTabularInline):
model = Node
extra = 0
-class SitePrivilegeInline(admin.TabularInline):
+class SitePrivilegeInline(PlStackTabularInline):
model = SitePrivilege
extra = 0
kwargs['queryset'] = users
return super(SitePrivilegeInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
-class SliceMembershipInline(admin.TabularInline):
+class SliceMembershipInline(PlStackTabularInline):
model = SliceMembership
extra = 0
+ fields = ('user', 'role')
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'slice':
return super(SliceMembershipInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
-class SliceTagInline(admin.TabularInline):
+class SliceTagInline(PlStackTabularInline):
model = SliceTag
extra = 0
class PlanetStackBaseAdmin(admin.ModelAdmin):
save_on_top = False
+ exclude = ['enacted']
class RoleAdmin(PlanetStackBaseAdmin):
fieldsets = [
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')
filter_horizontal = ('deployments',)
- inlines = [NodeInline, UserInline, SitePrivilegeInline]
+ inlines = [TagInline, NodeInline, UserInline, SitePrivilegeInline]
search_fields = ['name']
def queryset(self, request):
# 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
+ if obj is None:
+ continue
+ if isinstance(inline, SliverInline):
+ inline.model.caller = request.user
yield inline.get_formset(request, obj)
class SitePrivilegeAdmin(PlanetStackBaseAdmin):
qs = qs.filter(site__in=sites)
return qs
-class SliceAdmin(OSModelAdmin):
+class SliceAdmin(PlanetStackBaseAdmin):
fields = ['name', 'site', 'serviceClass', 'description', 'slice_url']
list_display = ('name', 'site','serviceClass', 'slice_url')
- inlines = [SliverInline, SliceMembershipInline, SliceTagInline]
+ inlines = [SliverInline, SliceMembershipInline, TagInline, SliceTagInline]
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'site':
# hide MyInline in the add view
if obj is None:
continue
- # give inline object access to driver and caller
- auth = request.session.get('auth', {})
- auth['tenant'] = obj.name # meed to connect using slice's tenant
- inline.model.os_manager = OpenStackManager(auth=auth, caller=request.user)
- inline.model.creator = request.user
+ if isinstance(inline, SliverInline):
+ inline.model.caller = request.user
yield inline.get_formset(request, obj)
def get_queryset(self, request):
if request.user.is_superuser:
return qs
# users can only see slices at their site
- return qs.filter(site=request.user.site)
+ return qs.filter(site=request.user.site)
+
+ def save_model(self, request, obj, form, change):
+ # update openstack connection to use this site/tenant
+ obj.caller = request.user
+ obj.save()
class SliceMembershipAdmin(PlanetStackBaseAdmin):
fieldsets = [
class NodeAdmin(admin.ModelAdmin):
list_display = ('name', 'site', 'deployment')
list_filter = ('deployment',)
+ inlines = [TagInline]
class SliverForm(forms.ModelForm):
'instance_name': PlainTextWidget(),
}
+class ProjectAdmin(admin.ModelAdmin):
+ exclude = ['enacted']
+
+class TagAdmin(admin.ModelAdmin):
+ exclude = ['enacted']
+
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):
if db_field.name == 'slice':
return self.initial["password"]
-class UserAdmin(UserAdmin, OSModelAdmin):
+class UserAdmin(UserAdmin):
class Meta:
app_label = "core"
return super(ReservationAdmin, self).changelist_view(request, extra_context)
def get_form(self, request, obj=None, **kwargs):
- request._obj_ = obj\r
- if obj is not None:\r
- # For changes, set request._slice to the slice already set in the\r
- # object.\r
- request._slice = obj.slice\r
- self.form = ReservationChangeForm\r
- else:\r
- if getattr(request, "_refresh", False):\r
- self.form = ReservationAddRefreshForm\r
- else:\r
- self.form = ReservationAddForm\r
- return super(ReservationAdmin, self).get_form(request, obj, **kwargs)\r
-\r
+ 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):\r
- # Prevent slice from being changed after the reservation has been\r
- # created.\r
- return ['slice']\r
- else:\r
+ 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
admin.site.register(Deployment, DeploymentAdmin)
admin.site.register(Site, SiteAdmin)
admin.site.register(Slice, SliceAdmin)
-#admin.site.register(Subnet)
-
+admin.site.register(Project, ProjectAdmin)
if showAll:
+ admin.site.register(Tag, TagAdmin)
admin.site.register(Node, NodeAdmin)
admin.site.register(SliceMembership, SliceMembershipAdmin)
admin.site.register(SitePrivilege, SitePrivilegeAdmin)
git://git.onelab.eu / plstackapi.git / blobdiff