from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse, NoReverseMatch
-import django_evolution
+import django_evolution
+
+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 '<span style="min-width:16px;"><img src="/static/admin/img/icon_success.gif"></span>'
+ else:
+ if obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
+ return '<span style="min-width:16px;" title="%s"><img src="/static/admin/img/icon_clock.gif"></span>' % obj.backend_status
+ else:
+ return '<span style="min-width:16px;" title="%s"><img src="/static/admin/img/icon_error.gif"></span>' % obj.backend_status
+
+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") # enacted on %s" % str(obj.enacted))
+ else:
+ return "%s %s" % (icon, obj.backend_status)
+
+class PlainTextWidget(forms.HiddenInput):
+ input_type = 'hidden'
+
+ def render(self, name, value, attrs=None):
+ if value is None:
+ value = ''
+ return mark_safe(str(value) + super(PlainTextWidget, self).render(name, value, attrs))
class ReadOnlyAwareAdmin(admin.ModelAdmin):
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 __user_is_readonly(self, request):
return request.user.isReadOnlyUser()
+ def backend_status_text(self, obj):
+ return mark_safe(backend_text(obj))
+
+ def backend_status_icon(self, obj):
+ return mark_safe(backend_icon(obj))
+ backend_status_icon.short_description = ""
+
+
class SingletonAdmin (ReadOnlyAwareAdmin):
def has_add_permission(self, request):
if not super(SingletonAdmin, self).has_add_permission(request):
selflink.allow_tags = True
selflink.short_description = "Details"
-class ReadOnlyTabularInline(PlStackTabularInline):
- can_delete = False
+ def has_add_permission(self, request):
+ return not request.user.isReadOnlyUser()
def get_readonly_fields(self, request, obj=None):
- return self.fields
+ readonly_fields = list(self.readonly_fields)[:]
+ if request.user.isReadOnlyUser():
+ for field in self.fields:
+ if not field in readonly_fields:
+ 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 PlStackGenericTabularInline(generic.GenericTabularInline):
def has_add_permission(self, request):
- return False
+ return not request.user.isReadOnlyUser()
-class ReservationROInline(ReadOnlyTabularInline):
- model = Reservation
- extra = 0
- suit_classes = 'suit-tab suit-tab-reservations'
- fields = ['startTime','slice','duration']
+ def get_readonly_fields(self, request, obj=None):
+ readonly_fields = list(self.readonly_fields)[:]
+ if request.user.isReadOnlyUser():
+ for field in self.fields:
+ if not field in readonly_fields:
+ 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
suit_classes = 'suit-tab suit-tab-reservations'
-
+
def queryset(self, request):
return Reservation.select_by_user(request.user)
-class TagROInline(generic.GenericTabularInline):
- model = Tag
- extra = 0
- suit_classes = 'suit-tab suit-tab-tags'
- can_delete = False
- fields = ['service', 'name', 'value']
-
- def get_readonly_fields(self, request, obj=None):
- return self.fields
-
- def has_add_permission(self, request):
- return False
-
-
-class TagInline(generic.GenericTabularInline):
+class TagInline(PlStackGenericTabularInline):
model = Tag
extra = 0
suit_classes = 'suit-tab suit-tab-tags'
NetworkLookerUpper.byNetworkName[network_name] = NetworkLookerUpper(network_name)
return NetworkLookerUpper.byNetworkName[network_name]
-class SliverROInline(ReadOnlyTabularInline):
- model = Sliver
- fields = ['ip', 'instance_name', 'slice', 'numberCores', 'deploymentNetwork', 'image', 'node']
- suit_classes = 'suit-tab suit-tab-slivers'
-
class SliverInline(PlStackTabularInline):
model = Sliver
- fields = ['all_ips_string', 'instance_name', 'slice', 'numberCores', 'deploymentNetwork', 'image', 'node']
+ fields = ['backend_status_icon', 'all_ips_string', 'instance_name', 'slice', 'deploymentNetwork', 'flavor', 'image', 'node']
extra = 0
- readonly_fields = ['all_ips_string', 'instance_name']
+ readonly_fields = ['backend_status_icon', 'all_ips_string', 'instance_name']
suit_classes = 'suit-tab suit-tab-slivers'
def queryset(self, request):
def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
if db_field.name == 'deploymentNetwork':
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);"})
+ elif 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 SiteROInline(ReadOnlyTabularInline):
- model = Site
- extra = 0
- fields = ['name', 'login_base', 'site_url', 'enabled']
- suit_classes = 'suit-tab suit-tab-sites'
-
class SiteInline(PlStackTabularInline):
model = Site
extra = 0
def queryset(self, request):
return Site.select_by_user(request.user)
-class UserROInline(ReadOnlyTabularInline):
- model = User
- fields = ['email', 'firstname', 'lastname']
- extra = 0
- suit_classes = 'suit-tab suit-tab-users'
-
class UserInline(PlStackTabularInline):
model = User
- fields = ['email', 'firstname', 'lastname']
+ fields = ['backend_status_icon', 'email', 'firstname', 'lastname']
+ readonly_fields = ('backend_status_icon', )
extra = 0
suit_classes = 'suit-tab suit-tab-users'
def queryset(self, request):
return User.select_by_user(request.user)
-class SliceROInline(ReadOnlyTabularInline):
- model = Slice
- suit_classes = 'suit-tab suit-tab-slices'
- fields = ['name','site', 'serviceClass', 'service']
-
class SliceInline(PlStackTabularInline):
model = Slice
- fields = ['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'
def queryset(self, request):
return Slice.select_by_user(request.user)
-class NodeROInline(ReadOnlyTabularInline):
- model = Node
- extra = 0
- suit_classes = 'suit-tab suit-tab-nodes'
- fields = ['name','deployment','site']
-
class NodeInline(PlStackTabularInline):
model = Node
extra = 0
suit_classes = 'suit-tab suit-tab-nodes'
- fields = ['name','deployment','site']
-
-class DeploymentPrivilegeROInline(ReadOnlyTabularInline):
- model = DeploymentPrivilege
- extra = 0
- suit_classes = 'suit-tab suit-tab-deploymentprivileges'
- fields = ['user','role','deployment']
+ fields = ['backend_status_icon', 'name','deployment','site']
+ readonly_fields = ('backend_status_icon', )
class DeploymentPrivilegeInline(PlStackTabularInline):
model = DeploymentPrivilege
extra = 0
suit_classes = 'suit-tab suit-tab-deploymentprivileges'
- fields = ['user','role','deployment']
+ fields = ['backend_status_icon', 'user','role','deployment']
+ readonly_fields = ('backend_status_icon', )
def queryset(self, request):
return DeploymentPrivilege.select_by_user(request.user)
-#CLEANUP DOUBLE SitePrivilegeInline
-class SitePrivilegeROInline(ReadOnlyTabularInline):
- model = SitePrivilege
- extra = 0
- suit_classes = 'suit-tab suit-tab-siteprivileges'
- fields = ['user','site', 'role']
-
class SitePrivilegeInline(PlStackTabularInline):
model = SitePrivilege
extra = 0
suit_classes = 'suit-tab suit-tab-siteprivileges'
- fields = ['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':
def queryset(self, request):
return SitePrivilege.select_by_user(request.user)
-class SiteDeploymentROInline(ReadOnlyTabularInline):
- model = SiteDeployments
- #model = Site.deployments.through
- extra = 0
- suit_classes = 'suit-tab suit-tab-deployments'
- fields = ['deployment','site']
-
class SiteDeploymentInline(PlStackTabularInline):
model = SiteDeployments
- #model = Site.deployments.through
extra = 0
suit_classes = 'suit-tab suit-tab-deployments'
- fields = ['deployment','site']
+ fields = ['backend_status_icon', 'deployment','site']
+ readonly_fields = ('backend_status_icon', )
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'site':
return SiteDeployments.select_by_user(request.user)
-class SlicePrivilegeROInline(ReadOnlyTabularInline):
- model = SlicePrivilege
- extra = 0
- suit_classes = 'suit-tab suit-tab-sliceprivileges'
- fields = ['user', 'slice', 'role']
-
class SlicePrivilegeInline(PlStackTabularInline):
model = SlicePrivilege
suit_classes = 'suit-tab suit-tab-sliceprivileges'
extra = 0
- fields = ('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':
- kwargs['queryset'] = Slice.select_by_user(request.user)
+ kwargs['queryset'] = Slice.select_by_user(request.user)
if db_field.name == 'user':
- kwargs['queryset'] = User.select_by_user(request.user)
+ kwargs['queryset'] = User.select_by_user(request.user)
return super(SlicePrivilegeInline, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
return SlicePrivilege.select_by_user(request.user)
-class SliceNetworkROInline(ReadOnlyTabularInline):
- model = Network.slices.through
- extra = 0
- verbose_name = "Network Connection"
- verbose_name_plural = "Network Connections"
- suit_classes = 'suit-tab suit-tab-slicenetworks'
- fields = ['network']
-
class SliceNetworkInline(PlStackTabularInline):
model = Network.slices.through
selflink_fieldname = "network"
verbose_name = "Network Connection"
verbose_name_plural = "Network Connections"
suit_classes = 'suit-tab suit-tab-slicenetworks'
- fields = ['network']
-
-class ImageDeploymentsROInline(ReadOnlyTabularInline):
- model = ImageDeployments
- extra = 0
- verbose_name = "Image Deployments"
- verbose_name_plural = "Image Deployments"
- suit_classes = 'suit-tab suit-tab-imagedeployments'
- fields = ['image', 'deployment', 'glance_image_id']
+ fields = ['backend_status_icon', 'network']
+ readonly_fields = ('backend_status_icon', )
class ImageDeploymentsInline(PlStackTabularInline):
model = ImageDeployments
verbose_name = "Image Deployments"
verbose_name_plural = "Image Deployments"
suit_classes = 'suit-tab suit-tab-imagedeployments'
- fields = ['image', 'deployment', 'glance_image_id']
- readonly_fields = ['glance_image_id']
-
-class PlainTextWidget(forms.HiddenInput):
- input_type = 'hidden'
-
- def render(self, name, value, attrs=None):
- if value is None:
- value = ''
- return mark_safe(str(value) + super(PlainTextWidget, self).render(name, value, attrs))
+ fields = ['backend_status_icon', 'image', 'deployment', 'glance_image_id']
+ readonly_fields = ['backend_status_icon', '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
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)
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['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
def save(self, commit=True):
deployment = super(DeploymentAdminForm, self).save(commit=False)
+ deployment.flavors = self.cleaned_data['flavors']
+
if commit:
deployment.save()
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.save_m2m()
+ self.save_m2m()
return deployment
class DeploymentAdmin(PlanetStackBaseAdmin):
model = Deployment
- fieldList = ['name','sites', 'images', 'accessControl']
+ 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] # ,ImageDeploymentsInline]
+ list_display = ['backend_status_icon', 'name']
+ list_display_links = ('backend_status_icon', 'name', )
+ readonly_fields = ('backend_status_text', )
- user_readonly_inlines = [DeploymentPrivilegeROInline,NodeROInline,TagROInline] # ,ImageDeploymentsROInline]
user_readonly_fields = ['name']
suit_form_tabs =(('sites','Deployment Details'),('nodes','Nodes'),('deploymentprivileges','Privileges'),('tags','Tags')) # ,('imagedeployments','Images'))
return AdminFormMetaClass
-class ServiceAttrAsTabROInline(ReadOnlyTabularInline):
- model = ServiceAttribute
- fields = ['name','value']
- extra = 0
- suit_classes = 'suit-tab suit-tab-serviceattrs'
-
class ServiceAttrAsTabInline(PlStackTabularInline):
model = ServiceAttribute
fields = ['name','value']
suit_classes = 'suit-tab suit-tab-serviceattrs'
class ServiceAdmin(PlanetStackBaseAdmin):
- list_display = ("name","description","versionNumber","enabled","published")
- fieldList = ["name","description","versionNumber","enabled","published"]
+ list_display = ("backend_status_icon","name","description","versionNumber","enabled","published")
+ list_display_links = ('backend_status_icon', 'name', )
+ 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
- user_readonly_inlines = [ServiceAttrAsTabROInline,SliceROInline]
suit_form_tabs =(('general', 'Service Details'),
('slices','Slices'),
)
class SiteAdmin(PlanetStackBaseAdmin):
- fieldList = ['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']}),
('siteprivileges','Privileges'),
('deployments','Deployments'),
('slices','Slices'),
- ('nodes','Nodes'),
+ ('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']
- user_readonly_inlines = [SliceROInline,UserROInline,TagROInline, NodeROInline, SitePrivilegeROInline,SiteDeploymentROInline]
- list_display = ('name', 'login_base','site_url', 'enabled')
+ 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]
search_fields = ['name']
class SitePrivilegeAdmin(PlanetStackBaseAdmin):
- fieldList = ['user', 'site', 'role']
+ fieldList = ['backend_status_text', 'user', 'site', 'role']
fieldsets = [
(None, {'fields': fieldList, 'classes':['collapse']})
]
- list_display = ('user', 'site', 'role')
+ readonly_fields = ('backend_status_text', )
+ list_display = ('backend_status_icon', 'user', 'site', 'role')
+ list_display_links = list_display
user_readonly_fields = fieldList
user_readonly_inlines = []
class Meta:
model = Slice
widgets = {
- 'service': LinkedSelect
+ 'service': LinkedSelect
}
+ def clean(self):
+ cleaned_data = super(SliceForm, self).clean()
+ name = cleaned_data.get('name')
+ site_id = cleaned_data.get('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 SliceAdmin(PlanetStackBaseAdmin):
form = SliceForm
- fieldList = ['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']}),]
- list_display = ('name', 'site','serviceClass', 'slice_url', 'max_slivers')
+ 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]
user_readonly_fields = fieldList
- user_readonly_inlines = [SlicePrivilegeROInline,SliverROInline,TagROInline, ReservationROInline, SliceNetworkROInline]
suit_form_tabs =(('general', 'Slice Details'),
('slicenetworks','Networks'),
)
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) )
-
deployment_nodes = []
for node in Node.objects.all():
deployment_nodes.append( (node.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 imageDeployment in image.imagedeployments_set.all():
+ deployment_images.append( (imageDeployment.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):
class SlicePrivilegeAdmin(PlanetStackBaseAdmin):
fieldsets = [
- (None, {'fields': ['user', 'slice', 'role']})
+ (None, {'fields': ['backend_status_text', 'user', 'slice', 'role']})
]
- list_display = ('user', 'slice', 'role')
+ readonly_fields = ('backend_status_text', )
+ list_display = ('backend_status_icon', 'user', 'slice', 'role')
+ list_display_links = list_display
user_readonly_fields = ['user', 'slice', 'role']
user_readonly_inlines = []
class ImageAdmin(PlanetStackBaseAdmin):
- fieldsets = [('Image Details',
- {'fields': ['name', 'disk_format', 'container_format'],
+ fieldsets = [('Image Details',
+ {'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'))
inlines = [SliverInline, ImageDeploymentsInline]
user_readonly_fields = ['name', 'disk_format', 'container_format']
- user_readonly_inlines = [SliverROInline, ImageDeploymentsROInline]
-
+
+ list_display = ['backend_status_icon', 'name']
+ list_display_links = ('backend_status_icon', 'name', )
+
class NodeForm(forms.ModelForm):
class Meta:
widgets = {
class NodeAdmin(PlanetStackBaseAdmin):
form = NodeForm
- list_display = ('name', 'site', 'deployment')
+ list_display = ('backend_status_icon', 'name', 'site', 'deployment')
+ list_display_links = ('backend_status_icon', 'name', )
list_filter = ('deployment',)
inlines = [TagInline,SliverInline]
- fieldsets = [('Node Details', {'fields': ['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_inlines = [TagInline,SliverInline]
}
class TagAdmin(PlanetStackBaseAdmin):
- list_display = ['service', 'name', 'value', 'content_type', 'content_object',]
+ list_display = ['backend_status_icon', 'service', 'name', 'value', 'content_type', 'content_object',]
+ list_display_links = list_display
user_readonly_fields = ['service', 'name', 'value', 'content_type', 'content_object',]
user_readonly_inlines = []
class SliverAdmin(PlanetStackBaseAdmin):
form = SliverForm
fieldsets = [
- ('Sliver Details', {'fields': ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'numberCores', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
+ ('Sliver Details', {'fields': ['backend_status_text', 'slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image', ], 'classes': ['suit-tab suit-tab-general'], })
]
- list_display = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']
+ readonly_fields = ('backend_status_text', )
+ list_display = ['backend_status_icon', 'ip', 'instance_name', 'slice', 'flavor', 'image', 'node', 'deploymentNetwork']
+ list_display_links = ('backend_status_icon', 'ip',)
suit_form_tabs =(('general', 'Sliver Details'),
('tags','Tags'),
inlines = [TagInline]
- user_readonly_fields = ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'numberCores', 'image']
- user_readonly_inlines = [TagROInline]
+ user_readonly_fields = ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image']
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'slice':
return super(SliverAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
def queryset(self, request):
- # admins can see all slivers. Users can only see slivers of
+ # admins can see all slivers. Users can only see slivers of
# the slices they belong to.
return Sliver.select_by_user(request.user)
def get_formsets(self, request, obj=None):
# 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 = ('ip', 'instance_name')
+ self.readonly_fields = ('backend_status_text')
else:
- self.readonly_fields = ()
- #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
+ self.readonly_fields = ('backend_status_text')
+ #self.readonly_fields = ('ip', 'instance_name', 'slice', 'image', 'key')
for inline in self.get_inline_instances(request, obj):
# hide MyInline in the add view
suit_classes = 'suit-tab suit-tab-dashboards'
fields = ['user', 'dashboardView', 'order']
-class UserDashboardViewROInline(ReadOnlyTabularInline):
- model = UserDashboardView
- extra = 0
- suit_classes = 'suit-tab suit-tab-dashboards'
- fields = ['user', 'dashboardView', 'order']
-
class UserAdmin(UserAdmin):
class Meta:
app_label = "core"
fieldListContactInfo = ['firstname','lastname','phone','timezone']
fieldsets = (
- ('Login Details', {'fields': ['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',)}),
'fields': ('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
- user_readonly_inlines = [SlicePrivilegeROInline,SitePrivilegeROInline,DeploymentPrivilegeROInline,UserDashboardViewROInline]
suit_form_tabs =(('general','Login Details'),
('contact','Contact Information'),
# save the original readonly fields\r
self.readonly_save = self.readonly_fields\r
self.inlines_save = self.inlines
- self.readonly_fields=self.user_readonly_fields
- self.inlines = self.user_readonly_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"):\r
# restore the original readonly fields\r
def queryset(self, request):
return User.select_by_user(request.user)
+ def backend_status_text(self, obj):
+ return mark_safe(backend_text(obj))
+
+ def backend_status_icon(self, obj):
+ return mark_safe(backend_icon(obj))
+ backend_status_icon.short_description = ""
+
class DashboardViewAdmin(PlanetStackBaseAdmin):
fieldsets = [('Dashboard View Details',
- {'fields': ['name', 'url'],
+ {'fields': ['backend_status_text', 'name', 'url'],
'classes': ['suit-tab suit-tab-general']})
]
+ readonly_fields = ('backend_status_text', )
suit_form_tabs =(('general','Dashboard View Details'),)
-class ServiceResourceROInline(ReadOnlyTabularInline):
- model = ServiceResource
- extra = 0
- fields = ['serviceClass', 'name', 'maxUnitsDeployment', 'maxUnitsNode', 'maxDuration', 'bucketInRate', 'bucketMaxSize', 'cost', 'calendarReservable']
-
class ServiceResourceInline(PlStackTabularInline):
model = ServiceResource
extra = 0
class ServiceClassAdmin(PlanetStackBaseAdmin):
- list_display = ('name', 'commitment', 'membershipFee')
+ list_display = ('backend_status_icon', 'name', 'commitment', 'membershipFee')
+ list_display_links = ('backend_status_icon', 'name', )
inlines = [ServiceResourceInline]
user_readonly_fields = ['name', 'commitment', 'membershipFee']
user_readonly_inlines = []
-class ReservedResourceROInline(ReadOnlyTabularInline):
- model = ReservedResource
- extra = 0
- fields = ['sliver', 'resource','quantity','reservationSet']
- suit_classes = 'suit-tab suit-tab-reservedresources'
-
class ReservedResourceInline(PlStackTabularInline):
model = ReservedResource
extra = 0
return False
class ReservationAdmin(PlanetStackBaseAdmin):
- fieldList = ['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
suit_form_tabs = (('general','Reservation Details'), ('reservedresources','Reserved Resources'))
inlines = [ReservedResourceInline]
- user_readonly_inlines = [ReservedResourceROInline]
user_readonly_fields = fieldList
def add_view(self, request, form_url='', extra_context=None):
return Reservation.select_by_user(request.user)
class NetworkParameterTypeAdmin(PlanetStackBaseAdmin):
- list_display = ("name", )
+ list_display = ("backend_status_icon", "name", )
+ list_display_links = ('backend_status_icon', 'name', )
user_readonly_fields = ['name']
user_readonly_inlines = []
class RouterAdmin(PlanetStackBaseAdmin):
- list_display = ("name", )
+ list_display = ("backend_status_icon", "name", )
+ list_display_links = ('backend_status_icon', 'name', )
user_readonly_fields = ['name']
user_readonly_inlines = []
-class RouterROInline(ReadOnlyTabularInline):
- model = Router.networks.through
- extra = 0
- verbose_name_plural = "Routers"
- verbose_name = "Router"
- suit_classes = 'suit-tab suit-tab-routers'
-
- fields = ['name', 'owner', 'permittedNetworks', 'networks']
-
class RouterInline(PlStackTabularInline):
model = Router.networks.through
extra = 0
verbose_name = "Router"
suit_classes = 'suit-tab suit-tab-routers'
-class NetworkParameterROInline(ReadOnlyTabularInline):
- model = NetworkParameter
- extra = 1
- verbose_name_plural = "Parameters"
- verbose_name = "Parameter"
- suit_classes = 'suit-tab suit-tab-netparams'
- fields = ['parameter', 'value', 'content_type', 'object_id', 'content_object']
-
-class NetworkParameterInline(generic.GenericTabularInline):
+class NetworkParameterInline(PlStackGenericTabularInline):
model = NetworkParameter
- extra = 1
+ extra = 0
verbose_name_plural = "Parameters"
verbose_name = "Parameter"
suit_classes = 'suit-tab suit-tab-netparams'
-
-class NetworkSliversROInline(ReadOnlyTabularInline):
- fields = ['network', 'sliver', 'ip', 'port_id']
- model = NetworkSliver
- extra = 0
- verbose_name_plural = "Slivers"
- verbose_name = "Sliver"
- suit_classes = 'suit-tab suit-tab-networkslivers'
+ fields = ['backend_status_icon', 'parameter', 'value']
+ readonly_fields = ('backend_status_icon', )
class NetworkSliversInline(PlStackTabularInline):
- readonly_fields = ("ip", )
+ fields = ['backend_status_icon', 'network','sliver','ip']
+ readonly_fields = ("backend_status_icon", "ip", )
model = NetworkSliver
selflink_fieldname = "sliver"
extra = 0
verbose_name = "Sliver"
suit_classes = 'suit-tab suit-tab-networkslivers'
-class NetworkSlicesROInline(ReadOnlyTabularInline):
- model = NetworkSlice
- extra = 0
- verbose_name_plural = "Slices"
- verbose_name = "Slice"
- suit_classes = 'suit-tab suit-tab-networkslices'
- fields = ['network','slice']
-
class NetworkSlicesInline(PlStackTabularInline):
model = NetworkSlice
selflink_fieldname = "slice"
verbose_name_plural = "Slices"
verbose_name = "Slice"
suit_classes = 'suit-tab suit-tab-networkslices'
+ fields = ['backend_status_icon', 'network','slice']
+ readonly_fields = ('backend_status_icon', )
class NetworkAdmin(PlanetStackBaseAdmin):
- list_display = ("name", "subnet", "ports", "labels")
+ list_display = ("backend_status_icon", "name", "subnet", "ports", "labels")
+ list_display_links = ('backend_status_icon', 'name', )
readonly_fields = ("subnet", )
inlines = [NetworkParameterInline, NetworkSliversInline, NetworkSlicesInline, RouterInline]
fieldsets = [
- (None, {'fields': ['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','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'], 'classes':['suit-tab suit-tab-general']}),]
+ 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_inlines = [NetworkParameterROInline, NetworkSliversROInline, NetworkSlicesROInline, RouterROInline]
suit_form_tabs =(
('general','Network Details'),
('routers','Routers'),
)
class NetworkTemplateAdmin(PlanetStackBaseAdmin):
- list_display = ("name", "guaranteedBandwidth", "visibility")
+ list_display = ("backend_status_icon", "name", "guaranteedBandwidth", "visibility")
+ list_display_links = ('backend_status_icon', 'name', )
user_readonly_fields = ["name", "guaranteedBandwidth", "visibility"]
user_readonly_inlines = []
+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):
auth = {'username': request.POST['username'],
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,
admin.site.register(Sliver, SliverAdmin)
admin.site.register(Image, ImageAdmin)
admin.site.register(DashboardView, DashboardViewAdmin)
+ admin.site.register(Flavor, FlavorAdmin)
git://git.onelab.eu / plstackapi.git / blobdiff