trema 0.4.7 → 0.4.8

data/features/step_definitions/README.md

@@ -0,0 +1,7 @@
+Cucumber Step Definitions
+=========================
+
+A collection of step definitions for use with [Trema][trema] and Trema apps.
+These steps are highly specific to Trema.
+
+[trema]: https://github.com/trema/trema

data/features/step_definitions/Rakefile

@@ -0,0 +1,10 @@
+task default: :rubocop
+
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+rescue LoadError
+  task :rubocop do
+    $stderr.puts 'RuboCop is disabled'
+  end
+end

data/features/step_definitions/show_stats_steps.rb

@@ -0,0 +1,56 @@
+# rubocop:disable LineLength
+
+Then(/^the number of packets sent from "(.*?)" should be:$/) do |host_name, table|
+  command = "trema show_stats #{host_name}"
+  step "I successfully run `#{command}`"
+
+  result = {}
+  in_current_dir do
+    output_from(command).split("\n").each do |each|
+      case each
+      when /Packets sent/
+        next
+      when /Packets recevied/
+        break
+      when /-> (\S+) = (\d+) packet/
+        result[Regexp.last_match(1)] = Regexp.last_match(2).to_i
+      else
+        fail "Failed to parse line '#{each}'"
+      end
+    end
+  end
+  table.hashes.each do |each|
+    ip_address = each.fetch('destination')
+    expect(result.fetch(ip_address)).to eq(each.fetch('#packets').to_i)
+  end
+end
+
+Then(/^the number of packets received by "(.*?)" should be:$/) do |host_name, table|
+  command = "trema show_stats #{host_name}"
+  step "I successfully run `#{command}`"
+
+  result = Hash.new(0)
+  in_current_dir do
+    received = false
+    output_from(command).split("\n").each do |each|
+      case each
+      when /Packets sent/
+        next
+      when /Packets received/
+        received = true
+        next
+      when /(\S+) -> (\S+) = (\d+) packet/
+        next unless received
+        result[Regexp.last_match(1)] = Regexp.last_match(3).to_i
+      else
+        fail "Failed to parse line '#{each}'"
+      end
+    end
+  end
+  table.hashes.each do |each|
+    ip_address = each.fetch('source')
+    expect(result[ip_address]).to eq(each.fetch('#packets').to_i)
+  end
+end
+
+# rubocop:enable LineLength

data/features/step_definitions/virtual_link_steps.rb

@@ -0,0 +1,8 @@
+# rubocop:disable LineLength
+
+Then(/^virtual links should not exist$/) do
+  step %(I run `bash -c 'ifconfig | grep "^link[0-9]\+-[0-9]\+" > virtual_links.txt'`)
+  step 'the file "virtual_links.txt" should not contain "link"'
+end
+
+# rubocop:enable LineLength

data/features/support/env.rb

@@ -1,74 +1 @@
-#
-# Copyright (C) 2008-2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 2, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-
-require 'bundler'
-begin
-  Bundler.setup :default, :development
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts 'Run `bundle install` to install missing gems'
-  exit e.status_code
-end
-
-
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../../ruby'))
-
-
 require 'aruba/cucumber'
-require 'rspec'
-require 'tempfile'
-require 'trema/executables'
-require 'trema/monkey-patch/string'
-
-
-def run(command)
-  fail "Failed to execute #{ command }" unless system(command)
-end
-
-
-def ps_entry_of(name)
-  `ps -ef | grep -w "#{ name } " | grep -v grep`
-end
-
-
-def cucumber_log(name)
-  File.join Trema.log, name
-end
-
-
-def new_tmp_log
-  system "rm #{ Trema.log }/tmp.*" # cleanup
-  `mktemp --tmpdir=#{ Trema.log }`.chomp
-end
-
-
-# show_stats output format:
-# ip_dst,tp_dst,ip_src,tp_src,n_pkts,n_octets
-def count_packets(stats)
-  return 0 if stats.split.size <= 1
-  stats.split[ 1..-1].inject(0) do | sum, each |
-    sum += each.split(',')[ 4].to_i
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/features/support/hooks.rb

@@ -1,57 +1,13 @@
-#
-# Copyright (C) 2008-2013 NEC Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License, version 2, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-
-require 'trema/path'
-
-
-def wait_until_all_pid_files_are_deleted(timeout = 12)
-  elapsed = 0
-  loop do
-    fail 'Failed to clean up remaining processes.' if elapsed > timeout
-    break if Dir.glob(File.join(Trema.pid, '*.pid')).empty?
-    sleep 0.1
-    elapsed += 0.1
-  end
-  sleep 1
-end
-
-
 Before do
-  @aruba_timeout_seconds = 10
-  run 'trema killall'
-  wait_until_all_pid_files_are_deleted
+  @aruba_timeout_seconds = 5
 end
 
-
-Before('@slow_process') do
-  @aruba_io_wait_seconds = 1
+Before('@sudo') do
+  fail 'sudo authentication failed' unless system 'sudo -v'
+  @aruba_timeout_seconds = 10
 end
 
-
 After do
-  run 'trema killall'
-  wait_until_all_pid_files_are_deleted
-  processes.clear
+  run 'trema killall --all'
+  sleep 5
 end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/features/trema_delete_link.feature

@@ -0,0 +1,30 @@
+Feature: trema start command
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "packet_in_controller.rb" with:
+      """
+      class PacketInController < Trema::Controller
+        def packet_in(dpid, message)
+          logger.info 'new packet_in'
+        end
+      end
+      """
+    And a file named "trema.conf" with:
+      """
+      vswitch { datapath_id 0xabc }
+      vhost('host1') { ip '192.168.0.1' }
+      vhost('host2') { ip '192.168.0.2' }
+      link '0xabc', 'host1'
+      link '0xabc', 'host2'
+      """
+    And I run `trema run packet_in_controller.rb -c trema.conf -d`
+
+  @sudo
+  Scenario: trema delete_link 0xabc host1
+    When I successfully run `trema delete_link 0xabc host1`
+    And I successfully run `trema send_packets --source host1 --dest host2`
+    Then the file "PacketInController.log" should not contain "new packet_in"

data/features/trema_killall.feature

@@ -0,0 +1,56 @@
+Feature: trema killall command
+  Background:
+    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:
+      """
+      class NullController < Trema::Controller; end
+      """
+    And a file named "trema.conf" with:
+      """
+      vswitch { datapath_id 0xabc }
+      vhost('host1') { ip '192.168.0.1' }
+      vhost('host2') { ip '192.168.0.2' }
+      link '0xabc', 'host1'
+      link '0xabc', 'host2'
+      """
+    And I run `trema run null_controller.rb -c trema.conf -d`
+    And a file named "void_controller.rb" with:
+      """
+      class VoidController < Trema::Controller; end
+      """
+    And I run `trema run void_controller.rb -p 6654 -d`
+
+  @sudo
+  Scenario: killall controller_name
+    When I successfully run `trema killall NullController`
+    Then virtual links should not exist 
+    And I successfully run `ls`
+    And the following files should not exist:
+      | NullController.pid |
+      | vhost.host1.pid    |
+      | vhost.host2.pid    |
+    And the following files should exist:
+      | VoidController.pid |
+  
+  @sudo
+  Scenario: killall --all
+    When I successfully run `trema killall --all`
+    Then virtual links should not exist 
+    And the following files should not exist:
+      | NullController.pid |
+      | VoidController.pid |
+      | vhost.host1.pid    |
+      | vhost.host2.pid    |
+
+  @sudo
+  Scenario: killall NO_SUCH_NAME
+    When I run `trema killall NO_SUCH_NAME`
+    Then the exit status should not be 0
+    And the output should contain:
+    """
+    Controller process "NO_SUCH_NAME" does not exist.
+    """

data/features/trema_run.feature

@@ -0,0 +1,47 @@
+Feature: trema run command
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+
+  @sudo
+  Scenario: the default port
+    Given a file named "switch_ready.rb" with:
+      """
+      class SwitchReady < Trema::Controller
+        def switch_ready(dpid)
+          logger.info format('Hello %s!', dpid.to_hex)
+        end
+      end
+      """
+    And a file named "trema.conf" with:
+      """
+      vswitch { datapath_id 0xabc }
+      """
+    When I successfully run `trema -v run switch_ready.rb -c trema.conf -d`
+    And I run `sleep 5`
+    Then the file "SwitchReady.log" should contain "Hello 0xabc!"
+
+  @sudo
+  Scenario: -p option
+    Given a file named "switch_ready.rb" with:
+      """
+      class SwitchReady < Trema::Controller
+        def switch_ready(dpid)
+          logger.info format('Hello %s!', dpid.to_hex)
+        end
+      end
+      """
+    And a file named "trema.conf" with:
+      """
+      vswitch {
+        datapath_id 0xabc
+        port 1234
+      }
+      """
+    When I successfully run `trema -v run -p 1234 switch_ready.rb -c trema.conf -d`
+    And I run `sleep 5`
+    Then the file "SwitchReady.log" should contain "Hello 0xabc!"
+

data/features/trema_start.feature

@@ -0,0 +1,73 @@
+Feature: trema start command
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "switch_ready_controller.rb" with:
+      """
+      class SwitchReadyController < Trema::Controller
+        def switch_ready(dpid)
+          if @reconnect
+            logger.info "Switch #{dpid.to_hex} connected again."
+          else
+            logger.info "Switch #{dpid.to_hex} connected."
+            @reconnect = true
+          end
+        end
+      end
+      """
+    And a file named "trema.conf" with:
+      """
+      vswitch { datapath_id 0xabc }
+      vhost('host1') { ip '192.168.0.1' }
+      link '0xabc', 'host1'
+      """
+    And I run `trema run switch_ready_controller.rb -c trema.conf -d`
+
+  @sudo
+  Scenario: trema stop and start switch_name
+    Given I successfully run `trema stop 0xabc`
+    When I successfully run `trema start 0xabc`
+    And I successfully run `sleep 10`
+    Then the file "SwitchReadyController.log" should contain:
+      """
+      Switch 0xabc connected again.
+      """
+
+  @sudo
+  Scenario: trema stop and start host_name
+    Given I successfully run `trema stop host1`
+    And I successfully run `sleep 3`
+    When I successfully run `trema start host1`
+    And I successfully run `sleep 10`
+    Then the following files should exist:
+      | vhost.host1.pid |
+
+  @sudo
+  Scenario: start switch_name (already running)
+    When I run `trema start 0xabc`
+    Then the exit status should not be 0
+    And the output should contain:
+      """
+      error: Open vSwitch (dpid = 2748) is already running!
+      """
+
+  @sudo
+  Scenario: start host_name (already running)
+    When I run `trema start host1`
+    Then the exit status should not be 0
+    # And the output should contain:
+    #   """
+    #   error: vhost "host1" is already running!
+    #   """
+
+  @sudo
+  Scenario: start NO_SUCH_NAME
+    When I run `trema start NO_SUCH_NAME`
+    Then the exit status should not be 0
+    And the output should contain:
+      """
+      "NO_SUCH_NAME" does not exist.
+      """

data/features/trema_stop.feature

@@ -0,0 +1,50 @@
+Feature: trema stop command
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "switch_disconnected_controller.rb" with:
+      """
+      class SwitchDisconnectedController < Trema::Controller
+        def switch_disconnected(dpid)
+          logger.info "Switch #{dpid.to_hex} is disconnected."
+        end
+      end
+      """
+    And a file named "trema.conf" with:
+      """
+      vswitch { datapath_id 0xabc }
+
+      vhost('host1') { ip '192.168.0.1' }
+      vhost('host2') { ip '192.168.0.2' }
+
+      link '0xabc', 'host1'
+      link '0xabc', 'host2'
+      """
+    And I run `trema run switch_disconnected_controller.rb -c trema.conf -d`
+
+  @sudo
+  Scenario: stop switch_name
+    When I successfully run `trema stop 0xabc`
+    And I successfully run `sleep 10`
+    Then the file "SwitchDisconnectedController.log" should contain:
+      """
+      Switch 0xabc is disconnected.
+      """
+
+  @sudo
+  Scenario: stop host_name
+    When I successfully run `trema stop host1`
+    And I successfully run `sleep 5`
+    Then the file "vhost.host1.pid" should not exist
+
+  @sudo
+  Scenario: stop NO_SUCH_NAME
+    When I run `trema stop NO_SUCH_NAME`
+    Then the exit status should not be 0
+    And the output should contain:
+    """
+    "NO_SUCH_NAME" does not exist.
+    """