From af79d6aaf7b2305e4032f01ed0fe7dff2a01fee3 Mon Sep 17 00:00:00 2001
From: jeff <jeff@greenqloud.com>
Date: Mon, 21 Apr 2014 14:47:12 +0000
Subject: [PATCH] CLOUDSTACK-6467: Add pre/post-state transition status to
 messages published on

... event bus by UserVmStateListener. Allow system VM resource state
post-transitions to be published.

(cherry picked from commit 9c4de764f74bffd5cd547f8514d4a6897fb961c2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/vm/UserVmStateListener.java
---
 server/src/com/cloud/vm/UserVmStateListener.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/com/cloud/vm/UserVmStateListener.java
index f783ffaa607..213ff8af72c 100644
--- a/server/src/com/cloud/vm/UserVmStateListener.java
+++ b/server/src/com/cloud/vm/UserVmStateListener.java
@@ -72,12 +72,12 @@ public class UserVmStateListener implements StateListener<State, VirtualMachine.
         if(!status){
             return false;
         }
-        
-        if(vo.getType() != VirtualMachine.Type.User){
+
+        pubishOnEventBus(event.name(), "postStateTransitionEvent", vo, oldState, newState);
+
+        if (vo.getType() != VirtualMachine.Type.User) {
             return true;
         }
-        
-        pubishOnEventBus(event.name(), "postStateTransitionEvent", vo, oldState, newState);
 
         if (VirtualMachine.State.isVmCreated(oldState, event, newState)) {
             generateUsageEvent(vo.getServiceOfferingId(), vo, EventTypes.EVENT_VM_CREATE);
@@ -135,6 +135,7 @@ public class UserVmStateListener implements StateListener<State, VirtualMachine.
         eventDescription.put("id", vo.getUuid());
         eventDescription.put("old-state", oldState.name());
         eventDescription.put("new-state", newState.name());
+        eventDescription.put("status", status);
 
         String eventDate = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").format(new Date());
         eventDescription.put("eventDateTime", eventDate);