ACK received from mfojtik on irc. Pushed as commit 9577bee8470ee2097702a79eb04b00daf3d55a3b
Cheers, Dies Koper > -----Original Message----- > From: [email protected] [mailto:[email protected]] > Sent: Wednesday, 23 January 2013 11:36 PM > To: [email protected] > Subject: [PATCH] Fgcp: remap instance error states according to allowed > actions > > From: Dies Koper <[email protected]> > > --- > server/lib/deltacloud/drivers/fgcp/fgcp_driver.rb | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > 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' > } > -- > 1.8.0.msysgit.0 > >
