trema 0.2.5 → 0.2.6

data/features/example.switch_monitor.feature

@@ -1,51 +1,33 @@
-Feature: Hello trema sample application
+Feature: "Switch Monitor" sample application
 
-  As a Trema user
-  I want to list up OpenFlow switches in my network
-  So that I can monitor my switches
+  In order to learn how to listen switch UP/DOWN event
+  As a developer using Trema
+  I want to execute "Switch Monitor" sample application
 
-
-  Scenario: switch-monitor
-    Given I try trema run "./src/examples/switch_monitor/switch-monitor.rb" with following configuration (backgrounded):
+  Background:
+    Given a file named "switch_monitor.conf" with:
       """
       vswitch { datapath_id 0x1 }
       vswitch { datapath_id 0x2 }
       vswitch { datapath_id 0x3 }
       """
-      And *** sleep 2 ***
-      And wait until "SwitchMonitor" is up
-    When I try trema kill "0x3"
-      And *** sleep 2 ***
-    Then the log file "SwitchMonitor.log" should match:
-      """
-      Switch 0x3 is DOWN
-      """
-    When I try trema up "0x3"
-      And *** sleep 10 ***
-    Then the log file "SwitchMonitor.log" should match:
-      """
-      All switches = 0x1, 0x2, 0x3
-      """
 
+  @slow_process
+  Scenario: Run "Switch Monitor" C example
+    Given I run `trema run ../../objects/examples/switch_monitor/switch_monitor -c switch_monitor.conf -d`
+     And wait until "switch_monitor" is up
+    When I run `trema kill 0x3`
+    Then the file "../../tmp/log/switch_monitor.log" should contain "Switch 0x3 is DOWN"
+    When I run `trema up 0x3`
+     And *** sleep 10 ***
+    Then the file "../../tmp/log/switch_monitor.log" should contain "All switches = 0x1, 0x2, 0x3"
 
-  Scenario: switch-monitor in C
-    Given I try trema run "./objects/examples/switch_monitor/switch_monitor" with following configuration (backgrounded):
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      vswitch { datapath_id 0x3 }
-      """
-      And *** sleep 2 ***
-      And wait until "switch_monitor" is up
-    When I try trema kill "0x3"
-      And *** sleep 2 ***
-    Then the log file "switch_monitor.log" should match:
-      """
-      Switch 0x3 is DOWN
-      """
-    When I try trema up "0x3"
-      And *** sleep 10 ***
-    Then the log file "switch_monitor.log" should match:
-      """
-      All switches  = 0x1, 0x2, 0x3
-      """
+  @slow_process
+  Scenario: Run "Switch Monitor" Ruby example
+    Given I run `trema run ../../src/examples/switch_monitor/switch-monitor.rb -c switch_monitor.conf -d`
+     And wait until "SwitchMonitor" is up
+    When I run `trema kill 0x3`
+    Then the file "../../tmp/log/SwitchMonitor.log" should contain "Switch 0x3 is DOWN"
+    When I run `trema up 0x3`
+     And *** sleep 10 ***
+    Then the file "../../tmp/log/SwitchMonitor.log" should contain "All switches = 0x1, 0x2, 0x3"

data/features/packetin_filter.feature

@@ -4,46 +4,52 @@ Feature: packetin_filter help
   I want to see the help message of packetin_filter command
   So that I can learn how to use packetin_filter
 
+  @wip
   Scenario: packetin_filter --help
     When I try to run "./objects/packetin_filter/packetin_filter --help"
     Then the output should be:
       """
       OpenFlow Packet in Filter.
       Usage: packetin_filter [OPTION]... [PACKETIN-FILTER-RULE]...
-      
-        -n, --name=SERVICE_NAME     service name
-        -d, --daemonize             run in the background
-        -l, --logging_level=LEVEL   set logging level
-        -h, --help                  display this help and exit
-      
+
+        -n, --name=SERVICE_NAME         service name
+        -d, --daemonize                 run in the background
+        -l, --logging_level=LEVEL       set logging level
+        -g, --syslog                    output log messages to syslog
+        -f, --logging_facility=FACILITY set syslog facility
+        -h, --help                      display this help and exit
+
       PACKETIN-FILTER-RULE:
         match-type::destination-service-name
-      
+
       match-type:
-        lldp                        LLDP ethernet frame type and priority is 0x8000
-        packet_in                   any packet and priority is zero
-      
-      destination-service-name      destination service name
+        lldp                            LLDP ethernet frame type and priority is 0x8000
+        packet_in                       any packet and priority is zero
+
+      destination-service-name          destination service name
       """
 
+  @wip
   Scenario: packetin_filter -h
     When I try to run "./objects/packetin_filter/packetin_filter -h"
     Then the output should be:
       """
       OpenFlow Packet in Filter.
       Usage: packetin_filter [OPTION]... [PACKETIN-FILTER-RULE]...
-      
-        -n, --name=SERVICE_NAME     service name
-        -d, --daemonize             run in the background
-        -l, --logging_level=LEVEL   set logging level
-        -h, --help                  display this help and exit
-      
+
+        -n, --name=SERVICE_NAME         service name
+        -d, --daemonize                 run in the background
+        -l, --logging_level=LEVEL       set logging level
+        -g, --syslog                    output log messages to syslog
+        -f, --logging_facility=FACILITY set syslog facility
+        -h, --help                      display this help and exit
+
       PACKETIN-FILTER-RULE:
         match-type::destination-service-name
-      
+
       match-type:
-        lldp                        LLDP ethernet frame type and priority is 0x8000
-        packet_in                   any packet and priority is zero
-      
-      destination-service-name      destination service name
+        lldp                            LLDP ethernet frame type and priority is 0x8000
+        packet_in                       any packet and priority is zero
+
+      destination-service-name          destination service name
       """

data/features/step_definitions/misc_steps.rb

@@ -1,6 +1,4 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -41,19 +39,32 @@ Then /^([^\s]*) is terminated$/ do | name |
 end
 
 
-Then /^vswitch ([^\s]*) is terminated$/ do | dpid |
-  pid_file = File.join( Trema.tmp, "openflowd.#{ dpid }.pid" )
+Then /^the vswitch "(.*?)" is running$/ do | dpid |
+  pid_file = File.join( Trema.pid, "open_vswitch.#{ dpid }.pid" )
+  File.exists?( pid_file ).should be_true
+end
+
+
+Then /^the vswitch "([^"]*)" is terminated$/ do | dpid |
+  pid_file = File.join( Trema.pid, "open_vswitch.#{ dpid }.pid" )
   File.exists?( pid_file ).should be_false
 end
 
 
-Then /^([^\s]*) is started$/ do | name |
-  ps_entry_of( name ).should_not be_empty
+Then /^the vhost "(.*?)" is terminated$/ do | host |
+  pid_file = File.join( Trema.pid, "phost.#{ host }.pid" )
+  File.exists?( pid_file ).should be_false
 end
 
 
-Then /^switch_manager should be killed$/ do
-  IO.read( @log ).should match( /^Shutting down switch_manager/ )
+Then /^the controller "(.*?)" is terminated$/ do | controller |
+  pid_file = File.join( Trema.pid, "#{ controller }.pid" )
+  File.exists?( pid_file ).should be_false
+end
+
+
+Then /^([^\s]*) is started$/ do | name |
+  ps_entry_of( name ).should_not be_empty
 end
 
 

data/features/step_definitions/send_packets_steps.rb

@@ -1,6 +1,4 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,8 +17,7 @@
 
 
 When /^I send (\d+) packets from (.+) to (.+)$/ do | n_packets, host_a, host_b |
-  run "./trema send_packets --source #{ host_a } --dest #{ host_b } --n_pkts #{ n_packets }"
-  sleep 1  # ensure that all packets are sent
+  step "I run `trema send_packets --source #{ host_a } --dest #{ host_b } --n_pkts #{ n_packets }`"
 end
 
 
@@ -29,12 +26,6 @@ When /^I send 1 packet from (.+) to (.+)$/ do | host_a, host_b |
 end
 
 
-When /^I send packets from (.+) to (.+) \(duration = (\d+)\)$/ do | host_a, host_b, duration |
-  run "./trema send_packets --source #{ host_a } --dest #{ host_b } --duration #{ duration }"
-  sleep 1  # ensure that all packets are sent
-end
-
-
 ### Local variables:
 ### mode: Ruby
 ### coding: utf-8-unix

data/features/step_definitions/stats_steps.rb

@@ -1,6 +1,4 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,15 +17,17 @@
 
 
 Then /^the total number of tx packets should be:$/ do | table |
+  sleep 1
   table.hashes[ 0 ].each_pair do | host, n |
-    count_packets( `./trema show_stats #{ host } --tx` ).should == n.to_i
+    count_packets( `trema show_stats #{ host } --tx` ).should == n.to_i
   end
 end
 
 
 Then /^the total number of rx packets should be:$/ do | table |
+  sleep 1
   table.hashes[ 0 ].each_pair do | host, n |
-    count_packets( `./trema show_stats #{ host } --rx` ).should == n.to_i
+    count_packets( `trema show_stats #{ host } --rx` ).should == n.to_i
   end
 end
 

data/features/support/env.rb

@@ -31,6 +31,7 @@ end
 $LOAD_PATH.unshift( File.expand_path( File.dirname( __FILE__ ) + "/../../ruby" ) )
 
 
+require "aruba/cucumber"
 require "rspec"
 require "tempfile"
 require "trema/executables"
@@ -54,7 +55,7 @@ end
 
 def new_tmp_log
   system "rm #{ Trema.log }/tmp.*" # cleanup
-  `mktemp --tmpdir=#{ Trema.log }`.chomp  
+  `mktemp --tmpdir=#{ Trema.log }`.chomp
 end
 
 

data/features/support/hooks.rb

@@ -1,8 +1,41 @@
+#
+# Copyright (C) 2008-2012 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.
+#
+
+
 Before do
-  run "./trema killall"
+  @aruba_timeout_seconds = 5
+  run "trema killall"
+  sleep 5
+end
+
+
+Before( "@slow_process" ) do
+  @aruba_io_wait_seconds = 1
 end
 
 
 After do
-  run "./trema killall"
+  run "trema killall"
+  sleep 1
 end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/features/switch_manager.feature

@@ -4,6 +4,7 @@ Feature: switch_manager help
   I want to see the help message of switch_manager command
   So that I can learn how to use switch_manager
 
+  @wip
   Scenario: switch_manager --help
     When I try to run "./objects/switch_manager/switch_manager --help"
     Then the output should be:
@@ -11,14 +12,17 @@ Feature: switch_manager help
       OpenFlow Switch Manager.
       Usage: switch_manager [OPTION]... [-- SWITCH_MANAGER_OPTION]...
 
-        -s, --switch=PATH           the command path of switch
-        -n, --name=SERVICE_NAME     service name
-        -p, --port=PORT             server listen port (default 6633)
-        -d, --daemonize             run in the background
-        -l, --logging_level=LEVEL   set logging level
-        -h, --help                  display this help and exit
+        -s, --switch=PATH               the command path of switch
+        -n, --name=SERVICE_NAME         service name
+        -p, --port=PORT                 server listen port (default 6633)
+        -d, --daemonize                 run in the background
+        -l, --logging_level=LEVEL       set logging level
+        -g, --syslog                    output log messages to syslog
+        -f, --logging_facility=FACILITY set syslog facility
+        -h, --help                      display this help and exit
       """
 
+  @wip
   Scenario: switch_manager -h
     When I try to run "./objects/switch_manager/switch_manager -h"
     Then the output should be:
@@ -26,10 +30,12 @@ Feature: switch_manager help
       OpenFlow Switch Manager.
       Usage: switch_manager [OPTION]... [-- SWITCH_MANAGER_OPTION]...
 
-        -s, --switch=PATH           the command path of switch
-        -n, --name=SERVICE_NAME     service name
-        -p, --port=PORT             server listen port (default 6633)
-        -d, --daemonize             run in the background
-        -l, --logging_level=LEVEL   set logging level
-        -h, --help                  display this help and exit
+        -s, --switch=PATH               the command path of switch
+        -n, --name=SERVICE_NAME         service name
+        -p, --port=PORT                 server listen port (default 6633)
+        -d, --daemonize                 run in the background
+        -l, --logging_level=LEVEL       set logging level
+        -g, --syslog                    output log messages to syslog
+        -f, --logging_facility=FACILITY set syslog facility
+        -h, --help                      display this help and exit
       """

data/features/trema-config.feature

@@ -1,68 +1,55 @@
-Feature: trema-config compile helper
-
-  As a Trema user
-  I want to compile trema apps like: gcc -o hello_trema hello_trema.c `trema-config --cflags --libs`
-  So that I can compile trema apps without specifying Trema-specific flags and options.
+Feature: trema-config command
 
+  In order to specify C compiler options easily
+  As a developer using Trema
+  I want to use trema-config command
 
   Scenario: trema-config --cflags
-    When I try to run "gcc -c src/examples/hello_trema/hello_trema.c `./trema-config --cflags` -o tmp/hello_trema.o"
-    Then I should not get errors
-
+    When I run `trema-config --cflags`
+    Then the output should match /^-I\S+lib -I\S+openflow$/
 
   Scenario: trema-config -c
-    When I try to run "gcc -c src/examples/hello_trema/hello_trema.c `./trema-config -c` -o tmp/hello_trema.o"
-    Then I should not get errors
-
+    When I run `trema-config -c`
+    Then the output should match /^-I\S+lib -I\S+openflow$/
 
   Scenario: trema-config --libs
-    When I try to run "gcc -c src/examples/hello_trema/hello_trema.c `./trema-config --cflags` -o tmp/hello_trema.o"
-     And I try to run "gcc tmp/hello_trema.o `./trema-config --libs` -o tmp/hello_trema"
-    Then I should not get errors
-
+    When I run `trema-config --libs`
+    Then the output should match /^-L\S+lib -l.*/
 
   Scenario: trema-config -l
-    When I try to run "gcc -c src/examples/hello_trema/hello_trema.c `./trema-config --cflags` -o tmp/hello_trema.o"
-     And I try to run "gcc tmp/hello_trema.o `./trema-config -l` -o tmp/hello_trema"
-    Then I should not get errors
-
+    When I run `trema-config -l`
+    Then the output should match /^-L\S+lib -l.*/
 
   Scenario: trema-config --cflags --libs
-    When I try to run "gcc -c src/examples/hello_trema/hello_trema.c `./trema-config -c` -o tmp/hello_trema.o"
-     And I try to run "gcc tmp/hello_trema.o `./trema-config --cflags --libs` -o tmp/hello_trema"
-    Then I should not get errors
-
+    When I run `trema-config --cflags --libs`
+    Then the output should match /^-I\S+lib -I\S+openflow -L\S+lib -l.*/
 
   Scenario: trema-config -c --libs
-    When I try to run "gcc src/examples/hello_trema/hello_trema.c `./trema-config -c --libs` -o tmp/hello_trema"
-    Then I should not get errors
-
+    When I run `trema-config -c --libs`
+    Then the output should match /^-I\S+lib -I\S+openflow -L\S+lib -l.*/
 
   Scenario: trema-config --cflags -l
-    When I try to run "gcc src/examples/hello_trema/hello_trema.c `./trema-config --cflags -l` -o tmp/hello_trema"
-    Then I should not get errors
-
+    When I run `trema-config --cflags -l`
+    Then the output should match /^-I\S+lib -I\S+openflow -L\S+lib -l.*/
 
   Scenario: trema-config -c -l
-    When I try to run "gcc src/examples/hello_trema/hello_trema.c `./trema-config -c -l` -o tmp/hello_trema"
-    Then I should not get errors
-
+    When I run `trema-config -c -l`
+    Then the output should match /^-I\S+lib -I\S+openflow -L\S+lib -l.*/
 
   Scenario: trema-config --help
-    When I try to run "./trema-config --help"
-    Then the output should be:
+    When I run `trema-config --help`
+    Then the output should contain:
       """
-      Usage: ./trema-config [OPTIONS ...]
+      Usage: trema-config [OPTIONS ...]
           -c, --cflags
           -l, --libs
       """
 
-
   Scenario: trema-config -h
-    When I try to run "./trema-config -h"
-    Then the output should be:
+    When I run `trema-config -h`
+    Then the output should contain:
       """
-      Usage: ./trema-config [OPTIONS ...]
+      Usage: trema-config [OPTIONS ...]
           -c, --cflags
           -l, --libs
       """