Add pre/post-state transition status to messages published on event bus by UserVmStateListener. Allow system VM resource state post-transitions to be published.

jeff · murali-reddy · commit 9c4de764f74b · 2014-04-24T20:05:26.000+05:30
diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/com/cloud/vm/UserVmStateListener.java
@@ -77,12 +77,12 @@ public boolean postStateTransitionEvent(State oldState, Event event, State newSt
             return false;
         }
 
+        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);
         } else if (VirtualMachine.State.isVmStarted(oldState, event, newState)) {
@@ -128,6 +128,7 @@ private void pubishOnEventBus(String event, String status, VirtualMachine vo, Vi
         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);
