trema 0.2.2.1 → 0.2.3

data/spec/trema/features-reply_spec.rb

@@ -1,6 +1,4 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,30 +20,66 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe FeaturesReply, ".new( VALID OPTIONS )" do
-  subject { FeaturesReply.new( :datapath_id => 123, 
-    :transaction_id => 1234,
-    :n_buffers => 256,
-    :n_tables => 2,
-    :capabilities => 135,
-    :actions => 2047,
-    :ports => ports 
-    )
-  }
-  its( :datapath_id ) { should == 123 }
-  its( :transaction_id ) { should == 1234 }
-  its( :n_buffers ) { should == 256 }
-  its( :n_tables ) { should == 2 }
-  its( :capabilities ) { should == 135 }
-  its( :actions ) { should == 2047 }
-  let( :ports ) { [ mock( "port #0" ), mock( "port #1" ), mock( "port #2" ) ] }
-  its( :ports ) { subject.size.should == 3 }
-end
+module Trema
+  describe FeaturesReply, ".new" do
+    it { expect { subject }.to raise_error( ArgumentError ) }
+  end
+
+
+  describe FeaturesReply, ".new(options...)" do
+    subject {
+      valid_options = {
+        :datapath_id => 123,
+        :transaction_id => 1234,
+        :n_buffers => 256,
+        :n_tables => 2,
+        :capabilities => 135,
+        :actions => 2047,
+        :ports => [ "port #0", "port #1", "port #2" ]
+      }
+      FeaturesReply.new( valid_options )
+    }
+
+    its( :datapath_id ) { should == 123 }
+    its( :transaction_id ) { should == 1234 }
+    its( :xid ) { should == 1234 }
+    its( :n_buffers ) { should == 256 }
+    its( :n_tables ) { should == 2 }
+    its( :capabilities ) { should == 135 }
+    its( :actions ) { should == 2047 }
+    its( :ports ) { subject.size.should == 3 }
+  end
+
+
+  describe FeaturesReply, ".new(options...) (No :datapath_id)" do
+    subject {
+      FeaturesReply.new( {
+        # :datapath_id => 123,
+        :transaction_id => 1234,
+        :n_buffers => 256,
+        :n_tables => 2,
+        :capabilities => 135,
+        :actions => 2047,
+        :ports => [ "port #0", "port #1", "port #2" ]
+      } )
+    }
+    it { expect { subject }.to raise_error( ArgumentError, ":datapath_id is a mandatory option" ) }
+  end
 
 
-describe FeaturesReply, ".new( MANDATORY OPTIONS MISSING)" do
-  it "should raise ArgumentError" do
-    expect { subject }.to raise_error( ArgumentError ) 
+  describe FeaturesReply, ".new(options...) (No :transaction_id)" do
+    subject {
+      FeaturesReply.new( {
+        :datapath_id => 123,
+        # :transaction_id => 1234,
+        :n_buffers => 256,
+        :n_tables => 2,
+        :capabilities => 135,
+        :actions => 2047,
+        :ports => [ "port #0", "port #1", "port #2" ]
+      } )
+    }
+    it { expect { subject }.to raise_error( ArgumentError, ":transaction_id is a mandatory option" ) }
   end
 end
 

data/spec/trema/features-request_spec.rb

@@ -1,6 +1,4 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,39 +20,67 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe FeaturesRequest, ".new( OPTIONAL OPTION MISSING )" do
-  it_should_behave_like "any Openflow message with default transaction ID"
+shared_examples_for "features request message" do
+  class FeaturesRequestController < Controller; end
+
+  it "should be logged to the switch's log", :sudo => true do
+    network {
+      vswitch( "features-request" ) { datapath_id 0xabc }
+    }.run( FeaturesRequestController ) {
+      controller( "FeaturesRequestController" ).send_message( 0xabc, subject )
+      IO.read( File.join( Trema.log, "openflowd.features-request.log" ) ).should include( "OFPT_FEATURES_REQUEST" )
+    }
+  end
 end
 
 
-describe FeaturesRequest, ".new( VALID OPTION )" do
-  subject { FeaturesRequest.new :transaction_id => transaction_id }
-  it_should_behave_like "any OpenFlow message with transaction_id option"
-
-
-  context "when #features_request is sent with transaction ID(1234)" do
-    it "should receive #features_reply with transaction ID(1234)" do
-      class FeaturesController < Controller; end
-      network {
-        vswitch { datapath_id 0xabc }
-      }.run( FeaturesController ) {
-        features_request = FeaturesRequest.new( :transaction_id => 1234 )
-        controller( "FeaturesController" ).send_message( 0xabc, features_request )
-        controller( "FeaturesController" ).should_receive( :features_reply ) do | arg |
-          arg.datapath_id.should == 0xabc
-          arg.transaction_id.should == 1234
-        end
-      }
+module Trema
+  describe FeaturesRequest, ".new" do
+    it_should_behave_like "any Openflow message with default transaction ID"
+    it_should_behave_like "features request message"
+  end
+
+
+  describe FeaturesRequest, ".new(nil)" do
+    subject { FeaturesRequest.new( nil ) }
+    it_should_behave_like "any Openflow message with default transaction ID"
+    it_should_behave_like "features request message"
+  end
+
+
+  describe FeaturesRequest, ".new(transaction_id)" do
+    subject { FeaturesRequest.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 "features request message"
+    end
+  end
+
+
+  describe FeaturesRequest, ".new(:transaction_id => value)" do
+    subject { FeaturesRequest.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 "features request message"
+    end
+  end
+
+
+  describe FeaturesRequest, ".new(:xid => value)" do
+    subject { FeaturesRequest.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 "features request message"
     end
   end
-end
 
 
-describe FeaturesRequest, ".new( INVALID OPTION )" do
-  it "should raise TypeError" do
-    expect {
-      FeaturesRequest.new "INVALID_OPTION"
-    }.to raise_error( TypeError )
+  describe FeaturesRequest, '.new("INVALID OPTION")', :nosudo => true do
+    it { expect { FeaturesRequest.new "INVALID OPTION" }.to raise_error( TypeError ) }
   end
 end
 

data/spec/trema/flow-mod_spec.rb

@@ -0,0 +1,99 @@
+#
+# 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"
+
+
+module Trema
+  describe FlowMod, ".new", :nosudo => true do
+    it_should_behave_like "any Openflow message with default transaction ID"
+  end
+
+
+  describe FlowMod, ".new(nil)", :nosudo => true do
+    subject { FlowMod.new( nil ) }
+    it_should_behave_like "any Openflow message with default transaction ID"
+  end
+
+
+  describe FlowMod, ".new(transaction_id)", :nosudo => true do
+    subject { FlowMod.new( transaction_id ) }
+    it_should_behave_like "any Openflow message with transaction ID"
+  end
+
+
+  describe FlowMod, ".new(:transaction_id => value)", :nosudo => true do
+    subject { FlowMod.new( :transaction_id => transaction_id ) }
+    it_should_behave_like "any Openflow message with transaction ID"
+  end
+
+
+  describe FlowMod, ".new(:xid => value)", :nosudo => true do
+    subject { FlowMod.new( :xid => xid ) }
+    it_should_behave_like "any Openflow message with xid"
+  end
+
+
+  describe FlowMod, ".new(:command => value)", :nosudo => true do
+    subject { FlowMod.new( :command => command ) }
+
+    context "command: 0", :nosudo => true do
+      let( :command ) { 0 }
+      its( :command ) { should == 0 }
+    end
+
+    # TODO: boundary test.
+  end
+
+
+  describe FlowMod, ".new(:idle_timeout => value)", :nosudo => true do
+    subject { FlowMod.new( :idle_timeout => idle_timeout ) }
+
+    context "idle_timeout: 0", :nosudo => true do
+      let( :idle_timeout ) { 0 }
+      its( :idle_timeout ) { should == 0 }
+    end
+
+    # TODO: boundary test.
+  end
+
+
+  describe FlowMod, ".new(:hard_timeout => value)", :nosudo => true do
+    subject { FlowMod.new( :hard_timeout => hard_timeout ) }
+
+    context "hard_timeout: 0", :nosudo => true do
+      let( :hard_timeout ) { 0 }
+      its( :hard_timeout ) { should == 0 }
+    end
+
+    # TODO: boundary test.
+  end
+
+
+  describe FlowMod, '.new("INVALID OPTION")', :nosudo => true do
+    it { expect { FlowMod.new "INVALID OPTION" }.to raise_error( TypeError ) }
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/{openflow-switch_spec.rb → hardware-switch_spec.rb}

@@ -20,15 +20,15 @@
 
 require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema/dsl/switch"
-require "trema/openflow-switch"
+require "trema/hardware-switch"
 
 
 module Trema
-  describe OpenflowSwitch, %[dpid = "0xabc"] do
+  describe HardwareSwitch, %[dpid = "0xabc"] do
     before :each do
       stanza = DSL::Switch.new
       stanza.dpid "0xabc"
-      @switch = OpenflowSwitch.new( stanza )
+      @switch = HardwareSwitch.new( stanza )
     end
 
 

data/spec/trema/hello_spec.rb

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

data/spec/trema/ip_spec.rb

@@ -0,0 +1,54 @@
+#
+# 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/ip"
+
+
+module Trema
+  describe IP do
+    context "when creating" do
+      subject { IP.new( ip_address, prefixlen ) }
+
+      context %{when "192.168.1.1/32"} do
+        let( :ip_address ) { "192.168.1.1" }
+        let( :prefixlen ) { 32 }
+
+        its( :to_s ) { should == "192.168.1.1" }
+        its( :to_i ) { should == 3232235777 }
+        its( :to_a ) { should == [ 0xc0, 0xa8, 0x01, 0x01 ] }
+      end
+
+      context %{when "10.1.1.1/8"} do
+        let( :ip_address ) { "10.1.1.1" }
+        let( :prefixlen ) { 8 }
+
+        its( :to_s ) { should == "10.0.0.0" }
+        its( :to_i ) { should == 10 * 256 * 256 * 256 }
+        its( :to_a ) { should == [ 0x0a, 0x00, 0x00, 0x00 ] }
+      end
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/mac_spec.rb

@@ -1,6 +1,4 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -23,82 +21,69 @@ require "trema/mac"
 
 
 module Trema
-  describe Mac do
-    context "when creating from an invalid value" do
-      context %{when "INVALID MAC ADDRESS" } do
-        it "should raise an error" do
-          lambda do
-            Mac.new( "INVALID MAC ADDRESS" )
-          end.should raise_error( %{Invalid MAC address: "INVALID MAC ADDRESS"} )
-        end
-      end
-
-
-      context "when -1" do
-        it "should raise an error" do
-          lambda do
-            Mac.new( -1 )
-          end.should raise_error( "Invalid MAC address: -1" )
-        end
-      end
-
+  describe Mac, ".new(invalid_value)" do
+    subject { Mac.new( value ) }
 
-      context "when 0x1000000000000" do
-        it "should raise an error" do
-          lambda do
-            Mac.new( 0x1000000000000 )
-          end.should raise_error( "Invalid MAC address: #{ 0x1000000000000 }" )
-        end
-      end
-
-
-      context %{when "[ 1, 2, 3 ]" } do
-        it "should raise an error" do
-          lambda do
-            Mac.new( [ 1, 2, 3 ] )
-          end.should raise_error( "Invalid MAC address: [1, 2, 3]" )
-        end
-      end
+    context %{when "INVALID MAC ADDRESS"} do
+      let( :value ) { "INVALID MAC ADDRESS" }
+      it { expect { subject }.to raise_error( ArgumentError ) }
     end
 
+    context "when -1" do
+      let( :value ) { -1 }
+      it { expect { subject }.to raise_error( ArgumentError ) }
+    end
 
-    context "when creating" do
-      subject { Mac.new( mac_address ) }
-
-
-      context %{when "11:22:33:44:55:66"} do
-        let( :mac_address ) { "11:22:33:44:55:66" }
-
-        it { should == Mac.new( "11:22:33:44:55:66" ) }
-        its( :value ) { should == 0x112233445566 }
-        its( :to_s ) { should == "11:22:33:44:55:66" }
-        its( :to_short ) { should == [ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 ] }
-      end
+    context "when 0x1000000000000" do
+      let( :value ) { 0x1000000000000 }
+      it { expect { subject }.to raise_error( ArgumentError ) }
+    end
 
+    context "when [ 1, 2, 3 ]" do
+      let( :value ) { [ 1, 2, 3 ] }
+      it { expect { subject }.to raise_error( TypeError ) }
+    end
+  end
 
-      context "when 0" do
-        let( :mac_address ) { 0 }
 
-        it { should == Mac.new( 0 ) }
-        its( :value ) { should == 0 }
-        its( :to_s ) { should == "00:00:00:00:00:00" }
-        its( :to_short ) { should == [ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ] }
-      end
+  describe Mac, ".new(value)" do
+    subject { Mac.new( value ) }
 
+    context %{when "11:22:33:44:55:66"} do
+      let( :value ) { "11:22:33:44:55:66" }
+      it { should == Mac.new( "11:22:33:44:55:66" ) }
+      its( :value ) { should == 0x112233445566 }
+      its( :to_s ) { should == "11:22:33:44:55:66" }
+      its( :to_a ) { should == [ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 ] }
+      its( :multicast? ){ should be_true }
+      its( :broadcast? ){ should be_false }
+    end
 
-      context "when 0xffffffffffff" do
-        let( :mac_address ) { 0xffffffffffff }
+    context "when 0" do
+      let( :value ) { 0 }
+      it { should == Mac.new( 0 ) }
+      its( :value ) { should == 0 }
+      its( :to_s ) { should == "00:00:00:00:00:00" }
+      its( :to_a ) { should == [ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ] }
+      its( :multicast? ){ should be_false }
+      its( :broadcast? ){ should be_false }
+    end
 
-        it { should == Mac.new( 0xffffffffffff ) }
-        its( :value ) { should == 0xffffffffffff }
-        its( :to_s ) { should == "ff:ff:ff:ff:ff:ff" }
-        its( :to_short ) { should == [ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff ] }
-      end
+    context "when 0xffffffffffff" do
+      let( :value ) { 0xffffffffffff }
+      it { should == Mac.new( 0xffffffffffff ) }
+      its( :value ) { should == 0xffffffffffff }
+      its( :to_s ) { should == "ff:ff:ff:ff:ff:ff" }
+      its( :to_a ) { should == [ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff ] }
+      its( :multicast? ){ should be_true }
+      its( :broadcast? ){ should be_true }
     end
+  end
 
 
+  describe Mac do
     context "when querying FDB" do
-      it "should be used for FDB keys" do
+      it "can be used for Hash keys" do
         fdb = {}
         fdb[ Mac.new( "00:00:00:00:00:01" ) ] = "Port #1"
         fdb[ Mac.new( "00:00:00:00:00:01" ) ].should == "Port #1"