trema 0.4.6 → 0.4.7

data/spec/trema/vendor-action_spec.rb

@@ -16,53 +16,53 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe VendorAction, "new(vendor_id)", :type => "actions" do
+describe VendorAction, 'new(vendor_id)', :type => 'actions' do
   subject { VendorAction.new vendor_id }
 
-  context "with vendor_id (0x00004cff)" do
-    let( :vendor_id ) { 0x00004cff }
-    its( :vendor_id ) { should == 0x00004cff }
+  context 'with vendor_id (0x00004cff)' do
+    let(:vendor_id) { 0x00004cff }
+    its(:vendor_id) { should == 0x00004cff }
   end
 
-  it_validates "option is within range", :vendor_id, 0..( 2 ** 32 - 1 )
+  it_validates 'option is within range', :vendor_id, 0..( 2**32 - 1)
 
-  context %{with vendor_id ("0x00004cff")} do
-    let( :vendor_id ) { "0x00004cff" }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with vendor_id (0x00004cff)' do
+    let(:vendor_id) { '0x00004cff' }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 end
 
 
-describe VendorAction, ".new(0x00002320, body)", :type => "actions" do
+describe VendorAction, '.new(0x00002320, body)', :type => 'actions' do
   subject { VendorAction.new 0x00002320, body }
 
-  context %{with body ("deadbeef")} do
-    let( :body ) { "deadbeef" }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with body (deadbeef)' do
+    let(:body) { 'deadbeef' }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context "with body 9 octets long" do
-    let( :body ) { [ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 ] }
-    it { expect { subject }.to raise_error( ArgumentError ) }
+  context 'with body 9 octets long' do
+    let(:body) { [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08] }
+    it { expect { subject }.to raise_error(ArgumentError) }
   end
 
-  context "when sending a Flow Mod with VendorAction" do
-    let( :body ) { [ 0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ] }
+  context 'when sending a Flow Mod with VendorAction' do
+    let(:body) { [0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00] }
 
-    it "should insert a new flow entry with action (note:54.72.65.6d.61.00)" do
+    it 'should insert a new flow entry with action (note:54.72.65.6d.61.00)' do
       class TestController < Controller; end
-      network {
+      network do
         vswitch { datapath_id 0xabc }
-      }.run( TestController ) {
-        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
+      end.run(TestController) do
+        controller('TestController').send_flow_mod_add(0xabc, :actions => subject)
         sleep 2
-        expect( vswitch( "0xabc" ) ).to have( 1 ).flows
-        expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to eq( "note:54.72.65.6d.61.00" )
-      }
+        expect(vswitch('0xabc')).to have(1).flows
+        expect(vswitch('0xabc').flows[ 0].actions).to eq('note:54.72.65.6d.61.00')
+      end
     end
   end
 end

data/spec/trema/vendor_spec.rb

@@ -16,55 +16,55 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 module Trema
-  describe Vendor, ".new" do
-    it_should_behave_like "any Openflow message with default transaction ID"
-    its ( :vendor ) { should == 0 }
-    its ( :data ) { should be_nil }
+  describe Vendor, '.new' do
+    it_should_behave_like 'any Openflow message with default transaction ID'
+    its ( :vendor) { should == 0 }
+    its ( :data) { should be_nil }
   end
 
 
-  describe Vendor, ".new(nil)" do
-    it_should_behave_like "any Openflow message with default transaction ID"
-    its ( :vendor ) { should == 0 }
-    its ( :data ) { should be_nil }
+  describe Vendor, '.new(nil)' do
+    it_should_behave_like 'any Openflow message with default transaction ID'
+    its ( :vendor) { should == 0 }
+    its ( :data) { should be_nil }
   end
 
 
-  describe Vendor, ".new(:transaction_id => value)" do
-    subject { Vendor.new( :transaction_id => transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
+  describe Vendor, '.new(:transaction_id => value)' do
+    subject { Vendor.new(:transaction_id => transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
   end
 
 
-  describe Vendor, ".new(:xid => value)" do
-    subject { Vendor.new( :xid => xid ) }
-    it_should_behave_like "any Openflow message with xid"
+  describe Vendor, '.new(:xid => value)' do
+    subject { Vendor.new(:xid => xid) }
+    it_should_behave_like 'any Openflow message with xid'
   end
 
 
-  describe Vendor, ".new(:vendor_id => value)", :nosudo => true do
-    subject { Vendor.new( :vendor => vendor ) }
-    let( :vendor ) { 0xdeadbeef }
-    its( :vendor ) { should == 0xdeadbeef }
-    its ( :data ) { should be_nil }
+  describe Vendor, '.new(:vendor_id => value)', :nosudo => true do
+    subject { Vendor.new(:vendor => vendor) }
+    let(:vendor) { 0xdeadbeef }
+    its(:vendor) { should == 0xdeadbeef }
+    its ( :data) { should be_nil }
   end
 
 
-  describe Vendor, ".new(:data => value)", :nosudo => true do
-    subject { Vendor.new( :data => data ) }
-    let( :data ) { "VENDOR DATA".unpack( "C*" ) }
-    its( :data ) { should == [86, 69, 78, 68, 79, 82, 32, 68, 65, 84, 65] }
-    its ( :vendor ) { should == 0 }
+  describe Vendor, '.new(:data => value)', :nosudo => true do
+    subject { Vendor.new(:data => data) }
+    let(:data) { 'VENDOR DATA'.unpack('C*') }
+    its(:data) { should == [86, 69, 78, 68, 79, 82, 32, 68, 65, 84, 65] }
+    its ( :vendor) { should == 0 }
   end
 
 
   describe Vendor, '.new("INVALID OPTION")', :nosudo => true do
-    it { expect { Vendor.new "INVALID OPTION" }.to raise_error( TypeError ) }
+    it { expect { Vendor.new 'INVALID OPTION' }.to raise_error(TypeError) }
   end
 end
 

data/spec/trema_spec.rb

@@ -16,8 +16,8 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'trema'
 
 
 describe Trema do

data/src/examples/cbench_switch/cbench-switch.rb

@@ -19,13 +19,13 @@
 
 
 class CbenchSwitch < Controller
-  def packet_in datapath_id, message
+  def packet_in(datapath_id, message)
     send_flow_mod_add(
       datapath_id,
       :cookie => 0,
-      :match => ExactMatch.from( message ),
+      :match => ExactMatch.from(message),
       :buffer_id => message.buffer_id,
-      :actions => ActionOutput.new( :port => message.in_port + 1 )
+      :actions => ActionOutput.new(:port => message.in_port + 1)
     )
   end
 end

data/src/examples/dumper/dumper.rb

@@ -20,20 +20,20 @@
 # Openflow message event dumper.
 #
 class Dumper < Controller
-  def switch_ready datapath_id
-    info "[switch_ready]"
+  def switch_ready(datapath_id)
+    info '[switch_ready]'
     info "  datapath_id: #{ datapath_id.to_hex }"
   end
 
 
-  def switch_disconnected datapath_id
-    info "[switch_disconnected]"
+  def switch_disconnected(datapath_id)
+    info '[switch_disconnected]'
     info "  datapath_id: #{ datapath_id.to_hex }"
   end
 
 
-  def openflow_error datapath_id, message
-    info "[error]"
+  def openflow_error(datapath_id, message)
+    info '[error]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "type: #{ message.type.to_hex }"
@@ -42,17 +42,17 @@ class Dumper < Controller
   end
 
 
-  def vendor datapath_id, message
-    info "[vendor]"
+  def vendor(datapath_id, message)
+    info '[vendor]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
-    info "data:"
+    info 'data:'
     info "#{ message.buffer.unpack "H*" }"
   end
 
 
-  def features_reply datapath_id, message
-    info "[features_reply]"
+  def features_reply(datapath_id, message)
+    info '[features_reply]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "n_buffers: #{ message.n_buffers }"
@@ -65,8 +65,8 @@ class Dumper < Controller
   end
 
 
-  def get_config_reply datapath_id, message
-    info "[get_config_reply]"
+  def get_config_reply(datapath_id, message)
+    info '[get_config_reply]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "flags: #{ message.flags.to_hex }"
@@ -74,8 +74,8 @@ class Dumper < Controller
   end
 
 
-  def packet_in datapath_id, message
-    info "[packet_in]"
+  def packet_in(datapath_id, message)
+    info '[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 }"
@@ -86,12 +86,12 @@ class Dumper < Controller
   end
 
 
-  def flow_removed datapath_id, message
-    info "[flow_removed]"
+  def flow_removed(datapath_id, message)
+    info '[flow_removed]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
 
-    info "match:"
+    info 'match:'
     info "  wildcards: #{ message.match.wildcards.to_hex }"
     info "  in_port: #{ message.match.in_port }"
     info "  dl_src: #{ message.match.dl_src }"
@@ -117,8 +117,8 @@ class Dumper < Controller
   end
 
 
-  def port_status datapath_id, message
-    info "[port_status]"
+  def port_status(datapath_id, message)
+    info '[port_status]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "reason: #{ message.reason.to_hex }"
@@ -126,8 +126,8 @@ class Dumper < Controller
   end
 
 
-  def stats_reply datapath_id, message
-    info "[stats_reply]"
+  def stats_reply(datapath_id, message)
+    info '[stats_reply]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "type: #{ message.type.to_hex }"
@@ -136,19 +136,19 @@ class Dumper < Controller
   end
 
 
-  def barrier_reply datapath_id, message
-    info "[barrier_reply]"
+  def barrier_reply(datapath_id, message)
+    info '[barrier_reply]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
   end
 
 
-  def queue_get_config_reply datapath_id, message
-    info "[queue_get_config_reply]"
+  def queue_get_config_reply(datapath_id, message)
+    info '[queue_get_config_reply]'
     info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "port: #{ message.port }"
-    info( "queues:" );
+    info('queues:');
     dump_packet_queue message.queues
   end
 
@@ -158,7 +158,7 @@ class Dumper < Controller
   ##############################################################################
 
 
-  def dump_phy_port port
+  def dump_phy_port(port)
     # for testing port-status record the mac address if port.number == 2.
     @hw_addr = port.hw_addr if port.number == 2
     info "port_no: #{ port.number }"
@@ -173,15 +173,15 @@ class Dumper < Controller
   end
 
 
-  def dump_packet_queue queues
+  def dump_packet_queue(queues)
     queues.each do | packet_queue |
       info "queue_id: #{ packet_queue.queue_id.to_hex }"
       info "  len: #{ packet_queue.len }"
-      info "  properties:"
+      info '  properties:'
       packet_queue.properties.each do | prop |
         info "    property: #{ prop.property.to_hex }"
         info "    len: #{ prop.len.to_hex }"
-        info "      rate: %u" % prop.rate if prop.property == PacketQueue::OFPQT_MIN_RATE
+        info '      rate: %u' % prop.rate if prop.property == PacketQueue::OFPQT_MIN_RATE
       end
     end
   end

data/src/examples/hello_trema/hello-trema.rb

@@ -17,8 +17,8 @@
 
 
 class HelloTrema < Controller
-  def switch_ready datapath_id
-    info "Hello %#x!" % datapath_id
+  def switch_ready(datapath_id)
+    info 'Hello %#x!' % datapath_id
   end
 end
 

data/src/examples/learning_switch/fdb.rb

@@ -28,18 +28,18 @@ class ForwardingEntry
   attr_writer :age_max
 
 
-  def initialize mac, port_no, age_max, dpid
+  def initialize(mac, port_no, age_max, dpid)
     @mac = mac
     @port_no = port_no
     @age_max = age_max
     @dpid = dpid
     @last_update = Time.now
-    debug "New entry: MAC address = #{ @mac.to_s }, port number = #{ @port_no }"
+    debug "New entry: MAC address = #{ @mac }, port number = #{ @port_no }"
   end
 
 
-  def update port_no
-    debug "Update: The port number of #{ @mac.to_s } has been changed #{ @port_no } => #{ port_no }"
+  def update(port_no)
+    debug "Update: The port number of #{ @mac } has been changed #{ @port_no } => #{ port_no }"
     @port_no = port_no
     @last_update = Time.now
   end
@@ -47,7 +47,7 @@ class ForwardingEntry
 
   def aged_out?
     aged_out = Time.now - @last_update > @age_max
-    debug "Age out: An entry (MAC address = #{ @mac.to_s }, port number = #{ @port_no }) has been aged-out" if aged_out
+    debug "Age out: An entry (MAC address = #{ @mac }, port number = #{ @port_no }) has been aged-out" if aged_out
     aged_out
   end
 end
@@ -65,8 +65,8 @@ class FDB
   end
 
 
-  def port_no_of mac
-    dest = @db[ mac ]
+  def port_no_of(mac)
+    dest = @db[ mac]
     if dest
       dest.port_no
     else
@@ -75,22 +75,22 @@ class FDB
   end
 
 
-  def lookup mac
-    if dest = @db[ mac ]
-      [ dest.dpid, dest.port_no ]
+  def lookup(mac)
+    if dest = @db[ mac]
+      [dest.dpid, dest.port_no]
     else
       nil
     end
   end
 
 
-  def learn mac, port_no, dpid = nil
-    entry = @db[ mac ]
+  def learn(mac, port_no, dpid = nil)
+    entry = @db[ mac]
     if entry
       entry.update port_no
     else
-      new_entry = ForwardingEntry.new( mac, port_no, DEFAULT_AGE_MAX, dpid )
-      @db[ new_entry.mac ] = new_entry
+      new_entry = ForwardingEntry.new(mac, port_no, DEFAULT_AGE_MAX, dpid)
+      @db[ new_entry.mac] = new_entry
     end
   end
 

data/src/examples/learning_switch/learning-switch.rb

@@ -18,7 +18,7 @@
 #
 
 
-require "fdb"
+require 'fdb'
 
 
 #
@@ -33,11 +33,11 @@ class LearningSwitch < Controller
   end
 
 
-  def packet_in datapath_id, message
+  def packet_in(datapath_id, message)
     return if message.macda.reserved?
 
     @fdb.learn message.macsa, message.in_port
-    port_no = @fdb.port_no_of( message.macda )
+    port_no = @fdb.port_no_of(message.macda)
     if port_no
       flow_mod datapath_id, message, port_no
       packet_out datapath_id, message, port_no
@@ -57,25 +57,27 @@ class LearningSwitch < Controller
   ##############################################################################
 
 
-  def flow_mod datapath_id, message, port_no
+  def flow_mod(datapath_id, message, port_no)
     send_flow_mod_add(
       datapath_id,
-      :match => ExactMatch.from( message ),
-      :actions => ActionOutput.new( :port => port_no )
+      :match => ExactMatch.from(message),
+      :actions => ActionOutput.new(:port => port_no)
     )
   end
 
 
-  def packet_out datapath_id, message, port_no
+  def packet_out(datapath_id, message, port_no)
     send_packet_out(
       datapath_id,
-      :packet_in => message,
-      :actions => ActionOutput.new( :port => port_no )
+      :in_port => message.in_port,
+      :buffer_id => 0xffffffff,
+      :data => message.data,
+      :actions => ActionOutput.new(:port => port_no)
     )
   end
 
 
-  def flood datapath_id, message
+  def flood(datapath_id, message)
     packet_out datapath_id, message, OFPP_FLOOD
   end
 end