trema 0.4.6 → 0.4.7

data/spec/trema/packet-out_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'
 
 
 class PacketOutController < Controller
-  def packet_in datapath_id, message
+  def packet_in(datapath_id, message)
     send_flow_mod_add(
       datapath_id,
-      :match => Match.from( message ),
-      :actions => Trema::ActionOutput.new( :port => 2 )
+      :match => Match.from(message),
+      :actions => Trema::ActionOutput.new(:port => 2)
     )
     send_packet_out(
       datapath_id,
       :packet_in => message,
-      :actions => Trema::ActionOutput.new( :port => 2 )
+      :actions => Trema::ActionOutput.new(:port => 2)
     )
   end
 end
 
 
-describe "packet-out" do
-  context "a controller instance" do
-    it "should respond to #send_packet_out" do
-      expect( PacketOutController.new ).to respond_to(:send_packet_out)
+describe 'packet-out' do
+  context 'a controller instance' do
+    it 'should respond to #send_packet_out' do
+      expect(PacketOutController.new).to respond_to(:send_packet_out)
     end
   end
 
 
-  context "when invoked with no datapath_id" do
-    it "should raise an error" do
+  context 'when invoked with no datapath_id' do
+    it 'should raise an error' do
       expect { PacketOutController.new.send_packet_out }.to raise_error
     end
   end
 
 
-  context "when #packet_in" do
-    it "should #packet_out" do
-      network {
-        vswitch( "packet-out" ) { datapath_id 0xabc }
-        vhost "host1"
-        vhost "host2"
-        link "host1", "packet-out"
-        link "host2", "packet-out"
-      }.run( PacketOutController ) {
-        send_packets "host2", "host1"
+  context 'when #packet_in' do
+    it 'should #packet_out' do
+      network do
+        vswitch('packet-out') { datapath_id 0xabc }
+        vhost 'host1'
+        vhost 'host2'
+        link 'host1', 'packet-out'
+        link 'host2', 'packet-out'
+      end.run(PacketOutController) do
+        send_packets 'host2', 'host1'
         sleep 2
-        expect( vhost( "host1" ).rx_stats.n_pkts ).to eq( 1 )
-      }
+        expect(vhost('host1').rx_stats.n_pkts).to eq(1)
+      end
     end
   end
 
 
-  context "when data argument is string type" do
-    it "should #packet_out" do
-      network {
-        vswitch( "packet-out" ) { datapath_id 0xabc }
-        vhost "host1"
-        vhost ( "host2" ) {
-          ip "192.168.0.2"
-          netmask "255.255.0.0"
-          mac "00:00:00:00:00:02"
-        }
-        link "host1", "packet-out"
-        link "host2", "packet-out"
-      }.run( PacketOutController ) {
+  context 'when data argument is string type' do
+    it 'should #packet_out' do
+      network do
+        vswitch('packet-out') { datapath_id 0xabc }
+        vhost 'host1'
+        vhost ( 'host2') do
+          ip '192.168.0.2'
+          netmask '255.255.0.0'
+          mac '00:00:00:00:00:02'
+        end
+        link 'host1', 'packet-out'
+        link 'host2', 'packet-out'
+      end.run(PacketOutController) do
         data = [
           0x00, 0x00, 0x00, 0x00, 0x00, 0x02, # dst
           0x00, 0x00, 0x00, 0x00, 0x00, 0x01, # src
@@ -103,15 +103,15 @@ describe "packet-out" do
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        ].pack( "C*" )
-        controller( "PacketOutController" ).send_packet_out(
+        ].pack('C*')
+        controller('PacketOutController').send_packet_out(
           0xabc,
           :data => data,
-          :actions => Trema::ActionOutput.new( :port => 1 )
+          :actions => Trema::ActionOutput.new(:port => 1)
         )
         sleep 2
-        expect( vhost( "host2" ).rx_stats.n_pkts ).to eq( 1 )
-      }
+        expect(vhost('host2').rx_stats.n_pkts).to eq(1)
+      end
     end
   end
 

data/spec/trema/packetin-filter_spec.rb

@@ -16,15 +16,15 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/packetin-filter"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/packetin-filter'
 
 
 module Trema
   describe PacketinFilter do
-    it "should run packetin_filter with proper options" do
-      packetin_filter = PacketinFilter.new( :lldp => "TopologyManager", :packet_in => "OpenFlowPingPong" )
-      packetin_filter.should_receive( :sh ).once.with( /packetin_filter \-\-daemonize \-\-name=filter lldp::TopologyManager packet_in::OpenFlowPingPong$/ )
+    it 'should run packetin_filter with proper options' do
+      packetin_filter = PacketinFilter.new(:lldp => 'TopologyManager', :packet_in => 'OpenFlowPingPong')
+      packetin_filter.should_receive(:sh).once.with(/packetin_filter \-\-daemonize \-\-name=filter lldp::TopologyManager packet_in::OpenFlowPingPong$/)
 
       packetin_filter.run!
     end

data/spec/trema/port-mod_spec.rb

@@ -16,77 +16,77 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
-describe PortMod, ".new( VALID OPTIONS )" do
-  subject {
+describe PortMod, '.new( VALID OPTIONS )' do
+  subject do
     PortMod.new(
       :port_no => 2,
-      :hw_addr => Mac::new( "11:22:33:44:55:66" ),
+      :hw_addr => Mac::new('11:22:33:44:55:66'),
       :config => 1,
       :mask => 1,
       :advertise => 0
     )
-  }
-  its( :port_no ) { should == 2 }
-  its( "hw_addr.to_s" ) { should eq "11:22:33:44:55:66" }
-  its( :config ) { should == 1 }
-  its( :mask ) { should == 1 }
-  its( :advertise ) { should == 0 }
-  it_should_behave_like "any Openflow message with default transaction ID"
-
-
-  describe "hw_addr" do
-    it "should be a Trema::Mac object" do
-      expect( PortMod.new(
+  end
+  its(:port_no) { should == 2 }
+  its('hw_addr.to_s') { should eq '11:22:33:44:55:66' }
+  its(:config) { should == 1 }
+  its(:mask) { should == 1 }
+  its(:advertise) { should == 0 }
+  it_should_behave_like 'any Openflow message with default transaction ID'
+
+
+  describe 'hw_addr' do
+    it 'should be a Trema::Mac object' do
+      expect(PortMod.new(
                :port_no => 2,
-               :hw_addr => Mac::new( "11:22:33:44:55:66" ),
+               :hw_addr => Mac::new('11:22:33:44:55:66'),
                :config => 1,
                :mask => 1,
                :advertise => 0
-             ).hw_addr.to_s ).to eq( "11:22:33:44:55:66" )
+             ).hw_addr.to_s).to eq('11:22:33:44:55:66')
     end
 
 
     it "should be a string('11:22:33:44:55')" do
-      expect( PortMod.new(
+      expect(PortMod.new(
                :port_no => 2,
-               :hw_addr => "11:22:33:44:55:66",
+               :hw_addr => '11:22:33:44:55:66',
                :config => 1,
                :mask => 1,
-               :advertise => 0 ).hw_addr.to_s ).to eq( "11:22:33:44:55:66" )
+               :advertise => 0).hw_addr.to_s).to eq('11:22:33:44:55:66')
     end
 
 
-    it "should be a number(281474976710655)" do
-      expect( PortMod.new(
+    it 'should be a number(281474976710655)' do
+      expect(PortMod.new(
                :port_no => 2,
                :hw_addr => 281474976710655,
                :config => 1,
                :mask => 1,
-               :advertise => 0 ).hw_addr.to_s ).to eq( "ff:ff:ff:ff:ff:ff" )
+               :advertise => 0).hw_addr.to_s).to eq('ff:ff:ff:ff:ff:ff')
     end
 
 
-    it "should otherwise raise ArgumentError" do
-      expect { PortMod.new(
+    it 'should otherwise raise ArgumentError' do
+      expect do PortMod.new(
                 :port_no => 2,
-                :hw_addr => Array.new( 1234 ),
+                :hw_addr => Array.new(1234),
                 :config => 1,
                 :mask => 1,
                 :advertise => 0
                )
-             }.to raise_error( ArgumentError )
+             end.to raise_error(ArgumentError)
     end
   end
 end
 
 
-describe PortMod, "new( MANDATORY OPTIONS MISSING )" do
-  it "should raise ArgumentError" do
-    expect { subject }.to raise_error( ArgumentError, "Port no, hw_addr, config, mask, advertise are mandatory options" )
+describe PortMod, 'new( MANDATORY OPTIONS MISSING )' do
+  it 'should raise ArgumentError' do
+    expect { subject }.to raise_error(ArgumentError, 'Port no, hw_addr, config, mask, advertise are mandatory options')
   end
 end
 

data/spec/trema/port-status-add_spec.rb

@@ -16,12 +16,12 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 describe Trema::PortStatusAdd do
-  it_should_behave_like "port status message", :klass => Trema::PortStatusAdd
+  it_should_behave_like 'port status message', :klass => Trema::PortStatusAdd
 end
 
 

data/spec/trema/port-status-delete_spec.rb

@@ -16,12 +16,12 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 describe Trema::PortStatusDelete do
-  it_should_behave_like "port status message", :klass => Trema::PortStatusDelete
+  it_should_behave_like 'port status message', :klass => Trema::PortStatusDelete
 end
 
 

data/spec/trema/port-status-modify_spec.rb

@@ -16,19 +16,19 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 describe Trema::PortStatusModify do
-  it_should_behave_like "port status message", :klass => Trema::PortStatusModify
+  it_should_behave_like 'port status message', :klass => Trema::PortStatusModify
 end
 
 
 module Trema
   class PortStatusController < Controller
-    def features_reply dpid, message
-      message.ports.select( &:up? ).each do | each |
+    def features_reply(dpid, message)
+      message.ports.select(&:up?).each do | each |
         port_mod = PortMod.new(
           :port_no => each.number,
           :hw_addr => each.hw_addr,
@@ -43,21 +43,21 @@ module Trema
 
 
   describe Controller do
-    context "when one port goes down" do
-      it "should receive port_status (modify)" do
-        network {
+    context 'when one port goes down' do
+      it 'should receive port_status (modify)' do
+        network do
           vswitch { datapath_id 0xabc }
-          vhost "host"
-          link "host", "0xabc"
-        }.run( PortStatusController ) {
-          controller( "PortStatusController" ).should_receive( :port_status ).with do | dpid, message |
-            expect( dpid ).to eq( 0xabc )
-            expect( message ).to be_an_instance_of( PortStatusModify )
+          vhost 'host'
+          link 'host', '0xabc'
+        end.run(PortStatusController) do
+          controller('PortStatusController').should_receive(:port_status).with do | dpid, message |
+            expect(dpid).to eq(0xabc)
+            expect(message).to be_an_instance_of(PortStatusModify)
           end
 
-          controller( "PortStatusController" ).send_message 0xabc, FeaturesRequest.new
+          controller('PortStatusController').send_message 0xabc, FeaturesRequest.new
           sleep 2  # FIXME: wait to receive port_status
-        }
+        end
       end
     end
   end

data/spec/trema/port-status_spec.rb

@@ -16,8 +16,8 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 module Trema

data/spec/trema/port_spec.rb

@@ -16,38 +16,38 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema'
 
 
 describe Trema::Port do
-  it "should have its port number" do
-    port = Trema::Port.new( :number => 123 )
-    expect( port.number ).to be( 123 )
+  it 'should have its port number' do
+    port = Trema::Port.new(:number => 123)
+    expect(port.number).to be(123)
   end
 
-  it "should check the port up" do
-    port = Trema::Port.new( :config => 0, :state => 0 )
-    expect( port.up? ).to be_true
-    expect( port.down? ).to be_false
+  it 'should check the port up' do
+    port = Trema::Port.new(:config => 0, :state => 0)
+    expect(port.up?).to be_true
+    expect(port.down?).to be_false
   end
 
-  it "should check the port down(config=0,state=1)" do
-    port = Trema::Port.new( :config => 0, :state => 1 )
-    expect( port.up? ).to be_false
-    expect( port.down? ).to be_true
+  it 'should check the port down(config=0,state=1)' do
+    port = Trema::Port.new(:config => 0, :state => 1)
+    expect(port.up?).to be_false
+    expect(port.down?).to be_true
   end
 
-  it "should check the port down(config=1,state=0)" do
-    port = Trema::Port.new( :config => 1, :state => 0 )
-    expect( port.up? ).to be_false
-    expect( port.down? ).to be_true
+  it 'should check the port down(config=1,state=0)' do
+    port = Trema::Port.new(:config => 1, :state => 0)
+    expect(port.up?).to be_false
+    expect(port.down?).to be_true
   end
 
-  it "should check the port down(config=1,state=1)" do
-    port = Trema::Port.new( :config => 1, :state => 1 )
-    expect( port.up? ).to be_false
-    expect( port.down? ).to be_true
+  it 'should check the port down(config=1,state=1)' do
+    port = Trema::Port.new(:config => 1, :state => 1)
+    expect(port.up?).to be_false
+    expect(port.down?).to be_true
   end
 end
 

data/spec/trema/process_spec.rb

@@ -16,46 +16,46 @@
 #
 
 
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema/process"
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require 'trema/process'
 
 
 describe Trema::Process do
   before :each do
-    @pid_file = mock( "PID file" )
+    @pid_file = mock('PID file')
   end
 
 
-  it "should be instantiated from a PID file" do
-    IO.should_receive( :read ).with( @pid_file ).and_return( "1234\n" )
-    stat = mock( "stat", :uid => 0 )
-    File.stub!( :stat ).with( @pid_file ).and_return( stat )
+  it 'should be instantiated from a PID file' do
+    IO.should_receive(:read).with(@pid_file).and_return("1234\n")
+    stat = mock('stat', :uid => 0)
+    File.stub!(:stat).with(@pid_file).and_return(stat)
 
-    Trema::Process.read( @pid_file )
+    Trema::Process.read(@pid_file)
   end
 
 
-  it "should be killed" do
-    IO.stub!( :read ).with( @pid_file ).and_return( "1234\n" )
-    stat = mock( "stat", :uid => 1000 )
-    File.stub!( :stat ).with( @pid_file ).and_return( stat )
+  it 'should be killed' do
+    IO.stub!(:read).with(@pid_file).and_return("1234\n")
+    stat = mock('stat', :uid => 1000)
+    File.stub!(:stat).with(@pid_file).and_return(stat)
 
-    process = Trema::Process.read( @pid_file )
-    process.stub!( :` ).and_return( "ALIVE", "" )
-    process.should_receive( :sh ).with( "kill 1234 2>/dev/null" )
+    process = Trema::Process.read(@pid_file)
+    process.stub!(:`).and_return('ALIVE', '')
+    process.should_receive(:sh).with('kill 1234 2>/dev/null')
 
     process.kill!
   end
 
 
-  it "should be killed with sudo" do
-    IO.stub!( :read ).with( @pid_file ).and_return( "1234\n" )
-    stat = mock( "stat", :uid => 0 )
-    File.stub!( :stat ).with( @pid_file ).and_return( stat )
+  it 'should be killed with sudo' do
+    IO.stub!(:read).with(@pid_file).and_return("1234\n")
+    stat = mock('stat', :uid => 0)
+    File.stub!(:stat).with(@pid_file).and_return(stat)
 
-    process = Trema::Process.read( @pid_file )
-    process.stub!( :` ).and_return( "ALIVE", "" )
-    process.should_receive( :sh ).with( "sudo kill 1234 2>/dev/null" )
+    process = Trema::Process.read(@pid_file)
+    process.stub!(:`).and_return('ALIVE', '')
+    process.should_receive(:sh).with('sudo kill 1234 2>/dev/null')
 
     process.kill!
   end