trema 0.4.6 → 0.4.7

data/features/examples/switch_monitor.feature

@@ -12,24 +12,24 @@ Feature: "Switch Monitor" sample application
       vswitch { datapath_id 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
+  @slow_process @ruby
+  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`
      And *** sleep 2 ***
-    Then the file "../../tmp/log/switch_monitor.log" should contain "Switch 0x3 is DOWN"
+    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/switch_monitor.log" should contain "All switches = 0x1, 0x2, 0x3"
+    Then the file "../../tmp/log/SwitchMonitor.log" should contain "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
+  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`
      And *** sleep 2 ***
-    Then the file "../../tmp/log/SwitchMonitor.log" should contain "Switch 0x3 is DOWN"
+    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/SwitchMonitor.log" should contain "All switches = 0x1, 0x2, 0x3"
+    Then the file "../../tmp/log/switch_monitor.log" should contain "All switches = 0x1, 0x2, 0x3"

data/features/examples/transparent_firewall.feature

@@ -0,0 +1,73 @@
+Feature: "Transparent Firewall" sample application
+
+  @slow_process
+  Scenario: block-rfc1918.rb blocks packets with private source/destination address
+    Given a file named "transparent_firewall.conf" with:
+      """
+      vswitch("firewall") { datapath_id "0xabc" }
+
+      vhost("host1") { ip "192.168.0.1" }
+      vhost("host2") { ip "192.168.0.2" }
+
+      link "firewall", "host1"
+      link "firewall", "host2"
+      """
+    And I run `trema run ../../src/examples/transparent_firewall/block-rfc1918.rb -c transparent_firewall.conf -d`
+    And wait until "BlockRFC1918" is up
+    When I send 1 packet from host1 to host2
+    And I run `trema show_stats host2 --rx`
+    And the output should not contain "192.168.0.2,1,192.168.0.1,1,1,50"
+
+  @slow_process
+  Scenario: block-rfc1918.rb does not block packets with global source/destination address
+    Given a file named "transparent_firewall.conf" with:
+      """
+      vswitch("firewall") { datapath_id "0xabc" }
+
+      vhost("host1") { ip "1.1.1.1" }
+      vhost("host2") { ip "2.2.2.2" }
+
+      link "firewall", "host1"
+      link "firewall", "host2"
+      """
+    And I run `trema run ../../src/examples/transparent_firewall/block-rfc1918.rb -c transparent_firewall.conf -d`
+    And wait until "BlockRFC1918" is up
+    When I send 1 packet from host1 to host2
+    And I run `trema show_stats host2 --rx`
+    And the output should contain "2.2.2.2,1,1.1.1.1,1,1,50"
+
+  @slow_process
+  Scenario: pass-delegated.rb blocks packets with source address outside of delegated IP address space.
+    Given a file named "transparent_firewall.conf" with:
+      """
+      vswitch("firewall") { datapath_id "0xabc" }
+
+      vhost("host1") { ip "192.168.0.1" }
+      vhost("host2") { ip "192.168.0.2" }
+
+      link "firewall", "host1"
+      link "firewall", "host2"
+      """
+    And I run `trema run ../../src/examples/transparent_firewall/pass-delegated.rb -c transparent_firewall.conf -d`
+    And wait until "PassDelegated" is up
+    When I send 1 packet from host2 to host1
+    And I run `trema show_stats host1 --rx`
+    And the output should not contain "192.168.0.1,1,192.168.0.1,2,1,50"
+
+  @slow_process
+  Scenario: pass-delegated.rb does not block packets with source address of delegated IP address space.
+    Given a file named "transparent_firewall.conf" with:
+      """
+      vswitch("firewall") { datapath_id "0xabc" }
+
+      vhost("host1") { ip "14.0.0.1" }
+      vhost("host2") { ip "14.0.0.2" }
+
+      link "firewall", "host1"
+      link "firewall", "host2"
+      """
+    And I run `trema run ../../src/examples/transparent_firewall/pass-delegated.rb -c transparent_firewall.conf -d`
+    And wait until "PassDelegated" is up
+    When I send 1 packet from host2 to host1
+    And I run `trema show_stats host1 --rx`
+    And the output should contain "14.0.0.1,1,14.0.0.2,1,1,50"

data/features/handlers/switch_ready.feature

@@ -22,7 +22,7 @@ Feature: switch_ready handler
   unaware of such details. Users only need to handle the switch-ready
   message.
 
-  @slow_process
+  @slow_process @ruby
   Scenario: switch_ready handler
     Given a file named "switch-ready-detector.rb" with:
     """

data/features/step_definitions/misc_steps.rb

@@ -16,65 +16,65 @@
 #
 
 
-Given /^I compile "(.*?)" into "(.*?)"$/ do | c_source, executable |
+Given(/^I compile "(.*?)" into "(.*?)"$/) do | c_source, executable |
   run_simple "gcc #{ c_source } #{`trema-config -c -l`} -o #{ executable }", true
 end
 
 
-When /^\*\*\* sleep (\d+) \*\*\*$/ do | sec |
+When(/^\*\*\* sleep (\d+) \*\*\*$/) do | sec |
   sleep sec.to_i
 end
 
 
-When /^wait until "([^"]*)" is up$/ do | process |
+When(/^wait until "([^"]*)" is up$/) do | process |
   nloop = 0
-  pid_file = File.join( Trema.pid, "#{ process }.pid" )
+  pid_file = File.join(Trema.pid, "#{ process }.pid")
   loop do
     nloop += 1
-    raise "Timeout" if nloop > 60 # FIXME
-    break if FileTest.exists?( pid_file ) and not ps_entry_of( process ).nil?
+    fail 'Timeout' if nloop > 100 # FIXME
+    break if FileTest.exists?(pid_file) && ps_entry_of(process)
     sleep 0.1
   end
   sleep 1  # FIXME
 end
 
 
-Then /^the output should contain "(.*?)" within the timeout period$/ do | expected |
-  step %{I wait for output to contain "#{ expected }"}
+Then(/^the output should contain "(.*?)" within the timeout period$/) do | expected |
+  step %(I wait for output to contain "#{ expected }")
 end
 
 
-Then /^([^\s]*) is terminated$/ do | name |
-  ps_entry_of( name ).should be_empty
+Then(/^([^\s]*) is terminated$/) do | name |
+  ps_entry_of(name).should be_empty
 end
 
 
-Then /^the vswitch "(.*?)" is running$/ do | dpid |
-  pid_file = File.join( Trema.pid, "open_vswitch.#{ dpid }.pid" )
-  File.exists?( pid_file ).should be_true
+Then(/^the vswitch "(.*?)" is running$/) do | dpid |
+  pid_file = File.join(Trema.pid, "open_vswitch.#{ dpid }.pid")
+  File.exist?(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
+Then(/^the vswitch "([^"]*)" is terminated$/) do | dpid |
+  pid_file = File.join(Trema.pid, "open_vswitch.#{ dpid }.pid")
+  File.exist?(pid_file).should be_false
 end
 
 
-Then /^the vhost "(.*?)" is terminated$/ do | host |
-  pid_file = File.join( Trema.pid, "phost.#{ host }.pid" )
-  File.exists?( pid_file ).should be_false
+Then(/^the vhost "(.*?)" is terminated$/) do | host |
+  pid_file = File.join(Trema.pid, "phost.#{ host }.pid")
+  File.exist?(pid_file).should be_false
 end
 
 
-Then /^the controller "(.*?)" is terminated$/ do | controller |
-  pid_file = File.join( Trema.pid, "#{ controller }.pid" )
-  File.exists?( pid_file ).should be_false
+Then(/^the controller "(.*?)" is terminated$/) do | controller |
+  pid_file = File.join(Trema.pid, "#{ controller }.pid")
+  File.exist?(pid_file).should be_false
 end
 
 
-Then /^([^\s]*) is started$/ do | name |
-  ps_entry_of( name ).should_not be_empty
+Then(/^([^\s]*) is started$/) do | name |
+  ps_entry_of(name).should_not be_empty
 end
 
 

data/features/step_definitions/send_packets_steps.rb

@@ -16,12 +16,12 @@
 #
 
 
-When /^I send (\d+) packets from (.+) to (.+)$/ do | n_packets, host_a, host_b |
+When(/^I send (\d+) packets from (.+) to (.+)$/) do | n_packets, host_a, host_b |
   step "I run `trema send_packets --source #{ host_a } --dest #{ host_b } --n_pkts #{ n_packets }`"
 end
 
 
-When /^I send 1 packet from (.+) to (.+)$/ do | host_a, host_b |
+When(/^I send 1 packet from (.+) to (.+)$/) do | host_a, host_b |
   step "I send 1 packets from #{ host_a } to #{ host_b }"
 end
 

data/features/step_definitions/stats_steps.rb

@@ -16,18 +16,18 @@
 #
 
 
-Then /^the total number of tx packets should be:$/ do | table |
+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
+  table.hashes[ 0].each_pair do | host, n |
+    count_packets(`trema show_stats #{ host } --tx`).should == n.to_i
   end
 end
 
 
-Then /^the total number of rx packets should be:$/ do | table |
+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
+  table.hashes[ 0].each_pair do | host, n |
+    count_packets(`trema show_stats #{ host } --rx`).should == n.to_i
   end
 end
 

data/features/support/env.rb

@@ -16,37 +16,37 @@
 #
 
 
-require "bundler"
+require 'bundler'
 begin
   Bundler.setup :default, :development
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
 
-$LOAD_PATH.unshift( File.expand_path( File.dirname( __FILE__ ) + "/../../ruby" ) )
+$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"
+require 'aruba/cucumber'
+require 'rspec'
+require 'tempfile'
+require 'trema/executables'
+require 'trema/monkey-patch/string'
 
 
-def run command
-  raise "Failed to execute #{ command }" unless system( command )
+def run(command)
+  fail "Failed to execute #{ command }" unless system(command)
 end
 
 
-def ps_entry_of name
+def ps_entry_of(name)
   `ps -ef | grep -w "#{ name } " | grep -v grep`
 end
 
 
-def cucumber_log name
+def cucumber_log(name)
   File.join Trema.log, name
 end
 
@@ -59,10 +59,10 @@ end
 
 # show_stats output format:
 # ip_dst,tp_dst,ip_src,tp_src,n_pkts,n_octets
-def count_packets stats
+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
+  stats.split[ 1..-1].inject(0) do | sum, each |
+    sum += each.split(',')[ 4].to_i
   end
 end
 

data/features/support/hooks.rb

@@ -16,16 +16,16 @@
 #
 
 
-require "trema/path"
+require 'trema/path'
 
 
-def wait_until_all_pid_files_are_deleted timeout = 12
+def wait_until_all_pid_files_are_deleted(timeout = 12)
   elapsed = 0
   loop do
-    raise "Failed to clean up remaining processes." if elapsed > timeout
-    break if Dir.glob( File.join( Trema.pid, "*.pid" ) ).empty?
-    sleep 1
-    elapsed += 1
+    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
@@ -33,18 +33,18 @@ end
 
 Before do
   @aruba_timeout_seconds = 10
-  run "trema killall"
+  run 'trema killall'
   wait_until_all_pid_files_are_deleted
 end
 
 
-Before( "@slow_process" ) do
+Before('@slow_process') do
   @aruba_io_wait_seconds = 1
 end
 
 
 After do
-  run "trema killall"
+  run 'trema killall'
   wait_until_all_pid_files_are_deleted
   processes.clear
 end

data/features/switch_event/add_forward_entry.feature

@@ -29,7 +29,7 @@ Feature: Ruby methods for adding switch event forwarding entry
   All the above methods take a result handler as Ruby block, but 
   can be omitted if checking is not necessary.
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: add_forward_entry_to_all_switches event_type, trema_name
     Given a file named "network.conf" with:
       """
@@ -84,7 +84,7 @@ Feature: Ruby methods for adding switch event forwarding entry
       | :port_status  | "AddEntryToAllTest", "new_controller" | "AddEntryToAllTest", "new_controller" |
       | :state_notify | "AddEntryToAllTest", "new_controller" | "AddEntryToAllTest", "new_controller" |
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: add_forward_entry_to_switch dpid, event_type, trema_name
     Given a file named "network.conf" with:
       """
@@ -123,7 +123,7 @@ Feature: Ruby methods for adding switch event forwarding entry
       | :port_status  | "AddEntryToSwitchDaemonTest", "new_controller" |
       | :state_notify | "AddEntryToSwitchDaemonTest", "new_controller" |
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: add_forward_entry_to_switch_manager event_type, trema_name
     Given a file named "AddEntryToSwitchManagerTest.rb" with:
       """ruby

data/features/switch_event/delete_forward_entry.feature

@@ -29,7 +29,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
   All the above methods take a result handler as Ruby block, but 
   they can be omitted if checking is not necessary.
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: delete_forward_entry_from_all_switches event_type, trema_name
     Given a file named "network.conf" with:
       """
@@ -84,7 +84,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
       | :port_status  |                           |                   |
       | :state_notify |                           |                   |
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: delete_forward_entry_from_switch dpid, event_type, trema_name
     Given a file named "network.conf" with:
       """
@@ -123,7 +123,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
       | :port_status  |                   |
       | :state_notify |                   |
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: delete_forward_entry_from_switch_manager event_type, trema_name
     Given a file named "DeleteFromSwitchManagerTest.rb" with:
       """ruby

data/features/switch_event/dump_forward_entries.feature

@@ -22,7 +22,7 @@ Feature: Ruby methods for dumping switch event forwarding entry
   ----
   All the above methods take a result handler as Ruby block.
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: dump_forward_entries_from_switch dpid, event_type
     Given a file named "network.conf" with:
       """
@@ -62,7 +62,7 @@ Feature: Ruby methods for dumping switch event forwarding entry
       | :port_status  | "port_status"          |
       | :state_notify | "DumpSwitchDaemonTest" |
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: dump_forward_entries_from_switch_manager event_type
     Given a file named "network.conf" with:
       """

data/features/switch_event/set_forward_entries.feature

@@ -26,7 +26,7 @@ Feature: Ruby methods for setting switch event forwarding entry
   All the above methods take a result handler as Ruby block, but 
   they can be omitted if checking is not necessary.
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: set_forward_entries_to_switch dpid, event_type, trema_names
     Given a file named "network.conf" with:
       """
@@ -65,7 +65,7 @@ Feature: Ruby methods for setting switch event forwarding entry
       | :port_status  | "SetEntriesToSwitchDaemonTest", "Another" |
       | :state_notify | "SetEntriesToSwitchDaemonTest", "Another" |
 
-  @slow_process
+  @slow_process @ruby
   Scenario Outline: set_forward_entries_to_switch_manager event_type, trema_names
     Given a file named "SetEntriesToSwitchManagerTest.rb" with:
       """ruby