From 1540ddf34cc4fba5f3e091d27e2701f90a8f8747 Mon Sep 17 00:00:00 2001 From: Eishun Kondoh Date: Tue, 7 May 2019 10:03:18 +0900 Subject: [PATCH] example/router: Fix set_field parameter --- .../lib/simple_router/openflow/flow_tables.ex | 10 +++++----- .../lib/simple_router/openflow/group_tables.ex | 2 +- examples/simple_router/mix.lock | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/simple_router/lib/simple_router/openflow/flow_tables.ex b/examples/simple_router/lib/simple_router/openflow/flow_tables.ex index ec216b5..64cf90b 100644 --- a/examples/simple_router/lib/simple_router/openflow/flow_tables.ex +++ b/examples/simple_router/lib/simple_router/openflow/flow_tables.ex @@ -61,7 +61,7 @@ defmodule SimpleRouter.Openflow.FlowTables do ipv4_dst: {route.dst, route.mask} ), instructions: [ - ApplyActions.new(SetField.new({:reg0, IPv4Address.to_int(route.nexthop)})), + ApplyActions.new(SetField.new(reg0: IPv4Address.to_int(route.nexthop))), GotoTable.new(@interface_lookup_table_id) ] ) @@ -103,7 +103,7 @@ defmodule SimpleRouter.Openflow.FlowTables do match: match, instructions: [ ApplyActions.new([ - SetField.new({:reg1, iface.number}), + SetField.new(reg1: iface.number), NxResubmitTable.new(@arp_lookup_table_id), NxResubmitTable.new(@egress_table_id) ]) @@ -174,9 +174,9 @@ defmodule SimpleRouter.Openflow.FlowTables do NxStackPop.new(field: :arp_tpa), NxStackPop.new(field: :arp_tha), NxStackPop.new(field: :arp_spa), - SetField.new({:arp_op, 0x2}), - SetField.new({:arp_sha, mac}), - SetField.new({:eth_src, mac}), + SetField.new(arp_op: 0x2), + SetField.new(arp_sha: mac), + SetField.new(eth_src: mac), Output.new(:in_port) ] end diff --git a/examples/simple_router/lib/simple_router/openflow/group_tables.ex b/examples/simple_router/lib/simple_router/openflow/group_tables.ex index 9cad5b1..cc8dd52 100644 --- a/examples/simple_router/lib/simple_router/openflow/group_tables.ex +++ b/examples/simple_router/lib/simple_router/openflow/group_tables.ex @@ -9,7 +9,7 @@ defmodule SimpleRouter.Openflow.GroupTables do bucket = Openflow.Bucket.new( actions: [ - SetField.new({:eth_src, iface.mac_address}), + SetField.new(eth_src: iface.mac_address), Output.new(iface.number) ] ) diff --git a/examples/simple_router/mix.lock b/examples/simple_router/mix.lock index fcb0cff..64390d9 100644 --- a/examples/simple_router/mix.lock +++ b/examples/simple_router/mix.lock @@ -2,6 +2,6 @@ "eovsdb": {:git, "https://github.com/shun159/eovsdb.git", "1ff1572708d72fd25631c681f2102407903252a3", [branch: "master"]}, "jsone": {:git, "https://github.com/sile/jsone.git", "b23d312a5ed051ea7ad0989a9f2cb1a9c3f9a502", [tag: "1.4.6"]}, "pkt": {:git, "https://github.com/msantos/pkt.git", "ff0e9a7d28cdae941bce935602cd252cad1ea296", []}, - "ranch": {:hex, :ranch, "1.6.2", "6db93c78f411ee033dbb18ba8234c5574883acb9a75af0fb90a9b82ea46afa00", [:rebar3], [], "hexpm"}, + "ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm"}, "uuid": {:git, "https://github.com/avtobiff/erlang-uuid.git", "585c2474afb4a597ae8c8bf6d21e5a9c73f18e0b", [tag: "v0.5.0"]}, }