trema 0.4.6 → 0.4.7

data/ruby/trema/ofctl.rb

@@ -18,45 +18,45 @@
 #
 
 
-require "trema/executables"
-require "trema/flow"
+require 'trema/executables'
+require 'trema/flow'
 
 
 module Trema
   class Ofctl
-    def add_flow switch, options
-      actions = options[ :actions ]
+    def add_flow(switch, options)
+      actions = options[ :actions]
       options.delete :actions
       option_string = options.collect do | k, v |
         "#{ k }=#{ v }"
-      end.join( "," )
+      end.join(',')
       sh "sudo #{ Executables.ovs_ofctl } add-flow #{ switch.network_device } #{ option_string },actions=#{ actions } 2>/dev/null"
     end
 
 
-    def flows switch
-      dump_flows( switch ).split( "\n" )[ 1..-1 ].collect do | each |
-        Trema::Flow.parse( each )
+    def flows(switch)
+      dump_flows(switch).split("\n")[ 1..-1].collect do | each |
+        Trema::Flow.parse(each)
       end.compact
     end
 
 
-    def users_flows switch
-      flows( switch ).select( &:users_flow? )
+    def users_flows(switch)
+      flows(switch).select(&:users_flow?)
     end
 
 
-    def dump_flows switch
+    def dump_flows(switch)
       `sudo #{ Executables.ovs_ofctl } dump-flows #{ switch.network_device } 2>&1`
     end
 
 
-    def bring_port_up switch, port_number
+    def bring_port_up(switch, port_number)
       `sudo #{ Executables.ovs_ofctl } mod-port #{ switch.network_device } #{ port_number } up 2>&1`
     end
 
 
-    def bring_port_down switch, port_number
+    def bring_port_down(switch, port_number)
       `sudo #{ Executables.ovs_ofctl } mod-port #{ switch.network_device } #{ port_number } down 2>&1`
     end
   end

data/ruby/trema/open-vswitch.rb

@@ -16,12 +16,12 @@
 #
 
 
-require "trema/default_openflow_channel_port"
-require "trema/daemon"
-require "trema/executables"
-require "trema/hardware-switch"
-require "trema/ofctl"
-require "trema/path"
+require 'trema/default_openflow_channel_port'
+require 'trema/daemon'
+require 'trema/executables'
+require 'trema/hardware-switch'
+require 'trema/ofctl'
+require 'trema/path'
 
 
 module Trema
@@ -44,7 +44,7 @@ module Trema
     #
     # @return [OpenVswitch]
     #
-    def initialize stanza, port = DEFAULT_OPENFLOW_CHANNEL_PORT
+    def initialize(stanza, port = DEFAULT_OPENFLOW_CHANNEL_PORT)
       super stanza
       @port = port
       @interfaces = []
@@ -59,7 +59,7 @@ module Trema
     #
     # @return [Array]
     #
-    def << interface
+    def <<(interface)
       @interfaces << interface
       restart!
       @interfaces
@@ -89,16 +89,16 @@ module Trema
     # @return [Array]
     #
     def flows
-      Ofctl.new.users_flows( self )
+      Ofctl.new.users_flows(self)
     end
 
 
-    def bring_port_up port_number
+    def bring_port_up(port_number)
       Ofctl.new.bring_port_up self, port_number
     end
 
 
-    def bring_port_down port_number
+    def bring_port_down(port_number)
       Ofctl.new.bring_port_down self, port_number
     end
 
@@ -114,24 +114,24 @@ module Trema
 
 
     def options
-      default_options.join( " " ) + " netdev@#{ network_device } tcp:#{ ip }:#{ @port }"
+      default_options.join(' ') + " netdev@#{ network_device } tcp:#{ ip }:#{ @port }"
     end
 
 
     def default_options
       [
-       "--detach",
-       "--out-of-band",
-       "--fail=closed",
-       "--inactivity-probe=180",
-       "--rate-limit=40000",
-       "--burst-limit=20000",
-       "--pidfile=#{ pid_file }",
-       "--verbose=ANY:file:dbg",
-       "--verbose=ANY:console:err",
-       "--log-file=#{ log_file }",
-       "--datapath-id=#{ dpid_long }",
-       "--unixctl=#{ unixctl }",
+        '--detach',
+        '--out-of-band',
+        '--fail=closed',
+        '--inactivity-probe=180',
+        '--rate-limit=40000',
+        '--burst-limit=20000',
+        "--pidfile=#{ pid_file }",
+        '--verbose=ANY:file:dbg',
+        '--verbose=ANY:console:err',
+        "--log-file=#{ log_file }",
+        "--datapath-id=#{ dpid_long }",
+        "--unixctl=#{ unixctl }"
       ] + ports_option
     end
 
@@ -142,7 +142,7 @@ module Trema
 
 
     def ports_option
-      @interfaces.empty? ? [] : [ "--ports=#{ @interfaces.join( "," ) }" ]
+      @interfaces.empty? ? [] : ["--ports=#{ @interfaces.join(",") }"]
     end
 
 

data/ruby/trema/openflow-switch.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/network-component"
+require 'trema/network-component'
 
 
 module Trema

data/ruby/trema/ordered-hash.rb

@@ -32,14 +32,14 @@ module Trema
     end
 
 
-    def [] key
-      @content[ key ]
+    def [](key)
+      @content[ key]
     end
 
 
-    def []= key, value
-      @content[ key ] = value
-      unless @keys.include?( key )
+    def []=(key, value)
+      @content[ key] = value
+      unless @keys.include?(key)
         @keys << key
       end
     end
@@ -47,7 +47,7 @@ module Trema
 
     def values
       @keys.map do | each |
-        @content[ each ]
+        @content[ each]
       end
     end
 
@@ -59,9 +59,9 @@ module Trema
     end
 
 
-    def each &block
+    def each(&block)
       @keys.each do | each |
-        block.call each, @content[ each ]
+        block.call each, @content[ each]
       end
     end
   end

data/ruby/trema/packet-in.c

@@ -1228,7 +1228,6 @@ packet_in_udp_checksum( VALUE self ) {
  */
 void
 Init_packet_in() {
-  rb_require( "rubygems" );
   rb_require( "pio" );
 
   mTrema = rb_eval_string( "Trema" );

data/ruby/trema/packet-queue.rb

@@ -27,7 +27,7 @@ module Trema
 
     # Add queue to list.
     # @param [PacketQueue] queue a {PacketQueue} instance.
-    def self.append queue
+    def self.append(queue)
       @queues ||= []
       @queues << queue unless @queues.include?(queue)
     end
@@ -42,7 +42,7 @@ module Trema
 
     # Iterate over each {PacketQueue} item.
     # @return [Array] a list of {PacketQueue} items.
-    def self.each &block
+    def self.each(&block)
       @queues.each do | each |
         block.call each
       end
@@ -80,16 +80,16 @@ module Trema
     # @option options [Symbol] :len
     #   queue description's length in bytes.
     #
-    def initialize options
-      @queue_id = options[ :queue_id ]
-      @len = options[ :len ]
+    def initialize(options)
+      @queue_id = options[ :queue_id]
+      @len = options[ :len]
       @properties = []
     end
 
 
     # @param [MinRateQueue] queue
     #   a property queue {MinRateQueue} object to append to the properties list.
-    def append queue
+    def append(queue)
       @properties << queue
     end
 
@@ -127,7 +127,7 @@ module Trema
     #   property queue id.
     # @param [Number] len
     #   length in bytes of the property queue.
-    def initialize property, len
+    def initialize(property, len)
       @property = property
       @len = len
     end
@@ -157,7 +157,7 @@ module Trema
     #   the rate value of the mimimum rate queue.
     # @param [PacketQueue] packet_queue
     #   A {PacketQueue} instance to use to save the minimum rate queue.
-    def initialize property, len, rate, packet_queue
+    def initialize(property, len, rate, packet_queue)
       super property, len
       @rate = rate
       packet_queue.append self

data/ruby/trema/packetin-filter.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/executables"
-require "trema/network-component"
+require 'trema/executables'
+require 'trema/network-component'
 
 
 module Trema
@@ -35,7 +35,7 @@ module Trema
     #
     # @api public
     #
-    def initialize queues
+    def initialize(queues)
       check_mandatory_options queues
       @queues = queues
       PacketinFilter.add self
@@ -53,7 +53,7 @@ module Trema
     # @api public
     #
     def name
-      "packet-in filter"
+      'packet-in filter'
     end
 
 
@@ -84,9 +84,9 @@ module Trema
     #
     # @api private
     #
-    def check_mandatory_options queues
-      [ :lldp, :packet_in ].each do | each |
-        raise ":#{ each } is a mandatory option" if queues[ each ].nil?
+    def check_mandatory_options(queues)
+      [:lldp, :packet_in].each do | each |
+        fail ":#{ each } is a mandatory option" if queues[ each].nil?
       end
     end
 
@@ -99,7 +99,7 @@ module Trema
     # @api private
     #
     def lldp_queue
-      "lldp::#{ @queues[ :lldp ] }"
+      "lldp::#{ @queues[ :lldp] }"
     end
 
 
@@ -111,7 +111,7 @@ module Trema
     # @api private
     #
     def packetin_queue
-      "packet_in::#{ @queues[ :packet_in ] }"
+      "packet_in::#{ @queues[ :packet_in] }"
     end
   end
 end

data/ruby/trema/path.rb

@@ -16,11 +16,11 @@
 #
 
 
-require "trema/monkey-patch/module"
+require 'trema/monkey-patch/module'
 
 
 module Trema
-  HOME = File.expand_path( File.join( File.dirname( __FILE__ ), "..", ".." ) )
+  HOME = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
 
   class << self
@@ -30,10 +30,10 @@ module Trema
 
 
     def tmp
-      if ENV.key?( "TREMA_TMP" )
-        File.expand_path ENV[ "TREMA_TMP" ]
+      if ENV.key?('TREMA_TMP')
+        File.expand_path ENV[ 'TREMA_TMP']
       else
-        File.join home, "tmp"
+        File.join home, 'tmp'
       end
     end
 
@@ -43,38 +43,38 @@ module Trema
     ############################################################################
 
 
-    def file base, path, name = nil
-      define_class_method( name || File.basename( path ).gsub( ".", "_" ) ) do
-        File.join __send__( base ), path
+    def file(base, path, name = nil)
+      define_class_method(name || File.basename(path).gsub('.', '_')) do
+        File.join __send__(base), path
       end
     end
-    alias :dir :file
+    alias_method :dir, :file
   end
 
 
-  dir :home, "objects"
-  dir :home, "ruby"
-  dir :home, "src/lib", :include
-  dir :home, "vendor"
-  dir :objects, "cmockery"
-  dir :objects, "lib"
-  dir :objects, "oflops"
-  dir :objects, "openflow"
-  dir :objects, "openvswitch"
-  dir :objects, "phost"
-  dir :tmp, "log"
-  dir :tmp, "pid"
-  dir :tmp, "sock"
-  dir :vendor, "cmockery-20110428", :vendor_cmockery
-  dir :vendor, "oflops-0.03.trema1", :vendor_oflops
-  dir :vendor, "openflow-1.0.0", :vendor_openflow
-  dir :vendor, "openflow.git", :vendor_openflow_git
-  dir :vendor, "openvswitch-1.2.2.trema1", :vendor_openvswitch
-  dir :vendor, "phost", :vendor_phost
-  dir :vendor, "ruby-ifconfig-1.2", :vendor_ruby_ifconfig
-  file :cmockery, "include/google/cmockery.h"
-  file :cmockery, "lib/libcmockery.a"
-  file :openflow, "openflow.h"
+  dir :home, 'objects'
+  dir :home, 'ruby'
+  dir :home, 'src/lib', :include
+  dir :home, 'vendor'
+  dir :objects, 'cmockery'
+  dir :objects, 'lib'
+  dir :objects, 'oflops'
+  dir :objects, 'openflow'
+  dir :objects, 'openvswitch'
+  dir :objects, 'phost'
+  dir :tmp, 'log'
+  dir :tmp, 'pid'
+  dir :tmp, 'sock'
+  dir :vendor, 'cmockery-20110428', :vendor_cmockery
+  dir :vendor, 'oflops-0.03.trema1', :vendor_oflops
+  dir :vendor, 'openflow-1.0.0', :vendor_openflow
+  dir :vendor, 'openflow.git', :vendor_openflow_git
+  dir :vendor, 'openvswitch-1.2.2.trema1', :vendor_openvswitch
+  dir :vendor, 'phost', :vendor_phost
+  dir :vendor, 'ruby-ifconfig-1.2', :vendor_ruby_ifconfig
+  file :cmockery, 'include/google/cmockery.h'
+  file :cmockery, 'lib/libcmockery.a'
+  file :openflow, 'openflow.h'
 end
 
 

data/ruby/trema/phost.rb

@@ -18,8 +18,8 @@
 #
 
 
-require "trema/daemon"
-require "trema/executables"
+require 'trema/daemon'
+require 'trema/executables'
 
 
 module Trema
@@ -38,7 +38,7 @@ module Trema
     #
     # Creates a new instance of Phost for each virtual host.
     #
-    def initialize host
+    def initialize(host)
       @host = host
     end
 
@@ -49,7 +49,7 @@ module Trema
     # @return [String] the virtual host's interface name.
     #
     def interface
-      raise "The link(s) for vhost '#{ name }' is not defined." if @host.interface.nil?
+      fail "The link(s) for vhost '#{ name }' is not defined." if @host.interface.nil?
       @host.interface
     end
 
@@ -58,7 +58,7 @@ module Trema
     # @return [Boolean] whether phost is running or not.
     #
     def running?
-      not @host.interface.nil? and super
+      not @host.interface.nil? && super
     end