vm: add add_port, remove_port to merged_activities.whitelist

d0cc86ea · Bach Dániel · 62060459 · d0cc86ea
Commit d0cc86ea authored Oct 21, 2014 by Bach Dániel
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

circle/vm/models/instance.py
+1 -1

No files found.
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
@@ -817,7 +817,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
        return acts

    def get_merged_activities(self, user=None):
-        whitelist = ("create_disk", "download_disk")
+        whitelist = ("create_disk", "download_disk", "add_port", "remove_port")
        acts = self.get_activities(user)
        merged_acts = []
        latest = None