trema 0.4.6 → 0.4.7

data/spec/trema/set-ip-tos_spec.rb

@@ -16,48 +16,48 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe SetIpTos, ".new( type_of_service )", :type => "actions" do
-  subject { SetIpTos.new( type_of_service ) }
+describe SetIpTos, '.new( type_of_service )', :type => 'actions' do
+  subject { SetIpTos.new(type_of_service) }
 
-  context "with type_of_service (32)" do
-    let( :type_of_service ) { 32 }
-    its( :type_of_service ) { should == 32 }
+  context 'with type_of_service (32)' do
+    let(:type_of_service) { 32 }
+    its(:type_of_service) { should == 32 }
   end
 
-  it_validates "option is within range", :type_of_service, 0..( 2 ** 8 - 1 )
+  it_validates 'option is within range', :type_of_service, 0..( 2**8 - 1)
 
-  context %{with type_of_service ("32")} do
-    let( :type_of_service ) { "32" }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with type_of_service (32)' do
+    let(:type_of_service) { '32' }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context %{with type_of_service ([32])} do
-    let( :type_of_service ) { [ 32 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with type_of_service ([32])' do
+    let(:type_of_service) { [32] }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context "with type_of_service (1)" do
-    let( :type_of_service ) { 1 }
-    it { expect { subject }.to raise_error( ArgumentError ) }
+  context 'with type_of_service (1)' do
+    let(:type_of_service) { 1 }
+    it { expect { subject }.to raise_error(ArgumentError) }
   end
 
-  context "when sending a Flow Mod with SetIpTos" do
-    let( :type_of_service ) { 4 }
+  context 'when sending a Flow Mod with SetIpTos' do
+    let(:type_of_service) { 4 }
 
-    it "should insert a new flow entry with action (mod_nw_tos:4)" do
+    it 'should insert a new flow entry with action (mod_nw_tos:4)' 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( "mod_nw_tos:4" )
-      }
+        expect(vswitch('0xabc')).to have(1).flows
+        expect(vswitch('0xabc').flows[ 0].actions).to eq('mod_nw_tos:4')
+      end
     end
   end
 end

data/spec/trema/set-transport-dst-port_spec.rb

@@ -16,43 +16,43 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe SetTransportDstPort, "new( port_number )", :type => "actions" do
+describe SetTransportDstPort, 'new( port_number )', :type => 'actions' do
   subject { SetTransportDstPort.new port_number }
 
-  context "with port_number (5555)" do
-    let( :port_number ) { 5555 }
-    its( :port_number ) { should == 5555 }
+  context 'with port_number (5555)' do
+    let(:port_number) { 5555 }
+    its(:port_number) { should == 5555 }
   end
 
-  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 %{with invalid port_number ("5555")} do
-    let( :port_number ) { "5555" }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with invalid port_number (5555)' do
+    let(:port_number) { '5555' }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context %{with invalid port_number ([1, 2, 3])} do
-    let( :port_number ) { [ 1, 2, 3 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with invalid port_number ([1, 2, 3])' do
+    let(:port_number) { [1, 2, 3] }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context "when sending a Flow Mod with SetTransportDstPort" do
-    let( :port_number ) { 5555 }
+  context 'when sending a Flow Mod with SetTransportDstPort' do
+    let(:port_number) { 5555 }
 
-    it "should insert a new flow entry with action (mod_tp_dst:5555)" do
+    it 'should insert a new flow entry with action (mod_tp_dst:5555)' 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( "mod_tp_dst:5555" )
-      }
+        expect(vswitch('0xabc')).to have(1).flows
+        expect(vswitch('0xabc').flows[ 0].actions).to eq('mod_tp_dst:5555')
+      end
     end
   end
 end

data/spec/trema/set-transport-src-port_spec.rb

@@ -16,43 +16,43 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe SetTransportSrcPort, "new( port_number )", :type => "actions" do
+describe SetTransportSrcPort, 'new( port_number )', :type => 'actions' do
   subject { SetTransportSrcPort.new port_number }
 
-  context "with port_number (5555)" do
-    let( :port_number ) { 5555 }
-    its( :port_number ) { should == 5555 }
+  context 'with port_number (5555)' do
+    let(:port_number) { 5555 }
+    its(:port_number) { should == 5555 }
   end
 
-  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 %{with invalid port_number ("5555")} do
-    let( :port_number ) { "5555" }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with invalid port_number (5555)' do
+    let(:port_number) { '5555' }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context %{with invalid port_number ([1, 2, 3])} do
-    let( :port_number ) { [ 1, 2, 3 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with invalid port_number ([1, 2, 3])' do
+    let(:port_number) { [1, 2, 3] }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context "when sending a Flow Mod with SetTransportSrcPort" do
-    let( :port_number ) { 5555 }
+  context 'when sending a Flow Mod with SetTransportSrcPort' do
+    let(:port_number) { 5555 }
 
-    it "should insert a new flow entry with action (mod_tp_src:5555)" do
+    it 'should insert a new flow entry with action (mod_tp_src:5555)' 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( "mod_tp_src:5555" )
-      }
+        expect(vswitch('0xabc')).to have(1).flows
+        expect(vswitch('0xabc').flows[ 0].actions).to eq('mod_tp_src:5555')
+      end
     end
   end
 end

data/spec/trema/set-vlan-priority_spec.rb

@@ -16,43 +16,43 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe SetVlanPriority, ".new(vlan_priority)", :type => "actions" do
-  subject { SetVlanPriority.new( vlan_priority ) }
+describe SetVlanPriority, '.new(vlan_priority)', :type => 'actions' do
+  subject { SetVlanPriority.new(vlan_priority) }
 
-  context "with vlan_priority (4)" do
-    let( :vlan_priority ) { 4 }
-    its( :vlan_priority ) { should == 4 }
+  context 'with vlan_priority (4)' do
+    let(:vlan_priority) { 4 }
+    its(:vlan_priority) { should == 4 }
   end
 
-  it_validates "option is within range", :vlan_priority, 0..7
+  it_validates 'option is within range', :vlan_priority, 0..7
 
-  context %{with vlan_priority ("4")} do
-    let( :vlan_priority ) { "4" }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with vlan_priority (4)' do
+    let(:vlan_priority) { '4' }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context "with vlan_priority ([4])" do
-    let( :vlan_priority ) { [ 4 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with vlan_priority ([4])' do
+    let(:vlan_priority) { [4] }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context "when sending a Flow Mod with SetVlanVid" do
-    let( :vlan_priority ) { 7 }
+  context 'when sending a Flow Mod with SetVlanVid' do
+    let(:vlan_priority) { 7 }
 
-    it "should insert a new flow with action (mod_vlan_pcp:7)" do
+    it 'should insert a new flow with action (mod_vlan_pcp:7)' 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( "mod_vlan_pcp:7" )
-      }
+        expect(vswitch('0xabc')).to have(1).flows
+        expect(vswitch('0xabc').flows[ 0].actions).to eq('mod_vlan_pcp:7')
+      end
     end
   end
 end

data/spec/trema/set-vlan-vid_spec.rb

@@ -16,43 +16,43 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe SetVlanVid, ".new(vlan_id)", :type => "actions" do
-  subject { SetVlanVid.new( vlan_id ) }
+describe SetVlanVid, '.new(vlan_id)', :type => 'actions' do
+  subject { SetVlanVid.new(vlan_id) }
 
-  context "with vlan_id (1024)" do
-    let( :vlan_id ) { 1024 }
-    its( :vlan_id ) { should == 1024 }
+  context 'with vlan_id (1024)' do
+    let(:vlan_id) { 1024 }
+    its(:vlan_id) { should == 1024 }
   end
 
-  it_validates "option is within range", :vlan_id, 1..4095
+  it_validates 'option is within range', :vlan_id, 1..4095
 
-  context %{with vlan_id ("1024")} do
-    let( :vlan_id ) { "1024" }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with vlan_id (1024)' do
+    let(:vlan_id) { '1024' }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context "with vlan_id ([1024])" do
-    let( :vlan_id ) { [ 1024 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
+  context 'with vlan_id ([1024])' do
+    let(:vlan_id) { [1024] }
+    it { expect { subject }.to raise_error(TypeError) }
   end
 
-  context "when sending a Flow Mod with SetVlanVid" do
-    let( :vlan_id ) { 1024 }
+  context 'when sending a Flow Mod with SetVlanVid' do
+    let(:vlan_id) { 1024 }
 
-    it "should insert a new flow entry with action (mod_vlan_vid:1024)" do
+    it 'should insert a new flow entry with action (mod_vlan_vid:1024)' 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( "mod_vlan_vid:1024" )
-      }
+        expect(vswitch('0xabc')).to have(1).flows
+        expect(vswitch('0xabc').flows[ 0].actions).to eq('mod_vlan_vid:1024')
+      end
     end
   end
 end

data/spec/trema/shell/vhost_spec.rb

@@ -16,37 +16,37 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 
 
-describe Trema::Shell, ".vhost" do
-  before {
+describe Trema::Shell, '.vhost' do
+  before do
     Trema::Host.clear
-    $context = mock( "context", :dump => true )
-  }
+    $context = mock('context', :dump => true)
+  end
 
 
-  it "should create a new vhost if name given" do
-    Trema::Shell.vhost( "host1" )
+  it 'should create a new vhost if name given' do
+    Trema::Shell.vhost('host1')
 
-    expect( Trema::Host ).to have( 1 ).host
-    expect( Trema::Host[ "host1" ].name ).to eq( "host1" )
+    expect(Trema::Host).to have(1).host
+    expect(Trema::Host[ 'host1'].name).to eq('host1')
   end
 
 
-  it "should take ip, netmask, promisc, and mac option" do
-    Trema::Shell.vhost( "host1" ) {
-      ip "192.168.100.1"
-      netmask "255.255.255.0"
-      promisc "on"
-      mac "00:00:00:1:1:1"
-    }
+  it 'should take ip, netmask, promisc, and mac option' do
+    Trema::Shell.vhost('host1') do
+      ip '192.168.100.1'
+      netmask '255.255.255.0'
+      promisc 'on'
+      mac '00:00:00:1:1:1'
+    end
 
-    expect( Trema::Host ).to have( 1 ).host
-    expect( Trema::Host[ "host1" ].name ).to eq( "host1" )
-    expect( Trema::Host[ "host1" ].ip ).to eq( "192.168.100.1" )
-    expect( Trema::Host[ "host1" ].promisc ).to be_true
-    expect( Trema::Host[ "host1" ].mac ).to eq( "00:00:00:1:1:1" )
+    expect(Trema::Host).to have(1).host
+    expect(Trema::Host[ 'host1'].name).to eq('host1')
+    expect(Trema::Host[ 'host1'].ip).to eq('192.168.100.1')
+    expect(Trema::Host[ 'host1'].promisc).to be_true
+    expect(Trema::Host[ 'host1'].mac).to eq('00:00:00:1:1:1')
   end
 end
 

data/spec/trema/shell/vswitch_spec.rb

@@ -16,10 +16,10 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
 
 
-describe Trema::Shell, ".vswitch" do
+describe Trema::Shell, '.vswitch' do
   around do | example |
     Trema::OpenflowSwitch.clear
     example.run
@@ -27,54 +27,54 @@ describe Trema::Shell, ".vswitch" do
   end
 
 
-  context "executed without a shell" do
+  context 'executed without a shell' do
     before { $config = nil }
 
 
-    it "should raise" do
-      expect {
-        Trema::Shell.vswitch { dpid "0xabc" }
-      }.to raise_error( "Not in Trema shell" )
+    it 'should raise' do
+      expect do
+        Trema::Shell.vswitch { dpid '0xabc' }
+      end.to raise_error('Not in Trema shell')
     end
   end
 
 
-  context "executed within a shell" do
-    before {
-      $config = mock( "config", :port => 6653 )
-      $context = mock( "context", :dump => true )
-    }
-    after { Trema::OpenflowSwitch[ "0xabc" ].shutdown! if Trema::OpenflowSwitch[ "0xabc" ] }
+  context 'executed within a shell' do
+    before do
+      $config = mock('config', :port => 6653)
+      $context = mock('context', :dump => true)
+    end
+    after { Trema::OpenflowSwitch[ '0xabc'].shutdown! if Trema::OpenflowSwitch[ '0xabc'] }
 
 
-    it "should create a new vswitch if name given" do
-      Trema::Shell.vswitch { dpid "0xabc" }
-      expect( Trema::OpenflowSwitch ).to have( 1 ).switch
-      expect( Trema::OpenflowSwitch[ "0xabc" ].name ).to eq( "0xabc" )
-      expect( Trema::OpenflowSwitch[ "0xabc" ].dpid_short ).to eq( "0xabc" )
-      expect( Trema::OpenflowSwitch[ "0xabc" ].dpid_long ).to eq( "0000000000000abc" )
+    it 'should create a new vswitch if name given' do
+      Trema::Shell.vswitch { dpid '0xabc' }
+      expect(Trema::OpenflowSwitch).to have(1).switch
+      expect(Trema::OpenflowSwitch[ '0xabc'].name).to eq('0xabc')
+      expect(Trema::OpenflowSwitch[ '0xabc'].dpid_short).to eq('0xabc')
+      expect(Trema::OpenflowSwitch[ '0xabc'].dpid_long).to eq('0000000000000abc')
     end
 
 
-    it "should create a new vswitch if dpid given" do
-      Trema::Shell.vswitch "0xabc"
+    it 'should create a new vswitch if dpid given' do
+      Trema::Shell.vswitch '0xabc'
 
-      expect( Trema::OpenflowSwitch ).to have( 1 ).switch
-      expect( Trema::OpenflowSwitch[ "0xabc" ].name ).to eq( "0xabc" )
-      expect( Trema::OpenflowSwitch[ "0xabc" ].dpid_short ).to eq( "0xabc" )
-      expect( Trema::OpenflowSwitch[ "0xabc" ].dpid_long ).to eq( "0000000000000abc" )
+      expect(Trema::OpenflowSwitch).to have(1).switch
+      expect(Trema::OpenflowSwitch[ '0xabc'].name).to eq('0xabc')
+      expect(Trema::OpenflowSwitch[ '0xabc'].dpid_short).to eq('0xabc')
+      expect(Trema::OpenflowSwitch[ '0xabc'].dpid_long).to eq('0000000000000abc')
     end
 
 
-    it "should raise if dpid not given" do
-      expect {
+    it 'should raise if dpid not given' do
+      expect do
         Trema::Shell.vswitch
-      }.to raise_error( "No dpid given" )
+      end.to raise_error('No dpid given')
     end
 
 
-    it "should raise if the name is invalid and block not given" do
-      expect { Trema::Shell.vswitch "INVALID_DPID" }.to raise_error( "Invalid dpid: INVALID_DPID" )
+    it 'should raise if the name is invalid and block not given' do
+      expect { Trema::Shell.vswitch 'INVALID_DPID' }.to raise_error('Invalid dpid: INVALID_DPID')
     end
   end
 end