fields = ['backend_status_icon', 'name','deployment','site']
readonly_fields = ('backend_status_icon', )
-class DeploymentPrivilegeInline(PlStackTabularInline):
- model = DeploymentPrivilege
+class ControllerPrivilegeInline(PlStackTabularInline):
+ model = ControllerPrivilege
extra = 0
- suit_classes = 'suit-tab suit-tab-deploymentprivileges'
- fields = ['backend_status_icon', 'user','role','deployment']
+ suit_classes = 'suit-tab suit-tab-admin-only'
+ fields = ['backend_status_icon', 'user','role','controller']
readonly_fields = ('backend_status_icon', )
def queryset(self, request):
- return DeploymentPrivilege.select_by_user(request.user)
+ return ControllerPrivilege.select_by_user(request.user)
class SitePrivilegeInline(PlStackTabularInline):
model = SitePrivilege
def queryset(self, request):
return SitePrivilege.select_by_user(request.user)
-class SiteDeploymentInline(PlStackTabularInline):
- model = SiteDeployment
+class SiteDeploymentsInline(PlStackTabularInline):
+ model = SiteDeployments
extra = 0
suit_classes = 'suit-tab suit-tab-deployments'
- fields = ['backend_status_icon', 'deployment','site']
+ 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 == 'deployment':
kwargs['queryset'] = Deployment.select_by_user(request.user)
- return super(SiteDeploymentInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
+
+ if db_field.name == 'controller':
+ kwargs['queryset'] = Controller.select_by_user(request.user)
+
+ return super(SiteDeploymentsInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
- return SiteDeployment.select_by_user(request.user)
+ return SiteDeployments.select_by_user(request.user)
class SlicePrivilegeInline(PlStackTabularInline):
fields = ['backend_status_icon', 'network']
readonly_fields = ('backend_status_icon', )
-class ImageDeploymentInline(PlStackTabularInline):
- model = ImageDeployment
+class ImageDeploymentsInline(PlStackTabularInline):
+ model = ImageDeployments
extra = 0
verbose_name = "Image Deployments"
verbose_name_plural = "Image Deployments"
suit_classes = 'suit-tab suit-tab-imagedeployments'
- fields = ['backend_status_icon', 'image', 'deployment', 'glance_image_id']
+ fields = ['backend_status_icon', 'image', 'deployment']
+ readonly_fields = ['backend_status_icon']
+
+class ControllerImagesInline(PlStackTabularInline):
+ model = ControllerImages
+ extra = 0
+ verbose_name = "Controller Images"
+ verbose_name_plural = "Controller Images"
+ suit_classes = 'suit-tab suit-tab-admin-only'
+ fields = ['backend_status_icon', 'image', 'controller', 'glance_image_id']
readonly_fields = ['backend_status_icon', 'glance_image_id']
class SliceRoleAdmin(PlanetStackBaseAdmin):
# 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(), SiteDeployment, "deployment", "site")
- self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments.all(), ImageDeployment, "deployment", "image")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['sites'], deployment.sitedeployments.all(), SiteDeployments, "deployment", "site")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments.all(), ControllerImages, "deployment", "image")
self.save_m2m()
model = Deployment
fieldList = ['backend_status_text', 'name', 'availability_zone', 'sites', 'images', 'flavors', 'accessControl']
fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-sites']})]
- inlines = [DeploymentPrivilegeInline,NodeInline,TagInline] # ,ImageDeploymentInline]
+ inlines = [ControllerPrivilegeInline,NodeInline,TagInline] # ,ControllerImagesInline]
list_display = ['backend_status_icon', 'name']
list_display_links = ('backend_status_icon', 'name', )
readonly_fields = ('backend_status_text', )
return AdminFormMetaClass
+class ControllerAdminForm(forms.ModelForm):
+ site_deployments = forms.ModelMultipleChoiceField(
+ queryset=SiteDeployment.objects.all(),
+ required=False,
+ help_text="Select which sites deployments are managed by this controller",
+ widget=FilteredSelectMultiple(
+ verbose_name=('Site Deployments'), is_stacked=False
+ )
+ )
+
+ class Meta:
+ model = Controller
+
+ def __init__(self, *args, **kwds):
+ request = kwargs.pop('request', None)
+ 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()]
+
+ 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['site_deployments'], controller.controllersitedeployments.all(), ControllerSiteDeployments, "controller", "site_deployment")
+
+ self.save_m2m()
+
+ return controller
+
+class ControllerAdmin(PlanetStackBaseAdmin):
+ model = Controller
+ fieldList = ['name', 'version', 'backend_type', 'auth_url', 'admin_user', 'admin_tenant',]
+ fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-admin-only']})]
+ inlines = [ControllerPrivilegeInline, ContrllerSiteInline] # ,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):
+ if request.user.isReadOnlyUser():
+ kwargs["form"] = ControllerAdminROForm
+ else:
+ kwargs["form"] = ControllerAdminForm
+ adminForm = super(DeploymentAdmin,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
+
class ServiceAttrAsTabInline(PlStackTabularInline):
model = ServiceAttribute
fields = ['name','value']
list_display = ('backend_status_icon', 'name', 'login_base','site_url', 'enabled')
list_display_links = ('backend_status_icon', 'name', )
filter_horizontal = ('deployments',)
- inlines = [SliceInline,UserInline,TagInline, NodeInline, SitePrivilegeInline, SiteDeploymentInline]
+ inlines = [SliceInline,UserInline,TagInline, NodeInline, SitePrivilegeInline, SiteDeploymentsInline]
search_fields = ['name']
def queryset(self, request):
raise forms.ValidationError('slice name must begin with %s' % site.login_base)
return cleaned_data
-class SliceDeploymentInline(PlStackTabularInline):
- model = SliceDeployment
+class ControllerSlicesInline(PlStackTabularInline):
+ model = ControllerSlices
extra = 0
- verbose_name = "Slice Deployment"
- verbose_name_plural = "Slice Deployments"
+ verbose_name = "Controller Slices"
+ verbose_name_plural = "Controller Slices"
suit_classes = 'suit-tab suit-tab-admin-only'
- fields = ['backend_status_icon', 'deployment', 'tenant_id']
+ fields = ['backend_status_icon', 'controller', 'tenant_id']
readonly_fields = ('backend_status_icon', )
class SliceAdmin(PlanetStackBaseAdmin):
list_display = ('backend_status_icon', 'name', 'site','serviceClass', 'slice_url', 'max_slivers')
list_display_links = ('backend_status_icon', 'name', )
inlines = [SlicePrivilegeInline,SliverInline, TagInline, ReservationInline,SliceNetworkInline]
- admin_inlines = [SliceDeploymentInline]
+ admin_inlines = [ControllerSlicesInline]
user_readonly_fields = fieldList
for deployment in flavor.deployments.all():
deployment_flavors.append( (deployment.id, flavor.id, flavor.name) )
- deployment_images = []
+ controller_images = []
for image in Image.objects.all():
- for imageDeployment in image.imagedeployments_set.all():
- deployment_images.append( (imageDeployment.deployment.id, image.id, image.name) )
+ for controller_image in image.controllerimages.all():
+ controller_images.append( (controller_image.controller.id, image.id, image.name) )
site_login_bases = []
for site in Site.objects.all():
]
readonly_fields = ('backend_status_text', )
- suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'))
+ suit_form_tabs =(('general','Image Details'),('slivers','Slivers'),('imagedeployments','Deployments'), ('controllerimages', 'Controllers'))
- inlines = [SliverInline, ImageDeploymentInline]
+ inlines = [SliverInline, ControllerImagesInline]
user_readonly_fields = ['name', 'disk_format', 'container_format']
# that reference specific fields on auth.User.
list_display = ('email', 'firstname', 'lastname', 'site', 'last_login')
list_filter = ('site',)
- inlines = [SlicePrivilegeInline,SitePrivilegeInline,DeploymentPrivilegeInline,UserDashboardViewInline]
+ inlines = [SlicePrivilegeInline,SitePrivilegeInline,ControllerPrivilegeInline,UserDashboardViewInline]
fieldListLoginDetails = ['backend_status_text', 'email','site','password','is_active','is_readonly','is_admin','public_key']
fieldListContactInfo = ['firstname','lastname','phone','timezone']
('contact','Contact Information'),
('sliceprivileges','Slice Privileges'),
('siteprivileges','Site Privileges'),
- ('deploymentprivileges','Deployment Privileges'),
+ ('controllerprivileges','Controller Privileges'),
('dashboards','Dashboard Views'))
def formfield_for_foreignkey(self, db_field, request, **kwargs):
fields = ['backend_status_icon', 'network','slice']
readonly_fields = ('backend_status_icon', )
-class NetworkDeploymentsInline(PlStackTabularInline):
- model = NetworkDeployments
+class ControllerNetworksInline(PlStackTabularInline):
+ model = ControllerNetworks
extra = 0
- verbose_name_plural = "Network Deployments"
- verbose_name = "Network Deployment"
+ verbose_name_plural = "Controller Networks"
+ verbose_name = "Controller Network"
suit_classes = 'suit-tab suit-tab-admin-only'
- fields = ['backend_status_icon', 'deployment','net_id','subnet_id']
+ fields = ['backend_status_icon', 'controller','net_id','subnet_id']
readonly_fields = ('backend_status_icon', )
class NetworkForm(forms.ModelForm):
readonly_fields = ("subnet", )
inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline]
- admin_inlines = [NetworkDeploymentsInline]
+ admin_inlines = [ControllerNetworksInline]
form=NetworkForm
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)
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)
git://git.onelab.eu / plstackapi.git / blobdiff