X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=cef140ba0c84f95cca1a51da033427618e4dd2af;hb=90ecab134bf44662886576bea76c48d0aea316b7;hp=296098fc8d1b6fe5e475b66271eff24aa758c931;hpb=5bec44cddd6c9bd20666e4f61491d9f27ed481dc;p=plstackapi.git diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index 296098f..cef140b 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -31,7 +31,7 @@ def backend_icon(obj): # backend_status, enacted, updated): if (obj.enacted is not None) and obj.enacted >= obj.updated: return '' else: - if obj.backend_status == "Provisioning in progress" or obj.backend_status=="": + if ((obj.backend_status is not None) and obj.backend_status.startswith("0 -")) or obj.backend_status == "Provisioning in progress" or obj.backend_status=="": return '' % obj.backend_status else: return '' % html_escape(obj.backend_status, quote=True) @@ -340,9 +340,9 @@ class NetworkLookerUpper: class SliverInline(PlStackTabularInline): model = Sliver - fields = ['backend_status_icon', 'all_ips_string', 'instance_name', 'slice', 'deployment', 'flavor', 'image', 'node'] + fields = ['backend_status_icon', 'all_ips_string', 'instance_id', 'instance_name', 'slice', 'deployment', 'flavor', 'image', 'node'] extra = 0 - readonly_fields = ['backend_status_icon', '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): @@ -542,7 +542,7 @@ 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 for x in self.instance.sites.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() @@ -594,7 +594,7 @@ 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.sitedeployment.all(), SiteDeployment, "deployment", "site") + self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments.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 @@ -633,7 +633,7 @@ class DeploymentAdmin(PlanetStackBaseAdmin): # 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'),('tags','Tags'),('imagedeployments','Images')) + suit_form_tabs =(('sites','Deployment Details'),('deploymentprivileges','Privileges')) def get_form(self, request, obj=None, **kwargs): if request.user.isReadOnlyUser(): @@ -669,7 +669,7 @@ class ControllerAdminForm(forms.ModelForm): super(ControllerAdminForm, self).__init__(*args, **kwargs) if self.instance and self.instance.pk: - self.fields['sites'].initial = [x.site_deployment for x in self.instance.controllersite.all()] + 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 @@ -716,7 +716,7 @@ class ControllerAdminForm(forms.ModelForm): class ControllerAdmin(PlanetStackBaseAdmin): model = Controller - fieldList = ['name', 'version', 'backend_type', 'auth_url', 'admin_user', 'admin_tenant','admin_password'] + fieldList = ['name', 'backend_type', 'version', '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'] @@ -742,6 +742,13 @@ class ControllerAdmin(PlanetStackBaseAdmin): 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'] @@ -763,21 +770,30 @@ 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'] + #fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location'] + fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'location'] fieldsets = [ (None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']}), #('Deployment Networks', {'fields': ['deployments'], 'classes':['suit-tab suit-tab-deployments']}), ] - readonly_fields = ['backend_status_text', 'accountLink'] + #readonly_fields = ['backend_status_text', 'accountLink'] + readonly_fields = ['backend_status_text'] - user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base', 'accountLink'] + #user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base', 'accountLink'] + user_readonly_fields = ['name', 'deployments','site_url', 'enabled', 'is_public', 'login_base'] 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, SitePrivilegeInline, SiteDeploymentInline] - admin_inlines = [ControllerSite] + inlines = [SliceInline,UserInline,TagInline, SitePrivilegeInline, SiteDeploymentInline, SiteNodeInline] + admin_inlines = [ControllerSiteInline] search_fields = ['name'] @property @@ -787,8 +803,7 @@ class SiteAdmin(PlanetStackBaseAdmin): ('siteprivileges','Privileges'), ('deployments','Deployments'), ('slices','Slices'), - #('nodes','Nodes'), - ('tags','Tags'), + ('nodes','Nodes'), ] request=getattr(_thread_locals, "request", None) @@ -922,8 +937,8 @@ class SliceAdmin(PlanetStackBaseAdmin): ('slicenetworks','Networks'), ('sliceprivileges','Privileges'), ('slivers','Slivers'), + #('reservations','Reservations'), ('tags','Tags'), - ('reservations','Reservations'), ] request=getattr(_thread_locals, "request", None) @@ -946,7 +961,7 @@ class SliceAdmin(PlanetStackBaseAdmin): 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.site_deployment.id, node.id, node.name) ) + deployment_nodes.append( (node.site_deployment.deployment.id, node.id, node.name) ) deployment_flavors = [] for flavor in Flavor.objects.all(): @@ -1065,7 +1080,7 @@ class NodeAdmin(PlanetStackBaseAdmin): 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): @@ -1076,6 +1091,7 @@ class SliverForm(forms.ModelForm): widgets = { 'ip': PlainTextWidget(), 'instance_name': PlainTextWidget(), + 'instance_id': PlainTextWidget(), 'slice': LinkedSelect, 'deployment': LinkedSelect, 'node': LinkedSelect, @@ -1091,15 +1107,13 @@ class TagAdmin(PlanetStackBaseAdmin): class SliverAdmin(PlanetStackBaseAdmin): form = SliverForm fieldsets = [ - ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deployment', 'node', 'ip', 'instance_name', 'flavor', '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'], }) ] readonly_fields = ('backend_status_text', ) - list_display = ['backend_status_icon', 'ip', 'instance_name', 'slice', 'flavor', 'image', 'node', 'deployment'] + 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] @@ -1223,7 +1237,8 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin): # The fields to be used in displaying the User model. # These override the definitions on the base UserAdmin # that reference specific fields on auth.User. - list_display = ('email', 'firstname', 'lastname', 'site', 'last_login') + list_display = ('backend_status_icon', 'email', 'firstname', 'lastname', 'site', 'last_login') + list_display_links = ("email",) list_filter = ('site',) inlines = [SlicePrivilegeInline,SitePrivilegeInline,UserDashboardViewInline] admin_inlines = [ControllerUserInline] @@ -1239,7 +1254,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_admin','is_admin', 'is_readonly', 'phone', 'public_key','password1', 'password2')}, ), ) readonly_fields = ('backend_status_text', ) @@ -1275,6 +1290,15 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin): def queryset(self, request): return User.select_by_user(request.user) + def get_form(self, request, obj=None, **kwargs): + if not request.user.is_admin: + self.fieldsets = ( + ('Login Details', {'fields': ['backend_status_text', 'email', 'site','password','public_key'], 'classes':['suit-tab suit-tab-general']}), + ('Contact Information', {'fields': ('firstname','lastname','phone', 'timezone'), 'classes':['suit-tab suit-tab-contact']}), + ) + self.readonly_fields = ('backend_status_text', 'site') + return super(UserAdmin, self).get_form(request, obj, **kwargs) + class ControllerDashboardViewInline(PlStackTabularInline): model = ControllerDashboardView extra = 0 @@ -1283,9 +1307,10 @@ class ControllerDashboardViewInline(PlStackTabularInline): 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] @@ -1701,12 +1726,12 @@ admin.site.register(Controller, ControllerAdmin) admin.site.register(Site, SiteAdmin) admin.site.register(Slice, SliceAdmin) admin.site.register(Service, ServiceAdmin) -admin.site.register(Reservation, ReservationAdmin) +#admin.site.register(Reservation, ReservationAdmin) admin.site.register(Network, NetworkAdmin) admin.site.register(Router, RouterAdmin) admin.site.register(NetworkTemplate, NetworkTemplateAdmin) -admin.site.register(Account, AccountAdmin) -admin.site.register(Invoice, InvoiceAdmin) +#admin.site.register(Account, AccountAdmin) +#admin.site.register(Invoice, InvoiceAdmin) if True: admin.site.register(NetworkParameterType, NetworkParameterTypeAdmin)