From 1ea56dfd39e769b0bca4cb3bd029186f424b57c4 Mon Sep 17 00:00:00 2001
From: Kálmán Viktor <kviktor@cloud.bme.hu>
Date: Wed, 11 May 2016 15:20:07 +0200
Subject: [PATCH] vm: fix vm state changed to XY on None message
---
circle/vm/models/instance.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/circle/vm/models/instance.py b/circle/vm/models/instance.py
index 9925c56..3e9a46f 100644
--- a/circle/vm/models/instance.py
+++ b/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
new_node = self.node
# 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:
act = InstanceActivity.create(
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)
except ActivityInProgressError:
pass # discard state change if another activity is in progress.
--
libgit2 0.26.0