From 99da0f55e018f4d3cc51ade14e53d612369a1d7a Mon Sep 17 00:00:00 2001 From: Eishun Kondoh Date: Mon, 22 Jul 2019 20:01:23 +0900 Subject: [PATCH] openflow/actions: Add nx_check_pkt_larger this action available since post-2.11 --- lib/openflow/actions/nx_check_pkt_larger.ex | 46 ++++++++++++++++++++ lib/openflow/enums.ex | 15 +++++++ lib/tres/messages.ex | 1 + priv/openflow_enum_gen.exs | 1 + test/lib/openflow/ofp_action_test.exs | 31 +++++++++++++ test/packet_data/nx_check_pkt_larger.raw | Bin 0 -> 32 bytes 6 files changed, 94 insertions(+) create mode 100644 lib/openflow/actions/nx_check_pkt_larger.ex create mode 100644 test/packet_data/nx_check_pkt_larger.raw diff --git a/lib/openflow/actions/nx_check_pkt_larger.ex b/lib/openflow/actions/nx_check_pkt_larger.ex new file mode 100644 index 0000000..ac0ecb6 --- /dev/null +++ b/lib/openflow/actions/nx_check_pkt_larger.ex @@ -0,0 +1,46 @@ +defmodule Openflow.Action.NxCheckPktLarger do + defstruct( + pkt_len: 0, + offset: 0, + dst_field: nil + ) + + @experimenter 0x00002320 + @nxast 49 + + alias __MODULE__ + alias Openflow.Action.Experimenter + + @type t :: %NxCheckPktLarger{dst_field: atom(), pkt_len: 0..0xFFFF, offset: 0..0xFFFF} + + @spec new(dst_field: atom(), pkt_len: 0..0xFFFF, offset: 0..0xFFFF) :: t() + def new(options \\ []) do + dst_field = options[:dst_field] || raise "dst_field must be specified" + pkt_len = options[:pkt_len] || raise "pkt_len must be specified" + ofs = Keyword.get(options, :offset, 0) + %NxCheckPktLarger{dst_field: dst_field, pkt_len: pkt_len, offset: ofs} + end + + @spec to_binary(t()) :: binary() + def to_binary(%NxCheckPktLarger{} = pkt_larger) do + dst_field_bin = Openflow.Match.codec_header(pkt_larger.dst_field) + pkt_len = pkt_larger.pkt_len + ofs = pkt_larger.offset + + Experimenter.pack_exp_header(<< + @experimenter::32, + @nxast::16, + pkt_len::16, + ofs::16, + dst_field_bin::4-bytes, + 0::size(10)-unit(8) + >>) + end + + @spec read(binary()) :: t() + def read(<<@experimenter::32, @nxast::16, body::bytes>>) do + <> = body + dst_field = Openflow.Match.codec_header(dst_field_bin) + %NxCheckPktLarger{dst_field: dst_field, pkt_len: pkt_len, offset: ofs} + end +end diff --git a/lib/openflow/enums.ex b/lib/openflow/enums.ex index 6975a3d..61ff9e5 100644 --- a/lib/openflow/enums.ex +++ b/lib/openflow/enums.ex @@ -4417,6 +4417,12 @@ defmodule Openflow.Enums do _class, _reason -> Openflow.Action.NxDecap end + def to_int(Openflow.Action.NxCheckPktLarger, :nicira_ext_action) do + nicira_ext_action_to_int(Openflow.Action.NxCheckPktLarger) + catch + _class, _reason -> Openflow.Action.NxCheckPktLarger + end + def to_int(Openflow.Action.NxDebugRecirc, :nicira_ext_action) do nicira_ext_action_to_int(Openflow.Action.NxDebugRecirc) catch @@ -9619,6 +9625,12 @@ defmodule Openflow.Enums do _class, _reason -> 47 end + def to_atom(0x31, :nicira_ext_action) do + nicira_ext_action_to_atom(0x31) + catch + _class, _reason -> 49 + end + def to_atom(0xFF, :nicira_ext_action) do nicira_ext_action_to_atom(0xFF) catch @@ -11888,6 +11900,7 @@ defmodule Openflow.Enums do def nicira_ext_action_to_int(Openflow.Action.NxLearn2), do: 0x2D def nicira_ext_action_to_int(Openflow.Action.NxEncap), do: 0x2E def nicira_ext_action_to_int(Openflow.Action.NxDecap), do: 0x2F + def nicira_ext_action_to_int(Openflow.Action.NxCheckPktLarger), do: 0x31 def nicira_ext_action_to_int(Openflow.Action.NxDebugRecirc), do: 0xFF def nicira_ext_action_to_int(_), do: throw(:bad_enum) def nicira_ext_action_to_atom(0x1), do: Openflow.Action.NxResubmit @@ -11927,6 +11940,7 @@ defmodule Openflow.Enums do def nicira_ext_action_to_atom(0x2D), do: Openflow.Action.NxLearn2 def nicira_ext_action_to_atom(0x2E), do: Openflow.Action.NxEncap def nicira_ext_action_to_atom(0x2F), do: Openflow.Action.NxDecap + def nicira_ext_action_to_atom(0x31), do: Openflow.Action.NxCheckPktLarger def nicira_ext_action_to_atom(0xFF), do: Openflow.Action.NxDebugRecirc def nicira_ext_action_to_atom(_), do: throw(:bad_enum) def nx_mp_algorithm_to_int(:modulo_n), do: 0x0 @@ -13742,6 +13756,7 @@ defmodule Openflow.Enums do {Openflow.Action.NxLearn2, 45}, {Openflow.Action.NxEncap, 46}, {Openflow.Action.NxDecap, 47}, + {Openflow.Action.NxCheckPktLarger, 49}, {Openflow.Action.NxDebugRecirc, 255} ] diff --git a/lib/tres/messages.ex b/lib/tres/messages.ex index 04810a2..2705465 100644 --- a/lib/tres/messages.ex +++ b/lib/tres/messages.ex @@ -117,6 +117,7 @@ defmodule Tres.Messages do alias Openflow.Action.NxEncap alias Openflow.Action.NxDecap alias Openflow.Action.NxDebugRecirc + alias Openflow.Action.NxCheckPktLarger alias Openflow.Action.NxFlowSpecMatch alias Openflow.Action.NxFlowSpecLoad diff --git a/priv/openflow_enum_gen.exs b/priv/openflow_enum_gen.exs index ae370b7..f6cdcb9 100644 --- a/priv/openflow_enum_gen.exs +++ b/priv/openflow_enum_gen.exs @@ -861,6 +861,7 @@ enums = [ {Openflow.Action.NxLearn2, 45}, {Openflow.Action.NxEncap, 46}, {Openflow.Action.NxDecap, 47}, + {Openflow.Action.NxCheckPktLarger, 49}, {Openflow.Action.NxDebugRecirc, 0xFF} ], nx_mp_algorithm: [ diff --git a/test/lib/openflow/ofp_action_test.exs b/test/lib/openflow/ofp_action_test.exs index f2c6296..dc24c96 100644 --- a/test/lib/openflow/ofp_action_test.exs +++ b/test/lib/openflow/ofp_action_test.exs @@ -1017,6 +1017,37 @@ defmodule OfpActionTest do end end + describe "Openflow.Action.NxCheckPktLarger" do + test "with options: if the packet larger than 100 bytes, set mark to reg1" do + test_file = "test/packet_data/nx_check_pkt_larger.raw" + packet = File.read!(test_file) + actions = Openflow.Action.read(packet) + + check_pkt_larger = + Openflow.Action.NxCheckPktLarger.new( + dst_field: :reg1, + offset: 0, + pkt_len: 100 + ) + + actions_bin = Openflow.Action.to_binary(check_pkt_larger) + assert actions_bin == packet + assert actions == [check_pkt_larger] + end + + test "with no dst_field option" do + assert_raise RuntimeError, "dst_field must be specified", fn -> + Openflow.Action.NxCheckPktLarger.new(pkt_len: 100) + end + end + + test "with no pkt_len option" do + assert_raise RuntimeError, "pkt_len must be specified", fn -> + Openflow.Action.NxCheckPktLarger.new(dst_field: :reg1) + end + end + end + describe "Openflow.Action.NxRegMove" do test "with options: move in_port value to vlan_tci field" do test_file = "test/packet_data/nx_reg_move.raw" diff --git a/test/packet_data/nx_check_pkt_larger.raw b/test/packet_data/nx_check_pkt_larger.raw new file mode 100644 index 0000000000000000000000000000000000000000..adeeeeed74ca71f07ed41d3527e962c31145f4d0 GIT binary patch literal 32 ccmezWpFx3vL0N&pkRgSEfq{{Ug#iTs09H2w{r~^~ literal 0 HcmV?d00001