trema 0.4.6 → 0.4.7

data/spec/trema/flow-removed_spec.rb

@@ -16,114 +16,114 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe Trema::FlowRemoved, ".new( VALID OPTIONS )" do
-  context "when an instance is created" do
+describe Trema::FlowRemoved, '.new( VALID OPTIONS )' do
+  context 'when an instance is created' do
     subject do
       match = Match.new(
         :in_port => 1,
-        :dl_src => "00:00:00:00:00:01",
-        :dl_dst => "00:00:00:00:00:02",
+        :dl_src => '00:00:00:00:00:01',
+        :dl_dst => '00:00:00:00:00:02',
         :dl_vlan => 65535,
         :dl_vlan_pcp => 0,
         :dl_type => 0x800,
         :nw_tos => 0,
         :nw_proto => 17,
-        :nw_src => "192.168.0.1",
-        :nw_dst => "192.168.0.2",
+        :nw_src => '192.168.0.1',
+        :nw_dst => '192.168.0.2',
         :tp_src => 1,
         :tp_dst => 1
       )
 
       FlowRemoved.new(
-        :datapath_id=>2748,
-        :transaction_id=>0,
+        :datapath_id => 2748,
+        :transaction_id => 0,
         :match => match,
         :cookie => 123456789,
         :priority => 65535,
         :reason => 0,
-        :duration_sec=>1,
-        :duration_nsec=>779000000,
-        :idle_timeout=>1,
-        :packet_count=> 6,
+        :duration_sec => 1,
+        :duration_nsec => 779000000,
+        :idle_timeout => 1,
+        :packet_count => 6,
         :byte_count => 256
       )
     end
-    its ( :datapath_id ) { should == 2748 }
-    its ( :transaction_id ) { should == 0 }
-    its ( :match ) { should be_instance_of( Match ) }
-    its ( :cookie ) { should == 123456789 }
-    its ( :priority ) { should == 65535 }
-    its ( :reason ) { should == 0 }
-    its ( :duration_sec ) { should == 1 }
-    its ( :duration_nsec ) { should == 779000000 }
-    its ( :idle_timeout ) { should == 1 }
-    its ( :packet_count ) { should == 6 }
-    its ( :byte_count ) { should == 256 }
+    its ( :datapath_id) { should == 2748 }
+    its ( :transaction_id) { should == 0 }
+    its ( :match) { should be_instance_of(Match) }
+    its ( :cookie) { should == 123456789 }
+    its ( :priority) { should == 65535 }
+    its ( :reason) { should == 0 }
+    its ( :duration_sec) { should == 1 }
+    its ( :duration_nsec) { should == 779000000 }
+    its ( :idle_timeout) { should == 1 }
+    its ( :packet_count) { should == 6 }
+    its ( :byte_count) { should == 256 }
   end
 
 
-  context "when a flow expires" do
-    it "should #flow_removed" do
+  context 'when a flow expires' do
+    it 'should #flow_removed' do
       class FlowRemovedController < Controller; end
-      network {
+      network do
         vswitch { datapath_id 0xabc }
-      }.run( FlowRemovedController ) {
-        controller( "FlowRemovedController" ).should_receive( :flow_removed )
-        controller( "FlowRemovedController" ).send_flow_mod_add(
+      end.run(FlowRemovedController) do
+        controller('FlowRemovedController').should_receive(:flow_removed)
+        controller('FlowRemovedController').send_flow_mod_add(
           0xabc,
           :idle_timeout => 1,
           :send_flow_rem => true
         )
         sleep 2 # FIXME: wait to receive flow_removed
-      }
+      end
     end
 
 
-    it "should #flow_removed with valid attributes as per flow mod add" do
+    it 'should #flow_removed with valid attributes as per flow mod add' do
       class FlowRemovedController < Controller; end
       match = Match.new(
-        :in_port=> 1,
-        :dl_src => "00:00:00:00:00:01",
-        :dl_dst => "00:00:00:00:00:02",
+        :in_port => 1,
+        :dl_src => '00:00:00:00:00:01',
+        :dl_dst => '00:00:00:00:00:02',
         :dl_type => 0x800,
         :dl_vlan => 65535,
         :dl_vlan_pcp => 0,
         :nw_tos => 0,
         :nw_proto => 17,
-        :nw_src => "192.168.0.1",
-        :nw_dst => "192.168.0.2",
+        :nw_src => '192.168.0.1',
+        :nw_dst => '192.168.0.2',
         :tp_src => 1,
         :tp_dst => 1
       )
-      network {
+      network do
         vswitch { datapath_id 0xabc }
-      }.run( FlowRemovedController ) {
-        controller( "FlowRemovedController" ).should_receive( :flow_removed ) do | datapath_id, message |
-          expect( datapath_id ).to eq( 0xabc )
-          expect( message.match.in_port ).to eq( 1 )
-          expect( message.match.dl_src.to_s ).to eq( "00:00:00:00:00:01" )
-          expect( message.match.dl_dst.to_s ).to eq( "00:00:00:00:00:02" )
-          expect( message.match.dl_type ).to eq( 0x800 )
-          expect( message.match.dl_vlan ).to eq( 65535 )
-          expect( message.match.dl_vlan_pcp ).to eq( 0 )
-          expect( message.match.nw_tos ).to eq( 0 )
-          expect( message.match.nw_proto ).to eq( 17 )
-          expect( Pio::IPv4Address.new( message.match.nw_src ).to_s ).to eq( "192.168.0.1" )
-          expect( Pio::IPv4Address.new( message.match.nw_dst ).to_s ).to eq( "192.168.0.2" )
-          expect( message.match.tp_src ).to eq( 1 )
-          expect( message.match.tp_dst ).to eq( 1 )
-          expect( message.cookie ).to eq( 123456789 )
-          expect( message.idle_timeout ).to eq( 1 )
-          expect( message.reason ).to eq( 0 )
-          expect( message.duration_sec ).to be >= 1
-          expect( message.packet_count ).to eq( 0 )
-          expect( message.byte_count ).to eq( 0 )
+      end.run(FlowRemovedController) do
+        controller('FlowRemovedController').should_receive(:flow_removed) do | datapath_id, message |
+          expect(datapath_id).to eq(0xabc)
+          expect(message.match.in_port).to eq(1)
+          expect(message.match.dl_src.to_s).to eq('00:00:00:00:00:01')
+          expect(message.match.dl_dst.to_s).to eq('00:00:00:00:00:02')
+          expect(message.match.dl_type).to eq(0x800)
+          expect(message.match.dl_vlan).to eq(65535)
+          expect(message.match.dl_vlan_pcp).to eq(0)
+          expect(message.match.nw_tos).to eq(0)
+          expect(message.match.nw_proto).to eq(17)
+          expect(Pio::IPv4Address.new(message.match.nw_src).to_s).to eq('192.168.0.1')
+          expect(Pio::IPv4Address.new(message.match.nw_dst).to_s).to eq('192.168.0.2')
+          expect(message.match.tp_src).to eq(1)
+          expect(message.match.tp_dst).to eq(1)
+          expect(message.cookie).to eq(123456789)
+          expect(message.idle_timeout).to eq(1)
+          expect(message.reason).to eq(0)
+          expect(message.duration_sec).to be >= 1
+          expect(message.packet_count).to eq(0)
+          expect(message.byte_count).to eq(0)
         end
-        controller( "FlowRemovedController" ).send_flow_mod_add(
+        controller('FlowRemovedController').send_flow_mod_add(
           0xabc,
           :match => match,
           :cookie => 123456789,
@@ -131,7 +131,7 @@ describe Trema::FlowRemoved, ".new( VALID OPTIONS )" do
           :send_flow_rem => true
         )
         sleep 2 # FIXME: wait to receive flow_removed
-      }
+      end
     end
   end
 end

data/spec/trema/get-config-reply_spec.rb

@@ -16,21 +16,23 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe GetConfigReply, ".new( VALID OPTIONS )" do
-  subject { GetConfigReply.new( :datapath_id => 123,
-    :transaction_id => 1234,
-    :flags => 1,
-    :miss_send_len => 1024
+describe GetConfigReply, '.new( VALID OPTIONS )' do
+  subject do
+    GetConfigReply.new(
+      :datapath_id => 123,
+      :transaction_id => 1234,
+      :flags => 1,
+      :miss_send_len => 1024
     )
-  }
-  its ( :datapath_id ) { should == 123 }
-  its ( :transaction_id ) { should == 1234 }
-  its ( :flags ) { should == 1 }
-  its ( :miss_send_len ) { should == 1024 }
+  end
+  its ( :datapath_id) { should == 123 }
+  its ( :transaction_id) { should == 1234 }
+  its ( :flags) { should == 1 }
+  its ( :miss_send_len) { should == 1024 }
 end
 
 

data/spec/trema/get-config-request_spec.rb

@@ -16,71 +16,71 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-shared_examples_for "get config request message" do
+shared_examples_for 'get config request message' do
   class GetConfigRequestController < Controller; end
 
   it "should be logged to the switch's log", :sudo => true do
-    network {
-      vswitch( "get-config-request" ) { datapath_id 0xabc }
-    }.run( GetConfigRequestController ) {
-      controller( "GetConfigRequestController" ).send_message( 0xabc, subject )
+    network do
+      vswitch('get-config-request') { datapath_id 0xabc }
+    end.run(GetConfigRequestController) do
+      controller('GetConfigRequestController').send_message(0xabc, subject)
       sleep 2 # FIXME: wait to send_message
-      expect( IO.read( File.join( Trema.log, "openflowd.get-config-request.log" ) ) ).to include( "OFPT_GET_CONFIG_REQUEST" )
-    }
+      expect(IO.read(File.join(Trema.log, 'openflowd.get-config-request.log'))).to include('OFPT_GET_CONFIG_REQUEST')
+    end
   end
 end
 
 
 module Trema
-  describe GetConfigRequest, ".new" do
-    it_should_behave_like "any Openflow message with default transaction ID"
-    it_should_behave_like "get config request message"
+  describe GetConfigRequest, '.new' do
+    it_should_behave_like 'any Openflow message with default transaction ID'
+    it_should_behave_like 'get config request message'
   end
 
 
-  describe GetConfigRequest, ".new(nil)" do
-    subject { GetConfigRequest.new( nil ) }
-    it_should_behave_like "any Openflow message with default transaction ID"
-    it_should_behave_like "get config request message"
+  describe GetConfigRequest, '.new(nil)' do
+    subject { GetConfigRequest.new(nil) }
+    it_should_behave_like 'any Openflow message with default transaction ID'
+    it_should_behave_like 'get config request message'
   end
 
 
-  describe GetConfigRequest, ".new(transaction_id)" do
-    subject { GetConfigRequest.new( transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
-    context "when sent to a switch" do
-      let( :transaction_id ) { 123 }
-      it_should_behave_like "get config request message"
+  describe GetConfigRequest, '.new(transaction_id)' do
+    subject { GetConfigRequest.new(transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
+    context 'when sent to a switch' do
+      let(:transaction_id) { 123 }
+      it_should_behave_like 'get config request message'
     end
   end
 
 
-  describe GetConfigRequest, ".new(:transaction_id => value)" do
-    subject { GetConfigRequest.new( :transaction_id => transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
-    context "when sent to a switch" do
-      let( :transaction_id ) { 123 }
-      it_should_behave_like "get config request message"
+  describe GetConfigRequest, '.new(:transaction_id => value)' do
+    subject { GetConfigRequest.new(:transaction_id => transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
+    context 'when sent to a switch' do
+      let(:transaction_id) { 123 }
+      it_should_behave_like 'get config request message'
     end
   end
 
 
-  describe GetConfigRequest, ".new(:xid => value)" do
-    subject { GetConfigRequest.new( :xid => xid ) }
-    it_should_behave_like "any Openflow message with xid"
-    context "when sent to a switch" do
-      let( :xid ) { 123 }
-      it_should_behave_like "get config request message"
+  describe GetConfigRequest, '.new(:xid => value)' do
+    subject { GetConfigRequest.new(:xid => xid) }
+    it_should_behave_like 'any Openflow message with xid'
+    context 'when sent to a switch' do
+      let(:xid) { 123 }
+      it_should_behave_like 'get config request message'
     end
   end
 
 
   describe GetConfigRequest, '.new("INVALID OPTION")', :nosudo => true do
-    it { expect { GetConfigRequest.new "INVALID OPTION" }.to raise_error( TypeError ) }
+    it { expect { GetConfigRequest.new 'INVALID OPTION' }.to raise_error(TypeError) }
   end
 end
 

data/spec/trema/hardware-switch_spec.rb

@@ -16,32 +16,32 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/dsl/switch"
-require "trema/hardware-switch"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/dsl/switch'
+require 'trema/hardware-switch'
 
 
 module Trema
-  describe HardwareSwitch, %[dpid = "0xabc"] do
+  describe HardwareSwitch, 'dpid = 0xabc' do
     before :each do
       stanza = DSL::Switch.new
-      stanza.dpid "0xabc"
-      @switch = HardwareSwitch.new( stanza )
+      stanza.dpid '0xabc'
+      @switch = HardwareSwitch.new(stanza)
     end
 
 
-    it "should return its name" do
-      expect( @switch.name ).to eq( "0xabc" )
+    it 'should return its name' do
+      expect(@switch.name).to eq('0xabc')
     end
 
 
-    it "should return dpid in long format" do
-      expect( @switch.dpid_long ).to eq( "0000000000000abc" )
+    it 'should return dpid in long format' do
+      expect(@switch.dpid_long).to eq('0000000000000abc')
     end
 
 
-    it "should return dpid in short format" do
-      expect( @switch.dpid_short ).to eq( "0xabc" )
+    it 'should return dpid in short format' do
+      expect(@switch.dpid_short).to eq('0xabc')
     end
   end
 end

data/spec/trema/hello_spec.rb

@@ -16,42 +16,42 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 module Trema
-  describe Hello, ".new" do
-    it_should_behave_like "any Openflow message with default transaction ID"
+  describe Hello, '.new' do
+    it_should_behave_like 'any Openflow message with default transaction ID'
   end
 
 
-  describe Hello, ".new(nil)" do
-    subject { Hello.new( nil ) }
-    it_should_behave_like "any Openflow message with default transaction ID"
+  describe Hello, '.new(nil)' do
+    subject { Hello.new(nil) }
+    it_should_behave_like 'any Openflow message with default transaction ID'
   end
 
 
-  describe Hello, ".new(transaction_id)" do
-    subject { Hello.new( transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
+  describe Hello, '.new(transaction_id)' do
+    subject { Hello.new(transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
   end
 
 
-  describe Hello, ".new(:transaction_id => value)" do
-    subject { Hello.new( :transaction_id => transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
+  describe Hello, '.new(:transaction_id => value)' do
+    subject { Hello.new(:transaction_id => transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
   end
 
 
-  describe Hello, ".new(:xid => value)" do
-    subject { Hello.new( :xid => xid ) }
-    it_should_behave_like "any Openflow message with xid"
+  describe Hello, '.new(:xid => value)' do
+    subject { Hello.new(:xid => xid) }
+    it_should_behave_like 'any Openflow message with xid'
   end
 
 
   describe Hello, '.new("INVALID OPTION")' do
-    it { expect { Hello.new "INVALID OPTION" }.to raise_error( TypeError ) }
+    it { expect { Hello.new 'INVALID OPTION' }.to raise_error(TypeError) }
   end
 end
 

data/spec/trema/host_spec.rb

@@ -16,166 +16,166 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/host"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/host'
 
 
 module Trema
   describe Host do
-    before {
+    before do
       Host.instances.clear
 
-      @cli = mock( "cli" )
-      Cli.stub!( :new ).and_return( @cli )
-    }
+      @cli = mock('cli')
+      Cli.stub!(:new).and_return(@cli)
+    end
 
 
     describe :ip do
-      context "when ip is omitted" do
+      context 'when ip is omitted' do
         before { @stanza = {} }
 
-        subject { Host.new( @stanza ).ip }
+        subject { Host.new(@stanza).ip }
 
-        it { should == "192.168.0.1" }
+        it { should == '192.168.0.1' }
       end
 
 
       context "when ip \"192.168.100.100\"" do
-        before { @stanza = { :ip => "192.168.100.100" } }
+        before { @stanza = { :ip => '192.168.100.100' } }
 
-        subject { Host.new( @stanza ).ip }
+        subject { Host.new(@stanza).ip }
 
-        it { should == "192.168.100.100" }
+        it { should == '192.168.100.100' }
       end
     end
 
 
     describe :mac do
-      context "when mac is omitted" do
+      context 'when mac is omitted' do
         before { @stanza = {} }
 
-        subject { Host.new( @stanza ).mac }
+        subject { Host.new(@stanza).mac }
 
-        it { should == "00:00:00:00:00:01" }
+        it { should == '00:00:00:00:00:01' }
       end
 
 
       context "when mac \"00:00:00:aa:bb:cc\"" do
-        before { @stanza = { :mac => "00:00:00:aa:bb:cc" } }
+        before { @stanza = { :mac => '00:00:00:aa:bb:cc' } }
 
-        subject { Host.new( @stanza ).mac }
+        subject { Host.new(@stanza).mac }
 
-        it { should == "00:00:00:aa:bb:cc" }
+        it { should == '00:00:00:aa:bb:cc' }
       end
     end
 
 
     describe :netmask do
-      context "when netmask is omitted" do
+      context 'when netmask is omitted' do
         before { @stanza = {} }
 
-        subject { Host.new( @stanza ).netmask }
+        subject { Host.new(@stanza).netmask }
 
-        it { should == "255.255.255.255" }
+        it { should == '255.255.255.255' }
       end
 
 
       context "when netmask \"255.255.0.0\"" do
-        before { @stanza = { :netmask => "255.255.0.0" } }
+        before { @stanza = { :netmask => '255.255.0.0' } }
 
-        subject { Host.new( @stanza ).netmask }
+        subject { Host.new(@stanza).netmask }
 
-        it { should == "255.255.0.0" }
+        it { should == '255.255.0.0' }
       end
     end
 
 
-    context "when #add_arp_entries" do
+    context 'when #add_arp_entries' do
       describe :cli do
-        before {
-          @host0 = Host.new( :name => "HOST 0" )
-          @host1 = mock( "HOST 1" )
-          @host2 = mock( "HOST 2" )
-          @host3 = mock( "HOST 3" )
-        }
-
-        it "should add arp entries" do
-          @cli.should_receive( :add_arp_entry ).with( @host1 )
-          @cli.should_receive( :add_arp_entry ).with( @host2 )
-          @cli.should_receive( :add_arp_entry ).with( @host3 )
-
-          @host0.add_arp_entry [ @host1, @host2, @host3 ]
+        before do
+          @host0 = Host.new(:name => 'HOST 0')
+          @host1 = mock('HOST 1')
+          @host2 = mock('HOST 2')
+          @host3 = mock('HOST 3')
+        end
+
+        it 'should add arp entries' do
+          @cli.should_receive(:add_arp_entry).with(@host1)
+          @cli.should_receive(:add_arp_entry).with(@host2)
+          @cli.should_receive(:add_arp_entry).with(@host3)
+
+          @host0.add_arp_entry [@host1, @host2, @host3]
         end
       end
     end
 
 
-    context "when #run!" do
+    context 'when #run!' do
       describe :cli do
-        before {
-          Phost.stub!( :new ).and_return( mock( "phost", :run! => nil ) )
-        }
+        before do
+          Phost.stub!(:new).and_return(mock('phost', :run! => nil))
+        end
 
-        it "should set IP and MAC address" do
-          @cli.should_receive( :set_ip_and_mac_address )
+        it 'should set IP and MAC address' do
+          @cli.should_receive(:set_ip_and_mac_address)
 
-          Host.new( :name => "Yutaro's host" ).run!
+          Host.new(:name => "Yutaro's host").run!
         end
 
 
-        context "when promisc on" do
-          before { @cli.stub!( :set_ip_and_mac_address ) }
+        context 'when promisc on' do
+          before { @cli.stub!(:set_ip_and_mac_address) }
 
-          it "should enable promisc" do
-            @cli.should_receive( :enable_promisc )
+          it 'should enable promisc' do
+            @cli.should_receive(:enable_promisc)
 
-            Host.new( :name => "Yutaro's host", :promisc => true ).run!
+            Host.new(:name => "Yutaro's host", :promisc => true).run!
           end
         end
       end
     end
 
 
-    context "when #send_packets" do
+    context 'when #send_packets' do
       describe :cli do
-        before {
-          @dest = mock( "dest" )
-          @options = mock( "options" )
-        }
+        before do
+          @dest = mock('dest')
+          @options = mock('options')
+        end
 
-        it "should send_packets" do
-          @cli.should_receive( :send_packets ).with( @dest, @options )
+        it 'should send_packets' do
+          @cli.should_receive(:send_packets).with(@dest, @options)
 
-          Host.new( :name => "Yutaro's host" ).send_packet @dest, @options
+          Host.new(:name => "Yutaro's host").send_packet @dest, @options
         end
       end
     end
 
 
-    context "when getting stats" do
-      before {
-        @stats = mock( "stats" )
-        @host = Host.new( :name => "Yutaro's host" )
-      }
+    context 'when getting stats' do
+      before do
+        @stats = mock('stats')
+        @host = Host.new(:name => "Yutaro's host")
+      end
 
 
-      context "when #tx_stats" do
+      context 'when #tx_stats' do
         describe :cli do
-          it "should get tx stats" do
-            @cli.should_receive( :tx_stats ).and_return( @stats )
+          it 'should get tx stats' do
+            @cli.should_receive(:tx_stats).and_return(@stats)
 
-            expect( @host.tx_stats ).to eq( @stats )
+            expect(@host.tx_stats).to eq(@stats)
           end
         end
       end
 
 
-      context "when #rx_stats" do
+      context 'when #rx_stats' do
         describe :cli do
-          it "should get rx stats" do
-            @cli.should_receive( :rx_stats ).and_return( @stats )
+          it 'should get rx stats' do
+            @cli.should_receive(:rx_stats).and_return(@stats)
 
-            expect( @host.rx_stats ).to eq( @stats )
+            expect(@host.rx_stats).to eq(@stats)
           end
         end
       end