trema 0.2.2.1 → 0.2.3

data/spec/trema/dsl/syntax_spec.rb

@@ -30,15 +30,6 @@ describe Trema::DSL::Syntax do
   end
 
 
-  it "should recognize 'use_tremashark' directive" do
-    @context.should_receive( :tremashark= ).with( an_instance_of( Tremashark ) ).once
-
-    @syntax.instance_eval do
-      use_tremashark
-    end
-  end
-
-
   it "should recognize 'port' directive" do
     @context.should_receive( :port= ).with( 1234 ).once
 
@@ -59,7 +50,7 @@ describe Trema::DSL::Syntax do
 
 
   it "should recognize 'switch' directive" do
-    Trema::Switch.should_receive( :add ).with( an_instance_of( OpenflowSwitch ) ).once
+    Trema::OpenflowSwitch.should_receive( :add ).with( an_instance_of( HardwareSwitch ) ).once
 
     @syntax.instance_eval do
       switch { dpid "0xabc" }
@@ -68,7 +59,7 @@ describe Trema::DSL::Syntax do
 
 
   it "should recognize 'vswitch' directive" do
-    Trema::Switch.should_receive( :add ).with( an_instance_of( OpenVswitch ) ).once
+    Trema::OpenflowSwitch.should_receive( :add ).with( an_instance_of( OpenVswitch ) ).once
 
     @syntax.instance_eval do
       vswitch { dpid "0xabc" }

data/spec/trema/echo-reply_spec.rb

@@ -1,6 +1,4 @@
 #
-# Author: Nick Karanatsios <nickkaranatsios@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,22 +20,59 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe EchoReply, ".new( OPTIONAL OPTION MISSING )" do
-  it_should_behave_like "any Openflow message with default transaction ID"
-end
+module Trema
+  describe EchoReply, ".new", :nosudo => true do
+    it_should_behave_like "any Openflow message with default transaction ID"
+    its( :user_data ) { should be_nil }
+  end
 
 
-describe EchoReply, ".new( VALID OPTION )" do
-  subject { EchoReply.new :transaction_id => transaction_id }
-  it_should_behave_like "any OpenFlow message with transaction_id option"
-end
+  describe EchoReply, ".new(nil)", :nosudo => true do
+    subject { EchoReply.new( nil ) }
+    it_should_behave_like "any Openflow message with default transaction ID"
+    its( :user_data ) { should be_nil }
+  end
+
+
+  describe EchoReply, ".new(transaction_id)", :nosudo => true do
+    subject { EchoReply.new( transaction_id ) }
+    it_should_behave_like "any Openflow message with transaction ID"
+  end
+
+
+  describe EchoReply, ".new(:transaction_id => value)", :nosudo => true do
+    subject { EchoReply.new( :transaction_id => transaction_id ) }
+    it_should_behave_like "any Openflow message with transaction ID"
+  end
+
+
+  describe EchoReply, ".new(:xid => value)", :nosudo => true do
+    subject { EchoReply.new( :xid => xid ) }
+    it_should_behave_like "any Openflow message with xid"
+  end
+
+
+  describe EchoReply, ".new(:user_data => value)", :nosudo => true do
+    subject { EchoReply.new( :user_data => user_data ) }
+    it_should_behave_like "any Openflow message with user_data"
+  end
+
+
+  describe EchoReply, ".new(:transaction_id => value, :user_data => value)", :nosudo => true do
+    subject { EchoReply.new( :transaction_id => transaction_id, :user_data => user_data ) }
+
+    context 'transaction_id: 123, user_data: "USER DATA"' do
+      let( :transaction_id ) { 123 }
+      let( :user_data ) { "USER DATA" }
+      its( :transaction_id ) { should == 123 }
+      its( :xid ) { should == 123 }
+      its( :user_data ) { should == "USER DATA" }
+    end
+  end
 
 
-describe EchoReply, ".new( INVALID OPTION )" do
-  it "should raise TypeError" do
-    expect {
-      EchoReply.new "INVALID OPTION"
-    }.to raise_error( TypeError )
+  describe EchoReply, '.new("INVALID OPTION")', :nosudo => true do
+    it { expect { EchoReply.new "INVALID OPTION" }.to raise_error( TypeError ) }
   end
 end
 

data/spec/trema/echo-request_spec.rb

@@ -1,6 +1,4 @@
 #
-# Author: Nick Karanatsios <nickkaranatsios@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,49 +20,103 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe EchoRequest, ".new( OPTIONAL OPTION MISSING )" do
-  its( :user_data ) { should be_nil }
-  it_should_behave_like "any Openflow message with default transaction ID"
+shared_examples_for "echo reply message" do
+  class EchoReplyController < Controller; end
+
+  it "should be logged to the switch's log", :sudo => true do
+    network {
+      vswitch( "echo" ) { datapath_id 0xabc }
+    }.run( EchoReplyController ) {
+      controller( "EchoReplyController" ).send_message( 0xabc, subject )
+      IO.read( File.join( Trema.log, "openflowd.echo.log" ) ).should include( "OFPT_ECHO_REPLY" )
+    }
+  end
 end
 
 
-describe EchoRequest, ".new( INVALID OPTIONS ) - user_data numeric" do
-  subject { EchoRequest.new 1234, 456 }
-  it "should raise an ArgumentError" do
-    expect { subject }.to raise_error( ArgumentError )
+module Trema
+  describe EchoRequest, ".new" do
+    it_should_behave_like "any Openflow message with default transaction ID"
+    it_should_behave_like "echo reply message"
+    its( :user_data ) { should be_nil }
   end
-end
 
 
-describe EchoRequest, ".new( INVALID OPTIONS ) - arguments as an Array" do
-  subject { EchoRequest.new [ 1234, "this is a test" ] }
-  it "should raise a TypeError" do
-    expect { subject }.to raise_error( TypeError )
+  describe EchoRequest, ".new(nil)" do
+    subject { EchoRequest.new( nil ) }
+    it_should_behave_like "any Openflow message with default transaction ID"
+    it_should_behave_like "echo reply message"
+    its( :user_data ) { should be_nil }
   end
-end
 
 
-describe EchoRequest, ".new( VALID OPTIONS )" do
-  subject { EchoRequest.new :transaction_id => transaction_id, :user_data => 'this is a test' }
-  let( :transaction_id ) { 1234 }
-  its( :user_data ) { should eq( "this is a test" ) }
-  it_should_behave_like "any OpenFlow message with transaction_id option"
-
-
-  context "when #echo_request is sent" do
-    it "should #echo_reply" do
-      class EchoRequestController < Controller; end
-      network {
-        vswitch( "echo_request" ) { datapath_id 0xabc }
-      }.run( EchoRequestController ) {
-        echo_request = EchoRequest.new( :transaction_id => 1234, :user_data => 'this is a test' )
-        controller( "EchoRequestController" ).send_message( 0xabc, echo_request )
-        log_file = Trema.log + "/openflowd.echo_request.log"
-        IO.read( log_file ).should include( "OFPT_ECHO_REPLY" )
-        sleep 1
-      }
+  describe EchoRequest, ".new(transaction_id)" do
+    subject { EchoRequest.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 "echo reply message"
+    end
+  end
+
+
+  describe EchoRequest, ".new(:transaction_id => value)" do
+    subject { EchoRequest.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 "echo reply message"
+    end
+  end
+
+
+  describe EchoRequest, ".new(:xid => value)" do
+    subject { EchoRequest.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 "echo reply message"
     end
   end
+
+
+  describe EchoRequest, ".new(:user_data => value)" do
+    subject { EchoRequest.new( :user_data => user_data ) }
+    it_should_behave_like "any Openflow message with user_data"
+
+    context "when sent to a switch" do
+      let( :user_data ) { "USER DATA" }
+      it_should_behave_like "echo reply message"
+    end
+  end
+
+
+  describe EchoRequest, ".new(:transaction_id => value, :user_data => value)" do
+    subject { EchoRequest.new( :transaction_id => transaction_id, :user_data => user_data ) }
+
+    context 'transaction_id: 123, user_data: "USER DATA"', :nosudo => true do
+      let( :transaction_id ) { 123 }
+      let( :user_data ) { "USER DATA" }
+
+      its( :transaction_id ) { should == 123 }
+      its( :xid ) { should == 123 }
+      its( :user_data ) { should == "USER DATA" }
+    end
+
+    context "when sent to a switch" do
+      let( :transaction_id ) { 123 }
+      let( :user_data ) { "USER DATA" }
+      it_should_behave_like "echo reply message"
+    end
+  end
+
+
+  describe EchoRequest, '.new("INVALID OPTION")', :nosudo => true do
+    it { expect { EchoRequest.new "INVALID OPTION" }.to raise_error( TypeError ) }
+  end
 end
 
 

data/spec/trema/enqueue_spec.rb

@@ -0,0 +1,76 @@
+#
+# Copyright (C) 2008-2012 NEC Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+
+require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
+require "trema"
+
+
+describe Enqueue, ".new( :port_number => 1 )" do
+  it { expect { Enqueue.new( :port_number => 1 ) }.to raise_error( ArgumentError ) }
+end
+
+
+describe Enqueue, ".new( :queue_id => 1 )" do
+  it { expect { Enqueue.new( :queue_id => 1 ) }.to raise_error( ArgumentError ) }
+end
+
+
+describe Enqueue, ".new( :port_number => number, :queue_id => 1 )" do
+  subject { Enqueue.new :port_number => port_number, :queue_id => 1 }
+  it_validates "option range", :port_number, 0..( 2 ** 16 - 1 )
+
+  context "when :port_number == 1" do
+    let( :port_number ) { 1 }
+    its( :port_number ) { should == 1 }
+  end
+end
+
+
+describe Enqueue, ".new( :port_number => 1, :queue_id => number )" do
+  subject { Enqueue.new :port_number => 1, :queue_id => queue_id }
+  it_validates "option range", :queue_id, 0..( 2 ** 32 - 1 )
+
+  context "when :queue_id == 256" do
+    let( :queue_id ) { 256 }
+    its( :queue_id ) { should == 256 }
+  end
+end
+
+
+describe Enqueue, ".new( VALID OPTIONS )" do
+  context "when sending #flow_mod(add) with action set to enqueue" do
+    it "should have a flow with action set to enqueue" do
+      class FlowModAddController < Controller; end
+      network {
+        vswitch { datapath_id 0xabc }
+      }.run( FlowModAddController ) {
+        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => Enqueue.new( :port_number => 1, :queue_id => 123 ) )
+        sleep 2 # FIXME: wait to send_flow_mod
+        vswitch( "0xabc" ).should have( 1 ).flows
+        vswitch( "0xabc" ).flows[0].actions.should match( /enqueue:1q123/ )
+      }
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/error_spec.rb

@@ -1,6 +1,4 @@
 #
-# Author: Nick Karanatsios <nickkaranatsios@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,19 +20,14 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe Error, ".new( VALID OPTIONS )" do
-  context "when using Error constants" do
-    subject { Error.constants }
+module Trema
+  describe Trema, ".constants", :nosudo => true do
+    subject { Trema.constants }
     it { should include "OFPET_HELLO_FAILED" }
-    it { should include "OFPET_BAD_REQUEST" }
-    it { should include "OFPET_BAD_ACTION" }
-    it { should include "OFPET_FLOW_MOD_FAILED" }
-    it { should include "OFPET_PORT_MOD_FAILED" }
-    it { should include "OFPET_QUEUE_OP_FAILED" }
-
     it { should include "OFPHFC_INCOMPATIBLE" }
     it { should include "OFPHFC_EPERM" }
 
+    it { should include "OFPET_BAD_REQUEST" }
     it { should include "OFPBRC_BAD_VERSION" }
     it { should include "OFPBRC_BAD_TYPE" }
     it { should include "OFPBRC_BAD_STAT" }
@@ -45,6 +38,7 @@ describe Error, ".new( VALID OPTIONS )" do
     it { should include "OFPBRC_BUFFER_EMPTY" }
     it { should include "OFPBRC_BUFFER_UNKNOWN" }
 
+    it { should include "OFPET_BAD_ACTION" }
     it { should include "OFPBAC_BAD_TYPE" }
     it { should include "OFPBAC_BAD_LEN" }
     it { should include "OFPBAC_BAD_VENDOR" }
@@ -55,83 +49,74 @@ describe Error, ".new( VALID OPTIONS )" do
     it { should include "OFPBAC_TOO_MANY" }
     it { should include "OFPBAC_BAD_QUEUE" }
 
+    it { should include "OFPET_FLOW_MOD_FAILED" }
     it { should include "OFPFMFC_ALL_TABLES_FULL" }
     it { should include "OFPFMFC_OVERLAP" }
-    it { should include "OFPFMFC_OVERLAP" }
     it { should include "OFPFMFC_BAD_EMERG_TIMEOUT" }
     it { should include "OFPFMFC_BAD_COMMAND" }
     it { should include "OFPFMFC_UNSUPPORTED" }
 
+    it { should include "OFPET_PORT_MOD_FAILED" }
     it { should include "OFPPMFC_BAD_PORT" }
     it { should include "OFPPMFC_BAD_HW_ADDR" }
 
+    it { should include "OFPET_QUEUE_OP_FAILED" }
     it { should include "OFPQOFC_BAD_PORT" }
     it { should include "OFPQOFC_BAD_QUEUE" }
     it { should include "OFPQOFC_EPERM" }
   end
-end
 
 
-describe Error, ".new( MANDATORY OPTIONS MISSING ) - type, code" do
-  subject{ Error.new }
-  exception = "Type and code are mandatory options"
-  it "should raise '#{ exception }'" do
-    expect { subject }.to raise_error( exception )
+  describe Error, ".new", :nosudo => true do
+    it { expect { subject }.to raise_error( ArgumentError, "Type and code are mandatory options" ) }
   end
-end
 
 
-describe Error, ".new( MANDATORY OPTION MISSING ) - code" do
-  subject { Error.new( :type => Error::OFPET_BAD_REQUEST ) }
-  exception = "Code is a mandatory option"
-  it "should raise '#{ exception }'" do
-    expect { subject }.to raise_error( exception )
+  describe Error, ".new(nil)", :nosudo => true do
+    it { expect { subject }.to raise_error( ArgumentError, "Type and code are mandatory options" ) }
   end
-end
 
 
-  
-describe Error, ".new( MANDATORY OPTION MISSING ) - type" do
-  subject { Error.new( :code => Error::OFPBRC_BAD_TYPE ) }
-  exception = "Type is a mandatory option"
-  it "should raise '#{ exception }'" do
-    expect { subject }.to raise_error( exception )
+  describe Error, ".new(:type => value)", :nosudo => true do
+    subject { Error.new( :type => OFPET_BAD_REQUEST ) }
+    it { expect { subject }.to raise_error( ArgumentError, "Code is a mandatory option" ) }
   end
-end
 
 
-describe Error, ".new( OPTIONAL OPTION MISSING ) - transaction_id" do
-  subject { Error.new( :type => Error::OFPET_BAD_REQUEST, :code => Error::OFPBRC_BAD_TYPE ) }
-  it_should_behave_like "any Openflow message with default transaction ID"
-end
+  describe Error, ".new(:code => value)", :nosudo => true do
+    subject { Error.new( :code => OFPBRC_BAD_TYPE ) }
+    it { expect { subject }.to raise_error( ArgumentError, "Type is a mandatory option" ) }
+  end
+
+
+  describe Error, ".new(:type => value, :code => value)" do
+    subject { Error.new( :type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE ) }
+    it_should_behave_like "any Openflow message with default transaction ID"
+    its( :error_type ) { should == OFPET_BAD_REQUEST }
+    its( :code ) { should == OFPBRC_BAD_TYPE }
+    its( :data ) { should be_nil }
+  end
+
+
+  describe Error, ".new(:type => value, :code => value, :transaction_id => value)" do
+    subject { Error.new( :type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :transaction_id => transaction_id ) }
+    it_should_behave_like "any Openflow message with transaction ID"
+  end
 
 
-describe Error, ".new( OPTIONAL OPTION MISSING ) - user_data" do
-    subject do 
-      Error.new(
-        :type => Error::OFPET_BAD_REQUEST,
-        :code => Error::OFPBRC_BAD_TYPE,
-        :transaction_id => 123
-      )
-    end
-    its( :user_data ) { should be_nil }
+  describe Error, ".new(:type => value, :code => value, :xid => value)" do
+    subject { Error.new( :type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :xid => xid ) }
+    it_should_behave_like "any Openflow message with xid"
   end
 
 
-describe Error, ".new( VALID OPTIONS )" do
-  subject do 
-    Error.new(
-      :type => Error::OFPET_BAD_REQUEST,
-      :code => Error::OFPBRC_BAD_TYPE,
-      :transaction_id => transaction_id,
-      :user_data => "this is a test"
-    )
+  describe Error, ".new(:type => value, :code => value, :data => value)" do
+    subject { Error.new( :type => OFPET_BAD_REQUEST, :code => OFPBRC_BAD_TYPE, :data => "deadbeef" ) }
+    it_should_behave_like "any Openflow message with default transaction ID"
+    its( :error_type ) { should == OFPET_BAD_REQUEST }
+    its( :code ) { should == OFPBRC_BAD_TYPE }
+    its( :data ) { should == "deadbeef" }
   end
-  let( :transaction_id ) { 1234 }
-  its( :error_type ) { should == Error::OFPET_BAD_REQUEST }
-  its( :code ) { should == Error::OFPBRC_BAD_TYPE }
-  its( :user_data ) { should eq "this is a test" }
-  it_should_behave_like "any OpenFlow message with transaction_id option"
 end