CORD-1913: Restore execution of custom service save() methods in attics
Change-Id: I989aef8f1efa9a61ea6ca88fec2eec7f1e24ac83
(cherry picked from commit df97081abcd640f857b9287f0ab75822cf290e37)
diff --git a/xos/attic/monitoringchannel_model.py b/xos/attic/monitoringchannel_model.py
index 458759a..250d6c1 100644
--- a/xos/attic/monitoringchannel_model.py
+++ b/xos/attic/monitoringchannel_model.py
@@ -30,7 +30,7 @@
#Allow creation of this model instances for non-admin users also
return True
-def save(self, *args, **kwargs):
+def __xos_save_base(self, *args, **kwargs):
if not self.creator:
if not getattr(self, "caller", None):
# caller must be set when creating a monitoring channel since it creates a slice
@@ -45,8 +45,8 @@
if channel_count > 0:
raise XOSValidationError("Already %s channels exist for user Can only create max 1 MonitoringChannel instance per user" % str(channel_count))
- super(MonitoringChannel, self).save(*args, **kwargs)
model_policy_monitoring_channel(self.pk)
+ return False
def delete(self, *args, **kwargs):
self.cleanup_container()
@@ -183,4 +183,4 @@
ceilometer_services = CeilometerService.get_service_objects().all()
if not ceilometer_services:
return None
- return ceilometer_services[0].kafka_url
\ No newline at end of file
+ return ceilometer_services[0].kafka_url