X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fcore%2Fadmin.py;h=bc845540f1116480e29963555e21a59df4437092;hb=a5800d37ffca30e7c9231045dd553f68b7191906;hp=1952890daadd115f386946eb1ce3b3bac7a523fd;hpb=19017f39a21a240ea42b5b11cb040adb760c6e84;p=plstackapi.git
diff --git a/planetstack/core/admin.py b/planetstack/core/admin.py
index 1952890..bc84554 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', 'controllerNetwork', 'flavor', 'image', 'node']
extra = 0
readonly_fields = ['backend_status_icon', 'all_ips_string', 'instance_name']
suit_classes = 'suit-tab suit-tab-slivers'
@@ -335,7 +349,7 @@ 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 == 'controllerNetwork':
kwargs['queryset'] = Deployment.select_by_acl(request.user)
kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_deployment_changed(this);"})
elif db_field.name == 'flavor':
@@ -377,19 +391,35 @@ 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 ControllerPrivilegeInline(PlStackTabularInline):
+ model = ControllerPrivilege
+ 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)
+
+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
extra = 0
@@ -408,11 +438,11 @@ class SitePrivilegeInline(PlStackTabularInline):
def queryset(self, request):
return SitePrivilege.select_by_user(request.user)
-class SiteDeploymentInline(PlStackTabularInline):
+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):
@@ -421,7 +451,11 @@ class SiteDeploymentInline(PlStackTabularInline):
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 SiteDeployments.select_by_user(request.user)
@@ -461,7 +495,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 +551,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.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()
def manipulate_m2m_objs(self, this_obj, selected_objs, all_relations, relation_class, local_attrname, foreign_attrname):
@@ -560,8 +603,8 @@ 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.sitedeployments.all(), SiteDeployments, "deployment", "site")
+ self.manipulate_m2m_objs(deployment, self.cleaned_data['images'], deployment.imagedeployments.all(), DeploymentImages, "deployment", "image")
self.save_m2m()
@@ -578,16 +621,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'),('tags','Tags'),('imagedeployments','Images'))
def get_form(self, request, obj=None, **kwargs):
if request.user.isReadOnlyUser():
@@ -605,6 +652,96 @@ class DeploymentAdmin(PlanetStackBaseAdmin):
return AdminFormMetaClass
+class ControllerAdminForm(forms.ModelForm):
+ site_deployments = forms.ModelMultipleChoiceField(
+ queryset=SiteDeployments.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, **kwargs):
+ 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','admin_password']
+ #fieldsets = [(None, {'fields': fieldList, 'classes':['suit-tab suit-tab-general']})]
+ inlines = [ControllerSiteDeploymentsInline] # ,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
+
class ServiceAttrAsTabInline(PlStackTabularInline):
model = ServiceAttribute
fields = ['name','value']
@@ -637,7 +774,7 @@ class SiteAdmin(PlanetStackBaseAdmin):
('siteprivileges','Privileges'),
('deployments','Deployments'),
('slices','Slices'),
- ('nodes','Nodes'),
+ #('nodes','Nodes'),
('tags','Tags'),
)
readonly_fields = ['backend_status_text', 'accountLink']
@@ -647,7 +784,7 @@ 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, SiteDeploymentsInline]
search_fields = ['name']
def queryset(self, request):
@@ -738,6 +875,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,13 +885,13 @@ 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 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):
@@ -762,7 +902,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 = [ControllerSlicesInline]
user_readonly_fields = fieldList
@@ -781,6 +921,17 @@ 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 = []
@@ -794,8 +945,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.controller.id, image.id, image.name) )
site_login_bases = []
for site in Site.objects.all():
@@ -875,9 +1026,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,15 +1044,15 @@ 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'))
@@ -916,7 +1067,7 @@ class SliverForm(forms.ModelForm):
'ip': PlainTextWidget(),
'instance_name': PlainTextWidget(),
'slice': LinkedSelect,
- 'deploymentNetwork': LinkedSelect,
+ 'controllerNetwork': LinkedSelect,
'node': LinkedSelect,
'image': LinkedSelect
}
@@ -930,10 +1081,10 @@ 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', 'controllerNetwork', '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', 'controllerNetwork']
list_display_links = ('backend_status_icon', 'ip',)
suit_form_tabs =(('general', 'Sliver Details'),
@@ -942,7 +1093,7 @@ class SliverAdmin(PlanetStackBaseAdmin):
inlines = [TagInline]
- user_readonly_fields = ['slice', 'deploymentNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image']
+ user_readonly_fields = ['slice', 'controllerNetwork', 'node', 'ip', 'instance_name', 'flavor', 'image']
def formfield_for_foreignkey(self, db_field, request, **kwargs):
if db_field.name == 'slice':
@@ -1026,6 +1177,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.
@@ -1055,7 +1207,7 @@ 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,ControllerPrivilegeInline,UserDashboardViewInline]
fieldListLoginDetails = ['backend_status_text', 'email','site','password','is_active','is_readonly','is_admin','public_key']
fieldListContactInfo = ['firstname','lastname','phone','timezone']
@@ -1088,7 +1240,7 @@ class UserAdmin(PermissionCheckingAdminMixin, UserAdmin):
('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):
@@ -1309,25 +1461,39 @@ class NetworkSlicesInline(PlStackTabularInline):
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):
+ 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 = [ControllerNetworksInline]
+
+ 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','guaranteedBandwidth', 'permitAllSlices','permittedSlices','network_id','router_id','subnet_id','subnet'],
+ 'classes':['suit-tab suit-tab-general']}),
+ (None, {'fields': ['topologyParameters', 'controllerUrl', 'controllerParameters'],
+ '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']
@@ -1335,6 +1501,7 @@ class NetworkAdmin(PlanetStackBaseAdmin):
@property
def suit_form_tabs(self):
tabs=[('general','Network Details'),
+ ('sdn', 'SDN Configuration'),
('netparams', 'Parameters'),
('networkslivers','Slivers'),
('networkslices','Slices'),
@@ -1353,6 +1520,10 @@ class NetworkTemplateAdmin(PlanetStackBaseAdmin):
list_display_links = ('backend_status_icon', 'name', )
user_readonly_fields = ["name", "guaranteedBandwidth", "visibility"]
user_readonly_inlines = []
+ fieldsets = [
+ (None, {'fields': ['name', 'description', 'guaranteedBandwidth', 'visibility', 'translation', 'sharedNetworkName', 'sharedNetworkId', 'topologyKind', 'controllerKind'],
+ '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 +1666,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 +1682,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)