pio 0.27.1 → 0.27.2

data/lib/pio/open_flow10/features/request.rb

@@ -1,4 +1,4 @@
-require 'pio/open_flow'
+require 'pio/open_flow/message'
 
 module Pio
   module OpenFlow10
@@ -6,17 +6,10 @@ module Pio
     class Features
       # Features Request message.
       class Request < OpenFlow::Message
-        # Features Request message format.
-        class Format < BinData::Record
-          extend OpenFlow::Format
+        open_flow_header version: 1, message_type: 5
+        string :body, length: 0
 
-          header version: 1, message_type: 5
-          string :body, value: ''
-
-          def user_data
-            body
-          end
-        end
+        alias_method :user_data, :body
       end
     end
   end

data/lib/pio/open_flow10/flow_mod.rb

@@ -1,8 +1,7 @@
 require 'pio/open_flow'
 require 'pio/open_flow10/actions'
-require 'pio/open_flow10/match'
+require 'pio/open_flow10/match10'
 
-# Base module.
 module Pio
   module OpenFlow10
     # OpenFlow 1.0 Flow Mod message.
@@ -29,55 +28,26 @@ module Pio
         end
       end
 
-      # Message body of FlowMod.
-      class Body < BinData::Record
-        extend OpenFlow::Flags
-
-        flags_16bit :flags,
-                    [:send_flow_rem,
-                     :check_overwrap,
-                     :emerg]
-
-        endian :big
-
-        match10 :match
-        uint64 :cookie
-        command :command
-        uint16 :idle_timeout
-        uint16 :hard_timeout
-        uint16 :priority
-        uint32 :buffer_id
-        uint16 :out_port
-        flags :flags
-        actions :actions, length: -> { header.length - 72 }
-
-        def empty?
-          false
-        end
-
-        def length
-          64 + actions.binary.length
-        end
-      end
-
-      # OpenFlow 1.0 Flow Mod message format.
-      class Format < BinData::Record
-        extend OpenFlow::Format
-
-        header version: 1, message_type: 14
-        body :body
-      end
-
-      body_option :actions
-      body_option :buffer_id
-      body_option :command
-      body_option :cookie
-      body_option :flags
-      body_option :hard_timeout
-      body_option :idle_timeout
-      body_option :match
-      body_option :out_port
-      body_option :priority
+      extend OpenFlow::Flags
+
+      flags_16bit :flags,
+                  [:send_flow_rem,
+                   :check_overwrap,
+                   :emerg]
+
+      open_flow_header version: 1,
+                       message_type: 14,
+                       message_length: -> { 72 + actions.binary.length }
+      match10 :match
+      uint64 :cookie
+      command :command
+      uint16 :idle_timeout
+      uint16 :hard_timeout
+      uint16 :priority
+      uint32 :buffer_id
+      uint16 :out_port
+      flags :flags
+      actions :actions, length: -> { message_length - 72 }
     end
   end
 end

data/lib/pio/open_flow10/{flow_stats_reply.rb → flow_stats/reply.rb}

@@ -1,9 +1,8 @@
 require 'pio/open_flow10/actions'
+require 'pio/open_flow10/match10'
 require 'pio/open_flow10/stats_type'
 
-# Base module.
 module Pio
-  # OpenFlow 1.0 messages
   module OpenFlow10
     # OpenFlow 1.0 FlowStats messages
     module FlowStats
@@ -31,28 +30,13 @@ module Pio
           actions :actions, length: -> { entry_length - 88 }
         end
 
-        # Message body of Flow Stats Reply.
-        class Body < BinData::Record
-          endian :big
-
-          stats_type :stats_type, value: -> { :flow }
-          uint16 :flags
-          array(:stats,
-                type: :flow_stats_entry,
-                read_until: :eof)
-
-          def length
-            4 + stats.to_binary_s.length
-          end
-        end
-
-        # OpenFlow 1.0 Flow Stats Reply message format.
-        class Format < BinData::Record
-          extend OpenFlow::Format
+        open_flow_header version: 1,
+                         message_type: 17,
+                         message_length: -> { 12 + stats.to_binary_s.length }
 
-          header version: 1, message_type: 17
-          body :body
-        end
+        stats_type :stats_type, value: -> { :flow }
+        uint16 :flags
+        array :stats, type: :flow_stats_entry, read_until: :eof
       end
     end
   end

data/lib/pio/open_flow10/flow_stats/request.rb

@@ -0,0 +1,25 @@
+require 'pio/open_flow/message'
+require 'pio/open_flow10/match10'
+require 'pio/open_flow10/stats_type'
+
+module Pio
+  module OpenFlow10
+    # OpenFlow 1.0 FlowStats messages
+    module FlowStats
+      # OpenFlow 1.0 Flow Stats Request message
+      class Request < OpenFlow::Message
+        open_flow_header version: 1,
+                         message_type: 16,
+                         message_length: 56
+
+        stats_type :stats_type, value: -> { :flow }
+        uint16 :flags
+        match10 :match
+        uint8 :table_id, initial_value: 0xff
+        string :padding, length: 1
+        hide :padding
+        port16 :out_port, initial_value: -> { :none }
+      end
+    end
+  end
+end

data/lib/pio/open_flow10/hello.rb

@@ -1,23 +1,13 @@
-require 'pio/open_flow/format'
 require 'pio/open_flow/message'
 
-# Base module.
 module Pio
-  # OpenFlow 1.0 messages
   module OpenFlow10
     # Hello message
     class Hello < OpenFlow::Message
-      # Hello message format
-      class Format < BinData::Record
-        extend OpenFlow::Format
+      open_flow_header version: 1, message_type: 0
+      string :body, length: 0
 
-        header version: 1, message_type: 0
-        string :body
-
-        def user_data
-          body
-        end
-      end
+      alias_method :user_data, :body
     end
   end
 end

data/lib/pio/open_flow10/match.rb

@@ -1,6 +1,5 @@
 require 'English'
 require 'bindata'
-require 'pio/open_flow'
 require 'pio/type/ip_address'
 require 'pio/type/mac_address'
 
@@ -161,22 +160,5 @@ module Pio
         @format.__send__ method, *args, &block
       end
     end
-
-    # Pio::MatchFormat wrapper.
-    class Match10 < BinData::Primitive
-      endian :big
-
-      string :match,
-             read_length: 40,
-             initial_value: Pio::OpenFlow10::Match.new.to_binary_s
-
-      def set(object)
-        self.match = object.to_binary_s
-      end
-
-      def get
-        Pio::OpenFlow10::Match.read match
-      end
-    end
   end
 end

data/lib/pio/open_flow10/match10.rb

@@ -0,0 +1,22 @@
+require 'pio/open_flow10/match'
+
+module Pio
+  module OpenFlow10
+    # Pio::MatchFormat wrapper.
+    class Match10 < BinData::Primitive
+      endian :big
+
+      string :match,
+             read_length: 40,
+             initial_value: Pio::OpenFlow10::Match.new.to_binary_s
+
+      def set(object)
+        self.match = object.to_binary_s
+      end
+
+      def get
+        Pio::OpenFlow10::Match.read match
+      end
+    end
+  end
+end

data/lib/pio/open_flow10/packet_in.rb

@@ -4,7 +4,6 @@ require 'pio/open_flow'
 require 'pio/parse_error'
 require 'pio/parser'
 
-# Base module.
 module Pio
   module OpenFlow10
     # OpenFlow 1.0 Packet-In message
@@ -25,55 +24,32 @@ module Pio
         end
       end
 
-      # Message body of Packet-In.
-      class Body < BinData::Record
-        endian :big
-
-        uint32 :buffer_id
-        uint16 :total_len, value: -> { raw_data.length }
-        uint16 :in_port
-        reason :reason
-        uint8 :padding
-        hide :padding
-        string :raw_data, read_length: :total_len
-
-        def data
-          @data ||= Pio::Parser.read(raw_data)
-        end
-
-        def empty?
-          false
-        end
-
-        def length
-          10 + raw_data.length
-        end
-
-        def lldp?
-          data.is_a? Lldp
-        end
-
-        def method_missing(method, *args)
-          data.__send__(method, *args).snapshot
-        end
+      open_flow_header version: 1,
+                       message_type: 10,
+                       message_length: -> { 18 + raw_data.length }
+      uint32 :buffer_id
+      uint16 :total_len, value: -> { raw_data.length }
+      uint16 :in_port
+      reason :reason
+      uint8 :padding
+      hide :padding
+      string :raw_data, read_length: :total_len
+
+      def data
+        @data ||= Pio::Parser.read(raw_data)
       end
 
-      # OpenFlow 1.0 Flow Mod message format.
-      class Format < BinData::Record
-        extend OpenFlow::Format
+      def lldp?
+        data.is_a? Lldp
+      end
 
-        header version: 1, message_type: 10
-        body :body
+      def method_missing(method, *args)
+        data.__send__(method, *args).snapshot
       end
 
       attr_accessor :datapath_id
       alias_method :dpid, :datapath_id
       alias_method :dpid=, :datapath_id=
-
-      body_option :buffer_id
-      body_option :in_port
-      body_option :reason
-      body_option :raw_data
     end
   end
 end

data/lib/pio/open_flow10/packet_out.rb

@@ -6,37 +6,14 @@ module Pio
   module OpenFlow10
     # OpenFlow 1.0 Packet-Out message
     class PacketOut < OpenFlow::Message
-      # OpenFlow 1.0 Flow Mod message format.
-      class Format < BinData::Record
-        # Message body of Packet-Out
-        class Body < BinData::Record
-          endian :big
-
-          uint32 :buffer_id
-          uint16 :in_port
-          uint16 :actions_len, initial_value: -> { actions.binary.length }
-          actions :actions, length: -> { actions_len }
-          rest :raw_data
-
-          def empty?
-            false
-          end
-
-          def length
-            8 + actions_len + raw_data.length
-          end
-        end
-
-        extend OpenFlow::Format
-
-        header version: 1, message_type: 13
-        body :body
-      end
-
-      body_option :buffer_id
-      body_option :in_port
-      body_option :actions
-      body_option :raw_data
+      open_flow_header version: 1,
+                       message_type: 13,
+                       message_length: -> { 16 + actions_len + raw_data.length }
+      uint32 :buffer_id
+      uint16 :in_port
+      uint16 :actions_len, initial_value: -> { actions.binary.length }
+      actions :actions, length: -> { actions_len }
+      rest :raw_data
     end
   end
 end

data/lib/pio/open_flow10/port_status.rb

@@ -1,8 +1,6 @@
-require 'pio/open_flow'
+require 'pio/open_flow/message'
 
-# Base module.
 module Pio
-  # OpenFlow 1.0 messages
   module OpenFlow10
     # OpenFlow 1.0 Port Status message
     class PortStatus < OpenFlow::Message
@@ -21,51 +19,25 @@ module Pio
         end
       end
 
-      # Message body of Port Status
-      class Body < BinData::Record
-        endian :big
+      open_flow_header version: 1,
+                       message_type: 12,
+                       message_length: 10
+      reason :reason
+      uint56 :padding
+      hide :padding
+      phy_port16 :desc
 
-        reason :reason
-        uint56 :padding
-        hide :padding
-        phy_port16 :desc
-      end
-
-      # OpenFlow 1.0 Flow Mod message format.
-      class Format < BinData::Record
-        extend OpenFlow::Format
-
-        header version: 1, message_type: 12
-        body :body
-
-        def reason
-          body.reason.to_sym
-        end
+      def reason
+        @format.reason.to_sym
       end
 
       attr_writer :datapath_id
 
       def desc
-        @desc ||= @format.body.desc.snapshot
+        @desc ||= @format.desc.snapshot
         @desc.instance_variable_set :@datapath_id, @datapath_id
         @desc
       end
-
-      # rubocop:disable MethodLength
-      def initialize(user_options = {})
-        header_options = parse_header_options(user_options)
-        body_options = if user_options.respond_to?(:fetch)
-                         user_options.delete :transaction_id
-                         user_options.delete :xid
-                         dpid = user_options[:dpid]
-                         user_options[:datapath_id] = dpid if dpid
-                         user_options
-                       else
-                         ''
-                       end
-        @format = Format.new(header: header_options, body: body_options)
-      end
-      # rubocop:enable MethodLength
     end
   end
 end