Rename dobby_ofclient to dobby_oflib

Szymon Mentel · Szymon Mentel · commit a6931e22912a · 2015-02-19T10:43:04.000+01:00
diff --git a/.edts b/.edts
@@ -1,3 +1,3 @@
-:name "dobby_ofclient"
-:node-sname "dobby_ofclient_edts"
+:name "dobby_oflib"
+:node-sname "dobby_oflib_edts"
 :lib-dirs '("deps" "test")
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 APPS = kernel stdlib sasl erts ssl tools runtime_tools crypto inets \
 	public_key mnesia syntax_tools compiler
-COMBO_PLT = $(HOME)/.dobby_ofc_combo_dialyzer_plt
+COMBO_PLT = $(HOME)/.dobby_oflib_combo_dialyzer_plt
 
 .PHONY: all compile deps test clean distclean ct
 
@@ -41,7 +41,7 @@ dialyzer: compile
 
 dev: compile
 	erl -pa ebin -pa deps/*/ebin \
-	-eval "[application:start(A) || A <- [compiler, syntax_tools, goldrush, lager, dobby_ofclient]]"
+	-eval "application:ensure_all_started(dobby_oflib)."
 
 compile test clean: rebar
 
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
-# dobby_client
-MAP Client
+# dobby_oflib
+MAP library for OpenFlow
diff --git a/rebar.config b/rebar.config
@@ -1,8 +1,9 @@
 {sub_dirs, ["deps"]}.
 
 {deps,
- [{lager, "2.1.1", {git, "git://github.com/basho/lager", {tag, "2.1.1"}}}
- ]}.
+ [{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"}}}]
+}.
 
 {cover_enabled, true}.
 {erl_opts, [{parse_transform, lager_transform}, debug_info]}.
diff --git a/src/dobby_oflib.app.src b/src/dobby_oflib.app.src
@@ -1,13 +1,12 @@
-{application, dobby_ofclient,
+{application, dobby_oflib,
  [
-  {description, "Dobby Client for OpenFlow"},
+  {description, "Dobby Library for OpenFlow"},
   {vsn, "0.1"},
   {registered, []},
   {applications, [
                   kernel,
                   stdlib,
                   lager
                  ]},
-  {mod, { dof_app, []}},
   {env, []}
  ]}.
diff --git a/src/dobby_oflib.erl b/src/dobby_oflib.erl
@@ -4,11 +4,12 @@
 %%% @doc <Module purpose>
 %%% @end
 %%%=============================================================================
--module(dobby_ofclient).
+-module(dobby_oflib).
 -copyright("2015, Erlang Solutions Ltd.").
 
 %% API
--export([get_path/2]).
+-export([get_path/2,
+         publish_new_flow/3]).
 
 %% Application callbacks
 -export([]).
@@ -38,6 +39,15 @@
 get_path(SrcEndPoint, DstEndpoint) ->
     {ok, digraph:new()}.
 
+-spec publish_new_flow(Src :: binary(), Dst :: binary(), FlowPath) ->
+                              {ok, NetFlowId :: binary()} | {error, Reason :: term()}
+                                        when
+      FlowPath :: #{DatapathId :: binary() => FlowMods :: list(FlowMod)},
+      FlowMod :: {Matches :: [term()], Instructions :: [term()], Opts :: [term()]}.
+
+publish_new_flow(SrcEndpoint, DstEndpoint, FlowPath) ->
+    ok.
+
 %%%=============================================================================
 %%% Internal functions
 %%%=============================================================================
diff --git a/src/dof_app.erl b/src/dof_app.erl
diff --git a/src/dof_sup.erl b/src/dof_sup.erl
diff --git a/test/dobby_ofclient.test.cfg b/test/dobby_ofclient.test.cfg
diff --git a/test/dobby_ofclient_tests.erl b/test/dobby_ofclient_tests.erl
diff --git a/test/dobby_oflib.test.cfg b/test/dobby_oflib.test.cfg
@@ -0,0 +1,2 @@
+{config, [dobby_oflib.cfg]}.
+{suites, ".", [dobby_oflib_SUITE]}.
diff --git a/test/dobby_oflib_SUITE.erl b/test/dobby_oflib_SUITE.erl
@@ -4,7 +4,7 @@
 %%% @doc <Suite purpose>
 %%% @end
 %%%=============================================================================
--module(dobby_ofclient_SUITE).
+-module(dobby_oflib_SUITE).
 -copyright("2015, Erlang Solutions Ltd.").
 
 %% Note: This directive should only be used in test suites.
@@ -41,12 +41,28 @@ groups() ->
   [].
 
 all() ->
-  [my_test_case].
+  [should_publish_net_flow].
 
 %%%=============================================================================
-%%%   Testcases
+%%% Testcases
 %%%=============================================================================
 
-my_test_case(_Config) ->
-    ok.
+should_publish_net_flow(_Config) ->
+    %% GIVEN
+    FlowPath =
+        [{"00:00:00:00:0p0:01:00:01",
+          [{[{in_port,1}],[{apply_actions,[{output,2,no_buffer}]}],[]},
+           {[{in_port,2}], [{apply_actions,[{output,1,no_buffer}]}], []}]
+         },
+         {"00:00:00:00:00:01:00:02",
+          [{[{in_port,2}],[{apply_actions,[{output,1,no_buffer}]}],[]},
+           {[{in_port,1}],[{apply_actions,[{output,2,no_buffer}]}],[]}]
+         }],
+    SrcEP = <<"Src">>,
+    DstEP = <<"Dst">>,
 
+    %% WHEN
+    NetFlowId = dobby_ofclient:publish_new_flow(SrcEP, DstEP, FlowPath),
+
+    %% THEN
+    meck:called(dby, publish, [SrcEP, DstEP, ])
diff --git a/test/dofl_test_utils.erl b/test/dofl_test_utils.erl
@@ -4,7 +4,7 @@
 %%% @doc Test utilies
 %%% @end
 %%%=============================================================================
--module(dof_test_utils).
+-module(dofl_test_utils).
 -copyright("2015, Erlang Solutions Ltd.").
 
 %% API
