trema 0.4.6 → 0.4.7

data/spec/trema/stats-request_spec.rb

@@ -16,145 +16,145 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-shared_examples_for "any stats-request" do
-  it_should_behave_like "any Openflow message with default transaction ID"
-  its( :flags ) { should == 0 }
+shared_examples_for 'any stats-request' do
+  it_should_behave_like 'any Openflow message with default transaction ID'
+  its(:flags) { should == 0 }
 end
 
 
 describe StatsRequest do
-  context "when .DescStatsRequest.new( VALID OPTIONS )" do
+  context 'when .DescStatsRequest.new( VALID OPTIONS )' do
     subject { DescStatsRequest.new }
-    it_should_behave_like "any stats-request"
+    it_should_behave_like 'any stats-request'
   end
 
 
-  context "when .FlowStatsRequest.new( MANDATORY OPTION MISSING )" do
+  context 'when .FlowStatsRequest.new( MANDATORY OPTION MISSING )' do
     subject { FlowStatsRequest.new }
-    it "should raise ArgumentError" do
-      expect { subject }.to raise_error( ArgumentError )
+    it 'should raise ArgumentError' do
+      expect { subject }.to raise_error(ArgumentError)
     end
   end
 
 
-  context "when .FlowStatsRequest.new( OPTIONAL OPTIONS MISSING )" do
-    subject { FlowStatsRequest.new( :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ) ) }
-    it_should_behave_like "any stats-request"
-    its( :match ) { should be_an_instance_of( Match ) }
-    its( :table_id ) { should == 0xff }
-    its( :out_port ) { should == 0xffff }
+  context 'when .FlowStatsRequest.new( OPTIONAL OPTIONS MISSING )' do
+    subject { FlowStatsRequest.new(:match => Match.new(:dl_type => 0x800, :nw_proto => 17)) }
+    it_should_behave_like 'any stats-request'
+    its(:match) { should be_an_instance_of(Match) }
+    its(:table_id) { should == 0xff }
+    its(:out_port) { should == 0xffff }
   end
 
 
-  context "when .FlowStatsRequest.new( VALID OPTIONS )" do
+  context 'when .FlowStatsRequest.new( VALID OPTIONS )' do
     subject do
       FlowStatsRequest.new(
-        :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ),
+        :match => Match.new(:dl_type => 0x800, :nw_proto => 17),
         :table_id => 1,
         :out_port => 2
       )
     end
-    it_should_behave_like "any stats-request"
-    its( :match ) { should be_an_instance_of( Match ) }
-    its( :table_id ) { should == 1 }
-    its( :out_port ) { should == 2 }
+    it_should_behave_like 'any stats-request'
+    its(:match) { should be_an_instance_of(Match) }
+    its(:table_id) { should == 1 }
+    its(:out_port) { should == 2 }
   end
 
 
-  context "when .AggregateStatsRequest.new( MANDATORY OPTION MISSING )" do
+  context 'when .AggregateStatsRequest.new( MANDATORY OPTION MISSING )' do
     subject { AggregateStatsRequest.new }
-    it "should raise ArgumentError" do
-      expect { subject }.to raise_error( ArgumentError )
+    it 'should raise ArgumentError' do
+      expect { subject }.to raise_error(ArgumentError)
     end
   end
 
 
-  context "when .AggregateStatsRequest.new( OPTIONAL OPTIONS MISSING )" do
-    subject { AggregateStatsRequest.new( :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ) ) }
-    it_should_behave_like "any stats-request"
-    its( :match ) { should be_an_instance_of( Match ) }
-    its( :table_id ) { should == 0xff }
-    its( :out_port ) { should == 0xffff }
+  context 'when .AggregateStatsRequest.new( OPTIONAL OPTIONS MISSING )' do
+    subject { AggregateStatsRequest.new(:match => Match.new(:dl_type => 0x800, :nw_proto => 17)) }
+    it_should_behave_like 'any stats-request'
+    its(:match) { should be_an_instance_of(Match) }
+    its(:table_id) { should == 0xff }
+    its(:out_port) { should == 0xffff }
   end
 
 
-  context "when .AggregateStatsRequest.new( VALID OPTIONS )" do
+  context 'when .AggregateStatsRequest.new( VALID OPTIONS )' do
     subject do
       AggregateStatsRequest.new(
-        :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ),
+        :match => Match.new(:dl_type => 0x800, :nw_proto => 17),
         :table_id => 1,
         :out_port => 2
       )
     end
-    it_should_behave_like "any stats-request"
-    its( :match ) { should be_an_instance_of( Match ) }
-    its( :table_id ) { should == 1 }
-    its( :out_port ) { should == 2 }
+    it_should_behave_like 'any stats-request'
+    its(:match) { should be_an_instance_of(Match) }
+    its(:table_id) { should == 1 }
+    its(:out_port) { should == 2 }
   end
 
 
-  context "when .TableStatsRequest.new( VALID OPTIONS )" do
+  context 'when .TableStatsRequest.new( VALID OPTIONS )' do
     subject { TableStatsRequest.new }
-    it_should_behave_like "any stats-request"
+    it_should_behave_like 'any stats-request'
   end
 
 
-  context "when .PortStasRequest.new( OPTIONAL OPTION MISSING )" do
+  context 'when .PortStasRequest.new( OPTIONAL OPTION MISSING )' do
     subject { PortStatsRequest.new }
-    it_should_behave_like "any stats-request"
-    its( :port_no ) { should == 0xffff }
+    it_should_behave_like 'any stats-request'
+    its(:port_no) { should == 0xffff }
   end
 
 
-  context "when .PortStasRequest.new( VALID OPTIONS )" do
+  context 'when .PortStasRequest.new( VALID OPTIONS )' do
     subject { PortStatsRequest.new :port_no => 1 }
-    it_should_behave_like "any stats-request"
-    its( :port_no ) { should == 1 }
+    it_should_behave_like 'any stats-request'
+    its(:port_no) { should == 1 }
   end
 
 
-  context "when .QueueStatsRequest.new( OPTIONAL OPTIONS MISSING )" do
+  context 'when .QueueStatsRequest.new( OPTIONAL OPTIONS MISSING )' do
     subject { QueueStatsRequest.new }
-    it_should_behave_like "any stats-request"
-    its( :port_no ) { should == 0xfffc }
-    its( :queue_id ) { should == 0xffffffff }
+    it_should_behave_like 'any stats-request'
+    its(:port_no) { should == 0xfffc }
+    its(:queue_id) { should == 0xffffffff }
   end
 
 
-  context "when .QueueStatsRequest.new( VALID OPTIONS )" do
+  context 'when .QueueStatsRequest.new( VALID OPTIONS )' do
     subject { QueueStatsRequest.new :port_no => 1, :queue_id => 2 }
-    it_should_behave_like "any stats-request"
-    its( :port_no ) { should == 1 }
-    its( :queue_id ) { should == 2 }
+    it_should_behave_like 'any stats-request'
+    its(:port_no) { should == 1 }
+    its(:queue_id) { should == 2 }
   end
 
 
-  context "when .VendorStatsRequest.new( OPTIONAL OPTION MISSING )" do
+  context 'when .VendorStatsRequest.new( OPTIONAL OPTION MISSING )' do
     subject { VendorStatsRequest.new }
-    it_should_behave_like "any stats-request"
-    its( :vendor_id ) { should == 0x00004cff }
-    its( :data ) { should be_nil }
+    it_should_behave_like 'any stats-request'
+    its(:vendor_id) { should == 0x00004cff }
+    its(:data) { should be_nil }
   end
 
 
-  context "when .VendorStatsRequest.new( VALID OPTION )" do
+  context 'when .VendorStatsRequest.new( VALID OPTION )' do
     subject { VendorStatsRequest.new :vendor_id => 123 }
-    it_should_behave_like "any stats-request"
-    its( :vendor_id ) { should == 123 }
-    its( :data ) { should be_nil }
+    it_should_behave_like 'any stats-request'
+    its(:vendor_id) { should == 123 }
+    its(:data) { should be_nil }
   end
 
 
-  context "when .VendorStatsRequest.new(:data => value)" do
+  context 'when .VendorStatsRequest.new(:data => value)' do
     subject { VendorStatsRequest.new :data => data }
-    it_should_behave_like "any stats-request"
-    let( :data ) { "VENDOR DATA".unpack( "C*" ) }
-    its( :data ) { should == [86, 69, 78, 68, 79, 82, 32, 68, 65, 84, 65] }
-    its( :vendor_id ) { should == 0x00004cff }
+    it_should_behave_like 'any stats-request'
+    let(:data) { 'VENDOR DATA'.unpack('C*') }
+    its(:data) { should == [86, 69, 78, 68, 79, 82, 32, 68, 65, 84, 65] }
+    its(:vendor_id) { should == 0x00004cff }
   end
 end
 

data/spec/trema/strip-vlan-header_spec.rb

@@ -16,22 +16,22 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe StripVlanHeader, :type => "actions" do
-  context "when sending a Flow Mod with StripVlanHeader" do
-    it "should insert a new flow entry with action (strip_vlan)" do
+describe StripVlanHeader, :type => 'actions' do
+  context 'when sending a Flow Mod with StripVlanHeader' do
+    it 'should insert a new flow entry with action (strip_vlan)' 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( "strip_vlan" )
-      }
+        expect(vswitch('0xabc')).to have(1).flows
+        expect(vswitch('0xabc').flows[ 0].actions).to eq('strip_vlan')
+      end
     end
   end
 end

data/spec/trema/switch-daemon_spec.rb

@@ -16,59 +16,59 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/switch-daemon"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/switch-daemon'
 
 
 module Trema
   describe SwitchDaemon do
-    it "should be initialized with proper options" do
+    it 'should be initialized with proper options' do
       rule = {
-        :port_status => "topology",
-        :packet_in => "controller",
-        :state_notify => "topology",
-        :vendor => "controller"
+        :port_status => 'topology',
+        :packet_in => 'controller',
+        :state_notify => 'topology',
+        :vendor => 'controller'
       }
-      switch_daemon = SwitchDaemon.new( rule )
+      switch_daemon = SwitchDaemon.new(rule)
 
-      expect( switch_daemon.options ).to include( "port_status::topology" )
-      expect( switch_daemon.options ).to include( "packet_in::controller" )
-      expect( switch_daemon.options ).to include( "state_notify::topology" )
-      expect( switch_daemon.options ).to include( "vendor::controller" )
+      expect(switch_daemon.options).to include('port_status::topology')
+      expect(switch_daemon.options).to include('packet_in::controller')
+      expect(switch_daemon.options).to include('state_notify::topology')
+      expect(switch_daemon.options).to include('vendor::controller')
     end
 
 
-    it "should be initialized with options which have multiple controllers" do
+    it 'should be initialized with options which have multiple controllers' do
       rule = {
-        :port_status => "topology0,topology1",
-        :packet_in => "controller0,controller1",
-        :state_notify => "topology0,topology1",
-        :vendor => "controller0,controller1"
+        :port_status => 'topology0,topology1',
+        :packet_in => 'controller0,controller1',
+        :state_notify => 'topology0,topology1',
+        :vendor => 'controller0,controller1'
       }
-      switch_daemon = SwitchDaemon.new( rule )
+      switch_daemon = SwitchDaemon.new(rule)
 
-      expect( switch_daemon.options ).to include( "port_status::topology0" )
-      expect( switch_daemon.options ).to include( "port_status::topology1" )
-      expect( switch_daemon.options ).to include( "packet_in::controller0" )
-      expect( switch_daemon.options ).to include( "packet_in::controller1" )
-      expect( switch_daemon.options ).to include( "state_notify::topology0" )
-      expect( switch_daemon.options ).to include( "state_notify::topology1" )
-      expect( switch_daemon.options ).to include( "vendor::controller0" )
-      expect( switch_daemon.options ).to include( "vendor::controller1" )
+      expect(switch_daemon.options).to include('port_status::topology0')
+      expect(switch_daemon.options).to include('port_status::topology1')
+      expect(switch_daemon.options).to include('packet_in::controller0')
+      expect(switch_daemon.options).to include('packet_in::controller1')
+      expect(switch_daemon.options).to include('state_notify::topology0')
+      expect(switch_daemon.options).to include('state_notify::topology1')
+      expect(switch_daemon.options).to include('vendor::controller0')
+      expect(switch_daemon.options).to include('vendor::controller1')
     end
 
 
-    it "should be initialized without vendor options" do
+    it 'should be initialized without vendor options' do
       rule = {
-        :port_status => "topology",
-        :packet_in => "controller",
-        :state_notify => "topology"
+        :port_status => 'topology',
+        :packet_in => 'controller',
+        :state_notify => 'topology'
       }
-      switch_daemon = SwitchDaemon.new( rule )
+      switch_daemon = SwitchDaemon.new(rule)
 
-      expect( switch_daemon.options ).to include( "port_status::topology" )
-      expect( switch_daemon.options ).to include( "packet_in::controller" )
-      expect( switch_daemon.options ).to include( "state_notify::topology" )
+      expect(switch_daemon.options).to include('port_status::topology')
+      expect(switch_daemon.options).to include('packet_in::controller')
+      expect(switch_daemon.options).to include('state_notify::topology')
     end
   end
 end

data/spec/trema/switch-disconnected_spec.rb

@@ -16,34 +16,34 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 class SwitchDisconnected < Controller; end
 
 
 describe SwitchDisconnected do
-  context "when switch is killed" do
-    it "should receive a switch_disconnected" do
-      network {
-        vswitch( "switch-disconnect" ) { datapath_id 0xabc }
-      }.run( SwitchDisconnected ) {
-        controller( "SwitchDisconnected" ).should_receive( :switch_disconnected )
-        vswitch( "switch-disconnect" ).shutdown!
+  context 'when switch is killed' do
+    it 'should receive a switch_disconnected' do
+      network do
+        vswitch('switch-disconnect') { datapath_id 0xabc }
+      end.run(SwitchDisconnected) do
+        controller('SwitchDisconnected').should_receive(:switch_disconnected)
+        vswitch('switch-disconnect').shutdown!
         sleep 3 # FIXME: wait to shutdown
-      }
+      end
     end
 
 
-    it "should receive a switch_disconnected with valid datapath_id" do
-      network {
-        vswitch( "switch-disconnect" ) { datapath_id 0xabc }
-      }.run( SwitchDisconnected ) {
-        controller( "SwitchDisconnected" ).should_receive( :switch_disconnected ).with( 0xabc )
-        vswitch( "switch-disconnect" ).shutdown!
+    it 'should receive a switch_disconnected with valid datapath_id' do
+      network do
+        vswitch('switch-disconnect') { datapath_id 0xabc }
+      end.run(SwitchDisconnected) do
+        controller('SwitchDisconnected').should_receive(:switch_disconnected).with(0xabc)
+        vswitch('switch-disconnect').shutdown!
         sleep 3 # FIXME: wait to shutdown
-      }
+      end
     end
   end
 end

data/spec/trema/switch-manager_spec.rb

@@ -16,17 +16,17 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/switch-manager"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/switch-manager'
 
 
 module Trema
   describe SwitchManager do
-    it "should run switch_manager command with proper options" do
-      rule = { :port_status => "topology", :packet_in => "controller", :state_notify => "topology", :vendor => "controller" }
-      switch_manager = SwitchManager.new( rule )
+    it 'should run switch_manager command with proper options' do
+      rule = { :port_status => 'topology', :packet_in => 'controller', :state_notify => 'topology', :vendor => 'controller' }
+      switch_manager = SwitchManager.new(rule)
 
-      switch_manager.should_receive( :sh ).once.with( /port_status::topology packet_in::controller state_notify::topology vendor::controller$/ )
+      switch_manager.should_receive(:sh).once.with(/port_status::topology packet_in::controller state_notify::topology vendor::controller$/)
 
       switch_manager.run!
     end

data/spec/trema/tremashark_spec.rb

@@ -16,15 +16,15 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/tremashark"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/tremashark'
 
 
 module Trema
   describe Tremashark do
-    it "should run tremashark command with proper options" do
+    it 'should run tremashark command with proper options' do
       tremashark = Tremashark.new
-      tremashark.should_receive( :sh ).once.with( /tremashark \-\-daemonize$/ )
+      tremashark.should_receive(:sh).once.with(/tremashark \-\-daemonize$/)
 
       tremashark.run
     end

data/spec/trema/util_spec.rb

@@ -16,65 +16,65 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/dsl/configuration"
-require "trema/dsl/runner"
-require "trema/util"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/dsl/configuration'
+require 'trema/dsl/runner'
+require 'trema/util'
 
 
 include Trema::Util
 
 
 describe Trema::Util do
-  it "should assert that trema is built" do
-    Trema::Executables.stub!( :compiled? ).and_return( false )
-    $stderr.should_receive( :puts ).with( /^ERROR/ )
-    expect { assert_trema_is_built }.to raise_error( SystemExit )
+  it 'should assert that trema is built' do
+    Trema::Executables.stub!(:compiled?).and_return(false)
+    $stderr.should_receive(:puts).with(/^ERROR/)
+    expect { assert_trema_is_built }.to raise_error(SystemExit)
   end
 
 
-  it "should execute and check the results of a command" do
-    expect { sh "NO SUCH COMMAND" }.to raise_error( "Command 'NO SUCH COMMAND' failed!" )
+  it 'should execute and check the results of a command' do
+    expect { sh 'NO SUCH COMMAND' }.to raise_error("Command 'NO SUCH COMMAND' failed!")
   end
 
 
-  it "should cleanup current session" do
-    apps = { "app 1" => mock( "app 1" ), "app 2" => mock( "app 2" ), "app 3" => mock( "app 3" ) }
+  it 'should cleanup current session' do
+    apps = { 'app 1' => mock('app 1'), 'app 2' => mock('app 2'), 'app 3' => mock('app 3') }
     apps.each do | name, app |
-      app.should_receive( :shutdown! )
+      app.should_receive(:shutdown!)
     end
 
-    switches = { "switch 1" => mock( "switch 1" ), "switch 2" => mock( "switch 2" ), "switch 3" => mock( "switch 3" ) }
+    switches = { 'switch 1' => mock('switch 1'), 'switch 2' => mock('switch 2'), 'switch 3' => mock('switch 3') }
     switches.each do | name, switch |
-      switch.should_receive( :shutdown! )
+      switch.should_receive(:shutdown!)
     end
 
-    hosts = { "host 1" => mock( "host 1" ), "host 2" => mock( "host 2" ), "host 3" => mock( "host 3" ) }
+    hosts = { 'host 1' => mock('host 1'), 'host 2' => mock('host 2'), 'host 3' => mock('host 3') }
     hosts.each do | name, host |
-      host.should_receive( :shutdown! )
+      host.should_receive(:shutdown!)
     end
 
-    links = { "link 1" => mock( "link 1" ), "link 2" => mock( "link 2" ), "link 3" => mock( "link 3" ) }
+    links = { 'link 1' => mock('link 1'), 'link 2' => mock('link 2'), 'link 3' => mock('link 3') }
     links.each do | name, link |
-      link.should_receive( :delete! )
+      link.should_receive(:delete!)
     end
 
-    last_session = mock( "last session" )
-    last_session.stub!( :apps ).and_return( apps )
-    last_session.stub!( :switches ).and_return( switches )
-    last_session.stub!( :hosts ).and_return( hosts )
-    last_session.stub!( :links ).and_return( links )
-    last_session.stub!( :netnss ).and_return( {} )
-    Trema::DSL::Context.stub!( :load_current ).and_return( last_session )
-
-    pid_files = [ mock( "PID file #0" ), mock( "PID file #1" ), mock( "PID file #2" ) ]
-    Dir.stub!( :glob ).and_return( pid_files )
-
-    process = mock( "process" )
-    process.should_receive( :kill! ).exactly( 3 ).times
-    Trema::Process.should_receive( :read ).with( pid_files[ 0 ] ).once.ordered.and_return( process )
-    Trema::Process.should_receive( :read ).with( pid_files[ 1 ] ).once.ordered.and_return( process )
-    Trema::Process.should_receive( :read ).with( pid_files[ 2 ] ).once.ordered.and_return( process )
+    last_session = mock('last session')
+    last_session.stub!(:apps).and_return(apps)
+    last_session.stub!(:switches).and_return(switches)
+    last_session.stub!(:hosts).and_return(hosts)
+    last_session.stub!(:links).and_return(links)
+    last_session.stub!(:netnss).and_return({})
+    Trema::DSL::Context.stub!(:load_current).and_return(last_session)
+
+    pid_files = [mock('PID file #0'), mock('PID file #1'), mock('PID file #2')]
+    Dir.stub!(:glob).and_return(pid_files)
+
+    process = mock('process')
+    process.should_receive(:kill!).exactly(3).times
+    Trema::Process.should_receive(:read).with(pid_files[ 0]).once.ordered.and_return(process)
+    Trema::Process.should_receive(:read).with(pid_files[ 1]).once.ordered.and_return(process)
+    Trema::Process.should_receive(:read).with(pid_files[ 2]).once.ordered.and_return(process)
 
     cleanup_current_session
   end