From 470f251cbb5cd32cb7fca60c0bb533db5927c095 Mon Sep 17 00:00:00 2001 From: Murali Reddy Date: Mon, 13 Jan 2014 17:47:47 +0530 Subject: [PATCH] CLOUDSTACK-5849: Failed shutdown of the network causes network state to be changed to 'Implemented' Wrong network state transition s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented fix keeps state as Shutdown --- api/src/com/cloud/network/Network.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java index 0b767898b31..2197c2b7143 100644 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@ -225,7 +225,7 @@ public interface Network extends ControlledEntity, StateObject, I s_fsm.addTransition(State.Implementing, Event.OperationFailed, State.Shutdown); s_fsm.addTransition(State.Implemented, Event.DestroyNetwork, State.Shutdown); s_fsm.addTransition(State.Shutdown, Event.OperationSucceeded, State.Allocated); - s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Implemented); + s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Shutdown); s_fsm.addTransition(State.Setup, Event.DestroyNetwork, State.Destroy); s_fsm.addTransition(State.Allocated, Event.DestroyNetwork, State.Destroy); }