deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dko...@apache.org
Subject git commit: FGCP: advertise delete action when cimi system has no machines
Date Thu, 25 Apr 2013 22:23:42 GMT
Updated Branches:
  refs/heads/master e75bf156f -> c1d487af8


FGCP: advertise delete action when cimi system has no machines


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

Branch: refs/heads/master
Commit: c1d487af86dc1622b3995abc9d10e926adc0af72
Parents: e75bf15
Author: Dies Koper <diesk@fast.au.fujitsu.com>
Authored: Fri Apr 26 08:07:04 2013 +1000
Committer: Dies Koper <diesk@fast.au.fujitsu.com>
Committed: Fri Apr 26 08:11:49 2013 +1000

----------------------------------------------------------------------
 .../drivers/fgcp/fgcp_driver_cimi_methods.rb       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/c1d487af/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb b/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
index 9ff83e3..20c9223 100644
--- a/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
+++ b/server/lib/deltacloud/drivers/fgcp/fgcp_driver_cimi_methods.rb
@@ -77,7 +77,7 @@ module Deltacloud::Drivers::Fgcp
           # check for special case: in destroy_system the FW is stopped before the system
is deleted
           system[:state] = 'DELETING' if ((vservers.nil? and system[:state] != 'CREATING')
or system[:state] == 'STOPPED') and
                                          ['STOPPED', 'STOPPING'].include? client.get_efm_status("#{vsys_id}-S-0001")['efmStatus'][0]
-          system[:operations] << { :href => context.system_url(vsys_id), :rel =>
"delete" } if system[:state] == 'STOPPED'
+          system[:operations] << { :href => context.system_url(vsys_id), :rel =>
"delete" } if system[:state] == 'STOPPED' or (vservers.nil? and system[:state] == 'MIXED')
         end
         systems
       end


Mime
View raw message