from plstackapi.core.models import Site
from plstackapi.core.models import *
+from plstackapi.openstack.manager import OpenStackManager
from plstackapi.openstack.driver import OpenStackDriver
from plstackapi.openstack.client import OpenStackClient
class SliverInline(admin.TabularInline):
model = Sliver
- fields = ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']
+ fields = ['ip', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
extra = 0
class SiteInline(admin.TabularInline):
model = Site
extra = 0
+class SliceInline(admin.TabularInline):
+ model = Slice
+ extra = 0
+
+class UserInline(admin.TabularInline):
+ model = PLUser
+ extra = 0
+
+class RoleInline(admin.TabularInline):
+ model = Role
+ extra = 0
+
class NodeInline(admin.TabularInline):
model = Node
extra = 0
+class PlainTextWidget(forms.Widget):
+ def render(self, _name, value, attrs):
+ return mark_safe(value) if value is not None else ''
+
class PlanetStackBaseAdmin(admin.ModelAdmin):
save_on_top = False
+class OSModelAdmin(PlanetStackBaseAdmin):
+ """Attach client connection to openstack on delete() and save()"""
+
+ def save_model(self, request, obj, form, change):
+ auth = request.session.get('auth', {})
+ auth['tenant'] = request.user.site.login_base
+ obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
+ obj.save()
+
+ def delete_model(self, request, obj):
+ auth = request.session.get('auth', {})
+ auth['tenant'] = request.user.site.login_base
+ obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
+ obj.delete()
+
+class RoleAdmin(OSModelAdmin):
+ fieldsets = [
+ ('Role', {'fields': ['role_type']})
+ ]
+ list_display = ('role_type',)
+
+
class DeploymentNetworkAdminForm(forms.ModelForm):
sites = forms.ModelMultipleChoiceField(
queryset=Site.objects.all(),
form = DeploymentNetworkAdminForm
inlines = [NodeInline,]
-class SiteAdmin(admin.ModelAdmin):
+ 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
+ # give inline object access to driver and caller
+ client = OpenStackClient(tenant=request.user.site.login_base, **request.session.get('auth', {}))
+ inline.model.driver = OpenStackDriver(client=client)
+ inline.model.caller = request.user
+ yield inline.get_formset(request, obj)
+
+class SiteAdmin(OSModelAdmin):
fieldsets = [
(None, {'fields': ['name', 'site_url', 'enabled', 'is_public', 'login_base']}),
('Location', {'fields': ['latitude', 'longitude']}),
inlines = [NodeInline,]
search_fields = ['name']
-class KeyAdmin(admin.ModelAdmin):
+ 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
+ # give inline object access to driver and caller
+ auth = request.session.get('auth', {})
+ auth['tenant'] = request.user.site.login_base
+ inline.model.os_manager = OpenStackManager(auth=auth, caller=request.user)
+ yield inline.get_formset(request, obj)
+
+class SitePrivilegeAdmin(PlanetStackBaseAdmin):
+ fieldsets = [
+ (None, {'fields': ['user', 'site', 'role']})
+ ]
+ list_display = ('user', 'site', 'role')
+
+ def save_model(self, request, obj, form, change):
+ # update openstack connection to use this site/tenant
+ auth = request.session.get('auth', {})
+ auth['tenant'] = obj.site.login_base
+ obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
+ obj.save()
+
+ def delete_model(self, request, obj):
+ # update openstack connection to use this site/tenant
+ auth = request.session.get('auth', {})
+ auth['tenant'] = obj.site.login_base
+ obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
+ obj.delete()
+
+class KeyAdmin(OSModelAdmin):
fieldsets = [
('Key', {'fields': ['name', 'key', 'type', 'blacklisted', 'user']})
]
list_display = ['name', 'key', 'type', 'blacklisted', 'user']
+ def get_queryset(self, request):
+ # get keys user is allowed to see
+ qs = super(KeyAdmin, self).get_queryset(request)
+ if request.user.is_superuser:
+ return qs
+ # users can only see their own keys
+ return qs.filter(user=request.user)
+
+
+class SliceAdmin(OSModelAdmin):
+ fields = ['name', 'site', 'serviceClass', 'instantiation', 'description', 'slice_url']
+ list_display = ('name', 'site','serviceClass', 'slice_url', 'instantiation')
+ inlines = [SliverInline]
+
+ 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
+ # 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)
+ yield inline.get_formset(request, obj)
+
+ def get_queryset(self, request):
+ qs = super(SliceAdmin, self).get_queryset(request)
+ if request.user.is_superuser:
+ return qs
+ # users can only see slices at their site
+ return qs.filter(site=request.user.site)
+
+class SliceMembershipAdmin(PlanetStackBaseAdmin):
+ fieldsets = [
+ (None, {'fields': ['user', 'slice', 'role']})
+ ]
+ list_display = ('user', 'slice', 'role')
+
def save_model(self, request, obj, form, change):
- # attach the caller's openstack clien connection to the object
- client = OpenStackClient(tenant=request.user.site.login_base, **request.session.get('auth', {}))
- obj.driver = OpenStackDriver(client=client)
+ # update openstack connection to use this site/tenant
+ auth = request.session.get('auth', {})
+ auth['tenant'] = obj.slice.name
+ obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
obj.save()
def delete_model(self, request, obj):
- client = OpenStackClient(tenant=request.user.site.login_base, **request.session.get('auth', {}))
- obj.driver = OpenStackDriver(client=client)
+ # update openstack connection to use this site/tenant
+ auth = request.session.get('auth', {})
+ auth['tenant'] = obj.slice.name
+ obj.os_manager = OpenStackManager(auth=auth, caller=request.user)
obj.delete()
-class SliceAdmin(PlanetStackBaseAdmin):
- fields = ['name', 'site', 'instantiation', 'description', 'slice_url']
- list_display = ('name', 'site','slice_url', 'instantiation')
- inlines = [SliverInline]
-class SubnetAdmin(admin.ModelAdmin):
+class SubnetAdmin(PlanetStackBaseAdmin):
fields = ['cidr', 'ip_version', 'start', 'end', 'slice']
- list_display = ('slice','cidr', 'start', 'end', 'ip_version' )
+ list_display = ('slice','cidr', 'start', 'end', 'ip_version')
+
+ def save_model(self, request, obj, form, change):
+ # update openstack connection to use this subnet's slice/tenant
+ client = OpenStackClient(tenant=obj.slice.name, **request.session.get('auth', {}))
+ obj.driver = OpenStackDriver(client=client)
+ obj.caller = request.user
+ obj.save()
+
+ def delete_model(self, request, obj):
+ # update openstack connection to use this subnet's slice/tenant
+ client = OpenStackClient(tenant=obj.slice.name, **request.session.get('auth', {}))
+ obj.driver = OpenStackDriver(client=client)
+ obj.caller = request.user
+ obj.delete()
class ImageAdmin(admin.ModelAdmin):
fields = ['image_id', 'name', 'disk_format', 'container_format']
list_display = ('name', 'site', 'deploymentNetwork')
list_filter = ('deploymentNetwork',)
-class RoleAdmin(admin.ModelAdmin):
- fieldsets = [
- ('Role', {'fields': ['role_type']})
- ]
- list_display = ('role_type',)
-
-class PlainTextWidget(forms.Widget):
- def render(self, _name, value, attrs):
- return mark_safe(value) if value is not None else ''
class SliverForm(forms.ModelForm):
class Meta:
'ip': PlainTextWidget(),
}
-class SliverAdmin(admin.ModelAdmin):
+class SliverAdmin(PlanetStackBaseAdmin):
form = SliverForm
fieldsets = [
- ('Sliver', {'fields': ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']})
+ ('Sliver', {'fields': ['ip', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']})
]
- list_display = ['ip', 'name', 'slice', 'flavor', 'image', 'key', 'node', 'deploymentNetwork']
+ list_display = ['ip', 'name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
+
+ def save_model(self, request, obj, form, change):
+ # update openstack connection to use this sliver's slice/tenant
+ client = OpenStackClient(tenant=obj.slice.name, **request.session.get('auth', {}))
+ obj.driver = OpenStackDriver(client=client)
+ obj.caller = request.user
+ obj.save()
+
+ def delete_model(self, request, obj):
+ # update openstack connection to use this sliver's slice/tenant
+ client = OpenStackClient(tenant=obj.slice.name, **request.session.get('auth', {}))
+ obj.driver = OpenStackDriver(client=client)
+ obj.caller = request.user
+ obj.delete()
+
class UserCreationForm(forms.ModelForm):
"""A form for creating new users. Includes all the required
def save(self, commit=True):
# Save the provided password in hashed format
user = super(UserCreationForm, self).save(commit=False)
- user.set_password(self.cleaned_data["password1"])
+ user.password = self.cleaned_data["password1"]
+ #user.set_password(self.cleaned_data["password1"])
if commit:
user.save()
return user
return self.initial["password"]
-class PLUserAdmin(UserAdmin):
+class PLUserAdmin(UserAdmin, OSModelAdmin):
class Meta:
app_label = "core"
admin.site.unregister(Group)
admin.site.register(Site, SiteAdmin)
-admin.site.register(SitePrivilege)
+admin.site.register(SitePrivilege, SitePrivilegeAdmin)
admin.site.register(Slice, SliceAdmin)
-admin.site.register(SliceMembership)
+admin.site.register(SliceMembership, SliceMembershipAdmin)
admin.site.register(Subnet, SubnetAdmin)
admin.site.register(Image, ImageAdmin)
admin.site.register(Node, NodeAdmin)
admin.site.register(Sliver, SliverAdmin)
-admin.site.register(Flavor)
admin.site.register(Key, KeyAdmin)
admin.site.register(Role, RoleAdmin)
admin.site.register(DeploymentNetwork, DeploymentNetworkAdmin)
git://git.onelab.eu / plstackapi.git / blobdiff