You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by dk...@apache.org on 2013/01/23 14:04:03 UTC

git commit: Fgcp: remap instance error states according to allowed actions

Updated Branches:
  refs/heads/master 8d8d19039 -> 9577bee84


Fgcp: remap instance error states according to allowed actions


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/9577bee8
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/9577bee8
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/9577bee8

Branch: refs/heads/master
Commit: 9577bee8470ee2097702a79eb04b00daf3d55a3b
Parents: 8d8d190
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Sun Jan 20 11:04:01 2013 +1100
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Wed Jan 23 21:42:43 2013 +1100

----------------------------------------------------------------------
 server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/9577bee8/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
index cbda9ea..558771b 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb
@@ -60,6 +60,7 @@ class FgcpDriver < Deltacloud::BaseDriver
     stopping.to( :stopped )       .automatically  # stopping an instance does not automatically destroy it
     stopped.to(:running)          .on( :start )   # obvious
     stopped.to(:finish)           .on( :destroy ) # only destroy removes an instance, and it has to be stopped first
+    error.from( :pending :starting, :running, :stopping) # not including STOP_ERROR and START_ERROR as they are as :running and :stopped
   end
 
   ######################################################################
@@ -1705,9 +1706,9 @@ eofwopxml
     'UNEXPECTED_STOP' =>  'STOPPED',
     'RESTORING'       =>  'PENDING',
     'BACKUP_ING'      =>  'PENDING',
-    'ERROR'           =>  'STOPPED',
-    'START_ERROR'     =>  'STOPPED', # not sure about this one
-    'STOP_ERROR'      =>  'STOPPING',
+    'ERROR'           =>  'ERROR',   # allowed actions limited
+    'START_ERROR'     =>  'STOPPED', # allowed actions are same as for STOPPED
+    'STOP_ERROR'      =>  'RUNNING', # allowed actions are same as for RUNNING
     'REGISTERING'     =>  'PENDING',
     'CHANGE_TYPE'     =>  'PENDING'
   }