pio 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0bae1a4e884cc9c53cae04b7ca07d4781cea7b1
-  data.tar.gz: bdce833e9753e814505163d84bb10a59a1511955
+  metadata.gz: 9b5753a6115af1e4780aa485bf53e666cd071903
+  data.tar.gz: 14fa545e8f983b2694dcff0afafb7c1afeb91624
 SHA512:
-  metadata.gz: 7557c2fffccafb3e314d0cb97356eba24b391edc5941ae760dd1c6a9d7fe53e417a1d3706a89def3d2725f5df791f1d1d527e86f50ef5273d53775f2dc9f9bc1
-  data.tar.gz: e1672095ad435143f579135afca3fa08d6f530ff3d9b2b20ebeab600b8e8b0e5205404e2b6cf89333c183601a6cf9256d33955635f8e11c7ce603f241d7e39ae
+  metadata.gz: c6db3f9249f15d5fcaec8af17d66fa36af5a222dfb4b8b082049ffb356a871a98572d8edafbd11e9416ed3a7aca21428116ca69200c153f4690487485cf708ef
+  data.tar.gz: 44ccf71fb9db860a33706942d947a110464c2f809263543dca73c977888180ca4cfeb1646297a722cfcb777e027fa40566d80eb08410412ab8d76e4b627ccf75

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## develop (unreleased)
 
+## 0.30.0 (11/17/2015)
+### New features
+* [#281](https://github.com/trema/pio/pull/281): Add `NiciraRegLoad` action.
+* [#282](https://github.com/trema/pio/pull/282): Add `NiciraResubmit` action.
+* [#283](https://github.com/trema/pio/pull/283): Add `SetMetadata` action.
+* [#284](https://github.com/trema/pio/pull/284): Enable masking with reg0-reg7.
+* [#285](https://github.com/trema/pio/pull/285): Add Nicira `SendOutPort` action.
+
 
 ## 0.29.0 (11/11/2015)
 ### New features

data/bin/{code_metrics → terminal-notifier}

@@ -2,7 +2,7 @@
 #
 # This file was generated by Bundler.
 #
-# The application 'code_metrics' is installed as part of a gem, and
+# The application 'terminal-notifier' is installed as part of a gem, and
 # this file is here to facilitate running it.
 #
 
@@ -13,4 +13,4 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
 require 'rubygems'
 require 'bundler/setup'
 
-load Gem.bin_path('code_metrics', 'code_metrics')
+load Gem.bin_path('terminal-notifier', 'terminal-notifier')

data/features/{open_flow10 → open_flow}/nicira_resubmit.feature

@@ -1,4 +1,3 @@
-@open_flow10
 Feature: Pio::NiciraResubmit
 
   Scenario: new(1)

data/features/{open_flow10 → open_flow}/nicira_resubmit_table.feature

@@ -1,4 +1,3 @@
-@open_flow10
 Feature: Pio::NiciraResubmitTable
 
   Scenario: new(in_port: 1, table: 1)

data/features/open_flow13/nicira_reg_load.feature

@@ -0,0 +1,56 @@
+@open_flow13
+Feature: Pio::NiciraRegLoad
+
+  Scenario: new(0xdeadbeef, :reg0)
+    When I try to create an OpenFlow action with:
+      """
+      Pio::NiciraRegLoad.new(0xdeadbeef, :reg0)
+      """
+    Then it should finish successfully
+    And the action has the following fields and values:
+      | field                  |      value |
+      | action_type.to_hex     |     0xffff |
+      | action_length          |         24 |
+      | experimenter_id.to_hex |     0x2320 |
+      | experimenter_type      |          7 |
+      | offset                 |          0 |
+      | n_bits                 |         32 |
+      | destination            |      :reg0 |
+      | destination_internal   |      65540 |
+      | value.to_hex           | 0xdeadbeef |
+
+  Scenario: new(0xdeadbeef, :metadata)
+    When I try to create an OpenFlow action with:
+      """
+      Pio::NiciraRegLoad.new(0xdeadbeef, :metadata)
+      """
+    Then it should finish successfully
+    And the action has the following fields and values:
+      | field                  |      value |
+      | action_type.to_hex     |     0xffff |
+      | action_length          |         24 |
+      | experimenter_id.to_hex |     0x2320 |
+      | experimenter_type      |          7 |
+      | offset                 |          0 |
+      | n_bits                 |         64 |
+      | destination            |  :metadata |
+      | destination_internal   | 2147484680 |
+      | value.to_hex           | 0xdeadbeef |
+
+  Scenario: new(0xdeadbeef, :metadata, offset: 32, n_bits: 32)
+    When I try to create an OpenFlow action with:
+      """
+      Pio::NiciraRegLoad.new(0xdeadbeef, :metadata, offset: 32, n_bits: 32)
+      """
+    Then it should finish successfully
+    And the action has the following fields and values:
+      | field                  |      value |
+      | action_type.to_hex     |     0xffff |
+      | action_length          |         24 |
+      | experimenter_id.to_hex |     0x2320 |
+      | experimenter_type      |          7 |
+      | offset                 |         32 |
+      | n_bits                 |         32 |
+      | destination            |  :metadata |
+      | destination_internal   | 2147484680 |
+      | value.to_hex           | 0xdeadbeef |

data/features/open_flow13/nicira_reg_move.feature

@@ -19,3 +19,24 @@ Feature: Pio::NiciraRegMove
       | to                     | :arp_target_hardware_address |
       | destination_oxm_field  |                           25 |
       | destination_oxm_length |                            6 |
+
+  Scenario: new(from: :reg0, to: :reg7)
+    When I try to create an OpenFlow action with:
+      """
+      Pio::NiciraRegMove.new(from: :reg0, to: :reg7)
+      """
+    Then it should finish successfully
+    And the action has the following fields and values:
+      | field                  |  value |
+      | action_type.to_hex     | 0xffff |
+      | action_length          |     24 |
+      | experimenter_id.to_hex | 0x2320 |
+      | experimenter_type      |      6 |
+      | from                   |  :reg0 |
+      | source_oxm_class       |      1 |
+      | source_oxm_field       |      0 |
+      | source_oxm_length      |      4 |
+      | to                     |  :reg7 |
+      | destination_oxm_class  |      1 |
+      | destination_oxm_field  |      7 |
+      | destination_oxm_length |      4 |

data/features/open_flow13/nicira_send_out_port.feature

@@ -0,0 +1,20 @@
+@open_flow13
+Feature: Pio::NiciraSendOutPort
+
+  Scenario: new(:reg0)
+    When I try to create an OpenFlow action with:
+      """
+      Pio::NiciraSendOutPort.new(:reg0)
+      """
+    Then it should finish successfully
+    And the action has the following fields and values:
+      | field                  |  value |
+      | action_type.to_hex     | 0xffff |
+      | action_length          |     24 |
+      | experimenter_id.to_hex | 0x2320 |
+      | experimenter_type      |     15 |
+      | offset                 |      0 |
+      | source                 |  :reg0 |
+      | max_length             |      0 |
+
+    

data/features/open_flow13/set_metadata.feature

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

data/lib/pio/open_flow.rb

@@ -19,9 +19,9 @@ module Pio
        :PacketIn, :FlowRemoved, :PacketOut, :SendOutPort,
        :SetSourceMacAddress, :SetDestinationMacAddress, :PortStatus, :Stats,
        :FlowStats, :DescriptionStats, :AggregateStats, :TableStats, :PortStats,
-       :QueueStats, :Error, :NiciraResubmit, :SetArpOperation,
-       :SetArpSenderProtocolAddress, :SetArpSenderHardwareAddress,
-       :NiciraResubmitTable, :NiciraRegMove].each do |each|
+       :QueueStats, :Error, :SetArpOperation, :SetArpSenderProtocolAddress,
+       :SetArpSenderHardwareAddress, :NiciraRegMove, :SetMetadata,
+       :NiciraRegLoad, :NiciraSendOutPort].each do |each|
         set_message_class_name each, version
         @version = version.to_s
       end

data/lib/pio/open_flow/nicira_resubmit.rb

@@ -0,0 +1,18 @@
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow10/port16'
+
+module Pio
+  # NXAST_RESUBMIT action
+  class NiciraResubmit < OpenFlow::NiciraAction
+    nicira_action_header action_type: 0xffff,
+                         action_length: 16,
+                         subtype: 1
+    port16 :in_port
+    string :padding, length: 4
+    hide :padding
+
+    def initialize(port_number)
+      super(in_port: port_number)
+    end
+  end
+end

data/lib/pio/open_flow/nicira_resubmit_table.rb

@@ -0,0 +1,15 @@
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow10/port16'
+
+module Pio
+  # NXAST_RESUBMIT_TABLE action
+  class NiciraResubmitTable < OpenFlow::NiciraAction
+    nicira_action_header action_type: 0xffff,
+                         action_length: 16,
+                         subtype: 14
+    port16 :in_port
+    uint8 :table, initial_value: 0xff
+    string :padding, length: 3
+    hide :padding
+  end
+end

data/lib/pio/open_flow10.rb

@@ -27,8 +27,8 @@ require 'pio/open_flow10/stats_request'
 require 'pio/open_flow10/table_stats/request'
 
 # Actions
-require 'pio/open_flow10/nicira_resubmit'
-require 'pio/open_flow10/nicira_resubmit_table'
+require 'pio/open_flow/nicira_resubmit'
+require 'pio/open_flow/nicira_resubmit_table'
 require 'pio/open_flow10/send_out_port'
 require 'pio/open_flow10/set_destination_mac_address'
 require 'pio/open_flow10/set_source_mac_address'

data/lib/pio/open_flow13.rb

@@ -13,12 +13,17 @@ require 'pio/open_flow13/packet_out'
 require 'pio/open_flow13/stats_request'
 
 # Actions
+require 'pio/open_flow/nicira_resubmit'
+require 'pio/open_flow/nicira_resubmit_table'
+require 'pio/open_flow13/nicira_reg_load'
 require 'pio/open_flow13/nicira_reg_move'
+require 'pio/open_flow13/nicira_send_out_port'
 require 'pio/open_flow13/send_out_port'
 require 'pio/open_flow13/set_arp_operation'
 require 'pio/open_flow13/set_arp_sender_hardware_address'
 require 'pio/open_flow13/set_arp_sender_protocol_address'
 require 'pio/open_flow13/set_destination_mac_address'
+require 'pio/open_flow13/set_metadata'
 require 'pio/open_flow13/set_source_mac_address'
 
 # Instructions

data/lib/pio/open_flow13/goto_table.rb

@@ -28,6 +28,7 @@ module Pio
     def_delegators :@format, :instruction_length
     def_delegators :@format, :table_id
     def_delegators :@format, :to_binary_s
+    def_delegator :@format, :to_binary_s, :to_binary
 
     def initialize(table_id)
       @format = Format.new(table_id: table_id)

data/lib/pio/open_flow13/match.rb

@@ -12,11 +12,23 @@ module Pio
 
     # OpenFlow eXtensible Match (OXM)
     class Match
-      OXM_CLASS_OPENFLOW_BASIC = 0x8000
-      OXM_CLASS_EXPERIMENTER = 0xFFFF
+      # OFPXMC_NXM_1 TLV value
+      class NiciraMatchExtensionValue < BinData::Record
+        OXM_CLASS = 0x1
+      end
+
+      # OFPXMC_OPENFLOW_BASIC TLV value
+      class OpenFlowBasicValue < BinData::Record
+        OXM_CLASS = 0x8000
+      end
+
+      # OFPXMC_EXPERIMENTER TLV value
+      class ExperimenterValue < BinData::Record
+        OXM_CLASS = 0xFFFF
+      end
 
       # The value of OXM_OF_IN_PORT match field.
-      class InPort < BinData::Record
+      class InPort < OpenFlowBasicValue
         OXM_FIELD = 0
 
         endian :big
@@ -29,7 +41,7 @@ module Pio
       end
 
       # The value of OXM_OF_METADATA match field
-      class Metadata < BinData::Record
+      class Metadata < OpenFlowBasicValue
         OXM_FIELD = 2
 
         endian :big
@@ -42,7 +54,7 @@ module Pio
       end
 
       # Masked OXM_OF_METADATA match field
-      class MaskedMetadata < BinData::Record
+      class MaskedMetadata < OpenFlowBasicValue
         endian :big
 
         uint64 :metadata
@@ -54,7 +66,7 @@ module Pio
       end
 
       # The value of OXM_OF_ETH_DST match field.
-      class DestinationMacAddress < BinData::Record
+      class DestinationMacAddress < OpenFlowBasicValue
         OXM_FIELD = 3
 
         endian :big
@@ -67,7 +79,7 @@ module Pio
       end
 
       # The value of OXM_OF_ETH_SRC match field.
-      class SourceMacAddress < BinData::Record
+      class SourceMacAddress < OpenFlowBasicValue
         OXM_FIELD = 4
 
         endian :big
@@ -80,7 +92,7 @@ module Pio
       end
 
       # Masked OXM_OF_ETH_DST match field.
-      class MaskedDestinationMacAddress < BinData::Record
+      class MaskedDestinationMacAddress < OpenFlowBasicValue
         endian :big
 
         mac_address :destination_mac_address
@@ -92,7 +104,7 @@ module Pio
       end
 
       # Masked OXM_OF_ETH_SRC match field.
-      class MaskedSourceMacAddress < BinData::Record
+      class MaskedSourceMacAddress < OpenFlowBasicValue
         endian :big
 
         mac_address :source_mac_address
@@ -104,7 +116,7 @@ module Pio
       end
 
       # The value of OXM_OF_ETH_TYPE match field.
-      class EtherType < BinData::Record
+      class EtherType < OpenFlowBasicValue
         OXM_FIELD = 5
 
         endian :big
@@ -117,7 +129,7 @@ module Pio
       end
 
       # The value of OXM_OF_VLAN_VID match field
-      class VlanVid < BinData::Record
+      class VlanVid < OpenFlowBasicValue
         OXM_FIELD = 6
 
         endian :big
@@ -133,7 +145,7 @@ module Pio
       end
 
       # The value of OXM_OF_VLAN_PCP match field
-      class VlanPcp < BinData::Record
+      class VlanPcp < OpenFlowBasicValue
         OXM_FIELD = 7
 
         endian :big
@@ -149,7 +161,7 @@ module Pio
       end
 
       # The value of OXM_OF_IP_DSCP match field
-      class IpDscp < BinData::Record
+      class IpDscp < OpenFlowBasicValue
         OXM_FIELD = 8
 
         endian :big
@@ -165,7 +177,7 @@ module Pio
       end
 
       # The value of OXM_OF_IP_ECN match field
-      class IpEcn < BinData::Record
+      class IpEcn < OpenFlowBasicValue
         OXM_FIELD = 9
 
         endian :big
@@ -181,7 +193,7 @@ module Pio
       end
 
       # The value of OXM_OF_IP_PROTO
-      class IpProtocol < BinData::Record
+      class IpProtocol < OpenFlowBasicValue
         OXM_FIELD = 10
 
         endian :big
@@ -194,7 +206,7 @@ module Pio
       end
 
       # The value of OXM_OF_IPV4_SRC
-      class Ipv4SourceAddress < BinData::Record
+      class Ipv4SourceAddress < OpenFlowBasicValue
         OXM_FIELD = 11
 
         endian :big
@@ -207,7 +219,7 @@ module Pio
       end
 
       # The value of masked OXM_OF_IPV4_SRC
-      class MaskedIpv4SourceAddress < BinData::Record
+      class MaskedIpv4SourceAddress < OpenFlowBasicValue
         OXM_FIELD = 11
 
         endian :big
@@ -220,7 +232,7 @@ module Pio
       end
 
       # The value of OXM_OF_IPV4_DST
-      class Ipv4DestinationAddress < BinData::Record
+      class Ipv4DestinationAddress < OpenFlowBasicValue
         OXM_FIELD = 12
 
         endian :big
@@ -233,7 +245,7 @@ module Pio
       end
 
       # The value of masked OXM_OF_IPV4_DST
-      class MaskedIpv4DestinationAddress < BinData::Record
+      class MaskedIpv4DestinationAddress < OpenFlowBasicValue
         OXM_FIELD = 12
 
         endian :big
@@ -246,7 +258,7 @@ module Pio
       end
 
       # The value of OXM_OF_TCP_SRC
-      class TcpSourcePort < BinData::Record
+      class TcpSourcePort < OpenFlowBasicValue
         OXM_FIELD = 13
 
         endian :big
@@ -259,7 +271,7 @@ module Pio
       end
 
       # The value of OXM_OF_TCP_DST
-      class TcpDestinationPort < BinData::Record
+      class TcpDestinationPort < OpenFlowBasicValue
         OXM_FIELD = 14
 
         endian :big
@@ -272,7 +284,7 @@ module Pio
       end
 
       # The value of OXM_OF_UDP_SRC
-      class UdpSourcePort < BinData::Record
+      class UdpSourcePort < OpenFlowBasicValue
         OXM_FIELD = 15
 
         endian :big
@@ -285,7 +297,7 @@ module Pio
       end
 
       # The value of OXM_OF_UDP_SRC
-      class UdpDestinationPort < BinData::Record
+      class UdpDestinationPort < OpenFlowBasicValue
         OXM_FIELD = 16
 
         endian :big
@@ -298,7 +310,7 @@ module Pio
       end
 
       # The value of OXM_OF_SCTP_SRC
-      class SctpSourcePort < BinData::Record
+      class SctpSourcePort < OpenFlowBasicValue
         OXM_FIELD = 17
 
         endian :big
@@ -311,7 +323,7 @@ module Pio
       end
 
       # The value of OXM_OF_SCTP_DST
-      class SctpDestinationPort < BinData::Record
+      class SctpDestinationPort < OpenFlowBasicValue
         OXM_FIELD = 18
 
         endian :big
@@ -324,7 +336,7 @@ module Pio
       end
 
       # The value of OXM_OF_ICMPV4_TYPE
-      class Icmpv4Type < BinData::Record
+      class Icmpv4Type < OpenFlowBasicValue
         OXM_FIELD = 19
 
         endian :big
@@ -337,7 +349,7 @@ module Pio
       end
 
       # The value of OXM_OF_ICMPV4_CODE
-      class Icmpv4Code < BinData::Record
+      class Icmpv4Code < OpenFlowBasicValue
         OXM_FIELD = 20
 
         endian :big
@@ -350,7 +362,7 @@ module Pio
       end
 
       # The value of OXM_OF_ARP_OP
-      class ArpOperation < BinData::Record
+      class ArpOperation < OpenFlowBasicValue
         OXM_FIELD = 21
 
         endian :big
@@ -363,7 +375,7 @@ module Pio
       end
 
       # The value of OXM_OF_ARP_SPA
-      class ArpSenderProtocolAddress < BinData::Record
+      class ArpSenderProtocolAddress < OpenFlowBasicValue
         OXM_FIELD = 22
 
         endian :big
@@ -376,7 +388,7 @@ module Pio
       end
 
       # The value of masked OXM_OF_ARP_SPA
-      class MaskedArpSenderProtocolAddress < BinData::Record
+      class MaskedArpSenderProtocolAddress < OpenFlowBasicValue
         OXM_FIELD = 22
 
         endian :big
@@ -389,7 +401,7 @@ module Pio
       end
 
       # The value of OXM_OF_ARP_TPA
-      class ArpTargetProtocolAddress < BinData::Record
+      class ArpTargetProtocolAddress < OpenFlowBasicValue
         OXM_FIELD = 23
 
         endian :big
@@ -402,7 +414,7 @@ module Pio
       end
 
       # The value of masked OXM_OF_ARP_TPA
-      class MaskedArpTargetProtocolAddress < BinData::Record
+      class MaskedArpTargetProtocolAddress < OpenFlowBasicValue
         OXM_FIELD = 23
 
         endian :big
@@ -415,7 +427,7 @@ module Pio
       end
 
       # The value of OXM_OF_ARP_SHA match field.
-      class ArpSenderHardwareAddress < BinData::Record
+      class ArpSenderHardwareAddress < OpenFlowBasicValue
         OXM_FIELD = 24
 
         endian :big
@@ -428,7 +440,7 @@ module Pio
       end
 
       # Masked OXM_OF_ARP_SHA match field.
-      class MaskedArpSenderHardwareAddress < BinData::Record
+      class MaskedArpSenderHardwareAddress < OpenFlowBasicValue
         OXM_FIELD = 24
 
         endian :big
@@ -442,7 +454,7 @@ module Pio
       end
 
       # The value of OXM_OF_ARP_THA match field.
-      class ArpTargetHardwareAddress < BinData::Record
+      class ArpTargetHardwareAddress < OpenFlowBasicValue
         OXM_FIELD = 25
 
         endian :big
@@ -455,7 +467,7 @@ module Pio
       end
 
       # Masked OXM_OF_ARP_THA match field.
-      class MaskedArpTargetHardwareAddress < BinData::Record
+      class MaskedArpTargetHardwareAddress < OpenFlowBasicValue
         OXM_FIELD = 25
 
         endian :big
@@ -469,7 +481,7 @@ module Pio
       end
 
       # The value of OXM_OF_IPV6_SRC
-      class Ipv6SourceAddress < BinData::Record
+      class Ipv6SourceAddress < OpenFlowBasicValue
         OXM_FIELD = 26
 
         endian :big
@@ -482,7 +494,7 @@ module Pio
       end
 
       # The value of masked OXM_OF_IPV6_SRC
-      class MaskedIpv6SourceAddress < BinData::Record
+      class MaskedIpv6SourceAddress < OpenFlowBasicValue
         OXM_FIELD = 26
 
         endian :big
@@ -496,7 +508,7 @@ module Pio
       end
 
       # The value of OXM_OF_IPV6_DST
-      class Ipv6DestinationAddress < BinData::Record
+      class Ipv6DestinationAddress < OpenFlowBasicValue
         OXM_FIELD = 27
 
         endian :big
@@ -509,7 +521,7 @@ module Pio
       end
 
       # The value of OXM_OF_IPV6_DST
-      class MaskedIpv6DestinationAddress < BinData::Record
+      class MaskedIpv6DestinationAddress < OpenFlowBasicValue
         OXM_FIELD = 27
 
         endian :big
@@ -523,7 +535,7 @@ module Pio
       end
 
       # The value of OXM_OF_TUNNEL_ID match field
-      class TunnelId < BinData::Record
+      class TunnelId < OpenFlowBasicValue
         OXM_FIELD = 38
 
         endian :big
@@ -536,7 +548,7 @@ module Pio
       end
 
       # Masked OXM_OF_TUNNEL_ID match field
-      class MaskedTunnelId < BinData::Record
+      class MaskedTunnelId < OpenFlowBasicValue
         endian :big
 
         uint64 :tunnel_id
@@ -547,6 +559,206 @@ module Pio
         end
       end
 
+      # NXM_NX_REG0 match field
+      class Reg0 < NiciraMatchExtensionValue
+        OXM_FIELD = 0
+
+        endian :big
+
+        uint32 :reg0
+
+        def length
+          4
+        end
+      end
+
+      # Masked NXM_NX_REG0 match field
+      class MaskedReg0 < NiciraMatchExtensionValue
+        endian :big
+
+        uint32 :reg0
+        uint32 :reg0_mask
+
+        def length
+          8
+        end
+      end
+
+      # NXM_NX_REG1 match field
+      class Reg1 < NiciraMatchExtensionValue
+        OXM_FIELD = 1
+
+        endian :big
+
+        uint32 :reg1
+
+        def length
+          4
+        end
+      end
+
+      # Masked NXM_NX_REG1 match field
+      class MaskedReg1 < NiciraMatchExtensionValue
+        endian :big
+
+        uint32 :reg1
+        uint32 :reg1_mask
+
+        def length
+          8
+        end
+      end
+
+      # NXM_NX_REG2 match field
+      class Reg2 < NiciraMatchExtensionValue
+        OXM_FIELD = 2
+
+        endian :big
+
+        uint32 :reg2
+
+        def length
+          4
+        end
+      end
+
+      # Masked NXM_NX_REG2 match field
+      class MaskedReg2 < NiciraMatchExtensionValue
+        endian :big
+
+        uint32 :reg2
+        uint32 :reg2_mask
+
+        def length
+          8
+        end
+      end
+
+      # NXM_NX_REG3 match field
+      class Reg3 < NiciraMatchExtensionValue
+        OXM_FIELD = 3
+
+        endian :big
+
+        uint32 :reg3
+
+        def length
+          4
+        end
+      end
+
+      # Masked NXM_NX_REG3 match field
+      class MaskedReg3 < NiciraMatchExtensionValue
+        endian :big
+
+        uint32 :reg3
+        uint32 :reg3_mask
+
+        def length
+          8
+        end
+      end
+
+      # NXM_NX_REG4 match field
+      class Reg4 < NiciraMatchExtensionValue
+        OXM_FIELD = 4
+
+        endian :big
+
+        uint32 :reg4
+
+        def length
+          4
+        end
+      end
+
+      # Masked NXM_NX_REG4 match field
+      class MaskedReg4 < NiciraMatchExtensionValue
+        endian :big
+
+        uint32 :reg4
+        uint32 :reg4_mask
+
+        def length
+          8
+        end
+      end
+
+      # NXM_NX_REG5 match field
+      class Reg5 < NiciraMatchExtensionValue
+        OXM_FIELD = 5
+
+        endian :big
+
+        uint32 :reg5
+
+        def length
+          4
+        end
+      end
+
+      # Masked NXM_NX_REG5 match field
+      class MaskedReg5 < NiciraMatchExtensionValue
+        endian :big
+
+        uint32 :reg5
+        uint32 :reg5_mask
+
+        def length
+          8
+        end
+      end
+
+      # NXM_NX_REG6 match field
+      class Reg6 < NiciraMatchExtensionValue
+        OXM_FIELD = 6
+
+        endian :big
+
+        uint32 :reg6
+
+        def length
+          4
+        end
+      end
+
+      # Masked NXM_NX_REG6 match field
+      class MaskedReg6 < NiciraMatchExtensionValue
+        endian :big
+
+        uint32 :reg6
+        uint32 :reg6_mask
+
+        def length
+          8
+        end
+      end
+
+      # NXM_NX_REG7 match field
+      class Reg7 < NiciraMatchExtensionValue
+        OXM_FIELD = 7
+
+        endian :big
+
+        uint32 :reg7
+
+        def length
+          4
+        end
+      end
+
+      # Masked NXM_NX_REG7 match field
+      class MaskedReg7 < NiciraMatchExtensionValue
+        endian :big
+
+        uint32 :reg7
+        uint32 :reg7_mask
+
+        def length
+          8
+        end
+      end
+
       # OXM format
       class Oxm < BinData::Record
         # Experimenter part, data will use oxm_length
@@ -564,6 +776,79 @@ module Pio
           end
         end
 
+        # Nicira match extension
+        class NiciraMatchExtension < BinData::Record
+          endian :big
+
+          bit7 :oxm_field
+          bit1 :oxm_hasmask
+          uint8 :oxm_length, value: -> { tlv_value.length }
+          choice :tlv_value,
+                 selection: :choose_tlv_value do
+            reg0 Reg0
+            masked_reg0 MaskedReg0
+            reg1 Reg1
+            masked_reg1 MaskedReg1
+            reg2 Reg2
+            masked_reg2 MaskedReg2
+            reg3 Reg3
+            masked_reg3 MaskedReg3
+            reg4 Reg4
+            masked_reg4 MaskedReg4
+            reg5 Reg5
+            masked_reg5 MaskedReg5
+            reg6 Reg6
+            masked_reg6 MaskedReg6
+            reg7 Reg7
+            masked_reg7 MaskedReg7
+          end
+
+          def length
+            tlv_value.length + 2
+          end
+
+          def masked?
+            oxm_hasmask == 1
+          end
+
+          def method_missing(method, *args, &block)
+            tlv_value.__send__ method, *args, &block
+          end
+
+          private
+
+          # rubocop:disable AbcSize
+          # rubocop:disable CyclomaticComplexity
+          # rubocop:disable PerceivedComplexity
+          # rubocop:disable MethodLength
+          def choose_tlv_value
+            case oxm_field
+            when Reg0::OXM_FIELD
+              masked? ? MaskedReg0 : Reg0
+            when Reg1::OXM_FIELD
+              masked? ? MaskedReg1 : Reg1
+            when Reg2::OXM_FIELD
+              masked? ? MaskedReg2 : Reg2
+            when Reg3::OXM_FIELD
+              masked? ? MaskedReg3 : Reg3
+            when Reg4::OXM_FIELD
+              masked? ? MaskedReg4 : Reg4
+            when Reg5::OXM_FIELD
+              masked? ? MaskedReg5 : Reg5
+            when Reg6::OXM_FIELD
+              masked? ? MaskedReg6 : Reg6
+            when Reg7::OXM_FIELD
+              masked? ? MaskedReg7 : Reg7
+            else
+              fail "Unknown OXM field value: #{oxm_field}"
+            end
+          end
+          # rubocop:enable AbcSize
+          # rubocop:enable CyclomaticComplexity
+          # rubocop:enable PerceivedComplexity
+          # rubocop:enable MethodLength
+        end
+
         # rubocop:disable ClassLength
         # OpenflowBasic part, tlv_value will use oxm_field, oxm_hasmask
         class OpenflowBasic < BinData::Record
@@ -727,10 +1012,11 @@ module Pio
         class MatchField < BinData::Record
           endian :big
 
-          uint16 :oxm_class, initial_value: OXM_CLASS_OPENFLOW_BASIC
+          uint16 :oxm_class
           choice :class_payload, selection: :oxm_class do
-            OpenflowBasic OXM_CLASS_OPENFLOW_BASIC
-            Experimenter OXM_CLASS_EXPERIMENTER
+            NiciraMatchExtension NiciraMatchExtensionValue::OXM_CLASS
+            OpenflowBasic OpenFlowBasicValue::OXM_CLASS
+            Experimenter ExperimenterValue::OXM_CLASS
           end
 
           def oxm_field
@@ -751,9 +1037,9 @@ module Pio
 
           def method_missing(method, *args, &block)
             case oxm_class
-            when OXM_CLASS_OPENFLOW_BASIC
+            when OpenFlowBasicValue::OXM_CLASS
               return class_payload.tlv_value.__send__(method, *args, &block)
-            when OXM_CLASS_EXPERIMENTER
+            when ExperimenterValue::OXM_CLASS
               return class_payload.__send__(method, *args, &block)
             else
               fail NoMethodError, method.to_s
@@ -777,9 +1063,10 @@ module Pio
         end
 
         # rubocop:disable Next
+        # rubocop:disable LineLength
         def method_missing(method, *args, &block)
           match_fields.each do |each|
-            if each.oxm_class == OXM_CLASS_OPENFLOW_BASIC
+            if each.oxm_class == OpenFlowBasicValue::OXM_CLASS || each.oxm_class == NiciraMatchExtensionValue::OXM_CLASS
               next unless each.class_payload.tlv_value.respond_to?(method)
               return each.class_payload.tlv_value.__send__(
                 method, *args, &block)
@@ -788,6 +1075,7 @@ module Pio
           fail NoMethodError, method.to_s
         end
         # rubocop:enable Next
+        # rubocop:enable LineLength
 
         private
 
@@ -812,6 +1100,7 @@ module Pio
       class Options
         # rubocop:disable MethodLength
         # rubocop:disable AbcSize
+        # rubocop:disable LineLength
         def initialize(user_attrs)
           @match_fields = []
 
@@ -822,29 +1111,30 @@ module Pio
            :icmpv4_type, :icmpv4_code, :arp_operation].each do |each|
             next unless user_attrs.key?(each)
             klass = Match.const_get(each.to_s.split('_').map(&:capitalize).join)
-            @match_fields << { class_payload:
-              { oxm_field: klass.const_get(:OXM_FIELD),
-                tlv_value: { each => user_attrs.fetch(each) } } }
+            @match_fields << { oxm_class: klass.superclass.const_get(:OXM_CLASS),
+                               class_payload: { oxm_field: klass.const_get(:OXM_FIELD),
+                                                tlv_value: { each => user_attrs.fetch(each) } } }
           end
 
           [:metadata, :destination_mac_address, :source_mac_address,
            :ipv4_source_address, :ipv4_destination_address,
            :arp_sender_protocol_address, :arp_target_protocol_address,
            :arp_sender_hardware_address, :arp_target_hardware_address,
-           :ipv6_source_address, :ipv6_destination_address,
-           :tunnel_id].each do |each|
+           :ipv6_source_address, :ipv6_destination_address, :tunnel_id,
+           :reg0, :reg1, :reg2, :reg3, :reg4, :reg5, :reg6, :reg7].each do |each|
             next unless user_attrs.key?(each)
             klass = Match.const_get(each.to_s.split('_').map(&:capitalize).join)
             mask_key = "#{each}_mask".to_sym
-            @match_fields << { class_payload:
-              { oxm_field: klass.const_get(:OXM_FIELD),
-                oxm_hasmask: user_attrs.key?(mask_key) ? 1 : 0,
-                tlv_value: { each => user_attrs[each],
-                             mask_key => user_attrs[mask_key] } } }
+            @match_fields << { oxm_class: klass.superclass.const_get(:OXM_CLASS),
+                               class_payload: { oxm_field: klass.const_get(:OXM_FIELD),
+                                                oxm_hasmask: user_attrs.key?(mask_key) ? 1 : 0,
+                                                tlv_value: { each => user_attrs[each],
+                                                             mask_key => user_attrs[mask_key] } } }
           end
         end
         # rubocop:enable MethodLength
         # rubocop:enable AbcSize
+        # rubocop:enable LineLength
 
         def to_hash
           { match_fields: @match_fields }