CLOUDSTACK-5849: Failed shutdown of the network causes network state to

murali-reddy · murali-reddy · commit 470f251cbb5c · 2014-01-13T17:47:47.000+05:30
be changed to 'Implemented'

Wrong network state transition

s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented

fix keeps state as Shutdown
diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java
@@ -225,7 +225,7 @@ public enum State {
             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);
         }

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ public enum State {`
`225`	`225`	`s_fsm.addTransition(State.Implementing, Event.OperationFailed, State.Shutdown);`
`226`	`226`	`s_fsm.addTransition(State.Implemented, Event.DestroyNetwork, State.Shutdown);`
`227`	`227`	`s_fsm.addTransition(State.Shutdown, Event.OperationSucceeded, State.Allocated);`
`228`		`- s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Implemented);`
	`228`	`+ s_fsm.addTransition(State.Shutdown, Event.OperationFailed, State.Shutdown);`
`229`	`229`	`s_fsm.addTransition(State.Setup, Event.DestroyNetwork, State.Destroy);`
`230`	`230`	`s_fsm.addTransition(State.Allocated, Event.DestroyNetwork, State.Destroy);`
`231`	`231`	`}`