trema 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b8a05a13bfe2838d39957fc277912a3a4807d7
-  data.tar.gz: 67137447964f0b00bd56627e02b69ff4cb95401f
+  metadata.gz: 56491c2c957c65072af879859d60774d095dd184
+  data.tar.gz: 79183b30e186b9210a257f32aaff467fde077de9
 SHA512:
-  metadata.gz: e1861bb97746c35236a8d319eb8e277e38ab3b0c61a6e4c47fa5bb24dc37112d3e199d3897292802af0a60325ac96a06b7ee26ebf6e6b2274cb7d368cf82d692
-  data.tar.gz: 761ab009fa625de9dc82709ece477544fd7be288b0fae69b628d2995175b4f9bc1832e369a39dd3951b801cdd6d2bc1ddcc533ca7d0025cd8330de81c961a571
+  metadata.gz: 8f7844e283019157acd6aa1f6053d86c855cce5d11e350270f3952022db612370c917d89370f071c734a24fd3a754f231538c908ea4410a3d9ca439a237b15a2
+  data.tar.gz: 292b789f6e2e8199baee54627e430daff018ba10c35d640f17eb924f2ebd873ff665c0e257f1c00059789242187b3422681e91b150e35eed58f1d08d7bf44f47

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 ## develop (unreleased)
 
 
+## 0.8.2 (11/11/2015)
+### Bugs fixed
+* Fix default out_port (OpenFlow 1.3)
+
+### Changes
+* Pio 0.29.0
+* Phut 0.7.2
+
+
 ## 0.8.1 (11/5/2015)
 ### Changes
 * Pio 0.28.1

data/README.md

@@ -42,6 +42,7 @@ OpenFlow controller using Trema Ruby API.
 * [trema/cbench](https://github.com/trema/cbench)
 * [trema/learning_switch](https://github.com/trema/learning_switch)
 * [trema/switch_monitor](https://github.com/trema/switch_monitor)
+* [trema/simple_router](https://github.com/trema/simple_router)
 * [trema/topology](https://github.com/trema/topology)
 * [trema/routing_switch](https://github.com/trema/routing_switch)
 

data/features/handlers/packet_in.feature

@@ -1,14 +1,6 @@
 Feature: packet_in handler
   Background:
-    Given a file named "packet_in_controller.rb" with:
-      """ruby
-      class PacketInController < Trema::Controller
-        def packet_in(dpid, message)
-          logger.info "new packet_in (dpid = #{dpid.to_hex})"
-        end
-      end
-      """
-    And a file named "trema.conf" with:
+    Given a file named "trema.conf" with:
       """ruby
       vswitch { datapath_id 0xabc }
       vhost('host1') { ip '192.168.0.1' }
@@ -19,14 +11,39 @@ Feature: packet_in handler
 
   @sudo
   Scenario: invoke packet_in handler
-    Given I successfully run `trema run packet_in_controller.rb -c trema.conf -d`
+    Given a file named "packet_in_controller.rb" with:
+      """ruby
+      class PacketInController < Trema::Controller
+        def packet_in(dpid, message)
+          logger.info "new packet_in (dpid = #{dpid.to_hex})"
+        end
+      end
+      """
+
+    And I successfully run `trema run packet_in_controller.rb -c trema.conf -d`
     And I successfully run `sleep 3`
     When I successfully run `trema send_packets --source host1 --dest host2`
     Then the file "PacketInController.log" should contain "new packet_in (dpid = 0xabc)"
 
   @sudo
   Scenario: invoke packet_in handler (OpenFlow 1.3)
-    Given I successfully run `trema run packet_in_controller.rb -c trema.conf --openflow13 -d`
+    Given a file named "packet_in_controller.rb" with:
+      """ruby
+      class PacketInController < Trema::Controller
+        def switch_ready(dpid)
+          send_flow_mod_add(
+            dpid,
+            match: Match.new,
+            instructions: Apply.new(SendOutPort.new(:controller))
+          )
+        end
+
+        def packet_in(dpid, message)
+          logger.info "new packet_in (dpid = #{dpid.to_hex})"
+        end
+      end
+      """
+    And I successfully run `trema run packet_in_controller.rb -c trema.conf --openflow13 -d`
     And I successfully run `sleep 3`
     When I successfully run `trema send_packets --source host1 --dest host2`
     Then the file "PacketInController.log" should contain "new packet_in (dpid = 0xabc)"

data/lib/trema/controller.rb

@@ -74,7 +74,7 @@ module Trema
           transaction_id: rand(0xffffffff),
           buffer_id: @user_options[:buffer_id] || 0xffffffff,
           match: @user_options.fetch(:match),
-          out_port: @user_options[:out_port] || 0xffff
+          out_port: @user_options[:out_port] || 0xffffffff
         }
       end
     end

data/lib/trema/version.rb

@@ -1,5 +1,5 @@
 # Base module.
 module Trema
   # gem version.
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

data/trema.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'bundler', '~> 1.10.6'
   gem.add_dependency 'gli', '~> 2.13.2'
-  gem.add_dependency 'phut', '~> 0.7.1'
-  gem.add_dependency 'pio', '~> 0.28.1'
+  gem.add_dependency 'phut', '~> 0.7.2'
+  gem.add_dependency 'pio', '~> 0.29.0'
 
   # Docs
   gem.add_development_dependency 'relish', '~> 0.7.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trema
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: pio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: relish
   requirement: !ruby/object:Gem::Requirement