mirrors/tres
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

quality: Add test cases for port_desc and port_stats messages

Browse source
This commit is contained in:
Eishun Kondoh 2019-05-05 23:37:20 +09:00
parent 2e3f772b1f
commit 599f1947db
8 changed files with 153 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/openflow/enums.ex
View file

@ -325,10 +325,10 @@ defmodule Openflow.Enums do
_class, _reason -> Openflow.Multipart.Table.Request
end
def to_int(Openflow.Multipart.PortStats.Request, :multipart_request_codec) do
multipart_request_codec_to_int(Openflow.Multipart.PortStats.Request)
def to_int(Openflow.Multipart.Port.Request, :multipart_request_codec) do
multipart_request_codec_to_int(Openflow.Multipart.Port.Request)
catch
_class, _reason -> Openflow.Multipart.PortStats.Request
_class, _reason -> Openflow.Multipart.Port.Request
end
def to_int(Openflow.Multipart.Queue.Request, :multipart_request_codec) do
@ -419,10 +419,10 @@ defmodule Openflow.Enums do
_class, _reason -> Openflow.Multipart.Table.Reply
end
def to_int(Openflow.Multipart.PortStats.Reply, :multipart_reply_codec) do
multipart_reply_codec_to_int(Openflow.Multipart.PortStats.Reply)
def to_int(Openflow.Multipart.Port.Reply, :multipart_reply_codec) do
multipart_reply_codec_to_int(Openflow.Multipart.Port.Reply)
catch
_class, _reason -> Openflow.Multipart.PortStats.Reply
_class, _reason -> Openflow.Multipart.Port.Reply
end
def to_int(Openflow.Multipart.Queue.Reply, :multipart_reply_codec) do
@ -10941,7 +10941,7 @@ defmodule Openflow.Enums do
def multipart_request_codec_to_int(Openflow.Multipart.Flow.Request), do: 0x1
def multipart_request_codec_to_int(Openflow.Multipart.Aggregate.Request), do: 0x2
def multipart_request_codec_to_int(Openflow.Multipart.Table.Request), do: 0x3
def multipart_request_codec_to_int(Openflow.Multipart.PortStats.Request), do: 0x4
def multipart_request_codec_to_int(Openflow.Multipart.Port.Request), do: 0x4
def multipart_request_codec_to_int(Openflow.Multipart.Queue.Request), do: 0x5
def multipart_request_codec_to_int(Openflow.Multipart.Group.Request), do: 0x6
def multipart_request_codec_to_int(Openflow.Multipart.GroupDesc.Request), do: 0x7
@ -10957,7 +10957,7 @@ defmodule Openflow.Enums do
def multipart_request_codec_to_atom(0x1), do: Openflow.Multipart.Flow.Request
def multipart_request_codec_to_atom(0x2), do: Openflow.Multipart.Aggregate.Request
def multipart_request_codec_to_atom(0x3), do: Openflow.Multipart.Table.Request
def multipart_request_codec_to_atom(0x4), do: Openflow.Multipart.PortStats.Request
def multipart_request_codec_to_atom(0x4), do: Openflow.Multipart.Port.Request
def multipart_request_codec_to_atom(0x5), do: Openflow.Multipart.Queue.Request
def multipart_request_codec_to_atom(0x6), do: Openflow.Multipart.Group.Request
def multipart_request_codec_to_atom(0x7), do: Openflow.Multipart.GroupDesc.Request
@ -10973,7 +10973,7 @@ defmodule Openflow.Enums do
def multipart_reply_codec_to_int(Openflow.Multipart.Flow.Reply), do: 0x1
def multipart_reply_codec_to_int(Openflow.Multipart.Aggregate.Reply), do: 0x2
def multipart_reply_codec_to_int(Openflow.Multipart.Table.Reply), do: 0x3
def multipart_reply_codec_to_int(Openflow.Multipart.PortStats.Reply), do: 0x4
def multipart_reply_codec_to_int(Openflow.Multipart.Port.Reply), do: 0x4
def multipart_reply_codec_to_int(Openflow.Multipart.Queue.Reply), do: 0x5
def multipart_reply_codec_to_int(Openflow.Multipart.Group.Reply), do: 0x6
def multipart_reply_codec_to_int(Openflow.Multipart.GroupDesc.Reply), do: 0x7
@ -10989,7 +10989,7 @@ defmodule Openflow.Enums do
def multipart_reply_codec_to_atom(0x1), do: Openflow.Multipart.Flow.Reply
def multipart_reply_codec_to_atom(0x2), do: Openflow.Multipart.Aggregate.Reply
def multipart_reply_codec_to_atom(0x3), do: Openflow.Multipart.Table.Reply
def multipart_reply_codec_to_atom(0x4), do: Openflow.Multipart.PortStats.Reply
def multipart_reply_codec_to_atom(0x4), do: Openflow.Multipart.Port.Reply
def multipart_reply_codec_to_atom(0x5), do: Openflow.Multipart.Queue.Reply
def multipart_reply_codec_to_atom(0x6), do: Openflow.Multipart.Group.Reply
def multipart_reply_codec_to_atom(0x7), do: Openflow.Multipart.GroupDesc.Reply
@ -13542,7 +13542,7 @@ defmodule Openflow.Enums do
{Openflow.Multipart.Flow.Request, 1},
{Openflow.Multipart.Aggregate.Request, 2},
{Openflow.Multipart.Table.Request, 3},
{Openflow.Multipart.PortStats.Request, 4},
{Openflow.Multipart.Port.Request, 4},
{Openflow.Multipart.Queue.Request, 5},
{Openflow.Multipart.Group.Request, 6},
{Openflow.Multipart.GroupDesc.Request, 7},
@ -13561,7 +13561,7 @@ defmodule Openflow.Enums do
{Openflow.Multipart.Flow.Reply, 1},
{Openflow.Multipart.Aggregate.Reply, 2},
{Openflow.Multipart.Table.Reply, 3},
{Openflow.Multipart.PortStats.Reply, 4},
{Openflow.Multipart.Port.Reply, 4},
{Openflow.Multipart.Queue.Reply, 5},
{Openflow.Multipart.Group.Reply, 6},
{Openflow.Multipart.GroupDesc.Reply, 7},

4
lib/openflow/multipart/port_desc/reply.ex
View file

@ -13,10 +13,6 @@ defmodule Openflow.Multipart.PortDesc.Reply do
def ofp_type, do: 18
def new(ports \\ []) do
%Reply{ports: ports}
end
def read(<<ports_bin::bytes>>) do
ports = for <<port_bin::64-bytes <- ports_bin>>, do: Openflow.Port.read(port_bin)
%Reply{ports: Enum.reverse(ports)}

6
lib/openflow/multipart/port_stats/reply.ex
View file

@ -1,4 +1,4 @@
defmodule Openflow.Multipart.PortStats.Reply do
defmodule Openflow.Multipart.Port.Reply do
defstruct(
version: 4,
xid: 0,
@ -13,10 +13,6 @@ defmodule Openflow.Multipart.PortStats.Reply do
def ofp_type, do: 18
def new(ports \\ []) do
%Reply{ports: ports}
end
def read(<<ports_bin::bytes>>) do
ports = Openflow.Multipart.PortStats.read(ports_bin)
%Reply{ports: ports}

8
lib/openflow/multipart/port_stats/request.ex
View file

@ -1,4 +1,4 @@
defmodule Openflow.Multipart.PortStats.Request do
defmodule Openflow.Multipart.Port.Request do
defstruct(
version: 4,
xid: 0,
@ -12,11 +12,7 @@ defmodule Openflow.Multipart.PortStats.Request do
def ofp_type, do: 18
def new(port_no) when is_integer(port_no) or is_atom(port_no) do
%Request{port_number: port_no}
end
def new(options) when is_list(options) do
def new(options \\ []) do
%Request{
xid: options[:xid] || 0,
port_number: options[:port_no] || :any