trema 0.4.6 → 0.4.7

data/src/examples/openflow_message/vendor-action.rb

@@ -22,9 +22,9 @@ class VendorActionSampleController < Controller
   OVS_VENDOR_ID = 0x00002320
   OVSAST_NOTE = 8
 
-  def switch_ready datapath_id
-    body = [ OVSAST_NOTE, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ].pack( "nC6" )
-    actions = VendorAction.new( OVS_VENDOR_ID, body.unpack( "C*" ) )
+  def switch_ready(datapath_id)
+    body = [OVSAST_NOTE, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00].pack('nC6')
+    actions = VendorAction.new(OVS_VENDOR_ID, body.unpack('C*'))
     send_flow_mod_modify(
       datapath_id,
       :hard_timeout => 60,

data/src/examples/openflow_message/vendor-stats-request.rb

@@ -22,12 +22,12 @@ class VendorStatsRequestSample < Controller
   OVS_VENDOR_ID = 0x00002320
   OVSST_FLOW = 0
 
-  def switch_ready datapath_id
+  def switch_ready(datapath_id)
     send_vendor_stats_request datapath_id
   end
 
 
-  def stats_reply datapath_id, message
+  def stats_reply(datapath_id, message)
     if message.type == StatsReply::OFPST_VENDOR
       vendor_stats_reply datapath_id, message
     end
@@ -37,14 +37,14 @@ class VendorStatsRequestSample < Controller
   private
 
 
-  def vendor_stats_reply datapath_id, message
-    info "[vendor_stats_reply]"
-    info "vendor_id: 0x%08x" % message.stats.first.vendor_id
+  def vendor_stats_reply(datapath_id, message)
+    info '[vendor_stats_reply]'
+    info 'vendor_id: 0x%08x' % message.stats.first.vendor_id
     info "data: [#{ message.stats.first.data.map { | n |  "0x%02x" % n }.join ", " }]"
   end
 
 
-  def send_vendor_stats_request datapath_id
+  def send_vendor_stats_request(datapath_id)
     data = [
       OVSST_FLOW,
       0x0, 0x0, 0x0, 0x0,
@@ -52,9 +52,9 @@ class VendorStatsRequestSample < Controller
       0x0,
       0xff,
       0x0, 0x0, 0x0
-    ].pack( "NC4 nnCC3" )
-    vendor_request = VendorStatsRequest.new( :vendor_id => OVS_VENDOR_ID, :data => data.unpack( "C*" ) )
-    send_message( datapath_id, vendor_request )
+    ].pack('NC4 nnCC3')
+    vendor_request = VendorStatsRequest.new(:vendor_id => OVS_VENDOR_ID, :data => data.unpack('C*'))
+    send_message(datapath_id, vendor_request)
   end
 end
 

data/src/examples/packet_in/packet-in.rb

@@ -17,8 +17,8 @@
 
 
 class PacketInDumper < Controller
-  def packet_in datapath_id, message
-    info "received a packet_in"
+  def packet_in(datapath_id, message)
+    info 'received a packet_in'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "buffer_id: #{ message.buffer_id.to_hex }"

data/src/examples/patch_panel/patch-panel.rb

@@ -19,15 +19,15 @@
 class PatchPanel < Controller
   def start
     @patch = []
-    File.open( "./patch-panel.conf" ).each_line do | each |
-      if /^(\d+)\s+(\d+)$/=~ each
-        @patch << [ $1.to_i, $2.to_i ]
+    File.open('./patch-panel.conf').each_line do | each |
+      if /^(\d+)\s+(\d+)$/ =~ each
+        @patch << [$1.to_i, $2.to_i]
       end
     end
   end
 
 
-  def switch_ready datapath_id
+  def switch_ready(datapath_id)
     @patch.each do | port_a, port_b |
       make_patch datapath_id, port_a, port_b
     end
@@ -37,16 +37,16 @@ class PatchPanel < Controller
   private
 
 
-  def make_patch datapath_id, port_a, port_b
+  def make_patch(datapath_id, port_a, port_b)
     send_flow_mod_add(
       datapath_id,
-      :match => Match.new( :in_port => port_a ),
-      :actions => SendOutPort.new( port_b )
+      :match => Match.new(:in_port => port_a),
+      :actions => SendOutPort.new(port_b)
     )
     send_flow_mod_add(
       datapath_id,
-      :match => Match.new( :in_port => port_b ),
-      :actions => SendOutPort.new( port_a )
+      :match => Match.new(:in_port => port_b),
+      :actions => SendOutPort.new(port_a)
     )
   end
 end

data/src/examples/repeater_hub/repeater-hub.rb

@@ -19,16 +19,16 @@
 
 
 class RepeaterHub < Controller
-  def packet_in datapath_id, message
+  def packet_in(datapath_id, message)
     send_flow_mod_add(
       datapath_id,
-      :match => ExactMatch.from( message ),
-      :actions => ActionOutput.new( OFPP_FLOOD )
+      :match => ExactMatch.from(message),
+      :actions => ActionOutput.new(OFPP_FLOOD)
     )
     send_packet_out(
       datapath_id,
       :packet_in => message,
-      :actions => ActionOutput.new( OFPP_FLOOD )
+      :actions => ActionOutput.new(OFPP_FLOOD)
     )
   end
 end

data/src/examples/repeater_hub/repeater-hub_spec.rb

@@ -16,131 +16,131 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "..", "spec", "spec_helper" )
-require File.join( File.dirname( __FILE__ ), "repeater-hub" )
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'spec', 'spec_helper')
+require File.join(File.dirname(__FILE__), 'repeater-hub')
 
 
 describe RepeaterHub do
   around do | example |
-    network {
-      vswitch("switch") { datapath_id "0xabc" }
+    network do
+      vswitch('switch') { datapath_id '0xabc' }
 
-      vhost("host1") { promisc "on" }
-      vhost("host2") { promisc "on" }
-      vhost("host3") { promisc "on" }
+      vhost('host1') { promisc 'on' }
+      vhost('host2') { promisc 'on' }
+      vhost('host3') { promisc 'on' }
 
-      link "switch", "host1"
-      link "switch", "host2"
-      link "switch", "host3"
-    }.run( RepeaterHub ) {
+      link 'switch', 'host1'
+      link 'switch', 'host2'
+      link 'switch', 'host3'
+    end.run(RepeaterHub) do
       example.run
-    }
+    end
   end
 
 
-  context "when host1 sends one packet to host2" do
-    it "should #packet_in" do
-      controller( "RepeaterHub" ).should_receive( :packet_in )
+  context 'when host1 sends one packet to host2' do
+    it 'should #packet_in' do
+      controller('RepeaterHub').should_receive(:packet_in)
 
-      send_packets "host1", "host2"
+      send_packets 'host1', 'host2'
       sleep 2 # FIXME: wait to send_packets
     end
 
 
-    it "should #send_flow_mod_add" do
-      controller( "RepeaterHub" ).should_receive( :send_flow_mod_add )
+    it 'should #send_flow_mod_add' do
+      controller('RepeaterHub').should_receive(:send_flow_mod_add)
 
-      send_packets "host1", "host2"
+      send_packets 'host1', 'host2'
       sleep 2 # FIXME: wait to send_packets
     end
 
 
-    describe "switch" do
-      before { send_packets "host1", "host2" }
+    describe 'switch' do
+      before { send_packets 'host1', 'host2' }
 
-      subject { vswitch( "switch" ) }
+      subject { vswitch('switch') }
 
-      it { should have( 1 ).flows }
-      its( "flows.first.actions" ) { should == "FLOOD" }
+      it { should have(1).flows }
+      its('flows.first.actions') { should == 'FLOOD' }
     end
 
 
-    describe "host" do
-      before { send_packets "host1", "host2" }
+    describe 'host' do
+      before { send_packets 'host1', 'host2' }
 
-      subject { vhost( host_name ) }
+      subject { vhost(host_name) }
 
-      context "RX stats of host2" do
-        let( :host_name ) { "host2" }
-        its( "rx_stats.n_pkts" ) { should == 1 }
+      context 'RX stats of host2' do
+        let(:host_name) { 'host2' }
+        its('rx_stats.n_pkts') { should == 1 }
       end
 
-      context "RX stats of host3" do
-        let( :host_name ) { "host3" }
-        its( "rx_stats.n_pkts" ) { should == 1 }
+      context 'RX stats of host3' do
+        let(:host_name) { 'host3' }
+        its('rx_stats.n_pkts') { should == 1 }
       end
     end
   end
 
 
-  context "when host1 sends one more packet after the first packet" do
-    before { send_packets "host1", "host2" }
+  context 'when host1 sends one more packet after the first packet' do
+    before { send_packets 'host1', 'host2' }
 
-    it "should not #packet_in" do
-      controller( "RepeaterHub" ).should_not_receive( :packet_in )
+    it 'should not #packet_in' do
+      controller('RepeaterHub').should_not_receive(:packet_in)
 
-      send_packets "host1", "host2"
+      send_packets 'host1', 'host2'
     end
 
-    it "should not #send_flow_mod_add" do
-      controller( "RepeaterHub" ).should_not_receive( :send_flow_mod_add )
+    it 'should not #send_flow_mod_add' do
+      controller('RepeaterHub').should_not_receive(:send_flow_mod_add)
 
-      send_packets "host1", "host2"
+      send_packets 'host1', 'host2'
     end
 
 
-    describe "switch" do
-      before { send_packets "host1", "host2" }
+    describe 'switch' do
+      before { send_packets 'host1', 'host2' }
 
-      subject { vswitch( "switch" ) }
+      subject { vswitch('switch') }
 
-      it { should have( 1 ).flows }
-      its( "flows.first.actions" ) { should == "FLOOD" }
+      it { should have(1).flows }
+      its('flows.first.actions') { should == 'FLOOD' }
     end
 
 
-    describe "host" do
-      before { send_packets "host1", "host2" }
+    describe 'host' do
+      before { send_packets 'host1', 'host2' }
 
-      subject { vhost( host_name ) }
+      subject { vhost(host_name) }
 
-      context "RX stats of host2" do
-        let( :host_name ) { "host2" }
-        its( "rx_stats.n_pkts" ) { should == 2 }
+      context 'RX stats of host2' do
+        let(:host_name) { 'host2' }
+        its('rx_stats.n_pkts') { should == 2 }
       end
 
-      context "RX stats of host3" do
-        let( :host_name ) { "host3" }
-        its( "rx_stats.n_pkts" ) { should == 2 }
+      context 'RX stats of host3' do
+        let(:host_name) { 'host3' }
+        its('rx_stats.n_pkts') { should == 2 }
       end
     end
   end
 
 
-  context "when host1 sends 100 packets to host2" do
-    describe "host" do
-      before { send_packets "host1", "host2", :pps => 100 }
+  context 'when host1 sends 100 packets to host2' do
+    describe 'host' do
+      before { send_packets 'host1', 'host2', :pps => 100 }
 
-      subject { vhost( host_name ) }
+      subject { vhost(host_name) }
 
-      context "RX stats of host2" do
-        let( :host_name ) { "host2" }
-        its( "rx_stats.n_pkts" ) { should == 100 }
+      context 'RX stats of host2' do
+        let(:host_name) { 'host2' }
+        its('rx_stats.n_pkts') { should == 100 }
       end
 
-      context "RX stats of host3" do
-        let( :host_name ) { "host3" }
-        its( "rx_stats.n_pkts" ) { should == 100 }
+      context 'RX stats of host3' do
+        let(:host_name) { 'host3' }
+        its('rx_stats.n_pkts') { should == 100 }
       end
     end
   end

data/src/examples/simple_router/arp-table.rb

@@ -24,24 +24,24 @@ class ARPEntry
   attr_reader :hwaddr
   attr_writer :age_max
 
-  def initialize port, hwaddr, age_max
+  def initialize(port, hwaddr, age_max)
     @port = port
     @hwaddr = hwaddr
     @age_max = age_max
     @last_updated = Time.now
-    info "New entry: MAC addr = #{ @hwaddr.to_s }, port = #{ @port }"
+    info "New entry: MAC addr = #{ @hwaddr }, port = #{ @port }"
   end
 
-  def update port, hwaddr
+  def update(port, hwaddr)
     @port = port
     @hwaddr = hwaddr
     @last_updated = Time.now
-    info "Update entry: MAC addr = #{ @hwaddr.to_s }, port = #{ @port }"
+    info "Update entry: MAC addr = #{ @hwaddr }, port = #{ @port }"
   end
 
   def aged_out?
     aged_out = Time.now - @last_updated > @age_max
-    info "Age out: An ARP entry (MAC address = #{ @hwaddr.to_s }, port number = #{ @port }) has been aged-out" if aged_out
+    info "Age out: An ARP entry (MAC address = #{ @hwaddr }, port number = #{ @port }) has been aged-out" if aged_out
     aged_out
   end
 end
@@ -53,7 +53,7 @@ class ARPTable
     @db = {}
   end
 
-  def update port, ipaddr, hwaddr
+  def update(port, ipaddr, hwaddr)
     entry = @db[ipaddr.to_i]
     if entry
       entry.update(port, hwaddr)
@@ -63,7 +63,7 @@ class ARPTable
     end
   end
 
-  def lookup ipaddr
+  def lookup(ipaddr)
     @db[ipaddr.to_i]
   end
 

data/src/examples/simple_router/interface.rb

@@ -28,56 +28,56 @@ class Interface
   attr_reader :masklen
   attr_reader :port
 
-  def initialize options
+  def initialize(options)
     @port = options[:port]
     @hwaddr = Pio::Mac.new(options[:hwaddr])
     @ipaddr = Pio::IPv4Address.new(options[:ipaddr])
     @masklen = options[:masklen]
   end
 
-  def has? mac
+  def has?(mac)
     mac == hwaddr
   end
 end
 
 class Interfaces
-  def initialize interfaces = []
+  def initialize(interfaces = [])
     @list = []
     interfaces.each do |each|
       @list << Interface.new(each)
     end
   end
 
-  def find_by_port port
+  def find_by_port(port)
     @list.find do |each|
       each.port == port
     end
   end
 
-  def find_by_ipaddr ipaddr
+  def find_by_ipaddr(ipaddr)
     @list.find do |each|
       each.ipaddr.to_i == ipaddr.to_i
     end
   end
 
-  def find_by_prefix ipaddr
+  def find_by_prefix(ipaddr)
     @list.find do |each|
       masklen = each.masklen
       each.ipaddr.mask(masklen).to_s == ipaddr.mask(masklen).to_s
     end
   end
 
-  def find_by_port_and_ipaddr port, ipaddr
+  def find_by_port_and_ipaddr(port, ipaddr)
     @list.find do |each|
-      each.port == port and each.ipaddr.to_i == ipaddr.to_i
+      each.port == port && each.ipaddr.to_i == ipaddr.to_i
     end
   end
 
-  def ours? port, macda
+  def ours?(port, macda)
     true if macda.broadcast?
 
     interface = find_by_port(port)
-    if not interface.nil? and interface.has?(macda)
+    unless interface.nil? && interface.has?(macda)
       true
     end
   end

data/src/examples/simple_router/routing-table.rb

@@ -22,28 +22,28 @@ require 'pio'
 class RoutingTable
   ADDR_LEN = 32
 
-  def initialize route = []
+  def initialize(route = [])
     @db = Array.new(ADDR_LEN + 1) { Hash.new }
     route.each do |each|
       add(each)
     end
   end
 
-  def add options
+  def add(options)
     dest = Pio::IPv4Address.new(options[:destination])
     masklen = options[:masklen]
     prefix = dest.mask(masklen)
     @db[masklen][prefix.to_i] = Pio::IPv4Address.new(options[:nexthop])
   end
 
-  def delete options
+  def delete(options)
     dest = Pio::IPv4Address.new(options[:destination])
     masklen = options[:masklen]
     prefix = dest.mask(masklen)
     @db[masklen].delete(prefix.to_i)
   end
 
-  def lookup dest
+  def lookup(dest)
     (0..ADDR_LEN).reverse_each do |masklen|
       prefix = dest.mask(masklen)
       entry = @db[masklen][prefix.to_i]