X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=365c0dc9038c3d3ef2aecf968937e006b075149f;hb=093d2fa46db97509dcf76e7b059393ed4fc632c3;hp=1952890daadd115f386946eb1ce3b3bac7a523fd;hpb=19017f39a21a240ea42b5b11cb040adb760c6e84;p=plstackapi.git diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 1952890..365c0dc 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' @@ -138,13 +152,13 @@ class PermissionCheckingAdminMixin(object): return mark_safe(backend_icon(obj)) backend_status_icon.short_description = "" - def get_form(self, request, obj=None): + 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) + 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) @@ -326,7 +340,7 @@ class NetworkLookerUpper: class SliverInline(PlStackTabularInline): model = Sliver - fields = ['backend_status_icon', 'all_ips_string', 'instance_name', 'slice', 'deploymentNetwork', 'flavor', 'image', 'node'] + fields = ['backend_status_icon', 'all_ips_string', 'instance_name', 'slice', 'deployment', 'flavor', 'image', 'node'] extra = 0 readonly_fields = ['backend_status_icon', 'all_ips_string', 'instance_name'] suit_classes = 'suit-tab suit-tab-slivers' @@ -335,10 +349,10 @@ class SliverInline(PlStackTabularInline): 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) kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_deployment_changed(this);"}) - elif db_field.name == 'flavor': + 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) @@ -377,19 +391,26 @@ class NodeInline(PlStackTabularInline): model = Node extra = 0 suit_classes = 'suit-tab suit-tab-nodes' - fields = ['backend_status_icon', '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' + 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 @@ -409,10 +430,10 @@ 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_icon', 'deployment','site'] + fields = ['backend_status_icon', 'deployment','site', 'controller'] readonly_fields = ('backend_status_icon', ) def formfield_for_foreignkey(self, db_field, request, **kwargs): @@ -421,10 +442,14 @@ 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): @@ -461,7 +486,16 @@ class ImageDeploymentsInline(PlStackTabularInline): 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 +542,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 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): @@ -560,8 +594,16 @@ 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(), 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() @@ -578,16 +620,20 @@ class SiteAssocInline(PlStackTabularInline): class DeploymentAdmin(PlanetStackBaseAdmin): model = Deployment - fieldList = ['backend_status_text', 'name', 'availability_zone', 'sites', 'images', 'flavors', '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(): @@ -605,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'] @@ -626,20 +770,18 @@ 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_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 = ['backend_status_text', 'accountLink'] user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base', 'accountLink'] @@ -647,9 +789,26 @@ 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, 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) @@ -738,6 +897,9 @@ class SliceForm(forms.ModelForm): 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) @@ -745,14 +907,14 @@ class SliceForm(forms.ModelForm): raise forms.ValidationError('slice name must begin with %s' % site.login_base) return cleaned_data -class SliceDeploymentsInline(PlStackTabularInline): - model = SliceDeployments +class ControllerSliceInline(PlStackTabularInline): + model = ControllerSlice 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'] - readonly_fields = ('backend_status_icon', ) + fields = ['backend_status_icon', 'controller', 'tenant_id'] + readonly_fields = ('backend_status_icon', 'controller' ) class SliceAdmin(PlanetStackBaseAdmin): form = SliceForm @@ -762,7 +924,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 = [SliceDeploymentsInline] + admin_inlines = [ControllerSliceInline] user_readonly_fields = fieldList @@ -772,8 +934,8 @@ class SliceAdmin(PlanetStackBaseAdmin): ('slicenetworks','Networks'), ('sliceprivileges','Privileges'), ('slivers','Slivers'), - ('tags','Tags'), ('reservations','Reservations'), + ('tags','Tags'), ] request=getattr(_thread_locals, "request", None) @@ -781,11 +943,22 @@ class SliceAdmin(PlanetStackBaseAdmin): 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 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) ) deployment_flavors = [] for flavor in Flavor.objects.all(): @@ -794,8 +967,8 @@ class SliceAdmin(PlanetStackBaseAdmin): deployment_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 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(): @@ -875,9 +1048,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, ImageDeploymentsInline] + inlines = [SliverInline, ControllerImagesInline] user_readonly_fields = ['name', 'disk_format', 'container_format'] @@ -893,18 +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_text', '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): @@ -916,7 +1089,7 @@ class SliverForm(forms.ModelForm): 'ip': PlainTextWidget(), 'instance_name': PlainTextWidget(), 'slice': LinkedSelect, - 'deploymentNetwork': LinkedSelect, + 'deployment': LinkedSelect, 'node': LinkedSelect, 'image': LinkedSelect } @@ -930,19 +1103,17 @@ class TagAdmin(PlanetStackBaseAdmin): class SliverAdmin(PlanetStackBaseAdmin): form = SliverForm fieldsets = [ - ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], }) + ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deployment', 'node', 'ip', 'instance_name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], }) ] readonly_fields = ('backend_status_text', ) - list_display = ['backend_status_icon', 'ip', 'instance_name', 'slice', 'flavor', 'image', 'node', 'deploymentNetwork'] + list_display = ['backend_status_icon', 'ip', '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', 'flavor', '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': @@ -1026,6 +1197,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. @@ -1039,6 +1211,14 @@ class UserDashboardViewInline(PlStackTabularInline): suit_classes = 'suit-tab suit-tab-dashboards' fields = ['user', 'dashboardView', 'order'] +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. @@ -1055,8 +1235,8 @@ 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,UserDashboardViewInline] + admin_inlines = [ControllerUserInline] fieldListLoginDetails = ['backend_status_text', 'email','site','password','is_active','is_readonly','is_admin','public_key'] fieldListContactInfo = ['firstname','lastname','phone','timezone'] @@ -1069,7 +1249,7 @@ class UserAdmin(PermissionCheckingAdminMixin, 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', ) @@ -1084,12 +1264,17 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin): if getattr(_thread_locals, "obj", None) is None: return [] else: - return (('general','Login Details'), + tabs = [('general','Login Details'), ('contact','Contact Information'), ('sliceprivileges','Slice Privileges'), ('siteprivileges','Site Privileges'), - ('deploymentprivileges','Deployment Privileges'), - ('dashboards','Dashboard Views')) + ('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': @@ -1100,14 +1285,23 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin): def queryset(self, request): return User.select_by_user(request.user) +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_text', '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 @@ -1309,32 +1503,47 @@ class NetworkSlicesInline(PlStackTabularInline): fields = ['backend_status_icon', 'network','slice'] readonly_fields = ('backend_status_icon', ) -class NetworkDeploymentsInline(PlStackTabularInline): - model = NetworkDeployments +class ControllerNetworkInline(PlStackTabularInline): + model = ControllerNetwork 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 = [ControllerNetworkInline] + + 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','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','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'] + 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'), @@ -1349,10 +1558,14 @@ class NetworkAdmin(PlanetStackBaseAdmin): 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") @@ -1495,6 +1708,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) @@ -1510,7 +1724,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)