pio 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4a2bc0f45a37328d72869a6b04ec3d891afedf6
-  data.tar.gz: dd495c7d16475d9f0d1124407eeb932a1ec69acc
+  metadata.gz: d143e0e583d6916c1375465b6add97ae65ff1436
+  data.tar.gz: ea651e9a42b7cd0df2077047e5d2c45dc985ef01
 SHA512:
-  metadata.gz: b47a1e1db39a3408a065677db5d1d7af6410560d5df4ec911c03212e524c202cac3af8fcdc1e1f7d8c50287c231df5589b421ed0b64a950a2776f099ff427910
-  data.tar.gz: 138ec261dc4beab21f21dfb0eebdcf800bc7d00c756f274fd2726fe750deabc1d100f7df57c248b2d3a0c5379db101f4ac71d9f4f86dffb62093df08d84cc44b
+  metadata.gz: dbb88254d9e82879c3b95ef23b29b146253bea2084b02500181cd170d78cbd7dc14f84c6e2affef58bc66b136f6319966f2f450a2bdc0c7ffb5db122f060306c
+  data.tar.gz: 9e9a071f4e4d3970773b11ccfaaf0d11128389eedd960d033f8383964d324b077755e2825107b2b793ce0ef158ec8d473237bd155603d47cacffc5698045676b

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.21.1 (6/24/2015)
+### Bugs fixed
+* [#179](https://github.com/trema/pio/pull/179): Fix wrong OXM length.
+
+
 ## 0.21.0 (6/19/2015)
 ### New features
 * [#164](https://github.com/trema/pio/pull/164): Add new classes `Pio::FlowMod`, `Pio::Apply`, `Pio::GotoTable`, `Pio::WriteMetadata`, `Pio::Meter` and `Pio::SendOutPort`.

data/README.md

@@ -70,7 +70,7 @@ bundle
 ## Team
 
 - [Yasuhito Takamiya](https://github.com/yasuhito) ([@yasuhito](https://twitter.com/yasuhito))
-- [Eishun Kondoh](https://github.com/shun159) ([@Eishun\_Kondoh](https://twitter.com/Eishun_Kondoh))
+- [Eishun Kondoh](https://github.com/shun159) ([@shunichigokew](https://twitter.com/shunichigokew))
 
 ### Contributors
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'bundler/gem_tasks'
 
 RELISH_PROJECT = 'trema/pio'
-FLAY_THRESHOLD = 300
+FLAY_THRESHOLD = 346
 
 task default: :travis
 task test: [:spec, :cucumber]

data/features/open_flow13/match.feature

@@ -95,6 +95,49 @@ Feature: Pio::Match
       | field      | value |
       | ether_type |  2048 |
 
+  Scenario: new(vlan_vid: 10)
+    When I try to create an OpenFlow message with:
+    """
+    Pio::Match.new(vlan_vid: 10)
+    """
+    Then it should finish successfully
+    And the message have the following fields and values:
+    | field    | value |
+    | vlan_vid |    10 |
+
+  Scenario: new(vlan_vid: 10, vlan_pcp: 5)
+    When I try to create an OpenFlow message with:
+      """
+      Pio::Match.new(vlan_vid: 10, vlan_pcp: 5)
+      """
+    Then it should finish successfully
+    And the message have the following fields and values:
+    | field    | value |
+    | vlan_vid |    10 |
+    | vlan_pcp |     5 |
+
+  Scenario: new(eth_type: 2048, ip_dscp: 46)
+    When I try to create an OpenFlow message with:
+      """
+      Pio::Match.new(ether_type: 2048, ip_dscp: 46)
+      """
+    Then it should finish successfully
+    And the message have the following fields and values:
+      | field      | value |
+      | ether_type |  2048 |
+      | ip_dscp    |    46 |
+
+  Scenario: new(eth_type: 2048, ip_ecn: 3)
+    When I try to create an OpenFlow message with:
+      """
+      Pio::Match.new(ether_type: 2048, ip_ecn: 46)
+      """
+    Then it should finish successfully
+    And the message have the following fields and values:
+      | field      | value |
+      | ether_type |  2048 |
+      | ip_ecn     |     3 |
+
   Scenario: new(ether_type: 0x0800, ipv4_source_address: '192.168.0.1')
     When I try to create an OpenFlow message with:
       """
@@ -301,6 +344,37 @@ Feature: Pio::Match
       | field      | value |
       | ether_type |     0 |
 
+  Scenario: read (file: open_flow13/oxm_vlan_vid_field.raw)
+    When I try to parse a file named "open_flow13/oxm_vlan_vid_field.raw" with "Pio::Match" class
+    Then it should finish successfully
+    And the message have the following fields and values:
+      | field    | value |
+      | vlan_vid |    10 |
+
+  Scenario: read (file: open_flow13/oxm_vlan_pcp_field.raw)
+    When I try to parse a file named "open_flow13/oxm_vlan_pcp_field.raw" with "Pio::Match" class
+    Then it should finish successfully
+    And the message have the following fields and values:
+      | field    | value |
+      | vlan_vid |    10 |
+      | vlan_pcp |     5 |
+
+  Scenario: read (file: open_flow13/oxm_ip_dscp_field.raw)
+    When I try to parse a file named "open_flow13/oxm_ip_dscp_field.raw" with "Pio::Match" class
+    Then it should finish successfully
+    And the message have the following fields and values:
+      | field      | value |
+      | ether_type |  2048 |
+      | ip_dscp    |    46 |
+
+  Scenario: read (file: open_flow13/oxm_ip_ecn_field.raw)
+    When I try to parse a file named "open_flow13/oxm_ip_ecn_field.raw" with "Pio::Match" class
+    Then it should finish successfully
+    And the message have the following fields and values:
+      | field      | value |
+      | ether_type |  2048 |
+      | ip_ecn     |     3 |
+
   Scenario: read (file: open_flow13/oxm_ipv4_source_field.raw)
     When I try to parse a file named "open_flow13/oxm_ipv4_source_field.raw" with "Pio::Match" class
     Then it should finish successfully

data/lib/pio/open_flow10/actions.rb

@@ -1,13 +1,13 @@
 require 'bindata'
-require 'pio/enqueue'
+require 'pio/open_flow10/enqueue'
 require 'pio/open_flow10/send_out_port'
-require 'pio/set_ether_address'
-require 'pio/set_ip_address'
-require 'pio/set_ip_tos'
-require 'pio/set_transport_port'
-require 'pio/set_vlan_priority'
-require 'pio/set_vlan_vid'
-require 'pio/strip_vlan_header'
+require 'pio/open_flow10/set_ether_address'
+require 'pio/open_flow10/set_ip_address'
+require 'pio/open_flow10/set_ip_tos'
+require 'pio/open_flow10/set_transport_port'
+require 'pio/open_flow10/set_vlan_priority'
+require 'pio/open_flow10/set_vlan_vid'
+require 'pio/open_flow10/strip_vlan_header'
 
 module Pio
   module OpenFlow

data/lib/pio/{set_vlan_priority.rb → open_flow10/set_vlan_priority.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_vlan'
+require 'pio/open_flow10/set_vlan'
 
 module Pio
   # An action to modify the VLAN priority of a packet.

data/lib/pio/{set_vlan_vid.rb → open_flow10/set_vlan_vid.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_vlan'
+require 'pio/open_flow10/set_vlan'
 
 module Pio
   # An action to modify the VLAN ID of a packet.

data/lib/pio/open_flow13/match.rb

@@ -115,6 +115,70 @@ module Pio
         end
       end
 
+      # The value of OXM_OF_VLAN_VID match field
+      class VlanVid < BinData::Record
+        OXM_FIELD = 6
+
+        endian :big
+
+        bit3 :padding
+        bit13 :vlan_vid
+
+        hide :padding
+
+        def length
+          2
+        end
+      end
+
+      # The value of OXM_OF_VLAN_PCP match field
+      class VlanPcp < BinData::Record
+        OXM_FIELD = 7
+
+        endian :big
+
+        bit5 :padding
+        bit3 :vlan_pcp
+
+        hide :padding
+
+        def length
+          1
+        end
+      end
+
+      # The value of OXM_OF_IP_DSCP match field
+      class IpDscp < BinData::Record
+        OXM_FIELD = 8
+
+        endian :big
+
+        bit2 :padding
+        bit6 :ip_dscp
+
+        hide :padding
+
+        def length
+          1
+        end
+      end
+
+      # The value of OXM_OF_IP_ECN match field
+      class IpEcn < BinData::Record
+        OXM_FIELD = 9
+
+        endian :big
+
+        bit6 :padding
+        bit2 :ip_ecn
+
+        hide :padding
+
+        def length
+          1
+        end
+      end
+
       # The value of OXM_OF_IP_PROTO
       class IpProtocol < BinData::Record
         OXM_FIELD = 10
@@ -189,7 +253,7 @@ module Pio
         uint16 :tcp_source_port
 
         def length
-          16
+          2
         end
       end
 
@@ -202,7 +266,7 @@ module Pio
         uint16 :tcp_destination_port
 
         def length
-          16
+          2
         end
       end
 
@@ -215,7 +279,7 @@ module Pio
         uint16 :udp_source_port
 
         def length
-          16
+          2
         end
       end
 
@@ -228,7 +292,7 @@ module Pio
         uint16 :udp_destination_port
 
         def length
-          16
+          2
         end
       end
 
@@ -241,7 +305,7 @@ module Pio
         ipv6_address :ipv6_source_address
 
         def length
-          128
+          16
         end
       end
 
@@ -255,7 +319,7 @@ module Pio
         ipv6_address :ipv6_source_address_mask
 
         def length
-          256
+          32
         end
       end
 
@@ -268,7 +332,7 @@ module Pio
         ipv6_address :ipv6_destination_address
 
         def length
-          128
+          16
         end
       end
 
@@ -282,7 +346,7 @@ module Pio
         ipv6_address :ipv6_destination_address_mask
 
         def length
-          256
+          32
         end
       end
 
@@ -307,6 +371,10 @@ module Pio
             ether_source_address EtherSourceAddress
             masked_ether_source_address MaskedEtherSourceAddress
             ether_type EtherType
+            vlan_vid VlanVid
+            vlan_pcp VlanPcp
+            ip_dscp IpDscp
+            ip_ecn IpEcn
             ipv4_source_address Ipv4SourceAddress
             masked_ipv4_source_address MaskedIpv4SourceAddress
             ipv4_destination_address Ipv4DestinationAddress
@@ -352,6 +420,14 @@ module Pio
               masked? ? MaskedEtherSourceAddress : EtherSourceAddress
             when EtherType::OXM_FIELD
               EtherType
+            when VlanVid::OXM_FIELD
+              VlanVid
+            when VlanPcp::OXM_FIELD
+              VlanPcp
+            when IpDscp::OXM_FIELD
+              IpDscp
+            when IpEcn::OXM_FIELD
+              IpEcn
             when Ipv4SourceAddress::OXM_FIELD
               masked? ? MaskedIpv4SourceAddress : Ipv4SourceAddress
             when Ipv4DestinationAddress::OXM_FIELD
@@ -429,8 +505,8 @@ module Pio
         def initialize(user_attrs)
           @match_fields = []
 
-          [:in_port, :ether_type, :ip_protocol,
-           :tcp_source_port, :tcp_destination_port,
+          [:in_port, :ether_type, :ip_protocol, :vlan_vid, :vlan_pcp,
+           :ip_dscp, :ip_ecn, :tcp_source_port, :tcp_destination_port,
            :udp_source_port, :udp_destination_port].each do |each|
             next unless user_attrs.key?(each)
             klass = Match.const_get(each.to_s.split('_').map(&:capitalize).join)

data/lib/pio/version.rb

@@ -1,5 +1,5 @@
 # Base module.
 module Pio
   # gem version.
-  VERSION = '0.21.0'.freeze
+  VERSION = '0.21.1'.freeze
 end

data/spec/pio/{enqueue_spec.rb → open_flow10/enqueue_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/enqueue'
+require 'pio/open_flow10/enqueue'
 
 describe Pio::Enqueue do
   describe '.new' do

data/spec/pio/{set_ether_destination_address_spec.rb → open_flow10/set_ether_destination_address_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_ether_address'
+require 'pio/open_flow10/set_ether_address'
 
 describe Pio::SetEtherDestinationAddr do
   describe '.new' do

data/spec/pio/{set_ether_source_address_spec.rb → open_flow10/set_ether_source_address_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_ether_address'
+require 'pio/open_flow10/set_ether_address'
 
 describe Pio::SetEtherSourceAddr do
   describe '.new' do

data/spec/pio/{set_ip_destination_address_spec.rb → open_flow10/set_ip_destination_address_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_ip_address'
+require 'pio/open_flow10/set_ip_address'
 
 describe Pio::SetIpDestinationAddress do
   describe '.new' do

data/spec/pio/{set_ip_source_address_spec.rb → open_flow10/set_ip_source_address_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_ip_address'
+require 'pio/open_flow10/set_ip_address'
 
 describe Pio::SetIpSourceAddress do
   describe '.new' do

data/spec/pio/{set_ip_tos_spec.rb → open_flow10/set_ip_tos_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_ip_tos'
+require 'pio/open_flow10/set_ip_tos'
 
 describe Pio::SetIpTos do
   describe '.new' do

data/spec/pio/{set_transport_destination_port_spec.rb → open_flow10/set_transport_destination_port_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_transport_port'
+require 'pio/open_flow10/set_transport_port'
 
 describe Pio::SetTransportDestinationPort do
   describe '.new' do

data/spec/pio/{set_transport_source_port_spec.rb → open_flow10/set_transport_source_port_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_transport_port'
+require 'pio/open_flow10/set_transport_port'
 
 describe Pio::SetTransportSourcePort do
   describe '.new' do

data/spec/pio/{set_vlan_priority_spec.rb → open_flow10/set_vlan_priority_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_vlan_priority'
+require 'pio/open_flow10/set_vlan_priority'
 
 describe Pio::SetVlanPriority do
   describe '.new' do

data/spec/pio/{set_vlan_vid_spec.rb → open_flow10/set_vlan_vid_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/set_vlan_vid'
+require 'pio/open_flow10/set_vlan_vid'
 
 describe Pio::SetVlanVid do
   describe '.new' do

data/spec/pio/{strip_vlan_header_spec.rb → open_flow10/strip_vlan_header_spec.rb}

@@ -1,4 +1,4 @@
-require 'pio/strip_vlan_header'
+require 'pio/open_flow10/strip_vlan_header'
 
 describe Pio::StripVlanHeader do
   Given(:strip_vlan_header) { Pio::StripVlanHeader.new }

data/spec/pio/open_flow13/match_spec.rb

@@ -141,6 +141,89 @@ describe Pio::OpenFlow13::Match do
       And { match.match_fields[0].oxm_length == 2 }
     end
 
+    context 'with vlan_vid: 10' do
+      When(:match) { Pio::OpenFlow13::Match.new(vlan_vid: 10) }
+      Then { match.vlan_vid == 10 }
+      And { match.class == Pio::OpenFlow13::Match }
+      And { match.length == 16 }
+      And { match.match_type == Pio::OpenFlow13::MATCH_TYPE_OXM }
+      And { match.match_length == 10 }
+      And { match.match_fields.size == 1 }
+      And do
+        match.match_fields[0].oxm_class ==
+          Pio::OpenFlow13::Match::OXM_CLASS_OPENFLOW_BASIC
+      end
+      And do
+        match.match_fields[0].oxm_field ==
+          Pio::OpenFlow13::Match::VlanVid::OXM_FIELD
+      end
+      And { match.match_fields[0].masked? == false }
+      And { match.match_fields[0].oxm_length == 2 }
+    end
+
+    context 'with vlan_vid: 10, vlan_pcp: 5' do
+      When(:match) { Pio::OpenFlow13::Match.new(vlan_vid: 10, vlan_pcp: 5) }
+      Then { match.vlan_vid == 10 }
+      Then { match.vlan_pcp == 5 }
+      And { match.class == Pio::OpenFlow13::Match }
+      And { match.length == 16 }
+      And { match.match_type == Pio::OpenFlow13::MATCH_TYPE_OXM }
+      And { match.match_length == 15 }
+      And { match.match_fields.size == 2 }
+      And do
+        match.match_fields[1].oxm_class ==
+          Pio::OpenFlow13::Match::OXM_CLASS_OPENFLOW_BASIC
+      end
+      And do
+        match.match_fields[1].oxm_field ==
+          Pio::OpenFlow13::Match::VlanPcp::OXM_FIELD
+      end
+      And { match.match_fields[1].masked? == false }
+      And { match.match_fields[0].oxm_length == 2 }
+    end
+
+    context 'with ether_type: 0x0800, ip_dscp: 0x2e' do
+      When(:match) { Pio::OpenFlow13::Match.new(ether_type: 0x0800, ip_dscp: 0x2e) }
+      Then { match.ether_type == 0x0800 }
+      Then { match.ip_dscp == 0x2e }
+      And { match.class == Pio::OpenFlow13::Match }
+      And { match.length == 16 }
+      And { match.match_type == Pio::OpenFlow13::MATCH_TYPE_OXM }
+      And { match.match_length == 15 }
+      And { match.match_fields.size == 2 }
+      And do
+        match.match_fields[1].oxm_class ==
+          Pio::OpenFlow13::Match::OXM_CLASS_OPENFLOW_BASIC
+      end
+      And do
+        match.match_fields[1].oxm_field ==
+          Pio::OpenFlow13::Match::IpDscp::OXM_FIELD
+      end
+      And { match.match_fields[1].masked? == false }
+      And { match.match_fields[0].oxm_length == 2 }
+    end
+
+    context 'with ether_type: 0x0800, ip_ecn: 3' do
+      When(:match) { Pio::OpenFlow13::Match.new(ether_type: 0x0800, ip_ecn: 3) }
+      Then { match.ether_type == 0x0800 }
+      Then { match.ip_ecn == 3 }
+      And { match.class == Pio::OpenFlow13::Match }
+      And { match.length == 16 }
+      And { match.match_type == Pio::OpenFlow13::MATCH_TYPE_OXM }
+      And { match.match_length == 15 }
+      And { match.match_fields.size == 2 }
+      And do
+        match.match_fields[1].oxm_class ==
+          Pio::OpenFlow13::Match::OXM_CLASS_OPENFLOW_BASIC
+      end
+      And do
+        match.match_fields[1].oxm_field ==
+          Pio::OpenFlow13::Match::IpEcn::OXM_FIELD
+      end
+      And { match.match_fields[1].masked? == false }
+      And { match.match_fields[0].oxm_length == 2 }
+    end
+
     context "with ether_type: 0x0800, ipv4_source_address: '1.2.3.4'" do
       When(:match) do
         Pio::OpenFlow13::Match.new(ether_type: 0x0800,
@@ -362,6 +445,94 @@ describe Pio::OpenFlow13::Match do
       And { match.match_fields[0].oxm_length == 2 }
     end
 
+    context 'with file "features/open_flow13/oxm_vlan_vid_field.raw"' do
+      Given(:raw_data) do
+        read_raw_data_file 'features/open_flow13/oxm_vlan_vid_field.raw'
+      end
+      Then { match.vlan_vid == 10 }
+      And { match.class == Pio::OpenFlow13::Match }
+      And { match.length == 16 }
+      And { match.match_type == Pio::OpenFlow13::MATCH_TYPE_OXM }
+      And { match.match_length == 10 }
+      And { match.match_fields.size == 1 }
+      And do
+        match.match_fields[0].oxm_class ==
+          Pio::OpenFlow13::Match::OXM_CLASS_OPENFLOW_BASIC
+      end
+      And do
+        match.match_fields[0].oxm_field ==
+          Pio::OpenFlow13::Match::VlanVid::OXM_FIELD
+      end
+      And { match.match_fields[0].masked? == false }
+      And { match.match_fields[0].oxm_length == 2 }
+    end
+
+    context 'with file "features/open_flow13/oxm_vlan_pcp_field.raw"' do
+      Given(:raw_data) do
+        read_raw_data_file 'features/open_flow13/oxm_vlan_pcp_field.raw'
+      end
+      Then { match.vlan_pcp == 5 }
+      And { match.class == Pio::OpenFlow13::Match }
+      And { match.length == 16 }
+      And { match.match_type == Pio::OpenFlow13::MATCH_TYPE_OXM }
+      And { match.match_length == 15 }
+      And { match.match_fields.size == 2 }
+      And do
+        match.match_fields[0].oxm_class ==
+          Pio::OpenFlow13::Match::OXM_CLASS_OPENFLOW_BASIC
+      end
+      And do
+        match.match_fields[0].oxm_field ==
+          Pio::OpenFlow13::Match::VlanVid::OXM_FIELD
+      end
+      And { match.match_fields[0].masked? == false }
+      And { match.match_fields[0].oxm_length == 2 }
+    end
+
+    context 'with file "features/open_flow13/oxm_ip_dscp_field.raw"' do
+      Given(:raw_data) do
+        read_raw_data_file 'features/open_flow13/oxm_ip_dscp_field.raw'
+      end
+      Then { match.ip_dscp == 0x2e }
+      And { match.class == Pio::OpenFlow13::Match }
+      And { match.length == 16 }
+      And { match.match_type == Pio::OpenFlow13::MATCH_TYPE_OXM }
+      And { match.match_length == 15 }
+      And { match.match_fields.size == 2 }
+      And do
+        match.match_fields[1].oxm_class ==
+          Pio::OpenFlow13::Match::OXM_CLASS_OPENFLOW_BASIC
+      end
+      And do
+        match.match_fields[1].oxm_field ==
+          Pio::OpenFlow13::Match::IpDscp::OXM_FIELD
+      end
+      And { match.match_fields[0].masked? == false }
+      And { match.match_fields[0].oxm_length == 2 }
+    end
+
+    context 'with file "features/open_flow13/oxm_ip_ecn_field.raw"' do
+      Given(:raw_data) do
+        read_raw_data_file 'features/open_flow13/oxm_ip_ecn_field.raw'
+      end
+      Then { match.ip_ecn == 3 }
+      And { match.class == Pio::OpenFlow13::Match }
+      And { match.length == 16 }
+      And { match.match_type == Pio::OpenFlow13::MATCH_TYPE_OXM }
+      And { match.match_length == 15 }
+      And { match.match_fields.size == 2 }
+      And do
+        match.match_fields[1].oxm_class ==
+          Pio::OpenFlow13::Match::OXM_CLASS_OPENFLOW_BASIC
+      end
+      And do
+        match.match_fields[1].oxm_field ==
+          Pio::OpenFlow13::Match::IpEcn::OXM_FIELD
+      end
+      And { match.match_fields[0].masked? == false }
+      And { match.match_fields[0].oxm_length == 2 }
+    end
+
     context 'with file "features/open_flow13/oxm_ipv4_source_field.raw"' do
       Given(:raw_data) do
         read_raw_data_file 'features/open_flow13/oxm_ipv4_source_field.raw'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pio
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -516,6 +516,8 @@ files:
 - features/open_flow13/oxm_ether_type_field.raw
 - features/open_flow13/oxm_in_phy_port_field.raw
 - features/open_flow13/oxm_in_port_field.raw
+- features/open_flow13/oxm_ip_dscp_field.raw
+- features/open_flow13/oxm_ip_ecn_field.raw
 - features/open_flow13/oxm_ipv4_destination_field.raw
 - features/open_flow13/oxm_ipv4_source_field.raw
 - features/open_flow13/oxm_ipv6_destination_field.raw
@@ -535,6 +537,8 @@ files:
 - features/open_flow13/oxm_udp_destination_field.raw
 - features/open_flow13/oxm_udp_field.raw
 - features/open_flow13/oxm_udp_source_field.raw
+- features/open_flow13/oxm_vlan_pcp_field.raw
+- features/open_flow13/oxm_vlan_vid_field.raw
 - features/open_flow13/send_out_port.feature
 - features/open_flow13/send_out_port.raw
 - features/open_flow13/write_metadata.feature
@@ -568,7 +572,6 @@ files:
 - lib/pio/dhcp/optional_tlv.rb
 - lib/pio/dhcp/parameter_list.rb
 - lib/pio/dhcp/request.rb
-- lib/pio/enqueue.rb
 - lib/pio/ethernet_header.rb
 - lib/pio/icmp.rb
 - lib/pio/icmp/format.rb
@@ -606,6 +609,7 @@ files:
 - lib/pio/open_flow10.rb
 - lib/pio/open_flow10/actions.rb
 - lib/pio/open_flow10/echo.rb
+- lib/pio/open_flow10/enqueue.rb
 - lib/pio/open_flow10/exact_match.rb
 - lib/pio/open_flow10/features.rb
 - lib/pio/open_flow10/flow_mod.rb
@@ -616,6 +620,14 @@ files:
 - lib/pio/open_flow10/packet_out.rb
 - lib/pio/open_flow10/port_status.rb
 - lib/pio/open_flow10/send_out_port.rb
+- lib/pio/open_flow10/set_ether_address.rb
+- lib/pio/open_flow10/set_ip_address.rb
+- lib/pio/open_flow10/set_ip_tos.rb
+- lib/pio/open_flow10/set_transport_port.rb
+- lib/pio/open_flow10/set_vlan.rb
+- lib/pio/open_flow10/set_vlan_priority.rb
+- lib/pio/open_flow10/set_vlan_vid.rb
+- lib/pio/open_flow10/strip_vlan_header.rb
 - lib/pio/open_flow13.rb
 - lib/pio/open_flow13/apply.rb
 - lib/pio/open_flow13/echo.rb
@@ -632,14 +644,6 @@ files:
 - lib/pio/parse_error.rb
 - lib/pio/payload.rb
 - lib/pio/pcap.rb
-- lib/pio/set_ether_address.rb
-- lib/pio/set_ip_address.rb
-- lib/pio/set_ip_tos.rb
-- lib/pio/set_transport_port.rb
-- lib/pio/set_vlan.rb
-- lib/pio/set_vlan_priority.rb
-- lib/pio/set_vlan_vid.rb
-- lib/pio/strip_vlan_header.rb
 - lib/pio/type/ip_address.rb
 - lib/pio/type/ipv6_address.rb
 - lib/pio/type/mac_address.rb
@@ -657,35 +661,35 @@ files:
 - spec/pio/dhcp/offer_spec.rb
 - spec/pio/dhcp/request_spec.rb
 - spec/pio/dhcp_spec.rb
-- spec/pio/enqueue_spec.rb
-- spec/pio/flow_mod_spec.rb
 - spec/pio/icmp/reply_spec.rb
 - spec/pio/icmp/request_spec.rb
 - spec/pio/icmp_spec.rb
 - spec/pio/ipv4_address_spec.rb
 - spec/pio/lldp/options_spec.rb
 - spec/pio/mac_spec.rb
-- spec/pio/match_spec.rb
 - spec/pio/open_flow/phy_port_spec.rb
 - spec/pio/open_flow/type_spec.rb
+- spec/pio/open_flow10/enqueue_spec.rb
+- spec/pio/open_flow10/flow_mod_spec.rb
+- spec/pio/open_flow10/match_spec.rb
+- spec/pio/open_flow10/packet_out_spec.rb
 - spec/pio/open_flow10/send_out_port_spec.rb
+- spec/pio/open_flow10/set_ether_destination_address_spec.rb
+- spec/pio/open_flow10/set_ether_source_address_spec.rb
+- spec/pio/open_flow10/set_ip_destination_address_spec.rb
+- spec/pio/open_flow10/set_ip_source_address_spec.rb
+- spec/pio/open_flow10/set_ip_tos_spec.rb
+- spec/pio/open_flow10/set_transport_destination_port_spec.rb
+- spec/pio/open_flow10/set_transport_source_port_spec.rb
+- spec/pio/open_flow10/set_vlan_priority_spec.rb
+- spec/pio/open_flow10/set_vlan_vid_spec.rb
+- spec/pio/open_flow10/strip_vlan_header_spec.rb
+- spec/pio/open_flow10/wildcards_spec.rb
 - spec/pio/open_flow13/goto_table_spec.rb
 - spec/pio/open_flow13/hello_spec.rb
 - spec/pio/open_flow13/match_spec.rb
 - spec/pio/open_flow13/meter_spec.rb
 - spec/pio/open_flow13/write_metadata_spec.rb
-- spec/pio/packet_out_spec.rb
-- spec/pio/set_ether_destination_address_spec.rb
-- spec/pio/set_ether_source_address_spec.rb
-- spec/pio/set_ip_destination_address_spec.rb
-- spec/pio/set_ip_source_address_spec.rb
-- spec/pio/set_ip_tos_spec.rb
-- spec/pio/set_transport_destination_port_spec.rb
-- spec/pio/set_transport_source_port_spec.rb
-- spec/pio/set_vlan_priority_spec.rb
-- spec/pio/set_vlan_vid_spec.rb
-- spec/pio/strip_vlan_header_spec.rb
-- spec/pio/wildcards_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/trema/pio
 licenses:
@@ -722,35 +726,35 @@ test_files:
 - spec/pio/dhcp/offer_spec.rb
 - spec/pio/dhcp/request_spec.rb
 - spec/pio/dhcp_spec.rb
-- spec/pio/enqueue_spec.rb
-- spec/pio/flow_mod_spec.rb
 - spec/pio/icmp/reply_spec.rb
 - spec/pio/icmp/request_spec.rb
 - spec/pio/icmp_spec.rb
 - spec/pio/ipv4_address_spec.rb
 - spec/pio/lldp/options_spec.rb
 - spec/pio/mac_spec.rb
-- spec/pio/match_spec.rb
 - spec/pio/open_flow/phy_port_spec.rb
 - spec/pio/open_flow/type_spec.rb
+- spec/pio/open_flow10/enqueue_spec.rb
+- spec/pio/open_flow10/flow_mod_spec.rb
+- spec/pio/open_flow10/match_spec.rb
+- spec/pio/open_flow10/packet_out_spec.rb
 - spec/pio/open_flow10/send_out_port_spec.rb
+- spec/pio/open_flow10/set_ether_destination_address_spec.rb
+- spec/pio/open_flow10/set_ether_source_address_spec.rb
+- spec/pio/open_flow10/set_ip_destination_address_spec.rb
+- spec/pio/open_flow10/set_ip_source_address_spec.rb
+- spec/pio/open_flow10/set_ip_tos_spec.rb
+- spec/pio/open_flow10/set_transport_destination_port_spec.rb
+- spec/pio/open_flow10/set_transport_source_port_spec.rb
+- spec/pio/open_flow10/set_vlan_priority_spec.rb
+- spec/pio/open_flow10/set_vlan_vid_spec.rb
+- spec/pio/open_flow10/strip_vlan_header_spec.rb
+- spec/pio/open_flow10/wildcards_spec.rb
 - spec/pio/open_flow13/goto_table_spec.rb
 - spec/pio/open_flow13/hello_spec.rb
 - spec/pio/open_flow13/match_spec.rb
 - spec/pio/open_flow13/meter_spec.rb
 - spec/pio/open_flow13/write_metadata_spec.rb
-- spec/pio/packet_out_spec.rb
-- spec/pio/set_ether_destination_address_spec.rb
-- spec/pio/set_ether_source_address_spec.rb
-- spec/pio/set_ip_destination_address_spec.rb
-- spec/pio/set_ip_source_address_spec.rb
-- spec/pio/set_ip_tos_spec.rb
-- spec/pio/set_transport_destination_port_spec.rb
-- spec/pio/set_transport_source_port_spec.rb
-- spec/pio/set_vlan_priority_spec.rb
-- spec/pio/set_vlan_vid_spec.rb
-- spec/pio/strip_vlan_header_spec.rb
-- spec/pio/wildcards_spec.rb
 - spec/spec_helper.rb
 - features/arp-storm.pcap
 - features/arp.feature
@@ -855,6 +859,8 @@ test_files:
 - features/open_flow13/oxm_ether_type_field.raw
 - features/open_flow13/oxm_in_phy_port_field.raw
 - features/open_flow13/oxm_in_port_field.raw
+- features/open_flow13/oxm_ip_dscp_field.raw
+- features/open_flow13/oxm_ip_ecn_field.raw
 - features/open_flow13/oxm_ipv4_destination_field.raw
 - features/open_flow13/oxm_ipv4_source_field.raw
 - features/open_flow13/oxm_ipv6_destination_field.raw
@@ -874,6 +880,8 @@ test_files:
 - features/open_flow13/oxm_udp_destination_field.raw
 - features/open_flow13/oxm_udp_field.raw
 - features/open_flow13/oxm_udp_source_field.raw
+- features/open_flow13/oxm_vlan_pcp_field.raw
+- features/open_flow13/oxm_vlan_vid_field.raw
 - features/open_flow13/send_out_port.feature
 - features/open_flow13/send_out_port.raw
 - features/open_flow13/write_metadata.feature