fix cleanup wrong method name, fix sliver set to null
diff --git a/xos/ceilometer/admin.py b/xos/ceilometer/admin.py
index 346a98e..8b6f469 100644
--- a/xos/ceilometer/admin.py
+++ b/xos/ceilometer/admin.py
@@ -64,12 +64,13 @@
model = MonitoringChannel
class MonitoringChannelAdmin(ReadOnlyAwareAdmin):
- list_display = ('backend_status_icon', 'id', 'service_specific_id', )
+ list_display = ('backend_status_icon', 'id', )
list_display_links = ('backend_status_icon', 'id')
- fieldsets = [ (None, {'fields': ['backend_status_text', 'kind', 'provider_service', # 'service_specific_id', # 'service_specific_attribute',
+ fieldsets = [ (None, {'fields': ['backend_status_text', 'kind', 'provider_service', 'service_specific_attribute',
+ 'sliver',
'creator'],
'classes':['suit-tab suit-tab-general']})]
- readonly_fields = ('backend_status_text', )
+ readonly_fields = ('backend_status_text', 'sliver', 'service_specific_attribute')
form = MonitoringChannelForm
suit_form_tabs = (('general','Details'),)
diff --git a/xos/ceilometer/models.py b/xos/ceilometer/models.py
index 3822809..2b2e990 100644
--- a/xos/ceilometer/models.py
+++ b/xos/ceilometer/models.py
@@ -31,7 +31,6 @@
if ceilometer_services:
self._meta.get_field("provider_service").default = ceilometer_services[0].id
super(MonitoringChannel, self).__init__(*args, **kwargs)
- self.sliver = None
def save(self, *args, **kwargs):
if not self.creator:
@@ -46,7 +45,7 @@
model_policy_monitoring_channel(self.pk)
def delete(self, *args, **kwargs):
- self.cleanup_sliver()
+ self.cleanup_container()
super(MonitoringChannel, self).delete(*args, **kwargs)
def model_policy_monitoring_channel(pk):