trema 0.4.6 → 0.4.7

data/spec/trema/enqueue_spec.rb

@@ -16,54 +16,54 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe Enqueue, ".new( :port_number => 1 )" do
-  it { expect { Enqueue.new( :port_number => 1 ) }.to raise_error( ArgumentError ) }
+describe Enqueue, '.new( :port_number => 1 )' do
+  it { expect { Enqueue.new(:port_number => 1) }.to raise_error(ArgumentError) }
 end
 
 
-describe Enqueue, ".new( :queue_id => 1 )" do
-  it { expect { Enqueue.new( :queue_id => 1 ) }.to raise_error( ArgumentError ) }
+describe Enqueue, '.new( :queue_id => 1 )' do
+  it { expect { Enqueue.new(:queue_id => 1) }.to raise_error(ArgumentError) }
 end
 
 
-describe Enqueue, ".new( :port_number => number, :queue_id => 1 )" do
+describe Enqueue, '.new( :port_number => number, :queue_id => 1 )' do
   subject { Enqueue.new :port_number => port_number, :queue_id => 1 }
-  it_validates "option is within range", :port_number, 0..( 2 ** 16 - 1 )
+  it_validates 'option is within range', :port_number, 0..( 2**16 - 1)
 
-  context "when :port_number == 1" do
-    let( :port_number ) { 1 }
-    its( :port_number ) { should == 1 }
+  context 'when :port_number == 1' do
+    let(:port_number) { 1 }
+    its(:port_number) { should == 1 }
   end
 end
 
 
-describe Enqueue, ".new( :port_number => 1, :queue_id => number )" do
+describe Enqueue, '.new( :port_number => 1, :queue_id => number )' do
   subject { Enqueue.new :port_number => 1, :queue_id => queue_id }
-  it_validates "option is within range", :queue_id, 0..( 2 ** 32 - 1 )
+  it_validates 'option is within range', :queue_id, 0..( 2**32 - 1)
 
-  context "when :queue_id == 256" do
-    let( :queue_id ) { 256 }
-    its( :queue_id ) { should == 256 }
+  context 'when :queue_id == 256' do
+    let(:queue_id) { 256 }
+    its(:queue_id) { should == 256 }
   end
 end
 
 
-describe Enqueue, ".new( VALID OPTIONS )" do
-  context "when sending #flow_mod(add) with action set to enqueue" do
-    it "should have a flow with action set to enqueue" do
+describe Enqueue, '.new( VALID OPTIONS )' do
+  context 'when sending #flow_mod(add) with action set to enqueue' do
+    it 'should have a flow with action set to enqueue' do
       class FlowModAddController < Controller; end
-      network {
+      network do
         vswitch { datapath_id 0xabc }
-      }.run( FlowModAddController ) {
-        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => Enqueue.new( :port_number => 1, :queue_id => 123 ) )
+      end.run(FlowModAddController) do
+        controller('FlowModAddController').send_flow_mod_add(0xabc, :actions => Enqueue.new(:port_number => 1, :queue_id => 123))
         sleep 2 # FIXME: wait to send_flow_mod
-        expect( vswitch( "0xabc" ) ).to have( 1 ).flows
-        expect( vswitch( "0xabc" ).flows[0].actions ).to match( /enqueue:1q123/ )
-      }
+        expect(vswitch('0xabc')).to have(1).flows
+        expect(vswitch('0xabc').flows[0].actions).to match(/enqueue:1q123/)
+      end
     end
   end
 end

data/spec/trema/error_spec.rb

@@ -16,60 +16,60 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 module Trema
-  describe Error, ".new", :nosudo => true do
-    it { expect { subject }.to raise_error( ArgumentError, "Type and code are mandatory options" ) }
+  describe Error, '.new', :nosudo => true do
+    it { expect { subject }.to raise_error(ArgumentError, 'Type and code are mandatory options') }
   end
 
 
-  describe Error, ".new(nil)", :nosudo => true do
-    it { expect { subject }.to raise_error( ArgumentError, "Type and code are mandatory options" ) }
+  describe Error, '.new(nil)', :nosudo => true do
+    it { expect { subject }.to raise_error(ArgumentError, 'Type and code are mandatory options') }
   end
 
 
-  describe Error, ".new(:type => value)", :nosudo => true do
-    subject { Error.new( :type => OFPET_BAD_REQUEST ) }
-    it { expect { subject }.to raise_error( ArgumentError, "Code is a mandatory option" ) }
+  describe Error, '.new(:type => value)', :nosudo => true do
+    subject { Error.new(:type => OFPET_BAD_REQUEST) }
+    it { expect { subject }.to raise_error(ArgumentError, 'Code is a mandatory option') }
   end
 
 
-  describe Error, ".new(:code => value)", :nosudo => true do
-    subject { Error.new( :code => OFPBRC_BAD_TYPE ) }
-    it { expect { subject }.to raise_error( ArgumentError, "Type is a mandatory option" ) }
+  describe Error, '.new(:code => value)', :nosudo => true do
+    subject { Error.new(:code => OFPBRC_BAD_TYPE) }
+    it { expect { subject }.to raise_error(ArgumentError, 'Type is a mandatory option') }
   end
 
 
-  describe Error, ".new(:type => value, :code => value)" do
-    subject { Error.new( :type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE ) }
-    it_should_behave_like "any Openflow message with default transaction ID"
-    its( :error_type ) { should == OFPET_BAD_REQUEST }
-    its( :code ) { should == OFPBRC_BAD_TYPE }
-    its( :data ) { should be_nil }
+  describe Error, '.new(:type => value, :code => value)' do
+    subject { Error.new(:type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE) }
+    it_should_behave_like 'any Openflow message with default transaction ID'
+    its(:error_type) { should == OFPET_BAD_REQUEST }
+    its(:code) { should == OFPBRC_BAD_TYPE }
+    its(:data) { should be_nil }
   end
 
 
-  describe Error, ".new(:type => value, :code => value, :transaction_id => value)" do
-    subject { Error.new( :type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :transaction_id => transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
+  describe Error, '.new(:type => value, :code => value, :transaction_id => value)' do
+    subject { Error.new(:type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :transaction_id => transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
   end
 
 
-  describe Error, ".new(:type => value, :code => value, :xid => value)" do
-    subject { Error.new( :type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :xid => xid ) }
-    it_should_behave_like "any Openflow message with xid"
+  describe Error, '.new(:type => value, :code => value, :xid => value)' do
+    subject { Error.new(:type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :xid => xid) }
+    it_should_behave_like 'any Openflow message with xid'
   end
 
 
-  describe Error, ".new(:type => value, :code => value, :data => value)" do
-    subject { Error.new( :type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :data => "deadbeef" ) }
-    it_should_behave_like "any Openflow message with default transaction ID"
-    its( :error_type ) { should == OFPET_BAD_REQUEST }
-    its( :code ) { should == OFPBRC_BAD_TYPE }
-    its( :data ) { should == "deadbeef" }
+  describe Error, '.new(:type => value, :code => value, :data => value)' do
+    subject { Error.new(:type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :data => 'deadbeef') }
+    it_should_behave_like 'any Openflow message with default transaction ID'
+    its(:error_type) { should == OFPET_BAD_REQUEST }
+    its(:code) { should == OFPBRC_BAD_TYPE }
+    its(:data) { should == 'deadbeef' }
   end
 end
 

data/spec/trema/executables_spec.rb

@@ -16,33 +16,33 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/executables"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/executables'
 
 
 describe Trema::Executables do
   subject { Trema::Executables }
 
-  its ( :cli ) { should be_a( String ) }
-  its ( :ovs_ofctl ) { should be_a( String ) }
-  its ( :ovs_openflowd ) { should be_a( String ) }
-  its ( :packet_capture ) { should be_a( String ) }
-  its ( :packetin_filter ) { should be_a( String ) }
-  its ( :phost ) { should be_a( String ) }
-  its ( :stdin_relay ) { should be_a( String ) }
-  its ( :switch ) { should be_a( String ) }
-  its ( :switch_manager ) { should be_a( String ) }
-  its ( :syslog_relay ) { should be_a( String ) }
-  its ( :tremashark ) { should be_a( String ) }
-
-  context "when Trema is compiled" do
-    before { FileTest.stub!( :executable? ).and_return( true ) }
-    its ( :compiled? ) { should be_true }
+  its ( :cli) { should be_a(String) }
+  its ( :ovs_ofctl) { should be_a(String) }
+  its ( :ovs_openflowd) { should be_a(String) }
+  its ( :packet_capture) { should be_a(String) }
+  its ( :packetin_filter) { should be_a(String) }
+  its ( :phost) { should be_a(String) }
+  its ( :stdin_relay) { should be_a(String) }
+  its ( :switch) { should be_a(String) }
+  its ( :switch_manager) { should be_a(String) }
+  its ( :syslog_relay) { should be_a(String) }
+  its ( :tremashark) { should be_a(String) }
+
+  context 'when Trema is compiled' do
+    before { FileTest.stub!(:executable?).and_return(true) }
+    its ( :compiled?) { should be_true }
   end
 
-  context "when Trema is not compiled" do
-    before { FileTest.stub!( :executable? ).and_return( false ) }
-    its ( :compiled? ) { should be_false }
+  context 'when Trema is not compiled' do
+    before { FileTest.stub!(:executable?).and_return(false) }
+    its ( :compiled?) { should be_false }
   end
 end
 

data/spec/trema/features-reply_spec.rb

@@ -16,18 +16,18 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 module Trema
-  describe FeaturesReply, ".new" do
-    it { expect { subject }.to raise_error( ArgumentError ) }
+  describe FeaturesReply, '.new' do
+    it { expect { subject }.to raise_error(ArgumentError) }
   end
 
 
-  describe FeaturesReply, ".new(options...)" do
-    subject {
+  describe FeaturesReply, '.new(options...)' do
+    subject do
       valid_options = {
         :datapath_id => 123,
         :transaction_id => 1234,
@@ -35,51 +35,51 @@ module Trema
         :n_tables => 2,
         :capabilities => 135,
         :actions => 2047,
-        :ports => [ "port #0", "port #1", "port #2" ]
+        :ports => ['port #0', 'port #1', 'port #2']
       }
-      FeaturesReply.new( valid_options )
-    }
+      FeaturesReply.new(valid_options)
+    end
 
-    its( :datapath_id ) { should == 123 }
-    its( :transaction_id ) { should == 1234 }
-    its( :xid ) { should == 1234 }
-    its( :n_buffers ) { should == 256 }
-    its( :n_tables ) { should == 2 }
-    its( :capabilities ) { should == 135 }
-    its( :actions ) { should == 2047 }
-    its( "ports.size" ) { should == 3 }
+    its(:datapath_id) { should == 123 }
+    its(:transaction_id) { should == 1234 }
+    its(:xid) { should == 1234 }
+    its(:n_buffers) { should == 256 }
+    its(:n_tables) { should == 2 }
+    its(:capabilities) { should == 135 }
+    its(:actions) { should == 2047 }
+    its('ports.size') { should == 3 }
   end
 
 
-  describe FeaturesReply, ".new(options...) (No :datapath_id)" do
-    subject {
-      FeaturesReply.new( {
+  describe FeaturesReply, '.new(options...) (No :datapath_id)' do
+    subject do
+      FeaturesReply.new({
         # :datapath_id => 123,
-        :transaction_id => 1234,
-        :n_buffers => 256,
-        :n_tables => 2,
-        :capabilities => 135,
-        :actions => 2047,
-        :ports => [ "port #0", "port #1", "port #2" ]
-      } )
-    }
-    it { expect { subject }.to raise_error( ArgumentError, ":datapath_id is a mandatory option" ) }
+                          :transaction_id => 1234,
+                          :n_buffers => 256,
+                          :n_tables => 2,
+                          :capabilities => 135,
+                          :actions => 2047,
+                          :ports => ['port #0', 'port #1', 'port #2']
+      })
+    end
+    it { expect { subject }.to raise_error(ArgumentError, ':datapath_id is a mandatory option') }
   end
 
 
-  describe FeaturesReply, ".new(options...) (No :transaction_id)" do
-    subject {
-      FeaturesReply.new( {
-        :datapath_id => 123,
+  describe FeaturesReply, '.new(options...) (No :transaction_id)' do
+    subject do
+      FeaturesReply.new({
+                          :datapath_id => 123,
         # :transaction_id => 1234,
-        :n_buffers => 256,
-        :n_tables => 2,
-        :capabilities => 135,
-        :actions => 2047,
-        :ports => [ "port #0", "port #1", "port #2" ]
-      } )
-    }
-    it { expect { subject }.to raise_error( ArgumentError, ":transaction_id is a mandatory option" ) }
+                          :n_buffers => 256,
+                          :n_tables => 2,
+                          :capabilities => 135,
+                          :actions => 2047,
+                          :ports => ['port #0', 'port #1', 'port #2']
+      })
+    end
+    it { expect { subject }.to raise_error(ArgumentError, ':transaction_id is a mandatory option') }
   end
 end
 

data/spec/trema/features-request_spec.rb

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

data/spec/trema/flow-mod_spec.rb

@@ -16,70 +16,70 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 module Trema
-  describe FlowMod, ".new", :nosudo => true do
-    it_should_behave_like "any Openflow message with default transaction ID"
+  describe FlowMod, '.new', :nosudo => true do
+    it_should_behave_like 'any Openflow message with default transaction ID'
   end
 
 
-  describe FlowMod, ".new(nil)", :nosudo => true do
-    subject { FlowMod.new( nil ) }
-    it_should_behave_like "any Openflow message with default transaction ID"
+  describe FlowMod, '.new(nil)', :nosudo => true do
+    subject { FlowMod.new(nil) }
+    it_should_behave_like 'any Openflow message with default transaction ID'
   end
 
 
-  describe FlowMod, ".new(transaction_id)", :nosudo => true do
-    subject { FlowMod.new( transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
+  describe FlowMod, '.new(transaction_id)', :nosudo => true do
+    subject { FlowMod.new(transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
   end
 
 
-  describe FlowMod, ".new(:transaction_id => value)", :nosudo => true do
-    subject { FlowMod.new( :transaction_id => transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
+  describe FlowMod, '.new(:transaction_id => value)', :nosudo => true do
+    subject { FlowMod.new(:transaction_id => transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
   end
 
 
-  describe FlowMod, ".new(:xid => value)", :nosudo => true do
-    subject { FlowMod.new( :xid => xid ) }
-    it_should_behave_like "any Openflow message with xid"
+  describe FlowMod, '.new(:xid => value)', :nosudo => true do
+    subject { FlowMod.new(:xid => xid) }
+    it_should_behave_like 'any Openflow message with xid'
   end
 
 
-  describe FlowMod, ".new(:command => value)", :nosudo => true do
-    subject { FlowMod.new( :command => command ) }
+  describe FlowMod, '.new(:command => value)', :nosudo => true do
+    subject { FlowMod.new(:command => command) }
 
-    context "command: 0", :nosudo => true do
-      let( :command ) { 0 }
-      its( :command ) { should == 0 }
+    context 'command: 0', :nosudo => true do
+      let(:command) { 0 }
+      its(:command) { should == 0 }
     end
 
     # TODO: boundary test.
   end
 
 
-  describe FlowMod, ".new(:idle_timeout => value)", :nosudo => true do
-    subject { FlowMod.new( :idle_timeout => idle_timeout ) }
+  describe FlowMod, '.new(:idle_timeout => value)', :nosudo => true do
+    subject { FlowMod.new(:idle_timeout => idle_timeout) }
 
-    context "idle_timeout: 0", :nosudo => true do
-      let( :idle_timeout ) { 0 }
-      its( :idle_timeout ) { should == 0 }
+    context 'idle_timeout: 0', :nosudo => true do
+      let(:idle_timeout) { 0 }
+      its(:idle_timeout) { should == 0 }
     end
 
     # TODO: boundary test.
   end
 
 
-  describe FlowMod, ".new(:hard_timeout => value)", :nosudo => true do
-    subject { FlowMod.new( :hard_timeout => hard_timeout ) }
+  describe FlowMod, '.new(:hard_timeout => value)', :nosudo => true do
+    subject { FlowMod.new(:hard_timeout => hard_timeout) }
 
-    context "hard_timeout: 0", :nosudo => true do
-      let( :hard_timeout ) { 0 }
-      its( :hard_timeout ) { should == 0 }
+    context 'hard_timeout: 0', :nosudo => true do
+      let(:hard_timeout) { 0 }
+      its(:hard_timeout) { should == 0 }
     end
 
     # TODO: boundary test.
@@ -87,7 +87,7 @@ module Trema
 
 
   describe FlowMod, '.new("INVALID OPTION")', :nosudo => true do
-    it { expect { FlowMod.new "INVALID OPTION" }.to raise_error( TypeError ) }
+    it { expect { FlowMod.new 'INVALID OPTION' }.to raise_error(TypeError) }
   end
 end