X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=436543d8a4754fd1ef5b065b39a4d1145fd846c7;hb=2ae2a5f67ffd9ce4176033d9182e79fc18cd957d;hp=d1f6f8659906f1c7fea4e801a4c0d3d528ee60a3;hpb=63d1a55aebd5e370a64576dd576dac4ce27dde20;p=plstackapi.git diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index d1f6f86..436543d 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -7,24 +7,52 @@ 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.auth.forms import ReadOnlyPasswordHashField +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 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 - -def backend_icon(value): - if value == "": - return "" - elif value == "Provisioning in progress": - return '' +import threading + +# thread locals necessary to work around a django-suit issue +_thread_locals = threading.local() + +def backend_icon(obj): # backend_status, enacted, updated): + #return "%s %s %s" % (str(obj.updated), str(obj.enacted), str(obj.backend_status)) + if (obj.enacted is not None) and obj.enacted >= obj.updated: + return '' + else: + if obj.backend_status == "Provisioning in progress" or obj.backend_status=="": + return '' % obj.backend_status else: - return '' + return '' % html_escape(obj.backend_status, quote=True) + +def backend_text(obj): + icon = backend_icon(obj) + if (obj.enacted is not None) and obj.enacted >= obj.updated: + return "%s %s" % (icon, "successfully enacted") + 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' @@ -34,15 +62,8 @@ class PlainTextWidget(forms.HiddenInput): value = '' return mark_safe(str(value) + super(PlainTextWidget, self).render(name, value, attrs)) -class BackendStatusIconWidget(forms.Widget): - def render(self, name, value, attrs=None): - return mark_safe('
%s
' % (value, backend_icon(value))) - -class BackendStatusFullWidget(forms.Widget): - def render(self, name, value, attrs=None): - return mark_safe('%s %s' % (backend_icon(value), value)) - -class ReadOnlyAwareAdmin(admin.ModelAdmin): +class PermissionCheckingAdminMixin(object): + # call save_by_user and delete_by_user instead of save and delete def has_add_permission(self, request, obj=None): return (not self.__user_is_readonly(request)) @@ -52,13 +73,42 @@ class ReadOnlyAwareAdmin(admin.ModelAdmin): def save_model(self, request, obj, form, change): if self.__user_is_readonly(request): + # this 'if' might be redundant if save_by_user is implemented right raise PermissionDenied - #pass - else: - return super(ReadOnlyAwareAdmin, self).save_model(request, obj, form, change) + + obj.caller = request.user + # update openstack connection to use this site/tenant + obj.save_by_user(request.user) + + def delete_model(self, request, obj): + obj.delete_by_user(request.user) + + def save_formset(self, request, form, formset, change): + instances = formset.save(commit=False) + for instance in instances: + instance.save_by_user(request.user) + + # BUG in django 1.7? Objects are not deleted by formset.save if + # commit is False. So let's delete them ourselves. + # + # code from forms/models.py save_existing_objects() + try: + forms_to_delete = formset.deleted_forms + except AttributeError: + forms_to_delete = [] + if formset.initial_forms: + for form in formset.initial_forms: + obj = form.instance + if form in forms_to_delete: + if obj.pk is None: + continue + formset.deleted_objects.append(obj) + obj.delete() + + formset.save_m2m() def get_actions(self,request): - actions = super(ReadOnlyAwareAdmin,self).get_actions(request) + actions = super(PermissionCheckingAdminMixin,self).get_actions(request) if self.__user_is_readonly(request): if 'delete_selected' in actions: @@ -84,35 +134,50 @@ class ReadOnlyAwareAdmin(admin.ModelAdmin): self.inlines = self.inlines_save try: - return super(ReadOnlyAwareAdmin, self).change_view(request, object_id, extra_context=extra_context) + return super(PermissionCheckingAdminMixin, self).change_view(request, object_id, extra_context=extra_context) except PermissionDenied: pass if request.method == 'POST': raise PermissionDenied request.readonly = True - return super(ReadOnlyAwareAdmin, self).change_view(request, object_id, extra_context=extra_context) + return super(PermissionCheckingAdminMixin, self).change_view(request, object_id, extra_context=extra_context) def __user_is_readonly(self, request): return request.user.isReadOnlyUser() - def formfield_for_dbfield(self, db_field, **kwargs): - if (db_field.name == 'backend_status'): - kwargs['widget'] = BackendStatusFullWidget(attrs={"title": "foo"}) - result = super(ReadOnlyAwareAdmin, self).formfield_for_dbfield(db_field, **kwargs) - - if (db_field.name == 'backend_status'): - result.required = False - - return result + def backend_status_text(self, obj): + return mark_safe(backend_text(obj)) def backend_status_icon(self, obj): - if hasattr(obj, 'backend_status'): - value = obj.backend_status - return mark_safe('
%s
' % (value, backend_icon(value))) - else: - return "" + return mark_safe(backend_icon(obj)) backend_status_icon.short_description = "" + def get_form(self, request, obj=None, **kwargs): + # Save obj and request in thread-local storage, so suit_form_tabs can + # use it to determine whether we're in edit or add mode, and can + # determine whether the user is an admin. + _thread_locals.request = request + _thread_locals.obj = obj + return super(PermissionCheckingAdminMixin, self).get_form(request, obj, **kwargs) + + def get_inline_instances(self, request, obj=None): + inlines = super(PermissionCheckingAdminMixin, self).get_inline_instances(request, obj) + + # inlines that should only be shown to an admin user + if request.user.is_admin: + for inline_class in getattr(self, "admin_inlines", []): + inlines.append(inline_class(self.model, self.admin_site)) + + return inlines + +class ReadOnlyAwareAdmin(PermissionCheckingAdminMixin, admin.ModelAdmin): + # Note: Make sure PermissionCheckingAdminMixin is listed before + # admin.ModelAdmin in the class declaration. + + pass + +class PlanetStackBaseAdmin(ReadOnlyAwareAdmin): + save_on_top = False class SingletonAdmin (ReadOnlyAwareAdmin): def has_add_permission(self, request): @@ -125,7 +190,6 @@ class SingletonAdmin (ReadOnlyAwareAdmin): else: return True - class PlStackTabularInline(admin.TabularInline): def __init__(self, *args, **kwargs): super(PlStackTabularInline, self).__init__(*args, **kwargs) @@ -204,17 +268,9 @@ class PlStackTabularInline(admin.TabularInline): readonly_fields.append(field) return readonly_fields - def formfield_for_dbfield(self, db_field, **kwargs): - if (db_field.name == 'backend_status'): - kwargs['widget'] = BackendStatusIconWidget() - - result = super(PlStackTabularInline, self).formfield_for_dbfield(db_field, **kwargs) - - if (db_field.name == 'backend_status'): - result.label = "" - result.required = False - - return result + def backend_status_icon(self, obj): + return mark_safe(backend_icon(obj)) + backend_status_icon.short_description = "" class PlStackGenericTabularInline(generic.GenericTabularInline): def has_add_permission(self, request): @@ -228,6 +284,10 @@ class PlStackGenericTabularInline(generic.GenericTabularInline): readonly_fields.append(field) return readonly_fields + def backend_status_icon(self, obj): + return mark_safe(backend_icon(obj)) + backend_status_icon.short_description = "" + class ReservationInline(PlStackTabularInline): model = Reservation extra = 0 @@ -280,64 +340,25 @@ class NetworkLookerUpper: class SliverInline(PlStackTabularInline): model = Sliver - fields = ['backend_status', 'all_ips_string', 'instance_name', 'slice', 'numberCores', 'deploymentNetwork', 'image', 'node'] + fields = ['backend_status_icon', 'all_ips_string', 'instance_id', 'instance_name', 'slice', 'deployment', 'flavor', 'image', 'node'] extra = 0 - readonly_fields = ['all_ips_string', 'instance_name'] + readonly_fields = ['backend_status_icon', 'all_ips_string', 'instance_id', 'instance_name'] suit_classes = 'suit-tab suit-tab-slivers' def queryset(self, request): return Sliver.select_by_user(request.user) def formfield_for_foreignkey(self, db_field, request=None, **kwargs): - if db_field.name == 'deploymentNetwork': + if db_field.name == 'deployment': kwargs['queryset'] = Deployment.select_by_acl(request.user) - # the inscrutable jquery selector below says: - # find the closest parent "tr" to the current element - # then find the child with class "field-node" - # then find the child with that is a select - # then return its id - kwargs['widget'] = forms.Select(attrs={'onChange': "update_nodes(this, $($(this).closest('tr')[0]).find('.field-node select')[0].id)"}) - #kwargs['widget'] = forms.Select(attrs={'onChange': "console.log($($($(this).closest('tr')[0]).children('.field-node')[0]).children('select')[0].id);"}) + kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_deployment_changed(this);"}) + if db_field.name == 'flavor': + kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_flavor_changed(this);"}) field = super(SliverInline, self).formfield_for_foreignkey(db_field, request, **kwargs) return field -""" - SMBAKER: This is the old code that implemented each network type as a - separate column in the sliver table. - - 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 = list(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.get(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 = list(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 @@ -348,7 +369,8 @@ class SiteInline(PlStackTabularInline): class UserInline(PlStackTabularInline): model = User - fields = ['backend_status', 'email', 'firstname', 'lastname'] + fields = ['backend_status_icon', 'email', 'firstname', 'lastname'] + readonly_fields = ('backend_status_icon', ) extra = 0 suit_classes = 'suit-tab suit-tab-users' @@ -357,7 +379,8 @@ class UserInline(PlStackTabularInline): class SliceInline(PlStackTabularInline): model = Slice - fields = ['backend_status', 'name', 'site', 'serviceClass', 'service'] + fields = ['backend_status_icon', 'name', 'site', 'serviceClass', 'service'] + readonly_fields = ('backend_status_icon', ) extra = 0 suit_classes = 'suit-tab suit-tab-slices' @@ -368,22 +391,32 @@ class NodeInline(PlStackTabularInline): model = Node extra = 0 suit_classes = 'suit-tab suit-tab-nodes' - fields = ['backend_status', 'name','deployment','site'] + fields = ['backend_status_icon', 'name', 'site_deployment'] + readonly_fields = ('backend_status_icon', ) class DeploymentPrivilegeInline(PlStackTabularInline): model = DeploymentPrivilege extra = 0 - suit_classes = 'suit-tab suit-tab-deploymentprivileges' - fields = ['backend_status', 'user','role','deployment'] + suit_classes = 'suit-tab suit-tab-admin-only' + fields = ['backend_status_icon', 'user','role','deployment'] + readonly_fields = ('backend_status_icon', ) def queryset(self, request): return DeploymentPrivilege.select_by_user(request.user) +class ControllerSiteInline(PlStackTabularInline): + model = ControllerSite + extra = 0 + suit_classes = 'suit-tab suit-tab-admin-only' + fields = ['controller', 'site', 'tenant_id'] + + class SitePrivilegeInline(PlStackTabularInline): model = SitePrivilege extra = 0 suit_classes = 'suit-tab suit-tab-siteprivileges' - fields = ['backend_status', 'user','site', 'role'] + fields = ['backend_status_icon', 'user','site', 'role'] + readonly_fields = ('backend_status_icon', ) def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'site': @@ -397,10 +430,11 @@ class SitePrivilegeInline(PlStackTabularInline): return SitePrivilege.select_by_user(request.user) class SiteDeploymentInline(PlStackTabularInline): - model = SiteDeployments + model = SiteDeployment extra = 0 suit_classes = 'suit-tab suit-tab-deployments' - fields = ['backend_status', 'deployment','site'] + fields = ['backend_status_icon', 'deployment','site', 'controller'] + readonly_fields = ('backend_status_icon', ) def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'site': @@ -408,17 +442,22 @@ class SiteDeploymentInline(PlStackTabularInline): if db_field.name == 'deployment': kwargs['queryset'] = Deployment.select_by_user(request.user) + + if db_field.name == 'controller': + kwargs['queryset'] = Controller.select_by_user(request.user) + return super(SiteDeploymentInline, self).formfield_for_foreignkey(db_field, request, **kwargs) def queryset(self, request): - return SiteDeployments.select_by_user(request.user) + return SiteDeployment.select_by_user(request.user) class SlicePrivilegeInline(PlStackTabularInline): model = SlicePrivilege suit_classes = 'suit-tab suit-tab-sliceprivileges' extra = 0 - fields = ('backend_status', 'user', 'slice', 'role') + fields = ('backend_status_icon', 'user', 'slice', 'role') + readonly_fields = ('backend_status_icon', ) def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'slice': @@ -438,7 +477,8 @@ class SliceNetworkInline(PlStackTabularInline): verbose_name = "Network Connection" verbose_name_plural = "Network Connections" suit_classes = 'suit-tab suit-tab-slicenetworks' - fields = ['backend_status', 'network'] + fields = ['backend_status_icon', 'network'] + readonly_fields = ('backend_status_icon', ) class ImageDeploymentsInline(PlStackTabularInline): model = ImageDeployments @@ -446,25 +486,17 @@ class ImageDeploymentsInline(PlStackTabularInline): verbose_name = "Image Deployments" verbose_name_plural = "Image Deployments" suit_classes = 'suit-tab suit-tab-imagedeployments' - fields = ['backend_status', 'image', 'deployment', 'glance_image_id'] - readonly_fields = ['glance_image_id'] - -class PlanetStackBaseAdmin(ReadOnlyAwareAdmin): - save_on_top = False - - def save_model(self, request, obj, form, change): - obj.caller = request.user - # update openstack connection to use this site/tenant - obj.save_by_user(request.user) - - def delete_model(self, request, obj): - obj.delete_by_user(request.user) + fields = ['backend_status_icon', 'image', 'deployment'] + readonly_fields = ['backend_status_icon'] - def save_formset(self, request, form, formset, change): - instances = formset.save(commit=False) - for instance in instances: - instance.save_by_user(request.user) - formset.save_m2m() +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): model = SliceRole @@ -491,8 +523,17 @@ class DeploymentAdminForm(forms.ModelForm): verbose_name=('Images'), is_stacked=False ) ) + flavors = forms.ModelMultipleChoiceField( + queryset=Flavor.objects.all(), + required=False, + help_text="Select which flavors should be usable on this deployment", + widget=FilteredSelectMultiple( + verbose_name=('Flavors'), is_stacked=False + ) + ) class Meta: model = Deployment + many_to_many = ["flavors",] def __init__(self, *args, **kwargs): request = kwargs.pop('request', None) @@ -501,8 +542,9 @@ 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 for x in self.instance.sitesdeployments.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): """ helper function for handling m2m relations from the MultipleChoiceField @@ -544,16 +586,26 @@ class DeploymentAdminForm(forms.ModelForm): if commit: deployment.save() + # this has to be done after save() if/when a deployment is first created + deployment.flavors = self.cleaned_data['flavors'] if deployment.pk: # save_m2m() doesn't seem to work with 'through' relations. So we # 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(), SiteDeployments, "deployment", "site") - self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments_set.all(), ImageDeployments, "deployment", "image") + self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployment.all(), SiteDeployment, "deployment", "site") + self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments.all(), ImageDeployments, "deployment", "image") + # manipulate_m2m_objs doesn't work for Flavor/Deployment relationship + # so well handle that manually here + for flavor in deployment.flavors.all(): + if getattr(flavor, 'name') not in self.cleaned_data['flavors']: + deployment.flavors.remove(flavor) + for flavor in self.cleaned_data['flavors']: + if flavor not in deployment.flavors.all(): + flavor.deployments.add(deployment) - self.save_m2m() + self.save_m2m() return deployment @@ -568,15 +620,20 @@ class SiteAssocInline(PlStackTabularInline): class DeploymentAdmin(PlanetStackBaseAdmin): model = Deployment - fieldList = ['backend_status', 'name', 'sites', 'images', 'accessControl'] + fieldList = ['backend_status_text', 'name', 'sites', 'images', 'flavors', 'accessControl'] fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})] - inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentsInline] + # node no longer directly connected to deployment + #inlines = [DeploymentPrivilegeInline,NodeInline,TagInline,ImageDeploymentsInline] + inlines = [DeploymentPrivilegeInline,TagInline,ImageDeploymentsInline] list_display = ['backend_status_icon', 'name'] list_display_links = ('backend_status_icon', 'name', ) + readonly_fields = ('backend_status_text', ) user_readonly_fields = ['name'] - suit_form_tabs =(('sites','Deployment Details'),('nodes','Nodes'),('deploymentprivileges','Privileges'),('tags','Tags')) # ,('imagedeployments','Images')) + # nodes no longer direclty connected to deployments + #suit_form_tabs =(('sites','Deployment Details'),('nodes','Nodes'),('deploymentprivileges','Privileges'),('tags','Tags'),('imagedeployments','Images')) + suit_form_tabs =(('sites','Deployment Details'),('deploymentprivileges','Privileges')) def get_form(self, request, obj=None, **kwargs): if request.user.isReadOnlyUser(): @@ -594,6 +651,104 @@ class DeploymentAdmin(PlanetStackBaseAdmin): return AdminFormMetaClass +class ControllerAdminForm(forms.ModelForm): + sites = forms.ModelMultipleChoiceField( + queryset=Site.objects.all(), + required=False, + help_text="Select which sites are managed by this controller", + widget=FilteredSelectMultiple( + verbose_name=('Sites'), is_stacked=False + ) + ) + + class Meta: + model = Controller + + def __init__(self, *args, **kwargs): + request = kwargs.pop('request', None) + super(ControllerAdminForm, self).__init__(*args, **kwargs) + + if self.instance and self.instance.pk: + self.fields['sites'].initial = [x.site for x in self.instance.controllersite.all()] + + def manipulate_m2m_objs(self, this_obj, selected_objs, all_relations, relation_class, local_attrname, foreign_attrname): + """ helper function for handling m2m relations from the MultipleChoiceField + this_obj: the source object we want to link from + selected_objs: a list of destination objects we want to link to + all_relations: the full set of relations involving this_obj, including ones we don't want + relation_class: the class that implements the relation from source to dest + local_attrname: field name representing this_obj in relation_class + foreign_attrname: field name representing selected_objs in relation_class + This function will remove all newobjclass relations from this_obj + that are not contained in selected_objs, and add any relations that + are in selected_objs but don't exist in the data model yet. + """ + existing_dest_objs = [] + for relation in list(all_relations): + if getattr(relation, foreign_attrname) not in selected_objs: + #print "deleting site", sdp.site + relation.delete() + else: + existing_dest_objs.append(getattr(relation, foreign_attrname)) + + for dest_obj in selected_objs: + if dest_obj not in existing_dest_objs: + #print "adding site", site + kwargs = {foreign_attrname: dest_obj, local_attrname: this_obj} + relation = relation_class(**kwargs) + relation.save() + + def save(self, commit=True): + controller = super(ControllerAdminForm, self).save(commit=False) + if commit: + controller.save() + + if controller.pk: + # save_m2m() doesn't seem to work with 'through' relations. So we + # create/destroy the through models ourselves. There has to be + # a better way... + self.manipulate_m2m_objs(controller, self.cleaned_data['sites'], controller.controllersite.all(), ControllerSite, "controller", "site") + pass + + self.save_m2m() + + return controller + +class ControllerAdmin(PlanetStackBaseAdmin): + model = Controller + fieldList = ['name', 'version', 'backend_type', 'auth_url', 'admin_user', 'admin_tenant','admin_password'] + #fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']})] + inlines = [ControllerSiteInline] # ,ControllerImagesInline] + list_display = ['backend_status_icon', 'name', 'version', 'backend_type'] + list_display_links = ('backend_status_icon', 'name', ) + readonly_fields = ('backend_status_text',) + + user_readonly_fields = [] + + def get_form(self, request, obj=None, **kwargs): + print self.fieldsets + if request.user.isReadOnlyUser(): + kwargs["form"] = ControllerAdminROForm + else: + kwargs["form"] = ControllerAdminForm + adminForm = super(ControllerAdmin,self).get_form(request, obj, **kwargs) + + # from stackexchange: pass the request object into the form + + class AdminFormMetaClass(adminForm): + def __new__(cls, *args, **kwargs): + kwargs['request'] = request + return adminForm(*args, **kwargs) + + return AdminFormMetaClass + + def save_model(self, request, obj, form, change): + # update openstack connection to use this site/tenant + obj.save_by_user(request.user) + + def delete_model(self, request, obj): + obj.delete_by_user(request.user) + class ServiceAttrAsTabInline(PlStackTabularInline): model = ServiceAttribute fields = ['name','value'] @@ -603,9 +758,10 @@ class ServiceAttrAsTabInline(PlStackTabularInline): class ServiceAdmin(PlanetStackBaseAdmin): list_display = ("backend_status_icon","name","description","versionNumber","enabled","published") list_display_links = ('backend_status_icon', 'name', ) - fieldList = ["backend_status","name","description","versionNumber","enabled","published"] + fieldList = ["backend_status_text","name","description","versionNumber","enabled","published"] fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']})] inlines = [ServiceAttrAsTabInline,SliceInline] + readonly_fields = ('backend_status_text', ) user_readonly_fields = fieldList @@ -614,42 +770,48 @@ class ServiceAdmin(PlanetStackBaseAdmin): ('serviceattrs','Additional Attributes'), ) +class SiteNodeInline(PlStackTabularInline): + model = Node + fields = ['name', 'site_deployment'] + extra = 0 + suit_classes = 'suit-tab suit-tab-nodes' + class SiteAdmin(PlanetStackBaseAdmin): - fieldList = ['backend_status', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location'] + fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location'] fieldsets = [ (None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}), #('Deployment Networks', {'fields': ['deployments'], 'classes':['suit-tab suit-tab-deployments']}), ] - suit_form_tabs =(('general', 'Site Details'), - ('users','Users'), - ('siteprivileges','Privileges'), - ('deployments','Deployments'), - ('slices','Slices'), - ('nodes','Nodes'), - ('tags','Tags'), - ) - readonly_fields = ['accountLink'] + readonly_fields = ['backend_status_text', 'accountLink'] user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base', 'accountLink'] 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, SitePrivilegeInline, SiteDeploymentInline, SiteNodeInline] + admin_inlines = [ControllerSiteInline] search_fields = ['name'] + @property + def suit_form_tabs(self): + tabs = [('general', 'Site Details'), + ('users','Users'), + ('siteprivileges','Privileges'), + ('deployments','Deployments'), + ('slices','Slices'), + ('nodes','Nodes'), + ] + + request=getattr(_thread_locals, "request", None) + if request and request.user.is_admin: + tabs.append( ('admin-only', 'Admin-Only') ) + + return tabs + def queryset(self, request): return Site.select_by_user(request.user) - 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, 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 @@ -679,10 +841,11 @@ class SiteAdmin(PlanetStackBaseAdmin): class SitePrivilegeAdmin(PlanetStackBaseAdmin): - fieldList = ['backend_status', 'user', 'site', 'role'] + fieldList = ['backend_status_text', 'user', 'site', 'role'] fieldsets = [ (None, {'fields': fieldList, 'classes':['collapse']}) ] + readonly_fields = ('backend_status_text', ) list_display = ('backend_status_icon', 'user', 'site', 'role') list_display_links = list_display user_readonly_fields = fieldList @@ -730,41 +893,98 @@ class SliceForm(forms.ModelForm): 'service': LinkedSelect } + def clean(self): + cleaned_data = super(SliceForm, self).clean() + name = cleaned_data.get('name') + site = cleaned_data.get('site') + slice_id = self.instance.id + if not site and slice_id: + site = Slice.objects.get(id=slice_id).site + if (not isinstance(site,Site)): + # previous code indicates 'site' could be a site_id and not a site? + site = Slice.objects.get(id=site.id) + if not name.startswith(site.login_base): + raise forms.ValidationError('slice name must begin with %s' % site.login_base) + return cleaned_data + +class ControllerSliceInline(PlStackTabularInline): + model = ControllerSlice + extra = 0 + verbose_name = "Controller Slices" + verbose_name_plural = "Controller Slices" + suit_classes = 'suit-tab suit-tab-admin-only' + fields = ['backend_status_icon', 'controller', 'tenant_id'] + readonly_fields = ('backend_status_icon', 'controller' ) + class SliceAdmin(PlanetStackBaseAdmin): form = SliceForm - fieldList = ['backend_status', 'name', 'site', 'serviceClass', 'enabled','description', 'service', 'slice_url', 'max_slivers'] + fieldList = ['backend_status_text', 'site', 'name', 'serviceClass', 'enabled','description', 'service', 'slice_url', 'max_slivers'] fieldsets = [('Slice Details', {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}),] + readonly_fields = ('backend_status_text', ) 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 = [ControllerSliceInline] user_readonly_fields = fieldList - suit_form_tabs =(('general', 'Slice Details'), - ('slicenetworks','Networks'), - ('sliceprivileges','Privileges'), - ('slivers','Slivers'), - ('tags','Tags'), - ('reservations','Reservations'), - ) + @property + def suit_form_tabs(self): + tabs =[('general', 'Slice Details'), + ('slicenetworks','Networks'), + ('sliceprivileges','Privileges'), + ('slivers','Slivers'), + ('reservations','Reservations'), + ('tags','Tags'), + ] + + request=getattr(_thread_locals, "request", None) + if request and request.user.is_admin: + tabs.append( ('admin-only', 'Admin-Only') ) + + return tabs + + def add_view(self, request, form_url='', extra_context=None): + # revert to default read-only fields + self.readonly_fields = ('backend_status_text',) + return super(SliceAdmin, self).add_view(request, form_url, extra_context=extra_context) - def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None): - #deployment_nodes = {} - #for node in Node.objects.all(): - # deployment_nodes[node.deployment.id] = get(deployment_nodes, node.deployment.id, []).append( (node.id, node.name) ) + def change_view(self, request, object_id, form_url='', extra_context=None): + # cannot change the site of an existing slice so make the site field read only + if object_id: + self.readonly_fields = ('backend_status_text','site') + return super(SliceAdmin, self).change_view(request, object_id, form_url) + def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None): deployment_nodes = [] for node in Node.objects.all(): - deployment_nodes.append( (node.deployment.id, node.id, node.name) ) + deployment_nodes.append( (node.site_deployment.id, node.id, node.name) ) - context["deployment_nodes"] = deployment_nodes + deployment_flavors = [] + for flavor in Flavor.objects.all(): + for deployment in flavor.deployments.all(): + deployment_flavors.append( (deployment.id, flavor.id, flavor.name) ) + + deployment_images = [] + for image in Image.objects.all(): + for deployment_image in image.imagedeployments.all(): + deployment_images.append( (deployment_image.deployment.id, image.id, image.name) ) + site_login_bases = [] + for site in Site.objects.all(): + site_login_bases.append((site.id, site.login_base)) + + context["deployment_nodes"] = deployment_nodes + context["deployment_flavors"] = deployment_flavors + context["deployment_images"] = deployment_images + context["site_login_bases"] = site_login_bases return super(SliceAdmin, self).render_change_form(request, context, add, change, form_url, obj) def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'site': kwargs['queryset'] = Site.select_by_user(request.user) - + kwargs['widget'] = forms.Select(attrs={'onChange': "update_slice_prefix(this, $($(this).closest('fieldset')[0]).find('.field-name input')[0].id)"}) + return super(SliceAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) def queryset(self, request): @@ -780,11 +1000,11 @@ class SliceAdmin(PlanetStackBaseAdmin): inline.model.caller = request.user yield inline.get_formset(request, obj) - class SlicePrivilegeAdmin(PlanetStackBaseAdmin): fieldsets = [ - (None, {'fields': ['backend_status', 'user', 'slice', 'role']}) + (None, {'fields': ['backend_status_text', 'user', 'slice', 'role']}) ] + readonly_fields = ('backend_status_text', ) list_display = ('backend_status_icon', 'user', 'slice', 'role') list_display_links = list_display @@ -823,13 +1043,14 @@ class SlicePrivilegeAdmin(PlanetStackBaseAdmin): class ImageAdmin(PlanetStackBaseAdmin): fieldsets = [('Image Details', - {'fields': ['backend_status', 'name', 'disk_format', 'container_format'], + {'fields': ['backend_status_text', 'name', 'disk_format', 'container_format'], 'classes': ['suit-tab suit-tab-general']}) ] + 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, ImageDeploymentsInline] + inlines = [SliverInline, ControllerImagesInline] user_readonly_fields = ['name', 'disk_format', 'container_format'] @@ -845,17 +1066,18 @@ class NodeForm(forms.ModelForm): class NodeAdmin(PlanetStackBaseAdmin): form = NodeForm - list_display = ('backend_status_icon', 'name', 'site', 'deployment') + list_display = ('backend_status_icon', 'name', 'site_deployment') list_display_links = ('backend_status_icon', 'name', ) - list_filter = ('deployment',) + list_filter = ('site_deployment',) inlines = [TagInline,SliverInline] - fieldsets = [('Node Details', {'fields': ['backend_status', 'name','site','deployment'], 'classes':['suit-tab suit-tab-details']})] + fieldsets = [('Node Details', {'fields': ['backend_status_text', 'name','site_deployment'], 'classes':['suit-tab suit-tab-details']})] + readonly_fields = ('backend_status_text', ) - user_readonly_fields = ['name','site','deployment'] + user_readonly_fields = ['name','site_deployment'] user_readonly_inlines = [TagInline,SliverInline] - suit_form_tabs =(('details','Node Details'),('slivers','Slivers'),('tags','Tags')) + suit_form_tabs =(('details','Node Details'),('slivers','Slivers')) class SliverForm(forms.ModelForm): @@ -866,8 +1088,9 @@ class SliverForm(forms.ModelForm): widgets = { 'ip': PlainTextWidget(), 'instance_name': PlainTextWidget(), + 'instance_id': PlainTextWidget(), 'slice': LinkedSelect, - 'deploymentNetwork': LinkedSelect, + 'deployment': LinkedSelect, 'node': LinkedSelect, 'image': LinkedSelect } @@ -881,18 +1104,17 @@ class TagAdmin(PlanetStackBaseAdmin): class SliverAdmin(PlanetStackBaseAdmin): form = SliverForm fieldsets = [ - ('Sliver Details', {'fields': ['backend_status', 'slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'numberCores', 'image', ], 'classes': ['suit-tab suit-tab-general'], }) + ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deployment', 'node', 'ip', 'instance_id', 'instance_name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], }) ] - list_display = ['backend_status_icon', 'ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork'] + readonly_fields = ('backend_status_text', ) + list_display = ['backend_status_icon', 'ip', 'instance_id', 'instance_name', 'slice', 'flavor', 'image', 'node', 'deployment'] list_display_links = ('backend_status_icon', 'ip',) - suit_form_tabs =(('general', 'Sliver Details'), - ('tags','Tags'), - ) + suit_form_tabs =(('general', 'Sliver Details'),) inlines = [TagInline] - user_readonly_fields = ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'numberCores', 'image'] + user_readonly_fields = ['slice', 'deployment', 'node', 'ip', 'instance_name', 'flavor', 'image'] def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'slice': @@ -910,9 +1132,9 @@ class SliverAdmin(PlanetStackBaseAdmin): # make some fields read only if we are updating an existing record if obj == None: #self.readonly_fields = ('ip', 'instance_name') - self.readonly_fields = () + self.readonly_fields = ('backend_status_text',) else: - self.readonly_fields = () + self.readonly_fields = ('backend_status_text',) #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key') for inline in self.get_inline_instances(request, obj): @@ -976,6 +1198,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. @@ -989,7 +1212,18 @@ class UserDashboardViewInline(PlStackTabularInline): suit_classes = 'suit-tab suit-tab-dashboards' fields = ['user', 'dashboardView', 'order'] -class UserAdmin(UserAdmin): +class ControllerUserInline(PlStackTabularInline): + model = ControllerUser + extra = 0 + suit_classes = 'suit-tab suit-tab-admin-only' + fields = ['controller', 'user', 'kuser_id'] + readonly_fields=['controller'] + + +class UserAdmin(PermissionCheckingAdminMixin, UserAdmin): + # Note: Make sure PermissionCheckingAdminMixin is listed before + # admin.ModelAdmin in the class declaration. + class Meta: app_label = "core" @@ -1002,13 +1236,13 @@ class UserAdmin(UserAdmin): # that reference specific fields on auth.User. list_display = ('email', 'firstname', 'lastname', 'site', 'last_login') list_filter = ('site',) - inlines = [SlicePrivilegeInline,SitePrivilegeInline,DeploymentPrivilegeInline,UserDashboardViewInline] - - fieldListLoginDetails = ['email','site','password','is_active','is_readonly','is_admin','public_key'] + inlines = [SlicePrivilegeInline,SitePrivilegeInline,UserDashboardViewInline] + admin_inlines = [ControllerUserInline] + fieldListLoginDetails = ['backend_status_text', 'email','site','password','is_active','is_readonly','is_admin','public_key'] fieldListContactInfo = ['firstname','lastname','phone','timezone'] fieldsets = ( - ('Login Details', {'fields': ['backend_status', 'email', 'site','password', 'is_active', 'is_readonly', 'is_admin', 'public_key'], 'classes':['suit-tab suit-tab-general']}), + ('Login Details', {'fields': ['backend_status_text', 'email', 'site','password', 'is_active', 'is_readonly', 'is_admin', 'public_key'], 'classes':['suit-tab suit-tab-general']}), ('Contact Information', {'fields': ('firstname','lastname','phone', 'timezone'), 'classes':['suit-tab suit-tab-contact']}), #('Dashboard Views', {'fields': ('dashboards',), 'classes':['suit-tab suit-tab-dashboards']}), #('Important dates', {'fields': ('last_login',)}), @@ -1016,21 +1250,32 @@ class UserAdmin(UserAdmin): add_fieldsets = ( (None, { 'classes': ('wide',), - 'fields': ('email', 'firstname', 'lastname', 'is_readonly', 'phone', 'public_key','password1', 'password2')} + 'fields': ('site', 'email', 'firstname', 'lastname', 'is_readonly', 'phone', 'public_key','password1', 'password2')}, ), ) + readonly_fields = ('backend_status_text', ) search_fields = ('email',) ordering = ('email',) filter_horizontal = () user_readonly_fields = fieldListLoginDetails + fieldListContactInfo - suit_form_tabs =(('general','Login Details'), - ('contact','Contact Information'), - ('sliceprivileges','Slice Privileges'), - ('siteprivileges','Site Privileges'), - ('deploymentprivileges','Deployment Privileges'), - ('dashboards','Dashboard Views')) + @property + def suit_form_tabs(self): + if getattr(_thread_locals, "obj", None) is None: + return [] + else: + tabs = [('general','Login Details'), + ('contact','Contact Information'), + ('sliceprivileges','Slice Privileges'), + ('siteprivileges','Site Privileges'), + ('dashboards','Dashboard Views')] + + request=getattr(_thread_locals, "request", None) + if request and request.user.is_admin: + tabs.append( ('admin-only', 'Admin-Only') ) + + return tabs def formfield_for_foreignkey(self, db_field, request, **kwargs): if db_field.name == 'site': @@ -1038,72 +1283,26 @@ class UserAdmin(UserAdmin): return super(UserAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) - def has_add_permission(self, request, obj=None): - return (not self.__user_is_readonly(request)) - - def has_delete_permission(self, request, obj=None): - return (not self.__user_is_readonly(request)) - - def get_actions(self,request): - actions = super(UserAdmin,self).get_actions(request) - - if self.__user_is_readonly(request): - if 'delete_selected' in actions: - del actions['delete_selected'] - - return actions - - def change_view(self,request,object_id, extra_context=None): - - if self.__user_is_readonly(request): - if not hasattr(self, "readonly_save"): - # save the original readonly fields - self.readonly_save = self.readonly_fields - self.inlines_save = self.inlines - if hasattr(self, "user_readonly_fields"): - self.readonly_fields=self.user_readonly_fields - if hasattr(self, "user_readonly_inlines"): - self.inlines = self.user_readonly_inlines - else: - if hasattr(self, "readonly_save"): - # restore the original readonly fields - self.readonly_fields = self.readonly_save - self.inlines = self.inlines_save - - try: - return super(UserAdmin, self).change_view(request, object_id, extra_context=extra_context) - except PermissionDenied: - pass - if request.method == 'POST': - raise PermissionDenied - request.readonly = True - return super(UserAdmin, self).change_view(request, object_id, extra_context=extra_context) - - def __user_is_readonly(self, request): - #groups = [x.name for x in request.user.groups.all() ] - #return "readonly" in groups - return request.user.isReadOnlyUser() - def queryset(self, request): return User.select_by_user(request.user) - def formfield_for_dbfield(self, db_field, **kwargs): - if (db_field.name == 'backend_status'): - kwargs['widget'] = BackendStatusFullWidget(attrs={"title": "foo"}) - result = super(UserAdmin, self).formfield_for_dbfield(db_field, **kwargs) - - if (db_field.name == 'backend_status'): - result.required = False - - return result +class ControllerDashboardViewInline(PlStackTabularInline): + model = ControllerDashboardView + extra = 0 + fields = ["controller", "url"] + suit_classes = 'suit-tab suit-tab-controllers' class DashboardViewAdmin(PlanetStackBaseAdmin): fieldsets = [('Dashboard View Details', - {'fields': ['backend_status', 'name', 'url'], + {'fields': ['backend_status_text', 'name', 'url', 'enabled'], 'classes': ['suit-tab suit-tab-general']}) ] + list_display = ["name", "enabled", "url"] + readonly_fields = ('backend_status_text', ) + inlines = [ControllerDashboardViewInline] - suit_form_tabs =(('general','Dashboard View Details'),) + suit_form_tabs =(('general','Dashboard View Details'), + ('controllers', 'Per-controller Dashboard Details')) class ServiceResourceInline(PlStackTabularInline): model = ServiceResource @@ -1197,8 +1396,9 @@ class ReservationAddRefreshForm(ReservationAddForm): return False class ReservationAdmin(PlanetStackBaseAdmin): - fieldList = ['backend_status', 'slice', 'startTime', 'duration'] + fieldList = ['backend_status_text', 'slice', 'startTime', 'duration'] fieldsets = [('Reservation Details', {'fields': fieldList, 'classes': ['suit-tab suit-tab-general']})] + readonly_fields = ('backend_status_text', ) list_display = ('startTime', 'duration') form = ReservationAddForm @@ -1281,11 +1481,12 @@ class NetworkParameterInline(PlStackGenericTabularInline): verbose_name_plural = "Parameters" verbose_name = "Parameter" suit_classes = 'suit-tab suit-tab-netparams' - fields = ['backend_status', 'parameter', 'value'] + fields = ['backend_status_icon', 'parameter', 'value'] + readonly_fields = ('backend_status_icon', ) class NetworkSliversInline(PlStackTabularInline): - fields = ['backend_status', 'network','sliver','ip'] - readonly_fields = ("ip", ) + fields = ['backend_status_icon', 'network','sliver','ip'] + readonly_fields = ("backend_status_icon", "ip", ) model = NetworkSliver selflink_fieldname = "sliver" extra = 0 @@ -1300,7 +1501,25 @@ class NetworkSlicesInline(PlStackTabularInline): verbose_name_plural = "Slices" verbose_name = "Slice" suit_classes = 'suit-tab suit-tab-networkslices' - fields = ['backend_status', 'network','slice'] + fields = ['backend_status_icon', 'network','slice'] + readonly_fields = ('backend_status_icon', ) + +class ControllerNetworkInline(PlStackTabularInline): + model = ControllerNetwork + extra = 0 + verbose_name_plural = "Controller Networks" + verbose_name = "Controller Network" + suit_classes = 'suit-tab suit-tab-admin-only' + 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") @@ -1308,24 +1527,52 @@ class NetworkAdmin(PlanetStackBaseAdmin): readonly_fields = ("subnet", ) inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline] + admin_inlines = [ControllerNetworkInline] + + form=NetworkForm fieldsets = [ - (None, {'fields': ['backend_status', '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','guaranteed_bandwidth', 'permit_all_slices','permitted_slices','network_id','router_id','subnet_id','subnet'], + 'classes':['suit-tab suit-tab-general']}), + (None, {'fields': ['topology_parameters', 'controller_url', 'controller_parameters'], + 'classes':['suit-tab suit-tab-sdn']}), + ] + + readonly_fields = ('backend_status_text', ) + user_readonly_fields = ['name','template','ports','labels','owner','guaranteed_bandwidth', 'permit_all_slices','permitted_slices','network_id','router_id','subnet_id','subnet'] + + @property + def suit_form_tabs(self): + tabs=[('general','Network Details'), + ('sdn', 'SDN Configuration'), + ('netparams', 'Parameters'), + ('networkslivers','Slivers'), + ('networkslices','Slices'), + ('routers','Routers'), + ] + + request=getattr(_thread_locals, "request", None) + if request and request.user.is_admin: + tabs.append( ('admin-only', 'Admin-Only') ) + + return tabs - user_readonly_fields = ['name','template','ports','labels','owner','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'] - suit_form_tabs =( - ('general','Network Details'), - ('netparams', 'Parameters'), - ('networkslivers','Slivers'), - ('networkslices','Slices'), - ('routers','Routers'), - ) class NetworkTemplateAdmin(PlanetStackBaseAdmin): - list_display = ("backend_status_icon", "name", "guaranteedBandwidth", "visibility") + list_display = ("backend_status_icon", "name", "guaranteed_bandwidth", "visibility") list_display_links = ('backend_status_icon', 'name', ) - user_readonly_fields = ["name", "guaranteedBandwidth", "visibility"] + user_readonly_fields = ["name", "guaranteed_bandwidth", "visibility"] user_readonly_inlines = [] + fieldsets = [ + (None, {'fields': ['name', 'description', 'guaranteed_bandwidth', 'visibility', 'translation', 'shared_network_name', 'shared_network_id', 'topology_kind', 'controller_kind'], + '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") + list_display_links = ("backend_status_icon", "name") + user_readonly_fields = ("name", "flavor") + fields = ("name", "description", "flavor", "order", "default") # register a signal that caches the user's credentials when they log in def cache_credentials(sender, user, request, **kwds): @@ -1445,7 +1692,6 @@ class AccountAdmin(admin.ModelAdmin): dollar_total_invoices = dollar_field("total_invoices", "Total Invoices") dollar_total_payments = dollar_field("total_payments", "Total Payments") - # Now register the new UserAdmin... admin.site.register(User, UserAdmin) # ... and, since we're not using Django's builtin permissions, @@ -1463,6 +1709,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) @@ -1478,7 +1725,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) @@ -1488,4 +1735,5 @@ if True: admin.site.register(Sliver, SliverAdmin) admin.site.register(Image, ImageAdmin) admin.site.register(DashboardView, DashboardViewAdmin) + admin.site.register(Flavor, FlavorAdmin)