svn commit: r1160498 - /incubator/deltacloud/trunk/server/server.rb

[lu...@apache.org]

Author: lutter
Date: Mon Aug 22 23:25:33 2011
New Revision: 1160498

URL: http://svn.apache.org/viewvc?rev=1160498&view=rev
Log:
* server.rb (firewalls/new_rule): raise a validation error if no source given

Modified:
    incubator/deltacloud/trunk/server/server.rb

Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1160498&r1=1160497&r2=1160498&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Mon Aug 22 23:25:33 2011
@@ -1148,7 +1148,11 @@ collection :firewalls do
       for i in (1..max_groups) do
         groups.merge!({params["group#{i}"]=>params["group#{i}owner"]})
       end
-      params.merge!( {'addresses' => addresses} ) ; params.merge!( {'groups' => groups} )
+      params['addresses'] = addresses
+      params['groups'] = groups
+      if addresses.empty? && groups.empty?
+        raise Deltacloud::Validation::Failure.new(nil, "No sources. Specify at least one source ip_address or group")
+      end
       driver.create_firewall_rule(credentials, params)
       @firewall = driver.firewall(credentials, {:id => params[:id]})
       status 201