Reimplemented add-config-data-members, which was lost.

Feuerlabs · Aug 16, 2012 · 4d03ecc · 4d03ecc
1 parent 77b063d
commit 4d03ecc
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/json_rpc_example/add-config-data-members.jr b/json_rpc_example/add-config-data-members.jr
@@ -4,7 +4,7 @@
     "id": "1",
     "params":
     {
-        "config-data": ["test12", "test11"],
-        "dev-id": [ "1234", "1235" ]
+        "config-data": ["test11"],
+        "dev-id": [ "1235" ]
     }
 }
diff --git a/json_rpc_example/add-dilo-yang.jr b/json_rpc_example/add-dilo-yang.jr
@@ -0,0 +1,10 @@
+{
+    "jsonrpc": "2.0",
+    "method": "exodm:create-yang-module",
+    "id": "1",
+    "params": { 
+        "repository": "user",  
+        "name": "dilo", 
+        "yang-module": "module dilo_tst { description: \"test\", prefix dilo_tst;  notification swipe { leaf device_id { type string; } leaf data { type string; } } }"
+    }
+}
diff --git a/lib/exodm_rpc/src/exodm_rpc_exodm.erl b/lib/exodm_rpc/src/exodm_rpc_exodm.erl
@@ -75,28 +75,64 @@ json_rpc_({request, _ReqEnv,
 	     {name, N},
 	     {'yang-module', Y}]}} = _RPC, _Env) when R =:= ?USER_REPOSITORY->
     ?debug("~p:json_rpc(create-yang-module) repository:~p name:~p~n", [ ?MODULE, R, N ]),
-    _Res = exodm_db_yang:write(N, Y),
-    {ok, result_code(ok)};
+    Res = exodm_db_yang:write(N, Y),
+    io:format("YANG_RES: ~p\n", [ Res]),
+    case Res of
+        ok ->
+            {ok, result_code(ok)};
+
+        {error, {Line, Fmt, Arg } } ->
+            ?info("~p:json_rpc(create-yang-module): Error: Line: ~p: ~p\n",
+                 [?MODULE, Line, io_lib:fwrite(Fmt, Arg) ]),
+            {ok, result_code('validation-failed')};
+
+        Err ->
+            ?info("~p:json_rpc(create-yang-module): Error: ~p\n",
+                 [?MODULE, Err ]),
+            {ok, result_code('validation-failed')}
+    end;
 
 
 json_rpc_({request, _ReqEnv,
 	   {call, exodm, 'provision-device',
 	    [{'dev-id', I},
              {'server-key', SK},
              {'device-key', DK}]}} = _RPC, _Env) ->
-    ?debug("~p:json_rpc(provision-device) device-id:~p server-key:~p device-key:~p~n",
+    ?debug("~p:json_rpc(provision-device) dev-id:~p server-key:~p device-key:~p~n",
            [ ?MODULE, I, SK, DK ]),
 
     exodm_db_device:new(exodm_db_session:get_aid(), I, [{'__ck', <<DK:64/little>>},
                                                         {'__sk', <<SK:64/little>>}]),
     {ok, result_code(ok)};
 
 
+
+
+json_rpc_({request, _ReqEnv,
+	   {call, exodm, 'add-config-data-members',
+	    [{'config-data', {array, CfgDataList}},
+             {'dev-id', {array, DevIdList}}]}} = _RPC, _Env) ->
+    ?debug("~p:json_rpc(add-config-data-members) dev-id:~p config-data:~p~n",
+           [ ?MODULE, CfgDataList, DevIdList ]),
+    AID = exodm_db_session:get_aid(),
+
+    try [ fun(CfgData) ->
+                  exodm_db_config:add_config_data_members(AID, CfgData, DevIdList)
+          end
+          || CfgData <- CfgDataList] of
+        _Res -> {ok, result_code(ok)}
+    catch error:E ->
+	    ?debug("RPC = ~p; ERROR = ~p~n",
+		   [_RPC, {E, erlang:get_stacktrace()}]),
+	    {error, E}
+    end;
+
 json_rpc_({request, _ReqEnv,
 	   {call, exodm, 'push-config-data',
 	    [{'config-data', Cfg}]}} = _RPC, _Env) ->
     ?debug("~p:json_rpc(push-config-data) config-data:~p ~n", [ ?MODULE, Cfg ]),
-    _AID = exodm_db_session:get_aid(),
+    AID = exodm_db_session:get_aid(),
+
     {ok, result_code(ok)};
 
 json_rpc_(RPC, _ENV) ->