trema 0.4.6 → 0.4.7

data/spec/trema/dsl/syntax_spec.rb

@@ -16,20 +16,20 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
-require "trema/dsl/syntax"
-require "trema/packetin-filter"
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require 'trema/dsl/syntax'
+require 'trema/packetin-filter'
 
 
 describe Trema::DSL::Syntax do
-  before( :each ) do
-    @context = mock( "context", :port => 6653, :dump_to => nil )
-    @syntax = Trema::DSL::Syntax.new( @context )
+  before(:each) do
+    @context = mock('context', :port => 6653, :dump_to => nil)
+    @syntax = Trema::DSL::Syntax.new(@context)
   end
 
 
   it "should recognize 'port' directive" do
-    @context.should_receive( :port= ).with( 1234 ).once
+    @context.should_receive(:port=).with(1234).once
 
     @syntax.instance_eval do
       port 1234
@@ -38,65 +38,65 @@ describe Trema::DSL::Syntax do
 
 
   it "should recognize 'link' directive" do
-    @context.stub!( :links ).and_return( [ mock( "link" ) ] )
-    Trema::Link.should_receive( :add ).with( an_instance_of( Trema::Link ) ).once
+    @context.stub!(:links).and_return([mock('link')])
+    Trema::Link.should_receive(:add).with(an_instance_of(Trema::Link)).once
 
     @syntax.instance_eval do
-      link "PEER0", "PEER1"
+      link 'PEER0', 'PEER1'
     end
   end
 
 
   it "should recognize 'switch' directive" do
-    Trema::OpenflowSwitch.should_receive( :add ).with( an_instance_of( HardwareSwitch ) ).once
+    Trema::OpenflowSwitch.should_receive(:add).with(an_instance_of(HardwareSwitch)).once
 
     @syntax.instance_eval do
-      switch { dpid "0xabc" }
+      switch { dpid '0xabc' }
     end
   end
 
 
   it "should recognize 'vswitch' directive" do
-    Trema::OpenflowSwitch.should_receive( :add ).with( an_instance_of( OpenVswitch ) ).once
+    Trema::OpenflowSwitch.should_receive(:add).with(an_instance_of(OpenVswitch)).once
 
     @syntax.instance_eval do
-      vswitch { dpid "0xabc" }
+      vswitch { dpid '0xabc' }
     end
   end
 
 
   it "should recognize 'vhost' directive" do
-    Trema::Host.should_receive( :add ).with( an_instance_of( Trema::Host ) ).once
+    Trema::Host.should_receive(:add).with(an_instance_of(Trema::Host)).once
 
     @syntax.instance_eval do
-      vhost { }
+      vhost {}
     end
   end
 
 
   it "should recognize 'filter' directive" do
-    Trema::PacketinFilter.should_receive( :add ).with( an_instance_of( Trema::PacketinFilter ) ).once
+    Trema::PacketinFilter.should_receive(:add).with(an_instance_of(Trema::PacketinFilter)).once
 
     @syntax.instance_eval do
-      filter :lldp => "LLDP RULE", :packet_in => "PACKET-IN RULE"
+      filter :lldp => 'LLDP RULE', :packet_in => 'PACKET-IN RULE'
     end
   end
 
 
   it "should recognize 'event' directive" do
-    Trema::SwitchManager.should_receive( :add ).with( an_instance_of( Trema::SwitchManager ) ).once
+    Trema::SwitchManager.should_receive(:add).with(an_instance_of(Trema::SwitchManager)).once
 
     @syntax.instance_eval do
-      event "RULE"
+      event 'RULE'
     end
   end
 
 
   it "should recognize 'run' directive" do
-    Trema::App.should_receive( :add ).with( an_instance_of( Trema::App ) ).once
+    Trema::App.should_receive(:add).with(an_instance_of(Trema::App)).once
 
     @syntax.instance_eval do
-      run( "My App" ) { }
+      run('My App') {}
     end
   end
 end

data/spec/trema/dsl/vhost_spec.rb

@@ -16,42 +16,42 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
-require "trema/dsl/vhost"
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require 'trema/dsl/vhost'
 
 
 module Trema
   module DSL
     describe Vhost do
       describe :name do
-        context "when name empty" do
+        context 'when name empty' do
           before { @vhost = Vhost.new }
 
-          subject { @vhost[ :name ] }
+          subject { @vhost[ :name] }
 
-          context "and IP address empty" do
+          context 'and IP address empty' do
             it { should be_nil }
           end
 
-          context "and IP address is 192.168.100.100" do
-            before { @vhost.ip "192.168.100.100" }
+          context 'and IP address is 192.168.100.100' do
+            before { @vhost.ip '192.168.100.100' }
 
-            specify { should == "192.168.100.100" }
+            specify { should == '192.168.100.100' }
           end
         end
 
 
         context "when name is \"Yutaro's host\"" do
-          before { @vhost = Vhost.new( "Yutaro's host" ) }
+          before { @vhost = Vhost.new("Yutaro's host") }
 
-          subject { @vhost[ :name ] }
+          subject { @vhost[ :name] }
 
-          context "and ip address empty" do
+          context 'and ip address empty' do
             it { should == "Yutaro's host" }
           end
 
-          context "and ip address 192.168.100.100" do
-            before { @vhost.ip "192.168.100.100" }
+          context 'and ip address 192.168.100.100' do
+            before { @vhost.ip '192.168.100.100' }
 
             it { should == "Yutaro's host" }
           end
@@ -60,76 +60,76 @@ module Trema
 
 
       describe :promisc do
-        before { @vhost = Vhost.new( "Yutaro's host" ) }
+        before { @vhost = Vhost.new("Yutaro's host") }
 
-        subject { @vhost[ :promisc ] }
+        subject { @vhost[ :promisc] }
 
-        context "when promisc off" do
-          before { @vhost.promisc "off" }
+        context 'when promisc off' do
+          before { @vhost.promisc 'off' }
 
           it { should be_false }
         end
 
 
-        context "when promisc no" do
-          before { @vhost.promisc "no" }
+        context 'when promisc no' do
+          before { @vhost.promisc 'no' }
 
           it { should be_false }
         end
 
 
-        context "when promisc on" do
-          before { @vhost.promisc "on" }
+        context 'when promisc on' do
+          before { @vhost.promisc 'on' }
 
           it { should be_true }
         end
 
 
-        context "when promisc yes" do
-          before { @vhost.promisc "yes" }
+        context 'when promisc yes' do
+          before { @vhost.promisc 'yes' }
 
           it { should be_true }
         end
 
 
-        context "when promisc INVALID_VALUE" do
+        context 'when promisc INVALID_VALUE' do
           specify do
-            expect { @vhost.promisc "INVALID_VALUE" }.to raise_error( Trema::DSL::SyntaxError )
+            expect { @vhost.promisc 'INVALID_VALUE' }.to raise_error(Trema::DSL::SyntaxError)
           end
         end
       end
 
 
       describe :netmask do
-        before { @vhost = Vhost.new( "Yutaro's host" ) }
+        before { @vhost = Vhost.new("Yutaro's host") }
 
-        subject { @vhost[ :netmask ] }
+        subject { @vhost[ :netmask] }
 
-        context "when netmask empty" do
+        context 'when netmask empty' do
           it { should be_nil }
         end
 
-        context "when netmask is 255.255.255.0" do
-          before { @vhost.netmask "255.255.255.0" }
+        context 'when netmask is 255.255.255.0' do
+          before { @vhost.netmask '255.255.255.0' }
 
-          it { should == "255.255.255.0" }
+          it { should == '255.255.255.0' }
         end
       end
 
 
       describe :mac do
-        before { @vhost = Vhost.new( "Yutaro's host" ) }
+        before { @vhost = Vhost.new("Yutaro's host") }
 
-        subject { @vhost[ :mac ] }
+        subject { @vhost[ :mac] }
 
-        context "when mac empty" do
+        context 'when mac empty' do
           it { should be_nil }
         end
 
-        context "when mac is 00:00:00:01:00:01" do
-          before { @vhost.mac "00:00:00:01:00:01" }
+        context 'when mac is 00:00:00:01:00:01' do
+          before { @vhost.mac '00:00:00:01:00:01' }
 
-          it { should == "00:00:00:01:00:01" }
+          it { should == '00:00:00:01:00:01' }
         end
       end
     end

data/spec/trema/dsl/vswitch_spec.rb

@@ -16,8 +16,8 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
-require "trema/dsl/vswitch"
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+require 'trema/dsl/vswitch'
 
 
 module Trema
@@ -28,44 +28,44 @@ module Trema
       end
 
 
-      context %[when parsing "vswitch { ... }"] do
-        it %[recognizes "dpid DATAPATH_ID" directive] do
-          expect { @vswitch.dpid "0xabc" }.not_to raise_error
+      context 'when parsing "vswitch { ... }"' do
+        it 'recognizes "dpid DATAPATH_ID" directive' do
+          expect { @vswitch.dpid '0xabc' }.not_to raise_error
         end
 
 
-        it %[recognizes "datapath_id DATAPATH_ID" directive] do
-          expect { @vswitch.datapath_id "0xabc" }.not_to raise_error
+        it 'recognizes "datapath_id DATAPATH_ID" directive' do
+          expect { @vswitch.datapath_id '0xabc' }.not_to raise_error
         end
 
 
-        it %[recognizes "ports PORT_NUMBERS" directive] do
-          expect { @vswitch.ports "0-4" }.not_to raise_error
+        it 'recognizes "ports PORT_NUMBERS" directive' do
+          expect { @vswitch.ports '0-4' }.not_to raise_error
         end
 
 
-        it %[recognizes "ip IP_ADDRESS" directive] do
-          expect { @vswitch.ip "192.168.0.1" }.not_to raise_error
+        it 'recognizes "ip IP_ADDRESS" directive' do
+          expect { @vswitch.ip '192.168.0.1' }.not_to raise_error
         end
       end
 
 
-      context "when getting the attributes of a vswitch" do
-        it "returns its dpid in long format" do
-          @vswitch.dpid "0xabc"
-          expect( @vswitch[ :dpid_long ] ).to eq( "0000000000000abc" )
+      context 'when getting the attributes of a vswitch' do
+        it 'returns its dpid in long format' do
+          @vswitch.dpid '0xabc'
+          expect(@vswitch[ :dpid_long]).to eq('0000000000000abc')
         end
 
 
-        it "returns its dpid in short format" do
-          @vswitch.dpid "0xabc"
-          expect( @vswitch[ :dpid_short ] ).to eq( "0xabc" )
+        it 'returns its dpid in short format' do
+          @vswitch.dpid '0xabc'
+          expect(@vswitch[ :dpid_short]).to eq('0xabc')
         end
 
 
-        it "returns its ip address" do
-          @vswitch.ip "192.168.0.1"
-          expect( @vswitch[ :ip ] ).to eq( "192.168.0.1" )
+        it 'returns its ip address' do
+          @vswitch.ip '192.168.0.1'
+          expect(@vswitch[ :ip]).to eq('192.168.0.1')
         end
       end
     end

data/spec/trema/echo-reply_spec.rb

@@ -16,63 +16,63 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 module Trema
-  describe EchoReply, ".new" do
-    it_should_behave_like "any Openflow message with default transaction ID"
-    its( :user_data ) { should be_nil }
+  describe EchoReply, '.new' do
+    it_should_behave_like 'any Openflow message with default transaction ID'
+    its(:user_data) { should be_nil }
   end
 
 
-  describe EchoReply, ".new(nil)" do
-    subject { EchoReply.new( nil ) }
-    it_should_behave_like "any Openflow message with default transaction ID"
-    its( :user_data ) { should be_nil }
+  describe EchoReply, '.new(nil)' do
+    subject { EchoReply.new(nil) }
+    it_should_behave_like 'any Openflow message with default transaction ID'
+    its(:user_data) { should be_nil }
   end
 
 
-  describe EchoReply, ".new(transaction_id)" do
-    subject { EchoReply.new( transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
+  describe EchoReply, '.new(transaction_id)' do
+    subject { EchoReply.new(transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
   end
 
 
-  describe EchoReply, ".new(:transaction_id => value)" do
-    subject { EchoReply.new( :transaction_id => transaction_id ) }
-    it_should_behave_like "any Openflow message with transaction ID"
+  describe EchoReply, '.new(:transaction_id => value)' do
+    subject { EchoReply.new(:transaction_id => transaction_id) }
+    it_should_behave_like 'any Openflow message with transaction ID'
   end
 
 
-  describe EchoReply, ".new(:xid => value)" do
-    subject { EchoReply.new( :xid => xid ) }
-    it_should_behave_like "any Openflow message with xid"
+  describe EchoReply, '.new(:xid => value)' do
+    subject { EchoReply.new(:xid => xid) }
+    it_should_behave_like 'any Openflow message with xid'
   end
 
 
-  describe EchoReply, ".new(:user_data => value)" do
-    subject { EchoReply.new( :user_data => user_data ) }
-    it_should_behave_like "any Openflow message with user_data"
+  describe EchoReply, '.new(:user_data => value)' do
+    subject { EchoReply.new(:user_data => user_data) }
+    it_should_behave_like 'any Openflow message with user_data'
   end
 
 
-  describe EchoReply, ".new(:transaction_id => value, :user_data => value)" do
-    subject { EchoReply.new( :transaction_id => transaction_id, :user_data => user_data ) }
+  describe EchoReply, '.new(:transaction_id => value, :user_data => value)' do
+    subject { EchoReply.new(:transaction_id => transaction_id, :user_data => user_data) }
 
     context 'transaction_id: 123, user_data: "USER DATA"' do
-      let( :transaction_id ) { 123 }
-      let( :user_data ) { "USER DATA" }
-      its( :transaction_id ) { should == 123 }
-      its( :xid ) { should == 123 }
-      its( :user_data ) { should == "USER DATA" }
+      let(:transaction_id) { 123 }
+      let(:user_data) { 'USER DATA' }
+      its(:transaction_id) { should == 123 }
+      its(:xid) { should == 123 }
+      its(:user_data) { should == 'USER DATA' }
     end
   end
 
 
   describe EchoReply, '.new("INVALID OPTION")' do
-    it { expect { EchoReply.new "INVALID OPTION" }.to raise_error( TypeError ) }
+    it { expect { EchoReply.new 'INVALID OPTION' }.to raise_error(TypeError) }
   end
 end
 

data/spec/trema/echo-request_spec.rb

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