git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
[plstackapi.git]
/
planetstack
/
core
/
admin.py
diff --git
a/planetstack/core/admin.py
b/planetstack/core/admin.py
index
296098f
..
1debeb0
100644
(file)
--- a/
planetstack/core/admin.py
+++ b/
planetstack/core/admin.py
@@
-340,9
+340,9
@@
class NetworkLookerUpper:
class SliverInline(PlStackTabularInline):
model = Sliver
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
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):
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['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 for x in self.instance.sites
deployments
.all()]
self.fields['images'].initial = [x.image for x in self.instance.imagedeployments.all()]
self.fields['flavors'].initial = self.instance.flavors.all()
self.fields['images'].initial = [x.image for x in self.instance.imagedeployments.all()]
self.fields['flavors'].initial = self.instance.flavors.all()
@@
-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'))
# 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():
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:
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
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
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']
#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
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']
class ServiceAttrAsTabInline(PlStackTabularInline):
model = ServiceAttribute
fields = ['name','value']
@@
-763,6
+770,12
@@
class ServiceAdmin(PlanetStackBaseAdmin):
('serviceattrs','Additional Attributes'),
)
('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 = [
class SiteAdmin(PlanetStackBaseAdmin):
fieldList = ['backend_status_text', 'name', 'site_url', 'enabled', 'is_public', 'login_base', 'accountLink','location']
fieldsets = [
@@
-776,8
+789,8
@@
class SiteAdmin(PlanetStackBaseAdmin):
list_display = ('backend_status_icon', 'name', 'login_base','site_url', 'enabled')
list_display_links = ('backend_status_icon', 'name', )
filter_horizontal = ('deployments',)
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 = [ControllerSite
Inline
]
search_fields = ['name']
@property
search_fields = ['name']
@property
@@
-787,8
+800,7
@@
class SiteAdmin(PlanetStackBaseAdmin):
('siteprivileges','Privileges'),
('deployments','Deployments'),
('slices','Slices'),
('siteprivileges','Privileges'),
('deployments','Deployments'),
('slices','Slices'),
- #('nodes','Nodes'),
- ('tags','Tags'),
+ ('nodes','Nodes'),
]
request=getattr(_thread_locals, "request", None)
]
request=getattr(_thread_locals, "request", None)
@@
-922,8
+934,8
@@
class SliceAdmin(PlanetStackBaseAdmin):
('slicenetworks','Networks'),
('sliceprivileges','Privileges'),
('slivers','Slivers'),
('slicenetworks','Networks'),
('sliceprivileges','Privileges'),
('slivers','Slivers'),
- ('tags','Tags'),
('reservations','Reservations'),
('reservations','Reservations'),
+ ('tags','Tags'),
]
request=getattr(_thread_locals, "request", None)
]
request=getattr(_thread_locals, "request", None)
@@
-1065,7
+1077,7
@@
class NodeAdmin(PlanetStackBaseAdmin):
user_readonly_fields = ['name','site_deployment']
user_readonly_inlines = [TagInline,SliverInline]
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):
class SliverForm(forms.ModelForm):
@@
-1076,6
+1088,7
@@
class SliverForm(forms.ModelForm):
widgets = {
'ip': PlainTextWidget(),
'instance_name': PlainTextWidget(),
widgets = {
'ip': PlainTextWidget(),
'instance_name': PlainTextWidget(),
+ 'instance_id': PlainTextWidget(),
'slice': LinkedSelect,
'deployment': LinkedSelect,
'node': LinkedSelect,
'slice': LinkedSelect,
'deployment': LinkedSelect,
'node': LinkedSelect,
@@
-1091,15
+1104,13
@@
class TagAdmin(PlanetStackBaseAdmin):
class SliverAdmin(PlanetStackBaseAdmin):
form = SliverForm
fieldsets = [
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', )
]
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',)
list_display_links = ('backend_status_icon', 'ip',)
- suit_form_tabs =(('general', 'Sliver Details'),
- ('tags','Tags'),
- )
+ suit_form_tabs =(('general', 'Sliver Details'),)
inlines = [TagInline]
inlines = [TagInline]
@@
-1239,7
+1250,7
@@
class UserAdmin(PermissionCheckingAdminMixin, UserAdmin):
add_fieldsets = (
(None, {
'classes': ('wide',),
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', )
),
)
readonly_fields = ('backend_status_text', )
@@
-1283,9
+1294,10
@@
class ControllerDashboardViewInline(PlStackTabularInline):
class DashboardViewAdmin(PlanetStackBaseAdmin):
fieldsets = [('Dashboard View Details',
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']})
]
'classes': ['suit-tab suit-tab-general']})
]
+ list_display = ["name", "enabled", "url"]
readonly_fields = ('backend_status_text', )
inlines = [ControllerDashboardViewInline]
readonly_fields = ('backend_status_text', )
inlines = [ControllerDashboardViewInline]