trema 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd254b79f9c14fa501bbd579c616b4a387f2d832
-  data.tar.gz: fbf648fbf79f72498a28fa45d93095042c93a074
+  metadata.gz: a874485c89ec22dec27a4ff7445ef1226f19ab44
+  data.tar.gz: c42a5dae78876b28a2ac924a11cb62ed46e8e882
 SHA512:
-  metadata.gz: 960bf892ff737db25a541bd8b20929d76b4e6103a541fc16fc6c0fb0c7e92f85ffc4ede76bb5ce9558bff7d567b20e6a65cff7eadc8e944bafc407e03ded2af6
-  data.tar.gz: 7d2229720caa81f7f3a9a36b1a4b326e024c724bdea82745d0896fb93205abee59d382f7370c202c133c20b98b42b5e65c4dac7a0876e5a3b4e8c052ebbe23cd
+  metadata.gz: 1aedce74834ac14034d4c71e0d0da7d2459b3555a8b3fe2f0db7b991e64849f7b21b95c6513955621325a2bca2efdcdb972a8b031a31aa01dd39fdc1141a5087
+  data.tar.gz: 060fe0e12cda2aad5c7e4b0509f075a9019d5f1671398be129bc964ea205c6ea3d83159b4771c40549be4d796a3d7cb9ca53ba31a4530129330918701a162f2a

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.5.1 (8/4/2015)
+### Bugs fixed
+* [#396](https://github.com/trema/trema/issues/396): `send_flow_mod_add` doesn't allow `:idle_timeout` and `:hard_timeout` options.
+
+
 ## 0.5.0 (8/2/2015)
 ### Changes
 * [#392](https://github.com/trema/trema/pull/392): Allow packet_in, etc during startup.

data/features/send_flow_mod_add.feature

@@ -0,0 +1,67 @@
+Feature: Controller#send_flow_mod_add
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "trema.conf" with:
+      """
+      vswitch { datapath_id 0xabc }
+      """
+
+  @sudo
+  Scenario: Controller#send_flow_mod_add (OpenFlow 1.0)
+    Given a file named "flow_mod_controller10.rb" with:
+      """
+      class FlowModController10 < Trema::Controller
+        def switch_ready(datapath_id)
+          logger.info 'Sending a FlowMod with OpenFlow 1.0 options'
+          send_flow_mod_add(
+            datapath_id,
+            actions: [],
+            buffer_id: 0,
+            command: :add,
+            flags: [],
+            hard_timeout: 0,
+            idle_timeout: 0,
+            match: Match.new(),
+            out_port: 0,
+            priority: 0
+          )
+          logger.info 'Sent a FlowMod successfully'
+        end
+      end
+      """
+    When I successfully run `trema run flow_mod_controller10.rb -c trema.conf -d`
+    And I run `sleep 5`
+    Then the file "FlowModController10.log" should contain "Sent a FlowMod successfully"
+
+  @sudo
+  Scenario: Controller#send_flow_mod_add (OpenFlow 1.3)
+    Given a file named "flow_mod_controller13.rb" with:
+      """
+      class FlowModController13 < Trema::Controller
+        def switch_ready(datapath_id)
+          logger.info 'Sending a FlowMod with OpenFlow 1.3 options'
+          send_flow_mod_add(
+            datapath_id,
+            buffer_id: 0,
+            command: :add,
+            flags: [],
+            hard_timeout: 0,
+            idle_timeout: 0,
+            instructions: [],
+            match: Match.new(),
+            out_port: 0,
+            priority: 0,
+            table_id: 0
+          )
+          logger.info 'Sent a FlowMod successfully'
+        end
+      end
+      """
+    When I successfully run `trema run flow_mod_controller13.rb --openflow13 -c trema.conf -d`
+    And I run `sleep 5`
+    Then the file "FlowModController13.log" should contain "Sent a FlowMod successfully"
+

data/features/trema_run.feature

@@ -45,6 +45,20 @@ Feature: trema run command
     And I run `sleep 5`
     Then the file "SwitchReady.log" should contain "Hello 0xabc!"
 
+  @sudo
+  Scenario: trema run with --openflow13 option
+    Given a file named "null_controller.rb" with:
+      """
+      class NullController < Trema::Controller; end
+      """
+    And a file named "trema.conf" with:
+      """
+      vswitch { datapath_id 0xabc }
+      """
+    When I successfully run `trema -v run null_controller.rb --openflow13 -c trema.conf -d`
+    And I run `sleep 5`
+    Then the output should contain "protocols=OpenFlow13"
+
   @sudo
   Scenario: trema run empty file and error
     Given a file named "empty.rb" with:

data/lib/trema/version.rb

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

data/trema.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'bundler', '~> 1.10.6'
   gem.add_dependency 'gli', '~> 2.13.1'
   gem.add_dependency 'phut', '~> 0.6.6'
-  gem.add_dependency 'pio', '~> 0.24.0'
+  gem.add_dependency 'pio', '~> 0.24.1'
   gem.add_dependency 'rake'
 
   # Docs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trema
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,7 @@ files:
 - features/cleanup_on_failure.feature
 - features/echo_reply_handler.feature
 - features/logging.feature
-- features/open_flow13.feature
+- features/send_flow_mod_add.feature
 - features/step_definitions/.gitignore
 - features/step_definitions/.rubocop.yml
 - features/step_definitions/.travis.yml

data/features/open_flow13.feature

@@ -1,50 +0,0 @@
-Feature: OpenFlow1.3
-  Background:
-    Given I set the environment variables to:
-      | variable         | value |
-      | TREMA_LOG_DIR    | .     |
-      | TREMA_PID_DIR    | .     |
-      | TREMA_SOCKET_DIR | .     |
-
-  @sudo
-  Scenario: trema run with --openflow13 option
-    Given a file named "null_controller.rb" with:
-      """
-      class NullController < Trema::Controller; end
-      """
-    And a file named "trema.conf" with:
-      """
-      vswitch { datapath_id 0xabc }
-      """
-    When I successfully run `trema -v run null_controller.rb --openflow13 -c trema.conf -d`
-    And I run `sleep 5`
-    Then the output should contain "protocols=OpenFlow13"
-
-  @sudo
-  Scenario: send_flow_mod_add
-    Given a file named "flow_mod_controller.rb" with:
-      """
-      class FlowModController < Trema::Controller
-        def switch_ready(datapath_id)
-          logger.info 'Sending a FlowMod with OpenFlow 1.3 options'
-          send_flow_mod_add(
-            datapath_id,
-            table_id: 0,
-            idle_timeout: 180,
-            flags: [],
-            priority: 1,
-            match: Match.new({}),
-            instructions: []
-          )
-          logger.info 'Sent a FlowMod successfully'
-        end
-      end
-      """
-    And a file named "trema.conf" with:
-      """
-      vswitch { datapath_id 0xabc }
-      """
-    When I successfully run `trema run flow_mod_controller.rb --openflow13 -c trema.conf -d`
-    And I run `sleep 5`
-    Then the file "FlowModController.log" should contain "Sent a FlowMod successfully"
-