trema 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: 9885ea68bffe5d48af843709c06d6b0380ea2916
-  metadata.gz: 5b4335551a0a407c64d74c84641fac37ffb7167c
+  metadata.gz: 16d03309cfb3b65ed463dff0c59990db3f87dc26
+  data.tar.gz: 7e9dbad2ecea2ab026bf0ba0ee3cb79cf2885009
 SHA512: 
-  data.tar.gz: e5484148554ae7e4c21e4653e91c13fee369a06b31c2454d15272a8ac581399b5079a818488d5d60d03388459173a26fe46b818aa3f55acbd1d5937dd4a51bf8
-  metadata.gz: e5defc8906693729384d4031065110450bffeab98f5954fa3e0b71ba9b3901512d1ca1e80f6a2b276b5111b1148a8620373c4fb48ba6a386a8e5cd50499883f1
+  metadata.gz: be99f19cbba01fd9c25eaaee21389ffc4c334adefc5a5f6b681f8bd89938cef58780cb46bde60997c6d414f124465ef08035a22ed830498d7915c68f55256af5
+  data.tar.gz: 4de20550f57a268e26f419d53510222a5294caee7dc5ce31a472aded241ea7e40b000fbb8a0e235164d64dda1e7664f204e670aa71fa75c0cb38bc4e87c7246a

data/Gemfile

@@ -13,16 +13,16 @@ gemspec
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "aruba", "~> 0.5.1"
-  gem "cucumber", "~> 1.2.3"
-  gem "flay", "~> 2.1.0"
-  gem "flog", "~> 3.2.2"
+  gem "aruba", "~> 0.5.3"
+  gem "cucumber", "~> 1.3.2"
+  gem "flay", "~> 2.3.0"
+  gem "flog", "~> 4.1.0"
   gem "rcov", "~> 1.0.0"
-  gem "redcarpet", "~> 2.2.2"
+  gem "redcarpet", "~> 2.3.0"
   gem "reek", "~> 1.3.1"
-  gem "relish", "~> 0.6"
+  gem "relish", "~> 0.7"
   gem "rspec", "~> 2.13.0"
-  gem "yard", "~> 0.8.5.2"
+  gem "yard", "~> 0.8.6.1"
 end
 
 

data/README.md

@@ -29,8 +29,8 @@ Trema supports GNU/Linux only. And it has been tested on the following environme
 
 * Ruby 1.8.7 (1.9.x is NOT supported yet)
 * RubyGems 1.3.6 or higher
-* Ubuntu 12.10, 12.04, 11.10, and 10.04 (i386/amd64, Desktop Edition)
-* Debian GNU/Linux 6.0 (i386/amd64)
+* Ubuntu 13.04, 12.10, 12.04, 11.10, and 10.04 (i386/amd64, Desktop Edition)
+* Debian GNU/Linux 7.0 and 6.0 (i386/amd64)
 * Fedora 16 (i386/x86_64)
 
 It may also run on other GNU/Linux distributions but is not tested and
@@ -48,7 +48,7 @@ Getting Started
 
 1.Install the prerequisites at the command prompt:
 
-    (In Ubuntu 12.10)
+    (In Ubuntu 13.04, 12.10, or Debian GNU/Linux 7.0)
     $ sudo apt-get install gcc make ruby1.8 rubygems1.8 ruby1.8-dev libpcap-dev libsqlite3-dev
 
     (In Ubuntu 12.04, 11.10 or Debian GNU/Linux 6.0)

data/Rakefile

@@ -409,7 +409,7 @@ end
 # Tests
 ################################################################################
 
-task :travis => [ :setup, :build_trema ]
+task :travis => [ :setup, :build_trema, "spec:travis" ]
 
 
 begin
@@ -430,6 +430,15 @@ begin
     task.rspec_opts = "--tag type:actions --format documentation --color"
   end
 
+
+  task "spec:travis" => :build_trema
+  RSpec::Core::RakeTask.new( "spec:travis" ) do | task |
+    task.verbose = $trace
+    task.pattern = FileList[ "spec/trema/hello_spec.rb", "spec/trema/echo-*_spec.rb" ]
+    task.rspec_opts = "--tag ~sudo --format documentation --color"
+  end
+
+
   task :rcov => :build_trema
   RSpec::Core::RakeTask.new( :rcov ) do | spec |
     spec.pattern = "spec/**/*_spec.rb"
@@ -488,15 +497,15 @@ begin
   desc "Analyze for code complexity"
   task :flog do
     flog = Flog.new( :continue => true )
-    flog.flog $quality_targets
+    flog.flog *$quality_targets
     threshold = 10
 
     bad_methods = flog.totals.select do | name, score |
-      name != "main#none" && score > threshold
+      ( not ( /##{flog.no_method}$/=~ name ) ) and score > threshold
     end
     bad_methods.sort do | a, b |
       a[ 1 ] <=> b[ 1 ]
-    end.each do | name, score |
+    end.reverse.each do | name, score |
       puts "%8.1f: %s" % [ score, name ]
     end
     unless bad_methods.empty?

data/cruise.rb

@@ -186,7 +186,7 @@ def gcov gcda, dir
     shell.on_stdout do | l |
       file = File.expand_path( $1 ) if /^File '(.*)'/=~ l
       testee = $c_files[ file ]
-      if /^Lines executed:(.*)% of (.*)$/=~ l
+      if /^Lines executed:(.*)% of (.*)$/=~ l and not testee.nil?
         testee.coverage = $1.to_f
         testee.lines = $2.to_i
       end

data/features/examples/switch_monitor.feature

@@ -17,6 +17,7 @@ Feature: "Switch Monitor" sample application
     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`
+     And *** sleep 1 ***
     Then the file "../../tmp/log/switch_monitor.log" should contain "Switch 0x3 is DOWN"
     When I run `trema up 0x3`
      And *** sleep 10 ***
@@ -27,6 +28,7 @@ Feature: "Switch Monitor" sample application
     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`
+     And *** sleep 1 ***
     Then the file "../../tmp/log/SwitchMonitor.log" should contain "Switch 0x3 is DOWN"
     When I run `trema up 0x3`
      And *** sleep 10 ***

data/features/switch_event/C-add_forward_entry.feature

@@ -41,12 +41,7 @@ Feature: C function example command "add_forward_entry"
 
   @slow_process
   Scenario Outline: Add 'mirror' to All Switch Manager/Daemon's event forwarding entries of packet_in
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './add_forward_entry -t packet_in mirror'`
     Then the output should contain "Operation Succeeded."
@@ -63,12 +58,7 @@ Feature: C function example command "add_forward_entry"
 
   @slow_process
   Scenario Outline: Switch added after event forwarding entry manipulation should also reflect new configuration of Switch Manager.
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     And I successfully run `trema run './add_forward_entry -t packet_in mirror'`
     And the output should contain "Operation Succeeded."
@@ -91,12 +81,7 @@ Feature: C function example command "add_forward_entry"
 
   @slow_process
   Scenario Outline: Add 'mirror' only to Switch Manager's event forwarding entry of packet_in
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './add_forward_entry -m -t packet_in mirror'`
     Then the output should contain "Updated service name list:"
@@ -113,12 +98,7 @@ Feature: C function example command "add_forward_entry"
 
   @slow_process
   Scenario Outline: Add 'mirror' only to Switch Daemon 0x1's event forwarding entries of packet_in
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './add_forward_entry -s 0x1 -t packet_in mirror'`
     Then the output should contain "Updated service name list:"

data/features/switch_event/C-delete_forward_entry.feature

@@ -41,12 +41,7 @@ Feature: C function example command "delete_forward_entry"
 
   @slow_process
   Scenario Outline: Delete 'RepeaterHub' from All Switch Manager/Daemon's event forwarding entries of packet_in
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './delete_forward_entry -t packet_in RepeaterHub '`
     Then the output should contain "Operation Succeeded."
@@ -61,12 +56,7 @@ Feature: C function example command "delete_forward_entry"
 
   @slow_process
   Scenario Outline: Delete 'RepeaterHub' only from Switch Manager's event forwarding entries of packet_in
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './delete_forward_entry -m -t packet_in RepeaterHub'`
     Then the output should contain "Updated service name list is empty."
@@ -81,12 +71,7 @@ Feature: C function example command "delete_forward_entry"
 
   @slow_process
   Scenario Outline: Delete 'RepeaterHub' only from Switch Daemon 0x1's event forwarding entries of packet_in
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './delete_forward_entry -s 0x1 -t packet_in RepeaterHub'`
     Then the output should contain "Updated service name list is empty."

data/features/switch_event/C-dump_forward_entries.feature

@@ -39,12 +39,7 @@ Feature: C function example command "dump_forward_entries"
 
   @slow_process
   Scenario Outline: Dump Switch Manager's event forwarding entries for each event type
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './dump_forward_entries -m -t <type>'`
     Then the output should contain "Current service name list:"
@@ -59,12 +54,7 @@ Feature: C function example command "dump_forward_entries"
 
   @slow_process
   Scenario Outline: Dump Switch Daemon's event forwarding entries for each event type on each switch
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './dump_forward_entries -s <switch> -t <type>'`
     Then the output should contain "Current service name list:"

data/features/switch_event/C-set_forward_entries.feature

@@ -40,12 +40,7 @@ Feature: C function example command "set_forward_entries"
 
   @slow_process
   Scenario Outline: Replace Switch Manager's event forwarding entries of packet_in to 'mirror' and 'filter'
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './set_forward_entries -m -t packet_in mirror,filter'`
     Then the output should contain "Updated service name list:"
@@ -64,12 +59,7 @@ Feature: C function example command "set_forward_entries"
 
   @slow_process
   Scenario Outline: Replace Switch Daemon 0x1's event forwarding entries of packet_in to 'mirror' and 'filter'
-    Given a file named "nw_dsl.conf" with:
-      """
-      vswitch { datapath_id 0x1 }
-      vswitch { datapath_id 0x2 }
-      """
-    And I successfully run `trema run ../repeater_hub/repeater-hub.rb -c nw_dsl.conf -d`
+    Given I successfully run `trema run ../repeater_hub/repeater-hub.rb -c network.conf -d`
     And wait until "RepeaterHub" is up
     When I successfully run `trema run './set_forward_entries -s 0x1 -t packet_in mirror,filter'`
     Then the output should contain "Updated service name list:"

data/features/switch_event/add_forward_entry.feature

@@ -31,7 +31,7 @@ Feature: Ruby methods for adding switch event forwarding entry
 
   @slow_process
   Scenario Outline: add_forward_entry_to_all_switches event_type, trema_name
-    Given a file named "nw_dsl.conf" with:
+    Given a file named "network.conf" with:
       """
       vswitch { datapath_id 0x1 }
       """
@@ -39,24 +39,29 @@ Feature: Ruby methods for adding switch event forwarding entry
       """ruby
       class AddEntryToAllTest < Controller
         include SwitchEvent
+        
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
       
         def switch_ready datapath_id
-          add_forward_entry_to_all_switches <event_type>, "new_controller" do | success |
+          add_forward_entry_to_all_switches @event_type, "new_controller" do | success |
             raise "Failed to add forwarding entry to all switches" if not success
-            info "Successfully added a forwarding entry of <event_type>."
-            dump_forward_entries_from_switch datapath_id, <event_type> do | success, services |
+            info "Successfully added a forwarding entry of #{@event_type_string}."
+            dump_forward_entries_from_switch datapath_id, @event_type do | success, services |
               raise "Failed to dump forwarding entry from a switch" if not success
-              info "Dumping switch #{datapath_id.to_hex}'s forwarding entries of <event_type> : #{services.inspect}"
+              info "Dumping switch #{datapath_id.to_hex}'s forwarding entries of #{@event_type_string} : #{services.inspect}"
             end
-            dump_forward_entries_from_switch_manager <event_type> do | success, services |
+            dump_forward_entries_from_switch_manager @event_type do | success, services |
               raise "Failed to dump forwarding entry from the switch manager" if not success
-              info "Dumping switch manager's forwarding entries of <event_type> : #{services.inspect}"
+              info "Dumping switch manager's forwarding entries of #{@event_type_string} : #{services.inspect}"
             end
           end
         end
       end
       """
-    When I successfully run `trema run ./AddEntryToAllTest.rb -c nw_dsl.conf -d`
+    When I successfully run `trema run "./AddEntryToAllTest.rb <event_type>" -c network.conf -d`
     And wait until "AddEntryToAllTest" is up
     And *** sleep 2 ***
     Then the file "../../tmp/log/AddEntryToAllTest.log" should contain:
@@ -73,15 +78,15 @@ Feature: Ruby methods for adding switch event forwarding entry
       """
 
     Examples: 
-      | event_type    | switch_manager_event_list             | switch_event_list                                       |
-      | :vendor       | "new_controller", "AddEntryToAllTest" | "new_controller", "AddEntryToAllTest"                   |
-      | :packet_in    | "new_controller", "AddEntryToAllTest" | "new_controller", "AddEntryToAllTest"                   |
-      | :port_status  | "new_controller", "AddEntryToAllTest" | "new_controller", "AddEntryToAllTest"                   |
-      | :state_notify | "new_controller", "AddEntryToAllTest" | "new_controller", "AddEntryToAllTest", "switch_manager" |
+      | event_type    | switch_manager_event_list             | switch_event_list                     |
+      | :vendor       | "AddEntryToAllTest", "new_controller" | "AddEntryToAllTest", "new_controller" |
+      | :packet_in    | "AddEntryToAllTest", "new_controller" | "AddEntryToAllTest", "new_controller" |
+      | :port_status  | "AddEntryToAllTest", "new_controller" | "AddEntryToAllTest", "new_controller" |
+      | :state_notify | "AddEntryToAllTest", "new_controller" | "AddEntryToAllTest", "new_controller" |
 
   @slow_process
   Scenario Outline: add_forward_entry_to_switch dpid, event_type, trema_name
-    Given a file named "nw_dsl.conf" with:
+    Given a file named "network.conf" with:
       """
       vswitch { datapath_id 0x1 }
       """
@@ -90,15 +95,20 @@ Feature: Ruby methods for adding switch event forwarding entry
       class AddEntryToSwitchDaemonTest < Controller
         include SwitchEvent
       
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         def switch_ready datapath_id
-          add_forward_entry_to_switch datapath_id, <event_type>, "new_controller" do | success, services |
+          add_forward_entry_to_switch datapath_id, @event_type, "new_controller" do | success, services |
             raise "Failed to add forwarding entry to switch" if not success
-            info "Successfully added a forwarding entry of <event_type> to switch #{datapath_id.to_hex} : #{services.inspect}"
+            info "Successfully added a forwarding entry of #{@event_type_string} to switch #{datapath_id.to_hex} : #{services.inspect}"
           end
         end
       end
       """
-    When I successfully run `trema run ./AddEntryToSwitchDaemonTest.rb -c nw_dsl.conf -d`
+    When I successfully run `trema run "./AddEntryToSwitchDaemonTest.rb <event_type>" -c network.conf -d`
     And wait until "AddEntryToSwitchDaemonTest" is up
     And *** sleep 1 ***
     Then the file "../../tmp/log/AddEntryToSwitchDaemonTest.log" should contain:
@@ -107,11 +117,11 @@ Feature: Ruby methods for adding switch event forwarding entry
       """
 
     Examples: 
-      | event_type    | switch_event_list                                                |
-      | :vendor       | "new_controller", "AddEntryToSwitchDaemonTest"                   |
-      | :packet_in    | "new_controller", "AddEntryToSwitchDaemonTest"                   |
-      | :port_status  | "new_controller", "AddEntryToSwitchDaemonTest"                   |
-      | :state_notify | "new_controller", "AddEntryToSwitchDaemonTest", "switch_manager" |
+      | event_type    | switch_event_list                              |
+      | :vendor       | "AddEntryToSwitchDaemonTest", "new_controller" |
+      | :packet_in    | "AddEntryToSwitchDaemonTest", "new_controller" |
+      | :port_status  | "AddEntryToSwitchDaemonTest", "new_controller" |
+      | :state_notify | "AddEntryToSwitchDaemonTest", "new_controller" |
 
   @slow_process
   Scenario Outline: add_forward_entry_to_switch_manager event_type, trema_name
@@ -120,16 +130,21 @@ Feature: Ruby methods for adding switch event forwarding entry
       class AddEntryToSwitchManagerTest < Controller
         include SwitchEvent
         
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         oneshot_timer_event :test_start, 0
         def test_start
-          add_forward_entry_to_switch_manager <event_type>, "new_controller" do | success, services |
+          add_forward_entry_to_switch_manager @event_type, "new_controller" do | success, services |
             raise "Failed to add forwarding entry to switch manager" if not success
-            info "Successfully added a forwarding entry of <event_type> to switch manager : #{services.inspect}"
+            info "Successfully added a forwarding entry of #{@event_type_string} to switch manager : #{services.inspect}"
           end
         end
       end
       """
-    When I successfully run `trema run ./AddEntryToSwitchManagerTest.rb -d`
+    When I successfully run `trema run "./AddEntryToSwitchManagerTest.rb <event_type>" -d`
     And wait until "AddEntryToSwitchManagerTest" is up
     And *** sleep 1 ***
     Then the file "../../tmp/log/AddEntryToSwitchManagerTest.log" should contain:
@@ -139,7 +154,7 @@ Feature: Ruby methods for adding switch event forwarding entry
 
     Examples: 
       | event_type    | switch_manager_event_list                       |
-      | :vendor       | "new_controller", "AddEntryToSwitchManagerTest" |
-      | :packet_in    | "new_controller", "AddEntryToSwitchManagerTest" |
-      | :port_status  | "new_controller", "AddEntryToSwitchManagerTest" |
-      | :state_notify | "new_controller", "AddEntryToSwitchManagerTest" |
+      | :vendor       | "AddEntryToSwitchManagerTest", "new_controller" |
+      | :packet_in    | "AddEntryToSwitchManagerTest", "new_controller" |
+      | :port_status  | "AddEntryToSwitchManagerTest", "new_controller" |
+      | :state_notify | "AddEntryToSwitchManagerTest", "new_controller" |

data/features/switch_event/delete_forward_entry.feature

@@ -31,7 +31,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
 
   @slow_process
   Scenario Outline: delete_forward_entry_from_all_switches event_type, trema_name
-    Given a file named "nw_dsl.conf" with:
+    Given a file named "network.conf" with:
       """
       vswitch { datapath_id 0x1 }
       """
@@ -40,23 +40,28 @@ Feature: Ruby methods for deleting switch event forwarding entry
       class DeleteEntryFromAllTest < Controller
         include SwitchEvent
       
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         def switch_ready datapath_id
-          delete_forward_entry_from_all_switches <event_type>, "DeleteEntryFromAllTest" do | success |
+          delete_forward_entry_from_all_switches @event_type, "DeleteEntryFromAllTest" do | success |
             raise "Failed to delete forwarding entry from all switches" if not success
-            info "Successfully deleted a forwarding entry of <event_type>."
-            dump_forward_entries_from_switch datapath_id, <event_type> do | success, services |
+            info "Successfully deleted a forwarding entry of #{@event_type_string}."
+            dump_forward_entries_from_switch datapath_id, @event_type do | success, services |
               raise "Failed to dump forwarding entry from a switch" if not success
               info "Dumping switch #{datapath_id.to_hex}'s forwarding entries of <event_type> : #{services.inspect}"
             end
-            dump_forward_entries_from_switch_manager <event_type> do | success, services |
+            dump_forward_entries_from_switch_manager @event_type do | success, services |
               raise "Failed to dump forwarding entry from the switch manager" if not success
-              info "Dumping switch manager's forwarding entries of <event_type> : #{services.inspect}"
+              info "Dumping switch manager's forwarding entries of #{@event_type_string} : #{services.inspect}"
             end
           end
         end
       end
       """
-    When I successfully run `trema run ./DeleteEntryFromAllTest.rb -c nw_dsl.conf -d`
+    When I successfully run `trema run "./DeleteEntryFromAllTest.rb <event_type>" -c network.conf -d`
     And wait until "DeleteEntryFromAllTest" is up
     And *** sleep 2 ***
     Then the file "../../tmp/log/DeleteEntryFromAllTest.log" should contain:
@@ -77,11 +82,11 @@ Feature: Ruby methods for deleting switch event forwarding entry
       | :vendor       |                           |                   |
       | :packet_in    |                           |                   |
       | :port_status  |                           |                   |
-      | :state_notify |                           | "switch_manager"  |
+      | :state_notify |                           |                   |
 
   @slow_process
   Scenario Outline: delete_forward_entry_from_switch dpid, event_type, trema_name
-    Given a file named "nw_dsl.conf" with:
+    Given a file named "network.conf" with:
       """
       vswitch { datapath_id 0x1 }
       """
@@ -90,15 +95,20 @@ Feature: Ruby methods for deleting switch event forwarding entry
       class DeleteFromSwitchDaemonTest < Controller
         include SwitchEvent
       
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         def switch_ready datapath_id
-          delete_forward_entry_from_switch datapath_id, <event_type>, "DeleteFromSwitchDaemonTest" do | success, services |
+          delete_forward_entry_from_switch datapath_id, @event_type, "DeleteFromSwitchDaemonTest" do | success, services |
             raise "Failed to delete forwarding entry from switch" if not success
-            info "Successfully deleted a forwarding entry of <event_type> from switch #{datapath_id.to_hex} : #{services.inspect}"
+            info "Successfully deleted a forwarding entry of #{@event_type_string} from switch #{datapath_id.to_hex} : #{services.inspect}"
           end
         end
       end
       """
-    When I successfully run `trema run ./DeleteFromSwitchDaemonTest.rb -c nw_dsl.conf -d`
+    When I successfully run `trema run "./DeleteFromSwitchDaemonTest.rb <event_type>" -c network.conf -d`
     And wait until "DeleteFromSwitchDaemonTest" is up
     And *** sleep 1 ***
     Then the file "../../tmp/log/DeleteFromSwitchDaemonTest.log" should contain:
@@ -111,7 +121,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
       | :vendor       |                   |
       | :packet_in    |                   |
       | :port_status  |                   |
-      | :state_notify | "switch_manager"  |
+      | :state_notify |                   |
 
   @slow_process
   Scenario Outline: delete_forward_entry_from_switch_manager event_type, trema_name
@@ -120,16 +130,21 @@ Feature: Ruby methods for deleting switch event forwarding entry
       class DeleteFromSwitchManagerTest < Controller
         include SwitchEvent
       
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         oneshot_timer_event :test_start, 0
         def test_start
-          delete_forward_entry_from_switch_manager <event_type>, "DeleteFromSwitchManagerTest" do | success, services |
+          delete_forward_entry_from_switch_manager @event_type, "DeleteFromSwitchManagerTest" do | success, services |
             raise "Failed to delete forwarding entry from switch manager" if not success
-            info "Successfully deleted a forwarding entry of <event_type> from switch manager : #{services.inspect}"
+            info "Successfully deleted a forwarding entry of #{@event_type_string} from switch manager : #{services.inspect}"
           end
         end
       end
       """
-    When I successfully run `trema run ./DeleteFromSwitchManagerTest.rb -d`
+    When I successfully run `trema run "./DeleteFromSwitchManagerTest.rb <event_type>" -d`
     And wait until "DeleteFromSwitchManagerTest" is up
     And *** sleep 1 ***
     Then the file "../../tmp/log/DeleteFromSwitchManagerTest.log" should contain:

data/features/switch_event/dump_forward_entries.feature

@@ -24,7 +24,7 @@ Feature: Ruby methods for dumping switch event forwarding entry
 
   @slow_process
   Scenario Outline: dump_forward_entries_from_switch dpid, event_type
-    Given a file named "nw_dsl.conf" with:
+    Given a file named "network.conf" with:
       """
       vswitch { datapath_id 0x1 }
       event :vendor => "vendor", :packet_in => "packet_in", :port_status => "port_status"
@@ -34,15 +34,20 @@ Feature: Ruby methods for dumping switch event forwarding entry
       class DumpSwitchDaemonTest < Controller
         include SwitchEvent
       
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         def switch_ready datapath_id
-          dump_forward_entries_from_switch datapath_id, <event_type> do | success, services |
+          dump_forward_entries_from_switch datapath_id, @event_type do | success, services |
             raise "Failed to dump forwarding entry from a switch" if not success
-            info "Dumping switch #{datapath_id.to_hex}'s forwarding entries of <event_type> : #{services.inspect}"
+            info "Dumping switch #{datapath_id.to_hex}'s forwarding entries of #{@event_type_string} : #{services.inspect}"
           end
         end
       end
       """
-    When I successfully run `trema run ./DumpSwitchDaemonTest.rb -c nw_dsl.conf -d`
+    When I successfully run `trema run "./DumpSwitchDaemonTest.rb <event_type>" -c network.conf -d`
     And wait until "DumpSwitchDaemonTest" is up
     And *** sleep 1 ***
     Then the file "../../tmp/log/DumpSwitchDaemonTest.log" should contain:
@@ -51,15 +56,15 @@ Feature: Ruby methods for dumping switch event forwarding entry
       """
 
     Examples: 
-      | event_type    | switch_event_list                        |
-      | :vendor       | "vendor"                                 |
-      | :packet_in    | "packet_in"                              |
-      | :port_status  | "port_status"                            |
-      | :state_notify | "DumpSwitchDaemonTest", "switch_manager" |
+      | event_type    | switch_event_list      |
+      | :vendor       | "vendor"               |
+      | :packet_in    | "packet_in"            |
+      | :port_status  | "port_status"          |
+      | :state_notify | "DumpSwitchDaemonTest" |
 
   @slow_process
   Scenario Outline: dump_forward_entries_from_switch_manager event_type
-    Given a file named "nw_dsl.conf" with:
+    Given a file named "network.conf" with:
       """
       event :vendor => "vendor", :packet_in => "packet_in", :port_status => "port_status", :state_notify => "state_notify"
       """
@@ -68,16 +73,21 @@ Feature: Ruby methods for dumping switch event forwarding entry
       class DumpSwitchManagerTest < Controller
         include SwitchEvent
       
+        def start
+          @event_type = ARGV[0].delete(":").to_sym
+          @event_type_string = ":#{@event_type.to_s}"
+        end
+      
         oneshot_timer_event :test_start, 0
         def test_start
-          dump_forward_entries_from_switch_manager <event_type> do | success, services |
+          dump_forward_entries_from_switch_manager @event_type do | success, services |
             raise "Failed to dump forwarding entry from the switch manager" if not success
-            info "Dumping switch manager's forwarding entries of <event_type> : #{services.inspect}"
+            info "Dumping switch manager's forwarding entries of #{@event_type_string} : #{services.inspect}"
           end
         end
       end
       """
-    When I successfully run `trema run ./DumpSwitchManagerTest.rb -c nw_dsl.conf -d`
+    When I successfully run `trema run "./DumpSwitchManagerTest.rb <event_type>" -c network.conf -d`
     And wait until "DumpSwitchManagerTest" is up
     And *** sleep 1 ***
     Then the file "../../tmp/log/DumpSwitchManagerTest.log" should contain: