vm: add whitelist to merged_activities

circle/vm/models/instance.py

@@ -928,6 +928,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
         return acts
         return acts
 
 
     def get_merged_activities(self, user=None):
     def get_merged_activities(self, user=None):
+        whitelist = ("create_disk", "download_disk")
         acts = self.get_activities(user)
         acts = self.get_activities(user)
         merged_acts = []
         merged_acts = []
         latest = None
         latest = None
@@ -935,7 +936,9 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
         for a in acts:
         for a in acts:
             if (latest == a.activity_code and
             if (latest == a.activity_code and
                     merged_acts[-1].result == a.result and
                     merged_acts[-1].result == a.result and
-                    (merged_acts[-1].finished - a.finished).days < 7):
+                    a.finished and merged_acts[-1].finished and
+                    (merged_acts[-1].finished - a.finished).days < 7 and
+                    not a.activity_code.endswith(whitelist)):
                 merged_acts[-1].times += 1
                 merged_acts[-1].times += 1
             else:
             else:
                 merged_acts.append(a)
                 merged_acts.append(a)