Refactored nicira extended actions

lib/openflow/actions/nx_reg_load.ex

@@ -12,28 +12,37 @@ defmodule Openflow.Action.NxRegLoad do
   @nxast 7
 
   alias __MODULE__
+  alias Openflow.Action.Experimenter
 
-  def new(options) do
-    dst_field = Keyword.get(options, :dst_field)
+  def new(options \\ []) do
+    dst_field = options[:dst_field] || raise "dst_field must be specified"
+    value = options[:value] || raise "value must be specified"
     default_n_bits = Openflow.Match.Field.n_bits_of(dst_field)
-    n_bits = Keyword.get(options, :n_bits, default_n_bits)
-    ofs = Keyword.get(options, :offset, 0)
-    value = Keyword.get(options, :value)
-    %NxRegLoad{n_bits: n_bits, offset: ofs, dst_field: dst_field, value: value}
+
+    %NxRegLoad{
+      n_bits: options[:n_bits] || default_n_bits,
+      offset: options[:offset] || 0,
+      dst_field: dst_field,
+      value: value
+    }
   end
 
-  def to_binary(%NxRegLoad{n_bits: n_bits, offset: ofs, dst_field: dst_field, value: value}) do
-    dst_field_bin = Openflow.Match.codec_header(dst_field)
-    value_bin0 = Openflow.Match.Field.codec(value, dst_field)
-    tmp_value = :binary.decode_unsigned(value_bin0, :big)
-    value_bin = <<tmp_value::64>>
-    ofs_nbits = ofs <<< 6 ||| n_bits - 1
-    body = <<ofs_nbits::16, dst_field_bin::4-bytes, value_bin::bytes>>
-    exp_body = <<@experimenter::32, @nxast::16, body::bytes>>
-    exp_body_size = byte_size(exp_body)
-    padding_length = Openflow.Utils.padding(4 + exp_body_size, 8)
-    length = 4 + exp_body_size + padding_length
-    <<0xFFFF::16, length::16, exp_body::bytes, 0::size(padding_length)-unit(8)>>
+  def to_binary(%NxRegLoad{} = load) do
+    ofs_nbits = load.offset <<< 6 ||| load.n_bits - 1
+    dst_field_bin = Openflow.Match.codec_header(load.dst_field)
+
+    value_int =
+      load.value
+      |> Openflow.Match.Field.codec(load.dst_field)
+      |> :binary.decode_unsigned(:big)
+
+    Experimenter.pack_exp_header(<<
+      @experimenter::32,
+      @nxast::16,
+      ofs_nbits::16,
+      dst_field_bin::4-bytes,
+      value_int::size(8)-unit(8)
+    >>)
   end
 
   def read(<<@experimenter::32, @nxast::16, body::bytes>>) do