Add @open_flow10 and @open_flow13 cucumber tags.

trema · Jul 21, 2015 · 7e1d185 · 7e1d185
1 parent 5a39e2b
commit 7e1d185
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 74 deletions.
diff --git a/features/open_flow10/echo_reply.feature b/features/open_flow10/echo_reply.feature
@@ -1,7 +1,5 @@
+@open_flow10
 Feature: Pio::Echo::Reply
-  Background:
-    Given I use OpenFlow 1.0
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow10/echo_request.feature b/features/open_flow10/echo_request.feature
@@ -1,7 +1,5 @@
+@open_flow10
 Feature: Pio::Echo::Request
-  Background:
-    Given I use OpenFlow 1.0
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow10/features_reply.feature b/features/open_flow10/features_reply.feature
@@ -1,7 +1,5 @@
+@open_flow10
 Feature: Pio::Features::Reply
-  Background:
-    Given I use OpenFlow 1.0
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow10/features_request.feature b/features/open_flow10/features_request.feature
@@ -1,7 +1,5 @@
+@open_flow10
 Feature: Pio::Features::Request
-  Background:
-    Given I use OpenFlow 1.0
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow10/flow_mod.feature b/features/open_flow10/flow_mod.feature
@@ -1,7 +1,5 @@
+@open_flow10
 Feature: Pio::FlowMod
-  Background:
-    Given I use OpenFlow 1.0
-
   Scenario: read (Flow Mod Add)
     When I try to parse a file named "open_flow10/flow_mod_add.raw" with "Pio::FlowMod" class
     Then it should finish successfully

diff --git a/features/open_flow10/hello.feature b/features/open_flow10/hello.feature
@@ -1,7 +1,5 @@
+@open_flow10
 Feature: Pio::Hello
-  Background:
-    Given I use OpenFlow 1.0
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow10/packet_in.feature b/features/open_flow10/packet_in.feature
@@ -1,7 +1,5 @@
+@open_flow10
 Feature: Pio::PacketIn
-  Background:
-    Given I use OpenFlow 1.0
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow10/packet_out.feature b/features/open_flow10/packet_out.feature
@@ -1,7 +1,5 @@
+@open_flow10
 Feature: Pio::PacketOut
-  Background:
-    Given I use OpenFlow 1.0
-
   Scenario: read
     When I try to parse a file named "open_flow10/packet_out.raw" with "PacketOut" class
     Then it should finish successfully

diff --git a/features/open_flow13/apply_actions.feature b/features/open_flow13/apply_actions.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Apply-Actions instruction.
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new()
     When I try to create an OpenFlow instruction with:
       """

diff --git a/features/open_flow13/echo_reply.feature b/features/open_flow13/echo_reply.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::Echo::Reply
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/echo_request.feature b/features/open_flow13/echo_request.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::Echo::Request
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/features_reply.feature b/features/open_flow13/features_reply.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::Features::Reply
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/features_request.feature b/features/open_flow13/features_request.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::Features::Request
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/flow_mod.feature b/features/open_flow13/flow_mod.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::FlowMod
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/goto_table.feature b/features/open_flow13/goto_table.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::GotoTable
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new(1)
     When I try to create an OpenFlow instruction with:
       """

diff --git a/features/open_flow13/hello.feature b/features/open_flow13/hello.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::Hello
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/match.feature b/features/open_flow13/match.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::Match
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/meter.feature b/features/open_flow13/meter.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::Meter
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new(1)
     When I try to create an OpenFlow instruction with:
     """

diff --git a/features/open_flow13/packet_in.feature b/features/open_flow13/packet_in.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::PacketIn
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/packet_out.feature b/features/open_flow13/packet_out.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::PacketOut
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new
     When I try to create an OpenFlow message with:
       """

diff --git a/features/open_flow13/send_out_port.feature b/features/open_flow13/send_out_port.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::SendOutPort
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new(1)
     When I try to create an OpenFlow action with:
       """

diff --git a/features/open_flow13/write_metadata.feature b/features/open_flow13/write_metadata.feature
@@ -1,7 +1,5 @@
+@open_flow13
 Feature: Pio::WriteMetadata
-  Background:
-    Given I use OpenFlow 1.3
-
   Scenario: new(metadata: 1)
     When I try to create an OpenFlow instruction with:
       """

diff --git a/features/step_definitions/open_flow_steps.rb b/features/step_definitions/open_flow_steps.rb
@@ -1,11 +1,3 @@
-Given(/^I use OpenFlow 1\.0$/) do
-  Pio::OpenFlow.switch_version :OpenFlow10
-end
-
-Given(/^I use OpenFlow 1\.3$/) do
-  Pio::OpenFlow.switch_version :OpenFlow13
-end
-
 When(/^I try to create a packet with:$/) do |ruby_code|
   begin
     @result = Pio.module_eval(ruby_code)

diff --git a/features/support/hooks.rb b/features/support/hooks.rb
@@ -0,0 +1,7 @@
+Before('@open_flow10') do
+  Pio::OpenFlow.switch_version :OpenFlow10
+end
+
+Before('@open_flow13') do
+  Pio::OpenFlow.switch_version :OpenFlow13
+end