trema 0.2.2.1 → 0.2.3

data/spec/trema/vendor-action_spec.rb

@@ -0,0 +1,81 @@
+#
+# 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 VendorAction, "new( vendor_id )" do
+  subject { VendorAction.new vendor_id }
+
+  it_validates "option range", :vendor_id, 0..( 2 ** 32 - 1 )
+
+  context "when vendor_id == 0x00004cff" do
+    let( :vendor_id ) { 0x00004cff }
+    its( :vendor_id ) { should == 0x00004cff }
+  end
+end
+
+
+describe VendorAction, ".new( string )" do
+  it { expect { VendorAction.new "0x00004cff" }.to raise_error( TypeError ) }
+end
+
+
+describe VendorAction, ".new( array )" do
+  it { expect { VendorAction.new [ 1, 2, 3 ] }.to raise_error( TypeError ) }
+end
+
+
+describe VendorAction, ".new( vendor_id, body )" do
+  subject { VendorAction.new vendor_id, body }
+  let( :vendor_id ) { 0x00004cff }
+
+  context %{when body == "deadbeef".unpack( "C*" )} do
+    let( :body ) { "deadbeef".unpack( "C*" ) }
+
+    its( :vendor_id ) { should == 0x00004cff }
+    its( :body ) { should == [ 100, 101, 97, 100, 98, 101, 101, 102 ] }
+
+    context "when sending Flow Mod Add with action set to VendorAction" do
+      it "should have a flow with action set to VendorAction" do
+        class FlowModAddController < Controller; end
+        pending "Use Nicira's vendor ID and body"
+        network {
+          vswitch { datapath_id 0xabc }
+        }.run( FlowModAddController ) {
+          controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => VendorAction.new( 0x00004cff, "deadbeef".unpack( "C*" ) ) )
+          vswitch( "0xabc" ).should have( 1 ).flows
+          vswitch( "0xabc" ).flows[ 0 ].actions.should match( /mod_vendor/ )
+        }
+      end
+    end
+  end
+end
+
+
+describe VendorAction, "new( vendor_id, string )" do
+  it { expect { VendorAction.new 0x00004cff, "deadbeef" }.to raise_error( TypeError ) }
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/vendor_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"
+
+
+module Trema
+  describe Vendor, ".new" do
+    it_should_behave_like "any Openflow message with default transaction ID"
+    its ( :vendor ) { should == 0 }
+    its ( :data ) { should be_nil }
+  end
+
+
+  describe Vendor, ".new(nil)" do
+    it_should_behave_like "any Openflow message with default transaction ID"
+    its ( :vendor ) { should == 0 }
+    its ( :data ) { should be_nil }
+  end
+
+
+  describe Vendor, ".new(:transaction_id => value)" do
+    subject { Vendor.new( :transaction_id => transaction_id ) }
+    it_should_behave_like "any Openflow message with transaction ID"
+  end
+
+
+  describe Vendor, ".new(:xid => value)" do
+    subject { Vendor.new( :xid => xid ) }
+    it_should_behave_like "any Openflow message with xid"
+  end
+
+
+  describe Vendor, ".new(:vendor_id => value)", :nosudo => true do
+    subject { Vendor.new( :vendor => vendor ) }
+    let( :vendor ) { 0xdeadbeef }
+    its( :vendor ) { should == 0xdeadbeef }
+    its ( :data ) { should be_nil }
+  end
+
+
+  describe Vendor, ".new(:data => value)", :nosudo => true do
+    subject { Vendor.new( :data => data ) }
+    let( :data ) { "VENDOR DATA".unpack( "C*" ) }
+    its( :data ) { should == [86, 69, 78, 68, 79, 82, 32, 68, 65, 84, 65] }
+    its ( :vendor ) { should == 0 }
+  end
+
+
+  describe Vendor, '.new("INVALID OPTION")', :nosudo => true do
+    it { expect { Vendor.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_spec.rb

@@ -0,0 +1,56 @@
+#
+# Author: Yasuhito Takamiya <yasuhito@gmail.com>
+#
+# 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, ".constants" do
+  subject { Trema.constants }
+
+  it { should include "OFPC_FLOW_STATS" }
+  it { should include "OFPC_TABLE_STATS" }
+  it { should include "OFPC_PORT_STATS" }
+  it { should include "OFPC_STP" }
+  it { should include "OFPC_RESERVED" }
+  it { should include "OFPC_IP_REASM" }
+  it { should include "OFPC_QUEUE_STATS" }
+  it { should include "OFPC_ARP_MATCH_IP" }
+
+  it { should include "OFPAT_OUTPUT" }
+  it { should include "OFPAT_SET_VLAN_VID" }
+  it { should include "OFPAT_SET_VLAN_PCP" }
+  it { should include "OFPAT_STRIP_VLAN" }
+  it { should include "OFPAT_SET_DL_SRC" }
+  it { should include "OFPAT_SET_DL_DST" }
+  it { should include "OFPAT_SET_NW_SRC" }
+  it { should include "OFPAT_SET_NW_DST" }
+  it { should include "OFPAT_SET_NW_TOS" }
+  it { should include "OFPAT_SET_TP_DST" }
+  it { should include "OFPAT_ENQUEUE" }
+  it { should include "OFPAT_VENDOR" }
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/src/examples/dumper/dumper.c

@@ -102,16 +102,8 @@ static void
 handle_switch_ready( uint64_t datapath_id, void *user_data ) {
   UNUSED( user_data );
 
-  buffer *buffer;
-
   dump( "[switch_ready]" );
   dump( "datapath_id: %#" PRIx64, datapath_id );
-
-  buffer = create_features_request( get_transaction_id() );
-
-  send_openflow_message( datapath_id, buffer );
-
-  free_buffer( buffer );
 }
 
 

data/src/examples/dumper/dumper.rb

@@ -21,12 +21,60 @@
 
 
 class Dumper < Controller
+  def switch_ready datapath_id
+    info "[switch_ready]"
+    info "  datapath_id: #{ datapath_id.to_hex }"
+  end
+
+
   def switch_disconnected datapath_id
     info "[switch_disconnected]"
     info "  datapath_id: #{ datapath_id.to_hex }"
   end
 
 
+  def openflow_error message
+    info "[error]"
+    info "datapath_id: #{ message.datapath_id.to_hex }"
+    info "transaction_id: #{ message.transaction_id.to_hex }"
+    info "type: #{ message.type.to_hex }"
+    info "code: #{ message.code.to_hex }"
+    info "data: #{ message.data.unpack "H*" }"
+  end
+
+
+  def vendor message
+    info "[vendor]"
+    info "datapath_id: #{ message.datapath_id.to_hex }"
+    info "transaction_id: #{ message.transaction_id.to_hex }"
+    info "data:"
+    info "#{ message.buffer.unpack "H*" }"
+  end
+
+
+  def features_reply datapath_id, message
+    info "[features_reply]"
+    info "datapath_id: #{ datapath_id.to_hex }"
+    info "transaction_id: #{ message.transaction_id.to_hex }"
+    info "n_buffers: #{ message.n_buffers }"
+    info "n_tables: #{ message.n_tables }"
+    info "capabilities: #{ message.capabilities.to_hex }"
+    info "actions: #{ message.actions.to_hex }"
+    message.ports.each do | each |
+      dump_phy_port each
+    end
+  end
+
+
+  def get_config_reply message
+    info "[get_config_reply]"
+    info "datapath_id: #{ message.datapath_id.to_hex }"
+    info "transaction_id: #{ message.transaction_id.to_hex }"
+    info "flags: #{ message.flags.to_hex }"
+    info "miss_send_len: #{ message.miss_send_len }"
+  end
+
+
   def packet_in datapath_id, message
     info "[packet_in]"
     info "  datapath_id: #{ datapath_id.to_hex }"
@@ -70,18 +118,9 @@ class Dumper < Controller
   end
 
 
-  def get_config_reply message
-    info "[get_config_reply]"
-    info "datapath_id: #{ message.datapath_id.to_hex }"
-    info "transaction_id: #{ message.transaction_id.to_hex }"
-    info "flags: #{ message.flags.to_hex }"
-    info "miss_send_len: #{ message.miss_send_len }"
-  end
-
-
-  def port_status message
+  def port_status datapath_id, message
     info "[port_status]"
-    info "datapath_id: #{ message.datapath_id.to_hex }"
+    info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "reason: #{ message.reason.to_hex }"
     dump_phy_port message.phy_port
@@ -98,13 +137,10 @@ class Dumper < Controller
   end
 
 
-  def openflow_error message
-    info "[error]"
+  def barrier_reply message
+    info "[barrier_reply]"
     info "datapath_id: #{ message.datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
-    info "type: #{ message.type.to_hex }"
-    info "code: #{ message.code.to_hex }"
-    info "data: #{ message.data.unpack "H*" }"
   end
 
 
@@ -118,42 +154,6 @@ class Dumper < Controller
   end
 
 
-  def barrier_reply message
-    info "[barrier_reply]"
-    info "datapath_id: #{ message.datapath_id.to_hex }"
-    info "transaction_id: #{ message.transaction_id.to_hex }"
-  end
-
-
-  def features_reply message
-    info "[features_reply]"
-    info "datapath_id: #{ message.datapath_id.to_hex }"
-    info "transaction_id: #{ message.transaction_id.to_hex }"
-    info "n_buffers: #{ message.n_buffers }"
-    info "n_tables: #{ message.n_tables }"
-    info "capabilities: #{ message.capabilities.to_hex }"
-    info "actions: #{ message.actions.to_hex }"
-    message.ports.each do | each |
-      dump_phy_port each
-    end
-  end
-
-
-  def vendor message
-    info "[vendor]"
-    info "datapath_id: #{ message.datapath_id.to_hex }"
-    info "transaction_id: #{ message.transaction_id.to_hex }"
-    info "data:"
-    info message.buffer.unpack( "H*" )
-  end
-
-
-  def list_switches_reply dpids
-    info "[list_switches_reply]"
-    info "switches = %s" % dpids.collect { | each | each.to_hex }.join( ", " )
-  end
-
-
   ##############################################################################
   private
   ##############################################################################

data/src/examples/hello_trema/hello_trema.c

@@ -1,8 +1,6 @@
 /*
  * Hello trema world!
  *
- * Author: Yasuhito Takamiya <yasuhito@gmail.com>
- * 
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify

data/src/examples/learning_switch/learning-switch.rb

@@ -26,7 +26,7 @@ require "fdb"
 #
 # A OpenFlow controller class that emulates a layer-2 switch.
 #
-class LearningSwitch < Trema::Controller
+class LearningSwitch < Controller
   add_timer_event :age_fdb, 5, :periodic
 
 
@@ -61,7 +61,7 @@ class LearningSwitch < Trema::Controller
     send_flow_mod_add(
       datapath_id,
       :match => ExactMatch.from( message ),
-      :actions => Trema::ActionOutput.new( :port => port_no )
+      :actions => ActionOutput.new( :port => port_no )
     )
   end
 
@@ -70,7 +70,7 @@ class LearningSwitch < Trema::Controller
     send_packet_out(
       datapath_id,
       :packet_in => message,
-      :actions => Trema::ActionOutput.new( :port => port_no )
+      :actions => ActionOutput.new( :port => port_no )
     )
   end
 

data/src/examples/multi_learning_switch/multi-learning-switch.rb

@@ -29,7 +29,7 @@ require "fdb"
 #
 # A OpenFlow controller class that emulates multiple layer-2 switches.
 #
-class MultiLearningSwitch < Trema::Controller
+class MultiLearningSwitch < Controller
   add_timer_event :age_fdbs, 5, :periodic
 
 
@@ -69,7 +69,7 @@ class MultiLearningSwitch < Trema::Controller
     send_flow_mod_add(
       datapath_id,
       :match => ExactMatch.from( message ),
-      :actions => Trema::ActionOutput.new( :port => port_no )
+      :actions => ActionOutput.new( :port => port_no )
     )
   end
 
@@ -78,7 +78,7 @@ class MultiLearningSwitch < Trema::Controller
     send_packet_out(
       datapath_id,
       :packet_in => message,
-      :actions => Trema::ActionOutput.new( :port => port_no )
+      :actions => ActionOutput.new( :port => port_no )
     )
   end
 

data/src/examples/openflow_message/features-request.rb

@@ -27,12 +27,12 @@ class FeaturesRequestController < Controller
   end
 
 
-  def features_reply message
-    info "datapath_id: #{ message.datapath_id.to_hex }"
+  def features_reply datapath_id, message
+    info "datapath_id: #{ datapath_id.to_hex }"
     info "transaction_id: #{ message.transaction_id.to_hex }"
     info "n_buffers: #{ message.n_buffers }"
     info "n_tables: #{ message.n_tables }"
-    print_capabilities message.capabilities 
+    print_capabilities message.capabilities
     print_actions message.actions
     print_ports message.ports
   end