pio 0.30.0 → 0.30.1

data/lib/pio/open_flow13/nicira_conjunction.rb

@@ -0,0 +1,26 @@
+require 'pio/open_flow/nicira_action'
+
+module Pio
+  module OpenFlow13
+    # NXAST_CONJUNCTION action
+    class NiciraConjunction < OpenFlow::NiciraAction
+      nicira_action_header action_type: 0xffff,
+                           action_length: 16,
+                           subtype: 34
+      uint8 :_clause
+      uint8 :n_clauses
+      uint32 :conjunction_id
+
+      def initialize(options)
+        super(_clause: options[:clause] - 1,
+              n_clauses: options[:n_clauses],
+              conjunction_id: options[:conjunction_id])
+      end
+
+      def clause
+        _clause + 1
+      end
+    end
+  end
+  NiciraConjunction = OpenFlow13::NiciraConjunction
+end

data/lib/pio/open_flow13/nicira_reg_load.rb

@@ -1,43 +1,63 @@
-require 'active_support/core_ext/string/inflections'
-require 'pio/open_flow/action'
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow13/match'
 
 module Pio
   module OpenFlow13
     # NXAST_REG_LOAD action
-    class NiciraRegLoad < OpenFlow::Action
-      action_header action_type: 0xffff, action_length: 24
-      uint32 :experimenter_id, value: 0x2320
-      uint16 :experimenter_type, value: 7
-      bit10 :offset_internal, initial_value: 0
-      bit6 :n_bits_internal
-      uint32 :destination_internal
-      uint64 :value_internal
-
-      attr_reader :destination
+    class NiciraRegLoad < OpenFlow::NiciraAction
+      nicira_action_header action_type: 0xffff,
+                           action_length: 24,
+                           subtype: 7
+      bit10 :_offset, initial_value: 0
+      bit6 :_n_bits
+      struct :_destination do
+        uint16 :oxm_class
+        bit7 :oxm_field
+        bit1 :oxm_hasmask, value: 0
+        bit8 :oxm_length
+      end
+      uint64 :_value
 
-      # rubocop:disable AbcSize
-      # rubocop:disable LineLength
       def initialize(value, destination, options = {})
         @destination = destination
-        oxm_klass = Match.const_get(destination.to_s.split('_').map(&:capitalize).join)
-        super(value_internal: value,
-              offset_internal: options[:offset] || 0,
-              n_bits_internal: options[:n_bits] ? options[:n_bits] - 1 : oxm_klass.new.length * 8 - 1,
-              destination_internal: ((oxm_klass.superclass.const_get(:OXM_CLASS) << 16) | (oxm_klass.const_get(:OXM_FIELD) << 9) | oxm_klass.new.length))
+        super(_value: value,
+              _offset: options[:offset] || 0,
+              _n_bits: (options[:n_bits] || oxm_length * 8) - 1,
+              _destination: { oxm_class: oxm_class,
+                              oxm_field: oxm_field,
+                              oxm_length: oxm_length })
       end
-      # rubocop:enable AbcSize
-      # rubocop:enable LineLength
+
+      attr_reader :destination
 
       def offset
-        offset_internal
+        _offset
       end
 
       def n_bits
-        n_bits_internal + 1
+        _n_bits + 1
       end
 
       def value
-        value_internal
+        _value
+      end
+
+      private
+
+      def oxm_class
+        destination_oxm_class.const_get(:OXM_CLASS)
+      end
+
+      def oxm_field
+        destination_oxm_class.const_get(:OXM_FIELD)
+      end
+
+      def oxm_length
+        destination_oxm_class.new.length
+      end
+
+      def destination_oxm_class
+        Match.const_get(@destination.to_s.split('_').map(&:capitalize).join)
       end
     end
   end

data/lib/pio/open_flow13/nicira_reg_move.rb

@@ -1,42 +1,84 @@
-require 'active_support/core_ext/string/inflections'
-require 'pio/open_flow/action'
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow13/match'
 
 module Pio
   module OpenFlow13
     # NXAST_REG_MOVE action
-    class NiciraRegMove < OpenFlow::Action
-      action_header action_type: 0xffff, action_length: 24
-      uint32 :experimenter_id, value: 0x2320
-      uint16 :experimenter_type, value: 6
-      uint16 :n_bits, initial_value: -> { source_oxm_length * 8 }
-      uint16 :source_offset, value: 0
-      uint16 :destination_offset, value: 0
-      uint16 :source_oxm_class
-      bit7 :source_oxm_field
-      bit1 :source_oxm_hasmask, value: 0
-      uint8 :source_oxm_length
-      uint16 :destination_oxm_class
-      bit7 :destination_oxm_field
-      bit1 :destination_oxm_hasmask, value: 0
-      uint8 :destination_oxm_length
-
-      attr_reader :from
-      attr_reader :to
-
-      # rubocop:disable AbcSize
-      def initialize(options)
-        @from = options.fetch(:from)
-        @to = options.fetch(:to)
-        from_klass = Match.const_get(@from.to_s.classify)
-        to_klass = Match.const_get(@to.to_s.classify)
-        super(source_oxm_class: from_klass.superclass.const_get(:OXM_CLASS),
-              source_oxm_field: from_klass.const_get(:OXM_FIELD),
-              source_oxm_length: from_klass.new.length,
-              destination_oxm_class: to_klass.superclass.const_get(:OXM_CLASS),
-              destination_oxm_field: to_klass.const_get(:OXM_FIELD),
-              destination_oxm_length: to_klass.new.length)
-      end
-      # rubocop:enable AbcSize
+    class NiciraRegMove < OpenFlow::NiciraAction
+      nicira_action_header action_type: 0xffff,
+                           action_length: 24,
+                           subtype: 6
+      uint16 :n_bits, initial_value: -> { _source[:oxm_length] * 8 }
+      uint16 :source_offset, initial_value: 0
+      uint16 :destination_offset, initial_value: 0
+      struct :_source do
+        uint16 :oxm_class
+        bit7 :oxm_field
+        bit1 :oxm_hasmask, value: 0
+        uint8 :oxm_length
+      end
+      struct :_destination do
+        uint16 :oxm_class
+        bit7 :oxm_field
+        bit1 :oxm_hasmask, value: 0
+        uint8 :oxm_length
+      end
+
+      # rubocop:disable MethodLength
+      def initialize(arguments)
+        @source = arguments.fetch(:source)
+        @destination = arguments.fetch(:destination)
+        registers = { _source: { oxm_class: source_oxm_class,
+                                 oxm_field: source_oxm_field,
+                                 oxm_length: source_oxm_length },
+                      _destination: { oxm_class: destination_oxm_class,
+                                      oxm_field: destination_oxm_field,
+                                      oxm_length: destination_oxm_length } }
+        options = [:n_bits,
+                   :source_offset,
+                   :destination_offset].each_with_object({}) do |each, opts|
+          opts[each] = arguments[each] if arguments[each]
+        end
+        super registers.merge(options)
+      end
+      # rubocop:enable MethodLength
+
+      attr_reader :source
+      attr_reader :destination
+
+      private
+
+      def source_oxm_class
+        source_class.const_get(:OXM_CLASS)
+      end
+
+      def source_oxm_field
+        source_class.const_get(:OXM_FIELD)
+      end
+
+      def source_oxm_length
+        source_class.new.length
+      end
+
+      def source_class
+        Match.const_get(@source.to_s.split('_').map(&:capitalize).join)
+      end
+
+      def destination_oxm_class
+        destination_class.const_get(:OXM_CLASS)
+      end
+
+      def destination_oxm_field
+        destination_class.const_get(:OXM_FIELD)
+      end
+
+      def destination_oxm_length
+        destination_class.new.length
+      end
+
+      def destination_class
+        Match.const_get(@destination.to_s.split('_').map(&:capitalize).join)
+      end
     end
   end
 end

data/lib/pio/open_flow13/nicira_send_out_port.rb

@@ -1,37 +1,53 @@
-require 'pio/open_flow/action'
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow13/match'
+require 'pio/open_flow13/send_out_port'
 
 module Pio
   module OpenFlow13
     # NXAST_OUTPUT_REG action
-    class NiciraSendOutPort < OpenFlow::Action
-      action_header action_type: 0xffff, action_length: 24
-      uint32 :experimenter_id, value: 0x2320
-      uint16 :experimenter_type, value: 15
-      bit10 :offset_internal, value: 0
-      bit6 :n_bits_internal
-      uint32 :source_internal
-      uint16 :max_length, value: 0
+    class NiciraSendOutPort < OpenFlow::NiciraAction
+      nicira_action_header action_type: 0xffff,
+                           action_length: 24,
+                           subtype: 15
+      bit10 :_offset
+      bit6 :_n_bits
+      struct :_source do
+        uint16 :oxm_class
+        bit7 :oxm_field
+        bit1 :oxm_hasmask, value: 0
+        bit8 :oxm_length
+      end
+      uint16 :max_length
       string :zero, length: 6
 
-      attr_reader :source
-
-      # rubocop:disable AbcSize
-      # rubocop:disable LineLength
-      def initialize(source)
+      def initialize(source, options = {})
         @source = source
-        oxm_klass = Match.const_get(source.to_s.split('_').map(&:capitalize).join)
-        super(n_bits_internal: oxm_klass.new.length * 8 - 1,
-              source_internal: ((oxm_klass.superclass.const_get(:OXM_CLASS) << 16) | (oxm_klass.const_get(:OXM_FIELD) << 9) | oxm_klass.new.length))
+        super(_n_bits: (options[:n_bits] || oxm_length * 8) - 1,
+              _offset: options[:offset] || 0,
+              _source: { oxm_class: source_oxm_class.const_get(:OXM_CLASS),
+                         oxm_field: source_oxm_class.const_get(:OXM_FIELD),
+                         oxm_length: oxm_length },
+              max_length: options[:max_length] || SendOutPort::NO_BUFFER)
       end
-      # rubocop:enable AbcSize
-      # rubocop:enable LineLength
+
+      attr_reader :source
 
       def offset
-        offset_internal
+        _offset
       end
 
       def n_bits
-        n_bits_internal + 1
+        _n_bits + 1
+      end
+
+      private
+
+      def oxm_length
+        source_oxm_class.new.length
+      end
+
+      def source_oxm_class
+        Match.const_get(@source.to_s.split('_').map(&:capitalize).join)
       end
     end
   end

data/lib/pio/open_flow13/nicira_stack_pop.rb

@@ -0,0 +1,49 @@
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow13/match'
+
+module Pio
+  module OpenFlow13
+    # NXAST_STACK_POP action
+    class NiciraStackPop < OpenFlow::NiciraAction
+      nicira_action_header action_type: 0xffff,
+                           action_length: 24,
+                           subtype: 28
+      uint16 :_offset
+      struct :field do
+        uint16 :oxm_class
+        bit7 :oxm_field
+        bit1 :oxm_hasmask, value: 0
+        uint8 :oxm_length
+      end
+      uint16 :_n_bits
+      string :padding, length: 6
+      hide :padding
+
+      def initialize(field, options = {})
+        @field = field
+        super(_offset: options[:offset] || 0,
+              _n_bits: (options[:n_bits] || oxm_length * 8) + 1,
+              field: { oxm_class: field_oxm_class.const_get(:OXM_CLASS),
+                       oxm_field: field_oxm_class.const_get(:OXM_FIELD),
+                       oxm_length: oxm_length })
+      end
+
+      attr_reader :field
+      alias offset _offset
+
+      def n_bits
+        _n_bits - 1
+      end
+
+      private
+
+      def oxm_length
+        field_oxm_class.new.length
+      end
+
+      def field_oxm_class
+        Match.const_get(@field.to_s.split('_').map(&:capitalize).join)
+      end
+    end
+  end
+end

data/lib/pio/open_flow13/nicira_stack_push.rb

@@ -0,0 +1,49 @@
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow13/match'
+
+module Pio
+  module OpenFlow13
+    # NXAST_STACK_PUSH action
+    class NiciraStackPush < OpenFlow::NiciraAction
+      nicira_action_header action_type: 0xffff,
+                           action_length: 24,
+                           subtype: 27
+      uint16 :_offset
+      struct :field do
+        uint16 :oxm_class
+        bit7 :oxm_field
+        bit1 :oxm_hasmask, value: 0
+        uint8 :oxm_length
+      end
+      uint16 :_n_bits
+      string :padding, length: 6
+      hide :padding
+
+      def initialize(field, options = {})
+        @field = field
+        super(_offset: options[:offset] || 0,
+              _n_bits: (options[:n_bits] || oxm_length * 8) + 1,
+              field: { oxm_class: field_oxm_class.const_get(:OXM_CLASS),
+                       oxm_field: field_oxm_class.const_get(:OXM_FIELD),
+                       oxm_length: oxm_length })
+      end
+
+      attr_reader :field
+      alias offset _offset
+
+      def n_bits
+        _n_bits - 1
+      end
+
+      private
+
+      def oxm_length
+        field_oxm_class.new.length
+      end
+
+      def field_oxm_class
+        Match.const_get(@field.to_s.split('_').map(&:capitalize).join)
+      end
+    end
+  end
+end

data/lib/pio/open_flow13/packet_in.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/try'
 require 'pio/open_flow'
 require 'pio/open_flow13/match'
 require 'pio/parser'
@@ -8,8 +9,9 @@ module Pio
     class PacketIn < OpenFlow::Message
       # Why is this packet being sent to the controller?
       # (enum ofp_packet_in_reason)
+      # rubocop:disable LineLength
       class Reason < BinData::Primitive
-        REASONS = { no_match: 0, action: 1, invalid_ttl: 2 }
+        REASONS = { no_match: 0, action: 1, invalid_ttl: 2 }.freeze
 
         uint8 :reason
 
@@ -22,9 +24,8 @@ module Pio
         end
       end
 
-      open_flow_header(version: 4,
-                       message_type: 10,
-                       message_length: lambda do
+      open_flow_header(version: 4, type: 10,
+                       length: lambda do
                          24 + match.length + padding.length + raw_data.length
                        end)
       uint32 :buffer_id
@@ -35,11 +36,11 @@ module Pio
       oxm :match
       string :padding, length: 2
       hide :padding
-      string :raw_data, read_length: :total_len
+      string :raw_data, read_length: -> { length - header_length - (16 + match.length + 2) }
 
       attr_accessor :datapath_id
-      alias_method :dpid, :datapath_id
-      alias_method :dpid=, :datapath_id=
+      alias dpid datapath_id
+      alias dpid= datapath_id=
 
       def data
         @data ||= Pio::Parser.read(raw_data)
@@ -50,8 +51,10 @@ module Pio
       end
 
       def method_missing(method, *args)
-        data.__send__(method, *args).snapshot
+        bindata_value = data.__send__(method, *args)
+        bindata_value.try(:snapshot) || bindata_value
       end
+      # rubocop:enable LineLength
     end
   end
 end