trema 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac18a035f00fe07ae6418554199541a9d94732a1
-  data.tar.gz: 121fe33ddf699232dae17036c5b3440a8d330381
+  metadata.gz: dab9ad5e8073729f235b8255bf9f22c9bdd41ec1
+  data.tar.gz: e7171cd9de212debc0c72c9bb111d06afdcfa07b
 SHA512:
-  metadata.gz: 2f3c2455b0416bf25b637d5fb3b1109ca240ef4c458d486eb5b903d6fde14a2b2f622a94a05a46f45175f71d7722c16673d25b7bb0daf5772e87de53e4bee6d1
-  data.tar.gz: 3d7fabeb8f28bca2a1e3ef46713add659f96bbfdeead929dbbbacecf8bc424fc4cac63f93c230d5093dc68998730bafe5ac151304668480fbec3057458107021
+  metadata.gz: 3cab3c7b79b83d0cfb210dbd05cc4a905fe646ee2c878a7a4f7e0f58753d000da4bff0abfc8826def84e469c67c781f6894bcd4395b0b552f8e3627611ad2e18
+  data.tar.gz: df6da3aa3099902242749ddeceaccc21eef3a948cd2f0dd754e15b3d39b6f66a5ff48ab17669961bf4641485df25f2d55fb8e9c885f0d42dba277e6a244dc5e2

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 ## develop (unreleased)
 
 
+## 0.9.0 (12/17/2015)
+### New features
+* [#415](https://github.com/trema/trema/pull/415): Add `trema netns [command]` command.
+* [#416](https://github.com/trema/trema/pull/416): dump_flows supports OpenFlow 1.3
+
+
 ## 0.8.4 (11/30/2015)
 ### Bugs fixed
 * Fix NoMethodError.

data/README.md

@@ -29,6 +29,12 @@ Prerequisites
 [openvswitch]: https://openvswitch.org/
 
 
+Documentation
+-------------
+
+See https://relishapp.com/trema/trema/docs for links to documentation for all APIs.
+
+
 Sample Code
 -----------
 

data/bin/trema

@@ -59,9 +59,10 @@ module Trema
     arg_name 'switches...'
     command :dump_flows do |c|
       c.desc 'Location to put socket files'
-      c.flag [:S, :socket_dir], default_value: Phut.socket_dir
+      c.flag [:S, :socket_dir], default_value: Trema::DEFAULT_SOCKET_DIR
 
       c.action do |_global_options, options, args|
+        Phut.socket_dir = options[:socket_dir]
         args.each do |each|
           puts Trema.fetch(each, options.fetch(:socket_dir)).dump_flows
         end
@@ -233,11 +234,16 @@ module Trema
       end
     end
 
-    desc 'Opens a new shell in the specified network namespace'
-    arg_name 'name'
+    desc 'Opens a new shell or runs a command in the specified network namespace'
+    arg_name 'name [command]'
     command :netns do |c|
       c.action do |global_options, options, args|
-        system "sudo ip netns exec #{args[0]} #{ENV['SHELL']}"
+        command_args = args[1..-1]
+        if command_args && command_args.size > 0
+          system "sudo ip netns exec #{args[0]} #{command_args.join(' ')}"
+        else
+          system "sudo ip netns exec #{args[0]} #{ENV['SHELL']}"
+        end
       end
     end
 
@@ -251,6 +257,8 @@ module Trema
         Phut::OpenVswitch::AlreadyRunning,
         GLI::UnknownCommandArgument
         true
+      when Interrupt
+        exit false
       else
         # show backtrace
         fail e

data/features/.nav

@@ -9,6 +9,9 @@
   - openflow13_option.feature
   - port_option.feature
 
+- trema_dump_flows (trema dump_flows command):
+  - dump_flows.feature
+
 - trema_killall (trema killall command):
   - killall.feature (basic usage)
   - all_option.feature
@@ -26,6 +29,9 @@
   - delete_link.feature (basic usage)
   - socket_dir_option.feature
 
+- trema_netns (trema netns command):
+  - netns.feature (basic usage)
+
 - logger:
   - debug.feature
   - info.feature

data/features/api/logging.feature

@@ -1,4 +1,11 @@
 Feature: logging
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+
   @sudo
   Scenario: controller, vhost and vswitch creates log files
     Given a file named "hello.rb" with:
@@ -16,7 +23,7 @@ Feature: logging
       link '0xabc', '192.168.0.1'
       """
     When I successfully run `trema run hello.rb -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the following files should exist:
       | Hello.log              |
       | vhost.192.168.0.1.log  |
@@ -36,7 +43,7 @@ Feature: logging
       link '0xabc', 'host1'
       """
     When I successfully run `trema run null_controller.rb -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the following files should exist:
       | NullController.log     |
       | vhost.host1.log        |
@@ -59,7 +66,7 @@ Feature: logging
       end
       """
     When I successfully run `trema run two_controllers.rb -d`
-    And I run `sleep 3`
+    And sleep 3
     Then the following files should exist:
       | ParentController.log |
       | ChildController.log  |

data/features/api/send_flow_mod_add.feature

@@ -1,6 +1,11 @@
 Feature: send_flow_mod_add
   Background:
-    Given a file named "trema.conf" with:
+    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 }
       """
@@ -29,7 +34,7 @@ Feature: send_flow_mod_add
       end
       """
     When I successfully run `trema run flow_mod_controller10.rb -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "FlowModController10.log" should contain "Sent a FlowMod successfully"
 
   @sudo
@@ -57,6 +62,6 @@ Feature: send_flow_mod_add
       end
       """
     When I successfully run `trema run flow_mod_controller13.rb --openflow13 -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "FlowModController13.log" should contain "Sent a FlowMod successfully"
 

data/features/handlers/barrier_reply.feature

@@ -1,6 +1,11 @@
 Feature: barrier_reply handler
   Background:
-    Given a file named "barrier_reply.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "barrier_reply.rb" with:
       """ruby
       class BarrierReply < Trema::Controller
         def switch_ready(dpid)

data/features/handlers/description_stats_reply.feature

@@ -1,6 +1,11 @@
 Feature: description_stats_reply handler
   Background:
-    Given a file named "description_stats_reply.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "description_stats_reply.rb" with:
       """ruby
       class DescriptionStatsReply < Trema::Controller
         def switch_ready(dpid)

data/features/handlers/echo_reply.feature

@@ -1,6 +1,11 @@
 Feature: echo_reply handler
   Background:
-    Given a file named "echo_reply.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "echo_reply.rb" with:
       """ruby
       class EchoReply < Trema::Controller
         def switch_ready(dpid)

data/features/handlers/hello_failed.feature

@@ -1,6 +1,11 @@
 Feature: hello_failed handler
   Background:
-    Given a file named "hello_fails.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "hello_fails.rb" with:
       """ruby
       require 'version_mismatch'
 

data/features/handlers/packet_in.feature

@@ -1,6 +1,11 @@
 Feature: packet_in handler
   Background:
-    Given a file named "trema.conf" with:
+    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:
       """ruby
       vswitch { datapath_id 0xabc }
       vhost('host1') { ip '192.168.0.1' }
@@ -21,7 +26,7 @@ Feature: packet_in handler
       """
 
     And I successfully run `trema run packet_in_controller.rb -c trema.conf -d`
-    And I successfully run `sleep 3`
+    And 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)"
 
@@ -44,6 +49,6 @@ Feature: packet_in handler
       end
       """
     And I successfully run `trema run packet_in_controller.rb -c trema.conf --openflow13 -d`
-    And I successfully run `sleep 3`
+    And 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/features/handlers/start.feature

@@ -1,6 +1,11 @@
 Feature: start handler
   Background:
-    Given a file named "hello.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "hello.rb" with:
       """ruby
       class Hello < Trema::Controller
         def start(args)

data/features/handlers/switch_disconnected.feature

@@ -1,6 +1,11 @@
 Feature: switch_disconnected handler
   Background:
-    Given a file named "switch_disconnected.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "switch_disconnected.rb" with:
       """ruby
       class SwitchDisconnected < Trema::Controller
         def switch_disconnected(dpid)

data/features/handlers/switch_ready.feature

@@ -1,6 +1,11 @@
 Feature: switch_ready handler
   Background:
-    Given a file named "switch_ready.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "switch_ready.rb" with:
       """ruby
       class SwitchReady < Trema::Controller
         def switch_ready(dpid)

data/features/logger/debug.feature

@@ -1,6 +1,11 @@
 Feature: Trema::Controller#logger.debug
   Background:
-    Given a file named "hello.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "hello.rb" with:
       """ruby
       class Hello < Trema::Controller
         def start(_args)
@@ -12,6 +17,7 @@ Feature: Trema::Controller#logger.debug
   @sudo
   Scenario: the default logging level
     When I trema run "hello.rb" interactively
+    And sleep 2
     And I trema killall "Hello"
     Then the output should not contain "Konnichi Wa"
     And the file "Hello.log" should not contain "DEBUG -- : Konnichi Wa"
@@ -19,7 +25,7 @@ Feature: Trema::Controller#logger.debug
   @sudo
   Scenario: --logging_level debug
     When I run `trema run hello.rb --logging_level debug` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "DEBUG -- : Konnichi Wa"
@@ -27,7 +33,7 @@ Feature: Trema::Controller#logger.debug
   @sudo
   Scenario: -v
     When I run `trema -v run hello.rb` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "DEBUG -- : Konnichi Wa"
@@ -35,7 +41,7 @@ Feature: Trema::Controller#logger.debug
   @sudo
   Scenario: --verbose
     When I run `trema --verbose run hello.rb` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "DEBUG -- : Konnichi Wa"

data/features/logger/error.feature

@@ -1,6 +1,11 @@
 Feature: Trema::Controller#logger.error
   Background:
-    Given a file named "hello.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "hello.rb" with:
       """ruby
       class Hello < Trema::Controller
         def start(_args)
@@ -12,6 +17,7 @@ Feature: Trema::Controller#logger.error
   @sudo
   Scenario: the default logging level
     When I trema run "hello.rb" interactively
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "ERROR -- : Konnichi Wa"
@@ -19,7 +25,7 @@ Feature: Trema::Controller#logger.error
   @sudo
   Scenario: --logging_level error
     When I run `trema run hello.rb --logging_level error` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "ERROR -- : Konnichi Wa"
@@ -27,7 +33,7 @@ Feature: Trema::Controller#logger.error
   @sudo
   Scenario: -v
     When I run `trema -v run hello.rb` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "ERROR -- : Konnichi Wa"
@@ -35,7 +41,7 @@ Feature: Trema::Controller#logger.error
   @sudo
   Scenario: --verbose
     When I run `trema --verbose run hello.rb` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "ERROR -- : Konnichi Wa"

data/features/logger/fatal.feature

@@ -1,6 +1,11 @@
 Feature: Trema::Controller#logger.fatal
   Background:
-    Given a file named "hello.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "hello.rb" with:
       """ruby
       class Hello < Trema::Controller
         def start(_args)
@@ -12,6 +17,7 @@ Feature: Trema::Controller#logger.fatal
   @sudo
   Scenario: the default logging level
     When I trema run "hello.rb" interactively
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "FATAL -- : Konnichi Wa"
@@ -19,7 +25,7 @@ Feature: Trema::Controller#logger.fatal
   @sudo
   Scenario: --logging_level fatal
     When I run `trema run hello.rb --logging_level fatal` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "FATAL -- : Konnichi Wa"
@@ -27,7 +33,7 @@ Feature: Trema::Controller#logger.fatal
   @sudo
   Scenario: -v
     When I run `trema -v run hello.rb` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "FATAL -- : Konnichi Wa"
@@ -35,7 +41,7 @@ Feature: Trema::Controller#logger.fatal
   @sudo
   Scenario: --verbose
     When I run `trema --verbose run hello.rb` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "FATAL -- : Konnichi Wa"

data/features/logger/info.feature

@@ -1,6 +1,11 @@
 Feature: Trema::Controller#logger.info
   Background:
-    Given a file named "hello.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "hello.rb" with:
       """ruby
       class Hello < Trema::Controller
         def start(_args)
@@ -12,6 +17,7 @@ Feature: Trema::Controller#logger.info
   @sudo
   Scenario: the default logging level
     When I trema run "hello.rb" interactively
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "INFO -- : Konnichi Wa"
@@ -19,7 +25,7 @@ Feature: Trema::Controller#logger.info
   @sudo
   Scenario: --logging_level info
     When I run `trema run hello.rb --logging_level info` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "INFO -- : Konnichi Wa"
@@ -27,7 +33,7 @@ Feature: Trema::Controller#logger.info
   @sudo
   Scenario: -v
     When I run `trema -v run hello.rb` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "INFO -- : Konnichi Wa"
@@ -35,7 +41,7 @@ Feature: Trema::Controller#logger.info
   @sudo
   Scenario: --verbose
     When I run `trema --verbose run hello.rb` interactively
-    And I run `sleep 3`
+    And sleep 2
     And I trema killall "Hello"
     Then the output should contain "Konnichi Wa"
     And the file "Hello.log" should contain "INFO -- : Konnichi Wa"