trema 0.4.6 → 0.4.7

data/ruby/trema/set-vlan-vid.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/action"
+require 'trema/action'
 
 
 module Trema
@@ -42,12 +42,12 @@ module Trema
     # @raise [ArgumentError] if vlan_id not within 1 and 4095 inclusive.
     # @raise [TypeError] if vlan_id is not an Integer.
     #
-    def initialize vlan_id
-      unless vlan_id.is_a?( Integer )
-        raise TypeError, "VLAN ID argument must be an Integer"
+    def initialize(vlan_id)
+      unless vlan_id.is_a?(Integer)
+        fail TypeError, 'VLAN ID argument must be an Integer'
       end
-      unless ( vlan_id >= 1 and vlan_id <= 4095 )
-        raise ArgumentError, "Valid VLAN ID values between 1 to 4095 inclusive"
+      unless ( vlan_id >= 1 && vlan_id <= 4095)
+        fail ArgumentError, 'Valid VLAN ID values between 1 to 4095 inclusive'
       end
       @vlan_id = vlan_id
     end

data/ruby/trema/shell.rb

@@ -18,16 +18,16 @@
 #
 
 
-require "trema/shell/down"
-require "trema/shell/killall"
-require "trema/shell/link"
-require "trema/shell/reset_stats"
-require "trema/shell/run"
-require "trema/shell/send_packets"
-require "trema/shell/show_stats"
-require "trema/shell/up"
-require "trema/shell/vhost"
-require "trema/shell/vswitch"
+require 'trema/shell/down'
+require 'trema/shell/killall'
+require 'trema/shell/link'
+require 'trema/shell/reset_stats'
+require 'trema/shell/run'
+require 'trema/shell/send_packets'
+require 'trema/shell/show_stats'
+require 'trema/shell/up'
+require 'trema/shell/vhost'
+require 'trema/shell/vswitch'
 
 
 ### Local variables:

data/ruby/trema/shell/down.rb

@@ -18,13 +18,13 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def down name
-      OpenflowSwitch[ name ].shutdown!
+    def down(name)
+      OpenflowSwitch[ name].shutdown!
     end
   end
 end

data/ruby/trema/shell/killall.rb

@@ -18,7 +18,7 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema

data/ruby/trema/shell/link.rb

@@ -18,30 +18,30 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def link peer0, peer1
-      stanza = DSL::Link.new( peer0, peer1 )
-      link = Link.new( stanza )
+    def link(peer0, peer1)
+      stanza = DSL::Link.new(peer0, peer1)
+      link = Link.new(stanza)
       link.enable!
 
-      if OpenflowSwitch[ peer0 ]
-        OpenflowSwitch[ peer0 ] << link.name
+      if OpenflowSwitch[ peer0]
+        OpenflowSwitch[ peer0] << link.name
       end
-      if OpenflowSwitch[ peer1 ]
-        OpenflowSwitch[ peer1 ] << link.name_peer
+      if OpenflowSwitch[ peer1]
+        OpenflowSwitch[ peer1] << link.name_peer
       end
 
-      if Host[ peer0 ]
-        Host[ peer0 ].interface = link.name
-        Host[ peer0 ].run!
+      if Host[ peer0]
+        Host[ peer0].interface = link.name
+        Host[ peer0].run!
       end
-      if Host[ peer1 ]
-        Host[ peer1 ].interface = link.name_peer
-        Host[ peer1 ].run!
+      if Host[ peer1]
+        Host[ peer1].interface = link.name_peer
+        Host[ peer1].run!
       end
 
       $context.dump

data/ruby/trema/shell/reset_stats.rb

@@ -18,22 +18,22 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def reset_stats host_name = nil
+    def reset_stats(host_name = nil)
       assert_trema_is_built
 
-      if host_name and Host[ host_name ].nil?
-        raise "Host '#{ host_name }' is not defined."
+      if host_name && Host[ host_name].nil?
+        fail "Host '#{ host_name }' is not defined."
       end
       if host_name
-        Cli.new( Host[ host_name ] ).reset_stats
+        Cli.new(Host[ host_name]).reset_stats
       else
         Host.each do | each |
-          Cli.new( each ).reset_stats
+          Cli.new(each).reset_stats
         end
       end
       true

data/ruby/trema/shell/run.rb

@@ -18,30 +18,30 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def run controller
+    def run(controller)
       assert_trema_is_built
 
       if controller
-        if /\.rb\Z/=~ controller.split.first
-          require "trema"
+        if /\.rb\Z/ =~ controller.split.first
+          require 'trema'
           include Trema
           ARGV.replace controller.split
-          $LOAD_PATH << File.dirname( controller )
+          $LOAD_PATH << File.dirname(controller)
           load controller
         else
           # Assume that the controller is written in C
           stanza = Trema::DSL::Run.new
           stanza.path controller
-          Trema::App.new( stanza )
+          Trema::App.new(stanza)
         end
       end
 
-      runner = DSL::Runner.new( $config )
+      runner = DSL::Runner.new($config)
       runner.maybe_run_switch_manager
       $config.switches.each do | name, switch |
         if switch.running?

data/ruby/trema/shell/send_packets.rb

@@ -18,14 +18,14 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def send_packets source, dest, options = {}
+    def send_packets(source, dest, options = {})
       assert_trema_is_built
-      Cli.new( Host[ source ] ).send_packets( Host[ dest ], options )
+      Cli.new(Host[ source]).send_packets(Host[ dest], options)
       true
     end
     module_function :send_packets

data/ruby/trema/shell/show_stats.rb

@@ -18,21 +18,21 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def show_stats host_name, option
+    def show_stats(host_name, option)
       assert_trema_is_built
 
-      raise "Host '#{ host_name }' is not defined." if Host[ host_name ].nil?
-      raise "Host '#{ host_name }' is not connected to any link." if Host[ host_name ].interface.nil?
+      fail "Host '#{ host_name }' is not defined." if Host[ host_name].nil?
+      fail "Host '#{ host_name }' is not connected to any link." if Host[ host_name].interface.nil?
 
-      if option.to_s == "tx"
-        Cli.new( Host[ host_name ] ).show_tx_stats
+      if option.to_s == 'tx'
+        Cli.new(Host[ host_name]).show_tx_stats
       else
-        Cli.new( Host[ host_name ] ).show_rx_stats
+        Cli.new(Host[ host_name]).show_rx_stats
       end
       true
     end

data/ruby/trema/shell/up.rb

@@ -18,16 +18,16 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def up name
-      if OpenflowSwitch[ name ].running?
-        OpenflowSwitch[ name ].restart!
+    def up(name)
+      if OpenflowSwitch[ name].running?
+        OpenflowSwitch[ name].restart!
       else
-        OpenflowSwitch[ name ].run!
+        OpenflowSwitch[ name].run!
       end
     end
   end

data/ruby/trema/shell/vhost.rb

@@ -18,14 +18,14 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def vhost name = nil, &block
-      stanza = DSL::Vhost.new( name )
-      stanza.instance_eval( &block ) if block
+    def vhost(name = nil, &block)
+      stanza = DSL::Vhost.new(name)
+      stanza.instance_eval(&block) if block
       Host.new stanza
       $context.dump
       true

data/ruby/trema/shell/vswitch.rb

@@ -18,18 +18,18 @@
 #
 
 
-require "trema/dsl"
+require 'trema/dsl'
 
 
 module Trema
   module Shell
-    def vswitch name = nil, &block
-      raise "Not in Trema shell" if $config.nil?
-      raise "No dpid given" if name.nil? and block.nil?
+    def vswitch(name = nil, &block)
+      fail 'Not in Trema shell' if $config.nil?
+      fail 'No dpid given' if name.nil? && block.nil?
 
-      stanza = DSL::Vswitch.new( name )
-      stanza.instance_eval &block if block
-      OpenVswitch.new( stanza, $config.port ).restart!
+      stanza = DSL::Vswitch.new(name)
+      stanza.instance_eval(&block) if block
+      OpenVswitch.new(stanza, $config.port).restart!
 
       $context.dump
 

data/ruby/trema/stats-helper.rb

@@ -33,9 +33,9 @@ module Trema
     #
     # @return [void]
     #
-    def initialize fields, options
+    def initialize(fields, options)
       fields.each do |field|
-        instance_variable_set( "@#{field}", options[field.intern] )
+        instance_variable_set("@#{field}", options[field.intern])
       end
     end
 
@@ -47,7 +47,7 @@ module Trema
     def to_s
       str = super.to_s + "\n"
       instance_variables.sort.each do |var|
-        str += "#{var[1..var.length]}: #{instance_variable_get( var ).to_s}\n"
+        str += "#{var[1..var.length]}: #{instance_variable_get(var)}\n"
       end
       # remove the last newline character
       str[0..-2]

data/ruby/trema/stats-reply.c

@@ -144,7 +144,6 @@ stats_reply_stats( VALUE self ) {
  */
 void
 Init_stats_reply() {
-  rb_require( "rubygems" );
   rb_require( "pio" );
   rb_require( "trema/desc-stats-reply" );
   rb_require( "trema/flow-stats-reply" );

data/ruby/trema/strip-vlan-header.rb

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

data/ruby/trema/switch-daemon.rb

@@ -20,7 +20,7 @@
 
 module Trema
   class SwitchDaemon
-    MANDATORY_QUEUES = [ :port_status, :packet_in, :state_notify ]
+    MANDATORY_QUEUES = [:port_status, :packet_in, :state_notify]
 
 
     #
@@ -35,7 +35,7 @@ module Trema
     # @option queues [Symbol] :state_notify
     #   the controller(s) to receive state notification messages.
     #
-    def initialize queues
+    def initialize(queues)
       check_mandatory_options queues
       @queues = queues
     end
@@ -47,7 +47,7 @@ module Trema
     #
     # @return [Array<String>] the switch daemon's options.
     def options
-      all_queues = MANDATORY_QUEUES + [ :vendor ]
+      all_queues = MANDATORY_QUEUES + [:vendor]
       all_queues.collect! do | each |
         queue each
       end.flatten!
@@ -62,9 +62,9 @@ module Trema
     #
     # @raise [RuntimeError] if a mandatory option is not found.
     #
-    def check_mandatory_options queues
+    def check_mandatory_options(queues)
       MANDATORY_QUEUES.each do | each |
-        raise ":#{ each } is a mandatory option" if queues[ each ].nil?
+        fail ":#{ each } is a mandatory option" if queues[ each].nil?
       end
     end
 
@@ -72,11 +72,11 @@ module Trema
     #
     # @return [Array<String>] an array of controller name strings.
     #
-    def queue queue_type
-      return [] unless @queues[ queue_type ]
-      controllers = @queues[ queue_type ].split( "," )
+    def queue(queue_type)
+      return [] unless @queues[ queue_type]
+      controllers = @queues[ queue_type].split(',')
       controllers.collect! do | each |
-        "#{ queue_type.to_s }::#{ each }"
+        "#{ queue_type }::#{ each }"
       end
     end
   end

data/ruby/trema/switch-manager.rb

@@ -16,10 +16,10 @@
 #
 
 
-require "trema/daemon"
-require "trema/executables"
-require "trema/network-component"
-require "trema/switch-daemon"
+require 'trema/daemon'
+require 'trema/executables'
+require 'trema/network-component'
+require 'trema/switch-daemon'
 
 
 module Trema
@@ -65,7 +65,7 @@ module Trema
     #
     # @return [SwitchManager]
     #
-    def initialize rule, port = nil
+    def initialize(rule, port = nil)
       @rule = rule
       @port = port
       @no_flow_cleanup = false
@@ -82,7 +82,7 @@ module Trema
     # @return [String]
     #
     def name
-      "switch manager"
+      'switch manager'
     end
 
 
@@ -97,15 +97,15 @@ module Trema
 
 
     def options
-      opts = [ "--daemonize" ]
+      opts = ['--daemonize']
       opts << "--port=#{ @port }" if @port
       opts
     end
 
 
     def switch_options
-      opts = SwitchDaemon.new( @rule ).options
-      opts << "--no-flow-cleanup" if @no_flow_cleanup
+      opts = SwitchDaemon.new(@rule).options
+      opts << '--no-flow-cleanup' if @no_flow_cleanup
       opts
     end
   end