trema 0.2.5 → 0.2.6

data/spec/trema/dsl/vhost_spec.rb

@@ -30,7 +30,7 @@ module Trema
           before { @vhost = Vhost.new }
 
           subject { @vhost[ :name ] }
-          
+
           context "and IP address empty" do
             it { should be_nil }
           end
@@ -65,7 +65,7 @@ module Trema
         before { @vhost = Vhost.new( "Yutaro's host" ) }
 
         subject { @vhost[ :promisc ] }
-        
+
         context "when promisc off" do
           before { @vhost.promisc "off" }
 
@@ -78,7 +78,7 @@ module Trema
 
           it { should be_false }
         end
-        
+
 
         context "when promisc on" do
           before { @vhost.promisc "on" }
@@ -102,13 +102,13 @@ module Trema
           end
         end
       end
-      
-      
+
+
       describe :netmask do
         before { @vhost = Vhost.new( "Yutaro's host" ) }
 
         subject { @vhost[ :netmask ] }
-        
+
         context "when netmask empty" do
           it { should be_nil }
         end
@@ -119,8 +119,8 @@ module Trema
           it { should == "255.255.255.0" }
         end
       end
-      
-      
+
+
       describe :mac do
         before { @vhost = Vhost.new( "Yutaro's host" ) }
 

data/spec/trema/echo-request_spec.rb

@@ -28,6 +28,7 @@ shared_examples_for "echo reply message" do
       vswitch( "echo" ) { datapath_id 0xabc }
     }.run( EchoReplyController ) {
       controller( "EchoReplyController" ).send_message( 0xabc, subject )
+      sleep 2 # FIXME: wait to send_message
       IO.read( File.join( Trema.log, "openflowd.echo.log" ) ).should include( "OFPT_ECHO_REPLY" )
     }
   end

data/spec/trema/features-request_spec.rb

@@ -28,6 +28,7 @@ shared_examples_for "features request message" do
       vswitch( "features-request" ) { datapath_id 0xabc }
     }.run( FeaturesRequestController ) {
       controller( "FeaturesRequestController" ).send_message( 0xabc, subject )
+      sleep 2 # FIXME: wait to send_message
       IO.read( File.join( Trema.log, "openflowd.features-request.log" ) ).should include( "OFPT_FEATURES_REQUEST" )
     }
   end

data/spec/trema/flow-removed_spec.rb

@@ -39,7 +39,7 @@ describe Trema::FlowRemoved, ".new( VALID OPTIONS )" do
         :tp_src => 1,
         :tp_dst => 1
       )
-      
+
       FlowRemoved.new(
         :datapath_id=>2748,
         :transaction_id=>0,
@@ -47,9 +47,9 @@ describe Trema::FlowRemoved, ".new( VALID OPTIONS )" do
         :cookie => 123456789,
         :priority => 65535,
         :reason => 0,
-        :duration_sec=>1, 
+        :duration_sec=>1,
         :duration_nsec=>779000000,
-        :idle_timeout=>1,  
+        :idle_timeout=>1,
         :packet_count=> 6,
         :byte_count => 256
       )
@@ -66,8 +66,8 @@ describe Trema::FlowRemoved, ".new( VALID OPTIONS )" do
     its ( :packet_count ) { should == 6 }
     its ( :byte_count ) { should == 256 }
   end
-  
-  
+
+
   context "when a flow expires" do
     it "should #flow_removed" do
       class FlowRemovedController < Controller; end
@@ -83,12 +83,12 @@ describe Trema::FlowRemoved, ".new( VALID OPTIONS )" do
         sleep 2 # FIXME: wait to receive flow_removed
       }
     end
-    
-    
+
+
     it "should #flow_removed with valid attributes as per flow mod add" do
       class FlowRemovedController < Controller; end
-      match = Match.new( 
-        :in_port=> 1, 
+      match = Match.new(
+        :in_port=> 1,
         :dl_src => "00:00:00:00:00:01",
         :dl_dst => "00:00:00:00:00:02",
         :dl_type => 0x800,

data/spec/trema/get-config-request_spec.rb

@@ -20,56 +20,68 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe GetConfigRequest, ".new( OPTIONAL OPTION MISSING )" do
-  it_should_behave_like "any Openflow message with default transaction ID"
+shared_examples_for "get config request message" do
+  class GetConfigRequestController < Controller; end
+
+  it "should be logged to the switch's log", :sudo => true do
+    network {
+      vswitch( "get-config-request" ) { datapath_id 0xabc }
+    }.run( GetConfigRequestController ) {
+      controller( "GetConfigRequestController" ).send_message( 0xabc, subject )
+      sleep 2 # FIXME: wait to send_message
+      IO.read( File.join( Trema.log, "openflowd.get-config-request.log" ) ).should include( "OFPT_GET_CONFIG_REQUEST" )
+    }
+  end
 end
 
 
-describe GetConfigRequest, ".new( INVALID OPTION )" do
-  subject { GetConfigRequest.new "INVALID OPTION" }
-  it "should raise TypeError" do
-    expect { subject }.to raise_error( TypeError )
+module Trema
+  describe GetConfigRequest, ".new" do
+    it_should_behave_like "any Openflow message with default transaction ID"
+    it_should_behave_like "get config request message"
   end
-end
 
 
-describe GetConfigRequest, ".new( VALID OPTION )" do
-  subject { GetConfigRequest.new :transaction_id => transaction_id }
-  it_should_behave_like "any OpenFlow message with transaction_id option"
+  describe GetConfigRequest, ".new(nil)" do
+    subject { GetConfigRequest.new( nil ) }
+    it_should_behave_like "any Openflow message with default transaction ID"
+    it_should_behave_like "get config request message"
+  end
+
+
+  describe GetConfigRequest, ".new(transaction_id)" do
+    subject { GetConfigRequest.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 "get config request message"
+    end
+  end
 
 
-  context "when #get_config_request is sent" do
-    it "should #get_config_reply" do
-      class GetConfigController < Controller; end
-      network {
-        vswitch { datapath_id 0xabc }
-      }.run( GetConfigController ) {
-        get_config_request = GetConfigRequest.new( :transaction_id => 1234 )
-        controller( "GetConfigController" ).should_receive( :get_config_reply )
-        sleep 1 # FIXME
-        controller( "GetConfigController" ).send_message( 0xabc, get_config_request )
-        sleep 2 # FIXME: wait to send_message
-      }
+  describe GetConfigRequest, ".new(:transaction_id => value)" do
+    subject { GetConfigRequest.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 "get config request message"
     end
-    
-    
-    it "should #get_config_reply with valid attributes" do
-      class GetConfigController < Controller; end
-      network {
-        vswitch { datapath_id 0xabc }
-      }.run( GetConfigController ) {
-        get_config_request = GetConfigRequest.new( :transaction_id => 1234 )
-        controller( "GetConfigController" ).should_receive( :get_config_reply ) do | datapath_id, message |
-          datapath_id.should == 0xabc
-          message.transaction_id.should == 1234
-          message.flags.should >= 0 and message.flags.should <= 3
-          message.miss_send_len.should == 65535
-        end
-        controller( "GetConfigController" ).send_message( 0xabc, get_config_request )
-        sleep 2 # FIXME: wait to send_message
-      }
+  end
+
+
+  describe GetConfigRequest, ".new(:xid => value)" do
+    subject { GetConfigRequest.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 "get config request message"
     end
   end
+
+
+  describe GetConfigRequest, '.new("INVALID OPTION")', :nosudo => true do
+    it { expect { GetConfigRequest.new "INVALID OPTION" }.to raise_error( TypeError ) }
+  end
 end
 
 

data/spec/trema/match_spec.rb

@@ -53,7 +53,7 @@ describe Match, ".new" do
   its( :nw_dst ) { subject.prefixlen.should == 24 }
   its( :tp_src ) { should == 10 }
   its( :tp_dst ) { should == 20 }
-  its( :to_s ) { should == "wildcards = 0x20000(nw_dst(8)), in_port = 1, dl_src = 00:00:00:00:00:01, dl_dst = 00:00:00:00:00:02, dl_vlan = 65535, dl_vlan_pcp = 0, dl_type = 0x800, nw_tos = 0, nw_proto = 17, nw_src = 192.168.0.1/32, nw_dst = 192.168.0.0/24, tp_src = 10, tp_dst = 20" }
+  its( :to_s ) { should == "wildcards = 0x20000(nw_dst(8)), in_port = 1, dl_src = 00:00:00:00:00:01, dl_dst = 00:00:00:00:00:02, dl_vlan = 0xffff, dl_vlan_pcp = 0, dl_type = 0x800, nw_tos = 0, nw_proto = 17, nw_src = 192.168.0.1/32, nw_dst = 192.168.0.0/24, tp_src = 10, tp_dst = 20" }
 end
 
 

data/spec/trema/openflow-error_spec.rb

@@ -27,7 +27,7 @@ describe Trema::OpenflowError, "new" do
       network {
         vswitch( "error-port") { datapath_id 0xabc }
       }.run( OpenflowErrorController ) {
-        port_mod = Trema::PortMod.new( :port_no => 2, 
+        port_mod = Trema::PortMod.new( :port_no => 2,
           :hw_addr => Trema::Mac.new( "11:22:33:44:55:66" ),
           :config => 1,
           :mask => 1,
@@ -36,15 +36,15 @@ describe Trema::OpenflowError, "new" do
         controller( "OpenflowErrorController" ).should_receive( :openflow_error ) do | datapath_id, message |
           datapath_id.should == 0xabc
           message.type.should == Error::OFPET_PORT_MOD_FAILED
-          message.code.should == Error::OFPPMFC_BAD_PORT 
+          message.code.should == Error::OFPPMFC_BAD_PORT
         end
         controller( "OpenflowErrorController" ).send_message( 0xabc, port_mod )
         sleep 2 # FIXME: wait to send_message
       }
     end
   end
-  
-  
+
+
   context "when #port_mod with an invalid(hw_addr) is sent" do
     it "should receive #error(type=Error::OFPET_PORT_MOD_FAILED,code=Error::OFPPMFC_BAD_HW_ADDR)" do
       class OpenflowErrorController < Controller; end
@@ -55,7 +55,7 @@ describe Trema::OpenflowError, "new" do
         link "host1", "error-hw-addr"
         link "host2", "error-hw-addr"
       }.run( OpenflowErrorController ) {
-        port_mod = Trema::PortMod.new( :port_no => 1, 
+        port_mod = Trema::PortMod.new( :port_no => 1,
           :hw_addr => Trema::Mac.new( "11:22:33:44:55:66" ),
           :config => 1,
           :mask => 1,
@@ -71,8 +71,8 @@ describe Trema::OpenflowError, "new" do
       }
     end
   end
-  
-  
+
+
   context "when #flow_mod(add) message with an invalid(action_port) is sent" do
     it "should receive #error(type=Error::OFPET_BAD_ACTION,code=Error::OFPBAC_BAD_OUT_PORT)" do
       class OpenflowErrorController < Controller; end
@@ -93,9 +93,9 @@ describe Trema::OpenflowError, "new" do
       }
     end
   end
-  
-  
-  context "when an unsupported message is sent" do  
+
+
+  context "when an unsupported message is sent" do
     it "should receive an openflow error with valid attributes" do
       class OpenflowController < Controller; end
       network {
@@ -111,7 +111,7 @@ describe Trema::OpenflowError, "new" do
           when 0,4
             message.code.should include 0,1
           when 1,2
-            message.code.should satisfy { | n | 
+            message.code.should satisfy { | n |
               n >= 0 && n <= 8
             }
           when 3

data/spec/trema/packet-out_spec.rb

@@ -22,7 +22,7 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-class PacketOutController < Controller 
+class PacketOutController < Controller
   def packet_in datapath_id, message
     send_flow_mod_add(
       datapath_id,
@@ -44,8 +44,8 @@ describe "packet-out" do
       PacketOutController.new.should respond_to(:send_packet_out)
     end
   end
-    
-  
+
+
   context "when invoked with no datapath_id" do
     it "should raise an error" do
       lambda do
@@ -53,8 +53,8 @@ describe "packet-out" do
       end.should raise_error("wrong number of arguments (0 for 1)")
     end
   end
-  
-  
+
+
   context "when #packet_in" do
     it "should #packet_out" do
       network {

data/spec/trema/queue-get-config-reply_spec.rb

@@ -23,7 +23,7 @@ require "trema"
 
 
 describe QueueGetConfigReply, ".new( VALID OPTIONS )" do
-  subject do 
+  subject do
     for i in 1..2 do
       pq = PacketQueue.new( :queue_id => i, :len => i * 64 )
       mr = MinRateQueue.new( i, i * 64, 1024 * i, pq)

data/spec/trema/queue-get-config-request_spec.rb

@@ -25,7 +25,7 @@ require "trema"
 describe QueueGetConfigRequest, ".new( OPTIONAL OPTION MISSING )" do
   its( :port ) { should == 1 }
   it_should_behave_like "any Openflow message with default transaction ID"
-end  
+end
 
 
 describe QueueGetConfigRequest, ".new( VALID OPTIONS )" do

data/spec/trema/set-eth-dst-addr_spec.rb

@@ -59,7 +59,7 @@ describe SetEthDstAddr, ".new( VALID OPTION )" do
           0xabc,
           :actions => SetEthDstAddr.new( "52:54:00:a8:ad:8c" )
         )
-        sleep 2 # FIXME: wait to send_flow_mod
+        sleep 6 # FIXME: wait to send_flow_mod
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_dl_dst:52:54:00:a8:ad:8c/ )
       }

data/spec/trema/set-eth-src-addr_spec.rb

@@ -56,7 +56,7 @@ describe SetEthSrcAddr, ".new( VALID OPTION )" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetEthSrcAddr.new( "52:54:00:a8:ad:8c" ) )
-        sleep 2 # FIXME: wait to send_flow_mod
+        sleep 6 # FIXME: wait to send_flow_mod
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_dl_src:52:54:00:a8:ad:8c/ )
       }

data/spec/trema/set-ip-dst-addr_spec.rb

@@ -43,6 +43,7 @@ describe SetIpDstAddr, ".new( VALID OPTION )" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetIpDstAddr.new( "192.168.1.1" ) )
+        sleep 2 # FIXME: wait to send_flow_mod_add
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_nw_dst:192.168.1.1/ )
       }

data/spec/trema/set-ip-src-addr_spec.rb

@@ -43,6 +43,7 @@ describe SetIpSrcAddr, ".new( VALID OPTION )" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetIpSrcAddr.new( "192.168.1.1" ) )
+        sleep 2 # FIXME: wait to send_flow_mod_add
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_nw_src:192.168.1.1/ )
       }

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

@@ -50,6 +50,7 @@ describe SetIpTos, ".new( VALID OPTION )" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetIpTos.new( 4 ) )
+        sleep 2 # FIXME: wait to send_flow_mod_add
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_nw_tos:4/ )
       }

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

@@ -50,6 +50,7 @@ describe SetTransportDstPort, ".new( VALID OPTION )" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetTransportDstPort.new( 5555 ) )
+        sleep 2 # FIXME: wait to send_flow_mod_add
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_tp_dst:5555/ )
       }

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

@@ -50,6 +50,7 @@ describe SetTransportSrcPort, ".new( VALID OPTION )" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetTransportSrcPort.new( 5555 ) )
+        sleep 2 # FIXME: wait to send_flow_mod_add
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_tp_src:5555/ )
       }

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

@@ -50,6 +50,7 @@ describe SetVlanPriority, ".new( VALID OPTION )" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetVlanPriority.new( 7 ) )
+        sleep 2 # FIXME: wait to send_flow_mod_add
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_vlan_pcp:7/ )
       }

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

@@ -28,7 +28,7 @@ describe SetVlanVid, ".new( number )" do
     its( :vlan_id ) { should == 1024 }
   end
 
-  it_validates "option range", :vlan_id, 1..4096
+  it_validates "option range", :vlan_id, 1..4095
 end
 
 
@@ -50,6 +50,7 @@ describe SetVlanVid, ".new( VALID OPTION )" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetVlanVid.new( 1024 ) )
+        sleep 2 # FIXME: wait to send_flow_mod_add
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[0].actions.should match( /mod_vlan_vid:1024/ )
       }