trema 0.8.4 → 0.9.0

data/features/logger/warn.feature

@@ -1,6 +1,11 @@
 Feature: Trema::Controller#logger.warn
   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.warn
   @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 "WARN -- : Konnichi Wa"
@@ -19,7 +25,7 @@ Feature: Trema::Controller#logger.warn
   @sudo
   Scenario: --logging_level warn
     When I run `trema run hello.rb --logging_level warn` 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 "WARN -- : Konnichi Wa"
@@ -27,7 +33,7 @@ Feature: Trema::Controller#logger.warn
   @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 "WARN -- : Konnichi Wa"
@@ -35,7 +41,7 @@ Feature: Trema::Controller#logger.warn
   @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 "WARN -- : Konnichi Wa"

data/features/step_definitions/dump_flows_steps.rb

@@ -1,13 +1,11 @@
-# rubocop:disable LineLength
-
-Then(/^the switch "(.*?)" has (\d+) flow entr(?:y|ies)$/) do |switch, num_entries|
-  command = "trema dump_flows #{switch} -S."
-  step "I run `#{command}`"
-  expect(output_from(command).split("\n").size - 1).to eq(num_entries.to_i)
+Then(/^the switch "(.*?)" has (\d+) flow entr(?:y|ies)$/) do |switch, number|
+  # FIXME: Read TREMA_SOCKET_DIR in trema dump_flows
+  command = "trema dump_flows #{switch} -S ."
+  step "I successfully run `#{command}`"
+  dump_flows = aruba.command_monitor.find(Aruba.platform.detect_ruby(command))
+  expect(dump_flows.output.split("\n").size - 1).to eq(number.to_i)
 end
 
 Then(/^the switch "(.*?)" has no flow entry$/) do |switch|
   step %(the switch "#{switch}" has 0 flow entry)
 end
-
-# rubocop:enable LineLength

data/features/step_definitions/rest_api_steps.rb

@@ -9,18 +9,18 @@ begin
   end
 
   Given(/^I send a GET request for "([^\"]*)"$/) do |path|
-    in_current_dir { get path }
+    cd('.') { get path }
   end
 
   # rubocop:disable LineLength
   Given(/^I send a POST request for "([^\"]*)" with body "([^\"]*)"$/) do |path, body|
-    in_current_dir { post path, Object.instance_eval(body) }
+    cd('.') { post path, Object.instance_eval(body) }
   end
   # rubocop:enable LineLength
 
   # rubocop:disable LineLength
   Given(/^I send a DELETE request for "([^\"]*)" with body "([^\"]*)"$/) do |path, body|
-    in_current_dir { delete path, Object.instance_eval(body) }
+    cd('.') { delete path, Object.instance_eval(body) }
   end
   # rubocop:enable LineLength
 

data/features/step_definitions/show_stats_steps.rb

@@ -29,10 +29,12 @@ Then(/^the number of packets received by "(.*?)" should be:$/) do |host_name, ta
   command = "trema show_stats #{host_name}"
   step "I run `#{command}`"
 
+  output = aruba.command_monitor.find(Aruba.platform.detect_ruby(command)).output
+
   result = Hash.new(0)
   cd('.') do
     received = false
-    output_from(command).split("\n").each do |each|
+    output.split("\n").each do |each|
       case each
       when /Packets sent/
         next

data/features/step_definitions/trema_steps.rb

@@ -26,14 +26,14 @@ When(/^I trema run "([^"]*)"$/) do |controller_file|
   step %(I run `trema run #{controller_path} -d`)
 end
 
+Given(/^I trema run "([^"]*)" with args "([^"]*)"$/) do |controller, args|
+  controller_path = File.join('..', '..', controller)
+  step %(I successfully run `trema run #{controller_path} #{args}`)
+  step %(sleep 10)
+end
+
 When(/^I trema run "([^"]*)" interactively$/) do |controller_file|
-  controller_path = if controller_file.include?('/')
-                      File.join '..', '..', controller_file
-                    else
-                      controller_file
-                    end
-  step %(I run `trema run #{controller_path}` interactively)
-  step %(I successfully run `sleep 3`)
+  step %(I run `trema run #{controller_file}` interactively)
 end
 
 # rubocop:disable LineLength
@@ -50,7 +50,7 @@ When(/^I trema run "([^"]*)"( interactively)? with the configuration "([^"]*)"$/
   else
     step %(I successfully run `trema run #{run_arguments} -d`)
   end
-  step %(I successfully run `sleep 3`)
+  step %(sleep 10)
 end
 # rubocop:enable LineLength
 
@@ -58,6 +58,11 @@ When(/^I trema killall "([^"]*)"$/) do |controller_name|
   step %(I successfully run `trema killall #{controller_name}`)
 end
 
+When(/^I delete the link between "([^"]*)" and "([^"]*)"$/) do |peer1, peer2|
+  step %(I successfully run `trema delete_link #{peer1} #{peer2}`)
+  step %(sleep 3)
+end
+
 # rubocop:disable LineLength
 Then(/^the log file "([^"]*)" should contain following messages:$/) do |log_file, messages|
   step %(a file named "#{log_file}" should exist)
@@ -70,3 +75,7 @@ end
 Then(/^the command returns immediately$/) do
   # noop
 end
+
+When(/^sleep (\d+)$/) do |time|
+  sleep time.to_i
+end

data/features/support/hooks.rb

@@ -3,14 +3,11 @@ Before do
 end
 
 Before('@sudo') do
-  ENV['TREMA_LOG_DIR'] = '.'
-  ENV['TREMA_PID_DIR'] = '.'
-  ENV['TREMA_SOCKET_DIR'] = '.'
   fail 'sudo authentication failed' unless system 'sudo -v'
-  @aruba_timeout_seconds = 10
+  @aruba_timeout_seconds = 15
 end
 
 After do
-  run "trema killall --all -S #{ENV['TREMA_SOCKET_DIR']}"
-  sleep 5
+  run 'trema killall --all -S .'
+  sleep 10
 end

data/features/trema_delete_link/delete_link.feature

@@ -1,4 +1,11 @@
 Feature: delete_link
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+
   @sudo
   Scenario: trema delete_link 0xabc host1
     Given a file named "packet_in_controller.rb" with:

data/features/trema_dump_flows/dump_flows.feature

@@ -0,0 +1,49 @@
+Feature: dump_flows
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "noop_controller.rb" with:
+      """ruby
+      class NoopController < Trema::Controller; end
+      """
+    And a file named "flow_mod_controller.rb" with:
+      """ruby
+      class FlowModController < Trema::Controller
+        def switch_ready(datapath_id)
+          send_flow_mod_add(datapath_id, match: Match.new)
+        end
+      end
+      """
+    And a file named "trema.conf" with:
+      """ruby
+      vswitch { datapath_id 0xabc }
+      """
+
+  @sudo
+  Scenario: dump_flows (no flow entries)
+    Given I trema run "noop_controller.rb" with the configuration "trema.conf"
+    When I successfully run `trema dump_flows 0xabc`
+    Then the output from "trema dump_flows 0xabc" should not contain "actions=drop"
+
+  @sudo
+  Scenario: dump_flows (one flow entry)
+    Given I trema run "flow_mod_controller.rb" with the configuration "trema.conf"
+    When I successfully run `trema dump_flows 0xabc`
+    Then the output from "trema dump_flows 0xabc" should contain "actions=drop"
+
+  @sudo
+  Scenario: dump_flows OpenFlow 1.3 (no flow entries)
+    Given I use OpenFlow 1.3
+    And I trema run "noop_controller.rb" with the configuration "trema.conf"
+    When I successfully run `trema dump_flows 0xabc`
+    Then the output from "trema dump_flows 0xabc" should not contain "actions=drop"
+
+  @sudo
+  Scenario: dump_flows OpenFlow 1.3 (one flow entry)
+    Given I use OpenFlow 1.3
+    And I trema run "flow_mod_controller.rb" with the configuration "trema.conf"
+    When I successfully run `trema dump_flows 0xabc`
+    Then the output from "trema dump_flows 0xabc" should contain "actions=drop"

data/features/trema_killall/all_option.feature

@@ -4,7 +4,12 @@ Feature: --all option
 
   @sudo
   Scenario: killall --all
-    Given a file named "null_controller.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "null_controller.rb" with:
       """ruby
       class NullController < Trema::Controller; end
       """

data/features/trema_killall/killall.feature

@@ -1,7 +1,12 @@
 Feature: killall
   @sudo
   Scenario: killall controller_name
-    Given a file named "null_controller.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "null_controller.rb" with:
       """ruby
       class NullController < Trema::Controller; end
       """

data/features/trema_killall/socket_dir_option.feature

@@ -2,6 +2,13 @@ Feature: -S (--socket_dir) option
 
   -S (--socket_dir) option specifies the location to find socket files
 
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+
   @sudo
   Scenario: -S option
     Given a file named "null_controller.rb" with:

data/features/trema_netns/README.md

@@ -0,0 +1,5 @@
+`trema netns` command opens a new shell or runs a command in the specified network namespace.
+
+```
+trema [global options] netns name [command]
+```

data/features/trema_netns/netns.feature

@@ -0,0 +1,55 @@
+Feature: netns
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "simple_hub.rb" with:
+      """ruby
+      class SimpleHub < Trema::Controller
+        def switch_ready(dpid)
+          send_flow_mod_add(
+            dpid,
+            match: Match.new,
+            actions: SendOutPort.new(:flood)
+          )
+        end
+      end
+      """
+    And a file named "simple_hub.conf" with:
+      """ruby
+      vswitch('simple_hub') { dpid 0x1 }
+      netns('host1') {
+        ip '192.168.1.2'
+        netmask '255.255.255.0'
+        route net: '0.0.0.0', gateway: '192.168.1.1'
+      }
+      netns('host2') {
+        ip '192.168.1.3'
+        netmask '255.255.255.0'
+        route net: '0.0.0.0', gateway: '192.168.1.1'
+      }
+      link 'simple_hub', 'host1'
+      link 'simple_hub', 'host2'
+      """
+    And I trema run "simple_hub.rb" with the configuration "simple_hub.conf"
+
+  @sudo
+  Scenario: netns namespece
+    When I run `trema netns host1` interactively
+    And I type "ip addr"
+    And I type "exit"
+    Then the stdout should contain "192.168.1.2"
+
+  @sudo
+  Scenario Outline: netns namespece command
+    When I run `<command>`
+    Then the stdout should contain "<output>"
+    Examples:
+       |command                                  |output                             |
+       |trema netns host1 ip add show host1      |192.168.1.2                        |
+       |trema netns host1 -- ping -c1 192.168.1.3|1 packets transmitted, 1 received, |
+       |trema netns host1 "ping -c1 192.168.1.3" |1 packets transmitted, 1 received, |
+       |trema netns host1 "ip addr \| grep 127"  |127.0.0.1                          |
+       |trema netns host1 ls $PWD                |simple_hub.conf                    |

data/features/trema_run/conf_option.feature

@@ -3,7 +3,12 @@ Feature: -c (--conf) option
   -c (--conf) option specifies emulated network configuration
 
   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 switch_ready(dpid)
@@ -19,13 +24,13 @@ Feature: -c (--conf) option
   @sudo
   Scenario: -c option
     When I successfully run `trema run hello.rb -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "Hello.log" should contain "Hello 0xabc!"
 
   @sudo
   Scenario: --conf option
     When I successfully run `trema run hello.rb --conf trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "Hello.log" should contain "Hello 0xabc!"
 
   @sudo

data/features/trema_run/daemonize_option.feature

@@ -3,7 +3,12 @@ Feature: -d (--daemonize) option
   -d (--daemonize) runs a controller as a daemon
 
   Background:
-    Given a file named "null_controller.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "null_controller.rb" with:
       """ruby
       class NullController < Trema::Controller; end
       """

data/features/trema_run/log_dir_option.feature

@@ -3,7 +3,11 @@ Feature: -L (--log_dir) option
   -L (--log_dir) option specifies the location to put log files
 
   Background:
-    Given a file named "null_controller.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "null_controller.rb" with:
       """ruby
       class NullController < Trema::Controller; end
       """
@@ -12,14 +16,14 @@ Feature: -L (--log_dir) option
   Scenario: -L option
     Given a directory named "log"
     When I successfully run `trema run null_controller.rb -L log -d`
-    And I run `sleep 3`
+    And sleep 3
     Then a file named "log/NullController.log" should exist
 
   @sudo
   Scenario: --log_dir option
     Given a directory named "log"
     When I successfully run `trema run null_controller.rb --log_dir log -d`
-    And I run `sleep 3`
+    And sleep 3
     Then a file named "log/NullController.log" should exist
 
   @sudo

data/features/trema_run/logging_level_option.feature

@@ -1,6 +1,11 @@
 Feature: -l (--logging_level) option
   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)
@@ -17,7 +22,7 @@ Feature: -l (--logging_level) option
   @sudo
   Scenario: --logging_level debug
     When I run `trema run hello.rb --logging_level debug -d`
-    And I run `sleep 3`
+    And sleep 3
     And the file "Hello.log" should contain "DEBUG -- : Konnichi Wa"
 
   @sudo

data/features/trema_run/openflow13_option.feature

@@ -3,7 +3,12 @@ Feature: --openflow13 option
   Use --openflow13 option to enable OpenFlow 1.3
 
   Background:
-    Given a file named "openflow_version.rb" with:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "openflow_version.rb" with:
       """ruby
       class OpenflowVersion < Trema::Controller
         def switch_ready(dpid)
@@ -23,17 +28,17 @@ Feature: --openflow13 option
   @sudo
   Scenario: --openflow13 option
     When I successfully run `trema run openflow_version.rb --openflow13 -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "OpenflowVersion.log" should contain "ofp_version = 4"
 
   @sudo
   Scenario: --no-openflow13 option
     When I successfully run `trema run openflow_version.rb --no-openflow13 -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "OpenflowVersion.log" should contain "ofp_version = 1"
 
   @sudo
   Scenario: the default OpenFlow version is 1.0
     When I successfully run `trema run openflow_version.rb -c trema.conf -d`
-    And I run `sleep 5`
+    And sleep 5
     Then the file "OpenflowVersion.log" should contain "ofp_version = 1"