ns-fog 1.22.8 → 1.22.9

data/fog.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'ns-fog'
-  s.version           = '1.22.8'
+  s.version           = '1.22.9'
   s.date              = '2014-07-21'
   s.rubyforge_project = 'fog'
 

data/lib/fog/qingcloud/models/compute/router.rb

@@ -112,7 +112,7 @@ module Fog
           requires :id
           json = service.describe_router_statics(id, rule_ids, type).body['router_static_set']
           json.inject([]) do |ret, o|
-            ret << Fog::Compute::QingCloud::RouterRule.convert_type(o['static_type']).new(o)
+            ret << RouterRule.convert_type(o['static_type']).new(o)
           end
         end
         alias_method :statics, :rules
@@ -122,10 +122,10 @@ module Fog
         end
         alias_method :get_static, :get_rule
 
-        def add_rules(rules)
+        def add_rules(rules, auto_apply = true)
           requires :id
-          service.add_router_statics(id, Fog::Compute::QingCloud::RouterRule.to_query([*rules]))
-          service.update_routers(id)
+          service.add_router_statics(id, RouterRule.to_query([*rules]))
+          service.update_routers(id) if auto_apply
           wait_for {ready?}
           true
         end
@@ -133,6 +133,39 @@ module Fog
         alias_method :add_statics, :add_rules
         alias_method :add_static, :add_rules
 
+        def add_port_forward_rule(src_port, dst_ip, dst_port, protocol, auto_apply = true)
+          rule = PortForwardRule.new(
+            src_port: src_port,
+            dst_ip: dst_ip,
+            dst_port: dst_port,
+            protocol: protocol
+          )
+          add_rules(rule, auto_apply)
+        end
+
+        def add_vpn_rule(type, port, protocol, cidr, auto_apply = true)
+          rule = VPNRule.new(
+            vpn_type: type,
+            vpn_port: port,
+            vpn_protocol: protocol,
+            vpn_cidr_block: cidr
+          )
+          add_rules(rule, auto_apply)
+        end
+
+        def add_dhcp_rule(server_id, dhcp_options, auto_apply = true)
+          rule = DHCPRule.new(
+            server_id: server_id,
+            dhcp_options: dhcp_options
+          )
+          add_rules(rule, auto_apply)
+        end
+
+        def add_gre_rule(gre_options, auto_apply = true)
+          rule = GRERule.new(gre_options: gre_options)
+          add_rules(rule, auto_apply)
+        end
+
         def delete_rules(rule_id)
           requires :id
           service.delete_router_statics([*rule_id])

data/lib/fog/qingcloud/models/compute/security_group.rb

@@ -23,6 +23,17 @@ module Fog
           service.security_group_rules.new(attrs).save
         end
 
+        def add_rules(rules, auto_apply = true)                          
+          requires :id                                                   
+          args = {}                                                      
+          rules.each_with_index { |r, i|                                 
+            args.merge! service.security_group_rules.new(r).to_query(i + 1)         
+          }                                                              
+          service.add_security_group_rules(id, args)                     
+          service.apply_security_group(id) if auto_apply                 
+          true
+        end
+
         def ingress_rules
           requires :id
           rules(:ingress)
@@ -35,6 +46,7 @@ module Fog
 
         def rules(direction = nil)
           requires :id
+          direction = [:egress, :ingress].index(direction)
           service.security_group_rules.all('group-id' => id, 'direction' => direction)
         end
 

data/lib/fog/qingcloud/models/compute/security_group_rule.rb

@@ -76,7 +76,6 @@ module Fog::Compute
         (val1.to_i .. port_end.to_i)
       end
 
-      private
       def to_range(stuff)
         if stuff.is_a? Range
           [stuff.first, stuff.end]
@@ -89,9 +88,10 @@ module Fog::Compute
         query = ['protocol', 'priority', 'action', 
                  'direction', 'val1', 'val2', 'val3'
                 ].inject({}) do |ret, x|
-          ret["rules.%d.#{x}" % n] =  send(x.to_sym)
+          ret["rules.#{n}.#{x}"] =  send(x.to_sym)
+          ret
         end
-        query['rules.%d.security_group_rule_name' % n] = name
+        query["rules.#{n}.security_group_rule_name"] = name
         query
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ns-fog
 version: !ruby/object:Gem::Version
-  version: 1.22.8
+  version: 1.22.9
   prerelease: 
 platform: ruby
 authors: