trema 0.3.4 → 0.3.5

data/ruby/trema/barrier-reply.c

@@ -70,6 +70,7 @@ barrier_reply_transaction_id( VALUE self ) {
 
 void
 Init_barrier_reply() {
+  mTrema = rb_define_module( "Trema" );
   cBarrierReply = rb_define_class_under( mTrema, "BarrierReply", rb_cObject );
   rb_define_method( cBarrierReply, "initialize", barrier_reply_init, 2 );
   rb_define_method( cBarrierReply, "datapath_id", barrier_reply_datapath_id, 0 );

data/ruby/trema/barrier-request.c

@@ -118,6 +118,7 @@ barrier_request_transaction_id( VALUE self ) {
 
 void
 Init_barrier_request() {
+  mTrema = rb_define_module( "Trema" );
   cBarrierRequest = rb_define_class_under( mTrema, "BarrierRequest", rb_cObject );
   rb_define_alloc_func( cBarrierRequest, barrier_request_alloc );
   rb_define_method( cBarrierRequest, "initialize", barrier_request_init, -1 );

data/ruby/trema/controller.c

@@ -641,6 +641,7 @@ Init_controller() {
   rb_require( "trema/app" );
 
   VALUE cApp = rb_eval_string( "Trema::App" );
+  mTrema = rb_define_module( "Trema" );
   cController = rb_define_class_under( mTrema, "Controller", cApp );
 
   rb_define_const( cController, "OFPP_MAX", INT2NUM( OFPP_MAX ) );

data/ruby/trema/echo-reply.c

@@ -104,6 +104,7 @@ echo_user_data( VALUE self ) {}
 
 void
 Init_echo_reply() {
+  mTrema = rb_define_module( "Trema" );
   cEchoReply = rb_define_class_under( mTrema, "EchoReply", rb_cObject );
   rb_define_alloc_func( cEchoReply, echo_reply_alloc );
   rb_define_method( cEchoReply, "initialize", echo_init, -1 );

data/ruby/trema/echo-request.c

@@ -99,6 +99,7 @@ echo_user_data( VALUE self ) {}
 
 void
 Init_echo_request() {
+  mTrema = rb_define_module( "Trema" );
   cEchoRequest = rb_define_class_under( mTrema, "EchoRequest", rb_cObject );
   rb_define_alloc_func( cEchoRequest, echo_request_alloc );
   rb_define_method( cEchoRequest, "initialize", echo_init, -1 );

data/ruby/trema/error.c

@@ -195,6 +195,7 @@ error_code( VALUE self ) {
 
 void
 Init_error() {
+  mTrema = rb_define_module( "Trema" );
   rb_define_const( mTrema, "OFPET_HELLO_FAILED", INT2NUM( OFPET_HELLO_FAILED ) );
   rb_define_const( mTrema, "OFPHFC_INCOMPATIBLE", INT2NUM( OFPHFC_INCOMPATIBLE ) );
   rb_define_const( mTrema, "OFPHFC_EPERM", INT2NUM( OFPHFC_EPERM ) );

data/ruby/trema/features-reply.c

@@ -215,6 +215,7 @@ features_reply_ports( VALUE self ) {
 
 void
 Init_features_reply() {
+  mTrema = rb_define_module( "Trema" );
   cFeaturesReply = rb_define_class_under( mTrema, "FeaturesReply", rb_cObject );
   rb_define_alloc_func( cFeaturesReply, features_reply_alloc );
   rb_define_method( cFeaturesReply, "initialize", features_reply_init, 1 );

data/ruby/trema/features-request.c

@@ -117,6 +117,7 @@ features_request_transaction_id( VALUE self ) {
 
 void
 Init_features_request() {
+  mTrema = rb_define_module( "Trema" );
   cFeaturesRequest = rb_define_class_under( mTrema, "FeaturesRequest", rb_cObject );
   rb_define_alloc_func( cFeaturesRequest, features_request_alloc );
   rb_define_method( cFeaturesRequest, "initialize", features_request_init, -1 );

data/ruby/trema/flow-mod.c

@@ -130,6 +130,7 @@ flow_mod_hard_timeout( VALUE self ) {
 
 void
 Init_flow_mod() {
+  mTrema = rb_define_module( "Trema" );
   cFlowMod = rb_define_class_under( mTrema, "FlowMod", rb_cObject );
   rb_define_alloc_func( cFlowMod, flow_mod_alloc );
   rb_define_method( cFlowMod, "initialize", flow_mod_init, -1 );

data/ruby/trema/flow-removed.c

@@ -222,6 +222,7 @@ flow_removed_byte_count( VALUE self ) {
 
 void
 Init_flow_removed() {
+  mTrema = rb_define_module( "Trema" );
   cFlowRemoved = rb_define_class_under( mTrema, "FlowRemoved", rb_cObject );
   rb_define_const( cFlowRemoved, "OFPRR_IDLE_TIMEOUT", INT2NUM( OFPRR_IDLE_TIMEOUT ) );
   rb_define_const( cFlowRemoved, "OFPRR_HARD_TIMEOUT", INT2NUM( OFPRR_HARD_TIMEOUT ) );

data/ruby/trema/get-config-reply.c

@@ -113,6 +113,7 @@ get_config_reply_miss_send_len( VALUE self ) {
 
 void
 Init_get_config_reply() {
+  mTrema = rb_define_module( "Trema" );
   cGetConfigReply = rb_define_class_under( mTrema, "GetConfigReply", rb_cObject );
   rb_define_method( cGetConfigReply, "initialize", get_config_reply_init, 1 );
   rb_define_method( cGetConfigReply, "datapath_id", get_config_reply_datapath_id, 0 );

data/ruby/trema/get-config-request.c

@@ -119,6 +119,7 @@ get_config_request_transaction_id( VALUE self ) {
 
 void
 Init_get_config_request() {
+  mTrema = rb_define_module( "Trema" );
   cGetConfigRequest = rb_define_class_under( mTrema, "GetConfigRequest", rb_cObject );
   rb_define_alloc_func( cGetConfigRequest, get_config_request_alloc );
   rb_define_method( cGetConfigRequest, "initialize", get_config_request_init, -1 );

data/ruby/trema/hello.c

@@ -116,6 +116,7 @@ hello_transaction_id( VALUE self ) {
 
 void
 Init_hello() {
+  mTrema = rb_define_module( "Trema" );
   cHello = rb_define_class_under( mTrema, "Hello", rb_cObject );
   rb_define_alloc_func( cHello, hello_alloc );
   rb_define_method( cHello, "initialize", hello_init, -1 );

data/ruby/trema/logger.c

@@ -143,6 +143,7 @@ logger_debug( int argc, VALUE *argv, VALUE self ) {
 
 void
 Init_logger() {
+  mTrema = rb_define_module( "Trema" );
   mLogger = rb_define_module_under( mTrema, "Logger" );
 
   rb_define_method( mLogger, "critical", logger_critical, -1 );

data/ruby/trema/match.c

@@ -562,6 +562,7 @@ match_init( int argc, VALUE *argv, VALUE self ) {
 
 void
 Init_match() {
+  mTrema = rb_define_module( "Trema" );
   cMatch = rb_define_class_under( mTrema, "Match", rb_cObject );
   rb_define_alloc_func( cMatch, match_alloc );
   rb_define_const( cMatch, "OFPFW_IN_PORT", INT2NUM( OFPFW_IN_PORT ) );

data/ruby/trema/openflow-error.c

@@ -127,6 +127,7 @@ openflow_error_data( VALUE self ) {
 
 void
 Init_openflow_error() {
+  mTrema = rb_define_module( "Trema" );
   cOpenflowError = rb_define_class_under( mTrema, "OpenflowError", rb_cObject );
   rb_define_method( cOpenflowError, "initialize", openflow_error_init, 1 );
   rb_define_method( cOpenflowError, "datapath_id", openflow_error_datapath_id, 0 );

data/ruby/trema/packet-in.c

@@ -1080,6 +1080,7 @@ void
 Init_packet_in() {
   rb_require( "trema/ip" );
   rb_require( "trema/mac" );
+  mTrema = rb_define_module( "Trema" );
   cPacketIn = rb_define_class_under( mTrema, "PacketIn", rb_cObject );
   rb_define_alloc_func( cPacketIn, packet_in_alloc );
 

data/ruby/trema/port-mod.c

@@ -205,6 +205,7 @@ port_mod_advertise( VALUE self ) {
 
 void
 Init_port_mod() {
+  mTrema = rb_define_module( "Trema" );
   cPortMod = rb_define_class_under( mTrema, "PortMod", rb_cObject );
   rb_define_alloc_func( cPortMod, port_mod_alloc );
   rb_define_method( cPortMod, "initialize", port_mod_init, -1 );

data/ruby/trema/port-status.c

@@ -122,6 +122,7 @@ port_status_phy_port( VALUE self ) {
 
 void
 Init_port_status() {
+  mTrema = rb_define_module( "Trema" );
   cPortStatus = rb_define_class_under( mTrema, "PortStatus", rb_cObject );
 
   rb_define_const( cPortStatus, "OFPPR_ADD", INT2NUM( OFPPR_ADD ) );

data/ruby/trema/port.c

@@ -300,6 +300,7 @@ port_compare( VALUE self, VALUE other ) {
 
 void
 Init_port() {
+  mTrema = rb_define_module( "Trema" );
   cPort = rb_define_class_under( mTrema, "Port", rb_cObject );
 
   rb_define_const( cPort, "OFPPC_PORT_DOWN", INT2NUM( OFPPC_PORT_DOWN ) );

data/ruby/trema/queue-get-config-reply.c

@@ -112,6 +112,7 @@ queue_get_config_reply_queues( VALUE self ) {
 void
 Init_queue_get_config_reply() {
   rb_require( "trema/packet-queue" );
+  mTrema = rb_define_module( "Trema" );
   cQueueGetConfigReply = rb_define_class_under( mTrema, "QueueGetConfigReply", rb_cObject );
   rb_define_method( cQueueGetConfigReply, "initialize", queue_get_config_reply_init, 1 );
   rb_define_method( cQueueGetConfigReply, "datapath_id", queue_get_config_reply_datapath_id, 0 );

data/ruby/trema/queue-get-config-request.c

@@ -125,6 +125,7 @@ queue_get_config_request_port( VALUE self ) {
 
 void
 Init_queue_get_config_request() {
+  mTrema = rb_define_module( "Trema" );
   cQueueGetConfigRequest = rb_define_class_under( mTrema, "QueueGetConfigRequest", rb_cObject );
   rb_define_alloc_func( cQueueGetConfigRequest, queue_get_config_request_alloc );
   rb_define_method( cQueueGetConfigRequest, "initialize", queue_get_config_request_init, -1 );

data/ruby/trema/send-out-port.rb

@@ -75,7 +75,7 @@ module Trema
 
 
     def to_s
-      "SendOutPort: port_number=#{ @port_number }, max_len=#{ @max_len }"
+      "#{ self.class.to_s }: port_number=#{ @port_number }, max_len=#{ @max_len }"
     end
 
 

data/ruby/trema/set-config.c

@@ -147,6 +147,7 @@ set_config_miss_send_len( VALUE self ) {
 
 void
 Init_set_config() {
+  mTrema = rb_define_module( "Trema" );
   cSetConfig = rb_define_class_under( mTrema, "SetConfig", rb_cObject );
   rb_define_alloc_func( cSetConfig, set_config_alloc );
   rb_define_const( cSetConfig, "OFPC_FRAG_NORMAL", INT2NUM( OFPC_FRAG_NORMAL ) );

data/ruby/trema/set-eth-addr.rb

@@ -38,6 +38,11 @@ module Trema
     def initialize mac_address
       @mac_address = Mac.new( mac_address )
     end
+
+
+    def to_s
+      "#{ self.class.to_s }: mac_address=#{ @mac_address }"
+    end
   end
 end
 

data/ruby/trema/set-eth-dst-addr.rb

@@ -27,6 +27,8 @@ module Trema
     #
     # Creates an action to modify the destination Ethernet address of a packet.
     #
+    # @overload initialize(mac_address)
+    #
     # @example
     #   SetEthDstAddr.new("11:22:33:44:55:66")
     #   SetEthDstAddr.new(0x112233445566)
@@ -38,14 +40,6 @@ module Trema
     # @raise [ArgumentError] if invalid format is detected.
     # @raise [TypeError] if supplied argument is not a String or Integer or Mac.
     #
-    def initialize mac_address
-      super mac_address
-    end
-
-
-    def to_s
-      "SetEthDstAddr: mac_address=#{ @mac_address }"
-    end
   end
 
 

data/ruby/trema/set-eth-src-addr.rb

@@ -27,6 +27,8 @@ module Trema
     #
     # Creates an action to modify the source Ethernet address of a packet.
     #
+    # @overload initialize(mac_address)
+    #
     # @example
     #   SetEthSrcAddr.new("11:22:33:44:55:66")
     #   SetEthSrcAddr.new(0x112233445566)
@@ -38,14 +40,6 @@ module Trema
     # @raise [ArgumentError] if invalid format is detected.
     # @raise [TypeError] if supplied argument is not a String or Integer or Mac.
     #
-    def initialize mac_address
-      super mac_address
-    end
-
-
-    def to_s
-      "SetEthSrcAddr: mac_address=#{ @mac_address }"
-    end
   end
 
 

data/ruby/trema/stats-reply.c

@@ -148,6 +148,7 @@ Init_stats_reply() {
   rb_require( "trema/port-stats-reply" );
   rb_require( "trema/queue-stats-reply" );
   rb_require( "trema/vendor-stats-reply" );
+  mTrema = rb_define_module( "Trema" );
   cStatsReply = rb_define_class_under( mTrema, "StatsReply", rb_cObject );
   rb_define_const( cStatsReply, "OFPST_DESC", INT2NUM( OFPST_DESC ) );
   rb_define_const( cStatsReply, "OFPST_FLOW", INT2NUM( OFPST_FLOW ) );

data/ruby/trema/stats-request.c

@@ -618,6 +618,7 @@ vendor_stats_request_init( int argc, VALUE *argv, VALUE self ) {
 
 void
 Init_stats_request() {
+  mTrema = rb_define_module( "Trema" );
   cStatsRequest = rb_define_class_under( mTrema, "StatsRequest", rb_cObject );
 
   cDescStatsRequest = rb_define_class_under( mTrema, "DescStatsRequest", cStatsRequest );

data/ruby/trema/switch.c

@@ -178,6 +178,7 @@ switch_start_chibach( VALUE self ) {
 
 void
 Init_switch() {
+  mTrema = rb_define_module( "Trema" );
   cSwitch = rb_define_class_under( mTrema, "Switch", rb_cObject );
   rb_include_module( cSwitch, mLogger );
 

data/ruby/trema/vendor.c

@@ -177,6 +177,7 @@ vendor_data( VALUE self ) {
 
 void
 Init_vendor() {
+  mTrema = rb_define_module( "Trema" );
   cVendor = rb_define_class_under( mTrema, "Vendor", rb_cObject );
   rb_define_alloc_func( cVendor, vendor_alloc );
   rb_define_method( cVendor, "initialize", vendor_init, -1 );

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end
 
 

data/spec/trema/send-out-port_spec.rb

@@ -30,7 +30,7 @@ describe SendOutPort, :type => "actions" do
 
       its( :port_number ) { should eq( 1 ) }
       its( :max_len ) { should eq( 2 ** 16 - 1 ) }
-      its( :to_s ) { should eq( "SendOutPort: port_number=1, max_len=65535" ) }
+      its( :to_s ) { should eq( "Trema::SendOutPort: port_number=1, max_len=65535" ) }
     end
 
 
@@ -47,6 +47,12 @@ describe SendOutPort, :type => "actions" do
             sleep 2
             expect( vswitch( "0xabc" ) ).to have( 1 ).flows
             expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to eq( "output:10" )
+            pending( "Test actions as an object using Trema::Switch" ) do
+              expect( vswitch( "0xabc" ) ).to have( 1 ).flows
+              expect( vswitch( "0xabc" ).flows[ 0 ] ).to have( 1 ).actions
+              expect( vswitch( "0xabc" ).flows[ 0 ].actions[ 0 ] ).to be_a( SendOutPort )
+              expect( vswitch( "0xabc" ).flows[ 0 ].actions[ 0 ].port_number ).to eq( 10 )
+            end
           }
         end
       end
@@ -66,7 +72,7 @@ describe SendOutPort, :type => "actions" do
 
       its( :port_number ) { should eq( 1 ) }
       its( :max_len ) { should eq( 2 ** 16 - 1 ) }
-      its( :to_s ) { should eq( "SendOutPort: port_number=1, max_len=65535" ) }
+      its( :to_s ) { should eq( "Trema::SendOutPort: port_number=1, max_len=65535" ) }
     end
   end
 
@@ -80,7 +86,7 @@ describe SendOutPort, :type => "actions" do
 
       its( :port_number ) { should eq( 1 ) }
       its( :max_len ) { should eq( 256 ) }
-      its( :to_s ) { should eq( "SendOutPort: port_number=1, max_len=256" ) }
+      its( :to_s ) { should eq( "Trema::SendOutPort: port_number=1, max_len=256" ) }
     end
 
 

data/spec/trema/set-eth-addr_spec.rb

@@ -0,0 +1,100 @@
+#
+# 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"
+
+
+[ SetEthSrcAddr, SetEthDstAddr ].each do | klass |
+  describe klass, "#new(mac_address)", :type => "actions" do
+    subject { klass.new( mac_address ) }
+
+
+    context "with mac_address (52:54:00:a8:ad:8c)" do
+      let( :mac_address ) { "52:54:00:a8:ad:8c" }
+
+      its( "mac_address.to_s" ) { should eq( "52:54:00:a8:ad:8c" ) }
+      its( :to_s ) { should eq( "#{ klass.to_s }: mac_address=52:54:00:a8:ad:8c" ) }
+    end
+
+
+    context "with mac_address (11:22:33:44:55:66)" do
+      let( :mac_address ) { "11:22:33:44:55:66" }
+
+      context "when set as FlowMod's action", :sudo => true do
+        it "should insert a new flow with action (mod_dl_{src,dst}:11:22:33:44:55:66)" do
+          class TestController < Controller; end
+          network {
+            vswitch { datapath_id 0xabc }
+          }.run( TestController ) {
+            controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
+            sleep 2
+            expect( vswitch( "0xabc" ) ).to have( 1 ).flows
+            expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to match( /mod_dl_(src|dst):11:22:33:44:55:66/ )
+            pending( "Test actions as an object using Trema::Switch" ) do
+              expect( vswitch( "0xabc" ) ).to have( 1 ).flows
+              expect( vswitch( "0xabc" ).flows[ 0 ] ).to have( 1 ).actions
+              expect( vswitch( "0xabc" ).flows[ 0 ].actions[ 0 ] ).to be_a( klass )
+              expect( vswitch( "0xabc" ).flows[ 0 ].actions[ 0 ].mac_address.to_s ).to eq( "11:22:33:44:55:66" )
+            end
+          }
+        end
+      end
+    end
+
+
+    context %q{with mac_address (Mac.new("52:54:00:a8:ad:8c"))} do
+      let( :mac_address ) { Mac.new("52:54:00:a8:ad:8c") }
+
+      its( "mac_address.to_s" ) { should eq( "52:54:00:a8:ad:8c" ) }
+      its( :to_s ) { should eq( "#{ klass.to_s }: mac_address=52:54:00:a8:ad:8c" ) }
+    end
+
+
+    context "with mac_address (0x525400a8ad8c)" do
+      let( :mac_address ) { 0x525400a8ad8c }
+
+      its( "mac_address.to_s" ) { should eq( "52:54:00:a8:ad:8c" ) }
+      its( :to_s ) { should eq( "#{ klass.to_s }: mac_address=52:54:00:a8:ad:8c" ) }
+    end
+
+
+    context %q{with invalid mac_address ("INVALID MAC STRING")} do
+      let( :mac_address ) { "INVALID MAC STRING" }
+
+      it { expect { subject }.to raise_error( ArgumentError ) }
+    end
+
+
+    context "with invalid mac_address ([1, 2, 3])" do
+      let( :mac_address ) { [ 1, 2, 3 ] }
+
+      it { expect { subject }.to raise_error( TypeError ) }
+    end
+
+
+    it_validates "option is within range", :mac_address, 0..0xffffffffffff
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/trema.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do | s |
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "rake"
   s.add_runtime_dependency "gli", "~> 2.5.2"
+  s.add_runtime_dependency "rdoc", "~> 3.12"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rdoc"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -49,8 +49,23 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+  name: rdoc
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 3
+        - 12
+        version: "3.12"
+  requirement: *id003
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +74,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  requirement: *id004
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rdoc
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  requirement: *id005
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: aruba
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,7 +102,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id006
   type: :development
 description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C
 email: 
@@ -380,8 +395,7 @@ files:
 - spec/trema/queue-get-config-request_spec.rb
 - spec/trema/send-out-port_spec.rb
 - spec/trema/set-config_spec.rb
-- spec/trema/set-eth-dst-addr_spec.rb
-- spec/trema/set-eth-src-addr_spec.rb
+- spec/trema/set-eth-addr_spec.rb
 - spec/trema/set-ip-dst-addr_spec.rb
 - spec/trema/set-ip-src-addr_spec.rb
 - spec/trema/set-ip-tos_spec.rb

data/spec/trema/set-eth-dst-addr_spec.rb

@@ -1,78 +0,0 @@
-#
-# 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 SetEthDstAddr, ".new( mac_address )", :type => "actions" do
-  subject { SetEthDstAddr.new( mac_address ) }
-
-  context "with mac_address (52:54:00:a8:ad:8c)" do
-    let( :mac_address ) { "52:54:00:a8:ad:8c" }
-    its( "mac_address.to_s" ) { should == "52:54:00:a8:ad:8c" }
-    its( :to_s ) { should == "SetEthDstAddr: mac_address=52:54:00:a8:ad:8c" }
-  end
-
-  context %q{with mac_address (Mac.new("52:54:00:a8:ad:8c"))} do
-    let( :mac_address ) { Mac.new("52:54:00:a8:ad:8c") }
-    its( "mac_address.to_s" ) { should == "52:54:00:a8:ad:8c" }
-    its( :to_s ) { should == "SetEthDstAddr: mac_address=52:54:00:a8:ad:8c" }
-  end
-
-  context "with mac_address (0x525400a8ad8c)" do
-    let( :mac_address ) { 0x525400a8ad8c }
-    its( "mac_address.to_s" ) { should == "52:54:00:a8:ad:8c" }
-    its( :to_s ) { should == "SetEthDstAddr: mac_address=52:54:00:a8:ad:8c" }
-  end
-
-  context %q{with invalid mac_address ("INVALID MAC STRING")} do
-    let( :mac_address ) { "INVALID MAC STRING" }
-    it { expect { subject }.to raise_error( ArgumentError ) }
-  end
-
-  context "with invalid mac_address ([1, 2, 3])" do
-    let( :mac_address ) { [ 1, 2, 3 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
-  end
-
-  it_validates "option is within range", :mac_address, 0..0xffffffffffff
-
-  context "when sending a Flow Mod with action set to SetEthDstAddr" do
-    let( :mac_address ) { "52:54:00:a8:ad:8c" }
-
-    it "should insert a new flow with action set to mod_dl_dst" do
-      class TestController < Controller; end
-      network {
-        vswitch { datapath_id 0xabc }
-      }.run( TestController ) {
-        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
-        sleep 2
-        expect( vswitch( "0xabc" ) ).to have( 1 ).flows
-        expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to eq( "mod_dl_dst:52:54:00:a8:ad:8c" )
-      }
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/spec/trema/set-eth-src-addr_spec.rb

@@ -1,78 +0,0 @@
-#
-# 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 SetEthSrcAddr, ".new( mac_address )", :type => "actions" do
-  subject { SetEthSrcAddr.new( mac_address ) }
-
-  context "with mac_address (52:54:00:a8:ad:8c)" do
-    let( :mac_address ) { "52:54:00:a8:ad:8c" }
-    its( "mac_address.to_s" ) { should == "52:54:00:a8:ad:8c" }
-    its( :to_s ) { should == "SetEthSrcAddr: mac_address=52:54:00:a8:ad:8c" }
-  end
-
-  context %q{with mac_address (Mac.new("52:54:00:a8:ad:8c"))} do
-    let( :mac_address ) { Mac.new("52:54:00:a8:ad:8c") }
-    its( "mac_address.to_s" ) { should == "52:54:00:a8:ad:8c" }
-    its( :to_s ) { should == "SetEthSrcAddr: mac_address=52:54:00:a8:ad:8c" }
-  end
-
-  context "with mac_address (0x525400a8ad8c)" do
-    let( :mac_address ) { 0x525400a8ad8c }
-    its( "mac_address.to_s" ) { should == "52:54:00:a8:ad:8c" }
-    its( :to_s ) { should == "SetEthSrcAddr: mac_address=52:54:00:a8:ad:8c" }
-  end
-
-  context %q{with invalid mac_address ("INVALID MAC STRING")} do
-    let( :mac_address ) { "INVALID MAC STRING" }
-    it { expect { subject }.to raise_error( ArgumentError ) }
-  end
-
-  context "with invalid mac_address ([1, 2, 3])" do
-    let( :mac_address ) { [ 1, 2, 3 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
-  end
-
-  it_validates "option is within range", :mac_address, 0..0xffffffffffff
-
-  context "when sending a Flow Mod with action set to SetEthSrcAddr" do
-    let( :mac_address ) { "52:54:00:a8:ad:8c" }
-
-    it "should insert a new flow with action set to mod_dl_src" do
-      class TestController < Controller; end
-      network {
-        vswitch { datapath_id 0xabc }
-      }.run( TestController ) {
-        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
-        sleep 2
-        expect( vswitch( "0xabc" ) ).to have( 1 ).flows
-        expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to eq( "mod_dl_src:52:54:00:a8:ad:8c" )
-      }
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End: