trema 0.2.2.1 → 0.2.3

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

@@ -0,0 +1,65 @@
+#
+# 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 SetTransportSrcPort, "new( number )" do
+  subject { SetTransportSrcPort.new number }
+
+  context "when number == 5555" do
+    let( :number ) { 5555 }
+    its( :port_number ) { should == 5555 }
+  end
+
+  it_validates "option range", :number, 0..( 2 ** 16 - 1 )
+end
+
+
+describe SetTransportSrcPort, ".new( string )" do
+  it { expect { SetTransportSrcPort.new( "5555" ) }.to raise_error( TypeError ) }
+end
+
+
+describe SetTransportSrcPort, ".new( array )" do
+  it { expect { SetTransportSrcPort.new( [ 1, 2, 3 ] ) }.to raise_error( TypeError ) }
+end
+
+
+describe SetTransportSrcPort, ".new( VALID OPTION )" do
+  context "when sending #flow_mod(add) with action set to mod_tp_src" do
+    it "should have a flow with action set to mod_tp_src" do
+      class FlowModAddController < Controller; end
+      network {
+        vswitch { datapath_id 0xabc }
+      }.run( FlowModAddController ) {
+        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetTransportSrcPort.new( 5555 ) )
+        vswitch( "0xabc" ).should have( 1 ).flows
+        vswitch( "0xabc" ).flows[0].actions.should match( /mod_tp_src:5555/ )
+      }
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

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

@@ -0,0 +1,65 @@
+#
+# 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 SetVlanPriority, ".new( number )" do
+  subject { SetVlanPriority.new( vlan_priority ) }
+
+  context "when vlan_priority == 4" do
+    let( :vlan_priority ) { 4 }
+    its( :vlan_priority ) { should == 4 }
+  end
+
+  it_validates "option range", :vlan_priority, 0..7
+end
+
+
+describe SetVlanPriority, %{.new( "4" )} do
+  it { expect { SetVlanPriority.new( "4" ) }.to raise_error( TypeError ) }
+end
+
+
+describe SetVlanPriority, ".new( [ 4 ] )" do
+  it { expect { SetVlanPriority.new( [ 4 ] ) }.to raise_error( TypeError ) }
+end
+
+
+describe SetVlanPriority, ".new( VALID OPTION )" do
+  context "when sending #flow_mod(add) with action set to mod_vlan_pcp" do
+    it "should have a flow with action set to mod_vlan_pcp" do
+      class FlowModAddController < Controller; end
+      network {
+        vswitch { datapath_id 0xabc }
+      }.run( FlowModAddController ) {
+        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetVlanPriority.new( 7 ) )
+        vswitch( "0xabc" ).should have( 1 ).flows
+        vswitch( "0xabc" ).flows[0].actions.should match( /mod_vlan_pcp:7/ )
+      }
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

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

@@ -0,0 +1,65 @@
+#
+# 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 SetVlanVid, ".new( number )" do
+  subject { SetVlanVid.new( vlan_id ) }
+
+  context "when vlan_id == 1024" do
+    let( :vlan_id ) { 1024 }
+    its( :vlan_id ) { should == 1024 }
+  end
+
+  it_validates "option range", :vlan_id, 1..4096
+end
+
+
+describe SetVlanVid, %{.new( "1024" )} do
+  it { expect { SetVlanVid.new( "1024" ) }.to raise_error( TypeError ) }
+end
+
+
+describe SetVlanVid, ".new( [ 1024 ] )" do
+  it { expect { SetVlanVid.new( [ 1024 ] ) }.to raise_error( TypeError ) }
+end
+
+
+describe SetVlanVid, ".new( VALID OPTION )" do
+  context "when sending #flow_mod(add) with action set to mod_vlan_vid" do
+    it "should have a flow with action set to mod_vlan_vid" do
+      class FlowModAddController < Controller; end
+      network {
+        vswitch { datapath_id 0xabc }
+      }.run( FlowModAddController ) {
+        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetVlanVid.new( 1024 ) )
+        vswitch( "0xabc" ).should have( 1 ).flows
+        vswitch( "0xabc" ).flows[0].actions.should match( /mod_vlan_vid:1024/ )
+      }
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/shell/vhost_spec.rb

@@ -22,7 +22,10 @@ require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
 
 
 describe Trema::Shell, ".vhost" do
-  before { $context = mock( "context", :dump => true ) }
+  before {
+    Trema::Host.clear
+    $context = mock( "context", :dump => true )
+  }
 
 
   it "should create a new vhost if name given" do

data/spec/trema/shell/vswitch_spec.rb

@@ -23,9 +23,9 @@ require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
 
 describe Trema::Shell, ".vswitch" do
   around do | example |
-    Trema::Switch.clear
+    Trema::OpenflowSwitch.clear
     example.run
-    Trema::Switch.clear
+    Trema::OpenflowSwitch.clear
   end
 
 
@@ -46,25 +46,25 @@ describe Trema::Shell, ".vswitch" do
       $config = mock( "config", :port => 6633 )
       $context = mock( "context", :dump => true )
     }
-    after { Trema::Switch[ "0xabc" ].shutdown! if Trema::Switch[ "0xabc" ] }
+    after { Trema::OpenflowSwitch[ "0xabc" ].shutdown! if Trema::OpenflowSwitch[ "0xabc" ] }
 
 
     it "should create a new vswitch if name given" do
       Trema::Shell.vswitch { dpid "0xabc" }
-      Trema::Switch.should have( 1 ).switch
-      Trema::Switch[ "0xabc" ].name.should == "0xabc"
-      Trema::Switch[ "0xabc" ].dpid_short.should == "0xabc"
-      Trema::Switch[ "0xabc" ].dpid_long.should == "0000000000000abc"
+      Trema::OpenflowSwitch.should have( 1 ).switch
+      Trema::OpenflowSwitch[ "0xabc" ].name.should == "0xabc"
+      Trema::OpenflowSwitch[ "0xabc" ].dpid_short.should == "0xabc"
+      Trema::OpenflowSwitch[ "0xabc" ].dpid_long.should == "0000000000000abc"
     end
 
 
     it "should create a new vswitch if dpid given" do
       Trema::Shell.vswitch "0xabc"
 
-      Trema::Switch.should have( 1 ).switch
-      Trema::Switch[ "0xabc" ].name.should == "0xabc"
-      Trema::Switch[ "0xabc" ].dpid_short.should == "0xabc"
-      Trema::Switch[ "0xabc" ].dpid_long.should == "0000000000000abc"
+      Trema::OpenflowSwitch.should have( 1 ).switch
+      Trema::OpenflowSwitch[ "0xabc" ].name.should == "0xabc"
+      Trema::OpenflowSwitch[ "0xabc" ].dpid_short.should == "0xabc"
+      Trema::OpenflowSwitch[ "0xabc" ].dpid_long.should == "0000000000000abc"
     end
 
 

data/spec/trema/stats-reply_spec.rb

@@ -23,6 +23,26 @@ require "trema"
 
 
 describe StatsReply, ".new( VALID OPTIONS )" do
+  context "when #desc-stats-reply is created" do
+    subject do
+      DescStatsReply.new(
+        :mfr_desc => "NEC Corporation",
+        :hw_desc => "no hardware description",
+        :sw_desc => "version xx.xx",
+        :serial_num => "1234",
+        :dp_desc => "nec01"                         
+      )
+    end
+
+    it { should respond_to( :to_s ) }
+    its ( :mfr_desc ) { should eq( "NEC Corporation" ) }
+    its ( :hw_desc ) { should eq( "no hardware description" ) }
+    its ( :sw_desc ) { should eq( "version xx.xx" ) }
+    its ( :serial_num ) { should eq( "1234" ) }
+    its ( :dp_desc ) { should eq( "nec01" ) }
+  end
+
+
   context "when #flow-stats-reply is created" do
     subject do
       actions = [ ActionOutput.new( :port => 1 ) ]
@@ -163,6 +183,28 @@ describe StatsReply, ".new( VALID OPTIONS )" do
   end
   
   
+  context "when #stats_request(desc-stats) is sent" do
+    it "should #stats_reply(desc-stats)" do
+      class DescStatsController < Controller; end
+      network {
+        vswitch( "desc-stats" ) { datapath_id 0xabc }
+      }.run( DescStatsController ) {
+        controller( "DescStatsController" ).should_receive( :stats_reply ) do | datapath_id, message |
+          datapath_id.should == 0xabc          
+          message.type.should == 0
+          message.stats[ 0 ].mfr_desc.should eq( "Nicira Networks, Inc." )
+          message.stats[ 0 ].hw_desc.should eq( "Open vSwitch" )
+          message.stats[ 0 ].should respond_to :to_s
+        end
+        
+        controller( "DescStatsController" ).send_message( 0xabc,
+          DescStatsRequest.new( :transaction_id => 1234 ) )
+        sleep 2 # FIXME: wait to send_message
+      }
+    end
+  end
+
+
   context "when #stats_request(flow-stats) is sent" do
     it "should #stats_reply(flow-stats)" do
       class FlowStatsController < Controller; end
@@ -185,10 +227,11 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         send_packets "host1", "host2", :n_pkts => 2
         sleep 2 # FIXME: wait to send_packets
 
-        controller( "FlowStatsController" ).should_receive( :stats_reply ) do | message |
+        controller( "FlowStatsController" ).should_receive( :stats_reply ) do | datapath_id, message |
+          datapath_id.should == 0xabc
           message.type.should == 1
-          message.stats[0].packet_count.should == 2
-          message.stats[0].should respond_to :to_s
+          message.stats[ 0 ].packet_count.should == 2
+          message.stats[ 0 ].should respond_to :to_s
         end
         match = Match.new( :dl_type =>0x800, :nw_proto => 17 )
         controller( "FlowStatsController" ).send_message( 0xabc,
@@ -221,11 +264,12 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         send_packets "host1", "host2", :n_pkts => 10
         sleep 2 # FIXME: wait to send_packets
 
-        controller( "AggregateStatsController" ).should_receive( :stats_reply ) do | message |
+        controller( "AggregateStatsController" ).should_receive( :stats_reply ) do | datapath_id, message |
+          datapath_id.should == 0xabc
           message.type.should == 2
-          message.stats[0].packet_count.should == 10
-          message.stats[0].flow_count.should == 1
-          message.stats[0].should respond_to :to_s
+          message.stats[ 0 ].packet_count.should == 10
+          message.stats[ 0 ].flow_count.should == 1
+          message.stats[ 0 ].should respond_to :to_s
         end
         match = Match.new( :dl_type =>0x800, :nw_proto => 17 )
         controller( "AggregateStatsController" ).send_message( 0xabc,
@@ -254,10 +298,11 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         send_packets "host1", "host2"
         sleep 2 # FIXME: wait to send_packets
         
-        controller( "PortStatsController" ).should_receive( :stats_reply ) do | message |
+        controller( "PortStatsController" ).should_receive( :stats_reply ) do | datapath_id, message |
+          datapath_id.should == 0xabc
           message.type.should == 4
-          message.stats[0].should be_an_instance_of(Trema::PortStatsReply)
-          message.stats[0].should respond_to :to_s
+          message.stats[ 0 ].should be_an_instance_of(Trema::PortStatsReply)
+          message.stats[ 0 ].should respond_to :to_s
         end
         controller( "PortStatsController" ).send_message( 0xabc,
           PortStatsRequest.new( :port_no => 1 ) )
@@ -284,11 +329,12 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         send_packets "host1", "host2"
         sleep 2 # FIXME: wait to send_packets
         
-        controller( "TableStatsController" ).should_receive( :stats_reply ) do | message |
+        controller( "TableStatsController" ).should_receive( :stats_reply ) do | datapath_id, message |
+          datapath_id.should == 0xabc
           message.type.should == 3
           message.transaction_id.should == 123
-          message.stats[0].should be_an_instance_of(Trema::TableStatsReply)
-          message.stats[0].should respond_to :to_s
+          message.stats[ 0 ].should be_an_instance_of(Trema::TableStatsReply)
+          message.stats[ 0 ].should respond_to :to_s
         end
         controller( "TableStatsController" ).send_message( 0xabc,
           TableStatsRequest.new( :transaction_id => 123 ) )

data/spec/trema/stats-request_spec.rb

@@ -29,6 +29,12 @@ end
 
 
 describe StatsRequest do
+  context "when .DescStatsRequest.new( VALID OPTIONS )" do
+    subject { DescStatsRequest.new }
+    it_should_behave_like "any stats-request"
+  end
+
+
   context "when .FlowStatsRequest.new( MANDATORY OPTION MISSING )" do
     subject { FlowStatsRequest.new }
     it "should raise ArgumentError" do

data/spec/trema/{action-strip-vlan_spec.rb → strip-vlan-header_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,28 +20,16 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe ActionStripVlan, ".new" do
+describe StripVlanHeader, ".new" do
   context "when sending #flow_mod(add) with action set to strip_vlan" do
-    it "should respond to #append" do
-      class FlowModAddController < Controller; end
-      network {
-        vswitch { datapath_id 0xabc }
-      }.run( FlowModAddController ) {
-        action = ActionStripVlan.new
-        action.should_receive( :append )
-        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => action )
-      }
-    end
-
-
     it "should have a flow with action set to strip_vlan" do
       class FlowModAddController < Controller; end
       network {
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
-        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => ActionStripVlan.new( ) )
+        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => StripVlanHeader.new )
         vswitch( "0xabc" ).should have( 1 ).flows
-        vswitch( "0xabc" ).flows[0].actions.should match( /strip_vlan/ )
+        vswitch( "0xabc" ).flows[ 0 ].actions.should match( /strip_vlan/ )
       }
     end
   end

data/spec/trema/switch-daemon_spec.rb

@@ -0,0 +1,39 @@
+#
+# 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/switch-daemon"
+
+
+module Trema
+  describe SwitchDaemon do
+    it "should be initialized with proper options" do
+      rule = { :port_status => "topology", :packet_in => "controller", :state_notify => "topology", :vendor => "controller" }
+      switch_daemon = SwitchDaemon.new( rule )
+
+      switch_daemon.options.should == [ "port_status::topology", "packet_in::controller", "state_notify::topology", "vendor::controller" ]
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End: