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
- 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):
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.sitesdeployments.all()]
self.fields['images'].initial = [x.image for x in self.instance.imagedeployments.all()]
self.fields['flavors'].initial = self.instance.flavors.all()
# 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():
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
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']
('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 = [
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 = [ControllerSiteInline]
search_fields = ['name']
@property
('siteprivileges','Privileges'),
('deployments','Deployments'),
('slices','Slices'),
- #('nodes','Nodes'),
- ('tags','Tags'),
+ ('nodes','Nodes'),
]
request=getattr(_thread_locals, "request", None)
('slicenetworks','Networks'),
('sliceprivileges','Privileges'),
('slivers','Slivers'),
- ('tags','Tags'),
('reservations','Reservations'),
+ ('tags','Tags'),
]
request=getattr(_thread_locals, "request", None)
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):
widgets = {
'ip': PlainTextWidget(),
'instance_name': PlainTextWidget(),
+ 'instance_id': PlainTextWidget(),
'slice': LinkedSelect,
'deployment': LinkedSelect,
'node': LinkedSelect,
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', )
- 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',)
- suit_form_tabs =(('general', 'Sliver Details'),
- ('tags','Tags'),
- )
+ suit_form_tabs =(('general', 'Sliver Details'),)
inlines = [TagInline]
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', )
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]