Adjust the app to separation between dobby server and dobby client

The dobby repository have been splitted into dobby and dobby_clib.

Author: Szymon Mentel

rebar.config

@@ -3,10 +3,11 @@
 {deps,
  [{lager, "2.1.1", {git, "https://github.com/basho/lager", {tag, "2.1.1"}}},
   {meck, "0.8.2", {git, "https://github.com/eproxus/meck.git", {tag, "0.8.2"}}},
+  {ct_tty_hook, ".*", {git, "https://github.com/mpmiszczyk/ct_tty_hook.git", {branch, master}}},
+  {recon, ".*", {git, "https://github.com/ferd/recon.git", {branch, "master"}}},
   %% TODO: Change to https when opensourcing
   {dobby, ".*", {git, "git@github.com:shivarammysore/dobby.git", {branch, master}}},
-  {ct_tty_hook, ".*", {git, "https://github.com/mpmiszczyk/ct_tty_hook.git", {branch, master}}},
-  {recon, ".*", {git, "https://github.com/ferd/recon.git", {branch, "master"}}}]
+  {dobby_clib, ".*", {git, "git@github.com:shivarammysore/dobby_clib.git", {branch, master}}}]
 }.
 
 {cover_enabled, true}.

src/dobby_oflib.app.src

@@ -6,6 +6,7 @@
   {applications, [
                   kernel,
                   stdlib,
+                  dobby_clib,
                   lager
                  ]},
   {env, []}

src/dobby_oflib.erl

@@ -11,7 +11,7 @@
 -export([get_path/2,
          publish_new_flow/3]).
 
--include_lib("dobby/include/dobby.hrl").
+-include_lib("dobby_clib/include/dobby.hrl").
 
 %% -define(MYMAC, "MY").
 
@@ -58,6 +58,8 @@ get_path(SrcEndpoint, DstEndpoint) ->
 publish_new_flow(SrcEndpoint, DstEndpoint, OpenFlowPath) ->
     NfId = publish_net_flow_identifer(SrcEndpoint, DstEndpoint),
     publish_openflow_path(NfId, OpenFlowPath),
+    lager:info("Published NetFlow: ~p between endpoints src: ~p dst: ~p ~n",
+               [NfId, SrcEndpoint, DstEndpoint]),
     NfId.
 
 %%%=============================================================================
@@ -67,8 +69,8 @@ publish_new_flow(SrcEndpoint, DstEndpoint, OpenFlowPath) ->
 publish_net_flow_identifer(Src, Dst) ->
     %% TODO: In transaction
     NfId = net_flow_identifier(Src, Dst),
-    dby:publish(Src, NfId, link_metadata(ep_to_nf, Src), [persistent]),
-    dby:publish(NfId, Dst, link_metadata(ep_to_nf, NfId), [persistent]),
+    publish(Src, NfId, link_metadata(ep_to_nf, Src)),
+    publish(NfId, Dst, link_metadata(ep_to_nf, NfId)),
     NfId.
 
 publish_openflow_path(NetFlowId, OpenFlowPath0) ->
@@ -77,18 +79,18 @@ publish_openflow_path(NetFlowId, OpenFlowPath0) ->
 
 publish_openflow_path(NetFlowId, [ExtendedFlowMod | T], LastId)
   when LastId =:= NetFlowId ->
-    Identifier = {Id, _Md} = flow_mod_identifier(ExtendedFlowMod),
-    LinkMd = link_metadata(of_path_starts_at, {NetFlowId, NetFlowId}),
-    dby:publish(NetFlowId, Identifier, LinkMd, [persistent]),
+    publish(NetFlowId,
+            {Id, _Md} = flow_mod_identifier(ExtendedFlowMod),
+            link_metadata(of_path_starts_at, {NetFlowId, NetFlowId})),
     publish_openflow_path(NetFlowId, T, Id);
 publish_openflow_path(NetFlowId, [ExtendedFlowMod | T], LastId) ->
-    Identifier = {Id, _Md} = flow_mod_identifier(ExtendedFlowMod),
-    LinkMd = link_metadata(of_path_forwards_to, {NetFlowId, LastId}),
-    dby:publish(LastId, Identifier, LinkMd, [persistent]),
+    publish(LastId,
+            {Id, _Md} = flow_mod_identifier(ExtendedFlowMod),
+            link_metadata(of_path_forwards_to, {NetFlowId, LastId})),
     publish_openflow_path(NetFlowId, T, Id);
 publish_openflow_path(NetFlowId, [], LastId) ->
-    LinkMd = link_metadata(of_path_ends_at, {NetFlowId, LastId}),
-    dby:publish(LastId, NetFlowId, LinkMd, [persistent]).
+    publish(LastId, NetFlowId,
+            link_metadata(of_path_ends_at, {NetFlowId, LastId})).
 
 net_flow_identifier(Src, Dst) ->
     <<"NF:", Src/binary, ":", Dst/binary>>.
@@ -106,6 +108,9 @@ link_metadata(Type, {NetFlowId, Src})
        Type =:= of_path_forwards_to ->
     #{type => Type, src => Src, net_flow_ids => [NetFlowId]}.
 
+publish(Src, Dst, LinkMetadata) ->
+    dby:publish(Src, Dst, LinkMetadata, [persistent]).
+
 flatten_openflow_path(FlowPath0) ->
     Fun = fun({Dpid, {OFVersion, FlowMods}}) ->
                   [{Dpid, OFVersion, FlowMod} || FlowMod <- FlowMods]

test/dobby_oflib_SUITE.erl

@@ -89,10 +89,8 @@ assert_flow_path_published(NetFlowId, [], LastId) ->
 %%%=============================================================================
 
 mock_dobby() ->
-    ok = meck:expect(dby, publish,
-                     fun(SrcEp, DstEp) ->
-                             <<"NFL:", SrcEp/binary, ":", DstEp/binary>>
-                     end).
+    ok = meck:expect(dby, publish, 4, _Ret = ok).
+
 unmock_dobby() ->
     ok = meck:unload(dby).