Merge branch 'issue-450' into 'master'

Fix vm state changed to XY on None message

Closes #450

See merge request !372

circle/vm/models/instance.py

@@ -447,12 +447,17 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
         if new_node is False:  # None would be a valid value
         if new_node is False:  # None would be a valid value
             new_node = self.node
             new_node = self.node
         # log state change
         # log state change
+
+        if new_node:
+            msg = ugettext_noop("vm state changed to %(state)s on %(node)s")
+        else:
+            msg = ugettext_noop("vm state changed to %(state)s")
+
         try:
         try:
             act = InstanceActivity.create(
             act = InstanceActivity.create(
                 code_suffix='vm_state_changed',
                 code_suffix='vm_state_changed',
-                readable_name=create_readable(
-                    ugettext_noop("vm state changed to %(state)s on %(node)s"),
-                    state=new_state, node=new_node),
+                readable_name=create_readable(msg, state=new_state,
+                                              node=new_node),
                 instance=self)
                 instance=self)
         except ActivityInProgressError:
         except ActivityInProgressError:
             pass  # discard state change if another activity is in progress.
             pass  # discard state change if another activity is in progress.