The R13B03 release.OTP_R13B03

1 files changed, 5436 insertions, 0 deletions

diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
new file mode 100644
index 0000000000..31cc095349
--- /dev/null
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -0,0 +1,5436 @@
+%% 
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2003-2009. All Rights Reserved.
+%% 
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% %CopyrightEnd%
+%% 
+
+%%----------------------------------------------------------------------
+%% Purpose:
+%%
+%% Test:    ts:run(snmp, snmp_manager_test, [batch]).
+%% Test:    ts:run(snmp, snmp_manager_test, event_tests, [batch]).
+%% Test:    ts:run(snmp, snmp_manager_test, inform_swarm, [batch]).
+%% 
+%%----------------------------------------------------------------------
+-module(snmp_manager_test).
+
+%%----------------------------------------------------------------------
+%% Include files
+%%----------------------------------------------------------------------
+
+-include("test_server.hrl").
+-include("snmp_test_lib.hrl").
+-include("snmp_test_data/Test2.hrl").
+
+-include_lib("snmp/include/snmp_types.hrl").
+-include_lib("snmp/include/STANDARD-MIB.hrl").
+
+
+%%----------------------------------------------------------------------
+%% External exports
+%%----------------------------------------------------------------------
+-export([
+	 all/1, 
+         init_per_testcase/2, fin_per_testcase/2,
+
+	 start_and_stop_tests/1,
+	 simple_start_and_stop1/1,
+	 simple_start_and_stop2/1,
+	 simple_start_and_monitor_crash1/1,
+	 simple_start_and_monitor_crash2/1,
+	 notify_started01/1,
+	 notify_started02/1,
+
+	 user_tests/1,
+	 register_user1/1,
+	 
+	 agent_tests/1,
+	 register_agent1/1,
+	 register_agent2/1,
+
+	 misc_tests/1,
+	 info/1,
+	 
+	 request_tests/1, 
+
+	 get_tests/1,
+	 simple_sync_get1/1, 
+	 simple_sync_get2/1, 
+	 simple_async_get1/1, 
+	 simple_async_get2/1, 
+
+	 get_next_tests/1,
+  	 simple_sync_get_next1/1, 
+  	 simple_sync_get_next2/1, 
+  	 simple_async_get_next1/1, 
+  	 simple_async_get_next2/1, 
+
+	 set_tests/1, 
+	 simple_sync_set1/1, 
+	 simple_sync_set2/1, 
+	 simple_async_set1/1, 
+	 simple_async_set2/1, 
+
+	 bulk_tests/1, 
+  	 simple_sync_get_bulk1/1, 
+  	 simple_sync_get_bulk2/1, 
+  	 simple_async_get_bulk1/1, 
+  	 simple_async_get_bulk2/1, 
+
+	 misc_request_tests/1, 
+  	 misc_async1/1, 
+  	 misc_async2/1, 
+
+	 discovery/1,
+
+	 event_tests/1, 
+	 
+	 trap1/1,
+	 trap2/1,
+
+	 inform1/1,
+	 inform2/1,
+	 inform3/1,
+	 inform4/1,
+	 inform_swarm/1,
+
+	 report/1,
+
+	 tickets/1,
+	 otp8015/1,
+	 otp8015_1/1
+
+	]).
+
+
+%%----------------------------------------------------------------------
+%% Internal exports
+%%----------------------------------------------------------------------
+
+%% -export([async_exec/2]).
+
+
+%%----------------------------------------------------------------------
+%% Macros and constants
+%%----------------------------------------------------------------------
+
+-define(AGENT_PORT,       4000).
+-define(AGENT_MMS,        1024).
+-define(AGENT_ENGINE_ID,  "agentEngine").
+
+-define(MGR_PORT,       5000).
+-define(MGR_MMS,        1024).
+-define(MGR_ENGINE_ID,  "mgrEngine").
+
+-define(NS_TIMEOUT,     10000).
+
+
+%%----------------------------------------------------------------------
+%% Records
+%%----------------------------------------------------------------------
+
+%%======================================================================
+%% External functions
+%%======================================================================
+
+init_per_testcase(Case, Config) when is_list(Config) ->
+    io:format(user, "~n~n*** INIT ~w:~w ***~n~n", [?MODULE,Case]),
+    init_per_testcase2(Case, Config).
+
+init_per_testcase2(Case, Config) ->
+    ?DBG("init [~w] Nodes [1]: ~p", [Case, erlang:nodes()]),
+
+    %% Fix a correct data dir (points to the wrong location):
+    DataDir0     = ?config(data_dir, Config),
+    DataDir1     = filename:split(filename:absname(DataDir0)),
+    [_|DataDir2] = lists:reverse(DataDir1),
+    DataDir      = filename:join(lists:reverse(DataDir2) ++ [?snmp_test_data]),
+
+    PrivDir = ?config(priv_dir, Config),
+
+    TopDir = filename:join(PrivDir, ?MODULE),
+    case file:make_dir(TopDir) of
+	ok ->
+	    ok;
+	{error, eexist} ->
+	    ok;
+	Error ->
+	    ?FAIL({failed_creating_subsuite_top_dir, Error})
+    end,
+	    
+    CaseTopDir = filename:join(TopDir, Case),
+    ?line ok   = file:make_dir(CaseTopDir),
+    
+    %% -- Manager dirs  --
+    MgrTopDir  = filename:join(CaseTopDir, "manager/"),
+    ?line ok   = file:make_dir(MgrTopDir),
+
+    MgrConfDir = filename:join(MgrTopDir,  "conf/"),
+    ?line ok   = file:make_dir(MgrConfDir),
+
+    MgrDbDir   = filename:join(MgrTopDir,  "db/"),
+    ?line ok   = file:make_dir(MgrDbDir),
+
+    MgrLogDir  = filename:join(MgrTopDir,  "log/"),
+    ?line ok   = file:make_dir(MgrLogDir),
+
+    %% -- Agent dirs --
+    AgTopDir  = filename:join(CaseTopDir, "agent/"),
+    ?line ok  = file:make_dir(AgTopDir),
+
+    AgConfDir = filename:join(AgTopDir,   "conf/"),
+    ?line ok  = file:make_dir(AgConfDir),
+
+    AgDbDir   = filename:join(AgTopDir,   "db/"),
+    ?line ok  = file:make_dir(AgDbDir),
+
+    AgLogDir  = filename:join(AgTopDir,   "log/"),
+    ?line ok  = file:make_dir(AgLogDir),
+
+    Conf = [{snmp_data_dir,             DataDir},
+	    {watchdog,                  ?WD_START(?MINS(5))},
+	    {ip,                        ?LOCALHOST()},
+	    {top_dir,                   TopDir},
+	    {agent_dir,                 AgTopDir},
+	    {agent_conf_dir,            AgConfDir},
+	    {agent_db_dir,              AgDbDir},
+	    {agent_log_dir,             AgLogDir}, 
+	    {manager_agent_target_name, "agent01"}, 
+	    {manager_dir,               MgrTopDir},
+	    {manager_conf_dir,          MgrConfDir},
+	    {manager_db_dir,            MgrDbDir},
+	    {manager_log_dir,           MgrLogDir} | Config],
+    Conf2 = init_per_testcase3(Case, Conf),
+    ?DBG("init [~w] Nodes [2]: ~p", [Case, erlang:nodes()]),
+    Conf2.
+
+init_per_testcase3(Case, Config) ->
+    OldApiCases = 
+	[
+	 simple_sync_get1, 
+	 simple_async_get1, 
+	 simple_sync_get_next1, 
+	 simple_async_get_next1, 
+	 simple_sync_set1, 
+	 simple_async_set1, 
+	 simple_sync_get_bulk1, 
+	 simple_async_get_bulk1,
+	 misc_async1
+	],
+    NewApiCases = 
+	[
+	 simple_sync_get2, 
+	 simple_async_get2, 
+	 simple_sync_get_next2, 
+	 simple_async_get_next2, 
+	 simple_sync_set2, 
+	 simple_async_set2, 
+	 simple_sync_get_bulk2, 
+	 simple_async_get_bulk2,
+	 misc_async2
+	],
+    Cases = [
+	     trap1,
+	     trap2,
+	     inform1,
+	     inform2,
+	     inform3,
+	     inform4,
+	     inform_swarm,
+	     report
+	    ] ++ OldApiCases ++ NewApiCases,
+    case lists:member(Case, Cases) of
+	true ->
+	    NoAutoInformCases = [inform1, inform2, inform3, inform_swarm], 
+	    AutoInform = not lists:member(Case, NoAutoInformCases),
+	    Conf1 = if 
+			Case =:= inform_swarm ->
+			    Verb = [{manager_config_verbosity,     silence},
+				    {manager_note_store_verbosity, silence},
+				    {manager_server_verbosity,     info},
+				    {manager_net_if_verbosity,     info},
+				    {agent_verbosity,              info}, 
+				    {agent_net_if_verbosity,       info}],
+			    Verb ++ Config;
+			true ->
+			    Config
+		    end,
+	    Conf2 = init_agent(Conf1),
+	    Conf3 = init_manager(AutoInform, Conf2), 
+	    Conf4 = init_mgr_user(Conf3),
+	    case lists:member(Case, NewApiCases) of
+		true ->
+		    init_mgr_user_data2(Conf4);
+		false ->
+		    init_mgr_user_data1(Conf4)
+	    end;
+	false ->
+	    Config
+    end.
+
+fin_per_testcase(Case, Config) when is_list(Config) ->
+    ?DBG("fin [~w] Nodes [1]: ~p", [Case, erlang:nodes()]),
+    Dog    = ?config(watchdog, Config),
+    ?WD_STOP(Dog),
+    Conf1  = lists:keydelete(watchdog, 1, Config),
+    Conf2  = fin_per_testcase2(Case, Conf1),
+    ?DBG("fin [~w] Nodes [2]: ~p", [Case, erlang:nodes()]),
+    %%     TopDir = ?config(top_dir, Conf2),
+    %%     ?DEL_DIR(TopDir),
+    Conf2.
+
+fin_per_testcase2(Case, Config) ->
+    OldApiCases = 
+	[
+	 simple_sync_get1, 
+	 simple_async_get1, 
+	 simple_sync_get_next1, 
+	 simple_async_get_next1, 
+	 simple_sync_set1, 
+	 simple_async_set1, 
+	 simple_sync_get_bulk1, 
+	 simple_async_get_bulk1,
+	 misc_async1
+	],
+    NewApiCases = 
+	[
+	 simple_sync_get2, 
+	 simple_async_get2, 
+	 simple_sync_get_next2, 
+	 simple_async_get_next2, 
+	 simple_sync_set2, 
+	 simple_async_set2, 
+	 simple_sync_get_bulk2, 
+	 simple_async_get_bulk2,
+	 misc_async2
+	],
+    Cases = [
+	     trap1,
+	     trap2,
+	     inform1,
+	     inform2,
+	     inform3,
+	     inform4,
+	     inform_swarm,
+	     report
+	    ] ++ OldApiCases ++ NewApiCases,
+    case lists:member(Case, Cases) of
+	true ->
+	    Conf1 = case lists:member(Case, NewApiCases) of
+			true ->
+			    fin_mgr_user_data2(Config);
+			false ->
+			    fin_mgr_user_data1(Config)
+		    end,
+	    Conf2 = fin_mgr_user(Conf1),
+	    Conf3 = fin_manager(Conf2),
+	    fin_agent(Conf3);
+	false ->
+	    Config
+    end.
+
+
+%%======================================================================
+%% Test case definitions
+%%======================================================================
+
+all(suite) ->
+    [
+     start_and_stop_tests,
+     misc_tests,
+     user_tests,
+     agent_tests,
+     request_tests,
+     event_tests, 
+     discovery,
+     tickets
+    ].
+
+start_and_stop_tests(suite) ->
+    [
+     simple_start_and_stop1,
+     simple_start_and_stop2,
+     simple_start_and_monitor_crash1,
+     simple_start_and_monitor_crash2,
+     notify_started01,
+     notify_started02
+    ].
+
+misc_tests(suite) ->
+    [
+     info
+    ].
+
+user_tests(suite) ->
+    [
+     register_user1
+    ].
+
+agent_tests(suite) ->
+    [
+     register_agent1, 
+     register_agent2
+    ].
+
+request_tests(suite) ->
+    [
+     get_tests,
+     get_next_tests,
+     set_tests,
+     bulk_tests,
+     misc_request_tests
+    ].
+
+get_tests(suite) ->
+    [
+     simple_sync_get1,
+     simple_sync_get2,
+     simple_async_get1,
+     simple_async_get2
+    ].
+
+get_next_tests(suite) ->
+    [
+     simple_sync_get_next1,
+     simple_sync_get_next2,
+     simple_async_get_next1,
+     simple_async_get_next2
+    ].
+
+set_tests(suite) ->
+    [
+     simple_sync_set1,
+     simple_sync_set2,
+     simple_async_set1,
+     simple_async_set2
+    ].
+
+bulk_tests(suite) ->
+    [
+     simple_sync_get_bulk1,
+     simple_sync_get_bulk2,
+     simple_async_get_bulk1,
+     simple_async_get_bulk2
+    ].
+
+misc_request_tests(suite) ->
+    [
+     misc_async1,
+     misc_async2
+    ].
+
+event_tests(suite) ->
+    [
+     trap1,
+     trap2,
+     inform1,
+     inform2,
+     inform3,
+     inform4,
+     inform_swarm,
+     report
+    ].
+
+tickets(suite) ->
+    [
+     otp8015
+    ].
+
+otp8015(suite) ->
+    [
+     otp8015_1
+    ].
+
+
+%%======================================================================
+%% Test functions
+%%======================================================================
+
+simple_start_and_stop1(suite) -> [];
+simple_start_and_stop1(Config) when is_list(Config) ->
+    %% ?SKIP(not_yet_implemented),
+    process_flag(trap_exit, true),
+    put(tname,ssas1),
+    p("starting with Config: ~n~p", [Config]),
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server, [{verbosity, trace}]},
+	    {net_if, [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+    p("try starting manager"),
+    ok = snmpm:start_link(Opts),
+
+    ?SLEEP(1000),
+
+    p("manager started, now try to stop"),
+    ok = snmpm:stop(),
+
+    ?SLEEP(1000),
+
+    p("end"),
+    ok.
+
+
+%%======================================================================
+
+simple_start_and_stop2(suite) -> [];
+simple_start_and_stop2(Config) when is_list(Config) ->
+    %% ?SKIP(not_yet_implemented),
+    process_flag(trap_exit, true),
+    put(tname,ssas2),
+    p("starting with Config: ~p~n", [Config]),
+
+    ManagerNode = start_manager_node(), 
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server, [{verbosity, trace}]},
+	    {net_if, [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+
+    p("try load snmp application"),
+    ?line ok = load_snmp(ManagerNode),
+
+    p("try set manager env for the snmp application"),
+    ?line ok = set_mgr_env(ManagerNode, Opts),
+
+    p("try starting snmp application (with only manager)"),
+    ?line ok = start_snmp(ManagerNode),
+
+    p("started"),
+
+    ?SLEEP(1000),
+
+    p("try stopping snmp application (with only manager)"),
+    ?line ok = stop_snmp(ManagerNode),
+
+    ?SLEEP(1000),
+
+    stop_node(ManagerNode),
+
+    ?SLEEP(1000),
+
+    p("end"),
+    ok.
+
+
+%%======================================================================
+
+simple_start_and_monitor_crash1(suite) -> [];
+simple_start_and_monitor_crash1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,ssamc1),
+    p("starting with Config: ~n~p", [Config]),
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server, [{verbosity, trace}]},
+	    {net_if, [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+    p("try starting manager"),
+    ok = snmpm:start(Opts),
+
+    ?SLEEP(1000),
+
+    p("create the monitor"),
+    Ref = snmpm:monitor(),
+
+    p("make sure it has not already crashed..."),
+    receive
+	{'DOWN', Ref, process, Obj1, Reason1} ->
+	    ?FAIL({unexpected_down, Obj1, Reason1})
+    after 1000 ->
+	    ok
+    end,
+
+    p("stop the manager"),
+    ok = snmpm:stop(),
+
+    p("await the down-message"),
+    receive
+	{'DOWN', Ref, process, Obj2, Reason2} ->
+	    p("received expected down-message: "
+	      "~n   Obj2:    ~p"
+	      "~n   Reason2: ~p", 
+	      [Obj2, Reason2]),
+	    ok
+    after 1000 ->
+	    ?FAIL(timeout)
+    end,
+
+    p("end"),
+    ok.
+
+
+%%======================================================================
+
+simple_start_and_monitor_crash2(suite) -> [];
+simple_start_and_monitor_crash2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,ssamc2),
+    p("starting with Config: ~n~p", [Config]),
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{restart_type, permanent},
+	    {server, [{verbosity, trace}]},
+	    {net_if, [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+    p("try starting manager"),
+    ok = snmpm:start(Opts),
+
+    ?SLEEP(1000),
+
+    p("create the monitor"),
+    Ref = snmpm:monitor(),
+
+    p("make sure it has not already crashed..."),
+    receive
+	{'DOWN', Ref, process, Obj1, Reason1} ->
+	    ?FAIL({unexpected_down, Obj1, Reason1})
+    after 1000 ->
+	    ok
+    end,
+
+    p("crash the manager"),
+    simulate_crash(),
+
+    p("await the down-message"),
+    receive
+	{'DOWN', Ref, process, Obj2, Reason2} ->
+	    p("received expected down-message: "
+	      "~n   Obj2:    ~p"
+	      "~n   Reason2: ~p", 
+	      [Obj2, Reason2]),
+	    ok
+    after 1000 ->
+	    ?FAIL(timeout)
+    end,
+
+    p("end"),
+    ok.
+
+
+%% The server supervisor allow 5 restarts in 500 msec.
+server_pid() ->
+    whereis(snmpm_server).
+
+-define(MAX_KILLS, 6).
+
+simulate_crash() ->
+    simulate_crash(0, server_pid()).
+
+simulate_crash(?MAX_KILLS, _) ->
+    ?SLEEP(1000),
+    case server_pid() of
+	P when is_pid(P) ->
+	    exit({error, {still_alive, P}});
+	_ ->
+	    ok
+    end;
+simulate_crash(NumKills, Pid) when (NumKills < ?MAX_KILLS) and is_pid(Pid) ->
+    p("similate_crash -> ~w, ~p", [NumKills, Pid]),
+    Ref = erlang:monitor(process, Pid),
+    exit(Pid, kill),
+    receive 
+	{'DOWN', Ref, process, _Object, _Info} ->
+	    p("received expected 'DOWN' message"),
+	    simulate_crash(NumKills + 1, server_pid())
+    after 1000 ->
+	    case server_pid() of
+		P when is_pid(P) ->
+		    exit({error, {no_down_from_server, P}});
+		_ ->
+		    ok
+	    end
+    end;
+simulate_crash(NumKills, _) ->
+    ?SLEEP(10),
+    simulate_crash(NumKills, server_pid()).
+
+
+%%======================================================================
+
+notify_started01(suite) -> [];
+notify_started01(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,ns01),
+    p("starting with Config: ~n~p", [Config]),
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server, [{verbosity, log}]},
+	    {net_if, [{verbosity, silence}]},
+	    {note_store, [{verbosity, silence}]},
+	    {config, [{verbosity, log}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+    p("request start notification (1)"),
+    Pid1 = snmpm:notify_started(10000),
+    receive
+	{snmpm_start_timeout, Pid1} ->
+	    p("received expected start timeout"),
+	    ok;
+	Any1 ->
+	    ?FAIL({unexpected_message, Any1})
+    after 15000 ->
+	    ?FAIL({unexpected_timeout, Pid1})
+    end,
+
+    p("request start notification (2)"),
+    Pid2 = snmpm:notify_started(10000),
+
+    p("start the snmpm starter"),
+    Pid = snmpm_starter(Opts, 5000),
+
+    p("await the start notification"),
+    Ref = 
+	receive
+	    {snmpm_started, Pid2} ->
+		p("received started message -> create the monitor"),
+		snmpm:monitor();
+	    Any2 ->
+		?FAIL({unexpected_message, Any2})
+	after 15000 ->
+		?FAIL({unexpected_timeout, Pid2})
+	end,
+
+    p("[~p] make sure it has not already crashed...", [Ref]),
+    receive
+	{'DOWN', Ref, process, Obj1, Reason1} ->
+	    ?FAIL({unexpected_down, Obj1, Reason1})
+    after 1000 ->
+	    ok
+    end,
+
+    p("stop the manager"),
+    Pid ! {stop, self()}, %ok = snmpm:stop(),
+
+    p("await the down-message"),
+    receive
+	{'DOWN', Ref, process, Obj2, Reason2} ->
+	    p("received expected down-message: "
+	      "~n   Obj2:    ~p"
+	      "~n   Reason2: ~p", 
+	      [Obj2, Reason2]),
+	    ok
+    after 5000 ->
+	    ?FAIL(down_timeout)
+    end,
+
+    p("end"),
+    ok.
+
+
+snmpm_starter(Opts, To) ->
+    Parent = self(),
+    spawn(
+      fun() -> 
+	      ?SLEEP(To), 
+	      ok = snmpm:start(Opts),
+	      receive
+		  {stop, Parent} ->
+		      snmpm:stop()
+	      end
+      end).
+
+
+%%======================================================================
+
+notify_started02(suite) -> [];
+notify_started02(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,ns02),
+    p("starting with Config: ~n~p", [Config]),
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server, [{verbosity, log}]},
+	    {net_if, [{verbosity, silence}]},
+	    {note_store, [{verbosity, silence}]},
+	    {config, [{verbosity, log}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+    p("start snmpm client process"),
+    Pid1 = ns02_loop1_start(),
+
+    p("start snmpm starter process"),
+    Pid2 = ns02_loop2_start(Opts),
+    
+    p("await snmpm client process exit"),
+    receive 
+	{'EXIT', Pid1, normal} ->
+	    ok;
+	{'EXIT', Pid1, Reason1} ->
+	    ?FAIL(Reason1)
+    after 25000 ->
+	    ?FAIL(timeout)
+    end,
+	
+    p("await snmpm starter process exit"),
+    receive 
+	{'EXIT', Pid2, normal} ->
+	    ok;
+	{'EXIT', Pid2, Reason2} ->
+	    ?FAIL(Reason2)
+    after 5000 ->
+	    ?FAIL(timeout)
+    end,
+	
+    p("end"),
+    ok.
+
+
+ns02_loop1_start() ->
+    spawn_link(fun() -> ns02_loop1() end).
+		       
+ns02_loop1() ->
+    put(tname,ns02_loop1),
+    p("starting"),
+    ns02_loop1(dummy, snmpm:notify_started(?NS_TIMEOUT), 5).
+
+ns02_loop1(_Ref, _Pid, 0) ->
+    p("done"),
+    exit(normal);
+ns02_loop1(Ref, Pid, N) ->
+    p("entry when"
+      "~n   Ref: ~p"
+      "~n   Pid: ~p"
+      "~n   N:   ~p", [Ref, Pid, N]),
+    receive
+	{snmpm_started, Pid} ->
+	    p("received expected started message (~w)", [N]),
+	    ns02_loop1(snmpm:monitor(), dummy, N);
+	{snmpm_start_timeout, Pid} ->
+	    p("unexpected timout"),
+	    ?FAIL({unexpected_start_timeout, Pid});
+	{'DOWN', Ref, process, Obj, Reason} ->
+	    p("received expected DOWN message (~w) with"
+	      "~n   Obj:    ~p"
+	      "~n   Reason: ~p", [N, Obj, Reason]),
+	    ns02_loop1(dummy, snmpm:notify_started(?NS_TIMEOUT), N-1)
+    after 10000 ->
+	    ?FAIL(timeout)
+    end.
+
+
+ns02_loop2_start(Opts) ->
+    spawn_link(fun() -> ns02_loop2(Opts) end).
+		       
+ns02_loop2(Opts) ->
+    put(tname,ns02_loop2),
+    p("starting"),
+    ns02_loop2(Opts, 5).
+
+ns02_loop2(_Opts, 0) ->
+    p("done"),
+    exit(normal);
+ns02_loop2(Opts, N) ->
+    p("entry when N: ~p", [N]),
+    ?SLEEP(2000),
+    p("start manager"),
+    snmpm:start(Opts),
+    ?SLEEP(2000),
+    p("stop manager"),
+    snmpm:stop(),
+    ns02_loop2(Opts, N-1).
+
+
+%%======================================================================
+
+info(suite) -> [];
+info(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,info),
+    p("starting with Config: ~n~p", [Config]),
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server, [{verbosity, trace}]},
+	    {net_if, [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+    p("try starting manager"),
+    ok = snmpm:start(Opts),
+
+    ?SLEEP(1000),
+
+    p("manager started, now get info"),
+    Info = snmpm:info(), 
+    p("got info, now verify: ~n~p", [Info]),
+    ok = verify_info( Info ),
+
+    p("info verified, now try to stop"),
+    ok = snmpm:stop(),
+
+    ?SLEEP(1000),
+
+    p("end"),
+    ok.
+
+verify_info(Info) when is_list(Info) ->
+    Keys = [{server,     [process_memory, db_memory]},
+	    {config,     [process_memory, db_memory]},
+	    {net_if,     [process_memory, port_info]},
+	    {note_store, [process_memory, db_memory]},
+	    stats_counters],
+    verify_info(Keys, Info);
+verify_info(BadInfo) ->
+    {error, {bad_info, BadInfo}}.
+
+verify_info([], _) ->
+    ok;
+verify_info([Key|Keys], Info) when is_atom(Key) ->
+    case lists:keymember(Key, 1, Info) of
+	true ->
+	    verify_info(Keys, Info);
+	false ->
+	    {error, {missing_info, {Key, Info}}}
+    end;
+verify_info([{Key, SubKeys}|Keys], Info) ->
+    case lists:keysearch(Key, 1, Info) of
+	{value, {Key, SubInfo}} ->
+	    case verify_info(SubKeys, SubInfo) of
+		ok ->
+		    verify_info(Keys, Info);
+		{error, {missing_info, {SubKey, _}}} ->
+		    {error, {missing_subinfo, {Key, SubKey, Info}}}
+	    end;
+	false ->
+	    {error, {missing_info, {Key, Info}}}
+    end.
+
+
+%%======================================================================
+
+register_user1(suite) -> [];
+register_user1(Config) when is_list(Config) ->
+    %% ?SKIP(not_yet_implemented).
+    process_flag(trap_exit, true),
+    put(tname,ru1),
+    p("starting with Config: ~p~n", [Config]),
+
+    ManagerNode = start_manager_node(), 
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server,     [{verbosity, trace}]},
+	    {net_if,     [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+
+    p("load snmp application"),
+    ?line ok = load_snmp(ManagerNode),
+
+    p("set manager env for the snmp application"),
+    ?line ok = set_mgr_env(ManagerNode, Opts),
+
+    p("starting snmp application (with only manager)"),
+    ?line ok = start_snmp(ManagerNode),
+
+    p("started"),
+
+    ?SLEEP(1000),
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("try register user(s)"),
+    ?line ok = mgr_register_user(ManagerNode, calvin, snmpm_user_default, 
+				 [self(), "various misc info"]),
+
+    Users1 = mgr_which_users(ManagerNode),
+    p("users: ~p~n", [Users1]),
+    ?line ok = verify_users(Users1, [calvin]),
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    ?line ok = mgr_register_user(ManagerNode, hobbe, snmpm_user_default, 
+				 {"misc info", self()}),
+
+    Users2 = mgr_which_users(ManagerNode),
+    p("users: ~p~n", [Users2]),
+    ?line ok = verify_users(Users2, [calvin, hobbe]),
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("try unregister user(s)"),
+    ?line ok = mgr_unregister_user(ManagerNode, calvin),
+
+    Users3 = mgr_which_users(ManagerNode),
+    p("users: ~p~n", [Users3]),
+    ?line ok = verify_users(Users3, [hobbe]),
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    ?line ok = mgr_unregister_user(ManagerNode, hobbe),
+
+    Users4 = mgr_which_users(ManagerNode),
+    p("users: ~p~n", [Users4]),
+    ?line ok = verify_users(Users4, []),
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    ?SLEEP(1000),
+
+    p("stop snmp application (with only manager)"),
+    ?line ok = stop_snmp(ManagerNode),
+
+    ?SLEEP(1000),
+
+    stop_node(ManagerNode),
+
+    ?SLEEP(1000),
+
+    p("end"),
+    ok.
+
+verify_users([], []) ->
+    ok;
+verify_users(ActualUsers, []) ->
+    {error, {unexpected_users, ActualUsers}};
+verify_users(ActualUsers0, [User|RegUsers]) ->
+    case lists:delete(User, ActualUsers0) of
+	ActualUsers0 ->
+	    {error, {not_registered, User}};
+	ActualUsers ->
+	    verify_users(ActualUsers, RegUsers)
+    end.
+    
+
+%%======================================================================
+
+register_agent1(doc) -> 
+    ["Test registration of agents with the OLD interface functions"];
+register_agent1(suite) -> 
+    [];
+register_agent1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,ra1),
+    p("starting with Config: ~p~n", [Config]),
+
+    ManagerNode = start_manager_node(), 
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server,     [{verbosity, trace}]},
+	    {net_if,     [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+
+    p("load snmp application"),
+    ?line ok = load_snmp(ManagerNode),
+
+    p("set manager env for the snmp application"),
+    ?line ok = set_mgr_env(ManagerNode, Opts),
+
+    p("starting snmp application (with only manager)"),
+    ?line ok = start_snmp(ManagerNode),
+
+    p("started"),
+
+    ?SLEEP(1000),
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("register user(s) calvin & hobbe"),
+    ?line ok = mgr_register_user(ManagerNode, user_alfa, snmpm_user_default, []),
+    ?line ok = mgr_register_user(ManagerNode, user_beta, snmpm_user_default, []),
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("register agent(s)"),
+    ?line ok = mgr_register_agent(ManagerNode, user_alfa, 5000, []),
+    ?line ok = mgr_register_agent(ManagerNode, user_alfa, 5001, []),
+    ?line ok = mgr_register_agent(ManagerNode, user_beta, 5002, []),
+    ?line ok = mgr_register_agent(ManagerNode, user_beta, 5003, []),
+
+    p("verify all agent(s): expect 4"),
+    case mgr_which_agents(ManagerNode) of
+	Agents1 when length(Agents1) =:= 4 ->
+	    p("all agents: ~p~n", [Agents1]),
+	    ok;
+	Agents1 ->
+	    ?FAIL({agent_registration_failure, Agents1})
+    end,
+
+    p("verify user_alfa agent(s)"),
+    case mgr_which_agents(ManagerNode, user_alfa) of
+	Agents2 when length(Agents2) =:= 2 ->
+	    p("calvin agents: ~p~n", [Agents2]),
+	    ok;
+	Agents2 ->
+	    ?FAIL({agent_registration_failure, Agents2})
+    end,
+
+    p("verify user_beta agent(s)"),
+    case mgr_which_agents(ManagerNode, user_beta) of
+	Agents3 when length(Agents3) =:= 2 ->
+	    p("hobbe agents: ~p~n", [Agents3]),
+	    ok;
+	Agents3 ->
+	    ?FAIL({agent_registration_failure, Agents3})
+    end,
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+    
+    p("unregister user user_alfa"),
+    ?line ok = mgr_unregister_user(ManagerNode, user_alfa),
+
+    p("verify all agent(s): expect 2"),
+    case mgr_which_agents(ManagerNode) of
+	Agents4 when length(Agents4) =:= 2 ->
+	    p("all agents: ~p~n", [Agents4]),
+	    ok;
+	Agents4 ->
+	    ?FAIL({agent_unregistration_failure, Agents4})
+    end,
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("unregister user_beta agents"),
+    ?line ok = mgr_unregister_agent(ManagerNode, user_beta, 5002),
+    ?line ok = mgr_unregister_agent(ManagerNode, user_beta, 5003),
+
+    p("verify all agent(s): expect 0"),
+    case mgr_which_agents(ManagerNode) of
+	[] ->
+	    ok;
+	Agents5 ->
+	    p("all agents: ~p~n", [Agents5]),
+	    ?FAIL({agent_unregistration_failure, Agents5})
+    end,
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("unregister user hobbe"),
+    ?line ok = mgr_unregister_user(ManagerNode, user_beta),
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    ?SLEEP(1000),
+
+    p("stop snmp application (with only manager)"),
+    ?line ok = stop_snmp(ManagerNode),
+
+    ?SLEEP(1000),
+
+    stop_node(ManagerNode),
+
+    ?SLEEP(1000),
+
+    p("end"),
+    ok.
+
+
+%%======================================================================
+
+register_agent2(doc) -> 
+    ["Test registration of agents with the NEW interface functions"];
+register_agent2(suite) -> 
+    [];
+register_agent2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ra2),
+    p("starting with Config: ~p~n", [Config]),
+
+    ManagerNode = start_manager_node(), 
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+    LocalHost = snmp_test_lib:localhost(), 
+
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server,     [{verbosity, trace}]},
+	    {net_if,     [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+
+    p("load snmp application"),
+    ?line ok = load_snmp(ManagerNode),
+
+    p("set manager env for the snmp application"),
+    ?line ok = set_mgr_env(ManagerNode, Opts),
+
+    p("starting snmp application (with only manager)"),
+    ?line ok = start_snmp(ManagerNode),
+
+    p("started"),
+
+    ?SLEEP(1000),
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("register user(s) calvin & hobbe"),
+    ?line ok = mgr_register_user(ManagerNode, user_alfa, snmpm_user_default, []),
+    ?line ok = mgr_register_user(ManagerNode, user_beta, snmpm_user_default, []),
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("register agent(s)"),
+    TargetName1 = "agent1", 
+    ?line ok = mgr_register_agent(ManagerNode, user_alfa, TargetName1, 
+				  [{address,   LocalHost},
+				   {port,      5001},
+				   {engine_id, "agentEngineId-1"}]),
+    TargetName2 = "agent2", 
+    ?line ok = mgr_register_agent(ManagerNode, user_alfa, TargetName2,
+				  [{address,   LocalHost},
+				   {port,      5002},
+				   {engine_id, "agentEngineId-2"}]),
+    TargetName3 = "agent3", 
+    ?line ok = mgr_register_agent(ManagerNode, user_beta, TargetName3,
+				  [{address,   LocalHost},
+				   {port,      5003},
+				   {engine_id, "agentEngineId-3"}]),
+    TargetName4 = "agent4", 
+    ?line ok = mgr_register_agent(ManagerNode, user_beta, TargetName4,
+				  [{address,   LocalHost},
+				   {port,      5004},
+				   {engine_id, "agentEngineId-4"}]),
+
+    p("verify all agent(s): expect 4"),
+    case mgr_which_agents(ManagerNode) of
+	Agents1 when length(Agents1) =:= 4 ->
+	    p("all agents: ~p~n", [Agents1]),
+	    ok;
+	Agents1 ->
+	    ?FAIL({agent_registration_failure, Agents1})
+    end,
+
+    p("verify user_alfa agent(s)"),
+    case mgr_which_agents(ManagerNode, user_alfa) of
+	Agents2 when length(Agents2) =:= 2 ->
+	    p("calvin agents: ~p~n", [Agents2]),
+	    ok;
+	Agents2 ->
+	    ?FAIL({agent_registration_failure, Agents2})
+    end,
+
+    p("verify user_beta agent(s)"),
+    case mgr_which_agents(ManagerNode, user_beta) of
+	Agents3 when length(Agents3) =:= 2 ->
+	    p("hobbe agents: ~p~n", [Agents3]),
+	    ok;
+	Agents3 ->
+	    ?FAIL({agent_registration_failure, Agents3})
+    end,
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+    
+    p("unregister user user_alfa"),
+    ?line ok = mgr_unregister_user(ManagerNode, user_alfa),
+
+    p("verify all agent(s): expect 2"),
+    case mgr_which_agents(ManagerNode) of
+	Agents4 when length(Agents4) =:= 2 ->
+	    p("all agents: ~p~n", [Agents4]),
+	    ok;
+	Agents4 ->
+	    ?FAIL({agent_unregistration_failure, Agents4})
+    end,
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("unregister user_beta agents"),
+    ?line ok = mgr_unregister_agent(ManagerNode, user_beta, TargetName3),
+    ?line ok = mgr_unregister_agent(ManagerNode, user_beta, TargetName4),
+
+    p("verify all agent(s): expect 0"),
+    case mgr_which_agents(ManagerNode) of
+	[] ->
+	    ok;
+	Agents5 ->
+	    p("all agents: ~p~n", [Agents5]),
+	    ?FAIL({agent_unregistration_failure, Agents5})
+    end,
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    p("unregister user hobbe"),
+    ?line ok = mgr_unregister_user(ManagerNode, user_beta),
+
+    p("manager info: ~p~n", [mgr_info(ManagerNode)]),
+
+    ?SLEEP(1000),
+
+    p("stop snmp application (with only manager)"),
+    ?line ok = stop_snmp(ManagerNode),
+
+    ?SLEEP(1000),
+
+    stop_node(ManagerNode),
+
+    ?SLEEP(1000),
+
+    p("end"),
+    ok.
+
+
+%%======================================================================
+
+simple_sync_get1(doc) -> ["Simple sync get-request - Old style (Addr & Port)"];
+simple_sync_get1(suite) -> [];
+simple_sync_get1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssg1),
+    p("starting with Config: ~p~n", [Config]),
+
+    Node  = ?config(manager_node, Config),
+    Addr  = ?config(ip, Config),
+    Port  = ?AGENT_PORT,
+
+    p("issue get-request without loading the mib"),
+    Oids1 = [?sysObjectID_instance, ?sysDescr_instance, ?sysUpTime_instance],
+    ?line ok = do_simple_get(Node, Addr, Port, Oids1),
+
+    p("issue get-request after first loading the mibs"),
+    ?line ok = mgr_user_load_mib(Node, std_mib()),
+    Oids2 = [[sysObjectID, 0], [sysDescr, 0], [sysUpTime, 0]],
+    ?line ok = do_simple_get(Node, Addr, Port, Oids2),
+    ok.
+
+do_simple_get(Node, Addr, Port, Oids) ->
+    ?line {ok, Reply, Rem} = mgr_user_sync_get(Node, Addr, Port, Oids),
+
+    ?DBG("~n   Reply: ~p"
+	 "~n   Rem:   ~w", [Reply, Rem]),
+    
+    %% verify that the operation actually worked:
+    %% The order should be the same, so no need to seach 
+    ?line ok = case Reply of
+		   {noError, 0, [#varbind{oid   = ?sysObjectID_instance,
+					  value = SysObjectID}, 
+				 #varbind{oid   = ?sysDescr_instance,
+					  value = SysDescr},
+				 #varbind{oid   = ?sysUpTime_instance,
+					  value = SysUpTime}]} ->
+		       p("expected result from get: "
+			 "~n   SysObjectID: ~p"
+			 "~n   SysDescr:    ~s"
+			 "~n   SysUpTime:   ~w", 
+			 [SysObjectID, SysDescr, SysUpTime]),
+		       ok;
+		   {noError, 0, Vbs} ->
+		       p("unexpected varbinds: ~n~p", [Vbs]),
+		       {error, {unexpected_vbs, Vbs}};
+		   Else ->
+		       p("unexpected reply: ~n~p", [Else]),
+		       {error, {unexpected_response, Else}}
+	       end,
+    ok.
+    
+
+%%======================================================================
+
+simple_sync_get2(doc) -> ["Simple sync get-request - New style (TargetName)"];
+simple_sync_get2(suite) -> [];
+simple_sync_get2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssg2),
+    p("starting with Config: ~p~n", [Config]),
+
+    Node       = ?config(manager_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    p("issue get-request without loading the mib"),
+    Oids1 = [?sysObjectID_instance, ?sysDescr_instance, ?sysUpTime_instance],
+    ?line ok = do_simple_get(Node, TargetName, Oids1),
+
+    p("issue get-request after first loading the mibs"),
+    ?line ok = mgr_user_load_mib(Node, std_mib()),
+    Oids2 = [[sysObjectID, 0], [sysDescr, 0], [sysUpTime, 0]],
+    ?line ok = do_simple_get(Node, TargetName, Oids2),
+    ok.
+
+do_simple_get(Node, TargetName, Oids) ->
+    ?line {ok, Reply, Rem} = mgr_user_sync_get(Node, TargetName, Oids),
+
+    ?DBG("~n   Reply: ~p"
+	 "~n   Rem:   ~w", [Reply, Rem]),
+    
+    %% verify that the operation actually worked:
+    %% The order should be the same, so no need to seach 
+    ?line ok = case Reply of
+		   {noError, 0, [#varbind{oid   = ?sysObjectID_instance,
+					  value = SysObjectID}, 
+				 #varbind{oid   = ?sysDescr_instance,
+					  value = SysDescr},
+				 #varbind{oid   = ?sysUpTime_instance,
+					  value = SysUpTime}]} ->
+		       p("expected result from get: "
+			 "~n   SysObjectID: ~p"
+			 "~n   SysDescr:    ~s"
+			 "~n   SysUpTime:   ~w", 
+			 [SysObjectID, SysDescr, SysUpTime]),
+		       ok;
+		   {noError, 0, Vbs} ->
+		       p("unexpected varbinds: ~n~p", [Vbs]),
+		       {error, {unexpected_vbs, Vbs}};
+		   Else ->
+		       p("unexpected reply: ~n~p", [Else]),
+		       {error, {unexpected_response, Else}}
+	       end,
+    ok.
+
+
+%%======================================================================
+
+simple_async_get1(doc) -> ["Simple (async) get-request - "
+			   "Old style (Addr & Port)"];
+simple_async_get1(suite) -> [];
+simple_async_get1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sag1),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    Addr      = ?config(ip, Config),
+    Port      = ?AGENT_PORT,
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    Exec = fun(Data) ->
+		    async_g_exec1(MgrNode, Addr, Port, Data)
+	   end,
+
+    Requests = [
+		{ 1,  
+		  [?sysObjectID_instance], 
+		  Exec, 
+		  fun(X) -> sag_verify(X, [?sysObjectID_instance]) end}, 
+		{ 2,  
+		  [?sysDescr_instance, ?sysUpTime_instance],
+		  Exec, 
+		  fun(X) -> 
+			  sag_verify(X, [?sysObjectID_instance, 
+					 ?sysUpTime_instance]) 
+		  end}, 
+		{ 3,  
+		  [[sysObjectID, 0], [sysDescr, 0], [sysUpTime, 0]],
+		  Exec, 
+		  fun(X) -> 
+			  sag_verify(X, [?sysObjectID_instance, 
+					 ?sysDescr_instance, 
+					 ?sysUpTime_instance]) 
+		  end}, 
+		{ 4,  
+		  [?sysObjectID_instance, 
+		   ?sysDescr_instance, 
+		   ?sysUpTime_instance],
+		  Exec, 
+		  fun(X) -> 
+			  sag_verify(X, [?sysObjectID_instance, 
+					 ?sysDescr_instance, 
+					 ?sysUpTime_instance]) 
+		  end}
+		],
+    
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+async_g_exec1(Node, Addr, Port, Oids) ->
+    mgr_user_async_get(Node, Addr, Port, Oids).
+
+sag_verify({noError, 0, _Vbs}, any) ->
+    p("verified [any]"),
+    ok;
+sag_verify({noError, 0, Vbs}, Exp) ->
+    ?DBG("verified first stage ok: "
+	 "~n   Vbs: ~p"
+	 "~n   Exp: ~p", [Vbs, Exp]),
+    sag_verify_vbs(Vbs, Exp);
+sag_verify(Error, _) ->
+    {error, {unexpected_response, Error}}.
+
+sag_verify_vbs([], []) ->
+    ?DBG("verified second stage ok", []),
+    ok;
+sag_verify_vbs(Vbs, []) ->
+    {error, {unexpected_vbs, Vbs}};
+sag_verify_vbs([], Exp) ->
+    {error, {expected_vbs, Exp}};
+sag_verify_vbs([#varbind{oid = Oid}|Vbs], [any|Exp]) ->
+    p("verified [any] oid ~w", [Oid]),
+    sag_verify_vbs(Vbs, Exp);
+sag_verify_vbs([#varbind{oid = Oid, value = Value}|Vbs], [Oid|Exp]) ->
+    p("verified oid ~w [~p]", [Oid, Value]),
+    sag_verify_vbs(Vbs, Exp);
+sag_verify_vbs([#varbind{oid = Oid, value = Value}|Vbs], [{Oid,Value}|Exp]) ->
+    p("verified oid ~w and ~p", [Oid, Value]),
+    sag_verify_vbs(Vbs, Exp);
+sag_verify_vbs([Vb|_], [E|_]) ->
+    {error, {unexpected_vb, Vb, E}}.
+
+
+%%======================================================================
+
+simple_async_get2(doc) -> ["Simple (async) get-request - "
+			  "New style (TargetName)"];
+simple_async_get2(suite) -> [];
+simple_async_get2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sag2),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode    = ?config(manager_node, Config),
+    AgentNode  = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    Exec = fun(Data) ->
+		    async_g_exec2(MgrNode, TargetName, Data)
+	   end,
+
+    Requests = [
+		{ 1,  
+		  [?sysObjectID_instance], 
+		  Exec, 
+		  fun(X) -> sag_verify(X, [?sysObjectID_instance]) end}, 
+		{ 2,  
+		  [?sysDescr_instance, ?sysUpTime_instance],
+		  Exec, 
+		  fun(X) -> 
+			  sag_verify(X, [?sysObjectID_instance, 
+					 ?sysUpTime_instance]) 
+		  end}, 
+		{ 3,  
+		  [[sysObjectID, 0], [sysDescr, 0], [sysUpTime, 0]],
+		  Exec, 
+		  fun(X) -> 
+			  sag_verify(X, [?sysObjectID_instance, 
+					 ?sysDescr_instance, 
+					 ?sysUpTime_instance]) 
+		  end}, 
+		{ 4,  
+		  [?sysObjectID_instance, 
+		   ?sysDescr_instance, 
+		   ?sysUpTime_instance],
+		  Exec, 
+		  fun(X) -> 
+			  sag_verify(X, [?sysObjectID_instance, 
+					 ?sysDescr_instance, 
+					 ?sysUpTime_instance]) 
+		  end}
+		],
+    
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+async_g_exec2(Node, TargetName, Oids) ->
+    mgr_user_async_get(Node, TargetName, Oids).
+
+
+%%======================================================================
+
+simple_sync_get_next1(doc) -> ["Simple (sync) get_next-request - "
+			       "Old style (Addr & Port)"];
+simple_sync_get_next1(suite) -> [];
+simple_sync_get_next1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssgn1),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    Addr      = ?config(ip, Config),
+    Port      = ?AGENT_PORT,
+
+    %% -- 1 --
+    Oids01 = [[1,3,7,1]],
+    VF01   = fun(X) -> verify_ssgn_reply1(X, [{[1,3,7,1],endOfMibView}]) end,
+    ?line ok = do_simple_get_next(1, 
+				  MgrNode, Addr, Port, Oids01, VF01),
+    
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+
+    %% -- 2 --
+    Oids02 = [[sysDescr], [1,3,7,1]], 
+    VF02   = fun(X) -> 
+		     verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView]) 
+	     end,
+    ?line ok = do_simple_get_next(2, 
+				  MgrNode, Addr, Port, Oids02, VF02),
+    
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    %% -- 3 --
+    ?line {ok, [TCnt2|_]} = mgr_user_name_to_oid(MgrNode, tCnt2),
+    Oids03 = [[TCnt2, 1]], 
+    VF03   = fun(X) -> 
+		     verify_ssgn_reply1(X, [{fl([TCnt2,2]), 100}]) 
+	     end,
+    ?line ok = do_simple_get_next(3, 
+				  MgrNode, Addr, Port, Oids03, VF03),
+    
+    %% -- 4 --
+    Oids04 = [[TCnt2, 2]], 
+    VF04   = fun(X) -> 
+		     verify_ssgn_reply1(X, [{fl([TCnt2,2]), endOfMibView}]) 
+	     end,
+    ?line ok = do_simple_get_next(4, 
+				  MgrNode, Addr, Port, Oids04, VF04),
+    
+    %% -- 5 --
+    ?line {ok, [TGenErr1|_]} = mgr_user_name_to_oid(MgrNode, tGenErr1),
+    Oids05 = [TGenErr1], 
+    VF05   = fun(X) -> 
+		     verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}) 
+	     end,
+    ?line ok = do_simple_get_next(5, 
+				  MgrNode, Addr, Port, Oids05, VF05),
+    
+    %% -- 6 --
+    ?line {ok, [TGenErr2|_]} = mgr_user_name_to_oid(MgrNode, tGenErr2),
+    Oids06 = [TGenErr2], 
+    VF06   = fun(X) -> 
+		     verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}) 
+	     end,
+    ?line ok = do_simple_get_next(6, 
+				  MgrNode, Addr, Port, Oids06, VF06),
+    
+    %% -- 7 --
+    ?line {ok, [TGenErr3|_]} = mgr_user_name_to_oid(MgrNode, tGenErr3),
+    Oids07 = [[sysDescr], TGenErr3], 
+    VF07   = fun(X) -> 
+		     verify_ssgn_reply2(X, {genErr, 2, 
+					   [?sysDescr, TGenErr3]}) 
+	     end,
+    ?line ok = do_simple_get_next(7, 
+				  MgrNode, Addr, Port, Oids07, VF07),
+    
+    %% -- 8 --
+    ?line {ok, [TTooBig|_]} = mgr_user_name_to_oid(MgrNode, tTooBig),
+    Oids08 = [TTooBig], 
+    VF08   = fun(X) -> 
+		     verify_ssgn_reply2(X, {tooBig, 0, []}) 
+	     end,
+    ?line ok = do_simple_get_next(8, 
+				  MgrNode, Addr, Port, Oids08, VF08),
+    ok.
+
+
+do_simple_get_next(N, Node, Addr, Port, Oids, Verify) ->
+    p("issue get-next command ~w", [N]),
+    case mgr_user_sync_get_next(Node, Addr, Port, Oids) of
+	{ok, Reply, Rem} ->
+	    ?DBG("get-next ok:"
+		 "~n   Reply: ~p"
+		 "~n   Rem:   ~w", [Reply, Rem]),
+	    Verify(Reply);
+
+	Error ->
+	    {error, {unexpected_reply, Error}}
+    end.
+
+
+verify_ssgn_reply1({noError, 0, _Vbs}, any) ->
+    ok;
+verify_ssgn_reply1({noError, 0, Vbs}, Expected) ->
+    check_ssgn_vbs(Vbs, Expected);
+verify_ssgn_reply1(R, _) ->
+    {error, {unexpected_reply, R}}.
+
+verify_ssgn_reply2({ErrStatus, ErrIdx, _Vbs}, {ErrStatus, ErrIdx, any}) ->
+    ok;
+verify_ssgn_reply2({ErrStatus, ErrIdx, Vbs}, {ErrStatus, ErrIdx, Expected}) ->
+    check_ssgn_vbs(Vbs, Expected);
+verify_ssgn_reply2(R, _) ->
+    {error, {unexpected_reply, R}}.
+
+check_ssgn_vbs([], []) ->
+    ok;
+check_ssgn_vbs(Unexpected, []) ->
+    {error, {unexpected_vbs, Unexpected}};
+check_ssgn_vbs([], Expected) ->
+    {error, {expected_vbs, Expected}};
+check_ssgn_vbs([#varbind{value = endOfMibView}|R], 
+	       [endOfMibView|Expected]) ->
+    check_ssgn_vbs(R, Expected);
+check_ssgn_vbs([#varbind{oid = Oid}|R], [Oid|Expected]) ->
+    check_ssgn_vbs(R, Expected);
+check_ssgn_vbs([#varbind{oid = Oid, value = Value}|R], 
+	       [{Oid, Value}|Expected]) ->
+    check_ssgn_vbs(R, Expected);
+check_ssgn_vbs([Vb|_], [E|_]) ->
+    {error, {unexpected_vb, Vb, E}}.
+
+
+%%======================================================================
+
+simple_sync_get_next2(doc) -> ["Simple (sync) get_next-request - "
+			       "New style (TargetName)"];
+simple_sync_get_next2(suite) -> [];
+simple_sync_get_next2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssgn),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    %% -- 1 --
+    Oids01 = [[1,3,7,1]],
+    VF01   = fun(X) -> verify_ssgn_reply1(X, [{[1,3,7,1],endOfMibView}]) end,
+    ?line ok = do_simple_get_next(1, 
+				  MgrNode, TargetName, Oids01, VF01),
+    
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+
+    %% -- 2 --
+    Oids02 = [[sysDescr], [1,3,7,1]], 
+    VF02   = fun(X) -> 
+		     verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView]) 
+	     end,
+    ?line ok = do_simple_get_next(2, 
+				  MgrNode, TargetName, Oids02, VF02),
+    
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    %% -- 3 --
+    ?line {ok, [TCnt2|_]} = mgr_user_name_to_oid(MgrNode, tCnt2),
+    Oids03 = [[TCnt2, 1]], 
+    VF03   = fun(X) -> 
+		     verify_ssgn_reply1(X, [{fl([TCnt2,2]), 100}]) 
+	     end,
+    ?line ok = do_simple_get_next(3, 
+				  MgrNode, TargetName, Oids03, VF03),
+    
+    %% -- 4 --
+    Oids04 = [[TCnt2, 2]], 
+    VF04   = fun(X) -> 
+		     verify_ssgn_reply1(X, [{fl([TCnt2,2]), endOfMibView}]) 
+	     end,
+    ?line ok = do_simple_get_next(4, 
+				  MgrNode, TargetName, Oids04, VF04),
+    
+    %% -- 5 --
+    ?line {ok, [TGenErr1|_]} = mgr_user_name_to_oid(MgrNode, tGenErr1),
+    Oids05 = [TGenErr1], 
+    VF05   = fun(X) -> 
+		     verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}) 
+	     end,
+    ?line ok = do_simple_get_next(5, 
+				  MgrNode, TargetName, Oids05, VF05),
+    
+    %% -- 6 --
+    ?line {ok, [TGenErr2|_]} = mgr_user_name_to_oid(MgrNode, tGenErr2),
+    Oids06 = [TGenErr2], 
+    VF06   = fun(X) -> 
+		     verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}) 
+	     end,
+    ?line ok = do_simple_get_next(6, 
+				  MgrNode, TargetName, Oids06, VF06),
+    
+    %% -- 7 --
+    ?line {ok, [TGenErr3|_]} = mgr_user_name_to_oid(MgrNode, tGenErr3),
+    Oids07 = [[sysDescr], TGenErr3], 
+    VF07   = fun(X) -> 
+		     verify_ssgn_reply2(X, {genErr, 2, 
+					   [?sysDescr, TGenErr3]}) 
+	     end,
+    ?line ok = do_simple_get_next(7, 
+				  MgrNode, TargetName, Oids07, VF07),
+    
+    %% -- 8 --
+    ?line {ok, [TTooBig|_]} = mgr_user_name_to_oid(MgrNode, tTooBig),
+    Oids08 = [TTooBig], 
+    VF08   = fun(X) -> 
+		     verify_ssgn_reply2(X, {tooBig, 0, []}) 
+	     end,
+    ?line ok = do_simple_get_next(8, 
+				  MgrNode, TargetName, Oids08, VF08),
+    ok.
+
+
+do_simple_get_next(N, Node, TargetName, Oids, Verify) ->
+    p("issue get-next command ~w", [N]),
+    case mgr_user_sync_get_next(Node, TargetName, Oids) of
+	{ok, Reply, Rem} ->
+	    ?DBG("get-next ok:"
+		 "~n   Reply: ~p"
+		 "~n   Rem:   ~w", [Reply, Rem]),
+	    Verify(Reply);
+
+	Error ->
+	    {error, {unexpected_reply, Error}}
+    end.
+
+
+%%======================================================================
+
+simple_async_get_next1(doc) -> ["Simple (async) get_next-request - "
+				"Old style (Addr & Port)"];
+simple_async_get_next1(suite) -> [];
+simple_async_get_next1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssgn1),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    Addr      = ?config(ip, Config),
+    Port      = ?AGENT_PORT,
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    Exec = fun(X) ->
+		   async_gn_exec1(MgrNode, Addr, Port, X)
+	   end,
+
+    ?line {ok, [TCnt2|_]}    = mgr_user_name_to_oid(MgrNode, tCnt2),
+    ?line {ok, [TGenErr1|_]} = mgr_user_name_to_oid(MgrNode, tGenErr1),
+    ?line {ok, [TGenErr2|_]} = mgr_user_name_to_oid(MgrNode, tGenErr2),
+    ?line {ok, [TGenErr3|_]} = mgr_user_name_to_oid(MgrNode, tGenErr3),
+    ?line {ok, [TTooBig|_]}  = mgr_user_name_to_oid(MgrNode, tTooBig),
+
+    Requests = 
+	[
+	 {1, 
+	  [[1,3,7,1]], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply1(X, [{[1,3,7,1], endOfMibView}])
+	  end}, 
+	 {2, 
+	  [[sysDescr], [1,3,7,1]], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView])
+	  end}, 
+	 {3, 
+	  [[TCnt2, 1]], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply1(X, [{fl([TCnt2,2]), 100}])
+	  end}, 
+	 {4, 
+	  [[TCnt2, 2]], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply1(X, [{fl([TCnt2,2]), endOfMibView}])
+	  end}, 
+	 {5, 
+	  [TGenErr1], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}) 
+	  end}, 
+	 {6, 
+	  [TGenErr2], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}) 
+	  end}, 
+	 {7, 
+	  [[sysDescr], TGenErr3], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 2, [TGenErr3]}) 
+	  end}, 
+	 {8, 
+	  [TTooBig], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {tooBig, 0, []}) 
+	  end}
+	],
+
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+
+async_gn_exec1(Node, Addr, Port, Oids) ->
+    mgr_user_async_get_next(Node, Addr, Port, Oids).
+
+
+%%======================================================================
+
+simple_async_get_next2(doc) -> ["Simple (async) get_next-request - "
+				"New style (TargetName)"];
+simple_async_get_next2(suite) -> [];
+simple_async_get_next2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssgn2),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode    = ?config(manager_node, Config),
+    AgentNode  = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    Exec = fun(X) ->
+		   async_gn_exec2(MgrNode, TargetName, X)
+	   end,
+
+    ?line {ok, [TCnt2|_]}    = mgr_user_name_to_oid(MgrNode, tCnt2),
+    ?line {ok, [TGenErr1|_]} = mgr_user_name_to_oid(MgrNode, tGenErr1),
+    ?line {ok, [TGenErr2|_]} = mgr_user_name_to_oid(MgrNode, tGenErr2),
+    ?line {ok, [TGenErr3|_]} = mgr_user_name_to_oid(MgrNode, tGenErr3),
+    ?line {ok, [TTooBig|_]}  = mgr_user_name_to_oid(MgrNode, tTooBig),
+
+    Requests = 
+	[
+	 {1, 
+	  [[1,3,7,1]], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply1(X, [{[1,3,7,1], endOfMibView}])
+	  end}, 
+	 {2, 
+	  [[sysDescr], [1,3,7,1]], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView])
+	  end}, 
+	 {3, 
+	  [[TCnt2, 1]], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply1(X, [{fl([TCnt2,2]), 100}])
+	  end}, 
+	 {4, 
+	  [[TCnt2, 2]], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply1(X, [{fl([TCnt2,2]), endOfMibView}])
+	  end}, 
+	 {5, 
+	  [TGenErr1], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}) 
+	  end}, 
+	 {6, 
+	  [TGenErr2], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}) 
+	  end}, 
+	 {7, 
+	  [[sysDescr], TGenErr3], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 2, [TGenErr3]}) 
+	  end}, 
+	 {8, 
+	  [TTooBig], 
+	  Exec, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {tooBig, 0, []}) 
+	  end}
+	],
+
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+
+async_gn_exec2(Node, TargetName, Oids) ->
+    mgr_user_async_get_next(Node, TargetName, Oids).
+
+
+%%======================================================================
+
+simple_sync_set1(doc) -> ["Simple (sync) set-request - "
+			  "Old style (Addr & Port)"];
+simple_sync_set1(suite) -> [];
+simple_sync_set1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sss1),
+    p("starting with Config: ~p~n", [Config]),
+
+    Node = ?config(manager_node, Config),
+    Addr = ?config(ip, Config),
+    Port = ?AGENT_PORT,
+
+    p("issue set-request without loading the mib"),
+    Val11 = "Arne Anka",
+    Val12 = "Stockholm",
+    VAVs1 = [
+	     {?sysName_instance,     s, Val11},
+	     {?sysLocation_instance, s, Val12}
+	    ],
+    ?line ok = do_simple_set1(Node, Addr, Port, VAVs1),
+
+    p("issue set-request after first loading the mibs"),
+    ?line ok = mgr_user_load_mib(Node, std_mib()),
+    Val21 = "Sune Anka",
+    Val22 = "Gothenburg",
+    VAVs2 = [
+	     {[sysName, 0],     Val21},
+	     {[sysLocation, 0], Val22}
+	    ],
+    ?line ok = do_simple_set1(Node, Addr, Port, VAVs2),
+    ok.
+
+do_simple_set1(Node, Addr, Port, VAVs) ->
+    [SysName, SysLoc] = value_of_vavs(VAVs),
+    ?line {ok, Reply, Rem} = mgr_user_sync_set(Node, Addr, Port, VAVs),
+
+    ?DBG("~n   Reply: ~p"
+	 "~n   Rem:   ~w", [Reply, Rem]),
+
+    %% verify that the operation actually worked:
+    %% The order should be the same, so no need to seach 
+    %% The value we get should be exactly the same as we sent
+    ?line ok = case Reply of
+		   {noError, 0, [#varbind{oid   = ?sysName_instance,
+					  value = SysName},
+				 #varbind{oid   = ?sysLocation_instance,
+					  value = SysLoc}]} ->
+		       ok;
+		   {noError, 0, Vbs} ->
+		       {error, {unexpected_vbs, Vbs}};
+		   Else ->
+		       p("unexpected reply: ~n~p", [Else]),
+		       {error, {unexpected_response, Else}}
+	       end,
+    ok.
+
+value_of_vavs(VAVs) ->
+    value_of_vavs(VAVs, []).
+
+value_of_vavs([], Acc) ->
+    lists:reverse(Acc);
+value_of_vavs([{_Oid, _Type, Val}|VAVs], Acc) ->
+    value_of_vavs(VAVs, [Val|Acc]);
+value_of_vavs([{_Oid, Val}|VAVs], Acc) ->
+    value_of_vavs(VAVs, [Val|Acc]).
+
+			       
+%%======================================================================
+
+simple_sync_set2(doc) -> ["Simple (sync) set-request - New style (TargetName)"];
+simple_sync_set2(suite) -> [];
+simple_sync_set2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sss2),
+    p("starting with Config: ~p~n", [Config]),
+
+    Node = ?config(manager_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    p("issue set-request without loading the mib"),
+    Val11 = "Arne Anka",
+    Val12 = "Stockholm",
+    VAVs1 = [
+	     {?sysName_instance,     s, Val11},
+	     {?sysLocation_instance, s, Val12}
+	    ],
+    ?line ok = do_simple_set2(Node, TargetName, VAVs1),
+
+    p("issue set-request after first loading the mibs"),
+    ?line ok = mgr_user_load_mib(Node, std_mib()),
+    Val21 = "Sune Anka",
+    Val22 = "Gothenburg",
+    VAVs2 = [
+	     {[sysName, 0],     Val21},
+	     {[sysLocation, 0], Val22}
+	    ],
+    ?line ok = do_simple_set2(Node, TargetName, VAVs2),
+    ok.
+
+do_simple_set2(Node, TargetName, VAVs) ->
+    [SysName, SysLoc] = value_of_vavs(VAVs),
+    ?line {ok, Reply, Rem} = mgr_user_sync_set(Node, TargetName, VAVs),
+
+    ?DBG("~n   Reply: ~p"
+	 "~n   Rem:   ~w", [Reply, Rem]),
+
+    %% verify that the operation actually worked:
+    %% The order should be the same, so no need to seach 
+    %% The value we get should be exactly the same as we sent
+    ?line ok = case Reply of
+		   {noError, 0, [#varbind{oid   = ?sysName_instance,
+					  value = SysName},
+				 #varbind{oid   = ?sysLocation_instance,
+					  value = SysLoc}]} ->
+		       ok;
+		   {noError, 0, Vbs} ->
+		       {error, {unexpected_vbs, Vbs}};
+		   Else ->
+		       p("unexpected reply: ~n~p", [Else]),
+		       {error, {unexpected_response, Else}}
+	       end,
+    ok.
+
+
+%%======================================================================
+
+simple_async_set1(doc) -> ["Simple (async) set-request - "
+			   "Old style (Addr & Port)"];
+simple_async_set1(suite) -> [];
+simple_async_set1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sas1),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    Addr      = ?config(ip, Config),
+    Port      = ?AGENT_PORT,
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    Exec = fun(X) ->
+		   async_s_exec1(MgrNode, Addr, Port, X)
+	   end,
+
+    Requests = 
+	[
+	 {1,
+	  [{?sysName_instance, s, "Arne Anka"}],
+	  Exec,
+	  fun(X) ->
+		  sas_verify(X, [?sysName_instance])
+	  end},
+	 {2,
+	  [{?sysLocation_instance, s, "Stockholm"}, 
+	   {?sysName_instance,     s, "Arne Anka"}],
+	  Exec,
+	  fun(X) ->
+		  sas_verify(X, [?sysLocation_instance, ?sysName_instance])
+	  end},
+	 {3,
+	  [{[sysName, 0],     "Gothenburg"}, 
+	   {[sysLocation, 0], "Sune Anka"}],
+	  Exec,
+	  fun(X) ->
+		  sas_verify(X, [?sysName_instance, ?sysLocation_instance])
+	  end}
+	],
+
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+
+async_s_exec1(Node, Addr, Port, VAVs) ->
+    mgr_user_async_set(Node, Addr, Port, VAVs).
+
+sas_verify({noError, 0, _Vbs}, any) ->
+    p("verified [any]"),
+    ok;
+sas_verify({noError, 0, Vbs}, Expected) ->
+    ?DBG("verified stage 1: "
+	 "~n   Vbs: ~p"
+	 "~n   Exp: ~p", [Vbs, Expected]),
+    sas_verify_vbs(Vbs, Expected);
+sas_verify(Error, _) ->
+    {error, {unexpected_reply, Error}}.
+
+sas_verify_vbs([], []) ->
+    ok;
+sas_verify_vbs(Vbs, []) ->
+    {error, {unexpected_vbs, Vbs}};
+sas_verify_vbs([], Exp) ->
+    {error, {expected_vbs, Exp}};
+sas_verify_vbs([#varbind{oid = Oid}|Vbs], [any|Exp]) ->
+    p("verified [any] oid ~w", [Oid]),
+    sas_verify_vbs(Vbs, Exp);
+sas_verify_vbs([#varbind{oid = Oid, value = Value}|Vbs], [Oid|Exp]) ->
+    p("verified oid ~w [~p]", [Oid, Value]),
+    sas_verify_vbs(Vbs, Exp);
+sas_verify_vbs([#varbind{oid = Oid, value = Value}|Vbs], [{Oid,Value}|Exp]) ->
+    p("verified oid ~w and ~p", [Oid, Value]),
+    sas_verify_vbs(Vbs, Exp);
+sas_verify_vbs([Vb|_], [E|_]) ->
+    {error, {unexpected_vb, Vb, E}}.
+
+    
+%%======================================================================
+
+simple_async_set2(doc) -> ["Simple (async) set-request - "
+			   "New style (TargetName)"];
+simple_async_set2(suite) -> [];
+simple_async_set2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sas2),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode    = ?config(manager_node, Config),
+    AgentNode  = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    Exec = fun(X) ->
+		   async_s_exec2(MgrNode, TargetName, X)
+	   end,
+
+    Requests = 
+	[
+	 {1,
+	  [{?sysName_instance, s, "Arne Anka"}],
+	  Exec,
+	  fun(X) ->
+		  sas_verify(X, [?sysName_instance])
+	  end},
+	 {2,
+	  [{?sysLocation_instance, s, "Stockholm"}, 
+	   {?sysName_instance,     s, "Arne Anka"}],
+	  Exec,
+	  fun(X) ->
+		  sas_verify(X, [?sysLocation_instance, ?sysName_instance])
+	  end},
+	 {3,
+	  [{[sysName, 0],     "Gothenburg"}, 
+	   {[sysLocation, 0], "Sune Anka"}],
+	  Exec,
+	  fun(X) ->
+		  sas_verify(X, [?sysName_instance, ?sysLocation_instance])
+	  end}
+	],
+
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+
+async_s_exec2(Node, TargetName, VAVs) ->
+    mgr_user_async_set(Node, TargetName, VAVs).
+
+
+%%======================================================================
+
+simple_sync_get_bulk1(doc) -> ["Simple (sync) get_bulk-request - "
+			       "Old style (Addr & Port)"];
+simple_sync_get_bulk1(suite) -> [];
+simple_sync_get_bulk1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssgb1),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    Addr = ?config(ip, Config),
+    Port = ?AGENT_PORT,
+
+    %% -- 1 --
+    ?line ok = do_simple_get_bulk1(1,
+				  MgrNode, Addr, Port,  1,  1, [], 
+				  fun verify_ssgb_reply1/1), 
+
+    %% -- 2 --
+    ?line ok = do_simple_get_bulk1(2, 
+				  MgrNode, Addr, Port, -1,  1, [], 
+				  fun verify_ssgb_reply1/1), 
+
+    %% -- 3 --
+    ?line ok = do_simple_get_bulk1(3, 
+				  MgrNode, Addr, Port, -1, -1, [], 
+				  fun verify_ssgb_reply1/1), 
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    %% -- 4 --
+    VF04 = fun(X) -> 
+		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+	   end,
+    ?line ok = do_simple_get_bulk1(4,
+				  MgrNode, Addr, Port,  
+				  2, 0, [[sysDescr],[1,3,7,1]], VF04),
+
+    %% -- 5 --
+    ?line ok = do_simple_get_bulk1(5,
+				  MgrNode, Addr, Port,  
+				  1, 2, [[sysDescr],[1,3,7,1]], VF04),
+
+    %% -- 6 --
+    VF06 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance,    endOfMibView,
+				       ?sysObjectID_instance, endOfMibView]) 
+	   end,
+    ?line ok = do_simple_get_bulk1(6,
+				  MgrNode, Addr, Port,  
+				  0, 2, [[sysDescr],[1,3,7,1]], VF06), 
+
+    %% -- 7 --
+    VF07 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance,    endOfMibView,
+				       ?sysDescr_instance,    endOfMibView,
+				       ?sysObjectID_instance, endOfMibView]) 
+	   end,
+    ?line ok = do_simple_get_bulk1(7,
+				  MgrNode, Addr, Port,  
+				  2, 2, 
+				  [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]],
+				  VF07), 
+
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    %% -- 8 --
+    VF08 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance, 
+				       ?sysDescr_instance]) 
+	   end,
+    ?line ok = do_simple_get_bulk1(8,
+				  MgrNode, Addr, Port,  
+				  1, 2, 
+				  [[sysDescr],[sysDescr],[tTooBig]],
+				 VF08), 
+
+    %% -- 9 --
+    ?line ok = do_simple_get_bulk1(9,
+				  MgrNode, Addr, Port,  
+				  1, 12, 
+				  [[tDescr2], [sysDescr]], 
+				  fun verify_ssgb_reply1/1),
+
+    %% -- 10 --
+    VF10 = fun(X) -> 
+		   verify_ssgb_reply3(X, 
+				      [{?sysDescr,    'NULL'}, 
+				       {?sysObjectID, 'NULL'},
+				       {?tGenErr1,    'NULL'},
+				       {?sysDescr,    'NULL'}]) 
+	   end,
+    ?line ok = do_simple_get_bulk1(10,
+				  MgrNode, Addr, Port,  
+				  2, 2, 
+				  [[sysDescr], 
+				   [sysObjectID], 
+				   [tGenErr1], 
+				   [sysDescr]],
+				 VF10), 
+
+    %% -- 11 --
+    ?line {ok, [TCnt2|_]} = mgr_user_name_to_oid(MgrNode, tCnt2),
+    p("TCnt2: ~p", [TCnt2]),
+    VF11 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [{fl([TCnt2,2]), 100}, 
+				       {fl([TCnt2,2]), endOfMibView}]) 
+	   end,
+    ?line ok = do_simple_get_bulk1(11,
+				  MgrNode, Addr, Port,  
+				  0, 2, 
+				  [[TCnt2, 1]], VF11),
+
+    ok.
+
+fl(L) ->
+    lists:flatten(L).
+
+do_simple_get_bulk1(N, Node, Addr, Port, NonRep, MaxRep, Oids, Verify) ->
+    p("issue get-bulk command ~w", [N]),
+    case mgr_user_sync_get_bulk(Node, Addr, Port, NonRep, MaxRep, Oids) of
+	{ok, Reply, Rem} ->
+	    ?DBG("get-bulk ok:"
+		 "~n   Reply: ~p"
+		 "~n   Rem:   ~w", [Reply, Rem]),
+	    Verify(Reply);
+
+	Error ->
+	    {error, {unexpected_reply, Error}}
+    end.
+
+verify_ssgb_reply1({noError, 0, []}) ->
+    ok;
+verify_ssgb_reply1(X) ->
+    {error, {unexpected_reply, X}}.
+
+verify_ssgb_reply2({noError, 0, Vbs}, ExpectedVbs) ->
+    check_ssgb_vbs(Vbs, ExpectedVbs);
+verify_ssgb_reply2(Error, _) ->
+    {error, {unexpected_reply, Error}}.
+
+verify_ssgb_reply3({genErr, 3, Vbs}, ExpectedVbs) ->
+    check_ssgb_vbs(Vbs, ExpectedVbs);
+verify_ssgb_reply3(Unexpected, _) ->
+    {error, {unexpected_reply, Unexpected}}.
+
+check_ssgb_vbs([], []) ->
+    ok;
+check_ssgb_vbs(Unexpected, []) ->
+    {error, {unexpected_vbs, Unexpected}};
+check_ssgb_vbs([], Expected) ->
+    {error, {expected_vbs, Expected}};
+check_ssgb_vbs([#varbind{value = endOfMibView}|R], 
+	       [endOfMibView|Expected]) ->
+    check_ssgb_vbs(R, Expected);
+check_ssgb_vbs([#varbind{oid = Oid}|R], [Oid|Expected]) ->
+    check_ssgb_vbs(R, Expected);
+check_ssgb_vbs([#varbind{oid = Oid, value = Value}|R], 
+	       [{Oid, Value}|Expected]) ->
+    check_ssgb_vbs(R, Expected);
+check_ssgb_vbs([R|_], [E|_]) ->
+    {error, {unexpected_vb, R, E}}.
+
+
+%%======================================================================
+
+simple_sync_get_bulk2(doc) -> ["Simple (sync) get_bulk-request - "
+			       "New style (TargetName)"];
+simple_sync_get_bulk2(suite) -> [];
+simple_sync_get_bulk2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssgb2),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode    = ?config(manager_node, Config),
+    AgentNode  = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    %% -- 1 --
+    ?line ok = do_simple_get_bulk2(1,
+				   MgrNode, TargetName,  1,  1, [], 
+				   fun verify_ssgb_reply1/1), 
+    
+    %% -- 2 --
+    ?line ok = do_simple_get_bulk2(2, 
+				   MgrNode, TargetName, -1,  1, [], 
+				   fun verify_ssgb_reply1/1), 
+
+    %% -- 3 --
+    ?line ok = do_simple_get_bulk2(3, 
+				   MgrNode, TargetName, -1, -1, [], 
+				   fun verify_ssgb_reply1/1), 
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    %% -- 4 --
+    VF04 = fun(X) -> 
+		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+	   end,
+    ?line ok = do_simple_get_bulk2(4,
+				   MgrNode, TargetName, 
+				   2, 0, [[sysDescr],[1,3,7,1]], VF04),
+
+    %% -- 5 --
+    ?line ok = do_simple_get_bulk2(5,
+				   MgrNode, TargetName,  
+				   1, 2, [[sysDescr],[1,3,7,1]], VF04),
+
+    %% -- 6 --
+    VF06 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance,    endOfMibView,
+				       ?sysObjectID_instance, endOfMibView]) 
+	   end,
+    ?line ok = do_simple_get_bulk2(6,
+				   MgrNode, TargetName,  
+				   0, 2, [[sysDescr],[1,3,7,1]], VF06), 
+
+    %% -- 7 --
+    VF07 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance,    endOfMibView,
+				       ?sysDescr_instance,    endOfMibView,
+				       ?sysObjectID_instance, endOfMibView]) 
+	   end,
+    ?line ok = do_simple_get_bulk2(7,
+				   MgrNode, TargetName, 
+				   2, 2, 
+				   [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]],
+				   VF07), 
+
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    %% -- 8 --
+    VF08 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance, 
+				       ?sysDescr_instance]) 
+	   end,
+    ?line ok = do_simple_get_bulk2(8,
+				   MgrNode, TargetName, 
+				   1, 2, 
+				   [[sysDescr],[sysDescr],[tTooBig]],
+				   VF08), 
+
+    %% -- 9 --
+    ?line ok = do_simple_get_bulk2(9,
+				   MgrNode, TargetName, 
+				   1, 12, 
+				   [[tDescr2], [sysDescr]], 
+				   fun verify_ssgb_reply1/1),
+
+    %% -- 10 --
+    VF10 = fun(X) -> 
+		   verify_ssgb_reply3(X, 
+				      [{?sysDescr,    'NULL'}, 
+				       {?sysObjectID, 'NULL'},
+				       {?tGenErr1,    'NULL'},
+				       {?sysDescr,    'NULL'}]) 
+	   end,
+    ?line ok = do_simple_get_bulk2(10,
+				   MgrNode, TargetName,  
+				   2, 2, 
+				   [[sysDescr], 
+				    [sysObjectID], 
+				    [tGenErr1], 
+				    [sysDescr]],
+				   VF10), 
+
+    %% -- 11 --
+    ?line {ok, [TCnt2|_]} = mgr_user_name_to_oid(MgrNode, tCnt2),
+    p("TCnt2: ~p", [TCnt2]),
+    VF11 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [{fl([TCnt2,2]), 100}, 
+				       {fl([TCnt2,2]), endOfMibView}]) 
+	   end,
+    ?line ok = do_simple_get_bulk2(11,
+				   MgrNode, TargetName,  
+				   0, 2, 
+				   [[TCnt2, 1]], VF11),
+    
+    ok.
+
+do_simple_get_bulk2(N, Node, TargetName, NonRep, MaxRep, Oids, Verify) ->
+    p("issue get-bulk command ~w", [N]),
+    case mgr_user_sync_get_bulk(Node, TargetName, NonRep, MaxRep, Oids) of
+	{ok, Reply, Rem} ->
+	    ?DBG("get-bulk ok:"
+		 "~n   Reply: ~p"
+		 "~n   Rem:   ~w", [Reply, Rem]),
+	    Verify(Reply);
+
+	Error ->
+	    {error, {unexpected_reply, Error}}
+    end.
+
+
+%%======================================================================
+
+simple_async_get_bulk1(doc) -> ["Simple (async) get_bulk-request - "
+				"Old style (Addr & Port)"];
+simple_async_get_bulk1(suite) -> [];
+simple_async_get_bulk1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sagb1),
+    p("starting with Config: ~p~n", [Config]),
+    
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    Addr = ?config(ip, Config),
+    Port = ?AGENT_PORT,
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    Exec = fun(Data) ->
+		    async_gb_exec1(MgrNode, Addr, Port, Data)
+	   end,
+
+    %% We re-use the verification functions from the ssgb test-case
+    VF04 = fun(X) -> 
+		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+	   end,
+    VF06 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance,    endOfMibView,
+				       ?sysObjectID_instance, endOfMibView]) 
+	   end,
+    VF07 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance,    endOfMibView,
+				       ?sysDescr_instance,    endOfMibView,
+				       ?sysObjectID_instance, endOfMibView]) 
+	   end,
+    VF08 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance, 
+				       ?sysDescr_instance]) 
+	   end,
+    VF10 = fun(X) -> 
+		   verify_ssgb_reply3(X, 
+				      [{?sysDescr,    'NULL'}, 
+				       {?sysObjectID, 'NULL'},
+				       {?tGenErr1,    'NULL'},
+				       {?sysDescr,    'NULL'}]) 
+	   end,
+    ?line {ok, [TCnt2|_]} = mgr_user_name_to_oid(MgrNode, tCnt2),
+    VF11 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [{fl([TCnt2,2]), 100}, 
+				       {fl([TCnt2,2]), endOfMibView}]) 
+	   end,
+    Requests = [
+		{ 1,  
+		  {1,  1, []}, 
+		  Exec, 
+		  fun verify_ssgb_reply1/1},
+		{ 2, 
+		  {-1,  1, []}, 
+		  Exec, 
+		  fun verify_ssgb_reply1/1},
+		{ 3, 
+		  {-1, -1, []}, 
+		  Exec, 
+		  fun verify_ssgb_reply1/1},
+		{ 4,  
+		  {2,  0, [[sysDescr],[1,3,7,1]]}, 
+		  Exec, 
+		  VF04},
+		{ 5,  
+		  {1,  2, [[sysDescr],[1,3,7,1]]}, 
+		  Exec, 
+		  VF04},
+		{ 6,  
+		  {0,  2, [[sysDescr],[1,3,7,1]]}, 
+		  Exec, 
+		  VF06},
+		{ 7,  
+		  {2,  2, [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]]}, 
+		  Exec, 
+		  VF07},
+		{ 8,  
+		  {1,  2, [[sysDescr],[sysDescr],[tTooBig]]}, 
+		  Exec, 
+		  VF08},
+		{ 9,  
+		  {1, 12, [[tDescr2], [sysDescr]]}, 
+		  Exec, 
+		  fun verify_ssgb_reply1/1},
+		{10,  
+		 {2,  2, [[sysDescr],[sysObjectID], [tGenErr1],[sysDescr]]}, 
+		 Exec, 
+		 VF10},
+		{11,  
+		 {0,  2, [[TCnt2, 1]]}, 
+		 Exec,
+		 VF11}, 
+		{12,  
+		 {2,  0, [[sysDescr],[1,3,7,1]]}, 
+		 Exec,
+		 VF04},
+		{13,  
+		 {1, 12, [[tDescr2], [sysDescr]]},
+		 Exec, 
+		 fun verify_ssgb_reply1/1},
+		{14,  
+		 {2,  2, [[sysDescr],[sysObjectID],[tGenErr1],[sysDescr]]},
+		 Exec, 
+		 VF10},
+		{15,  
+		 {0,  2, [[TCnt2, 1]]},
+		 Exec, 
+		 VF11},
+		{16,  
+		 {2,  2, [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]]},
+		 Exec, 
+		 VF07},
+		{17,  
+		 {2,  2, [[sysDescr],[sysObjectID], [tGenErr1],[sysDescr]]},
+		 Exec, 
+		 VF10}
+	       ],
+
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+
+async_gb_exec1(Node, Addr, Port, {NR, MR, Oids}) ->
+    mgr_user_async_get_bulk(Node, Addr, Port, NR, MR, Oids).
+
+
+%%======================================================================
+
+simple_async_get_bulk2(doc) -> ["Simple (async) get_bulk-request - "
+				"New style (TargetName)"];
+simple_async_get_bulk2(suite) -> [];
+simple_async_get_bulk2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sagb2),
+    p("starting with Config: ~p~n", [Config]),
+    
+    MgrNode    = ?config(manager_node, Config),
+    AgentNode  = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+
+    Exec = fun(Data) ->
+		    async_gb_exec2(MgrNode, TargetName, Data)
+	   end,
+
+    %% We re-use the verification functions from the ssgb test-case
+    VF04 = fun(X) -> 
+		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+	   end,
+    VF06 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance,    endOfMibView,
+				       ?sysObjectID_instance, endOfMibView]) 
+	   end,
+    VF07 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance,    endOfMibView,
+				       ?sysDescr_instance,    endOfMibView,
+				       ?sysObjectID_instance, endOfMibView]) 
+	   end,
+    VF08 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [?sysDescr_instance, 
+				       ?sysDescr_instance]) 
+	   end,
+    VF10 = fun(X) -> 
+		   verify_ssgb_reply3(X, 
+				      [{?sysDescr,    'NULL'}, 
+				       {?sysObjectID, 'NULL'},
+				       {?tGenErr1,    'NULL'},
+				       {?sysDescr,    'NULL'}]) 
+	   end,
+    ?line {ok, [TCnt2|_]} = mgr_user_name_to_oid(MgrNode, tCnt2),
+    VF11 = fun(X) -> 
+		   verify_ssgb_reply2(X, 
+				      [{fl([TCnt2,2]), 100}, 
+				       {fl([TCnt2,2]), endOfMibView}]) 
+	   end,
+    Requests = [
+		{ 1,  
+		  {1,  1, []}, 
+		  Exec, 
+		  fun verify_ssgb_reply1/1},
+		{ 2, 
+		  {-1,  1, []}, 
+		  Exec, 
+		  fun verify_ssgb_reply1/1},
+		{ 3, 
+		  {-1, -1, []}, 
+		  Exec, 
+		  fun verify_ssgb_reply1/1},
+		{ 4,  
+		  {2,  0, [[sysDescr],[1,3,7,1]]}, 
+		  Exec, 
+		  VF04},
+		{ 5,  
+		  {1,  2, [[sysDescr],[1,3,7,1]]}, 
+		  Exec, 
+		  VF04},
+		{ 6,  
+		  {0,  2, [[sysDescr],[1,3,7,1]]}, 
+		  Exec, 
+		  VF06},
+		{ 7,  
+		  {2,  2, [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]]}, 
+		  Exec, 
+		  VF07},
+		{ 8,  
+		  {1,  2, [[sysDescr],[sysDescr],[tTooBig]]}, 
+		  Exec, 
+		  VF08},
+		{ 9,  
+		  {1, 12, [[tDescr2], [sysDescr]]}, 
+		  Exec, 
+		  fun verify_ssgb_reply1/1},
+		{10,  
+		 {2,  2, [[sysDescr],[sysObjectID], [tGenErr1],[sysDescr]]}, 
+		 Exec, 
+		 VF10},
+		{11,  
+		 {0,  2, [[TCnt2, 1]]}, 
+		 Exec,
+		 VF11}, 
+		{12,  
+		 {2,  0, [[sysDescr],[1,3,7,1]]}, 
+		 Exec,
+		 VF04},
+		{13,  
+		 {1, 12, [[tDescr2], [sysDescr]]},
+		 Exec, 
+		 fun verify_ssgb_reply1/1},
+		{14,  
+		 {2,  2, [[sysDescr],[sysObjectID],[tGenErr1],[sysDescr]]},
+		 Exec, 
+		 VF10},
+		{15,  
+		 {0,  2, [[TCnt2, 1]]},
+		 Exec, 
+		 VF11},
+		{16,  
+		 {2,  2, [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]]},
+		 Exec, 
+		 VF07},
+		{17,  
+		 {2,  2, [[sysDescr],[sysObjectID], [tGenErr1],[sysDescr]]},
+		 Exec, 
+		 VF10}
+	       ],
+
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+
+async_gb_exec2(Node, TargetName, {NR, MR, Oids}) ->
+    mgr_user_async_get_bulk(Node, TargetName, NR, MR, Oids).
+
+
+%%======================================================================
+
+misc_async1(doc) -> ["Misc (async) request(s) - "
+		     "Old style (Addr & Port)"];
+misc_async1(suite) -> [];
+misc_async1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ms1),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    Addr = ?config(ip, Config),
+    Port = ?AGENT_PORT,
+    
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+    
+    ExecG = fun(Data) ->
+		    async_g_exec1(MgrNode, Addr, Port, Data)
+	    end,
+    
+    ExecGN = fun(Data) ->
+		     async_gn_exec1(MgrNode, Addr, Port, Data)
+	     end,
+    
+    ExecS = fun(Data) ->
+		    async_s_exec1(MgrNode, Addr, Port, Data)
+	    end,
+    
+    ExecGB = fun(Data) ->
+		     async_gb_exec1(MgrNode, Addr, Port, Data)
+	     end,
+    
+    ?line {ok, [TCnt2|_]}    = mgr_user_name_to_oid(MgrNode, tCnt2),
+    ?line {ok, [TGenErr1|_]} = mgr_user_name_to_oid(MgrNode, tGenErr1),
+    ?line {ok, [TGenErr2|_]} = mgr_user_name_to_oid(MgrNode, tGenErr2),
+    ?line {ok, [TGenErr3|_]} = mgr_user_name_to_oid(MgrNode, tGenErr3),
+    ?line {ok, [TTooBig|_]}  = mgr_user_name_to_oid(MgrNode, tTooBig),
+
+    Requests = 
+	[
+	 { 1,  
+	   [?sysObjectID_instance], 
+	   ExecG, 
+	   fun(X) -> 
+		   sag_verify(X, [?sysObjectID_instance]) 
+	   end
+	  },
+	 { 2,  
+	   {1,  1, []}, 
+	   ExecGB, 
+	   fun verify_ssgb_reply1/1},
+	 { 3, 
+	   {-1,  1, []}, 
+	   ExecGB, 
+	   fun verify_ssgb_reply1/1},
+	 { 4,
+	   [{?sysLocation_instance, s, "Stockholm"}, 
+	    {?sysName_instance,     s, "Arne Anka"}],
+	   ExecS,
+	   fun(X) ->
+		   sas_verify(X, [?sysLocation_instance, ?sysName_instance])
+	   end}, 
+	 { 5, 
+	   [[sysDescr], [1,3,7,1]], 
+	   ExecGN, 
+	   fun(X) ->
+		   verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView])
+	   end}, 
+	 { 6,  
+	   [[sysObjectID, 0], [sysDescr, 0], [sysUpTime, 0]],
+	   ExecG, 
+	   fun(X) -> 
+		   sag_verify(X, [?sysObjectID_instance, 
+				  ?sysDescr_instance, 
+				  ?sysUpTime_instance]) 
+	   end}, 
+	 { 7, 
+	  [TGenErr2], 
+	   ExecGN, 
+	   fun(X) ->
+		   verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}) 
+	   end}, 
+	 { 8,  
+	   {2,  0, [[sysDescr],[1,3,7,1]]}, 
+	   ExecGB, 
+	   fun(X) -> 
+		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+	   end},
+	 { 9,  
+	   {1,  2, [[sysDescr],[1,3,7,1]]}, 
+	   ExecGB, 
+	   fun(X) -> 
+		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+	   end},
+	 {10, 
+	  [TGenErr1], 
+	  ExecGN, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}) 
+	  end}, 
+	 {11,  
+	  {0,  2, [[sysDescr],[1,3,7,1]]}, 
+	  ExecGB, 
+	  fun(X) -> 
+		  verify_ssgb_reply2(X, 
+				     [?sysDescr_instance,    endOfMibView,
+				      ?sysObjectID_instance, endOfMibView]) 
+	  end},
+	 {12,
+	  [{[sysName, 0],     "Gothenburg"}, 
+	   {[sysLocation, 0], "Sune Anka"}],
+	  ExecS,
+	  fun(X) ->
+		  sas_verify(X, [?sysName_instance, ?sysLocation_instance])
+	  end},
+	 {13,  
+	  {2,  2, [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]]}, 
+	  ExecGB, 
+	  fun(X) -> 
+		  verify_ssgb_reply2(X, 
+				     [?sysDescr_instance,    endOfMibView,
+				      ?sysDescr_instance,    endOfMibView,
+				      ?sysObjectID_instance, endOfMibView]) 
+	  end},
+	 {14,  
+	  {1,  2, [[sysDescr],[sysDescr],[tTooBig]]}, 
+	  ExecGB, 
+	  fun(X) -> 
+		  verify_ssgb_reply2(X, 
+				     [?sysDescr_instance, 
+				      ?sysDescr_instance]) 
+	  end},
+	 {15,  
+	  {1, 12, [[tDescr2], [sysDescr]]}, 
+	  ExecGB, 
+	  fun verify_ssgb_reply1/1},
+	 {16,  
+	  {2,  2, [[sysDescr],[sysObjectID], [tGenErr1],[sysDescr]]}, 
+	  ExecGB, 
+	  fun(X) -> 
+		  verify_ssgb_reply3(X, 
+				     [{?sysDescr,    'NULL'}, 
+				      {?sysObjectID, 'NULL'},
+				      {?tGenErr1,    'NULL'},
+				      {?sysDescr,    'NULL'}]) 
+	  end},
+	 {17, 
+	  [[sysDescr], TGenErr3], 
+	  ExecGN, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 2, [TGenErr3]}) 
+	  end}, 
+	 {18,  
+	  {0,  2, [[TCnt2, 1]]}, 
+	  ExecGB,
+	  fun(X) -> 
+		  verify_ssgb_reply2(X, 
+				     [{fl([TCnt2,2]), 100}, 
+				      {fl([TCnt2,2]), endOfMibView}]) 
+	  end},
+	 {19, 
+	  [TTooBig], 
+	  ExecGN, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {tooBig, 0, []}) 
+	  end},
+	 {20, 
+	  [TTooBig], 
+	  ExecGN, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {tooBig, 0, []}) 
+	  end}
+	],
+    
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+
+%%======================================================================
+
+misc_async2(doc) -> ["Misc (async) request(s) - "
+		     "New style (TargetName)"];
+misc_async2(suite) -> [];
+misc_async2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ms2),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+    
+    ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
+    Test2Mib = test2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = agent_load_mib(AgentNode, Test2Mib),
+    
+    ExecG = fun(Data) ->
+		    async_g_exec2(MgrNode, TargetName, Data)
+	    end,
+    
+    ExecGN = fun(Data) ->
+		     async_gn_exec2(MgrNode, TargetName, Data)
+	     end,
+    
+    ExecS = fun(Data) ->
+		    async_s_exec2(MgrNode, TargetName, Data)
+	    end,
+    
+    ExecGB = fun(Data) ->
+		     async_gb_exec2(MgrNode, TargetName, Data)
+	     end,
+    
+    ?line {ok, [TCnt2|_]}    = mgr_user_name_to_oid(MgrNode, tCnt2),
+    ?line {ok, [TGenErr1|_]} = mgr_user_name_to_oid(MgrNode, tGenErr1),
+    ?line {ok, [TGenErr2|_]} = mgr_user_name_to_oid(MgrNode, tGenErr2),
+    ?line {ok, [TGenErr3|_]} = mgr_user_name_to_oid(MgrNode, tGenErr3),
+    ?line {ok, [TTooBig|_]}  = mgr_user_name_to_oid(MgrNode, tTooBig),
+
+    Requests = 
+	[
+	 { 1,  
+	   [?sysObjectID_instance], 
+	   ExecG, 
+	   fun(X) -> 
+		   sag_verify(X, [?sysObjectID_instance]) 
+	   end
+	  },
+	 { 2,  
+	   {1,  1, []}, 
+	   ExecGB, 
+	   fun verify_ssgb_reply1/1},
+	 { 3, 
+	   {-1,  1, []}, 
+	   ExecGB, 
+	   fun verify_ssgb_reply1/1},
+	 { 4,
+	   [{?sysLocation_instance, s, "Stockholm"}, 
+	    {?sysName_instance,     s, "Arne Anka"}],
+	   ExecS,
+	   fun(X) ->
+		   sas_verify(X, [?sysLocation_instance, ?sysName_instance])
+	   end}, 
+	 { 5, 
+	   [[sysDescr], [1,3,7,1]], 
+	   ExecGN, 
+	   fun(X) ->
+		   verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView])
+	   end}, 
+	 { 6,  
+	   [[sysObjectID, 0], [sysDescr, 0], [sysUpTime, 0]],
+	   ExecG, 
+	   fun(X) -> 
+		   sag_verify(X, [?sysObjectID_instance, 
+				  ?sysDescr_instance, 
+				  ?sysUpTime_instance]) 
+	   end}, 
+	 { 7, 
+	  [TGenErr2], 
+	   ExecGN, 
+	   fun(X) ->
+		   verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}) 
+	   end}, 
+	 { 8,  
+	   {2,  0, [[sysDescr],[1,3,7,1]]}, 
+	   ExecGB, 
+	   fun(X) -> 
+		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+	   end},
+	 { 9,  
+	   {1,  2, [[sysDescr],[1,3,7,1]]}, 
+	   ExecGB, 
+	   fun(X) -> 
+		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+	   end},
+	 {10, 
+	  [TGenErr1], 
+	  ExecGN, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}) 
+	  end}, 
+	 {11,  
+	  {0,  2, [[sysDescr],[1,3,7,1]]}, 
+	  ExecGB, 
+	  fun(X) -> 
+		  verify_ssgb_reply2(X, 
+				     [?sysDescr_instance,    endOfMibView,
+				      ?sysObjectID_instance, endOfMibView]) 
+	  end},
+	 {12,
+	  [{[sysName, 0],     "Gothenburg"}, 
+	   {[sysLocation, 0], "Sune Anka"}],
+	  ExecS,
+	  fun(X) ->
+		  sas_verify(X, [?sysName_instance, ?sysLocation_instance])
+	  end},
+	 {13,  
+	  {2,  2, [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]]}, 
+	  ExecGB, 
+	  fun(X) -> 
+		  verify_ssgb_reply2(X, 
+				     [?sysDescr_instance,    endOfMibView,
+				      ?sysDescr_instance,    endOfMibView,
+				      ?sysObjectID_instance, endOfMibView]) 
+	  end},
+	 {14,  
+	  {1,  2, [[sysDescr],[sysDescr],[tTooBig]]}, 
+	  ExecGB, 
+	  fun(X) -> 
+		  verify_ssgb_reply2(X, 
+				     [?sysDescr_instance, 
+				      ?sysDescr_instance]) 
+	  end},
+	 {15,  
+	  {1, 12, [[tDescr2], [sysDescr]]}, 
+	  ExecGB, 
+	  fun verify_ssgb_reply1/1},
+	 {16,  
+	  {2,  2, [[sysDescr],[sysObjectID], [tGenErr1],[sysDescr]]}, 
+	  ExecGB, 
+	  fun(X) -> 
+		  verify_ssgb_reply3(X, 
+				     [{?sysDescr,    'NULL'}, 
+				      {?sysObjectID, 'NULL'},
+				      {?tGenErr1,    'NULL'},
+				      {?sysDescr,    'NULL'}]) 
+	  end},
+	 {17, 
+	  [[sysDescr], TGenErr3], 
+	  ExecGN, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {genErr, 2, [TGenErr3]}) 
+	  end}, 
+	 {18,  
+	  {0,  2, [[TCnt2, 1]]}, 
+	  ExecGB,
+	  fun(X) -> 
+		  verify_ssgb_reply2(X, 
+				     [{fl([TCnt2,2]), 100}, 
+				      {fl([TCnt2,2]), endOfMibView}]) 
+	  end},
+	 {19, 
+	  [TTooBig], 
+	  ExecGN, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {tooBig, 0, []}) 
+	  end},
+	 {20, 
+	  [TTooBig], 
+	  ExecGN, 
+	  fun(X) ->
+		  verify_ssgn_reply2(X, {tooBig, 0, []}) 
+	  end}
+	],
+    
+    p("manager info when starting test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when starting test: ~n~p", [agent_info(AgentNode)]),
+
+    ?line ok = async_exec(Requests, []),
+
+    p("manager info when ending test: ~n~p", [mgr_info(MgrNode)]),
+    p("agent info when ending test: ~n~p", [agent_info(AgentNode)]),
+
+    ok.
+
+
+%%======================================================================
+
+discovery(suite) -> [];
+discovery(Config) when is_list(Config) ->
+    ?SKIP(not_yet_implemented).
+
+
+%%======================================================================
+%% 
+%% Utility functions for cases trap1 and trap2
+%% 
+
+collect_traps(N) ->
+    collect_traps(N, []).
+
+collect_traps(0, TrapInfo) ->
+    TrapInfo;
+collect_traps(N, Acc) ->
+    receive
+	{async_event, _From, {trap, TrapInfo}} ->
+	    p("collect_traps -> received trap: ~n   ~p", [TrapInfo]),
+	    collect_traps(N-1, [TrapInfo|Acc])
+    after 10000 ->
+	    p("collect_traps -> still awaiting ~w trap(s) - giving up", [N]),
+	    Acc
+    end.
+
+verify_traps([], []) ->
+    p("verify_traps -> done"),
+    ok;
+verify_traps([], Verifiers) ->
+    p("verify_traps -> done when ~w verifiers remain", [length(Verifiers)]),
+    {error, {failed_verify, [Id || {Id, _} <- Verifiers]}};
+verify_traps([Trap|Traps], Verifiers0) ->
+    p("verify_traps -> entry"),
+    case verify_trap(Trap, Verifiers0) of
+	{ok, Id} ->
+	    p("verify_traps -> trap verified: ~p", [Id]),
+	    Verifiers = lists:keydelete(Id, 1, Verifiers0),
+	    verify_traps(Traps, Verifiers);
+	error ->
+	    p("verify_traps -> failed verifying trap: ~n   ~p", [Trap]),
+	    {error, {failed_verifying_trap, Trap}}
+    end.
+
+verify_trap(Trap, []) ->
+    p("verify_trap -> could not verify trap:"
+      "~n   Trap: ~p", [Trap]),
+    error;
+verify_trap(Trap, [{Id, Verifier}|Verifiers]) ->
+    p("verify_trap -> entry with"
+      "~n   Id:   ~p"
+      "~n   Trap: ~p", [Id, Trap]),
+    case Verifier(Trap) of
+	ok ->
+	    p("verify_trap -> verified"),
+	    {ok, Id};
+	{error, _} ->
+	    p("verify_trap -> not verified"),
+	    verify_trap(Trap, Verifiers)
+    end.
+
+
+%%======================================================================
+
+trap1(suite) -> [];
+trap1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,t1),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, snmpv2_mib()),
+    Test2Mib      = test2_mib(Config), 
+    TestTrapMib   = test_trap_mib(Config), 
+    TestTrapv2Mib = test_trap_v2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapMib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapv2Mib),
+    ?line ok = agent_load_mib(AgentNode,  Test2Mib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapMib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapv2Mib),
+
+    %% Version 1 trap verification function:
+    VerifyTrap_v1 = 
+	fun(Ent, Gen, Spec, ExpVBs, Trap) ->
+		case Trap of
+		    {Ent, Gen, Spec, _Timestamp, VBs} ->
+			p("trap info as expected"), 
+			case (catch validate_vbs(MgrNode, 
+						 ExpVBs, VBs)) of
+			    ok ->
+				p("valid trap"),
+				ok;
+			    Error ->
+				p("invalid trap: ~n   Error: ~p", [Error]),
+				Error
+			end;
+		    {Enteprise, Generic, Spec, Timestamp, VBs} ->
+			p("unepxected v1 trap info:"
+			  "~n   Enteprise: ~p"
+			  "~n   Generic:   ~p"
+			  "~n   Spec:      ~p"
+			  "~n   Timestamp: ~p"
+			  "~n   VBs:       ~p", 
+			  [Enteprise, Generic, Spec, Timestamp, VBs]),
+			ExpTrap = {Ent, Gen, Spec, ignore, ExpVBs}, 
+			Reason = {unexpected_trap, {ExpTrap, Trap}},
+			{error, Reason};
+		    {Err, Idx, VBs} ->
+			p("unexpected trap info: "
+			  "~n   Err: ~p"
+			  "~n   Idx: ~p"
+			  "~n   VBs: ~p", [Err, Idx, VBs]),
+			Reason = {unexpected_status, {Err, Idx, VBs}},
+			{error, Reason}
+		end
+	end,
+
+    %% Version 2 trap verification function:
+    VerifyTrap_v2 = 
+	fun(ExpVBs, Trap) ->
+		case Trap of
+		    {noError, 0, VBs0} ->
+			p("trap info as expected: ~n~p", [VBs0]), 
+			%% The first two are a timestamp and oid
+			[_,_|VBs] = VBs0,
+			case (catch validate_vbs(MgrNode, 
+						 ExpVBs, VBs)) of
+			    ok ->
+				p("valid trap"),
+				ok;
+			    Error ->
+				p("invalid trap: ~n   Error: ~p", 
+				  [Error]),
+				Error
+			end;
+		    {Err, Idx, VBs} ->
+			p("unexpected error status: "
+			  "~n   Err: ~p"
+			  "~n   Idx: ~p"
+			  "~n   VBs: ~p", [Err, Idx, VBs]),
+			Reason = {unexpected_status, {Err, Idx, VBs}},
+			{error, Reason}
+		end
+	end,
+
+
+    %% -- command 1 --
+    %% Collect various info about the manager and the agent
+    Cmd1 = 
+	fun() ->
+		p("manager info: ~n~p", [mgr_info(MgrNode)]),
+		p("agent info: ~n~p", [agent_info(AgentNode)]),
+		ok
+	end,
+
+    %% -- command 2 --
+    %% Make the agent send trap(s) (both a v1 and a v2 trap)
+    Cmd2 = 
+	fun() ->
+		VBs = [{ifIndex,       [1], 1},
+		       {ifAdminStatus, [1], 1},
+		       {ifOperStatus,  [1], 2}],
+		agent_send_trap(AgentNode, linkUp, "standard trap", VBs),
+		ok
+	end,
+
+    %% -- command 3 --
+    %% Version 1 trap verify function
+    Cmd3_VerifyTrap_v1 = 
+	fun(Trap) ->
+		Ent    = [1,2,3], 
+		Gen    = 3, 
+		Spec   = 0, 
+		ExpVBs = [{[ifIndex,       1], 1},
+			  {[ifAdminStatus, 1], 1},
+			  {[ifOperStatus,  1], 2}],
+		VerifyTrap_v1(Ent, Gen, Spec, ExpVBs, Trap)
+	end,
+
+    %% Version 2 trap verify function
+    Cmd3_VerifyTrap_v2 = 
+	fun(Trap) ->
+		ExpVBs = [{[ifIndex,       1], 1},
+			  {[ifAdminStatus, 1], 1},
+			  {[ifOperStatus,  1], 2}],
+		VerifyTrap_v2(ExpVBs, Trap)
+	end,
+
+    %% Verify the two traps. The order of them is unknown
+    Cmd3 = 
+	fun() ->
+		Verifiers = [{"v1 trap verifier", Cmd3_VerifyTrap_v1},
+			     {"v2 trap verifier", Cmd3_VerifyTrap_v2}],
+		verify_traps(collect_traps(2), Verifiers)
+	end,
+
+    Cmd4 = fun() -> ?SLEEP(1000), ok end,
+
+    Commands = 
+	[
+	 {1, "Manager and agent info at start of test", Cmd1},
+	 {2, "Send trap from agent", Cmd2},
+	 {3, "Await trap(s) to manager", Cmd3},
+	 {4, "Sleep some time (1 sec)", Cmd4},
+	 {5, "Manager and agent info after test completion", Cmd1}
+	],
+
+    command_handler(Commands).
+
+    
+%%======================================================================
+
+trap2(suite) -> [];
+trap2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,t2),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, snmpv2_mib()),
+    Test2Mib      = test2_mib(Config), 
+    TestTrapMib   = test_trap_mib(Config), 
+    TestTrapv2Mib = test_trap_v2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapMib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapv2Mib),
+    ?line ok = agent_load_mib(AgentNode,  Test2Mib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapMib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapv2Mib),
+
+    %% Version 1 trap verification function:
+    VerifyTrap_v1 = 
+	fun(Ent, Gen, Spec, ExpVBs, Trap) ->
+		case Trap of
+		    {Ent, Gen, Spec, _Timestamp, VBs} ->
+			p("trap info as expected"), 
+			case (catch validate_vbs(MgrNode, 
+						 ExpVBs, VBs)) of
+			    ok ->
+				p("valid trap"),
+				ok;
+			    Error ->
+				p("invalid trap: ~n   Error: ~p", [Error]),
+				Error
+			end;
+		    {Enteprise, Generic, Spec, Timestamp, VBs} ->
+			p("unepxected v1 trap info:"
+			  "~n   Enteprise: ~p"
+			  "~n   Generic:   ~p"
+			  "~n   Spec:      ~p"
+			  "~n   Timestamp: ~p"
+			  "~n   VBs:       ~p", 
+			  [Enteprise, Generic, Spec, Timestamp, VBs]),
+			ExpTrap = {Ent, Gen, Spec, ignore, ExpVBs}, 
+			Reason = {unexpected_trap, {ExpTrap, Trap}},
+			{error, Reason};
+		    {Err, Idx, VBs} ->
+			p("unexpected trap info: "
+			  "~n   Err: ~p"
+			  "~n   Idx: ~p"
+			  "~n   VBs: ~p", [Err, Idx, VBs]),
+			Reason = {unexpected_status, {Err, Idx, VBs}},
+			{error, Reason}
+		end
+	end,
+
+    %% Version 2 trap verification function:
+    VerifyTrap_v2 = 
+	fun(ExpVBs, Trap) ->
+		case Trap of
+		    {noError, 0, VBs0} ->
+			p("trap info as expected: ~n~p", [VBs0]), 
+			%% The first two are a timestamp and oid
+			[_,_|VBs] = VBs0,
+			case (catch validate_vbs(MgrNode, 
+						 ExpVBs, VBs)) of
+			    ok ->
+				p("valid trap"),
+				ok;
+			    Error ->
+				p("invalid trap: ~n   Error: ~p", 
+				  [Error]),
+				Error
+			end;
+		    {Err, Idx, VBs} ->
+			p("unexpected error status: "
+			  "~n   Err: ~p"
+			  "~n   Idx: ~p"
+			  "~n   VBs: ~p", [Err, Idx, VBs]),
+			Reason = {unexpected_status, {Err, Idx, VBs}},
+			{error, Reason}
+		end
+	end,
+
+    %% -- command 1 --
+    %% Collect various info about the manager and the agent
+    Cmd1 = 
+	fun() ->
+		p("manager info: ~n~p", [mgr_info(MgrNode)]),
+		p("agent info: ~n~p",   [agent_info(AgentNode)]),
+		ok
+	end,
+
+    %% -- command 2 --
+    %% Make the agent send trap(s) (both a v1 and a v2 trap)
+    Cmd2 = 
+	fun() ->
+		VBs = [{sysContact, "pelle"}],
+		agent_send_trap(AgentNode, testTrap1, "standard trap", VBs),
+		ok
+	end,
+
+    %% -- command 3 --
+    %% Version 1 trap verify function
+    Cmd3_VerifyTrap_v1 = 
+	fun(Trap) ->
+		Ent    = [1,2,3], 
+		Gen    = 1, 
+		Spec   = 0, 
+		ExpVBs = [{[system, [4,0]], "pelle"}],
+		VerifyTrap_v1(Ent, Gen, Spec, ExpVBs, Trap)
+	end,
+
+    %% Version 2 trap verify function
+    Cmd3_VerifyTrap_v2 = 
+	fun(Trap) ->
+		ExpVBs = [{[system, [4,0]], "pelle"},
+			  {[snmpTrapEnterprise,0], any}],
+		VerifyTrap_v2(ExpVBs, Trap)
+	end,
+		
+    %% Verify the two traps. The order of them is unknown
+    Cmd3 = 
+	fun() ->
+		Verifiers = [{"v1 trap verifier", Cmd3_VerifyTrap_v1},
+			     {"v2 trap verifier", Cmd3_VerifyTrap_v2}],
+		verify_traps(collect_traps(2), Verifiers)
+	end,
+
+    %% -- command 4 --
+    %% Make the agent send another set of trap(s) (both a v1 and a v2 trap)
+    Cmd4 = 
+	fun() ->
+		VBs = [{ifIndex,       [1], 1},
+		       {ifAdminStatus, [1], 1},
+		       {ifOperStatus,  [1], 2}],
+		agent_send_trap(AgentNode, linkUp, "standard trap", VBs),
+		ok
+	end,
+
+    
+    %% -- command 5 --
+    %% Expected varbinds
+    ExpVBs5 = [{[ifIndex,       1], 1},
+	       {[ifAdminStatus, 1], 1},
+	       {[ifOperStatus,  1], 2}],
+
+    
+    %% Version 1 trap verify function
+    Cmd5_VerifyTrap_v1 = 
+	fun(Trap) ->
+		Ent    = [1,2,3], 
+		Gen    = 3, 
+		Spec   = 0, 
+		VerifyTrap_v1(Ent, Gen, Spec, ExpVBs5, Trap)
+	end,
+
+    %% Version 2 trap verify function
+    Cmd5_VerifyTrap_v2 = 
+	fun(Trap) ->
+		VerifyTrap_v2(ExpVBs5, Trap)
+	end,
+
+    %% Verify the two traps. The order of them is unknown
+    Cmd5 = 
+	fun() ->
+		Verifiers = [{"v1 trap verifier", Cmd5_VerifyTrap_v1},
+			     {"v2 trap verifier", Cmd5_VerifyTrap_v2}],
+		verify_traps(collect_traps(2), Verifiers)
+	end,
+
+    %% -- command 6 --
+    %% Some sleep before we are done
+    Cmd6 = fun() -> ?SLEEP(1000), ok end,
+
+    Commands = 
+	[
+	 {1, "Manager and agent info at start of test", Cmd1},
+	 {2, "Send first trap(s) from agent", Cmd2},
+	 {3, "Await the trap(s) from agent", Cmd3},
+	 {4, "Send second trap(s) from agent", Cmd4},
+	 {5, "Await the trap(s) from the agent", Cmd5},
+	 {6, "Sleep some time (1 sec)", Cmd6},
+	 {7, "Manager and agent info after test completion", Cmd1}
+	],
+
+    command_handler(Commands).
+
+    
+%%======================================================================
+
+inform1(suite) -> [];
+inform1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,i1),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, snmpv2_mib()),
+    Test2Mib      = test2_mib(Config), 
+    TestTrapMib   = test_trap_mib(Config), 
+    TestTrapv2Mib = test_trap_v2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapMib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapv2Mib),
+    ?line ok = agent_load_mib(AgentNode,  Test2Mib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapMib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapv2Mib),
+
+    
+    Cmd1 = 
+	fun() ->
+		p("manager info: ~n~p", [mgr_info(MgrNode)]),
+		p("manager system info: ~n~p", [mgr_sys_info(MgrNode)]),
+		p("agent info: ~n~p", [agent_info(AgentNode)]),
+		ok
+	end,
+
+    Cmd2 = 
+	fun() ->
+		agent_send_notif(AgentNode, testTrapv22, "standard inform"),
+		ok
+	end,
+
+    Cmd3 = 
+	fun() ->
+		receive
+		    {async_event, From, {inform, Pid, Inform}} ->
+			p("received inform"),
+			case Inform of
+			    {noError, 0, VBs} when is_list(VBs) ->
+				case (catch validate_testTrapv22_vbs(MgrNode, 
+								     VBs)) of
+				    ok ->
+					p("valid inform"),
+					Pid ! {handle_inform_no_response, 
+					       From}, 
+					ok;
+				    Error ->
+					p("invalid inform: ~n   Error: ~p", 
+					  [Error]),
+					Error
+				end;
+			    {Err, Idx, VBs} ->
+				p("unexpected error status: "
+				  "~n   Err: ~p"
+				  "~n   Idx: ~p"
+				  "~n   VBs: ~p", [Err, Idx, VBs]),
+				Reason = {unexpected_status, {Err, Idx, VBs}},
+				{error, Reason}
+			end
+		after 10000 ->
+			receive 
+			    Any ->
+				{error, {timeout_crap, Any}}
+			after 1000 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd4 = 
+	fun() ->
+		receive
+		    {async_event, From, {inform, Pid, Inform}} ->
+			p("received inform"),
+			case Inform of
+			    {noError, 0, VBs} when is_list(VBs) ->
+				case (catch validate_testTrapv22_vbs(MgrNode, 
+								     VBs)) of
+				    ok ->
+					p("valid inform"),
+					Pid ! {handle_inform_response, From}, 
+					ok;
+				    Error ->
+					p("invalid inform: ~n   Error: ~p", 
+					  [Error]),
+					Error
+				end;
+			    {Err, Idx, VBs} ->
+				p("unexpected error status: "
+				  "~n   Err: ~p"
+				  "~n   Idx: ~p"
+				  "~n   VBs: ~p", [Err, Idx, VBs]),
+				Reason = {unexpected_status, {Err, Idx, VBs}},
+				{error, Reason}
+			end
+		after 20000 ->
+			receive 
+			    Any ->
+				{error, {timeout_crap, Any}}
+			after 1000 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd5 = fun() -> ?SLEEP(5000), ok end,
+
+    Commands = 
+	[
+	 {1, "Manager and agent info at start of test", Cmd1},
+	 {2, "Send notifcation [no receiver] from agent", Cmd2},
+	 {3, "Await first inform to manager - do not reply", Cmd3},
+	 {4, "Await second inform to manager - reply", Cmd4},
+	 {5, "Sleep some time (5 sec)", Cmd5},
+	 {6, "Manager and agent info after test completion", Cmd1}
+	],
+
+    command_handler(Commands).
+
+
+%%======================================================================
+
+inform2(suite) -> [];
+inform2(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,i2),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+    %% Addr = ?config(ip, Config),
+    %% Port = ?AGENT_PORT,
+
+    ?line ok = mgr_user_load_mib(MgrNode, snmpv2_mib()),
+    Test2Mib      = test2_mib(Config), 
+    TestTrapMib   = test_trap_mib(Config), 
+    TestTrapv2Mib = test_trap_v2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapMib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapv2Mib),
+    ?line ok = agent_load_mib(AgentNode,  Test2Mib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapMib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapv2Mib),
+
+    Cmd1 = 
+	fun() ->
+		p("manager info: ~n~p", [mgr_info(MgrNode)]),
+		p("agent info: ~n~p", [agent_info(AgentNode)]),
+		ok
+	end,
+
+    Cmd2 = 
+	fun() ->
+		agent_send_notif(AgentNode, 
+				 testTrapv22, 
+				 {inform2_tag1, self()}, 
+				 "standard inform",
+				[]),
+		ok
+	end,
+
+    Cmd3 = 
+	fun() ->
+		receive
+		    {snmp_targets, inform2_tag1, Addrs} ->
+			p("sent inform to ~p", [Addrs]),
+			ok
+		after 10000 ->
+			receive 
+			    Any ->
+				{error, {timeout_crap, Any}}
+			after 1000 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd4 = 
+	fun() ->
+		receive
+		    {async_event, From, {inform, Pid, Inform}} ->
+			p("received inform"),
+			case Inform of
+			    {noError, 0, VBs} when is_list(VBs) ->
+				case (catch validate_testTrapv22_vbs(MgrNode, 
+								     VBs)) of
+				    ok ->
+					p("valid inform"),
+					Pid ! {handle_inform_no_response, 
+					       From}, 
+					ok;
+				    Error ->
+					p("invalid inform: ~n   Error: ~p", 
+					  [Error]),
+					Error
+				end;
+			    {Err, Idx, VBs} ->
+				p("unexpected error status: "
+				  "~n   Err: ~p"
+				  "~n   Idx: ~p"
+				  "~n   VBs: ~p", [Err, Idx, VBs]),
+				Reason = {unexpected_status, {Err, Idx, VBs}},
+				{error, Reason}
+			end
+		after 10000 ->
+			receive 
+			    Any ->
+				{error, {timeout_crap, Any}}
+			after 1000 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd5 = 
+	fun() ->
+		receive
+		    {async_event, From, {inform, Pid, Inform}} ->
+			p("received inform"),
+			case Inform of
+			    {noError, 0, VBs} when is_list(VBs) ->
+				case (catch validate_testTrapv22_vbs(MgrNode, 
+								     VBs)) of
+				    ok ->
+					p("valid inform"),
+					Pid ! {handle_inform_response, From}, 
+					ok;
+				    Error ->
+					p("invalid inform: ~n   Error: ~p", 
+					  [Error]),
+					Error
+				end;
+			    {Err, Idx, VBs} ->
+				p("unexpected error status: "
+				  "~n   Err: ~p"
+				  "~n   Idx: ~p"
+				  "~n   VBs: ~p", [Err, Idx, VBs]),
+				Reason = {unexpected_status, {Err, Idx, VBs}},
+				{error, Reason}
+			end
+		after 20000 ->
+			receive 
+			    Any ->
+				{error, {timeout_crap, Any}}
+			after 1000 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd6 = 
+	fun() ->
+		receive
+		    {snmp_notification, inform2_tag1, {got_response, Addr}} ->
+			p("received expected \"got response\" notification "
+			  "from: "
+			  "~n   ~p", [Addr]),
+			ok;
+		    {snmp_notification, inform2_tag1, {no_response, Addr}} ->
+			p("<ERROR> received expected \"no response\" "
+			  "notification from: "
+			  "~n   ~p", [Addr]),
+			{error, no_response}
+		after 10000 ->
+			receive 
+			    Any ->
+				{error, {timeout_crap, Any}}
+			after 1000 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd7 = fun() -> ?SLEEP(5000), ok end,
+
+    Commands = 
+	[
+	 {1, "Manager and agent info at start of test", Cmd1},
+	 {2, "Send notifcation [no receiver] from agent", Cmd2},
+	 {3, "await inform-sent acknowledge from agent", Cmd3},
+	 {4, "Await first inform to manager - do not reply", Cmd4},
+	 {5, "Await second inform to manager - reply", Cmd5},
+	 {6, "await inform-acknowledge from agent", Cmd6},
+	 {7, "Sleep some time (5 sec)", Cmd7},
+	 {8, "Manager and agent info after test completion", Cmd1}
+	],
+
+    command_handler(Commands).
+
+    
+%%======================================================================
+
+inform3(suite) -> [];
+inform3(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,i3),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, snmpv2_mib()),
+    Test2Mib      = test2_mib(Config), 
+    TestTrapMib   = test_trap_mib(Config), 
+    TestTrapv2Mib = test_trap_v2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapMib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapv2Mib),
+    ?line ok = agent_load_mib(AgentNode,  Test2Mib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapMib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapv2Mib),
+
+    Cmd1 = 
+	fun() ->
+		p("manager info: ~n~p", [mgr_info(MgrNode)]),
+		p("agent info: ~n~p", [agent_info(AgentNode)]),
+		ok
+	end,
+
+    Cmd2 = 
+	fun() ->
+		agent_send_notif(AgentNode, 
+				 testTrapv22, 
+				 {inform3_tag1, self()}, 
+				 "standard inform",
+				 []),
+		ok
+	end,
+
+    Cmd3 = 
+	fun() ->
+		receive
+		    {snmp_targets, inform3_tag1, [_Addr]} ->
+			p("received inform-sent acknowledgement", []),
+			ok
+		after 10000 ->
+			receive 
+			    Crap ->
+				{error, {timeout_crap, Crap}}
+			after 0 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd4 = 
+	fun() ->
+		receive
+		    {async_event, From, {inform, Pid, Inform}} ->
+			p("received inform"),
+			case Inform of
+			    {noError, 0, VBs} when is_list(VBs) ->
+				case (catch validate_testTrapv22_vbs(MgrNode, 
+								     VBs)) of
+				    ok ->
+					p("valid inform"),
+					Pid ! {handle_inform_no_response, 
+					       From}, 
+					ok;
+				    Error ->
+					p("invalid inform: ~n   Error: ~p", 
+					  [Error]),
+					Error
+				end;
+			    {Err, Idx, VBs} ->
+				p("unexpected error status: "
+				  "~n   Err: ~p"
+				  "~n   Idx: ~p"
+				  "~n   VBs: ~p", [Err, Idx, VBs]),
+				Reason = {unexpected_status, {Err, Idx, VBs}},
+				{error, Reason}
+			end
+		after 50000 ->
+			receive 
+			    Any ->
+				{error, {timeout_crap, Any}}
+			after 0 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd7 = 
+	fun() ->
+		receive
+		    {snmp_notification, inform3_tag1, {no_response, Addr}} ->
+			p("received expected \"no response\" notification "
+			  "from: "
+			  "~n   ~p", [Addr]),
+			ok;
+		    {snmp_notification, inform3_tag1, {got_response, Addr}} ->
+			p("<ERROR> received unexpected \"got response\" "
+			  "notification from: "
+			  "~n   ~p", 
+			  [Addr]),
+			{error, {got_response, Addr}}
+		after 120000 ->
+			receive 
+			    Crap ->
+				{error, {timeout_crap, Crap}}
+			after 0 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    Cmd8 = fun() -> ?SLEEP(1000), ok end,
+
+    Commands = 
+	[
+	 {1, "Manager and agent info at start of test", Cmd1},
+	 {2, "Send notifcation from agent", Cmd2},
+	 {3, "await inform-sent acknowledge from agent", Cmd3},
+	 {4, "Await first inform to manager - do not reply", Cmd4},
+	 {5, "Await first inform to manager - do not reply", Cmd4},
+	 {6, "Await first inform to manager - do not reply", Cmd4},
+	 {7, "await inform-acknowledge from agent", Cmd7},
+	 {8, "Sleep some time (1 sec)", Cmd8},
+	 {9, "Manager and agent info after test completion", Cmd1}
+	],
+
+    command_handler(Commands).
+
+    
+%%======================================================================
+
+inform4(suite) -> [];
+inform4(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname,i4),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, snmpv2_mib()),
+    Test2Mib      = test2_mib(Config), 
+    TestTrapMib   = test_trap_mib(Config), 
+    TestTrapv2Mib = test_trap_v2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapMib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapv2Mib),
+    ?line ok = agent_load_mib(AgentNode,  Test2Mib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapMib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapv2Mib),
+
+    Cmd1 = 
+	fun() ->
+		p("manager info: ~n~p", [mgr_info(MgrNode)]),
+		p("agent info: ~n~p", [agent_info(AgentNode)]),
+		ok
+	end,
+
+    Cmd2 = 
+	fun() ->
+		agent_send_notif(AgentNode, testTrapv22, "standard inform"),
+		ok
+	end,
+
+    Cmd3 = 
+	fun() ->
+		receive
+		    {async_event, From, {inform, Pid, Inform}} ->
+			p("received inform"),
+			case Inform of
+			    {noError, 0, VBs} when is_list(VBs) ->
+				case (catch validate_testTrapv22_vbs(MgrNode, 
+								     VBs)) of
+				    ok ->
+					p("valid inform"),
+					%% Actually, as we have
+					%% configured the manager in
+					%% this test case (irb = auto)
+					%% it has already responded
+					Pid ! {handle_inform_response, From}, 
+					ok;
+				    Error ->
+					p("invalid inform: ~n   Error: ~p", 
+					  [Error]),
+					Error
+				end;
+			    {Err, Idx, VBs} ->
+				p("unexpected error status: "
+				  "~n   Err: ~p"
+				  "~n   Idx: ~p"
+				  "~n   VBs: ~p", [Err, Idx, VBs]),
+				Reason = {unexpected_status, {Err, Idx, VBs}},
+				{error, Reason}
+			end
+		after 20000 ->
+			receive 
+			    Any ->
+				{error, {crap, Any}}
+			after 1000 ->
+				{error, timeout}
+			end
+		end
+	end,
+
+    %% This is the a result of erroneous configuration.
+%%     Cmd4 = 
+%% 	fun() ->
+%% 		receive 
+%% 		    {async_event, _ReqId, {error, Reason}} ->
+%% 			p("received error"),
+%% 			case Reason of
+%% 			    {failed_processing_message,
+%% 			     {securityError, usmStatsUnknownEngineIDs}} ->
+%% 				p("expected error"), 
+%% 				ok;
+%% 			    _ ->
+%% 				p("unexpected error: "
+%% 				  "~n   Reason: ~p", [Reason]),
+%% 				{error, {unexpected_error, Reason}}
+%% 			end
+%% 		after 20000 ->
+%% 			receive 
+%% 			    Any ->
+%% 				{error, {crap, Any}}
+%% 			after 1000 ->
+%% 				{error, timeout}
+%% 			end
+%% 		end
+%% 	end,
+
+    Cmd5 = fun() -> ?SLEEP(1000), ok end,
+
+    Commands = 
+	[
+	 {1, "Manager and agent info at start of test", Cmd1},
+	 {2, "Send notifcation [no receiver] from agent", Cmd2},
+	 {3, "Await inform to manager", Cmd3},
+%% 	 {4, "Await error info (because of erroneous config)", Cmd4},
+	 {5, "Sleep some time (1 sec)", Cmd5},
+	 {6, "Manager and agent info after test completion", Cmd1}
+	],
+
+    command_handler(Commands).
+
+
+%%======================================================================
+%% 
+%% Test: ts:run(snmp, snmp_manager_test, inform_swarm, [batch]).
+
+inform_swarm(suite) -> [];
+inform_swarm(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, is),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode   = ?config(manager_node, Config),
+    AgentNode = ?config(agent_node, Config),
+
+    ?line ok = mgr_user_load_mib(MgrNode, snmpv2_mib()),
+    Test2Mib      = test2_mib(Config), 
+    TestTrapMib   = test_trap_mib(Config), 
+    TestTrapv2Mib = test_trap_v2_mib(Config), 
+    ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapMib),
+    ?line ok = mgr_user_load_mib(MgrNode, TestTrapv2Mib),
+    ?line ok = agent_load_mib(AgentNode,  Test2Mib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapMib),
+    ?line ok = agent_load_mib(AgentNode,  TestTrapv2Mib),
+    NumInforms = 100, 
+
+    Collector = self(),
+
+    Generator = 
+	erlang:spawn(
+	  fun() ->
+		  receive
+		      {Collector, start} ->
+			  ok
+		  end,
+		  Seqs = lists:seq(1, NumInforms),
+		  lists:foreach(
+		    fun(N) ->
+			    p("send notification ~w", [N]),
+			    agent_send_notif(AgentNode, 
+					     testTrapv22, 
+					     {{inform2_tag1, N}, Collector},
+					     "standard inform",
+					     []),
+			    %% Sleep some [(N div 10)*100 ms] 
+			    %% every tenth notification
+			    if 
+				N rem 10 == 0 ->
+				    %% Time to sleep some
+				    Sleep = (N div 10) * 50,
+				    p("sleep ~w [~w]", [Sleep, N]),
+				    ?SLEEP(Sleep);
+				true ->
+				    ok
+			    end
+		    end,
+		    Seqs),
+		  ok
+	  end), 
+
+    Cmd1 = 
+	fun() ->
+		p("manager info: ~n~p", [mgr_info(MgrNode)]),
+		p("agent info: ~n~p", [agent_info(AgentNode)]),
+		ok
+	end,
+
+    Cmd2 = fun() -> Generator ! {Collector, start}, ok end,
+
+    Cmd3 = 
+	fun() ->
+		inform_swarm_collector(NumInforms)
+	end,
+
+
+    Cmd4 = fun() -> ?SLEEP(1000), ok end,
+
+    Commands = 
+	[
+	 {1, "Manager and agent info at start of test", Cmd1},
+	 {2, "Send notifcation(s) from agent", Cmd2},
+	 {3, "Await send-ack(s)/inform(s)/response(s)", Cmd3},
+	 {4, "Sleep some time (1 sec)", Cmd4},
+	 {5, "Manager and agent info after test completion", Cmd1}
+	],
+
+    command_handler(Commands).
+
+inform_swarm_collector(N) ->
+    inform_swarm_collector(N, 0, 0, 0, 10000).
+
+%% Note that we need to deal with re-transmissions!
+%% That is, the agent did not receive the ack in time,
+%% and therefor did a re-transmit. This means that we 
+%% expect to receive more inform's then we actually 
+%% sent. So for sucess we assume: 
+%% 
+%%     SentAckCnt =  N
+%%     RespCnt    =  N
+%%     RecvCnt    >= N
+%% 
+inform_swarm_collector(N, SentAckCnt, RecvCnt, RespCnt, _) 
+  when ((N == SentAckCnt) and 
+	(N == RespCnt)    and
+	(N >= RecvCnt)) ->
+    p("inform_swarm_collector -> done when"
+      "~n   N:          ~w"
+      "~n   SentAckCnt: ~w"
+      "~n   RecvCnt:    ~w"
+      "~n   RespCnt:    ~w", [N, SentAckCnt, RecvCnt, RespCnt]),
+    ok;
+inform_swarm_collector(N, SentAckCnt, RecvCnt, RespCnt, Timeout) ->
+    p("inform_swarm_collector -> entry with"
+      "~n   N:          ~w"
+      "~n   SentAckCnt: ~w"
+      "~n   RecvCnt:    ~w"
+      "~n   RespCnt:    ~w", [N, SentAckCnt, RecvCnt, RespCnt]),
+    receive
+	{snmp_targets, {inform2_tag1, Id}, [_Addr]} ->
+	    p("received inform-sent acknowledgement for ~w", [Id]),
+	    inform_swarm_collector(N, SentAckCnt+1, RecvCnt, RespCnt, 
+				   Timeout);
+
+	%% The manager has received the actual inform
+	{async_event, From, {inform, Pid, Inform}} ->
+	    p("received inform"),
+	    case Inform of
+		{noError, 0, VBs} when is_list(VBs) ->
+		    Pid ! {handle_inform_response, From}, 
+		    inform_swarm_collector(N, SentAckCnt, RecvCnt+1, RespCnt, 
+					   Timeout);
+		{Err, Idx, VBs} ->
+		    p("<ERROR> unexpected error status: "
+		      "~n   Err: ~p"
+		      "~n   Idx: ~p"
+		      "~n   VBs: ~p", [Err, Idx, VBs]),
+		    Reason = {unexpected_status, {Err, Idx, VBs}},
+		    {error, Reason}
+	    end;
+
+	%% The agent has received ack from the manager 
+	{snmp_notification, {inform2_tag1, Id}, {got_response, Addr}} ->
+	    p("received expected \"got response\" for ~w"
+	      "notification from: "
+	      "~n   ~p", 
+	      [Id, Addr]),
+	    inform_swarm_collector(N, SentAckCnt, RecvCnt, RespCnt+1, 
+				   Timeout);
+
+	%% The agent did not received ack from the manager in time 
+	{snmp_notification, inform2_tag1, {no_response, Addr}} ->
+	    p("<ERROR> received expected \"no response\" notification "
+	      "from: "
+	      "~n   ~p", [Addr]),
+	    Reason = {no_response, Addr, {N, SentAckCnt, RecvCnt, RespCnt}},
+	    {error, Reason}
+
+    after Timeout ->
+	    %% Give up when we have been dead in the water for Timeout ms
+	    {error, {timeout, N, SentAckCnt, RecvCnt, RespCnt}}
+    end.
+		    
+
+%%======================================================================
+
+report(suite) -> [];
+report(Config) when is_list(Config) ->
+    ?SKIP(not_yet_implemented).
+
+    
+
+%%======================================================================
+
+otp8015_1(doc) -> ["OTP-8015:1 - testing the new api-function."];
+otp8015_1(suite) -> [];
+otp8015_1(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, otp8015_1),
+    p("starting with Config: ~p~n", [Config]),
+
+    ConfDir = ?config(manager_conf_dir, Config),
+    DbDir   = ?config(manager_db_dir, Config),
+
+    write_manager_conf(ConfDir),
+
+    Opts = [{server, [{verbosity, trace}]},
+	    {net_if, [{verbosity, trace}]},
+	    {note_store, [{verbosity, trace}]},
+	    {config, [{verbosity, trace}, {dir, ConfDir}, {db_dir, DbDir}]}],
+
+    p("starting manager"),
+    ok = snmpm:start_link(Opts),
+
+    ?SLEEP(1000),
+
+    snmpm:load_mib(std_mib()), 
+    snmpm:load_mib(test_trap_mib(Config)),
+
+    p("manager started, now sleep some"),
+
+    ?SLEEP(1000),
+
+    p("loaded mibs: ~p", [snmpm:which_mibs()]),
+
+    p("get some type(s) from the mibs"),    
+    {ok, 'Counter32'} = snmpm:oid_to_type(?snmpOutTraps), 
+    {ok, [IfIndex]} = snmpm:name_to_oid(ifIndex),
+    {ok, 'INTEGER'} = snmpm:oid_to_type(IfIndex),
+    
+
+    p("stop manager"),
+    ok = snmpm:stop(),
+
+    ?SLEEP(1000),
+
+    p("end"),
+    ok.
+
+
+%%======================================================================
+%% async snmp utility functions
+%%======================================================================
+
+async_exec([], Acc) ->
+    p("all async request's sent => now await reponses"),
+    async_verify(async_collector(Acc, []));
+async_exec([{Id, Data, Exec, Ver}|Reqs], Acc) ->
+    p("issue async request ~w", [Id]),
+    ?line {ok, ReqId} = Exec(Data),
+    async_exec(Reqs, [{ReqId, Id, Ver}|Acc]).
+
+async_collector([], Acc) ->
+    p("received replies for all requests - now sort"),
+    lists:keysort(1, Acc);
+async_collector(Expected, Acc) ->
+    receive
+	{async_event, ReqId, Reply} ->
+	    p("received async event with request-id ~w", [ReqId]),
+	    case lists:keysearch(ReqId, 1, Expected) of
+		{value, {_, Id, Ver}} ->
+		    p("event was for request ~w", [Id]),
+		    Expected2 = lists:keydelete(ReqId, 1, Expected),
+		    async_collector(Expected2, [{Id, Ver, Reply}|Acc]);
+		false ->
+		    % Duplicate reply?
+		    ?FAIL({unexpected_async_event, ReqId, Reply})
+	    end
+    after 10000 ->
+	    ?FAIL({timeout, {Expected, Acc}})
+    end.
+
+async_verify([]) ->
+    ok;
+async_verify([{Id, Verify, Reply}|Replies]) ->
+    p("verify reply ~w", [Id]),
+    Verify(Reply),
+    async_verify(Replies).
+
+
+
+%%======================================================================
+%% Internal functions
+%%======================================================================
+
+
+%% -- Verify varbinds --
+
+validate_vbs(Node, ExpVBs, VBs) ->
+    validate_vbs(purify_oids(Node, ExpVBs), VBs).
+
+validate_testTrapv22_vbs(Node, VBs) ->
+    ExpVBs = [{[sysUpTime, 0], any},
+	      {[snmpTrapOID, 0], ?system ++ [0,1]}],
+    validate_vbs(purify_oids(Node, ExpVBs), VBs).
+
+validate_vbs([], []) ->
+    ok;
+validate_vbs(Exp, []) ->
+    {error, {expected_vbs, Exp}};
+validate_vbs([], VBs) ->
+    {error, {unexpected_vbs, VBs}};
+validate_vbs([any|Exp], [_|VBs]) ->
+    validate_vbs(Exp, VBs);
+validate_vbs([{_, any}|Exp], [#varbind{}|VBs]) ->
+    validate_vbs(Exp, VBs);
+validate_vbs([{Oid, Val}|Exp], [#varbind{oid = Oid, value = Val}|VBs]) ->
+    validate_vbs(Exp, VBs);
+validate_vbs([{Oid, Val1}|_], [#varbind{oid = Oid, value = Val2}|_]) ->
+    {error, {unexpected_vb_value, Oid, Val1, Val2}};
+validate_vbs([{Oid1, _}|_], [#varbind{oid = Oid2}|_]) ->
+    {error, {unexpected_vb_oid, Oid1, Oid2}}.
+
+purify_oids(_, []) ->
+    [];
+purify_oids(Node, [{Oid, Val}|Oids]) ->
+    [{purify_oid(Node, Oid), Val}| purify_oids(Node, Oids)].
+
+purify_oid(Node, Oid) ->
+    case mgr_user_purify_oid(Node, Oid) of
+	Oid2 when is_list(Oid2) ->
+	    Oid2;
+	{error, _} = Error ->
+	    throw(Error)
+    end.
+
+
+%% -- Test case command handler (executor) ---
+
+command_handler([]) ->
+    ok;
+command_handler([{No, Desc, Cmd}|Cmds]) ->
+    p("command_handler -> command ~w: "
+      "~n   ~s", [No, Desc]),
+    case (catch Cmd()) of
+	ok ->
+            p("command_handler -> ~w: ok",[No]),
+            command_handler(Cmds);
+        {error, Reason} ->
+            p("<ERROR> command_handler -> ~w error: ~n~p",[No, Reason]),
+            ?line ?FAIL({command_failed, No, Reason});
+        Error ->
+            p("<ERROR> command_handler -> ~w unexpected: ~n~p",[No, Error]),
+            ?line ?FAIL({unexpected_command_result, No, Error})
+    end.
+
+
+%% -- Misc manager functions --
+
+init_manager(AutoInform, Config) ->
+    ?LOG("init_manager -> entry with"
+	 "~n   AutoInform: ~p"
+	 "~n   Config:     ~p", [AutoInform, Config]),
+
+
+    %% -- 
+    %% Start node
+    %% 
+
+    ?line Node = start_manager_node(),
+
+
+    %% -- 
+    %% Start and initiate crypto on manager node
+    %% 
+
+    ?line ok = init_crypto(Node),
+
+    %% 
+    %% Write manager config
+    %% 
+
+    ?line ok = write_manager_config(Config),
+    
+    IRB  = case AutoInform of
+	       true ->
+		   auto;
+	       _ ->
+		   user
+	   end,
+    Conf = [{manager_node, Node}, {irb, IRB} | Config],
+    Vsns = [v1,v2,v3], 
+    start_manager(Node, Vsns, Conf).
+    
+fin_manager(Config) ->
+    Node = ?config(manager_node, Config),
+    stop_manager(Node, Config),
+    fin_crypto(Node),
+    stop_node(Node),
+    Config.
+    
+
+%% -- Misc agent functions --
+
+init_agent(Config) ->
+    ?LOG("init_agent -> entry with"
+	 "~n   Config: ~p", [Config]),
+
+    %% -- 
+    %% Retrieve some dir's
+    %% 
+    Dir     = ?config(top_dir,  Config),
+    DataDir = ?config(data_dir, Config),
+
+    %% -- 
+    %% Start node
+    %% 
+
+    ?line Node = start_agent_node(),
+
+
+    %% -- 
+    %% Start and initiate mnesia on agent node
+    %% 
+
+    ?line ok = init_mnesia(Node, Dir),
+    
+
+    %% -- 
+    %% Start and initiate crypto on agent node
+    %% 
+
+    ?line ok = init_crypto(Node),
+    
+
+    %% 
+    %% Write agent config
+    %% 
+
+    Vsns = [v1,v2], 
+    ?line ok = write_agent_config(Vsns, Config),
+
+    Conf = [{agent_node, Node},
+	    {mib_dir,    DataDir} | Config],
+    
+    %% 
+    %% Start the agent 
+    %% 
+
+    start_agent(Node, Vsns, Conf).
+
+fin_agent(Config) ->
+    Node = ?config(agent_node, Config),
+    stop_agent(Node, Config),
+    fin_crypto(Node),
+    fin_mnesia(Node),
+    stop_node(Node),
+    Config.
+
+init_mnesia(Node, Dir) ->
+    ?DBG("init_mnesia -> load application mnesia", []),
+    ?line ok = load_mnesia(Node),
+
+    ?DBG("init_mnesia -> application mnesia: set_env dir: ~n~p",[Dir]),
+    ?line ok = set_mnesia_env(Node, dir, filename:join(Dir, "mnesia")),
+
+    ?DBG("init_mnesia -> create mnesia schema",[]),
+    ?line case create_schema(Node) of
+	      ok ->
+		  ok;
+	      {error, {Node, {already_exists, Node}}} ->
+		  ?line ok = delete_schema(Node),
+		  ?line ok = create_schema(Node);
+	      Error ->
+		  ?FAIL({failed_creating_mnesia_schema, Error})
+	  end,
+    
+    ?DBG("init_mnesia -> start application mnesia",[]),
+    ?line ok = start_mnesia(Node),
+
+    ?DBG("init_mnesia -> create tables",[]),
+    ?line ok = create_tables(Node),
+    ok.
+
+fin_mnesia(Node) ->
+    ?line ok = delete_tables(Node),
+    ?line ok = stop_mnesia(Node),
+    ok.
+
+
+init_crypto(Node) ->
+    ?line ok = load_crypto(Node),
+    ?line ok = start_crypto(Node),
+    ok.
+
+fin_crypto(Node) ->
+    ?line ok = stop_crypto(Node),
+    ok.
+
+
+%% -- Misc application wrapper functions --
+
+load_app(Node, App) when (Node =:= node()) andalso is_atom(App) ->
+    application:load(App);
+load_app(Node, App) when is_atom(App) ->
+    rcall(Node, application, load, [App]).
+    
+start_app(Node, App) when (Node =:= node()) andalso is_atom(App) ->
+    application:start(App);
+start_app(Node, App) ->
+    rcall(Node, application, start, [App]).
+
+stop_app(Node, App) when (Node =:= node()) andalso is_atom(App)  ->
+    application:stop(App);
+stop_app(Node, App) when is_atom(App) ->
+    rcall(Node, application, stop, [App]).
+
+set_app_env(Node, App, Key, Val) when (Node =:= node()) andalso is_atom(App) ->
+    application:set_env(App, Key, Val);
+set_app_env(Node, App, Key, Val) when is_atom(App) ->
+    rcall(Node, application, set_env, [App, Key, Val]).
+
+
+%% -- Misc snmp wrapper functions --
+
+load_snmp(Node)                 -> load_app(Node, snmp).
+start_snmp(Node)                -> start_app(Node, snmp).
+stop_snmp(Node)                 -> stop_app(Node, snmp).
+set_agent_env(Node, Env)        -> set_snmp_env(Node, agent, Env).
+set_mgr_env(Node, Env)          -> set_snmp_env(Node, manager, Env).
+set_snmp_env(Node, Entity, Env) -> set_app_env(Node, snmp, Entity, Env).
+
+mgr_info(Node) ->
+    rcall(Node, snmpm, info, []).
+
+mgr_sys_info(Node) ->
+    rcall(Node, snmpm_config, system_info, []).
+
+%% mgr_register_user(Node, Id, Data) ->
+%%     mgr_register_user(Node, Id, ?MODULE, Data).
+
+mgr_register_user(Node, Id, Mod, Data) when is_atom(Mod) ->
+    rcall(Node, snmpm, register_user, [Id, Mod, Data]).
+
+mgr_unregister_user(Node, Id) ->
+    rcall(Node, snmpm, unregister_user, [Id]).
+
+mgr_which_users(Node) ->
+    rcall(Node, snmpm, which_users, []).
+
+%% mgr_register_agent(Node, Id) ->
+%%     mgr_register_agent(Node, Id, []).
+
+%% mgr_register_agent(Node, Id, Conf) when is_list(Conf) ->
+%%     mgr_register_agent(Node, Id, 5000, Conf).
+
+mgr_register_agent(Node, Id, Port, Conf) 
+  when is_integer(Port) andalso is_list(Conf) ->
+    Localhost = snmp_test_lib:localhost(),
+    mgr_register_agent(Node, Id, Localhost, Port, Conf);
+mgr_register_agent(Node, Id, TargetName, Config) 
+  when is_list(TargetName) andalso is_list(Config) ->
+    rcall(Node, snmpm, register_agent, [Id, TargetName, Config]).
+
+mgr_register_agent(Node, Id, Addr, Port, Conf) 
+  when is_integer(Port) andalso is_list(Conf) ->
+    rcall(Node, snmpm, register_agent, [Id, Addr, Port, Conf]).
+
+%% mgr_unregister_agent(Node, Id) ->
+%%     mgr_unregister_agent(Node, Id, 4000).
+
+mgr_unregister_agent(Node, Id, Port) when is_integer(Port) ->
+    Localhost = snmp_test_lib:localhost(),
+    rcall(Node, snmpm, unregister_agent, [Id, Localhost, Port]);
+mgr_unregister_agent(Node, Id, TargetName) when is_list(TargetName) ->
+    rcall(Node, snmpm, unregister_agent, [Id, TargetName]).
+
+mgr_which_agents(Node) ->
+    rcall(Node, snmpm, which_agents, []).
+
+mgr_which_agents(Node, Id) ->
+    rcall(Node, snmpm, which_agents, [Id]).
+
+
+%% -- Misc crypto wrapper functions --
+
+load_crypto(Node)  -> load_app(Node,  crypto).
+start_crypto(Node) -> start_app(Node, crypto).
+stop_crypto(Node)  -> stop_app(Node,  crypto).
+
+
+%% -- Misc mnesia wrapper functions --
+
+load_mnesia(Node)              -> load_app(Node,    mnesia).
+start_mnesia(Node)             -> start_app(Node,   mnesia).
+stop_mnesia(Node)              -> stop_app(Node,    mnesia).
+set_mnesia_env(Node, Key, Val) -> set_app_env(Node, mnesia, Key, Val).
+
+create_schema(Node) ->
+    rcall(Node, mnesia, create_schema, [[Node]]).
+
+delete_schema(Node) ->
+    rcall(Node, mnesia, delete_schema, [[Node]]).
+
+create_table(Node, Table) ->
+    rcall(Node, mnesia, create_table, [Table]).
+
+delete_table(Node, Table) ->
+    rcall(Node, mnesia, delete_table, [Table]).
+
+create_tables(Node) ->
+    Tab1 = [{name,       friendsTable2},
+	    {ram_copies, [Node]},
+	    {snmp,       [{key, integer}]},
+	    {attributes, [a1,a2,a3]}],
+    Tab2 = [{name,       kompissTable2},
+	    {ram_copies, [Node]},
+	    {snmp,       [{key, integer}]},
+	    {attributes, [a1,a2,a3]}],
+    Tab3 = [{name,       snmp_variables},
+	    {attributes, [a1,a2]}],
+    Tabs = [Tab1, Tab2, Tab3],
+    create_tables(Node, Tabs).
+
+create_tables(_Node, []) ->
+    ok;
+create_tables(Node, [Tab|Tabs]) ->
+    case create_table(Node, Tab) of
+	{atomic, ok} ->
+	    create_tables(Node, Tabs);
+	Error ->
+	    ?FAIL({failed_creating_table, Node, Tab, Error})
+    end.
+
+delete_tables(Node) ->
+    Tabs = [friendsTable2, kompissTable2, snmp_variables],
+    delete_tables(Node, Tabs).
+
+%% delete_mib_storage_tables(Node) ->
+%%     Tabs = [snmpa_mib_data, snmpa_mib_tree, snmpa_symbolic_store],
+%%     delete_tables(Node, Tabs).
+
+delete_tables(Node, Tabs) ->
+    lists:foreach(fun(Tab) -> delete_table(Node, Tab) end, Tabs).
+
+
+%% -- Misc manager user wrapper functions --
+
+init_mgr_user(Conf) ->
+    ?DBG("init_mgr_user -> entry with"
+	 "~n   Conf: ~p", [Conf]),
+
+    Node   = ?config(manager_node, Conf),
+    %% UserId = ?config(user_id, Conf),
+
+    ?line {ok, User} = mgr_user_start(Node),
+    ?DBG("start_mgr_user -> User: ~p", [User]),
+    link(User),
+    
+    [{user_pid, User} | Conf].
+
+fin_mgr_user(Conf) ->
+    User = ?config(user_pid, Conf),
+    unlink(User),
+    Node = ?config(manager_node, Conf),
+    ?line ok = mgr_user_stop(Node),
+    Conf.
+
+init_mgr_user_data1(Conf) ->
+    Node = ?config(manager_node, Conf),
+    Addr = ?config(ip, Conf),
+    Port = ?AGENT_PORT,
+    ?line ok = mgr_user_register_agent(Node, Addr, Port),
+    Agents = mgr_user_which_own_agents(Node),
+    ?DBG("Own agents: ~p", [Agents]),
+
+    ?line {ok, DefAgentConf} = mgr_user_agent_info(Node, Addr, Port, all),
+    ?DBG("Default agent config: ~n~p", [DefAgentConf]),
+
+    ?line ok = mgr_user_update_agent_info(Node, Addr, Port, 
+					  community, "all-rights"),
+    ?line ok = mgr_user_update_agent_info(Node, Addr, Port, 
+					  sec_name, "all-rights"),
+    ?line ok = mgr_user_update_agent_info(Node, Addr, Port, 
+					  engine_id, "agentEngine"),
+    ?line ok = mgr_user_update_agent_info(Node, Addr, Port, 
+					  max_message_size, 1024),
+
+    ?line {ok, AgentConf} = mgr_user_agent_info(Node, Addr, Port, all),
+    ?DBG("Updated agent config: ~n~p", [AgentConf]),
+    Conf.
+
+init_mgr_user_data2(Conf) ->
+    Node       = ?config(manager_node, Conf),
+    TargetName = ?config(manager_agent_target_name, Conf),
+    Addr       = ?config(ip, Conf),
+    Port       = ?AGENT_PORT,
+    ?line ok = mgr_user_register_agent(Node, TargetName, 
+				       [{address,   Addr}, 
+					{port,      Port},
+					{engine_id, "agentEngine"}]),
+    Agents = mgr_user_which_own_agents(Node),
+    ?DBG("Own agents: ~p", [Agents]),
+
+    ?line {ok, DefAgentConf} = mgr_user_agent_info(Node, TargetName, all),
+    ?DBG("Default agent config: ~n~p", [DefAgentConf]),
+
+    ?line ok = mgr_user_update_agent_info(Node, TargetName, 
+					  community, "all-rights"),
+    ?line ok = mgr_user_update_agent_info(Node, TargetName, 
+					  sec_name, "all-rights"),
+    ?line ok = mgr_user_update_agent_info(Node, TargetName, 
+					  max_message_size, 1024),
+
+    ?line {ok, AgentConf} = mgr_user_agent_info(Node, TargetName, all),
+    ?DBG("Updated agent config: ~n~p", [AgentConf]),
+    Conf.
+
+fin_mgr_user_data1(Conf) ->
+    Node = ?config(manager_node, Conf),
+    Addr = ?config(ip, Conf),
+    Port = ?AGENT_PORT,
+    mgr_user_unregister_agent(Node, Addr, Port),
+    mgr_user_which_own_agents(Node),
+    Conf.
+
+fin_mgr_user_data2(Conf) ->
+    Node = ?config(manager_node, Conf),
+    TargetName = ?config(manager_agent_target_name, Conf),
+    mgr_user_unregister_agent(Node, TargetName),
+    mgr_user_which_own_agents(Node),
+    Conf.
+
+mgr_user_start(Node) ->
+    mgr_user_start(Node, snmp_manager_test_user).
+mgr_user_start(Node, Id) ->
+    rcall(Node, snmp_manager_user, start, [self(), Id]).
+
+mgr_user_stop(Node) ->
+    rcall(Node, snmp_manager_user, stop, []).
+
+%% mgr_user_register_agent(Node) ->
+%%     mgr_user_register_agent(Node, ?LOCALHOST(), ?AGENT_PORT, []).
+%% mgr_user_register_agent(Node, TargetName) when is_list(TargetName) ->
+%%     mgr_user_register_agent(Node, TargetName, []);
+%% mgr_user_register_agent(Node, Addr) ->
+%%     mgr_user_register_agent(Node, Addr, ?AGENT_PORT, []).
+mgr_user_register_agent(Node, TargetName, Conf) 
+  when is_list(TargetName) andalso is_list(Conf) ->
+    rcall(Node, snmp_manager_user, register_agent, [TargetName, Conf]);
+mgr_user_register_agent(Node, Addr, Port) ->
+    mgr_user_register_agent(Node, Addr, Port, []).
+mgr_user_register_agent(Node, Addr, Port, Conf) ->
+    rcall(Node, snmp_manager_user, register_agent, [Addr, Port, Conf]).
+
+%% mgr_user_unregister_agent(Node) ->
+%%     mgr_user_unregister_agent(Node, ?LOCALHOST(), ?AGENT_PORT).
+mgr_user_unregister_agent(Node, Addr_or_TargetName) ->
+    rcall(Node, snmp_manager_user, unregister_agent, [Addr_or_TargetName]).
+mgr_user_unregister_agent(Node, Addr, Port) ->
+    rcall(Node, snmp_manager_user, unregister_agent, [Addr, Port]).
+
+mgr_user_agent_info(Node, Addr_or_TargetName, Item) when is_atom(Item) ->
+    rcall(Node, snmp_manager_user, agent_info, [Addr_or_TargetName, Item]).
+mgr_user_agent_info(Node, Addr, Port, Item) when is_atom(Item) ->
+    rcall(Node, snmp_manager_user, agent_info, [Addr, Port, Item]).
+
+%% mgr_user_update_agent_info(Node, Item, Val) when atom(Item) ->
+%%     mgr_user_update_agent_info(Node, ?LOCALHOST(), ?AGENT_PORT, Item, Val).
+mgr_user_update_agent_info(Node, Addr_or_TargetName, Item, Val) 
+  when is_atom(Item) ->
+    rcall(Node, snmp_manager_user, update_agent_info, 
+	  [Addr_or_TargetName, Item, Val]).
+mgr_user_update_agent_info(Node, Addr, Port, Item, Val) when is_atom(Item) ->
+    rcall(Node, snmp_manager_user, update_agent_info, 
+	  [Addr, Port, Item, Val]).
+
+%% mgr_user_which_all_agents(Node) ->
+%%     rcall(Node, snmp_manager_user, which_all_agents, []).
+
+mgr_user_which_own_agents(Node) ->
+    rcall(Node, snmp_manager_user, which_own_agents, []).
+
+mgr_user_load_mib(Node, Mib) ->
+    rcall(Node, snmp_manager_user, load_mib, [Mib]).
+
+%% mgr_user_sync_get(Node, Oids) ->
+%%     mgr_user_sync_get(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
+mgr_user_sync_get(Node, Addr_or_TargetName, Oids) ->
+    rcall(Node, snmp_manager_user, sync_get, [Addr_or_TargetName, Oids]).
+mgr_user_sync_get(Node, Addr, Port, Oids) ->
+    rcall(Node, snmp_manager_user, sync_get, [Addr, Port, Oids]).
+
+%% mgr_user_async_get(Node, Oids) ->
+%%     mgr_user_async_get(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
+mgr_user_async_get(Node, Addr_or_TargetName, Oids) ->
+    rcall(Node, snmp_manager_user, async_get, [Addr_or_TargetName, Oids]).
+mgr_user_async_get(Node, Addr, Port, Oids) ->
+    rcall(Node, snmp_manager_user, async_get, [Addr, Port, Oids]).
+
+%% mgr_user_sync_get_next(Node, Oids) ->
+%%     mgr_user_sync_get_next(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
+mgr_user_sync_get_next(Node, Addr_or_TargetName, Oids) ->
+    rcall(Node, snmp_manager_user, sync_get_next, [Addr_or_TargetName, Oids]).
+mgr_user_sync_get_next(Node, Addr, Port, Oids) ->
+    rcall(Node, snmp_manager_user, sync_get_next, [Addr, Port, Oids]).
+
+%% mgr_user_async_get_next(Node, Oids) ->
+%%     mgr_user_async_get_next(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
+mgr_user_async_get_next(Node, Addr_or_TargetName, Oids) ->
+    rcall(Node, snmp_manager_user, async_get_next, [Addr_or_TargetName, Oids]).
+mgr_user_async_get_next(Node, Addr, Port, Oids) ->
+    rcall(Node, snmp_manager_user, async_get_next, [Addr, Port, Oids]).
+
+%% mgr_user_sync_set(Node, VAV) ->
+%%     mgr_user_sync_set(Node, ?LOCALHOST(), ?AGENT_PORT, VAV).
+mgr_user_sync_set(Node, Addr_or_TargetName, VAV) ->
+    rcall(Node, snmp_manager_user, sync_set, [Addr_or_TargetName, VAV]).
+mgr_user_sync_set(Node, Addr, Port, VAV) ->
+    rcall(Node, snmp_manager_user, sync_set, [Addr, Port, VAV]).
+
+%% mgr_user_async_set(Node, VAV) ->
+%%     mgr_user_async_set(Node, ?LOCALHOST(), ?AGENT_PORT, VAV).
+mgr_user_async_set(Node, Addr_or_TargetName, VAV) ->
+    rcall(Node, snmp_manager_user, async_set, [Addr_or_TargetName, VAV]).
+mgr_user_async_set(Node, Addr, Port, VAV) ->
+    rcall(Node, snmp_manager_user, async_set, [Addr, Port, VAV]).
+
+%% mgr_user_sync_get_bulk(Node, NonRep, MaxRep, Oids) ->
+%%     mgr_user_sync_get_bulk(Node, ?LOCALHOST(), ?AGENT_PORT, 
+%% 			   NonRep, MaxRep, Oids).
+mgr_user_sync_get_bulk(Node, Addr_or_TargetName, NonRep, MaxRep, Oids) ->
+    rcall(Node, snmp_manager_user, sync_get_bulk, 
+	     [Addr_or_TargetName, NonRep, MaxRep, Oids]).
+mgr_user_sync_get_bulk(Node, Addr, Port, NonRep, MaxRep, Oids) ->
+    rcall(Node, snmp_manager_user, sync_get_bulk, 
+	     [Addr, Port, NonRep, MaxRep, Oids]).
+
+%% mgr_user_async_get_bulk(Node, NonRep, MaxRep, Oids) ->
+%%     mgr_user_async_get_bulk(Node, ?LOCALHOST(), ?AGENT_PORT, 
+%% 			   NonRep, MaxRep, Oids).
+mgr_user_async_get_bulk(Node, Addr_or_TargetName, NonRep, MaxRep, Oids) ->
+    rcall(Node, snmp_manager_user, async_get_bulk, 
+	     [Addr_or_TargetName, NonRep, MaxRep, Oids]).
+mgr_user_async_get_bulk(Node, Addr, Port, NonRep, MaxRep, Oids) ->
+    rcall(Node, snmp_manager_user, async_get_bulk, 
+	     [Addr, Port, NonRep, MaxRep, Oids]).
+
+mgr_user_purify_oid(Node, Oid) ->
+    rcall(Node, snmp_manager_user, purify_oid, [Oid]).
+
+mgr_user_name_to_oid(Node, Name) ->
+    rcall(Node, snmp_manager_user, name_to_oid, [Name]).
+
+   
+%% -- Misc manager wrapper functions --
+
+start_manager(Node, Vsns, Config) ->
+    start_manager(Node, Vsns, Config, []).
+start_manager(Node, Vsns, Conf0, Opts) ->
+    ?DBG("start_manager -> entry with"
+	 "~n   Node:   ~p"
+	 "~n   Vsns:   ~p"
+	 "~n   Conf0:  ~p"
+	 "~n   Opts:   ~p", [Node, Vsns, Conf0, Opts]),
+    
+    AtlDir  = ?config(manager_log_dir,  Conf0),
+    ConfDir = ?config(manager_conf_dir, Conf0),
+    DbDir   = ?config(manager_db_dir, Conf0),
+    IRB     = ?config(irb, Conf0),
+
+    ConfigVerbosity    = get_opt(manager_config_verbosity,     Conf0, trace),
+    NoteStoreVerbosity = get_opt(manager_note_store_verbosity, Conf0, log),
+    ServerVerbosity    = get_opt(manager_server_verbosity,     Conf0, trace),
+    NetIfVerbosity     = get_opt(manager_net_if_verbosity,     Conf0, trace),
+
+    Env = [{versions,                     Vsns},
+	   {inform_request_behaviour,     IRB},
+	   {audit_trail_log, [{type,      read_write},
+			      {dir,       AtlDir},
+			      {size,      {10240, 10}},
+			      {repair,    true}]},
+	   {config,          [{dir,       ConfDir}, 
+			      {db_dir,    DbDir}, 
+			      {verbosity, ConfigVerbosity}]},
+	   {note_store,      [{verbosity, NoteStoreVerbosity}]},
+	   {server,          [{verbosity, ServerVerbosity}]},
+	   {net_if,          [{verbosity, NetIfVerbosity}]}],
+    ?line ok = set_mgr_env(Node, Env),
+
+    ?line ok = start_snmp(Node),
+    
+    Conf0.
+
+stop_manager(Node, Conf) ->
+    stop_snmp(Node),
+    Conf.
+
+%% -- Misc agent wrapper functions --
+
+start_agent(Node, Vsns, Config) ->
+    start_agent(Node, Vsns, Config, []).
+start_agent(Node, Vsns, Conf0, Opts) ->
+    ?DBG("start_agent -> entry with"
+	 "~n   Node:   ~p"
+	 "~n   Vsns:   ~p"
+	 "~n   Conf0:  ~p"
+	 "~n   Opts:   ~p", [Node, Vsns, Conf0, Opts]),
+    
+    AtlDir  = ?config(agent_log_dir,  Conf0),
+    ConfDir = ?config(agent_conf_dir, Conf0),
+    DbDir   = ?config(agent_db_dir,   Conf0),
+
+    MAV  = get_opt(agent_verbosity,                Conf0, trace),
+    CV   = get_opt(agent_config_verbosity,         Conf0, info),
+    LDBV = get_opt(agent_local_db_verbosity,       Conf0, info),
+    MSV  = get_opt(agent_mib_server_verbosity,     Conf0, info),
+    NSV  = get_opt(agent_note_store_verbosity,     Conf0, info),
+    SSV  = get_opt(agent_symbolic_store_verbosity, Conf0, info),
+    NIV  = get_opt(agent_net_if_verbosity,         Conf0, log),
+
+    Env = [{versions,        Vsns},
+	   {type,            master},
+	   {agent_verbosity, MAV},
+	   {audit_trail_log, [{type,   read_write},
+			      {dir,    AtlDir},
+			      {size,   {10240, 10}},
+			      {repair, true}]},
+	   {config,          [{dir,        ConfDir}, 
+			      {force_load, false}, 
+			      {verbosity,  CV}]},
+	   {db_dir,          DbDir},
+	   {local_db,        [{repair,    true},
+			      {auto_save, 10000},
+			      {verbosity, LDBV}]},
+	   {mib_server,      [{verbosity, MSV}]},
+	   {note_store,      [{verbosity, NSV}]},
+	   {stymbolic_store, [{verbosity, SSV}]},
+	   {net_if,          [{verbosity, NIV}]},
+	   {multi_threaded,  true}],
+    ?line ok = set_agent_env(Node, Env),
+
+    ?line ok = start_snmp(Node),
+    Conf0.
+
+stop_agent(Node, Conf) ->
+    stop_snmp(Node),
+    Conf.
+
+agent_load_mib(Node, Mib) ->
+    rcall(Node, snmpa, load_mibs, [[Mib]]).
+%% agent_unload_mib(Node, Mib) ->
+%%     rcall(Node, snmpa, unload_mibs, [[Mib]]).
+
+%% agent_send_trap(Node, Trap, Community) ->
+%%     Args = [snmp_master_agent, Trap, Community],
+%%     rcall(Node, snmpa, send_trap, Args).
+
+agent_send_trap(Node, Trap, Community, VBs) ->
+    Args = [snmp_master_agent, Trap, Community, VBs],
+    rcall(Node, snmpa, send_trap, Args).
+
+agent_send_notif(Node, Trap, Name) ->
+    agent_send_notif(Node, Trap, Name, []).
+
+agent_send_notif(Node, Trap, Name, VBs) ->
+    agent_send_notif(Node, Trap, no_receiver, Name, VBs).
+
+agent_send_notif(Node, Trap, Recv, Name, VBs) ->
+    Args = [snmp_master_agent, Trap, Recv, Name, VBs],
+    rcall(Node, snmpa, send_notification, Args).
+
+agent_info(Node) ->
+    rcall(Node, snmpa, info, []).
+
+%% agent_which_mibs(Node) ->
+%%     rcall(Node, snmpa, which_mibs, []).
+
+
+%% -- Misc node operation wrapper functions --
+
+start_agent_node() ->
+    start_node(snmp_agent).
+
+start_manager_node() ->
+    start_node(snmp_manager).
+
+start_node(Name) ->
+    Pa   = filename:dirname(code:which(?MODULE)),
+    Args = case init:get_argument('CC_TEST') of
+               {ok, [[]]} ->
+                   " -pa /clearcase/otp/libraries/snmp/ebin ";
+               {ok, [[Path]]} ->
+                   " -pa " ++ Path;
+               error ->
+                      ""
+              end,
+    A = Args ++ " -pa " ++ Pa,
+    case (catch ?START_NODE(Name, A)) of
+	{ok, Node} ->
+	    Node;
+	Else ->
+	    ?line ?FAIL(Else)
+    end.
+
+stop_node(Node) ->
+    rpc:cast(Node, erlang, halt, []),
+    await_stopped(Node, 5).
+
+await_stopped(_, 0) ->
+    ok;
+await_stopped(Node, N) ->
+    Nodes = erlang:nodes(),
+    case lists:member(Node, Nodes) of
+	true ->
+	    ?DBG("[~w] ~p still exist", [N, Node]),
+	    ?SLEEP(1000),
+	    await_stopped(Node, N-1);
+	false ->
+	    ?DBG("[~w] ~p gone", [N, Node]),
+	    ok
+    end.
+    
+ 
+
+%% -- Misc config wrapper functions --
+
+write_manager_config(Config) ->
+    Dir  = ?config(manager_conf_dir, Config),
+    Ip   = ?config(ip, Config),
+    Addr = tuple_to_list(Ip),
+    snmp_config:write_manager_snmp_files(Dir, Addr, ?MGR_PORT, 
+					 ?MGR_MMS, ?MGR_ENGINE_ID, [], [], []).
+
+write_manager_conf(Dir) ->
+    Port = "5000",
+    MMS  = "484",
+    EngineID = "\"mgrEngine\"",
+    Str = lists:flatten(
+            io_lib:format("%% Minimum manager config file\n"
+                          "{port,             ~s}.\n"
+                          "{max_message_size, ~s}.\n"
+                          "{engine_id,        ~s}.\n",
+                          [Port, MMS, EngineID])),
+    write_manager_conf(Dir, Str).
+
+%% write_manager_conf(Dir, IP, Port, MMS, EngineID) ->
+%%     Str = lists:flatten(
+%%             io_lib:format("{address,          ~s}.\n"
+%%                           "{port,             ~s}.\n"
+%%                           "{max_message_size, ~s}.\n"
+%%                           "{engine_id,        ~s}.\n",
+%%                           [IP, Port, MMS, EngineID])),
+%%     write_manager_conf(Dir, Str).
+
+write_manager_conf(Dir, Str) ->
+    write_conf_file(Dir, "manager.conf", Str).
+
+
+write_agent_config(Vsns, Conf) ->
+    Dir = ?config(agent_conf_dir, Conf),
+    Ip  = ?config(ip, Conf),
+    ?line Addr = tuple_to_list(Ip),
+    ?line ok = write_agent_config_files(Dir, Vsns, Addr),
+    ?line ok = update_agent_usm(Vsns, Dir),
+    ?line ok = update_agent_community(Vsns, Dir),
+    ?line ok = update_agent_vacm(Vsns, Dir),
+    ?line ok = write_agent_target_addr_conf(Dir, Addr, Vsns),
+    ?line ok = write_agent_target_params_conf(Dir, Vsns),
+    ?line ok = write_agent_notify_conf(Dir),
+    ok.
+    
+write_agent_config_files(Dir, Vsns, Addr) ->
+    snmp_config:write_agent_snmp_files(Dir, Vsns, 
+				       Addr, ?MGR_PORT, 
+				       Addr, ?AGENT_PORT, 
+				       "mgr-test", "trap", 
+				       none, "", 
+				       ?AGENT_ENGINE_ID, 
+				       ?AGENT_MMS).
+
+update_agent_usm(Vsns, Dir) ->
+    case lists:member(v3, Vsns) of
+        true ->
+            Conf = [{"agentEngine", "all-rights", "all-rights", zeroDotZero, 
+                     usmNoAuthProtocol, "", "", 
+                     usmNoPrivProtocol, "", "", "", "", ""}, 
+
+                    {"agentEngine", "no-rights", "no-rights", zeroDotZero, 
+                     usmNoAuthProtocol, "", "", 
+                     usmNoPrivProtocol, "", "", "", "", ""}, 
+
+                    {"agentEngine", "authMD5", "authMD5", zeroDotZero, 
+                     usmHMACMD5AuthProtocol, "", "", 
+                     usmNoPrivProtocol, "", "", "", "passwd_md5xxxxxx", ""}, 
+
+                    {"agentEngine", "authSHA", "authSHA", zeroDotZero, 
+                     usmHMACSHAAuthProtocol, "", "", 
+                     usmNoPrivProtocol, "", "", "", 
+                     "passwd_shaxxxxxxxxxx", ""}, 
+
+                    {"agentEngine", "privDES", "privDES", zeroDotZero, 
+                     usmHMACSHAAuthProtocol, "", "", 
+                     usmDESPrivProtocol, "", "", "", 
+                     "passwd_shaxxxxxxxxxx", "passwd_desxxxxxx"}, 
+
+                    {"mgrEngine", "all-rights", "all-rights", zeroDotZero, 
+                     usmNoAuthProtocol, "", "", 
+                     usmNoPrivProtocol, "", "", "", "", ""}, 
+
+                    {"mgrEngine", "no-rights", "no-rights", zeroDotZero, 
+                     usmNoAuthProtocol, "", "", 
+                     usmNoPrivProtocol, "", "", "", "", ""}, 
+
+                    {"mgrEngine", "authMD5", "authMD5", zeroDotZero, 
+                     usmHMACMD5AuthProtocol, "", "", 
+                     usmNoPrivProtocol, "", "", "", "passwd_md5xxxxxx", ""}, 
+
+                    {"mgrEngine", "authSHA", "authSHA", zeroDotZero, 
+                     usmHMACSHAAuthProtocol, "", "", 
+                     usmNoPrivProtocol, "", "", "", 
+                     "passwd_shaxxxxxxxxxx", ""}, 
+
+                    {"mgrEngine", "privDES", "privDES", zeroDotZero, 
+                     usmHMACSHAAuthProtocol, "", "", 
+                     usmDESPrivProtocol, "", "", "", 
+                     "passwd_shaxxxxxxxxxx", "passwd_desxxxxxx"}],
+            snmp_config:update_agent_usm_config(Dir, Conf);
+        false ->
+            ok
+    end.
+
+update_agent_community([v3], _Dir) -> 
+    ok;
+update_agent_community(_, Dir) ->
+    Conf = [{"no-rights", "no-rights", "no-rights", "", ""}],
+    snmp_config:update_agent_community_config(Dir, Conf).
+
+update_agent_vacm(_Vsns, Dir) ->
+    Conf = [{vacmSecurityToGroup, usm, "authMD5", "initial"}, 
+            {vacmSecurityToGroup, usm, "authSHA", "initial"}, 
+            {vacmSecurityToGroup, usm, "privDES", "initial"}, 
+            {vacmSecurityToGroup, usm, "newUser", "initial"},
+            {vacmViewTreeFamily, "internet", ?tDescr_instance, 
+             excluded, null}],
+    snmp_config:update_agent_vacm_config(Dir, Conf).
+
+write_agent_target_addr_conf(Dir, Addr, Vsns) -> 
+    snmp_config:write_agent_snmp_target_addr_conf(Dir, Addr, ?MGR_PORT, 
+						  300, 3, Vsns).
+
+write_agent_target_params_conf(Dir, Vsns) -> 
+    F = fun(v1) -> {"target_v1", v1,  v1,  "all-rights", noAuthNoPriv};
+           (v2) -> {"target_v2", v2c, v2c, "all-rights", noAuthNoPriv};
+           (v3) -> {"target_v3", v3,  usm, "all-rights", noAuthNoPriv}
+        end,
+    Conf = [F(Vsn) || Vsn <- Vsns],
+    snmp_config:write_agent_target_params_config(Dir, "", Conf).
+
+write_agent_notify_conf(Dir) -> 
+    Conf = [{"standard trap",   "std_trap",   trap}, 
+            {"standard inform", "std_inform", inform}],
+    snmp_config:write_agent_notify_config(Dir, "", Conf).
+
+
+write_conf_file(Dir, File, Str) ->
+    ?line {ok, Fd} = file:open(filename:join(Dir, File), write),
+    ?line ok = io:format(Fd, "~s", [Str]),
+    file:close(Fd).
+ 
+
+%% ------
+
+test2_mib(Config) ->
+    j(test_mib_dir(Config), "Test2.bin").
+
+test_trap_mib(Config) ->
+    j(test_mib_dir(Config), "TestTrap.bin").
+
+test_trap_v2_mib(Config) ->
+    j(test_mib_dir(Config), "TestTrapv2.bin").
+
+std_mib() ->
+    j(mib_dir(), "STANDARD-MIB.bin").
+
+snmpv2_mib() ->
+    j(mib_dir(), "SNMPv2-MIB.bin").
+
+test_mib_dir(Config) ->
+    ?config(snmp_data_dir, Config).
+
+mib_dir() ->
+    j(code:priv_dir(snmp), "mibs").
+
+j(A, B) ->
+    filename:join(A, B).
+
+
+%% ------
+
+get_opt(Key, Opts, Def) ->
+    snmp_misc:get_option(Key, Opts, Def).
+
+
+%% ------
+
+rcall(Node, Mod, Func, Args) ->
+    case rpc:call(Node, Mod, Func, Args) of
+	{badrpc, nodedown} ->
+	    ?FAIL({rpc_failure, Node});
+	Else ->
+	    Else
+    end.
+
+
+%% ------
+
+%% Time in milli sec
+%% t() ->
+%%     {A,B,C} = erlang:now(),
+%%     A*1000000000+B*1000+(C div 1000).
+
+
+%% ------
+
+p(F) ->
+    p(F, []).
+ 
+p(F, A) ->
+    p(get(tname), F, A).
+ 
+p(TName, F, A) ->
+    io:format("*** [~w][~s] ***"
+              "~n" ++ F ++ "~n", [TName,format_timestamp(now())|A]).
+
+format_timestamp({_N1, _N2, N3}   = Now) ->
+    {Date, Time}   = calendar:now_to_datetime(Now),
+    {YYYY,MM,DD}   = Date,
+    {Hour,Min,Sec} = Time,
+    FormatDate =
+        io_lib:format("~.4w:~.2.0w:~.2.0w ~.2.0w:~.2.0w:~.2.0w 4~w",
+                      [YYYY,MM,DD,Hour,Min,Sec,round(N3/1000)]),
+    lists:flatten(FormatDate).
+
+%% p(TName, F, A) ->
+%%     io:format("~w -> " ++ F ++ "~n", [TName|A]).
+