Commit d48175e1 by Őry Máté

Merge branch 'issue-177' into 'master'

Issue 177
parents 1ee90a64 3b9457cc
......@@ -648,11 +648,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
raise Node.DoesNotExist()
def _is_notified_about_expiration(self):
renews = self.activity_log.filter(activity_code__endswith='renew')
cond = {'activity_code__endswith': 'notification_about_expiration'}
if len(renews) > 0:
cond['finished__gt'] = renews[0].started
return self.activity_log.filter(**cond).exists()
last_activity = self.activity_log.latest('pk')
return (last_activity.activity_code ==
def notify_owners_about_expiration(self, again=False):
"""Notify owners about vm expiring soon if they aren't already.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment