trema 0.3.2 → 0.3.3

data/Rakefile

@@ -54,8 +54,16 @@ begin
   require "rspec/core"
   require "rspec/core/rake_task"
 
-  RSpec::Core::RakeTask.new( :spec ) do | spec |
-    spec.pattern = FileList[ "spec/**/*_spec.rb" ]
+  RSpec::Core::RakeTask.new do | task |
+    task.verbose = $trace
+    task.pattern = FileList[ "spec/**/*_spec.rb" ]
+    task.rspec_opts = "--format documentation --color"
+  end
+
+  RSpec::Core::RakeTask.new( "spec:actions" ) do | task |
+    task.verbose = $trace
+    task.pattern = FileList[ "spec/**/*_spec.rb" ]
+    task.rspec_opts = "--tag type:actions --format documentation --color"
   end
 
   RSpec::Core::RakeTask.new( "spec:travis" ) do | spec |

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end
 
 

data/spec/spec_helper.rb

@@ -121,14 +121,14 @@ class Network
     @th_controller = Thread.start do
       controller.run!
     end
-    sleep 2  # FIXME: wait until controller.up?
+    sleep 5  # FIXME: wait until controller.up?
   end
 
 
   def trema_kill
     cleanup_current_session
     @th_controller.join if @th_controller
-    sleep 2  # FIXME: wait until switch_manager.down?
+    sleep 5  # FIXME: wait until switch_manager.down?
   end
 
 

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

@@ -20,65 +20,63 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe SendOutPort, ".new( 1 )" do
-  subject { SendOutPort.new( 1 ) }
-  its( :port_number ) { should == 1 }
-  its( :max_len ) { should == 2 ** 16 - 1 }
-  its( :to_s ) { should == "SendOutPort: port=1, max_len=65535" }
-end
-
-
-describe SendOutPort, ".new( :port_number => number )" do
-  subject { SendOutPort.new :port_number => port_number }
-  it_validates "option range", :port_number, 0..( 2 ** 16 - 1 )
+describe SendOutPort, :type => "actions" do
+  context "#new( 1 )" do
+    subject { SendOutPort.new( 1 ) }
 
-  context "when :port_number == 1" do
-    let( :port_number ) { 1 }
     its( :port_number ) { should == 1 }
+    its( :max_len ) { should == 2 ** 16 - 1 }
     its( :to_s ) { should == "SendOutPort: port=1, max_len=65535" }
   end
-end
 
+  context "#new( :port_number => number )" do
+    subject { SendOutPort.new( :port_number => number ) }
 
-describe SendOutPort, ".new( :port_number => 1, :max_len => number )" do
-  subject { SendOutPort.new :port_number => 1, :max_len => max_len }
-  it_validates "option range", :max_len, 0..( 2 ** 16 - 1 )
+    context "with port number (1)" do
+      let( :number ) { 1 }
+      its( :port_number ) { should == 1 }
+      its( :to_s ) { should == "SendOutPort: port=1, max_len=65535" }
+    end
 
-  context "when :max_len == 256" do
-    let( :max_len ) { 256 }
-    its( :max_len ) { should == 256 }
-    its( :to_s ) { should == "SendOutPort: port=1, max_len=256" }
+    it_validates "option range", :number, 0..( 2 ** 16 - 1 )
   end
-end
 
+  context "#new( :port_number => 1, :max_len => number )" do
+    subject { SendOutPort.new( :port_number => 1, :max_len => max_len ) }
 
-describe SendOutPort, ".new( VALID OPTIONS )" do
-  context "when an action output is set to #flow_mod(add) " do
-    it "should have its action set to output:1" do
-      class FlowModAddController < Controller; end
+    context "with :max_len == 256" do
+      let( :max_len ) { 256 }
+      its( :max_len ) { should == 256 }
+      its( :to_s ) { should == "SendOutPort: port=1, max_len=256" }
+    end
+
+    it_validates "option range", :max_len, 0..( 2 ** 16 - 1 )
+  end
+
+  context "when sending a Flow Mod with SendOutPort action" do
+    it "should insert a new flow entry with action (output:1)" do
+      class TestController < Controller; end
       network {
         vswitch { datapath_id 0xabc }
-      }.run( FlowModAddController ) {
-        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc,
-          :actions => SendOutPort.new( :port_number => 1 ) )
-        sleep 2 # FIXME: wait to send_flow_mod_add
+      }.run( TestController ) {
+        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => SendOutPort.new( 1 ) )
+        sleep 2
         vswitch( "0xabc" ).should have( 1 ).flows
-        vswitch( "0xabc" ).flows[0].actions.should match( /output:1/ )
+        vswitch( "0xabc" ).flows[ 0 ].actions.should == "output:1"
       }
     end
   end
 
-
-  context "when multiple output actions assigned to #flow_mod(add)" do
-    it "should have its actions set to output:1\/output:2" do
-      class FlowModAddController < Controller; end
+  context "when sending a Flow Mod with multiple SendOutPort actions" do
+    it "should insert a new flow entry with actions (output:1\/output:2)" do
+      class TestController < Controller; end
       network {
         vswitch { datapath_id 0xabc }
-      }.run( FlowModAddController ) {
-        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => [ SendOutPort.new( :port_number => 1 ), SendOutPort.new( :port_number => 2 ) ] )
-        sleep 2 # FIXME: wait to send_flow_mod_add
+      }.run( TestController ) {
+        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => [ SendOutPort.new( 1 ), SendOutPort.new( 2 ) ] )
+        sleep 2
         vswitch( "0xabc" ).should have( 1 ).flows
-        vswitch( "0xabc" ).flows[0].actions.should match( /output:1\/output:2/ )
+        vswitch( "0xabc" ).flows[ 0 ].actions.should match( /output:1\/output:2/ )
       }
     end
   end

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

@@ -20,56 +20,51 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe SetEthDstAddr, %{.new( "52:54:00:a8:ad:8c" )} do
-  subject { SetEthDstAddr.new( "52:54:00:a8:ad:8c" ) }
-  its( :mac_address ) { should == Mac.new( "52:54:00:a8:ad:8c" ) }
-  its( :to_s ) { should == "SetEthDstAddr: mac_address=52:54:00:a8:ad:8c" }
-end
-
-
-describe SetEthDstAddr, %{.new( Mac.new( "52:54:00:a8:ad:8c" ) )} do
-  subject { SetEthDstAddr.new( Mac.new( "52:54:00:a8:ad:8c" ) )}
-  its( :mac_address ) { should == Mac.new( "52:54:00:a8:ad:8c" ) }
-  its( :to_s ) { should == "SetEthDstAddr: mac_address=52:54:00:a8:ad:8c" }
-end
-
-
-describe SetEthDstAddr, %{.new( "INVALID MAC STRING" )} do
-  it { expect { SetEthDstAddr.new( "INVALID MAC STRING" ) }.to raise_error( ArgumentError ) }
-end
+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
 
-describe SetEthDstAddr, ".new( number )" do
-  subject { SetEthDstAddr.new( mac_address ) }
+  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 "when mac_address == 0x525400a8ad8c" do
+  context "with mac_address (0x525400a8ad8c)" do
     let( :mac_address ) { 0x525400a8ad8c }
-    its( :mac_address ) { should == 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
 
-  it_validates "option range", :mac_address, 0..0xffffffffffff
-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
 
-describe SetEthDstAddr, ".new( [ 1, 2, 3 ] )" do
-  it { expect { SetEthDstAddr.new( [ 1, 2, 3 ] ) }.to raise_error( TypeError ) }
-end
+  it_validates "option 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" }
 
-describe SetEthDstAddr, ".new( VALID OPTION )" do
-  context "when sending #flow_mod(add) with action set to mod_dl_dst" do
-    it "should have a flow with action set to mod_dl_dst" do
-      class FlowModAddController < Controller; end
+    it "should insert a new flow with action set to mod_dl_dst" do
+      class TestController < Controller; end
       network {
         vswitch { datapath_id 0xabc }
-      }.run( FlowModAddController ) {
-        controller( "FlowModAddController" ).send_flow_mod_add(
-          0xabc,
-          :actions => SetEthDstAddr.new( "52:54:00:a8:ad:8c" )
-        )
-        sleep 20 # FIXME: wait to send_flow_mod
+      }.run( TestController ) {
+        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
+        sleep 2
         vswitch( "0xabc" ).should have( 1 ).flows
-        vswitch( "0xabc" ).flows[0].actions.should match( /mod_dl_dst:52:54:00:a8:ad:8c/ )
+        vswitch( "0xabc" ).flows[ 0 ].actions.should == "mod_dl_dst:52:54:00:a8:ad:8c"
       }
     end
   end

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

@@ -20,53 +20,51 @@ require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "trema"
 
 
-describe SetEthSrcAddr, %{.new( "52:54:00:a8:ad:8c" )} do
-  subject { SetEthSrcAddr.new( "52:54:00:a8:ad:8c" ) }
-  its( :mac_address ) { should == Mac.new( "52:54:00:a8:ad:8c" ) }
-  its( :to_s ) { should == "SetEthSrcAddr: mac_address=52:54:00:a8:ad:8c" }
-end
-
-
-describe SetEthSrcAddr, %{.new( Mac.new( "52:54:00:a8:ad:8c" ) )} do
-  subject { SetEthSrcAddr.new( Mac.new( "52:54:00:a8:ad:8c" ) )}
-  its( :mac_address ) { should == Mac.new( "52:54:00:a8:ad:8c" ) }
-  its( :to_s ) { should == "SetEthSrcAddr: mac_address=52:54:00:a8:ad:8c" }
-end
-
-
-describe SetEthSrcAddr, %{.new( "INVALID MAC STRING" )} do
-  it { expect { SetEthSrcAddr.new( "INVALID MAC STRING" ) }.to raise_error( ArgumentError ) }
-end
+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
 
-describe SetEthSrcAddr, ".new( number )" do
-  subject { SetEthSrcAddr.new( mac_address ) }
+  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 "when mac_address == 0x525400a8ad8c" do
+  context "with mac_address (0x525400a8ad8c)" do
     let( :mac_address ) { 0x525400a8ad8c }
-    its( :mac_address ) { should == 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
 
-  it_validates "option range", :mac_address, 0..0xffffffffffff
-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
 
-describe SetEthSrcAddr, ".new( [ 1, 2, 3 ] )" do
-  it { expect { SetEthSrcAddr.new( [ 1, 2, 3 ] ) }.to raise_error( TypeError ) }
-end
+  it_validates "option 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" }
 
-describe SetEthSrcAddr, ".new( VALID OPTION )" do
-  context "when sending #flow_mod(add) with action set to mod_dl_src" do
-    it "should have a flow with action set to mod_dl_src" do
-      class FlowModAddController < Controller; end
+    it "should insert a new flow with action set to mod_dl_src" do
+      class TestController < Controller; end
       network {
         vswitch { datapath_id 0xabc }
-      }.run( FlowModAddController ) {
-        controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => SetEthSrcAddr.new( "52:54:00:a8:ad:8c" ) )
-        sleep 20 # FIXME: wait to send_flow_mod
+      }.run( TestController ) {
+        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
+        sleep 2
         vswitch( "0xabc" ).should have( 1 ).flows
-        vswitch( "0xabc" ).flows[0].actions.should match( /mod_dl_src:52:54:00:a8:ad:8c/ )
+        vswitch( "0xabc" ).flows[ 0 ].actions.should == "mod_dl_src:52:54:00:a8:ad:8c"
       }
     end
   end

data/src/lib/openflow_message.c

@@ -2565,7 +2565,7 @@ validate_desc_stats_reply( const buffer *message ) {
   assert( message != NULL );
 
   ret = validate_header( message, OFPT_STATS_REPLY,
-                         offsetof( struct ofp_stats_reply, body ) + sizeof( struct ofp_desc_stats ),
+                         offsetof( struct ofp_stats_reply, body ),
                          offsetof( struct ofp_stats_reply, body ) + sizeof( struct ofp_desc_stats ) );
   if ( ret < 0 ) {
     return ret;
@@ -2662,7 +2662,7 @@ validate_aggregate_stats_reply( const buffer *message ) {
   assert( message != NULL );
 
   ret = validate_header( message, OFPT_STATS_REPLY,
-                         offsetof( struct ofp_stats_reply, body ) + sizeof( struct ofp_aggregate_stats_reply ),
+                         offsetof( struct ofp_stats_reply, body ),
                          offsetof( struct ofp_stats_reply, body ) + sizeof( struct ofp_aggregate_stats_reply ) );
   if ( ret < 0 ) {
     return ret;
@@ -2697,7 +2697,7 @@ validate_table_stats_reply( const buffer *message ) {
   assert( message != NULL );
 
   ret = validate_header( message, OFPT_STATS_REPLY,
-                         offsetof( struct ofp_stats_reply, body ) + sizeof( struct ofp_table_stats ),
+                         offsetof( struct ofp_stats_reply, body ),
                          UINT16_MAX );
   if ( ret < 0 ) {
     return ret;
@@ -2863,7 +2863,7 @@ validate_vendor_stats_reply( const buffer *message ) {
   assert( message != NULL );
 
   ret = validate_header( message, OFPT_STATS_REPLY,
-                         offsetof( struct ofp_stats_reply, body ) + sizeof( uint32_t ),
+                         offsetof( struct ofp_stats_reply, body ),
                          UINT16_MAX );
   if ( ret < 0 ) {
     return ret;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-01-16 00:00:00 Z
+date: 2013-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -101,7 +101,6 @@ extra_rdoc_files:
 - README.md
 files: 
 - .gitignore
-- .gitmodules
 - .mono.rant
 - .travis.yml
 - .yardopts
@@ -149,9 +148,6 @@ files:
 - features/trema.show_stats.feature
 - features/trema.up.feature
 - features/trema.version.feature
-- locale/README.ja.md
-- locale/ja/yard.po
-- locale/yard.pot
 - ruby/.gitignore
 - ruby/blocker.rb
 - ruby/extconf.rb

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/yard.i18n"]
-	path = vendor/yard.i18n
-	url = https://github.com/kou/yard

data/locale/README.ja.md

@@ -1,19 +0,0 @@
-YARD の翻訳作業の進めかた
-====================
-
-翻訳は gettext + YARD の仕組みを使っています。基本的にすべて rake コマンドだけでできます。
-
-1. YARD で .rb と .c のコメントを書く
-2. rake yard:po で locale/ja/yard.po を更新
-3. locale/ja/yard.po に日本語訳を書く。Emacs だと po-mode が便利。
-4. rake yard:ja で日本語対応した html が [trema]/doc に生成される
-5. html に間違いが無いことを確認したあと、更新した .po などを git commit
-
-つぎのことをこころがけてください。
-
-1. 生成物はそのまま公開されます。わかりやすく書こう (訳語の統一、むずかしい言葉を使わない、など)
-2. 元の英語ドキュメントが足りない場合には、英語のほうを書き足してから翻訳しよう。Floodlight や OpenFaucet のドキュメントが参考になると思います
-3. できれば spec/ のテストと見比べて、ドキュメントに書いてあることがテストされていなければ書き足そう
-
-すべてを最初から完璧にする必要は無いです。
-あとまわしにした箇所は TODO コメントを残す、チケットを切る等々、後で見てわかるように進めてください!