pio 0.30.0 → 0.30.1

data/features/open_flow13/send_out_port.feature

@@ -1,12 +1,11 @@
 @open_flow13
-Feature: Pio::SendOutPort
+Feature: SendOutPort
   Scenario: new(1)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SendOutPort.new(1)
       """
-    Then it should finish successfully
-    And the message has the following fields and values:
+    Then the message has the following fields and values:
       | field         |      value |
       | action_type   |          0 |
       | action_length |         16 |
@@ -14,12 +13,11 @@ Feature: Pio::SendOutPort
       | max_length    | :no_buffer |
 
   Scenario: new(:all)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SendOutPort.new(:all)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         | value      |
       | action_type   | 0          |
       | action_length | 16         |
@@ -27,12 +25,11 @@ Feature: Pio::SendOutPort
       | max_length    | :no_buffer |
 
   Scenario: new(:controller)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SendOutPort.new(:controller)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         | value       |
       | action_type   | 0           |
       | action_length | 16          |
@@ -40,12 +37,11 @@ Feature: Pio::SendOutPort
       | max_length    | :no_buffer  |
 
   Scenario: new(:local)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SendOutPort.new(:local)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         | value      |
       | action_type   | 0          |
       | action_length | 16         |
@@ -53,12 +49,11 @@ Feature: Pio::SendOutPort
       | max_length    | :no_buffer |
 
   Scenario: new(:table)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SendOutPort.new(:table)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         | value      |
       | action_type   | 0          |
       | action_length | 16         |
@@ -66,12 +61,11 @@ Feature: Pio::SendOutPort
       | max_length    | :no_buffer |
 
   Scenario: new(:in_port)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SendOutPort.new(:in_port)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         | value      |
       | action_type   | 0          |
       | action_length | 16         |
@@ -79,12 +73,11 @@ Feature: Pio::SendOutPort
       | max_length    | :no_buffer |
 
   Scenario: new(:normal)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SendOutPort.new(:normal)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         | value      |
       | action_type   | 0          |
       | action_length | 16         |
@@ -92,12 +85,11 @@ Feature: Pio::SendOutPort
       | max_length    | :no_buffer |
 
   Scenario: new(:flood)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SendOutPort.new(:flood)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         | value      |
       | action_type   | 0          |
       | action_length | 16         |
@@ -105,9 +97,8 @@ Feature: Pio::SendOutPort
       | max_length    | :no_buffer |
 
   Scenario: read
-    When I try to parse a file named "open_flow13/send_out_port.raw" with "Pio::SendOutPort" class
-    Then it should finish successfully
-    And the message has the following fields and values:
+    When I parse a file named "open_flow13/send_out_port.raw" with "Pio::SendOutPort" class
+    Then the message has the following fields and values:
       | field         |      value |
       | action_type   |          0 |
       | action_length |         16 |

data/features/open_flow13/set_arp_operation.feature

@@ -1,13 +1,12 @@
 @open_flow13
-Feature: Pio::SetArpOperation
+Feature: SetArpOperation
 
   Scenario: new(Pio::Arp::Reply::OPERATION)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
-      Pio::SetArpOperation.new(Pio::Arp::Reply::OPERATION)
+      Pio::SetArpOperation.new(Pio::Arp::Reply.operation)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         | value |
       | action_type   |    25 |
       | action_length |    16 |

data/features/open_flow13/set_arp_sender_hardware_address.feature

@@ -1,13 +1,12 @@
 @open_flow13
-Feature: Pio::SetArpSenderHardwareAddress
+Feature: SetArpSenderHardwareAddress
 
   Scenario: new('00:00:de:ad:be:ef')
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SetArpSenderHardwareAddress.new('00:00:de:ad:be:ef')
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         |             value |
       | action_type   |                25 |
       | action_length |                16 |

data/features/open_flow13/set_arp_sender_protocol_address.feature

@@ -1,13 +1,12 @@
 @open_flow13
-Feature: Pio::SetArpSenderProtocolAddress
+Feature: SetArpSenderProtocolAddress
 
   Scenario: new('192.168.1.1')
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SetArpSenderProtocolAddress.new('192.168.1.1')
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         |       value |
       | action_type   |          25 |
       | action_length |          16 |

data/features/open_flow13/set_destination_mac_address.feature

@@ -1,13 +1,12 @@
 @open_flow13
-Feature: Pio::SetDestinationMacAddress
+Feature: SetDestinationMacAddress
 
   Scenario: new('11:22:33:44:55:66')
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SetDestinationMacAddress.new('11:22:33:44:55:66')
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         |             value |
       | action_type   |                25 |
       | action_length |                16 |

data/features/open_flow13/set_ip_ttl.feature

@@ -0,0 +1,12 @@
+@open_flow13
+Feature: SetIpTtl
+
+  Scenario: new(10)
+    When I create an OpenFlow action with:
+      """
+      Pio::SetIpTtl.new(10)
+      """
+    Then the action has the following fields and values:
+      | field       | value |
+      | action_type |    23 |
+      | ttl         |    10 |

data/features/open_flow13/set_metadata.feature

@@ -1,13 +1,12 @@
 @open_flow13
-Feature: Pio::SetMetadata
+Feature: SetMetadata
 
   Scenario: new(0x123)
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SetMetadata.new(0x123)
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field           | value |
       | action_type     |    25 |
       | action_length   |    16 |

data/features/open_flow13/set_source_mac_address.feature

@@ -1,13 +1,12 @@
 @open_flow13
-Feature: Pio::SetSourceMacAddress
+Feature: SetSourceMacAddress
 
   Scenario: new('11:22:33:44:55:66')
-    When I try to create an OpenFlow action with:
+    When I create an OpenFlow action with:
       """
       Pio::SetSourceMacAddress.new('11:22:33:44:55:66')
       """
-    Then it should finish successfully
-    And the action has the following fields and values:
+    Then the action has the following fields and values:
       | field         |             value |
       | action_type   |                25 |
       | action_length |                16 |

data/features/open_flow13/stats_request.feature

@@ -1,19 +1,16 @@
-Feature: Pio::StatsRequest
+Feature: StatsRequest
   Background:
     Given I use OpenFlow 1.3
 
   @wip
   Scenario: new
-    When I try to create an OpenFlow message with:
+    When I create an OpenFlow message with:
       """
       Pio::StatsRequest.new(stats_type: :table)
       """
-    Then it should finish successfully
-    And the message has the following fields and values:
+    Then the message has the following fields and values:
       | field          |  value |
-      | ofp_version    |      4 |
-      | message_type   |     16 |
-      | message_length |     12 |
+      | version        |      4 |
       | transaction_id |      0 |
       | xid            |      0 |
       | stats_type     | :table |

data/features/open_flow13/write_metadata.feature

@@ -1,28 +1,26 @@
 @open_flow13
-Feature: Pio::WriteMetadata
+Feature: WriteMetadata
   Scenario: new(metadata: 1)
-    When I try to create an OpenFlow instruction with:
+    When I create an OpenFlow instruction with:
       """
-      Pio::WriteMetadata.new(metadata: 1)
+      Pio::OpenFlow13::WriteMetadata.new(metadata: 1)
       """
-    Then it should finish successfully
-    And the message has the following fields and values:
-      | field              |              value |
-      | class              | Pio::WriteMetadata |
-      | instruction_type   |                  2 |
-      | instruction_length |                 24 |
-      | to_binary_s.length |                 24 |
-      | metadata           |                  1 |
-      | metadata_mask      |                  0 |
+    Then the message has the following fields and values:
+      | field              |                          value |
+      | class              | Pio::OpenFlow13::WriteMetadata |
+      | instruction_type   |                              2 |
+      | instruction_length |                             24 |
+      | to_binary_s.length |                             24 |
+      | metadata           |                              1 |
+      | metadata_mask      |                              0 |
 
   Scenario: read
-    When I try to parse a file named "open_flow13/instruction_write_metadata.raw" with "Pio::WriteMetadata" class
-    Then it should finish successfully
-    And the message has the following fields and values:
-      | field              |              value |
-      | class              | Pio::WriteMetadata |
-      | instruction_type   |                  2 |
-      | instruction_length |                 24 |
-      | to_binary_s.length |                 24 |
-      | metadata           |                  1 |
-      | metadata_mask      |                  1 |
+    When I parse a file named "open_flow13/instruction_write_metadata.raw" with "Pio::OpenFlow13::WriteMetadata" class
+    Then the message has the following fields and values:
+      | field              |                          value |
+      | class              | Pio::OpenFlow13::WriteMetadata |
+      | instruction_type   |                              2 |
+      | instruction_length |                             24 |
+      | to_binary_s.length |                             24 |
+      | metadata           |                              1 |
+      | metadata_mask      |                              1 |

data/features/open_flow_read.feature

@@ -1,5 +1,5 @@
-Feature: Pio::OpenFlow.read
-  Scenario: OpenFlow10
+Feature: OpenFlow.read
+  Scenario: OpenFlow 1.0
     Given I switch the Pio::OpenFlow version to "OpenFlow10"
     Then the following each raw file should be parsed into its corresponding object using OpenFlow.read
       | raw file                                  | result object                              |
@@ -19,8 +19,27 @@ Feature: Pio::OpenFlow.read
       | open_flow10/flow_stats_request.raw        | Pio::OpenFlow10::FlowStats::Request        |
       | open_flow10/hello.raw                     | Pio::OpenFlow10::Hello                     |
       | open_flow10/hello_failed.raw              | Pio::OpenFlow10::Error::HelloFailed        |
-      | open_flow10/packet_in.raw                 | Pio::OpenFlow10::PacketIn                  |
       | open_flow10/packet_out.raw                | Pio::OpenFlow10::PacketOut                 |
+      | open_flow10/port_stats_request.raw        | Pio::OpenFlow10::PortStats::Request        |
       | open_flow10/port_status.raw               | Pio::OpenFlow10::PortStatus                |
-      | open_flow13/bad_request.raw               | Pio::OpenFlow13::Error::BadRequest         |
-      | open_flow13/hello_failed.raw              | Pio::OpenFlow13::Error::HelloFailed        |
+      | open_flow10/queue_stats_request.raw       | Pio::OpenFlow10::QueueStats::Request       |
+      | open_flow10/table_stats_request.raw       | Pio::OpenFlow10::TableStats::Request       |
+
+  Scenario: OpenFlow 1.3
+    Given I switch the Pio::OpenFlow version to "OpenFlow13"
+    Then the following each raw file should be parsed into its corresponding object using OpenFlow.read
+      | raw file                                          | result object                       |
+      | open_flow13/bad_request.raw                       | Pio::OpenFlow13::Error::BadRequest  |
+      | open_flow13/echo_reply_body.raw                   | Pio::OpenFlow13::Echo::Reply        |
+      | open_flow13/echo_reply_no_body.raw                | Pio::OpenFlow13::Echo::Reply        |
+      | open_flow13/echo_request_body.raw                 | Pio::OpenFlow13::Echo::Request      |
+      | open_flow13/echo_request_no_body.raw              | Pio::OpenFlow13::Echo::Request      |
+      | open_flow13/features_reply.raw                    | Pio::OpenFlow13::Features::Reply    |
+      | open_flow13/features_request.raw                  | Pio::OpenFlow13::Features::Request  |
+      | open_flow13/flow_mod_add_apply_no_match.raw       | Pio::OpenFlow13::FlowMod            |
+      | open_flow13/flow_mod_no_match_or_instructions.raw | Pio::OpenFlow13::FlowMod            |
+      | open_flow13/hello_failed.raw                      | Pio::OpenFlow13::Error::HelloFailed |
+      | open_flow13/hello_no_version_bitmap.raw           | Pio::OpenFlow13::Hello              |
+      | open_flow13/hello_version_bitmap.raw              | Pio::OpenFlow13::Hello              |
+      | open_flow13/packet_in.raw                         | Pio::OpenFlow13::PacketIn           |
+      | open_flow13/packet_out.raw                        | Pio::OpenFlow13::PacketOut          |

data/features/open_flow_version.feature

@@ -1,4 +1,4 @@
-Feature: Pio::OpenFlow.version
+Feature: OpenFlow.version
   Scenario: OpenFlow 1.0
     Given I switch the Pio::OpenFlow version to "OpenFlow10"
     When I get the OpenFlow version string

data/features/parser.feature

@@ -1,10 +1,9 @@
-Feature: Pio::Parser
+Feature: Parser
   Scenario: parse icmpv6.pcap
-    When I try to parse a file named "icmpv6.pcap" with "Pio::Parser" class
-    Then it should finish successfully
-    And the message #1 have the following fields and values:
-    | field           | value                      |
-    | class           | Pio::Parser::EthernetFrame |
-    | destination_mac | 00:60:97:07:69:ea          |
-    | source_mac      | 00:00:86:05:80:da          |
-    | ether_type      | 34525                      |
+    When I parse a file named "icmpv6.pcap" with "Pio::Parser" class
+    Then the message #1 have the following fields and values:
+      | field           | value              |
+      | class           | Pio::EthernetFrame |
+      | destination_mac | 00:60:97:07:69:ea  |
+      | source_mac      | 00:00:86:05:80:da  |
+      | ether_type      | 34525              |

data/features/step_definitions/open_flow_steps.rb

@@ -1,40 +1,35 @@
 Given(/^I switch the Pio::OpenFlow version to "([^"]*)"$/) do |version|
-  Pio::OpenFlow.switch_version version.to_sym
+  Pio::OpenFlow.version = version
 end
 
 When(/^I get the OpenFlow version string$/) do
-  @version = Pio::OpenFlow.version
+  @version = Pio::OpenFlow.version.to_s
 end
 
 Then(/^the version string should be "([^"]*)"$/) do |expected_version_string|
   expect(@version).to eq(expected_version_string)
 end
 
-When(/^I try to create a packet with:$/) do |ruby_code|
-  begin
-    @result = Pio.module_eval(ruby_code)
-  rescue
-    @last_error = $ERROR_INFO
-  end
+When(/^I create a packet with:$/) do |ruby_code|
+  cd('.') { @result = Pio.module_eval(ruby_code) }
 end
 
-When(/^I try to create an OpenFlow message with:$/) do |ruby_code|
-  step 'I try to create a packet with:', ruby_code
+When(/^I create an OpenFlow message with:$/) do |ruby_code|
+  step 'I create a packet with:', ruby_code
 end
 
-When(/^I try to create an OpenFlow action with:$/) do |ruby_code|
-  step 'I try to create a packet with:', ruby_code
+When(/^I create an OpenFlow action with:$/) do |ruby_code|
+  step 'I create a packet with:', ruby_code
 end
 
-When(/^I try to create an OpenFlow instruction with:$/) do |ruby_code|
-  step 'I try to create a packet with:', ruby_code
+When(/^I create an OpenFlow instruction with:$/) do |ruby_code|
+  step 'I create a packet with:', ruby_code
 end
 
 # rubocop:disable LineLength
 Then(/^the following each raw file should be parsed into its corresponding object using OpenFlow\.read$/) do |table|
   table.hashes.each do |each|
-    step %(I try to parse a file named "#{each['raw file']}" with "OpenFlow" class)
-    step 'it should finish successfully'
+    step %(I parse a file named "#{each['raw file']}" with "Pio::OpenFlow" class)
     step %(the message should be a "#{each['result object']}")
   end
 end

data/features/step_definitions/packet_data_steps.rb

@@ -1,43 +1,27 @@
-# rubocop:disable LineLength
-When(/^I try to parse a file named "(.*?\.raw)" with "(.*?)" class$/) do |path, klass|
-  full_path = File.expand_path(File.join(__dir__, '..', path))
-  raw_data = IO.read(full_path)
+When(/^I parse a file named "(.*?\.raw)" with "(.*?)" class$/) do |path, klass|
+  raw_data = IO.read(expand_path("%/#{path}"))
   parser_klass = Pio.const_get(klass)
-  begin
-    @result = parser_klass.read(raw_data)
-  rescue
-    @last_error = $ERROR_INFO
-  end
+  @result = parser_klass.read(raw_data)
 end
-# rubocop:enable LineLength
 
-# rubocop:disable LineLength
-When(/^I try to parse a file named "(.*?\.pcap)" with "(.*?)" class$/) do |path, klass|
-  full_path = File.expand_path(File.join(__dir__, '..', path))
-  pcap = Pio::Pcap::Frame.read(IO.read(full_path))
+When(/^I parse a file named "(.*?\.pcap)" with "(.*?)" class$/) do |path, klass|
+  pcap = Pio::Pcap::Frame.read(IO.read(expand_path("%/#{path}")))
   parser_klass = Pio.const_get(klass)
-  begin
-    @result = pcap.records.each_with_object([]) do |each, result|
-      result << parser_klass.read(each.data)
-    end
-  rescue
-    @last_error = $ERROR_INFO
+  @result = pcap.records.each_with_object([]) do |each, result|
+    result << parser_klass.read(each.data)
   end
 end
-# rubocop:enable LineLength
-
-Then(/^it should finish successfully$/) do
-  expect(@last_error).to be_nil
-end
-
-Then(/^it should fail with "([^"]*)", "([^"]*)"$/) do |error, message|
-  expect(@last_error.class.to_s).to eq(error)
-  expect(@last_error.message).to eq(message)
-end
 
 When(/^I create an exact match from "(.*?)"$/) do |path|
-  full_path = File.expand_path(File.join(__dir__, '..', path))
-  @result = Pio::ExactMatch.new(Pio::PacketIn.read(IO.read(full_path)))
+  raw_data = case File.extname(path)
+             when '.raw'
+               IO.read(expand_path("%/#{path}"))
+             when '.rb'
+               Pio.module_eval(IO.read(expand_path("%/#{path}")))
+             else
+               raise
+             end
+  @result = Pio::ExactMatch.new(Pio::PacketIn.read(raw_data))
 end
 
 Then(/^the message should be a "([^"]*)"$/) do |expected_klass|