pio 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 160b6df4de3e742f9bc613203352993fe5f8b1b9
-  data.tar.gz: a35953dba3610759b5d00e111538523bafb65ac5
+  metadata.gz: 72d822a526ecc76b756781275560ac85461cb743
+  data.tar.gz: 016ffba5c86e40a62e17baa73ad148796d3e1c9f
 SHA512:
-  metadata.gz: b558f6a0be89346665789e8847a221791a03db8381dbcb558b6ae3c8580717d91e7f209353b92bd20f54894d1607e68a815eef68fcd34cc135d5f5a86c0e26ee
-  data.tar.gz: 821b6cecaa878417d2338f6e1d1a801f7f98549b721acadeb8fafd5d48dee98e6a485c5efc222381d1a41de5c2823705b4adad2d6227ca10bbd72ecc9bb6633c
+  metadata.gz: badd7676a9c52f24e3941f47b2d6d7da1a26a14a6865119434307d08219be1c34c21336b32869b5836ef2ed89317f431c5d142d51d0d84f025297eea96cc3b77
+  data.tar.gz: 68591ec7d20cc8a5082c3742ae634e954871ec297bd7097fac3d6ebefa7af3ab439587b75b968862b973b7f396918b9d57dc0535cf1b01014627ba786a8e1071

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.15.1 (2/17/2015)
+### Bugs fixed
+* [#127](https://github.com/trema/pio/pull/127): Make OpenFlow classes thread safe.
+
+
 ## 0.15.0 (2/12/2015)
 ### New features
 * [#126](https://github.com/trema/pio/pull/126): Add new class `Pio::PortStatus`.

data/lib/pio/echo.rb

@@ -3,14 +3,12 @@ require 'pio/open_flow'
 module Pio
   # OpenFlow 1.0 Echo Request and Reply message.
   module Echo
-    # @!parse
-    #   # OpenFlow 1.0 Echo Request message.
-    #   class Request < OpenFlow::Message; end
-    class Request < OpenFlow::Message.factory(OpenFlow::Type::ECHO_REQUEST); end
+    # OpenFlow 1.0 Echo Request message.
+    class Request; end
+    OpenFlow::Message.factory(Request, OpenFlow::ECHO_REQUEST)
 
-    # @!parse
-    #   # OpenFlow 1.0 Echo Reply message.
-    #   class Reply < OpenFlow::Message; end
-    class Reply < OpenFlow::Message.factory(OpenFlow::Type::ECHO_REPLY); end
+    # OpenFlow 1.0 Echo Reply message.
+    class Reply; end
+    OpenFlow::Message.factory(Reply, OpenFlow::ECHO_REPLY)
   end
 end

data/lib/pio/features.rb

@@ -4,14 +4,13 @@ module Pio
   # OpenFlow 1.0 Features Request and Reply message.
   class Features
     # OpenFlow 1.0 Features Request message.
-    class Request < OpenFlow::Message.factory(OpenFlow::Type::FEATURES_REQUEST)
-    end
+    class Request; end
+    OpenFlow::Message.factory(Request, OpenFlow::FEATURES_REQUEST)
 
-    # OpenFlow 1.0 Features Reply message
-    class Reply < OpenFlow::Message.factory(OpenFlow::Type::FEATURES_REPLY)
+    class Reply
       # Message body of features reply.
-      class ReplyBody < BinData::Record
-        extend Flags
+      class Body < BinData::Record
+        extend OpenFlow::Flags
 
         # enum ofp_capabilities
         flags_32bit :capabilities,
@@ -58,7 +57,9 @@ module Pio
           24 + ports.to_binary_s.length
         end
       end
+    end
 
+    OpenFlow::Message.factory(Reply, OpenFlow::FEATURES_REPLY) do
       def_delegators :body, :datapath_id
       def_delegator :body, :datapath_id, :dpid
       def_delegators :body, :n_buffers

data/lib/pio/flow_mod.rb

@@ -1,9 +1,10 @@
 require 'pio/match'
 require 'pio/open_flow'
 
+# Base module.
 module Pio
-  # OpenFlow 1.0 flow setup and teardown message.
-  class FlowMod < OpenFlow::Message.factory(OpenFlow::Type::FLOW_MOD)
+  # OpenFlow 1.0 Flow Mod message.
+  class FlowMod
     # enum ofp_flow_mod_command
     class Command < BinData::Primitive
       COMMANDS = {
@@ -27,7 +28,7 @@ module Pio
     end
 
     # Message body of FlowMod.
-    class FlowModBody < BinData::Record
+    class Body < BinData::Record
       # Pio::MatchFormat wrapper.
       class Match < BinData::Primitive
         endian :big
@@ -43,7 +44,7 @@ module Pio
         end
       end
 
-      extend Flags
+      extend OpenFlow::Flags
 
       flags_16bit :flags,
                   [:send_flow_rem,
@@ -71,7 +72,9 @@ module Pio
         64 + actions.binary.length
       end
     end
+  end
 
+  OpenFlow::Message.factory(FlowMod, OpenFlow::FLOW_MOD) do
     def_delegators :body, :match
     def_delegators :body, :cookie
     def_delegators :body, :command

data/lib/pio/hello.rb

@@ -1,8 +1,8 @@
 require 'pio/open_flow'
 
+# Base module.
 module Pio
-  # @!parse
-  #   # OpenFlow 1.0 Hello message
-  #   class Hello < OpenFlow::Message; end
-  class Hello < OpenFlow::Message.factory(Pio::OpenFlow::Type::HELLO); end
+  # OpenFlow 1.0 Hello message
+  class Hello; end
+  OpenFlow::Message.factory(Hello, OpenFlow::HELLO)
 end

data/lib/pio/open_flow.rb

@@ -1,7 +1,22 @@
+module Pio
+  # OpenFlow specific types.
+  module OpenFlow
+    # OFPT_* constants.
+    HELLO = 0
+    ECHO_REQUEST = 2
+    ECHO_REPLY = 3
+    FEATURES_REQUEST = 5
+    FEATURES_REPLY = 6
+    PACKET_IN = 10
+    PORT_STATUS = 12
+    PACKET_OUT = 13
+    FLOW_MOD = 14
+  end
+end
+
 require 'pio/open_flow/actions'
 require 'pio/open_flow/flags'
 require 'pio/open_flow/message'
 require 'pio/open_flow/open_flow_header'
 require 'pio/open_flow/phy_port'
 require 'pio/open_flow/port_number'
-require 'pio/open_flow/type'

data/lib/pio/open_flow/flags.rb

@@ -1,55 +1,61 @@
-# bitmap functions.
-# This class smells of :reek:DataClump
-module Flags
-  def flags_32bit(name, flags)
-    _def_flags name, 32, flags
-  end
+module Pio
+  module OpenFlow
+    # bitmap functions.
+    # This class smells of :reek:DataClump
+    module Flags
+      def flags_32bit(name, flags)
+        _def_flags name, 32, flags
+      end
 
-  def flags_16bit(name, flags)
-    _def_flags name, 16, flags
-  end
+      def flags_16bit(name, flags)
+        _def_flags name, 16, flags
+      end
 
-  # rubocop:disable MethodLength
-  # This method smells of :reek:TooManyStatements
-  def _def_flags(name, size, flags)
-    flag_value = case flags
-                 when Array
-                   shift = 0
-                   flags.each_with_object({}) do |each, result|
-                     result[each] = 1 << shift
-                     shift += 1
-                     result
-                   end
-                 when Hash
-                   flags
-                 end
+      # rubocop:disable MethodLength
+      # This method smells of :reek:TooManyStatements
+      def _def_flags(name, size, flags)
+        flag_value = case flags
+                     when Array
+                       shift = 0
+                       flags.each_with_object({}) do |each, result|
+                         result[each] = 1 << shift
+                         shift += 1
+                         result
+                       end
+                     when Hash
+                       flags
+                     end
 
-    klass_name = name.to_s.split('_').map(&:capitalize).join
-    flags_hash = flag_value.inspect
+        klass_name = name.to_s.split('_').map(&:capitalize).join
+        flags_hash = flag_value.inspect
 
-    code = %{
-      class #{klass_name} < BinData::Primitive
-        endian :big
+        code = %{
+          class #{klass_name} < BinData::Primitive
+            endian :big
 
-        uint#{size} :#{name}
+            uint#{size} :#{name}
 
-        def get
-          list = #{flags_hash}
-          list.each_with_object([]) do |(key, value), result|
-            result << key if #{name} & value != 0
-            result
-          end
-        end
+            def get
+              list = #{flags_hash}
+              list.each_with_object([]) do |(key, value), result|
+                result << key if #{name} & value != 0
+                result
+              end
+            end
 
-        def set(v)
-          list = #{flags_hash}
-          v.each do |each|
-            fail "Invalid state flag: \#{v}" unless list.keys.include?(each)
+            def set(v)
+              list = #{flags_hash}
+              v.each do |each|
+                fail "Invalid state flag: \#{v}" unless list.keys.include?(each)
+              end
+              self.#{name} = v.empty? ?
+                             0 :
+                             v.map { |each| list[each] }.inject(:|)
+            end
           end
-          self.#{name} = v.empty? ? 0 : v.map { |each| list[each] }.inject(:|)
-        end
+        }
+        module_eval code
       end
-    }
-    module_eval code
+    end
   end
 end

data/lib/pio/open_flow/message.rb

@@ -7,126 +7,103 @@ module Pio
   module OpenFlow
     # Defines shortcuts to OpenFlow header fields.
     class Message
-      extend Forwardable
-
-      # struct ofp_header fields.
-      def_delegators :@format, :open_flow_header
-      def_delegators :open_flow_header, :ofp_version
-      def_delegators :open_flow_header, :message_type
-      def_delegators :open_flow_header, :message_length
-      def_delegators :open_flow_header, :transaction_id
-      def_delegator :open_flow_header, :transaction_id, :xid
-
-      def_delegators :@format, :body
-      def_delegator :@format, :body, :user_data
-
-      def_delegator :@format, :to_binary_s, :to_binary
-
-      def self.factory(message_type)
-        @message_type = message_type
-        self
-      end
-
-      def self.klass(message_type)
-        @messages.fetch(message_type)
-      end
-
-      def self.inherited(child)
-        child.const_set(:MESSAGE_TYPE, @message_type)
-        @messages ||= {}
-        @messages[@message_type] = child
-      end
-
-      def self.read(raw_data)
-        message = allocate
-        message.instance_variable_set(:@format, format.read(raw_data))
-        message
-      rescue BinData::ValidityError
-        message_name = name.split('::')[1..-1].join(' ')
-        raise Pio::ParseError, "Invalid #{message_name} message."
-      end
-
-      def self.format
-        const_get(:Format)
-      rescue NameError
-        define_message_format const_get(:MESSAGE_TYPE)
-        retry
+      def self.factory(klass, message_type, &block)
+        klass.extend Forwardable
+        klass.module_eval(&block) if block
+        klass.module_eval _format_class(klass, message_type)
+        klass.module_eval(&_define_open_flow_accessors)
+        klass.module_eval(&_define_self_read)
+        klass.module_eval(&_define_initialize)
+        klass.module_eval(&_define_to_binary)
       end
 
       # rubocop:disable MethodLength
-      def self.define_message_format(message_type)
-        code = %(
+      def self._format_class(klass, message_type)
+        %(
           class Format < BinData::Record
             endian :big
 
             open_flow_header :open_flow_header,
-                             message_type_value: #{message_type}
+            message_type_value: #{message_type}
             virtual assert: -> do
               open_flow_header.message_type == #{message_type}
             end
 
-            #{body_type} :body
+            #{klass.const_defined?(:Body) ? 'body' : 'string'} :body
+          end
+
+          def self.format
+            const_get :Format
           end
         )
-        module_eval code
       end
       # rubocop:enable MethodLength
 
-      def self.body_type
-        klass_name = name.split('::').last + 'Body'
-        const_get(klass_name)
-        klass_name.sub(/.*::/, '').
-          gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-          gsub(/([a-z\d])([A-Z])/, '\1_\2').
-          tr('-', '_').
-          downcase
-      rescue NameError
-        'string'
+      def self._define_open_flow_accessors
+        proc do
+          def_delegators :@format, :open_flow_header
+          def_delegators :open_flow_header, :ofp_version
+          def_delegators :open_flow_header, :message_type
+          def_delegators :open_flow_header, :message_length
+          def_delegators :open_flow_header, :transaction_id
+          def_delegator :open_flow_header, :transaction_id, :xid
+
+          def_delegators :@format, :body
+          def_delegator :@format, :body, :user_data
+        end
       end
 
-      def initialize(user_options = {})
-        header_options = parse_header_options(user_options)
-        body_options = parse_body_options(user_options)
-        @format = self.class.format.new(open_flow_header: header_options,
-                                        body: body_options)
+      def self._define_self_read
+        proc do
+          def self.read(raw_data)
+            allocate.tap do |message|
+              message.instance_variable_set(:@format, format.read(raw_data))
+            end
+          rescue BinData::ValidityError
+            message_name = name.split('::')[1..-1].join(' ')
+            raise Pio::ParseError, "Invalid #{message_name} message."
+          end
+        end
       end
 
-      private
+      # rubocop:disable MethodLength
+      # rubocop:disable AbcSize
+      def self._define_initialize
+        proc do
+          def initialize(user_options = {})
+            header_options = OpenFlowHeader::Options.parse(user_options)
+            body_options = parse_body_options(user_options)
+            @format = self.class.format.new(open_flow_header: header_options,
+                                            body: body_options)
+          end
+
+          private
 
-      # This method smells of :reek:FeatureEnvy
-      def parse_header_options(options)
-        xid = if options.respond_to?(:to_i)
-                options.to_i
-              elsif options.respond_to?(:fetch)
-                options[:transaction_id] || options[:xid] || 0
+          def parse_body_options(options)
+            if options.respond_to?(:fetch)
+              options.delete :transaction_id
+              options.delete :xid
+              dpid = options[:dpid]
+              options[:datapath_id] = dpid if dpid
+              if options.keys.size > 1
+                options
               else
-                fail TypeError
+                options[:user_data] || ''
               end
-        return { transaction_id: xid } if xid.unsigned_32bit?
-        fail(ArgumentError,
-             'Transaction ID should be an unsigned 32-bit integer.')
-      end
-
-      # rubocop:disable MethodLength
-      # This method smells of :reek:TooManyStatements
-      # This method smells of :reek:FeatureEnvy
-      # This method smells of :reek:UtilityFunction
-      def parse_body_options(options)
-        if options.respond_to?(:fetch)
-          options.delete :transaction_id
-          options.delete :xid
-          dpid = options[:dpid]
-          options[:datapath_id] = dpid if dpid
-          if options.keys.size > 1
-            options
-          else
-            options[:user_data] || ''
+            else
+              ''
+            end
           end
-        else
-          ''
         end
       end
       # rubocop:enable MethodLength
+      # rubocop:enable AbcSize
+
+      def self._define_to_binary
+        proc do
+          def_delegator :@format, :to_binary_s, :to_binary
+        end
+      end
     end
   end
 end

data/lib/pio/open_flow/open_flow_header.rb

@@ -1,17 +1,46 @@
 require 'bindata'
 
 module Pio
-  module Type
-    # OpenFlow 1.0 format.
-    module OpenFlow
-      # OpenFlow 1.0 message header format.
-      class OpenFlowHeader < BinData::Record
+  # OpenFlow 1.0 format.
+  module OpenFlow
+    # OpenFlow 1.0 message header format.
+    class OpenFlowHeader < BinData::Record
+      # Transaction ID (uint32)
+      class TransactionId < BinData::Primitive
         endian :big
+        uint32 :xid
 
-        uint8 :ofp_version, value: 1
-        uint8 :message_type, initial_value: :message_type_value
-        uint16 :message_length, initial_value: -> { 8 + body.length }
-        uint32 :transaction_id, initial_value: 0
+        def set(value)
+          unless value.unsigned_32bit?
+            fail(ArgumentError,
+                 'Transaction ID should be an unsigned 32-bit integer.')
+          end
+          self.xid = value
+        end
+
+        def get
+          xid
+        end
+      end
+
+      endian :big
+      uint8 :ofp_version, value: 1
+      uint8 :message_type, initial_value: :message_type_value
+      uint16 :message_length, initial_value: -> { 8 + body.length }
+      transaction_id :transaction_id, initial_value: 0
+
+      # parse header options
+      class Options
+        def self.parse(options)
+          xid = if options.respond_to?(:to_i)
+                  options.to_i
+                elsif options.respond_to?(:fetch)
+                  options[:transaction_id] || options[:xid] || 0
+                else
+                  fail TypeError
+                end
+          { transaction_id: xid }
+        end
       end
     end
   end

data/lib/pio/open_flow/phy_port.rb

@@ -2,79 +2,77 @@ require 'bindata'
 require 'pio/type/mac_address'
 
 module Pio
-  module Type
-    module OpenFlow
-      # Description of a physical port
-      class PhyPort < BinData::Record
-        extend Flags
+  module OpenFlow
+    # Description of a physical port
+    class PhyPort < BinData::Record
+      extend Flags
 
-        # enum ofp_port_config
-        flags_32bit :port_config,
-                    [:port_down,
-                     :no_stp,
-                     :no_recv,
-                     :no_recv_stp,
-                     :no_flood,
-                     :no_fwd,
-                     :no_packet_in]
+      # enum ofp_port_config
+      flags_32bit :port_config,
+                  [:port_down,
+                   :no_stp,
+                   :no_recv,
+                   :no_recv_stp,
+                   :no_flood,
+                   :no_fwd,
+                   :no_packet_in]
 
-        # enum ofp_port_state
-        flags_32bit :port_state,
-                    link_down: 1 << 0,
-                    stp_listen: 0 << 8,
-                    stp_learn: 1 << 8,
-                    stp_forward: 2 << 8,
-                    stp_block: 3 << 8
+      # enum ofp_port_state
+      flags_32bit :port_state,
+                  link_down: 1 << 0,
+                  stp_listen: 0 << 8,
+                  stp_learn: 1 << 8,
+                  stp_forward: 2 << 8,
+                  stp_block: 3 << 8
 
-        # enum ofp_port_features
-        flags_32bit :port_feature,
-                    [:port_10mb_hd,
-                     :port_10mb_fd,
-                     :port_100mb_hd,
-                     :port_100mb_fd,
-                     :port_1gb_hd,
-                     :port_1gb_fd,
-                     :port_10gb_fd,
-                     :port_copper,
-                     :port_fiber,
-                     :port_autoneg,
-                     :port_pause,
-                     :port_pause_asym]
+      # enum ofp_port_features
+      flags_32bit :port_feature,
+                  [:port_10mb_hd,
+                   :port_10mb_fd,
+                   :port_100mb_hd,
+                   :port_100mb_fd,
+                   :port_1gb_hd,
+                   :port_1gb_fd,
+                   :port_10gb_fd,
+                   :port_copper,
+                   :port_fiber,
+                   :port_autoneg,
+                   :port_pause,
+                   :port_pause_asym]
 
-        endian :big
+      endian :big
 
-        uint16 :port_no
-        mac_address :hardware_address
-        string :name, length: 16, trim_padding: true
-        port_config :config
-        port_state :state
-        port_feature :curr
-        port_feature :advertised
-        port_feature :supported
-        port_feature :peer
+      uint16 :port_no
+      mac_address :hardware_address
+      string :name, length: 16, trim_padding: true
+      port_config :config
+      port_state :state
+      port_feature :curr
+      port_feature :advertised
+      port_feature :supported
+      port_feature :peer
 
-        attr_accessor :datapath_id
-        alias_method :dpid, :datapath_id
+      attr_accessor :datapath_id
+      alias_method :dpid, :datapath_id
 
-        def number
-          port_no
-        end
+      def number
+        port_no
+      end
 
-        def mac_address
-          hardware_address
-        end
+      def mac_address
+        hardware_address
+      end
 
-        def up?
-          !down?
-        end
+      def up?
+        !down?
+      end
 
-        def down?
-          config.include?(:port_down) || state.include?(:link_down)
-        end
+      def down?
+        config.include?(:port_down) || state.include?(:link_down)
+      end
 
-        def local?
-          port_no == PortNumber::NUMBERS[:local]
-        end
+      def local?
+        port_no == PortNumber::NUMBERS[:local]
       end
     end
   end

data/lib/pio/packet_in.rb

@@ -1,10 +1,13 @@
 require 'bindata'
 require 'pio/open_flow'
 require 'pio/parse_error'
+require 'pio/type/ethernet_header'
+require 'pio/type/ipv4_header'
 
+# Base module.
 module Pio
   # OpenFlow 1.0 Packet-In message
-  class PacketIn < OpenFlow::Message.factory(OpenFlow::Type::PACKET_IN)
+  class PacketIn
     # Why is this packet being sent to the controller?
     # (enum ofp_packet_in_reason)
     class Reason < BinData::Primitive
@@ -22,7 +25,7 @@ module Pio
     end
 
     # Message body of Packet-In.
-    class PacketInBody < BinData::Record
+    class Body < BinData::Record
       endian :big
 
       uint32 :buffer_id
@@ -85,7 +88,9 @@ module Pio
       end
       # rubocop:enable MethodLength
     end
+  end
 
+  OpenFlow::Message.factory(PacketIn, OpenFlow::PACKET_IN) do
     attr_accessor :datapath_id
     alias_method :dpid, :datapath_id
     alias_method :dpid=, :datapath_id=
@@ -97,7 +102,7 @@ module Pio
     def_delegators :body, :data
 
     def parsed_data
-      @parsed_data ||= DataParser.read(data)
+      @parsed_data ||= PacketIn::DataParser.read(data)
     end
 
     def lldp?

data/lib/pio/packet_out.rb

@@ -1,11 +1,12 @@
 require 'bindata'
 require 'pio/open_flow'
 
+# Base module.
 module Pio
   # OpenFlow 1.0 Packet-Out message
-  class PacketOut < OpenFlow::Message.factory(OpenFlow::Type::PACKET_OUT)
+  class PacketOut
     # Message body of Packet-Out
-    class PacketOutBody < BinData::Record
+    class Body < BinData::Record
       endian :big
 
       uint32 :buffer_id
@@ -22,7 +23,9 @@ module Pio
         8 + actions_len + data.length
       end
     end
+  end
 
+  OpenFlow::Message.factory(PacketOut, OpenFlow::PACKET_OUT) do
     def_delegators :body, :buffer_id
     def_delegators :body, :in_port
     def_delegators :body, :actions_len

data/lib/pio/port_status.rb

@@ -1,8 +1,9 @@
 require 'pio/open_flow'
 
+# Base module.
 module Pio
   # OpenFlow 1.0 Port Status message
-  class PortStatus < OpenFlow::Message.factory(OpenFlow::Type::PORT_STATUS)
+  class PortStatus
     # What changed about the physical port
     class Reason < BinData::Primitive
       REASONS = { add: 0, delete: 1, modify: 2 }
@@ -18,8 +19,8 @@ module Pio
       end
     end
 
-    # Message body of Packet-In.
-    class PortStatusBody < BinData::Record
+    # Message body of Port Status
+    class Body < BinData::Record
       endian :big
 
       reason :reason
@@ -27,7 +28,9 @@ module Pio
       hide :padding
       phy_port :desc
     end
+  end
 
+  OpenFlow::Message.factory(PortStatus, OpenFlow::PORT_STATUS) do
     def_delegators :body, :desc
 
     def reason

data/lib/pio/version.rb

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

data/spec/pio/echo/reply_spec.rb

@@ -8,7 +8,7 @@ describe Pio::Echo::Reply do
       Given(:binary) { [1, 3, 0, 8, 0, 0, 0, 0].pack('C*') }
 
       Then { echo_reply.ofp_version == 1 }
-      Then { echo_reply.message_type == Pio::OpenFlow::Type::ECHO_REPLY }
+      Then { echo_reply.message_type == Pio::OpenFlow::ECHO_REPLY }
       Then { echo_reply.message_length == 8 }
       Then { echo_reply.transaction_id == 0 }
       Then { echo_reply.xid == 0 }
@@ -34,7 +34,7 @@ describe Pio::Echo::Reply do
       When(:echo_reply) { Pio::Echo::Reply.new }
 
       Then { echo_reply.ofp_version == 1 }
-      Then { echo_reply.message_type == Pio::OpenFlow::Type::ECHO_REPLY }
+      Then { echo_reply.message_type == Pio::OpenFlow::ECHO_REPLY }
       Then { echo_reply.message_length == 8 }
       Then { echo_reply.transaction_id == 0 }
       Then { echo_reply.xid == 0 }
@@ -49,7 +49,7 @@ describe Pio::Echo::Reply do
       When(:echo_reply) { Pio::Echo::Reply.new(123) }
 
       Then { echo_reply.ofp_version == 1 }
-      Then { echo_reply.message_type == Pio::OpenFlow::Type::ECHO_REPLY }
+      Then { echo_reply.message_type == Pio::OpenFlow::ECHO_REPLY }
       Then { echo_reply.message_length == 8 }
       Then { echo_reply.transaction_id == 123 }
       Then { echo_reply.xid == 123 }
@@ -64,7 +64,7 @@ describe Pio::Echo::Reply do
       When(:echo_reply) { Pio::Echo::Reply.new(transaction_id: 123) }
 
       Then { echo_reply.ofp_version == 1 }
-      Then { echo_reply.message_type == Pio::OpenFlow::Type::ECHO_REPLY }
+      Then { echo_reply.message_type == Pio::OpenFlow::ECHO_REPLY }
       Then { echo_reply.message_length == 8 }
       Then { echo_reply.transaction_id == 123 }
       Then { echo_reply.xid == 123 }
@@ -79,7 +79,7 @@ describe Pio::Echo::Reply do
       When(:echo_reply) { Pio::Echo::Reply.new(xid: 123) }
 
       Then { echo_reply.ofp_version == 1 }
-      Then { echo_reply.message_type == Pio::OpenFlow::Type::ECHO_REPLY }
+      Then { echo_reply.message_type == Pio::OpenFlow::ECHO_REPLY }
       Then { echo_reply.message_length == 8 }
       Then { echo_reply.transaction_id == 123 }
       Then { echo_reply.xid == 123 }
@@ -94,7 +94,7 @@ describe Pio::Echo::Reply do
       When(:echo_reply) { Pio::Echo::Reply.new(xid: 123, user_data: 'foobar') }
 
       Then { echo_reply.ofp_version == 1 }
-      Then { echo_reply.message_type == Pio::OpenFlow::Type::ECHO_REPLY }
+      Then { echo_reply.message_type == Pio::OpenFlow::ECHO_REPLY }
       Then { echo_reply.message_length == 14 }
       Then { echo_reply.transaction_id == 123 }
       Then { echo_reply.xid == 123 }

data/spec/pio/echo/request_spec.rb

@@ -8,7 +8,7 @@ describe Pio::Echo::Request do
       Given(:binary) { [1, 2, 0, 8, 0, 0, 0, 0].pack('C*') }
 
       Then { echo_request.ofp_version == 1 }
-      Then { echo_request.message_type == Pio::OpenFlow::Type::ECHO_REQUEST }
+      Then { echo_request.message_type == Pio::OpenFlow::ECHO_REQUEST }
       Then { echo_request.message_length == 8 }
       Then { echo_request.transaction_id == 0 }
       Then { echo_request.xid == 0 }
@@ -34,7 +34,7 @@ describe Pio::Echo::Request do
       When(:echo_request) { Pio::Echo::Request.new }
 
       Then { echo_request.ofp_version == 1 }
-      Then { echo_request.message_type == Pio::OpenFlow::Type::ECHO_REQUEST }
+      Then { echo_request.message_type == Pio::OpenFlow::ECHO_REQUEST }
       Then { echo_request.message_length == 8 }
       Then { echo_request.transaction_id == 0 }
       Then { echo_request.xid == 0 }
@@ -49,7 +49,7 @@ describe Pio::Echo::Request do
       When(:echo_request) { Pio::Echo::Request.new(123) }
 
       Then { echo_request.ofp_version == 1 }
-      Then { echo_request.message_type == Pio::OpenFlow::Type::ECHO_REQUEST }
+      Then { echo_request.message_type == Pio::OpenFlow::ECHO_REQUEST }
       Then { echo_request.message_length == 8 }
       Then { echo_request.transaction_id == 123 }
       Then { echo_request.xid == 123 }
@@ -64,7 +64,7 @@ describe Pio::Echo::Request do
       When(:echo_request) { Pio::Echo::Request.new(transaction_id: 123) }
 
       Then { echo_request.ofp_version == 1 }
-      Then { echo_request.message_type == Pio::OpenFlow::Type::ECHO_REQUEST }
+      Then { echo_request.message_type == Pio::OpenFlow::ECHO_REQUEST }
       Then { echo_request.message_length == 8 }
       Then { echo_request.transaction_id == 123 }
       Then { echo_request.xid == 123 }
@@ -79,7 +79,7 @@ describe Pio::Echo::Request do
       When(:echo_request) { Pio::Echo::Request.new(xid: 123) }
 
       Then { echo_request.ofp_version == 1 }
-      Then { echo_request.message_type == Pio::OpenFlow::Type::ECHO_REQUEST }
+      Then { echo_request.message_type == Pio::OpenFlow::ECHO_REQUEST }
       Then { echo_request.message_length == 8 }
       Then { echo_request.transaction_id == 123 }
       Then { echo_request.xid == 123 }
@@ -96,7 +96,7 @@ describe Pio::Echo::Request do
       end
 
       Then { echo_request.ofp_version == 1 }
-      Then { echo_request.message_type == Pio::OpenFlow::Type::ECHO_REQUEST }
+      Then { echo_request.message_type == Pio::OpenFlow::ECHO_REQUEST }
       Then { echo_request.message_length == 14 }
       Then { echo_request.transaction_id == 123 }
       Then { echo_request.xid == 123 }

data/spec/pio/features/reply_spec.rb

@@ -30,7 +30,7 @@ describe Pio::Features::Reply do
       Then { result.ofp_version == 1 }
       Then do
         result.message_type ==
-          Pio::OpenFlow::Type::FEATURES_REPLY
+          Pio::OpenFlow::FEATURES_REPLY
       end
       Then { result.message_length == 176 }
       Then { result.transaction_id == 2 }
@@ -101,7 +101,7 @@ describe Pio::Features::Reply do
     When(:features_reply) { Pio::Features::Reply.new(options) }
 
     Then { features_reply.ofp_version == 1 }
-    Then { features_reply.message_type == Pio::OpenFlow::Type::FEATURES_REPLY }
+    Then { features_reply.message_type == Pio::OpenFlow::FEATURES_REPLY }
     Then { features_reply.transaction_id == 0 }
     Then { features_reply.xid == 0 }
     Then { features_reply.dpid == 0x123 }

data/spec/pio/features/request_spec.rb

@@ -11,7 +11,7 @@ describe Pio::Features::Request do
       Then { result.ofp_version == 1 }
       Then do
         result.message_type ==
-          Pio::OpenFlow::Type::FEATURES_REQUEST
+          Pio::OpenFlow::FEATURES_REQUEST
       end
       Then { result.message_length == 8 }
       Then { result.transaction_id == 0 }
@@ -35,7 +35,7 @@ describe Pio::Features::Request do
       When(:result) { Pio::Features::Request.new }
 
       Then { result.ofp_version == 1 }
-      Then { result.message_type == Pio::OpenFlow::Type::FEATURES_REQUEST }
+      Then { result.message_type == Pio::OpenFlow::FEATURES_REQUEST }
       Then { result.message_length == 8 }
       Then { result.transaction_id == 0 }
       Then { result.xid == 0 }
@@ -48,7 +48,7 @@ describe Pio::Features::Request do
       When(:result) { Pio::Features::Request.new(123) }
 
       Then { result.ofp_version == 1 }
-      Then { result.message_type == Pio::OpenFlow::Type::FEATURES_REQUEST }
+      Then { result.message_type == Pio::OpenFlow::FEATURES_REQUEST }
       Then { result.message_length == 8 }
       Then { result.transaction_id == 123 }
       Then { result.xid == 123 }
@@ -61,7 +61,7 @@ describe Pio::Features::Request do
       When(:result) { Pio::Features::Request.new(transaction_id: 123) }
 
       Then { result.ofp_version == 1 }
-      Then { result.message_type == Pio::OpenFlow::Type::FEATURES_REQUEST }
+      Then { result.message_type == Pio::OpenFlow::FEATURES_REQUEST }
       Then { result.message_length == 8 }
       Then { result.transaction_id == 123 }
       Then { result.xid == 123 }
@@ -74,7 +74,7 @@ describe Pio::Features::Request do
       When(:result) { Pio::Features::Request.new(xid: 123) }
 
       Then { result.ofp_version == 1 }
-      Then { result.message_type == Pio::OpenFlow::Type::FEATURES_REQUEST }
+      Then { result.message_type == Pio::OpenFlow::FEATURES_REQUEST }
       Then { result.message_length == 8 }
       Then { result.transaction_id == 123 }
       Then { result.xid == 123 }

data/spec/pio/open_flow/phy_port_spec.rb

@@ -1,14 +1,14 @@
 require 'pio'
 
-describe Pio::Type::OpenFlow::PhyPort do
+describe Pio::OpenFlow::PhyPort do
   describe '.new' do
     When(:phy_port) do
-      Pio::Type::OpenFlow::PhyPort.new(port_no: 1,
-                                       hardware_address: '11:22:33:44:55:66',
-                                       name: 'port123',
-                                       config: [:port_down],
-                                       state: [:link_down],
-                                       curr: [:port_10gb_fd, :port_copper])
+      Pio::OpenFlow::PhyPort.new(port_no: 1,
+                                 hardware_address: '11:22:33:44:55:66',
+                                 name: 'port123',
+                                 config: [:port_down],
+                                 state: [:link_down],
+                                 curr: [:port_10gb_fd, :port_copper])
     end
 
     Then { phy_port.port_no == 1 }

data/spec/pio/open_flow/type_spec.rb

@@ -1,5 +1,5 @@
 require 'pio'
 
-describe Pio::OpenFlow::Type do
-  Then { Pio::OpenFlow::Type.constants.include?(:HELLO) == true }
+describe Pio::OpenFlow do
+  Then { Pio::OpenFlow.constants.include?(:HELLO) == true }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pio
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -503,7 +503,6 @@ files:
 - lib/pio/open_flow/open_flow_header.rb
 - lib/pio/open_flow/phy_port.rb
 - lib/pio/open_flow/port_number.rb
-- lib/pio/open_flow/type.rb
 - lib/pio/options.rb
 - lib/pio/packet_in.rb
 - lib/pio/packet_out.rb

data/lib/pio/open_flow/type.rb

@@ -1,16 +0,0 @@
-module Pio
-  module OpenFlow
-    # OFPT_* constants.
-    module Type
-      HELLO = 0
-      ECHO_REQUEST = 2
-      ECHO_REPLY = 3
-      FEATURES_REQUEST = 5
-      FEATURES_REPLY = 6
-      PACKET_IN = 10
-      PORT_STATUS = 12
-      PACKET_OUT = 13
-      FLOW_MOD = 14
-    end
-  end
-end