X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=ffa21d9de3f56e06f9e007eb1bdcb96a73b97882;hb=1ae8aaa726bdad9ca4982dc19b482e72f104d169;hp=cd0e5dd99efe3d568ae064776a1812f1deee2d97;hpb=8a70eb925a6bcbba56ac4b0b02383c2bb6371d67;p=plstackapi.git diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index cd0e5dd..ffa21d9 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -7,7 +7,7 @@ from django.contrib.auth.models import Group from django import forms from django.utils.safestring import mark_safe from django.contrib.auth.admin import UserAdmin -from django.contrib.admin.widgets import FilteredSelectMultiple +from django.contrib.admin.widgets import FilteredSelectMultiple, AdminTextareaWidget from django.contrib.auth.forms import ReadOnlyPasswordHashField, AdminPasswordChangeForm from django.contrib.auth.signals import user_logged_in from django.utils import timezone @@ -15,6 +15,9 @@ from django.contrib.contenttypes import generic from suit.widgets import LinkedSelect from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse, NoReverseMatch +from django.utils.encoding import force_text, python_2_unicode_compatible +from django.utils.html import conditional_escape, format_html +from django.forms.utils import flatatt, to_current_timezone from cgi import escape as html_escape import django_evolution @@ -40,6 +43,17 @@ def backend_text(obj): else: return "%s %s" % (icon, html_escape(obj.backend_status, quote=True)) +class UploadTextareaWidget(AdminTextareaWidget): + def render(self, name, value, attrs=None): + if value is None: + value = '' + final_attrs = self.build_attrs(attrs, name=name) + return format_html('' \ + '' \ + '
\r\n{1}' % (attrs["id"], attrs["id"], attrs["id"]), + flatatt(final_attrs), + force_text(value)) + class PlainTextWidget(forms.HiddenInput): input_type = 'hidden' @@ -380,15 +394,15 @@ class NodeInline(PlStackTabularInline): fields = ['backend_status_icon', 'name','deployment','site'] readonly_fields = ('backend_status_icon', ) -class DeploymentPrivilegeInline(PlStackTabularInline): - model = DeploymentPrivilege +class ControllerPrivilegeInline(PlStackTabularInline): + model = ControllerPrivilege extra = 0 - suit_classes = 'suit-tab suit-tab-deploymentprivileges' - fields = ['backend_status_icon', 'user','role','deployment'] + suit_classes = 'suit-tab suit-tab-admin-only' + fields = ['backend_status_icon', 'user','role','controller'] readonly_fields = ('backend_status_icon', ) def queryset(self, request): - return DeploymentPrivilege.select_by_user(request.user) + return ControllerPrivilege.select_by_user(request.user) class SitePrivilegeInline(PlStackTabularInline): model = SitePrivilege @@ -408,8 +422,8 @@ class SitePrivilegeInline(PlStackTabularInline): def queryset(self, request): return SitePrivilege.select_by_user(request.user) -class SiteDeploymentInline(PlStackTabularInline): - model = SiteDeployment +class SiteDeploymentsInline(PlStackTabularInline): + model = SiteDeployments extra = 0 suit_classes = 'suit-tab suit-tab-deployments' fields = ['backend_status_icon', 'deployment','site'] @@ -421,10 +435,28 @@ class SiteDeploymentInline(PlStackTabularInline): if db_field.name == 'deployment': kwargs['queryset'] = Deployment.select_by_user(request.user) - return super(SiteDeploymentInline, self).formfield_for_foreignkey(db_field, request, **kwargs) + return super(SiteDeploymentsInline, self).formfield_for_foreignkey(db_field, request, **kwargs) + + def queryset(self, request): + return SiteDeployments.select_by_user(request.user) + +class ControllerSitesInline(PlStackTabularInline): + model = ControllerSites + extra = 0 + suit_classes = 'suit-tab suit-tab-admin-only' + fields = ['backend_status_icon', 'controller','site'] + readonly_fields = ('backend_status_icon', ) + + def formfield_for_foreignkey(self, db_field, request, **kwargs): + if db_field.name == 'site': + kwargs['queryset'] = Site.select_by_user(request.user) + + if db_field.name == 'controller': + kwargs['queryset'] = Controller.select_by_user(request.user) + return super(ControllerSitesInline, self).formfield_for_foreignkey(db_field, request, **kwargs) def queryset(self, request): - return SiteDeployment.select_by_user(request.user) + return ControllerSites.select_by_user(request.user) class SlicePrivilegeInline(PlStackTabularInline): @@ -455,13 +487,22 @@ class SliceNetworkInline(PlStackTabularInline): fields = ['backend_status_icon', 'network'] readonly_fields = ('backend_status_icon', ) -class ImageDeploymentInline(PlStackTabularInline): - model = ImageDeployment +class ImageDeploymentsInline(PlStackTabularInline): + model = ImageDeployments extra = 0 verbose_name = "Image Deployments" verbose_name_plural = "Image Deployments" suit_classes = 'suit-tab suit-tab-imagedeployments' - fields = ['backend_status_icon', 'image', 'deployment', 'glance_image_id'] + fields = ['backend_status_icon', 'image', 'deployment'] + readonly_fields = ['backend_status_icon'] + +class ControllerImagesInline(PlStackTabularInline): + model = ControllerImages + extra = 0 + verbose_name = "Controller Images" + verbose_name_plural = "Controller Images" + suit_classes = 'suit-tab suit-tab-admin-only' + fields = ['backend_status_icon', 'image', 'controller', 'glance_image_id'] readonly_fields = ['backend_status_icon', 'glance_image_id'] class SliceRoleAdmin(PlanetStackBaseAdmin): @@ -508,8 +549,8 @@ class DeploymentAdminForm(forms.ModelForm): self.fields['accessControl'].initial = "allow site " + request.user.site.name if self.instance and self.instance.pk: - self.fields['sites'].initial = [x.site for x in self.instance.sitedeployments_set.all()] - self.fields['images'].initial = [x.image for x in self.instance.imagedeployments_set.all()] + self.fields['sites'].initial = [x.site for x in self.instance.sitedeployments.all()] + self.fields['images'].initial = [x.image for x in self.instance.imagedeployments.all()] self.fields['flavors'].initial = self.instance.flavors.all() def manipulate_m2m_objs(self, this_obj, selected_objs, all_relations, relation_class, local_attrname, foreign_attrname): @@ -560,8 +601,8 @@ class DeploymentAdminForm(forms.ModelForm): # create/destroy the through models ourselves. There has to be # a better way... - self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments_set.all(), SiteDeployment, "deployment", "site") - self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments_set.all(), ImageDeployment, "deployment", "image") + self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments.all(), SiteDeployments, "deployment", "site") + self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments.all(), ControllerImages, "deployment", "image") self.save_m2m() @@ -580,7 +621,7 @@ class DeploymentAdmin(PlanetStackBaseAdmin): model = Deployment fieldList = ['backend_status_text', 'name', 'availability_zone', 'sites', 'images', 'flavors', 'accessControl'] fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})] - inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentInline] + inlines = [ControllerPrivilegeInline,NodeInline,TagInline] # ,ControllerImagesInline] list_display = ['backend_status_icon', 'name'] list_display_links = ('backend_status_icon', 'name', ) readonly_fields = ('backend_status_text', ) @@ -647,7 +688,7 @@ class SiteAdmin(PlanetStackBaseAdmin): list_display = ('backend_status_icon', 'name', 'login_base','site_url', 'enabled') list_display_links = ('backend_status_icon', 'name', ) filter_horizontal = ('deployments',) - inlines = [SliceInline,UserInline,TagInline, NodeInline, SitePrivilegeInline, SiteDeploymentInline] + inlines = [SliceInline,UserInline,TagInline, NodeInline, SitePrivilegeInline, SiteDeploymentsInline] search_fields = ['name'] def queryset(self, request): @@ -748,13 +789,13 @@ class SliceForm(forms.ModelForm): raise forms.ValidationError('slice name must begin with %s' % site.login_base) return cleaned_data -class SliceDeploymentInline(PlStackTabularInline): - model = SliceDeployment +class ControllerSlicesInline(PlStackTabularInline): + model = ControllerSlices extra = 0 - verbose_name = "Slice Deployment" - verbose_name_plural = "Slice Deployments" + verbose_name = "Controller Slices" + verbose_name_plural = "Controller Slices" suit_classes = 'suit-tab suit-tab-admin-only' - fields = ['backend_status_icon', 'deployment', 'tenant_id'] + fields = ['backend_status_icon', 'controller', 'tenant_id'] readonly_fields = ('backend_status_icon', ) class SliceAdmin(PlanetStackBaseAdmin): @@ -765,7 +806,7 @@ class SliceAdmin(PlanetStackBaseAdmin): list_display = ('backend_status_icon', 'name', 'site','serviceClass', 'slice_url', 'max_slivers') list_display_links = ('backend_status_icon', 'name', ) inlines = [SlicePrivilegeInline,SliverInline, TagInline, ReservationInline,SliceNetworkInline] - admin_inlines = [SliceDeploymentInline] + admin_inlines = [ControllerSlicesInline] user_readonly_fields = fieldList @@ -807,10 +848,10 @@ class SliceAdmin(PlanetStackBaseAdmin): for deployment in flavor.deployments.all(): deployment_flavors.append( (deployment.id, flavor.id, flavor.name) ) - deployment_images = [] + controller_images = [] for image in Image.objects.all(): - for imageDeployment in image.imagedeployments_set.all(): - deployment_images.append( (imageDeployment.deployment.id, image.id, image.name) ) + for controller_image in image.controllerimages.all(): + controller_images.append( (controller_image.controller.id, image.id, image.name) ) site_login_bases = [] for site in Site.objects.all(): @@ -890,9 +931,9 @@ class ImageAdmin(PlanetStackBaseAdmin): ] readonly_fields = ('backend_status_text', ) - suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments')) + suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'), ('controllerimages', 'Controllers')) - inlines = [SliverInline, ImageDeploymentInline] + inlines = [SliverInline, ControllerImagesInline] user_readonly_fields = ['name', 'disk_format', 'container_format'] @@ -1041,6 +1082,7 @@ class UserChangeForm(forms.ModelForm): class Meta: model = User + widgets = { 'public_key': UploadTextareaWidget, } def clean_password(self): # Regardless of what the user provides, return the initial value. @@ -1070,7 +1112,7 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin): # that reference specific fields on auth.User. list_display = ('email', 'firstname', 'lastname', 'site', 'last_login') list_filter = ('site',) - inlines = [SlicePrivilegeInline,SitePrivilegeInline,DeploymentPrivilegeInline,UserDashboardViewInline] + inlines = [SlicePrivilegeInline,SitePrivilegeInline,ControllerPrivilegeInline,UserDashboardViewInline] fieldListLoginDetails = ['backend_status_text', 'email','site','password','is_active','is_readonly','is_admin','public_key'] fieldListContactInfo = ['firstname','lastname','phone','timezone'] @@ -1103,7 +1145,7 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin): ('contact','Contact Information'), ('sliceprivileges','Slice Privileges'), ('siteprivileges','Site Privileges'), - ('deploymentprivileges','Deployment Privileges'), + ('controllerprivileges','Controller Privileges'), ('dashboards','Dashboard Views')) def formfield_for_foreignkey(self, db_field, request, **kwargs): @@ -1324,25 +1366,39 @@ class NetworkSlicesInline(PlStackTabularInline): fields = ['backend_status_icon', 'network','slice'] readonly_fields = ('backend_status_icon', ) -class NetworkDeploymentsInline(PlStackTabularInline): - model = NetworkDeployments +class ControllerNetworksInline(PlStackTabularInline): + model = ControllerNetworks extra = 0 - verbose_name_plural = "Network Deployments" - verbose_name = "Network Deployment" + verbose_name_plural = "Controller Networks" + verbose_name = "Controller Network" suit_classes = 'suit-tab suit-tab-admin-only' - fields = ['backend_status_icon', 'deployment','net_id','subnet_id'] + fields = ['backend_status_icon', 'controller','net_id','subnet_id'] readonly_fields = ('backend_status_icon', ) +class NetworkForm(forms.ModelForm): + class Meta: + model = Network + widgets = { + 'topologyParameters': UploadTextareaWidget, + 'controllerParameters': UploadTextareaWidget, + } + class NetworkAdmin(PlanetStackBaseAdmin): list_display = ("backend_status_icon", "name", "subnet", "ports", "labels") list_display_links = ('backend_status_icon', 'name', ) readonly_fields = ("subnet", ) inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline] - admin_inlines = [NetworkDeploymentsInline] + admin_inlines = [ControllerNetworksInline] + + form=NetworkForm fieldsets = [ - (None, {'fields': ['backend_status_text', 'name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'], 'classes':['suit-tab suit-tab-general']}),] + (None, {'fields': ['backend_status_text', 'name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'], + 'classes':['suit-tab suit-tab-general']}), + (None, {'fields': ['topologyParameters', 'controllerUrl', 'controllerParameters'], + 'classes':['suit-tab suit-tab-sdn']}), + ] readonly_fields = ('backend_status_text', ) user_readonly_fields = ['name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'] @@ -1350,6 +1406,7 @@ class NetworkAdmin(PlanetStackBaseAdmin): @property def suit_form_tabs(self): tabs=[('general','Network Details'), + ('sdn', 'SDN Configuration'), ('netparams', 'Parameters'), ('networkslivers','Slivers'), ('networkslices','Slices'), @@ -1368,6 +1425,10 @@ class NetworkTemplateAdmin(PlanetStackBaseAdmin): list_display_links = ('backend_status_icon', 'name', ) user_readonly_fields = ["name", "guaranteedBandwidth", "visibility"] user_readonly_inlines = [] + fieldsets = [ + (None, {'fields': ['name', 'description', 'guaranteedBandwidth', 'visibility', 'translation', 'sharedNetworkName', 'sharedNetworkId', 'topologyKind', 'controllerKind'], + 'classes':['suit-tab suit-tab-general']}),] + suit_form_tabs = (('general','Network Template Details'), ) class FlavorAdmin(PlanetStackBaseAdmin): list_display = ("backend_status_icon", "name", "flavor", "order", "default") @@ -1510,6 +1571,7 @@ from django_evolution.models import Version, Evolution showAll = False admin.site.register(Deployment, DeploymentAdmin) +admin.site.register(Controller, ControllerAdmin) admin.site.register(Site, SiteAdmin) admin.site.register(Slice, SliceAdmin) admin.site.register(Service, ServiceAdmin) @@ -1525,7 +1587,7 @@ if True: admin.site.register(ServiceClass, ServiceClassAdmin) #admin.site.register(PlanetStack) admin.site.register(Tag, TagAdmin) - admin.site.register(DeploymentRole) + admin.site.register(ControllerRole) admin.site.register(SiteRole) admin.site.register(SliceRole) admin.site.register(PlanetStackRole)