X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=365c0dc9038c3d3ef2aecf968937e006b075149f;hb=093d2fa46db97509dcf76e7b059393ed4fc632c3;hp=e2de8c82955780e590229560d9ae3e38f694134f;hpb=4aa7ff88737c448ef3838482fb95f14aa182d279;p=plstackapi.git diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py index e2de8c8..365c0dc 100644 --- a/planetstack/core/admin.py +++ b/planetstack/core/admin.py @@ -340,7 +340,7 @@ class NetworkLookerUpper: class SliverInline(PlStackTabularInline): model = Sliver - fields = ['backend_status_icon', 'all_ips_string', 'instance_name', 'slice', 'controllerNetwork', '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' @@ -349,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 == 'controllerNetwork': + 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) @@ -404,21 +404,12 @@ class DeploymentPrivilegeInline(PlStackTabularInline): def queryset(self, request): return DeploymentPrivilege.select_by_user(request.user) -class ControllerPrivilegeInline(PlStackTabularInline): - model = ControllerPrivilege +class ControllerSiteInline(PlStackTabularInline): + model = ControllerSite extra = 0 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 ControllerPrivilege.select_by_user(request.user) + fields = ['controller', 'site', 'tenant_id'] -class ControllerSiteDeploymentsInline(PlStackTabularInline): - model = ControllerSiteDeployments - extra = 0 - suit_classes = 'suit-tab suit-tab-admin-only' - fields = ['controller', 'site_deployment', 'tenant_id'] class SitePrivilegeInline(PlStackTabularInline): model = SitePrivilege @@ -438,8 +429,8 @@ class SitePrivilegeInline(PlStackTabularInline): def queryset(self, request): return SitePrivilege.select_by_user(request.user) -class SiteDeploymentsInline(PlStackTabularInline): - model = SiteDeployments +class SiteDeploymentInline(PlStackTabularInline): + model = SiteDeployment extra = 0 suit_classes = 'suit-tab suit-tab-deployments' fields = ['backend_status_icon', 'deployment','site', 'controller'] @@ -455,10 +446,10 @@ class SiteDeploymentsInline(PlStackTabularInline): if db_field.name == 'controller': kwargs['queryset'] = Controller.select_by_user(request.user) - return super(SiteDeploymentsInline, self).formfield_for_foreignkey(db_field, request, **kwargs) + 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): @@ -551,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.site for x in self.instance.sitedeployments.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() @@ -603,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.sitedeployments.all(), SiteDeployments, "deployment", "site") + 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 @@ -642,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(): @@ -661,12 +652,12 @@ class DeploymentAdmin(PlanetStackBaseAdmin): return AdminFormMetaClass class ControllerAdminForm(forms.ModelForm): - site_deployments = forms.ModelMultipleChoiceField( - queryset=SiteDeployments.objects.all(), + sites = forms.ModelMultipleChoiceField( + queryset=Site.objects.all(), required=False, - help_text="Select which sites deployments are managed by this controller", + help_text="Select which sites are managed by this controller", widget=FilteredSelectMultiple( - verbose_name=('Site Deployments'), is_stacked=False + verbose_name=('Sites'), is_stacked=False ) ) @@ -678,7 +669,7 @@ class ControllerAdminForm(forms.ModelForm): super(ControllerAdminForm, self).__init__(*args, **kwargs) if self.instance and self.instance.pk: - self.fields['site_deployments'].initial = [x.site_deployment for x in self.instance.controllersitedeployments.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,8 +707,9 @@ class ControllerAdminForm(forms.ModelForm): # 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['site_deployments'], controller.controllersitedeployments.all(), ControllerSiteDeployments, "controller", "site_deployment") - + self.manipulate_m2m_objs(controller, self.cleaned_data['sites'], controller.controllersite.all(), ControllerSite, "controller", "site") + pass + self.save_m2m() return controller @@ -726,7 +718,7 @@ 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 = [ControllerSiteDeploymentsInline] # ,ControllerImagesInline] + inlines = [ControllerSiteInline] # ,ControllerImagesInline] list_display = ['backend_status_icon', 'name', 'version', 'backend_type'] list_display_links = ('backend_status_icon', 'name', ) readonly_fields = ('backend_status_text',) @@ -750,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'] @@ -771,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'] @@ -792,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, SitePrivilegeInline, SiteDeploymentsInline] + 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) @@ -893,14 +907,14 @@ class SliceForm(forms.ModelForm): raise forms.ValidationError('slice name must begin with %s' % site.login_base) return cleaned_data -class ControllerSlicesInline(PlStackTabularInline): - model = ControllerSlices +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', ) + readonly_fields = ('backend_status_icon', 'controller' ) class SliceAdmin(PlanetStackBaseAdmin): form = SliceForm @@ -910,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 = [ControllerSlicesInline] + admin_inlines = [ControllerSliceInline] user_readonly_fields = fieldList @@ -920,8 +934,8 @@ class SliceAdmin(PlanetStackBaseAdmin): ('slicenetworks','Networks'), ('sliceprivileges','Privileges'), ('slivers','Slivers'), - ('tags','Tags'), ('reservations','Reservations'), + ('tags','Tags'), ] request=getattr(_thread_locals, "request", None) @@ -1063,7 +1077,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): @@ -1075,7 +1089,7 @@ class SliverForm(forms.ModelForm): 'ip': PlainTextWidget(), 'instance_name': PlainTextWidget(), 'slice': LinkedSelect, - 'controllerNetwork': LinkedSelect, + 'deployment': LinkedSelect, 'node': LinkedSelect, 'image': LinkedSelect } @@ -1089,19 +1103,17 @@ class TagAdmin(PlanetStackBaseAdmin): class SliverAdmin(PlanetStackBaseAdmin): form = SliverForm fieldsets = [ - ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'controllerNetwork', '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', 'controllerNetwork'] + 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', 'controllerNetwork', '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': @@ -1199,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. @@ -1215,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,ControllerPrivilegeInline,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'] @@ -1229,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', ) @@ -1244,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'), - ('controllerprivileges','Controller 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': @@ -1268,9 +1293,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] @@ -1477,8 +1503,8 @@ class NetworkSlicesInline(PlStackTabularInline): fields = ['backend_status_icon', 'network','slice'] readonly_fields = ('backend_status_icon', ) -class ControllerNetworksInline(PlStackTabularInline): - model = ControllerNetworks +class ControllerNetworkInline(PlStackTabularInline): + model = ControllerNetwork extra = 0 verbose_name_plural = "Controller Networks" verbose_name = "Controller Network" @@ -1500,19 +1526,19 @@ class NetworkAdmin(PlanetStackBaseAdmin): readonly_fields = ("subnet", ) inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline] - admin_inlines = [ControllerNetworksInline] + 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'], + (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': ['topologyParameters', 'controllerUrl', 'controllerParameters'], + (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): @@ -1532,12 +1558,12 @@ 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', 'guaranteedBandwidth', 'visibility', 'translation', 'sharedNetworkName', 'sharedNetworkId', 'topologyKind', 'controllerKind'], + (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'), )