trema 0.4.6 → 0.4.7

data/ruby/trema/aggregate-stats-reply.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/stats-helper"
+require 'trema/stats-helper'
 
 
 module Trema
@@ -54,7 +54,7 @@ module Trema
     #   @return [AggregateStatsReply]
     #     an object that encapsulates the OFPST_STATS_REPLY(OFPST_AGGREGATE) OpenFlow message.
     #
-    def initialize options
+    def initialize(options)
       super FIELDS, options
     end
   end

data/ruby/trema/app.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/daemon"
-require "trema/network-component"
+require 'trema/daemon'
+require 'trema/network-component'
 
 
 module Trema
@@ -35,7 +35,7 @@ module Trema
     attr_reader :stanza
 
 
-    command { | app | [ app.command, app.stanza[ :options ] ].compact.join " " }
+    command { | app | [app.command, app.stanza[ :options]].compact.join ' ' }
 
 
     #
@@ -48,14 +48,14 @@ module Trema
     #
     # @api public
     #
-    def initialize stanza
+    def initialize(stanza)
       @stanza = stanza
-      if /\.rb\Z/=~ @stanza.fetch( :name )  # ruby?
-        require "trema"
-        path = @stanza.fetch( :path )
-        ARGV.replace [ path ]
-        $LOAD_PATH << File.dirname( path )
-        Trema.module_eval IO.read( path )
+      if /\.rb\Z/ =~ @stanza.fetch(:name)  # ruby?
+        require 'trema'
+        path = @stanza.fetch(:path)
+        ARGV.replace [path]
+        $LOAD_PATH << File.dirname(path)
+        Trema.module_eval IO.read(path)
       else
         App.add self
       end
@@ -73,7 +73,7 @@ module Trema
     # @api public
     #
     def name
-      @stanza[ :name ]
+      @stanza[ :name]
     end
 
 
@@ -88,7 +88,7 @@ module Trema
     # @api public
     #
     def daemonize!
-      sh [ command, "-d", @stanza[ :options ] ].compact.join( " " )
+      sh [command, '-d', @stanza[ :options]].compact.join(' ')
       self
     end
 
@@ -101,7 +101,7 @@ module Trema
     # @api private
     #
     def command
-      "#{ @stanza[ :path ] } --name #{ name }"
+      "#{ @stanza[ :path] } --name #{ name }"
     end
   end
 end

data/ruby/trema/cli.rb

@@ -18,7 +18,7 @@
 #
 
 
-require "trema/executables"
+require 'trema/executables'
 
 
 module Trema
@@ -35,7 +35,7 @@ module Trema
     attr_reader :n_octets
 
 
-    def initialize ip_dst, tp_dst, ip_src, tp_src, n_pkts, n_octets
+    def initialize(ip_dst, tp_dst, ip_src, tp_src, n_pkts, n_octets)
       @ip_dst = ip_dst
       @tp_dst = tp_dst.to_i
       @ip_src = ip_src
@@ -58,36 +58,36 @@ end
 
 module Trema
   class Cli
-    def initialize host
+    def initialize(host)
       @host = host
     end
 
 
-    def send_packets dest, options = {}
-      if options[ :duration ] and options[ :n_pkts ]
-        raise "--duration and --n_pkts are exclusive."
+    def send_packets(dest, options = {})
+      if options[ :duration] && options[ :n_pkts]
+        fail '--duration and --n_pkts are exclusive.'
       end
 
-      sh( "#{ Executables.cli } -i #{ @host.interface } send_packets " +
+      sh("#{ Executables.cli } -i #{ @host.interface } send_packets " \
           "--ip_src #{ @host.ip } --ip_dst #{ dest.ip } " +
-          send_packets_options( options ) )
+          send_packets_options(options))
     end
 
 
     def show_tx_stats
-      puts stats( :tx )
+      puts stats(:tx)
     end
 
 
     def show_rx_stats
-      puts stats( :rx )
+      puts stats(:rx)
     end
 
 
     def tx_stats
-      stat = stats( :tx ).split( "\n" )[ 1 ]
+      stat = stats(:tx).split("\n")[ 1]
       if stat
-        Trema::Stats.new *stat.split( "," )
+        Trema::Stats.new(*stat.split(','))
       else
         nil
       end
@@ -95,9 +95,9 @@ module Trema
 
 
     def rx_stats
-      stat = stats( :rx ).split( "\n" )[ 1 ]
+      stat = stats(:rx).split("\n")[ 1]
       if stat
-        Trema::Stats.new *stat.split( "," )
+        Trema::Stats.new(*stat.split(','))
       else
         Trema::Stats.new nil, nil, nil, nil, 0, 0
       end
@@ -110,7 +110,7 @@ module Trema
     end
 
 
-    def add_arp_entry other
+    def add_arp_entry(other)
       sh "sudo #{ Executables.cli } -i #{ @host.interface } add_arp_entry --ip_addr #{ other.ip } --mac_addr #{ other.mac }"
     end
 
@@ -130,24 +130,24 @@ module Trema
     ################################################################################
 
 
-    def send_packets_options options
+    def send_packets_options(options)
       [
-       tp_src( options[ :tp_src ] || default_tp_src ),
-       tp_dst( options[ :tp_dst ] || default_tp_dst ),
-       pps( options[ :pps ] || default_pps ),
-       options[ :n_pkts ] ? nil : duration( options[ :duration ] || default_duration ),
-       length( options[ :length ] || default_length ),
-       n_pkts( options[ :n_pkts ] ),
-       inc_ip_src( options[ :inc_ip_src ] ),
-       inc_ip_dst( options[ :inc_ip_dst ] ),
-       inc_tp_src( options[ :inc_tp_src ] ),
-       inc_tp_dst( options[ :inc_tp_dst ] ),
-       inc_payload( options[ :inc_payload ] ),
-      ].compact.join( " " )
+        tp_src(options[ :tp_src] || default_tp_src),
+        tp_dst(options[ :tp_dst] || default_tp_dst),
+        pps(options[ :pps] || default_pps),
+        options[ :n_pkts] ? nil : duration(options[ :duration] || default_duration),
+        length(options[ :length] || default_length),
+        n_pkts(options[ :n_pkts]),
+        inc_ip_src(options[ :inc_ip_src]),
+        inc_ip_dst(options[ :inc_ip_dst]),
+        inc_tp_src(options[ :inc_tp_src]),
+        inc_tp_dst(options[ :inc_tp_dst]),
+        inc_payload(options[ :inc_payload])
+      ].compact.join(' ')
     end
 
 
-    def tp_src value
+    def tp_src(value)
       "--tp_src #{ value }"
     end
 
@@ -157,7 +157,7 @@ module Trema
     end
 
 
-    def tp_dst value
+    def tp_dst(value)
       "--tp_dst #{ value }"
     end
 
@@ -167,7 +167,7 @@ module Trema
     end
 
 
-    def pps value
+    def pps(value)
       "--pps #{ value }"
     end
 
@@ -177,7 +177,7 @@ module Trema
     end
 
 
-    def duration value
+    def duration(value)
       "--duration #{ value }"
     end
 
@@ -187,7 +187,7 @@ module Trema
     end
 
 
-    def length value
+    def length(value)
       "--length #{ value }"
     end
 
@@ -197,63 +197,63 @@ module Trema
     end
 
 
-    def inc_ip_src value
+    def inc_ip_src(value)
       return nil if value.nil?
       if value == true
-        "--inc_ip_src"
+        '--inc_ip_src'
       else
         "--inc_ip_src=#{ value }"
       end
     end
 
 
-    def inc_ip_dst value
+    def inc_ip_dst(value)
       return nil if value.nil?
       if value == true
-        "--inc_ip_dst"
+        '--inc_ip_dst'
       else
         "--inc_ip_dst=#{ value }"
       end
     end
 
 
-    def inc_tp_src value
+    def inc_tp_src(value)
       return nil if value.nil?
       if value == true
-        "--inc_tp_src"
+        '--inc_tp_src'
       else
         "--inc_tp_src=#{ value }"
       end
     end
 
 
-    def inc_tp_dst value
+    def inc_tp_dst(value)
       return nil if value.nil?
       if value == true
-        "--inc_tp_dst"
+        '--inc_tp_dst'
       else
         "--inc_tp_dst=#{ value }"
       end
     end
 
 
-    def inc_payload value
+    def inc_payload(value)
       return nil if value.nil?
       if value == true
-        "--inc_payload"
+        '--inc_payload'
       else
         "--inc_payload=#{ value }"
       end
     end
 
 
-    def n_pkts value
+    def n_pkts(value)
       return nil if value.nil?
       "--n_pkts=#{ value }"
     end
 
 
-    def stats type
+    def stats(type)
       `sudo #{ Executables.cli } -i #{ @host.interface } show_stats --#{ type }`
     end
   end

data/ruby/trema/command.rb

@@ -18,20 +18,20 @@
 #
 
 
-require "trema/command/dump_flows"
-require "trema/command/kill"
-require "trema/command/killall"
-require "trema/command/netns"
-require "trema/command/port_up"
-require "trema/command/port_down"
-require "trema/command/reset_stats"
-require "trema/command/ruby"
-require "trema/command/run"
-require "trema/command/send_packets"
-require "trema/command/shell"
-require "trema/command/show_stats"
-require "trema/command/up"
-require "trema/command/version"
+require 'trema/command/dump_flows'
+require 'trema/command/kill'
+require 'trema/command/killall'
+require 'trema/command/netns'
+require 'trema/command/port_up'
+require 'trema/command/port_down'
+require 'trema/command/reset_stats'
+require 'trema/command/ruby'
+require 'trema/command/run'
+require 'trema/command/send_packets'
+require 'trema/command/shell'
+require 'trema/command/show_stats'
+require 'trema/command/up'
+require 'trema/command/version'
 
 
 ### Local variables:

data/ruby/trema/command/dump_flows.rb

@@ -16,8 +16,8 @@
 #
 
 
-require "trema/ofctl"
-require "trema/util"
+require 'trema/ofctl'
+require 'trema/util'
 
 
 module Trema
@@ -25,11 +25,11 @@ module Trema
     include Trema::Util
 
 
-    def trema_dump_flows switches
+    def trema_dump_flows(switches)
       switches.each do | each |
-        switch = find_switch_by_name( each )
+        switch = find_switch_by_name(each)
         exit_now! "No switch named `#{ each }` found!" if switch.nil?
-        puts Trema::Ofctl.new.dump_flows( switch )
+        puts Trema::Ofctl.new.dump_flows(switch)
       end
     end
   end

data/ruby/trema/command/kill.rb

@@ -16,7 +16,7 @@
 #
 
 
-require "trema/util"
+require 'trema/util'
 
 
 module Trema
@@ -24,8 +24,8 @@ module Trema
     include Trema::Util
 
 
-    def trema_kill name
-      unless maybe_kill( name )
+    def trema_kill(name)
+      unless maybe_kill(name)
         exit_now! "unknown name: #{ name }"
       end
     end
@@ -36,31 +36,31 @@ module Trema
     ############################################################################
 
 
-    def maybe_kill name
-      killed = maybe_kill_app( name ) || nil
-      killed ||= maybe_shutdown_host( name )
-      killed ||= maybe_shutdown_switch( name )
+    def maybe_kill(name)
+      killed = maybe_kill_app(name) || nil
+      killed ||= maybe_shutdown_host(name)
+      killed ||= maybe_shutdown_switch(name)
       # [TODO] kill a link by its name. Needs a good naming convension for link.
       killed
     end
 
 
-    def maybe_kill_app name
-      app = find_app_by_name( name )
+    def maybe_kill_app(name)
+      app = find_app_by_name(name)
       app.kill! if app
       app
     end
 
 
-    def maybe_shutdown_host name
-      host = find_host_by_name( name )
+    def maybe_shutdown_host(name)
+      host = find_host_by_name(name)
       host.shutdown! if host
       host
     end
 
 
-    def maybe_shutdown_switch name
-      switch = find_switch_by_name( name )
+    def maybe_shutdown_switch(name)
+      switch = find_switch_by_name(name)
       switch.shutdown if switch
       switch
     end

data/ruby/trema/command/killall.rb

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