pio 0.27.1 → 0.27.2

data/lib/pio/open_flow10/stats_reply.rb

@@ -1,22 +1,25 @@
+require 'pio/open_flow/message'
+require 'pio/open_flow10/aggregate_stats/reply'
+require 'pio/open_flow10/description_stats/reply'
+require 'pio/open_flow10/flow_stats/reply'
+
 module Pio
   module OpenFlow10
     class Stats
       # Stats reply parser.
       class Reply
-        # Stats reply format.
-        class Format < BinData::Record
-          extend OpenFlow::Format
-
-          header version: 1, message_type: 17
-          stats_type :stats_type
-        end
-
         TYPES = {
           description: OpenFlow10::DescriptionStats::Reply,
           flow: OpenFlow10::FlowStats::Reply,
           aggregate: OpenFlow10::AggregateStats::Reply
         }
 
+        # Stats reply format.
+        class Format < OpenFlow::Message
+          open_flow_header version: 1, message_type: 17, message_length: 10
+          stats_type :stats_type
+        end
+
         def self.read(binary)
           TYPES.fetch(Format.read(binary).stats_type.to_sym).read(binary)
         rescue KeyError

data/lib/pio/open_flow10/stats_request.rb

@@ -1,22 +1,22 @@
+require 'pio/open_flow/message'
+
 module Pio
   module OpenFlow10
     class Stats
       # Stats request parser.
       class Request
-        # Stats request format.
-        class Format < BinData::Record
-          extend OpenFlow::Format
-
-          header version: 1, message_type: 16
-          stats_type :stats_type
-        end
-
         TYPES = {
           description: OpenFlow10::DescriptionStats::Request,
           flow: OpenFlow10::FlowStats::Request,
           aggregate: OpenFlow10::AggregateStats::Request
         }
 
+        # Stats request format.
+        class Format < OpenFlow::Message
+          open_flow_header version: 1, message_type: 16, message_length: 10
+          stats_type :stats_type
+        end
+
         def self.read(binary)
           TYPES.fetch(Format.read(binary).stats_type.to_sym).read(binary)
         rescue KeyError

data/lib/pio/open_flow13.rb

@@ -1,15 +1,22 @@
-require 'pio/open_flow13/apply'
-require 'pio/open_flow13/echo'
+# Messages
+require 'pio/open_flow13/echo/reply'
+require 'pio/open_flow13/echo/request'
 require 'pio/open_flow13/error'
 require 'pio/open_flow13/error/bad_request'
 require 'pio/open_flow13/error/hello_failed'
-require 'pio/open_flow13/features'
+require 'pio/open_flow13/features/reply'
+require 'pio/open_flow13/features/request'
 require 'pio/open_flow13/flow_mod'
-require 'pio/open_flow13/goto_table'
 require 'pio/open_flow13/hello'
-require 'pio/open_flow13/meter'
 require 'pio/open_flow13/packet_in'
 require 'pio/open_flow13/packet_out'
-require 'pio/open_flow13/send_out_port'
 require 'pio/open_flow13/stats_request'
+
+# Actions
+require 'pio/open_flow13/send_out_port'
+
+# Instructions
+require 'pio/open_flow13/apply'
+require 'pio/open_flow13/goto_table'
+require 'pio/open_flow13/meter'
 require 'pio/open_flow13/write_metadata'

data/lib/pio/open_flow13/echo/reply.rb

@@ -0,0 +1,15 @@
+require 'pio/open_flow/message'
+
+module Pio
+  module OpenFlow13
+    module Echo
+      # OpenFlow 1.3 Echo Reply message.
+      class Reply < OpenFlow::Message
+        open_flow_header version: 4, message_type: 3
+        string :body, read_length: -> { message_length - 8 }
+
+        alias_method :user_data, :body
+      end
+    end
+  end
+end

data/lib/pio/open_flow13/echo/request.rb

@@ -0,0 +1,15 @@
+require 'pio/open_flow/message'
+
+module Pio
+  module OpenFlow13
+    module Echo
+      # OpenFlow 1.3 Echo Request message.
+      class Request < OpenFlow::Message
+        open_flow_header version: 4, message_type: 2
+        string :body, read_length: -> { message_length - 8 }
+
+        alias_method :user_data, :body
+      end
+    end
+  end
+end

data/lib/pio/open_flow13/error/bad_request.rb

@@ -1,4 +1,3 @@
-require 'pio/open_flow/format'
 require 'pio/open_flow/message'
 require 'pio/open_flow13/error/error_type13'
 
@@ -7,59 +6,43 @@ module Pio
     module Error
       # Bad request error.
       class BadRequest < OpenFlow::Message
-        # Bad request error format.
-        class Format < BinData::Record
-          # enum ofp_bad_request_code
-          class BadRequestCode < BinData::Primitive
-            ERROR_CODES = {
-              bad_version: 0,
-              bad_type: 1,
-              bad_multipart: 2,
-              bad_experimenter: 3,
-              bad_experimenter_type: 4,
-              permissions_error: 5,
-              bad_length: 6,
-              buffer_empty: 7,
-              buffer_unknown: 8,
-              bad_table_id: 9,
-              controller_is_slave: 10,
-              bad_port: 11,
-              bad_packet: 12,
-              multipart_buffer_overflow: 13
-            }
-
-            endian :big
-            uint16 :error_code
-
-            def get
-              ERROR_CODES.invert.fetch(error_code)
-            end
-
-            def set(value)
-              self.error_code = ERROR_CODES.fetch(value)
-            end
+        # enum ofp_bad_request_code
+        class BadRequestCode < BinData::Primitive
+          ERROR_CODES = {
+            bad_version: 0,
+            bad_type: 1,
+            bad_multipart: 2,
+            bad_experimenter: 3,
+            bad_experimenter_type: 4,
+            permissions_error: 5,
+            bad_length: 6,
+            buffer_empty: 7,
+            buffer_unknown: 8,
+            bad_table_id: 9,
+            controller_is_slave: 10,
+            bad_port: 11,
+            bad_packet: 12,
+            multipart_buffer_overflow: 13
+          }
+
+          endian :big
+          uint16 :error_code
+
+          def get
+            ERROR_CODES.invert.fetch(error_code)
           end
 
-          # Bad request error body.
-          class Body < BinData::Record
-            endian :big
-
-            error_type13 :error_type, value: -> { :bad_request }
-            bad_request_code :error_code
-            rest :raw_data
-
-            def length
-              4 + raw_data.length
-            end
+          def set(value)
+            self.error_code = ERROR_CODES.fetch(value)
           end
-
-          extend OpenFlow::Format
-
-          header version: 4, message_type: 1
-          body :body
         end
 
-        body_option :raw_data
+        open_flow_header version: 4,
+                         message_type: 1,
+                         message_length: -> { 12 + raw_data.length }
+        error_type13 :error_type, value: -> { :bad_request }
+        bad_request_code :error_code
+        rest :raw_data
       end
     end
   end

data/lib/pio/open_flow13/error/hello_failed.rb

@@ -1,41 +1,18 @@
 require 'pio/open_flow/hello_failed_code'
-require 'pio/open_flow/format'
 require 'pio/open_flow/message'
+require 'pio/open_flow13/error/error_type13'
 
-# Base module.
 module Pio
-  # OpenFlow 1.3 messages
   module OpenFlow13
     module Error
       # Hello Failed error message
       class HelloFailed < OpenFlow::Message
-        # Hello Failed error format.
-        class Format < BinData::Record
-          # Hello Failed error body.
-          class Body < BinData::Record
-            endian :big
-
-            error_type13 :error_type
-            hello_failed_code :error_code
-            rest :description
-
-            def length
-              4 + description.length
-            end
-          end
-
-          extend OpenFlow::Format
-
-          header version: 4, message_type: 1
-          body :body
-
-          def length
-            8 + body.length
-          end
-        end
-
-        body_option :error_code
-        body_option :description
+        open_flow_header version: 4,
+                         message_type: 1,
+                         message_length: -> { 12 + description.length }
+        error_type13 :error_type
+        hello_failed_code :error_code
+        rest :description
       end
     end
   end

data/lib/pio/open_flow13/features/reply.rb

@@ -1,62 +1,38 @@
-require 'pio/open_flow'
+require 'pio/open_flow/message'
 
-# Base module.
 module Pio
-  # OpenFlow 1.3 messages
   module OpenFlow13
     # Features Request and Reply message.
     class Features
       # Features Reply message.
       class Reply < OpenFlow::Message
-        # Features Reply message body.
-        class Body < BinData::Record
-          extend OpenFlow::Flags
-
-          flags_32bit(:capabilities,
-                      [:flow_stats,
-                       :table_stats,
-                       :port_stats,
-                       :group_stats,
-                       :NOT_USED,
-                       :ip_reasm,
-                       :queue_stats,
-                       :NOT_USED,
-                       :port_blocked])
-
-          endian :big
-
-          datapath_id :datapath_id
-          uint32 :n_buffers
-          uint8 :n_tables
-          uint8 :auxiliary_id
-          uint16 :padding
-          hide :padding
-          capabilities :capabilities
-          uint32 :reserved
-
-          def length
-            24
-          end
+        extend OpenFlow::Flags
+
+        flags_32bit(:capabilities,
+                    [:flow_stats,
+                     :table_stats,
+                     :port_stats,
+                     :group_stats,
+                     :NOT_USED,
+                     :ip_reasm,
+                     :queue_stats,
+                     :NOT_USED,
+                     :port_blocked])
+
+        open_flow_header version: 4, message_type: 6, message_length: 32
+        datapath_id :datapath_id
+        uint32 :n_buffers
+        uint8 :n_tables
+        uint8 :auxiliary_id
+        uint16 :padding
+        hide :padding
+        capabilities :capabilities
+        uint32 :reserved
+
+        def datapath_id
+          @format.datapath_id.to_i
         end
-
-        # Features Reply message format.
-        class Format < BinData::Record
-          extend OpenFlow::Format
-
-          header version: 4, message_type: 6
-          body :body
-
-          def datapath_id
-            body.datapath_id.to_i
-          end
-          alias_method :dpid, :datapath_id
-        end
-
-        body_option :dpid
-        body_option :datapath_id
-        body_option :n_buffers
-        body_option :n_tables
-        body_option :capabilities
+        alias_method :dpid, :datapath_id
       end
     end
   end

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

@@ -1,20 +1,13 @@
-require 'pio/open_flow'
+require 'pio/open_flow/message'
 
-# Base module.
 module Pio
-  # OpenFlow 1.3 messages
   module OpenFlow13
     # Features Request and Reply message.
     class Features
       # Features Request message.
       class Request < OpenFlow::Message
-        # Features Request message format.
-        class Format < BinData::Record
-          extend OpenFlow::Format
-
-          header version: 4, message_type: 5
-          string :body, value: ''
-        end
+        open_flow_header version: 4, message_type: 5
+        string :body, value: ''
       end
     end
   end

data/lib/pio/open_flow13/flow_mod.rb

@@ -2,7 +2,6 @@ require 'pio/open_flow'
 require 'pio/open_flow13/buffer_id'
 require 'pio/open_flow13/match'
 
-# Base module.
 module Pio
   module OpenFlow13
     # OpenFlow 1.3 FlowMod message parser and generator
@@ -103,57 +102,35 @@ module Pio
         end
       end
 
-      # OpenFlow 1.3 FlowMod message body
-      class Body < BinData::Record
-        extend OpenFlow::Flags
-        flags_16bit :flags,
-                    [:send_flow_rem,
-                     :check_overwrap,
-                     :reset_counts,
-                     :no_packet_counts,
-                     :no_byte_counts]
-
-        endian :big
-
-        uint64 :cookie
-        uint64 :cookie_mask
-        uint8 :table_id
-        command :command
-        uint16 :idle_timeout
-        uint16 :hard_timeout
-        uint16 :priority, initial_value: 0xffff
-        buffer_id :buffer_id
-        out_port :out_port
-        out_group :out_group
-        flags :flags
-        string :padding, length: 2
-        hide :padding
-        oxm :match
-        instructions :instructions
-
-        def length
-          40 + match.length + instructions.length
-        end
-      end
-
-      # OpenFlow 1.3 FlowMod message format
-      class Format < BinData::Record
-        extend OpenFlow::Format
-
-        header version: 4, message_type: 14
-        body :body
-      end
-
-      body_option :actions
-      body_option :buffer_id
-      body_option :command
-      body_option :flags
-      body_option :hard_timeout
-      body_option :idle_timeout
-      body_option :instructions
-      body_option :match
-      body_option :priority
-      body_option :table_id
+      extend OpenFlow::Flags
+
+      flags_16bit :flags,
+                  [:send_flow_rem,
+                   :check_overwrap,
+                   :reset_counts,
+                   :no_packet_counts,
+                   :no_byte_counts]
+
+      open_flow_header(version: 4,
+                       message_type: 14,
+                       message_length: lambda do
+                         48 + match.length + instructions.length
+                       end)
+      uint64 :cookie
+      uint64 :cookie_mask
+      uint8 :table_id
+      command :command
+      uint16 :idle_timeout
+      uint16 :hard_timeout
+      uint16 :priority, initial_value: 0xffff
+      buffer_id :buffer_id
+      out_port :out_port
+      out_group :out_group
+      flags :flags
+      string :padding, length: 2
+      hide :padding
+      oxm :match
+      instructions :instructions
     end
   end
 end