trema 0.2.5 → 0.2.6

data/features/trema.dump_flows.feature

@@ -1,14 +1,13 @@
 Feature: trema dump_flows command
 
-  As a Trema user
-  I want to dump the flow table of OpenFlow switch
-  So that I can debug my Trema apps
+  In order to inspect all flow entries in a Trema virtual switch
+  As a developer using Trema
+  I want to execute "trema dump_flows" command
 
-
-  Scenario: run trema dump_flows
-    When I try trema run "./objects/examples/repeater_hub/repeater_hub" with following configuration (backgrounded):
+  Background:
+    Given a file named "repeater_hub.conf" with:
       """
-      vswitch("repeater_hub") { datapath_id "0xabc" }
+      vswitch("repeater_hub") { datapath_id 0xabc }
 
       vhost("host1")
       vhost("host2")
@@ -18,8 +17,23 @@ Feature: trema dump_flows command
       link "repeater_hub", "host2"
       link "repeater_hub", "host3"
       """
-      And wait until "repeater_hub" is up
-      And I try to run "./trema send_packets --source host1 --dest host2"
-      And *** sleep 1 ***
-      And I try to run "./trema dump_flows repeater_hub" (log = "dump_flows.log")
-    Then "dump_flows.log" should contain some flow entries
+    And I successfully run `trema run ../../objects/examples/repeater_hub/repeater_hub -c repeater_hub.conf -d`
+
+  @slow_process
+  Scenario: dump a flow entry
+    Given I run `trema send_packets --source host1 --dest host2`
+    When I run `trema dump_flows repeater_hub`
+    Then the output should contain "actions=FLOOD"
+
+  @slow_process
+  Scenario: no flow entry
+    When I run `trema dump_flows repeater_hub`
+    Then the output should not contain "actions="
+
+  Scenario: no argument
+    When I run `trema dump_flows`
+    Then the output should contain "switches is required"
+
+  Scenario: wrong switch name
+    When I run `trema dump_flows nosuchswitch`
+    Then the output should contain "No switch named `nosuchswitch` found!"

data/features/trema.help.feature

@@ -0,0 +1,26 @@
+Feature: trema help
+
+  In order to understand how to use Trema
+  As a developer using Trema
+  I want to read the help message of trema command
+
+  Scenario: List sub-commands
+    When I run `trema help`
+    Then the output should contain "dump_flows"
+     And the output should contain "help"
+     And the output should contain "kill"
+     And the output should contain "killall"
+     And the output should contain "netns"
+     And the output should contain "reset_stats"
+     And the output should contain "ruby"
+     And the output should contain "run"
+     And the output should contain "send_packets"
+     And the output should contain "show_stats"
+     And the output should contain "up"
+     And the output should contain "version"
+
+  Scenario: List global options
+    When I run `trema help`
+    Then the output should contain "--help"
+     And the output should contain "-v, --verbose"
+     And the output should contain "--version"

data/features/trema.kill.feature

@@ -1,53 +1,51 @@
-Feature: kill a trema process with `trema kill' command
+Feature: trema kill command
 
-  As a Trema user
-  I want to kill a trema processes with `trema kill' command
-  So that I can emulate failures on switch/host/link
+  In order to test event handling or just kill unwanted processes
+  As a developer using Trema
+  I want to execute "trema kill" command
 
-
-  Scenario: kill a switch
-    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" }
+      vswitch { datapath_id 0x1 }
+      vswitch { datapath_id 0x2 }
+      vswitch { datapath_id 0x3 }
+
+      vhost "host1"
+      vhost "host2"
+      vhost "host3"
+
+      link "0x1", "host1"
+      link "0x2", "host2"
+      link "0x3", "host3"
       """
-      And wait until "SwitchMonitor" is up
-    When I try to run "./trema kill 0x1"
-      And *** sleep 1 ***
-    Then vswitch 0x1 is terminated
+    And I successfully run `trema run ../../src/examples/switch_monitor/switch-monitor.rb -c switch_monitor.conf -d`
 
+  @slow_process
+  Scenario: kill a switch
+    When I run `trema kill 0x1`
+    Then the vswitch "0x1" is terminated
 
+  @slow_process
   Scenario: kill a host
-    Given I try trema run "./src/examples/switch_monitor/switch-monitor.rb" with following configuration (backgrounded):
-      """
-      vswitch { datapath_id "0x1" }
-      vhost "host"
-      link "0x1", "host"
-      """
-      And wait until "SwitchMonitor" is up
-    When I try to run "./trema kill host"
-      And *** sleep 1 ***
-    Then host is terminated
+    When I run `trema kill host1`
+    Then the vhost "host1" is terminated
 
+  @slow_process
+  Scenario: kill hosts
+    When I run `trema kill host1 host2`
+    Then the vhost "host1" is terminated
+     And the vhost "host2" is terminated
 
+  @slow_process
   Scenario: kill a controller
-    Given I try trema run "./src/examples/switch_monitor/switch-monitor.rb" with following configuration (backgrounded):
-      """
-      vswitch { datapath_id "0x1" }
-      """
-      And wait until "SwitchMonitor" is up
-    When I try to run "./trema kill SwitchMonitor"
-      And *** sleep 1 ***
-    Then SwitchMonitor is terminated
+    When I run `trema kill SwitchMonitor`
+    Then the controller "SwitchMonitor" is terminated
 
+  Scenario: no argument
+    When I run `trema kill`
+    Then the output should contain "name is required"
 
-  Scenario: trema help kill
-    When I try to run "./trema help kill"
-    Then the output should be:
-      """
-      Usage: trema kill NAME [OPTIONS ...]
-          -h, --help
-          -v, --verbose
-
-      """
+  Scenario: wrong name
+    When I run `trema kill nosuchname`
+    Then the output should contain "unknown name: nosuchname"

data/features/trema.killall.feature

@@ -1,30 +1,30 @@
-Feature: kill all trema processes with `trema killall' command
-
-  As a Trema user
-  I want to kill all trema processes with `trema killall' command
-  So that I can close trema sessions cleanly
+Feature: trema killall command
 
+  In order to cleanup the previous trema session
+  As a developer using Trema
+  I want to execute "trema killall" command
 
+  @slow_process
   Scenario: trema killall
-    Given I try trema run "./objects/examples/dumper/dumper" with following configuration (backgrounded):
-      """
-      vswitch { datapath_id "0xabc" }
+    Given a file named "switch_monitor.conf" with:
       """
-      And wait until "dumper" is up
-    When I try to run "./trema killall"
-      And *** sleep 1 ***
-    Then switch_manager is terminated
-      And switch is terminated
-      And ovs-openflowd is terminated
-      And dumper is terminated
+      vswitch { datapath_id 0x1 }
+      vswitch { datapath_id 0x2 }
+      vswitch { datapath_id 0x3 }
 
+      vhost "host1"
+      vhost "host2"
+      vhost "host3"
 
-  Scenario: trema help killall
-    When I try to run "./trema help killall"
-    Then the output should be:
-      """
-      Usage: trema killall [OPTIONS ...]
-          -h, --help
-          -v, --verbose
-
+      link "0x1", "host1"
+      link "0x2", "host2"
+      link "0x3", "host3"
       """
+     And I successfully 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 killall`
+    Then switch_manager is terminated
+     And switch is terminated
+     And phost is terminated
+     And ovs-openflowd is terminated
+     And switch_monitor is terminated

data/features/trema.reset_stats.feature

@@ -1,14 +1,54 @@
-Feature: reset network stats with `trema reset_stats' command
+Feature: trema reset_stats command
 
-  As a Trema user
-  I want to reset network stats with `trema reset_stats' command
-  So that I can easily debug trema applications
+  In order to reset the stats of sent/received packets
+  As a developer using Trema
+  I want to execute "trema reset_stats" command
 
-  Scenario: trema help reset_stats
-    When I try to run "./trema help reset_stats"
-    Then the output should be:
+  Background:
+    Given a file named "learning_switch.conf" with:
       """
-      Usage: trema reset_stats [OPTIONS ...]
-          -h, --help
-          -v, --verbose
+      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 ../../src/examples/learning_switch/learning-switch.rb -c learning_switch.conf -d`
+    And I run `trema send_packets --source host1 --dest host2`
+
+  @slow_process
+  Scenario: reset_stats host1
+    When I run `trema reset_stats host1`
+     And I run `trema show_stats host1`
+    Then the output should contain exactly "Sent packets:\n\nReceived packets:\n\n"
+
+  @slow_process
+  Scenario: reset_stats host1 host2
+    When I run `trema reset_stats host1 host2`
+     And I run `trema show_stats host1`
+    Then the output should contain exactly "Sent packets:\n\nReceived packets:\n\n"
+
+  @slow_process
+  Scenario: reset_stats host1 host2
+    When I run `trema reset_stats host1 host2`
+     And I run `trema show_stats host2`
+    Then the output should contain exactly "Sent packets:\n\nReceived packets:\n\n"
+
+  @slow_process
+  Scenario: no argument
+    When I run `trema reset_stats`
+     And I run `trema show_stats host1`
+    Then the output should contain exactly "Sent packets:\n\nReceived packets:\n\n"
+
+  @slow_process
+  Scenario: no argument
+    When I run `trema reset_stats`
+     And I run `trema show_stats host2`
+    Then the output should contain exactly "Sent packets:\n\nReceived packets:\n\n"
+
+  @slow_process
+  Scenario: wrong name
+    When I run `trema reset_stats nosuchhost`
+    Then the output should contain "unknown host: nosuchhost"

data/features/trema.run.feature

@@ -1,47 +1,36 @@
-Feature: run trema application with `trema run' command
+Feature: trema run command
 
-  As a Trema user
-  I want to launch trema applications with `trema run' command
-  So that I don't have to mind the details of Trema
+  In order to launch trema applications
+  As a developer using Trema
+  I want to use `trema run` command
 
-
-  Scenario: trema run launches switch_manager and an application
-    When I try trema run "./objects/examples/dumper/dumper" with following configuration (backgrounded):
+  Background:
+    Given a file named "network.conf" with:
       """
-      vswitch { datapath_id "0xabc" }
+      vswitch { datapath_id 0xabc }
       """
-      And wait until "dumper" is up
-    Then switch_manager is started
-      And dumper is started
 
+  @slow_process
+  Scenario: trema run launches switch_manager and an application
+    When I run `trema run ../../objects/examples/dumper/dumper -c network.conf -d`
+     And wait until "dumper" is up
+    Then switch_manager is started
+     And dumper is started
 
+  @slow_process
   Scenario: trema run launches switch_manager and an application with proper options
-    When I try trema run "./objects/examples/learning_switch/learning_switch -i 0xabc" with following configuration (backgrounded, verbose):
-      """
-      vswitch { datapath_id "0xabc" }
-      """
-      And wait until "learning_switch" is up
-    Then "switch_manager" should be executed with option = "--daemonize --port=6633 -- port_status::learning_switch packet_in::learning_switch state_notify::learning_switch"
-      And "learning_switch" should be executed with option = "--name learning_switch -i 0xabc"
-
-
+    When I run `trema -v run ../../objects/examples/learning_switch/learning_switch -c network.conf -d`
+     And wait until "learning_switch" is up
+    Then the output should contain:
+     """
+     switch_manager --daemonize --port=6633 -- port_status::learning_switch packet_in::learning_switch state_notify::learning_switch vendor::learning_switch
+     """
+     And the output should contain:
+     """
+     learning_switch --name learning_switch -d
+     """
+
+  @slow_process
   Scenario: switch_manager is killed when trema session is closed
-    When I try trema run "/bin/true" with following configuration (verbose):
-      """
-      vswitch { datapath_id "0xabc" }
-      """
-    Then switch_manager should be killed
-
-
-  Scenario: trema help run
-    When I try to run "./trema help run"
-    Then the output should be:
-      """
-      Usage: ./trema run [OPTIONS ...]
-          -c, --conf FILE
-          -d, --daemonize
-          -s, --tremashark
-
-          -h, --help
-          -v, --verbose
-      """
+    When I run `trema -v run /bin/true -c network.conf`
+    Then the output should contain "Shutting down switch_manager..."

data/features/trema.send_packets.feature

@@ -1,56 +1,45 @@
-Feature: send packets with `trema send_packets' command
-
-  As a Trema user
-  I want to send network packets with `trema send_packets' command
-  So that I can easily debug trema applications
+Feature: trema send_packets command
 
+  In order to send/receive packets between virtual hosts
+  As a developer using Trema
+  I want to execute "trema send_packets" command
 
   Background:
-    Given I try trema run "learning_switch" example with following configuration (backgrounded):
+    Given a file named "learning_switch.conf" with:
       """
-      vswitch { datapath_id "0xabc" }
+      vswitch("learning") { datapath_id 0xabc }
 
       vhost("host1") { ip "192.168.0.1" }
       vhost("host2") { ip "192.168.0.2" }
 
-      link "0xabc", "host1"
-      link "0xabc", "host2"
+      link "learning", "host1"
+      link "learning", "host2"
       """
+    And I run `trema run ../../src/examples/learning_switch/learning-switch.rb -c learning_switch.conf -d`
 
+  @slow_process
+  Scenario: Sending packets
+    When I run `trema send_packets --source host1 --dest host2 --n_pkts=2`
+     And I run `trema send_packets --source host2 --dest host1 --n_pkts=1`
+    Then the total number of tx packets should be:
+      | host1 | host2 |
+      |     2 |     1 |
+    And the total number of rx packets should be:
+      | host1 | host2 |
+      |     1 |     2 |
 
-  Scenario: send_packets error (--source)
-    Then "./trema send_packets --source NO_SUCH_HOST --dest host2" exits abnormally with an error message:
+  @slow_process
+  Scenario: unknown host error (--source)
+    When I run `trema send_packets --source NO_SUCH_HOST --dest host2`
+    Then the output should contain:
       """
-      Unknown host: NO_SUCH_HOST
+      unknown host: NO_SUCH_HOST
       """
 
-
-  Scenario: send_packets error (--dest)
-    Then "./trema send_packets --dest host1 --dest NO_SUCH_HOST" exits abnormally with an error message:
+  @slow_process
+  Scenario: unknown host error (--dest)
+    When I run `trema send_packets --source host1 --dest NO_SUCH_HOST`
+    Then the output should contain:
       """
-      Unknown host: NO_SUCH_HOST
-      """
-
-
-  Scenario: trema help send_packets
-    When I try to run "./trema help send_packets"
-    Then the output should be:
-      """
-      Usage: ./trema send_packets --source HOSTNAME --dest HOSTNAME [OPTIONS ...]
-          -s, --source HOSTNAME
-              --inc_ip_src [NUMBER]
-          -d, --dest HOSTNAME
-              --inc_ip_dst [NUMBER]
-              --tp_src NUMBER
-              --inc_tp_src [NUMBER]
-              --tp_dst NUMBER
-              --inc_tp_dst [NUMBER]
-              --pps NUMBER
-              --n_pkts NUMBER
-              --duration NUMBER
-              --length NUMBER
-              --inc_payload [NUMBER]
-
-          -h, --help
-          -v, --verbose
+      unknown host: NO_SUCH_HOST
       """