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

Fix bug in add_br

Browse source
This commit is contained in:
Eishun Kondoh 2018-08-16 16:34:34 +09:00
parent d555cd8e09
commit 135bf9cafb
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
bin/enum_gen
View file

Binary file not shown.

12
lib/ovsdb/open_vswitch.ex
View file

@ -194,7 +194,7 @@ defmodule OVSDB.OpenvSwitch do
def handle_call({:add_br, options}, _from, state) do def handle_call({:add_br, options}, _from, state) do
%State{client_pid: pid, ovs_uuid: ovs} = state %State{client_pid: pid, ovs_uuid: ovs} = state
br_iface = %{name: options[:bridge], type: :internal} br_iface = %{name: options[:bridge], type: :internal}
br_port = %{name: options[:bridge], interfaces: ["named-uuid", "brinterface"]} br_port = %{name: options[:bridge], interfaces: ["named-uuid", "interface"]}
other_config = [ other_config = [
["datapath-id", options[:datapath_id]], ["datapath-id", options[:datapath_id]],
@ -205,22 +205,22 @@ defmodule OVSDB.OpenvSwitch do
new_bridge = %{ new_bridge = %{
name: options[:bridge], name: options[:bridge],
ports: ["named-uuid", "brport"], ports: ["named-uuid", "port"],
fail_mode: options[:fail_mode], fail_mode: options[:fail_mode],
other_config: make_ovsdb_map(other_config) other_config: make_ovsdb_map(other_config)
} }
named_uuid = ["named-uuid", "bridge"] named_uuid = ["named-uuid", "bridge"]
new_bridges = %{bridges: add_elem_to_set(options[:br_uuids], named_uuid)}
new_bridges = add_elem_to_set(options[:br_uuids], named_uuid)
next_config = [{"next_cfg", "+=", 1}] next_config = [{"next_cfg", "+=", 1}]
eq_ovs_uuid = [{"_uuid", "==", ovs}] eq_ovs_uuid = [{"_uuid", "==", ovs}]
replies = replies =
xact( xact(
[ [
:eovsdb_op.insert(@interface, br_iface, "brinterface"), :eovsdb_op.insert(@interface, br_iface, "interface"),
:eovsdb_op.insert(@port, br_port, "brport"), :eovsdb_op.insert(@port, br_port, "port"),
:eovsdb_op.insert(@bridge, new_bridge, "bridge"), :eovsdb_op.insert(@bridge, new_bridge, "bridge"),
:eovsdb_op.update(@open_vswitch, eq_ovs_uuid, new_bridges), :eovsdb_op.update(@open_vswitch, eq_ovs_uuid, new_bridges),
:eovsdb_op.mutate(@open_vswitch, eq_ovs_uuid, next_config) :eovsdb_op.mutate(@open_vswitch, eq_ovs_uuid, next_config)
@ -394,7 +394,7 @@ defmodule OVSDB.OpenvSwitch do
defp make_ovsdb_set(value), do: value defp make_ovsdb_set(value), do: value
defp add_elem_to_set(["set", []], value), do: value defp add_elem_to_set(["set", []], value), do: value
defp add_elem_to_set(["set", values], value), do: ["set", values ++ value] defp add_elem_to_set(["set", values], value), do: ["set", values ++ [value]]
defp add_elem_to_set(["uuid", _] = uuid, value), do: ["set", [uuid] ++ [value]] defp add_elem_to_set(["uuid", _] = uuid, value), do: ["set", [uuid] ++ [value]]
defp del_elem_from_set(["set", values], value), do: ["set", values -- [value]] defp del_elem_from_set(["set", values], value), do: ["set", values -- [value]]