From 6703fc56a382e62530ba23cb5452da6f4cccbe91 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 23 May 2013 11:17:21 +0200
Subject: [snmp/agent] Updated the config tool with new mib-storage format

---
 lib/snmp/src/app/snmp_app.erl     | 14 +++++++-------
 lib/snmp/src/misc/snmp_config.erl | 22 +++++++++++++++-------
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'lib/snmp/src')

diff --git a/lib/snmp/src/app/snmp_app.erl b/lib/snmp/src/app/snmp_app.erl
index deb42cc373..0cfbb22a5a 100644
--- a/lib/snmp/src/app/snmp_app.erl
+++ b/lib/snmp/src/app/snmp_app.erl
@@ -62,17 +62,17 @@ entities([], []) ->
 	    ?d("entities -> converted config: ~n~p", [Conf]),
 	    [{agent, Conf}]
     end;
-entities([], E) ->
+entities([], Acc) ->
     ?d("entities -> done", []),
-    lists:reverse(E);
-entities([ET|ETs], E) ->
+    lists:reverse(Acc);
+entities([Ent|Ents], Acc) ->
     ?d("entities -> entry with"
-       "~n   ET: ~p", [ET]),
-    case application:get_env(snmp, ET) of
+       "~n   Ent: ~p", [Ent]),
+    case application:get_env(snmp, Ent) of
 	{ok, Conf} ->
-	    entities(ETs, [{ET, Conf}|E]);
+	    entities(Ents, [{Ent, Conf}|Acc]);
 	_ ->
-	    entities(ETs, E)
+	    entities(Ents, Acc)
     end.
 	
 start_entities(_Type, []) ->
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 0bed097b62..22fe25941c 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -238,7 +238,7 @@ config_agent_sys() ->
     MibStorage = 
 	case MibStorageType of
 	    ets ->
-		ets;
+		[{module, snmpa_mib_storage_ets}];
 	    dets ->
 		DetsDir = ask("6b. Mib storage directory (absolute path)?",
 			      DbDir, fun verify_dir/1),
@@ -248,13 +248,14 @@ config_agent_sys() ->
 				 "default", fun verify_mib_storage_action/1),
 		case DetsAction of
 		    default ->
-			{dets, DetsDir};
+			[{module, snmpa_mib_storage_dets}, 
+			 {options, [{dir,    DetsDir}]}];
 		    _ ->
-			{dets, DetsDir, DetsAction}
+			[{module, snmpa_mib_storage_dets}, 
+			 {options, [{dir,    DetsDir}, 
+				    {action, DetsAction}]}]
 		end;
 	    mnesia ->
-% 		Nodes = ask("Mib storage nodes?", "none", 
-% 			    fun verify_mib_storage_nodes/1),
 		Nodes = [],
 		MnesiaAction = ask("6b. Mib storage [mnesia] database start "
 				   "action "
@@ -262,11 +263,18 @@ config_agent_sys() ->
 				   "default", fun verify_mib_storage_action/1),
 		case MnesiaAction of
 		    default ->
-			{mnesia, Nodes};
+			[{module, snmpa_mib_storage_mnesia}, 
+			 {options, [{nodes, Nodes}]}];
 		    _ ->
-			{mnesia, Nodes, MnesiaAction}
+			[{module, snmpa_mib_storage_mnesia}, 
+			 {options, [{nodes,  Nodes}, 
+				    {action, MnesiaAction}]}]
 		end
 	end,
+
+    %% Here we should ask about mib-server data module, 
+    %% but as we only have one at the moment...
+
     TargetCacheVerb = ask("7. Target cache verbosity "
 			  "(silence/info/log/debug/trace)?", "silence",
 			  fun verify_verbosity/1),
-- 
cgit v1.2.3