From d40d29a46fdfda326752504a08a69e21d8416837 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 26 Sep 2011 18:21:45 +0200 Subject: [PATCH] Bring back lost change in VDC host uniqueness --- src/ozones/Server/models/OzonesServer.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ozones/Server/models/OzonesServer.rb b/src/ozones/Server/models/OzonesServer.rb index d7623781ba..a11e8cc132 100644 --- a/src/ozones/Server/models/OzonesServer.rb +++ b/src/ozones/Server/models/OzonesServer.rb @@ -311,9 +311,8 @@ class OzonesServer "#{vdc.zones.id} not found, cannot update Vdc.") return [404, error.to_json] end - - if (!defined? vdc_data[:force] or - (defined? vdc_data[:force] and vdc_data[:force]!="yes")) and + + if (!vdc_data[:force] or vdc_data[:force].upcase!="YES") and !host_uniqueness?(zone, vdc_data[:hosts], vdc_id.to_i) return [403, OZones::Error.new( "Error: Couldn't update resource #{kind}. " +