spec/trema/openflow-error_spec.rb in trema-0.2.5 vs spec/trema/openflow-error_spec.rb in trema-0.2.6

- old
+ new

@@ -25,39 +25,39 @@ it "should receive #error(type=Error::OFPET_PORT_MOD_FAILED,code=Error::OFPPMFC_BAD_PORT)" do class OpenflowErrorController < Controller; end 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, :advertise => 0 ) 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 network { vswitch( "error-hw-addr") { datapath_id 0xabc } vhost "host1" vhost "host2" 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, :advertise => 0 ) @@ -69,12 +69,12 @@ controller( "OpenflowErrorController" ).send_message( 0xabc, port_mod ) sleep 2 # FIXME: wait to send_message } 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 network { vswitch( "error-out-port") { datapath_id 0xabc } @@ -91,13 +91,13 @@ controller( "OpenflowErrorController" ).send_flow_mod_add( 0xabc, :actions => ActionOutput.new( :port => 0x5555 ) ) sleep 2 # FIXME: wait to send_flow_mod_add } 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 { vswitch( "error-request") { datapath_id 0xabc } }.run( OpenflowController ) { @@ -109,10 +109,10 @@ } case message.type 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 message.code.should satisfy { | n | n >= 0 && n <= 5