trema 0.2.2.1 → 0.2.3

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, 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 = 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" }
 end
 
 

data/spec/trema/open-vswitch_spec.rb

@@ -23,13 +23,13 @@ require "trema/open-vswitch"
 
 
 module Trema
-  describe Switch do
+  describe OpenflowSwitch do
     around do | example |
       begin
-        Switch.clear
+        OpenflowSwitch.clear
         example.run
       ensure
-        Switch.clear
+        OpenflowSwitch.clear
       end
     end
 
@@ -38,10 +38,10 @@ module Trema
       OpenVswitch.new mock( "stanza 1", :name => "vswitch 1", :validate => true )
       OpenVswitch.new mock( "stanza 2", :name => "vswitch 2", :validate => true )
 
-      Switch.should have( 3 ).vswitches
-      Switch[ "vswitch 0" ].should_not be_nil
-      Switch[ "vswitch 1" ].should_not be_nil
-      Switch[ "vswitch 2" ].should_not be_nil
+      OpenflowSwitch.should have( 3 ).vswitches
+      OpenflowSwitch[ "vswitch 0" ].should_not be_nil
+      OpenflowSwitch[ "vswitch 1" ].should_not be_nil
+      OpenflowSwitch[ "vswitch 2" ].should_not be_nil
     end
   end
 

data/spec/trema/packet-in_spec.rb

@@ -27,11 +27,11 @@ describe Trema::PacketIn do
     send_packets "host1", "host2"
     sleep 2
   end
-  
-  
+
+
   class PacketInController < Controller; end
 
-  class PacketInSendController < Controller 
+  class PacketInSendController < Controller
     def packet_in datapath_id, message
       send_flow_mod_add(
                         datapath_id,
@@ -45,7 +45,7 @@ describe Trema::PacketIn do
                       )
     end
   end
-  
+
   context "when instance is created" do
     it "should have valid datapath_id and in_port" do
       network {
@@ -55,7 +55,7 @@ describe Trema::PacketIn do
         link "test", "host1"
         link "test", "host2"
       }.run( PacketInController ) {
-        controller( "PacketInController" ).should_receive( :packet_in ) do | datapath_id, message | 
+        controller( "PacketInController" ).should_receive( :packet_in ) do | datapath_id, message |
           datapath_id.should == 0xabc
           message.datapath_id.should == 0xabc
           message.in_port.should > 0
@@ -63,19 +63,19 @@ describe Trema::PacketIn do
         send_and_wait
       }
     end
-    
-    
+
+
     it "should have vaild user data" do
       network {
         vswitch( "test" ) { datapath_id 0xabc }
-        vhost( "host1" ) { mac "00:00:00:00:00:01" 
+        vhost( "host1" ) { mac "00:00:00:00:00:01"
                            ip "192.168.1.1" }
-        vhost( "host2" ) { mac "00:00:00:00:00:02" 
+        vhost( "host2" ) { mac "00:00:00:00:00:02"
                            ip "192.168.1.2" }
         link "test", "host1"
         link "test", "host2"
       }.run( PacketInController ) {
-        controller( "PacketInController" ).should_receive( :packet_in ) do | datapath_id, message | 
+        controller( "PacketInController" ).should_receive( :packet_in ) do | datapath_id, message |
            # packet_in expected to have data portion.
           message.total_len.should > 20
           message.data.should be_instance_of( String )
@@ -129,7 +129,7 @@ describe Trema::PacketIn do
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00
         ].pack( "C*" )
-        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message | 
+        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message |
           message.in_port.should > 0
           message.vtag?.should be_false
           message.arp?.should be_true
@@ -144,6 +144,52 @@ describe Trema::PacketIn do
           message.arp_spa.to_s.should == "192.168.0.1"
           message.arp_tha.to_s.should == "00:00:00:00:00:02"
           message.arp_tpa.to_s.should == "192.168.0.2"
+          message.arp_request?.should be_false
+          message.arp_reply?.should be_true
+
+          message.vlan_tpid.should be_nil
+          message.vlan_tci.should be_nil
+          message.vlan_prio.should be_nil
+          message.vlan_cfi.should be_nil
+          message.vlan_vid.should be_nil
+
+          message.ipv4_version.should be_nil
+          message.ipv4_ihl.should be_nil
+          message.ipv4_tos.should be_nil
+          message.ipv4_tot_len.should be_nil
+          message.ipv4_id.should be_nil
+          message.ipv4_frag_off.should be_nil
+          message.ipv4_ttl.should be_nil
+          message.ipv4_protocol.should be_nil
+          message.ipv4_checksum.should be_nil
+          message.ipv4_saddr.should be_nil
+          message.ipv4_daddr.should be_nil
+
+          message.icmpv4_type.should be_nil
+          message.icmpv4_code.should be_nil
+          message.icmpv4_checksum.should be_nil
+          message.icmpv4_id.should be_nil
+          message.icmpv4_seq.should be_nil
+          message.icmpv4_gateway.should be_nil
+
+          message.igmp_type.should be_nil
+          message.igmp_checksum.should be_nil
+          message.igmp_group.should be_nil
+
+          message.tcp_src_port.should be_nil
+          message.tcp_dst_port.should be_nil
+          message.tcp_seq_no.should be_nil
+          message.tcp_ack_no.should be_nil
+          message.tcp_offset.should be_nil
+          message.tcp_flags.should be_nil
+          message.tcp_window.should be_nil
+          message.tcp_checksum.should be_nil
+          message.tcp_urgent.should be_nil
+
+          message.udp_src_port.should be_nil
+          message.udp_dst_port.should be_nil
+          message.udp_checksum.should be_nil
+          message.udp_len.should be_nil
         end
 
         controller( "PacketInSendController" ).send_packet_out(
@@ -186,14 +232,14 @@ describe Trema::PacketIn do
           0x00, 0x02, # dst port
           0x00, 0x00, 0x00, 0x00, # sequence number
           0x00, 0x00, 0x00, 0x00, # acknowledgement number
-          0x50, # data offset, 
+          0x50, # data offset,
           0x00, # flags
           0x00, 0x00, # window size
           0x2e, 0x86, # checksum
           0x00, 0x00, # urgent pointer
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         ].pack( "C*" )
-        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message | 
+        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message |
           message.in_port.should > 0
           message.vtag?.should be_false
           message.arp?.should be_false
@@ -224,6 +270,12 @@ describe Trema::PacketIn do
           message.tcp_window.should == 0
           message.tcp_checksum.should == 11910 # 0x2e86
           message.tcp_urgent.should == 0
+
+          message.arp_oper.should be_nil
+          message.arp_sha.should be_nil
+          message.arp_spa.should be_nil
+          message.arp_tha.should be_nil
+          message.arp_tpa.should be_nil
         end
 
         controller( "PacketInSendController" ).send_packet_out(
@@ -270,7 +322,7 @@ describe Trema::PacketIn do
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
           0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         ].pack( "C*" )
-        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message | 
+        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message |
           message.in_port.should > 0
           message.vtag?.should be_false
           message.arp?.should be_false
@@ -347,7 +399,7 @@ describe Trema::PacketIn do
           0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x61,
           0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69
         ].pack( "C*" )
-        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message | 
+        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message |
           message.in_port.should > 0
           message.vtag?.should be_true
           message.arp?.should be_false
@@ -381,6 +433,11 @@ describe Trema::PacketIn do
           message.icmpv4_checksum.should == 0xe95b
           message.icmpv4_id.should == 0x0400
           message.icmpv4_seq.should == 0x6000
+
+          message.icmpv4_echo_reply?.should be_false
+          message.icmpv4_dst_unreach?.should be_false
+          message.icmpv4_redirect?.should be_false
+          message.icmpv4_echo_request?.should be_true
         end
 
         controller( "PacketInSendController" ).send_packet_out(
@@ -425,7 +482,7 @@ describe Trema::PacketIn do
           0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x61,
           0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69
         ].pack( "C*" )
-        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message | 
+        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message |
           message.in_port.should > 0
           message.vtag?.should be_false
           message.arp?.should be_false

data/spec/trema/port-status-add_spec.rb

@@ -0,0 +1,32 @@
+#
+# 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 Trema::PortStatusAdd do
+  it_should_behave_like "port status message", :klass => Trema::PortStatusAdd
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/port-status-delete_spec.rb

@@ -0,0 +1,32 @@
+#
+# 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 Trema::PortStatusDelete do
+  it_should_behave_like "port status message", :klass => Trema::PortStatusDelete
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/port-status-modify_spec.rb

@@ -0,0 +1,71 @@
+#
+# 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 Trema::PortStatusModify do
+  it_should_behave_like "port status message", :klass => Trema::PortStatusModify
+end
+
+
+module Trema
+  class PortStatusController < Controller
+    def features_reply dpid, message
+      message.ports.select( &:up? ).each do | each |
+        port_mod = PortMod.new(
+          :port_no => each.number,
+          :hw_addr => each.hw_addr,
+          :config => Port::OFPPC_PORT_DOWN,
+          :mask => Port::OFPPC_PORT_DOWN,
+          :advertise => 0
+        )
+        send_message dpid, port_mod
+      end
+    end
+  end
+
+
+  describe Controller do
+    context "when one port goes down" do
+      it "should receive port_status (modify)" do
+        network {
+          vswitch { datapath_id 0xabc }
+          vhost "host"
+          link "host", "0xabc"
+        }.run( PortStatusController ) {
+          controller( "PortStatusController" ).should_receive( :port_status ).with do | dpid, message |
+            dpid.should == 0xabc
+            message.should be_an_instance_of( PortStatusModify )
+          end
+
+          controller( "PortStatusController" ).send_message 0xabc, FeaturesRequest.new
+          sleep 2  # FIXME: wait to receive port_status
+        }
+      end
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/port-status_spec.rb

@@ -22,82 +22,11 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe Trema::PortStatus, ".new( VALID OPTIONS )" do
-  class PortStatusController < Controller
-    def features_reply message
-      ports = message.ports.select{ |each| each.config == 0 }.sort
-      if ports.length > 0 
-        port_mod = PortMod.new( 
-          :port_no => ports[0].number,
-          :hw_addr => ports[0].hw_addr, 
-          :config => 1, #config port down
-          :mask => 1, #mask
-          :advertise => 0
-        )
-        send_message message.datapath_id, port_mod
-      end
-    end
-  end
-
-
-  it "should have datapath_id" do
-    PortStatus.new( :datapath_id => 0xabc ).datapath_id.should == 0xabc
-  end
-
-
-  it "should have transaction_id" do
-    PortStatus.new( :transaction_id => 123 ).transaction_id.should == 123
-  end
-
-
-  it "should have reason" do
-    PortStatus.new( :reason => 2 ).reason.should == 2
-  end
-
-
-  it "should have phy_port" do
-    port = mock( "port" )
-    PortStatus.new( :phy_port => port ).phy_port.should == port
-  end
-
-
-  context "when #port_mod is sent" do
-    it "should #port_status" do
-      network {
-        vswitch("port-status") { datapath_id 0xabc }
-        vhost "host1"
-        vhost "host2"
-        link "host1", "port-status"
-        link "host2", "port-status"
-      }.run( PortStatusController ) {
-        controller( "PortStatusController" ).should_receive( :port_status )
-        controller( "PortStatusController" ).send_message( 0xabc, FeaturesRequest.new )
-        sleep 2 # FIXME: wait to receive port_status
-      }
-    end
-  end
-
-
-  context "when #port_mod(port#1,down) is sent" do
-    it "should #port_status(port#1,down)"  do
-      network {
-        vswitch( "port-status" ) { datapath_id 0xabc }
-        vhost "host1"
-        vhost "host2"
-        link "host1", "port-status"
-        link "host2", "port-status"
-      }.run( PortStatusController ) {
-        controller( "PortStatusController" ).send_message( 0xabc, FeaturesRequest.new )
-        controller( "PortStatusController" ).should_receive( :port_status ) do | message |
-          message.datapath_id.should == 0xabc
-          message.phy_port.number.should == 1
-          message.phy_port.config.should == 1
-          message.reason.should == 2
-        end
-        sleep 1 # FIXME: wait to receive port_status
-      }
-    end
-  end
+describe Trema::PortStatus do
+  subject { Trema::PortStatus }
+  its( :constants ) { should include "OFPPR_ADD" }
+  its( :constants ) { should include "OFPPR_DELETE" }
+  its( :constants ) { should include "OFPPR_MODIFY" }
 end