svn commit: r1151435 - in /incubator/deltacloud/trunk/server: lib/deltacloud/drivers/ec2/ec2_driver.rb server.rb

[ma...@apache.org]

Author: marios
Date: Wed Jul 27 11:49:07 2011
New Revision: 1151435

URL: http://svn.apache.org/viewvc?rev=1151435&view=rev
Log:
Restore consistency in create firewall rule parameters... port range is
specified with 'port_from' and 'port_to'
(removes instances of 'from_port'/'to_port')

Modified:
    incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
    incubator/deltacloud/trunk/server/server.rb

Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb?rev=1151435&r1=1151434&r2=1151435&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb Wed Jul 27 11:49:07 2011
@@ -657,7 +657,7 @@ module Deltacloud
             groups << {"group_name" => k, "owner" =>v}
           end
           safely do
-            ec2.manage_security_group_ingress(opts['id'], opts['from_port'], opts['to_port'], opts['protocol'],
+            ec2.manage_security_group_ingress(opts['id'], opts['port_from'], opts['port_to'], opts['protocol'],
               "authorize", opts['addresses'], groups)
           end
         end

Modified: incubator/deltacloud/trunk/server/server.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/server.rb?rev=1151435&r1=1151434&r2=1151435&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/server.rb (original)
+++ incubator/deltacloud/trunk/server/server.rb Wed Jul 27 11:49:07 2011
@@ -1084,8 +1084,8 @@ collection :firewalls do
     description 'Create a new firewall rule for the specified firewall'
     param :id,  :required, :string, [],  "Name of firewall in which to apply this rule"
     param :protocol,  :required, :string, ['tcp','udp','icmp'], "Transport layer protocol for the rule"
-    param :from_port, :required, :string, [], "Start of port range for the rule"
-    param :to_port,   :required, :string, [], "End of port range for the rule"
+    param :port_from, :required, :string, [], "Start of port range for the rule"
+    param :port_to,   :required, :string, [], "End of port range for the rule"
     with_capability :create_firewall_rule
     control do
       #source IPs from params