Merge branch 'bmk/snmp/manager/request_override_options' into bmk/snmp/snmp420_integration

Conflicts:
	lib/snmp/src/app/snmp.appup.src

OTP-9162

1 files changed, 793 insertions, 297 deletions

diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 50836db731..6bd62df655 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -37,13 +37,16 @@
 
 -include_lib("snmp/include/snmp_types.hrl").
 -include_lib("snmp/include/STANDARD-MIB.hrl").
+-include_lib("snmp/src/manager/snmpm_internal.hrl").
 
 
 %%----------------------------------------------------------------------
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-	all/0,groups/0,init_per_group/2,end_per_group/2, 
+	 all/0, 
+	 groups/0, 
+	 init_per_group/2, end_per_group/2, 
          init_per_testcase/2, end_per_testcase/2,
 
 	
@@ -54,49 +57,45 @@
 	 notify_started01/1,
 	 notify_started02/1,
 
-	
 	 register_user1/1,
-	 
 	
 	 register_agent1/1,
 	 register_agent2/1,
 
-	
 	 info/1,
 	 
-	 
-
-	
 	 simple_sync_get1/1, 
 	 simple_sync_get2/1, 
+	 simple_sync_get3/1, 
 	 simple_async_get1/1, 
 	 simple_async_get2/1, 
-
+	 simple_async_get3/1, 
 	
   	 simple_sync_get_next1/1, 
   	 simple_sync_get_next2/1, 
+  	 simple_sync_get_next3/1, 
   	 simple_async_get_next1/1, 
   	 simple_async_get_next2/1, 
-
+  	 simple_async_get_next3/1, 
 	 
 	 simple_sync_set1/1, 
 	 simple_sync_set2/1, 
+	 simple_sync_set3/1, 
 	 simple_async_set1/1, 
 	 simple_async_set2/1, 
-
+	 simple_async_set3/1, 
 	 
   	 simple_sync_get_bulk1/1, 
   	 simple_sync_get_bulk2/1, 
+  	 simple_sync_get_bulk3/1, 
   	 simple_async_get_bulk1/1, 
   	 simple_async_get_bulk2/1, 
-
+  	 simple_async_get_bulk3/1, 
 	 
   	 misc_async1/1, 
   	 misc_async2/1, 
 
 	 discovery/1,
-
-	 
 	 
 	 trap1/1,
 	 trap2/1,
@@ -109,8 +108,6 @@
 
 	 report/1,
 
-	
-	
 	 otp8015_1/1, 
 	
 	 otp8395_1/1
@@ -220,7 +217,7 @@ init_per_testcase2(Case, Config) ->
     Conf2.
 
 init_per_testcase3(Case, Config) ->
-    OldApiCases = 
+    ApiCases01 = 
 	[
 	 simple_sync_get1, 
 	 simple_async_get1, 
@@ -232,7 +229,7 @@ init_per_testcase3(Case, Config) ->
 	 simple_async_get_bulk1,
 	 misc_async1
 	],
-    NewApiCases = 
+    ApiCases02 = 
 	[
 	 simple_sync_get2, 
 	 simple_async_get2, 
@@ -245,6 +242,17 @@ init_per_testcase3(Case, Config) ->
 	 misc_async2,
 	 otp8395_1
 	],
+    ApiCases03 = 
+	[
+	 simple_sync_get3,
+	 simple_async_get3, 
+	 simple_sync_get_next3, 
+	 simple_async_get_next3, 
+	 simple_sync_set3, 
+	 simple_async_set3, 
+	 simple_sync_get_bulk3, 
+	 simple_async_get_bulk3
+	],
     Cases = 
 	[
 	 trap1,
@@ -256,8 +264,9 @@ init_per_testcase3(Case, Config) ->
 	 inform_swarm,
 	 report
 	] ++ 
-	OldApiCases ++ 
-	NewApiCases,
+	ApiCases01 ++ 
+	ApiCases02 ++
+	ApiCases03,
     case lists:member(Case, Cases) of
 	true ->
 	    NoAutoInformCases = [inform1, inform2, inform3, inform_swarm], 
@@ -279,7 +288,7 @@ init_per_testcase3(Case, Config) ->
 	    Conf2 = init_agent(Conf1),
 	    Conf3 = init_manager(AutoInform, Conf2), 
 	    Conf4 = init_mgr_user(Conf3),
-	    case lists:member(Case, NewApiCases) of
+	    case lists:member(Case, ApiCases02 ++ ApiCases03) of
 		true ->
 		    init_mgr_user_data2(Conf4);
 		false ->
@@ -301,7 +310,7 @@ end_per_testcase(Case, Config) when is_list(Config) ->
     Conf2.
 
 end_per_testcase2(Case, Config) ->
-    OldApiCases = 
+    ApiCases01 = 
 	[
 	 simple_sync_get1, 
 	 simple_async_get1, 
@@ -313,7 +322,7 @@ end_per_testcase2(Case, Config) ->
 	 simple_async_get_bulk1,
 	 misc_async1
 	],
-    NewApiCases = 
+    ApiCases02 = 
 	[
 	 simple_sync_get2, 
 	 simple_async_get2, 
@@ -326,6 +335,17 @@ end_per_testcase2(Case, Config) ->
 	 misc_async2,
 	 otp8395_1
 	],
+    ApiCases03 = 
+	[
+	 simple_sync_get3, 
+	 simple_async_get3, 
+	 simple_sync_get_next3, 
+	 simple_async_get_next3, 
+	 simple_sync_set3, 
+	 simple_async_set3, 
+	 simple_sync_get_bulk3, 
+	 simple_async_get_bulk3 
+	],
     Cases = 
 	[
 	 trap1,
@@ -337,11 +357,12 @@ end_per_testcase2(Case, Config) ->
 	 inform_swarm,
 	 report
 	] ++ 
-	OldApiCases ++ 
-	NewApiCases,
+	ApiCases01 ++ 
+	ApiCases02 ++ 
+	ApiCases03,
     case lists:member(Case, Cases) of
 	true ->
-	    Conf1 = case lists:member(Case, NewApiCases) of
+	    Conf1 = case lists:member(Case, ApiCases02 ++ ApiCases03) of
 			true ->
 			    fin_mgr_user_data2(Config);
 			false ->
@@ -360,42 +381,129 @@ end_per_testcase2(Case, Config) ->
 %%======================================================================
 
 all() -> 
-[{group, start_and_stop_tests}, {group, misc_tests},
- {group, user_tests}, {group, agent_tests},
- {group, request_tests}, {group, event_tests}, discovery,
- {group, tickets}].
+    [
+     {group, start_and_stop_tests}, 
+     {group, misc_tests},
+     {group, user_tests}, 
+     {group, agent_tests},
+     {group, request_tests}, 
+     {group, event_tests}, 
+     discovery,
+     {group, tickets}
+    ].
 
 groups() -> 
-    [{start_and_stop_tests, [],
-  [simple_start_and_stop1, simple_start_and_stop2,
-   simple_start_and_monitor_crash1,
-   simple_start_and_monitor_crash2, notify_started01,
-   notify_started02]},
- {misc_tests, [], [info]},
- {user_tests, [], [register_user1]},
- {agent_tests, [], [register_agent1, register_agent2]},
- {request_tests, [],
-  [{group, get_tests}, {group, get_next_tests},
-   {group, set_tests}, {group, bulk_tests},
-   {group, misc_request_tests}]},
- {get_tests, [],
-  [simple_sync_get1, simple_sync_get2, simple_async_get1,
-   simple_async_get2]},
- {get_next_tests, [],
-  [simple_sync_get_next1, simple_sync_get_next2,
-   simple_async_get_next1, simple_async_get_next2]},
- {set_tests, [],
-  [simple_sync_set1, simple_sync_set2, simple_async_set1,
-   simple_async_set2]},
- {bulk_tests, [],
-  [simple_sync_get_bulk1, simple_sync_get_bulk2,
-   simple_async_get_bulk1, simple_async_get_bulk2]},
- {misc_request_tests, [], [misc_async1, misc_async2]},
- {event_tests, [],
-  [trap1, trap2, inform1, inform2, inform3, inform4,
-   inform_swarm, report]},
- {tickets, [], [{group, otp8015}, {group, otp8395}]},
- {otp8015, [], [otp8015_1]}, {otp8395, [], [otp8395_1]}].
+    [
+     {start_and_stop_tests, [],
+      [
+       simple_start_and_stop1, 
+       simple_start_and_stop2,
+       simple_start_and_monitor_crash1,
+       simple_start_and_monitor_crash2, 
+       notify_started01,
+       notify_started02
+      ]
+     },
+     {misc_tests, [], 
+      [
+       info
+      ]
+     },
+     {user_tests, [], 
+      [
+       register_user1
+      ]
+     },
+     {agent_tests, [], 
+      [
+       register_agent1, 
+       register_agent2
+      ]
+     },
+     {request_tests, [],
+      [
+       {group, get_tests}, 
+       {group, get_next_tests},
+       {group, set_tests}, 
+       {group, bulk_tests},
+       {group, misc_request_tests}
+      ]
+     },
+     {get_tests, [],
+      [
+       simple_sync_get1, 
+       simple_sync_get2, 
+       simple_sync_get3, 
+       simple_async_get1,
+       simple_async_get2,
+       simple_async_get3
+      ]
+     },
+     {get_next_tests, [],
+      [
+       simple_sync_get_next1, 
+       simple_sync_get_next2,
+       simple_sync_get_next3,
+       simple_async_get_next1, 
+       simple_async_get_next2, 
+       simple_async_get_next3
+      ]
+     },
+     {set_tests, [],
+      [
+       simple_sync_set1, 
+       simple_sync_set2, 
+       simple_sync_set3, 
+       simple_async_set1,
+       simple_async_set2, 
+       simple_async_set3
+      ]
+     },
+     {bulk_tests, [],
+       [
+        simple_sync_get_bulk1, 
+        simple_sync_get_bulk2,
+        simple_sync_get_bulk3,
+        simple_async_get_bulk1, 
+        simple_async_get_bulk2, 
+	simple_async_get_bulk3
+       ]
+      },
+      {misc_request_tests, [], 
+       [
+	misc_async1, 
+	misc_async2
+       ]
+      },
+      {event_tests, [],
+       [
+	trap1, 
+        trap2, 
+        inform1, 
+        inform2, 
+        inform3, 
+        inform4,
+        inform_swarm, 
+        report
+       ]
+      },
+     {tickets, [], 
+      [
+       {group, otp8015}, 
+       {group, otp8395}
+      ]
+     },
+     {otp8015, [], 
+      [
+       otp8015_1
+      ]
+     }, 
+     {otp8395, [], 
+      [
+       otp8395_1
+      ]
+     }
+    ].
 
 init_per_group(_GroupName, Config) ->
 	Config.
@@ -404,21 +512,6 @@ end_per_group(_GroupName, Config) ->
 	Config.
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 %%======================================================================
 %% Test functions
 %%======================================================================
@@ -1319,15 +1412,15 @@ simple_sync_get1(Config) when is_list(Config) ->
 
     p("issue get-request without loading the mib"),
     Oids1 = [?sysObjectID_instance, ?sysDescr_instance, ?sysUpTime_instance],
-    ?line ok = do_simple_get(Node, Addr, Port, Oids1),
+    ?line ok = do_simple_sync_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),
+    ?line ok = do_simple_sync_get(Node, Addr, Port, Oids2),
     ok.
 
-do_simple_get(Node, Addr, Port, Oids) ->
+do_simple_sync_get(Node, Addr, Port, Oids) ->
     ?line {ok, Reply, Rem} = mgr_user_sync_get(Node, Addr, Port, Oids),
 
     ?DBG("~n   Reply: ~p"
@@ -1360,14 +1453,22 @@ do_simple_get(Node, Addr, Port, Oids) ->
 
 %%======================================================================
 
-simple_sync_get2(doc) -> ["Simple sync get-request - New style (TargetName)"];
+simple_sync_get2(doc) -> 
+    ["Simple sync get-request - Version 2 API (TargetName)"];
 simple_sync_get2(suite) -> [];
 simple_sync_get2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     put(tname, ssg2),
-    do_simple_get(Config).
+    do_simple_sync_get2(Config).
 
-do_simple_get(Config) ->
+do_simple_sync_get2(Config) ->
+    Get = fun(Node, TargetName, Oids) -> 
+		  mgr_user_sync_get(Node, TargetName, Oids) 
+	  end, 
+    PostVerify = fun() -> ok end,
+    do_simple_sync_get2(Config, Get, PostVerify).
+
+do_simple_sync_get2(Config, Get, PostVerify) ->
     p("starting with Config: ~p~n", [Config]),
 
     Node       = ?config(manager_node, Config),
@@ -1375,20 +1476,21 @@ do_simple_get(Config) ->
 
     p("issue get-request without loading the mib"),
     Oids1 = [?sysObjectID_instance, ?sysDescr_instance, ?sysUpTime_instance],
-    ?line ok = do_simple_get(Node, TargetName, Oids1),
+    ?line ok = do_simple_sync_get2(Node, TargetName, Oids1, Get, PostVerify),
 
     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),
+    ?line ok = do_simple_sync_get2(Node, TargetName, Oids2, Get, PostVerify),
     ok.
-    
-do_simple_get(Node, TargetName, Oids) ->
-    ?line {ok, Reply, Rem} = mgr_user_sync_get(Node, TargetName, Oids),
+
+do_simple_sync_get2(Node, TargetName, Oids, Get, PostVerify) 
+  when is_function(Get, 3) andalso is_function(PostVerify, 0) ->
+    ?line {ok, Reply, Rem} = 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
@@ -1403,7 +1505,7 @@ do_simple_get(Node, TargetName, Oids) ->
 			 "~n   SysDescr:    ~s"
 			 "~n   SysUpTime:   ~w", 
 			 [SysObjectID, SysDescr, SysUpTime]),
-		       ok;
+		       PostVerify();
 		   {noError, 0, Vbs} ->
 		       p("unexpected varbinds: ~n~p", [Vbs]),
 		       {error, {unexpected_vbs, Vbs}};
@@ -1416,6 +1518,38 @@ do_simple_get(Node, TargetName, Oids) ->
 
 %%======================================================================
 
+simple_sync_get3(doc) -> 
+    ["Simple sync get-request - Version 3 API (TargetName and send-opts)"];
+simple_sync_get3(suite) -> [];
+simple_sync_get3(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssg3),
+    do_simple_sync_get3(Config).
+
+do_simple_sync_get3(Config) ->
+    Self  = self(), 
+    Msg   = simple_sync_get3, 
+    Fun   = fun() -> Self ! Msg end,
+    Extra = {?SNMPM_EXTRA_INFO_TAG, Fun}, 
+    SendOpts = 
+	[
+	 {extra, Extra}
+	], 
+    Get = fun(Node, TargetName, Oids) -> 
+		  mgr_user_sync_get2(Node, TargetName, Oids, SendOpts) 
+	  end,
+    PostVerify = 
+	fun() ->
+		receive
+		    Msg ->
+			ok
+		end
+	end,
+    do_simple_sync_get2(Config, Get, PostVerify).
+
+
+%%======================================================================
+
 simple_async_get1(doc) -> ["Simple (async) get-request - "
 			   "Old style (Addr & Port)"];
 simple_async_get1(suite) -> [];
@@ -1435,40 +1569,41 @@ simple_async_get1(Config) when is_list(Config) ->
     ?line ok = agent_load_mib(AgentNode, Test2Mib),
 
     Exec = fun(Data) ->
-		    async_g_exec1(MgrNode, Addr, Port, 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}
-		],
+    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)]),
@@ -1516,66 +1651,76 @@ sag_verify_vbs([Vb|_], [E|_]) ->
 
 %%======================================================================
 
-simple_async_get2(doc) -> ["Simple (async) get-request - "
-			  "New style (TargetName)"];
+simple_async_get2(doc) -> 
+    ["Simple (async) get-request - Version 2 API (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),
+    Get        = fun(Oids) -> async_g_exec2(MgrNode, TargetName, Oids) end,
+    PostVerify = fun(Res) -> Res end, 
+    do_simple_async_sync_get2(Config, MgrNode, AgentNode, Get, PostVerify).
 
+do_simple_async_sync_get2(Config, MgrNode, AgentNode, Get, PostVerify) ->
     ?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}
-		],
+    do_simple_async_sync_get2(fun() -> mgr_info(MgrNode) end,
+			      fun() -> agent_info(AgentNode) end,
+			      Get, PostVerify).
+
+do_simple_async_sync_get2(MgrInfo, AgentInfo, Get, PostVerify) 
+  when is_function(MgrInfo, 0) andalso 
+       is_function(AgentInfo, 0) andalso 
+       is_function(Get, 1) andalso 
+       is_function(PostVerify, 1) ->
+    Requests = 
+	[
+	 { 1,  
+	   [?sysObjectID_instance], 
+	   Get, 
+	   fun(X) -> 
+		   PostVerify(sag_verify(X, [?sysObjectID_instance])) end}, 
+	 { 2,  
+	   [?sysDescr_instance, ?sysUpTime_instance],
+	   Get, 
+	   fun(X) -> 
+		   PostVerify(sag_verify(X, [?sysObjectID_instance, 
+					     ?sysUpTime_instance]))
+	   end}, 
+	 { 3,  
+	   [[sysObjectID, 0], [sysDescr, 0], [sysUpTime, 0]],
+	   Get, 
+	   fun(X) -> 
+		   PostVerify(sag_verify(X, [?sysObjectID_instance, 
+					     ?sysDescr_instance, 
+					     ?sysUpTime_instance]))
+		       
+	   end}, 
+	 { 4,  
+	   [?sysObjectID_instance, 
+	    ?sysDescr_instance, 
+	    ?sysUpTime_instance],
+	   Get, 
+	   fun(X) -> 
+		   PostVerify(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)]),
+    p("manager info when starting test: ~n~p", [MgrInfo()]),
+    p("agent info when starting test: ~n~p",   [AgentInfo()]),
 
     ?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)]),
+    p("manager info when ending test: ~n~p", [MgrInfo()]),
+    p("agent info when ending test: ~n~p",   [AgentInfo()]),
 
     ok.
 
@@ -1585,6 +1730,36 @@ async_g_exec2(Node, TargetName, Oids) ->
 
 %%======================================================================
 
+simple_async_get3(doc) -> 
+    ["Simple (async) get-request - Version 3 API (TargetName and send-opts)"];
+simple_async_get3(suite) -> [];
+simple_async_get3(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sag3),
+    p("starting with Config: ~p~n", [Config]),
+    MgrNode    = ?config(manager_node, Config),
+    AgentNode  = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+    Self  = self(), 
+    Msg   = simple_async_get3, 
+    Fun   = fun() -> Self ! Msg end,
+    Extra = {?SNMPM_EXTRA_INFO_TAG, Fun}, 
+    SendOpts = 
+	[
+	 {extra, Extra}
+	], 
+    Get = fun(Oids) -> async_g_exec3(MgrNode, TargetName, Oids, SendOpts) end,
+    PostVerify = fun(ok)    -> receive Msg -> ok end;
+		    (Error) -> Error 
+		 end,
+    do_simple_async_sync_get2(Config, MgrNode, AgentNode, Get, PostVerify).
+
+async_g_exec3(Node, TargetName, Oids, SendOpts) ->
+    mgr_user_async_get2(Node, TargetName, Oids, SendOpts).
+
+
+%%======================================================================
+
 simple_sync_get_next1(doc) -> ["Simple (sync) get_next-request - "
 			       "Old style (Addr & Port)"];
 simple_sync_get_next1(suite) -> [];
@@ -1722,23 +1897,33 @@ check_ssgn_vbs([Vb|_], [E|_]) ->
 
 %%======================================================================
 
-simple_sync_get_next2(doc) -> ["Simple (sync) get_next-request - "
-			       "New style (TargetName)"];
+simple_sync_get_next2(doc) -> 
+    ["Simple (sync) get_next-request - Version 2 API (TargetName)"];
 simple_sync_get_next2(suite) -> [];
 simple_sync_get_next2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    put(tname, ssgn),
+    put(tname, ssgn2),
     p("starting with Config: ~p~n", [Config]),
 
-    MgrNode   = ?config(manager_node, Config),
-    AgentNode = ?config(agent_node, Config),
+    GetNext = fun(Node, TargetName, Oids) -> 
+		      mgr_user_sync_get_next(Node, TargetName, Oids) 
+	      end,
+    PostVerify = fun(Res) -> Res end,
+    do_simple_sync_get_next2(Config, GetNext, PostVerify).
+
+do_simple_sync_get_next2(Config, GetNext, PostVerify) 
+  when is_function(GetNext, 3) andalso is_function(PostVerify, 1) ->
+
+    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),
+				  MgrNode, TargetName, Oids01, VF01, 
+				  GetNext, PostVerify),
     
     ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
 
@@ -1748,7 +1933,8 @@ simple_sync_get_next2(Config) when is_list(Config) ->
 		     verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView]) 
 	     end,
     ?line ok = do_simple_get_next(2, 
-				  MgrNode, TargetName, Oids02, VF02),
+				  MgrNode, TargetName, Oids02, VF02, 
+				  GetNext, PostVerify),
     
     Test2Mib = test2_mib(Config), 
     ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
@@ -1761,7 +1947,8 @@ simple_sync_get_next2(Config) when is_list(Config) ->
 		     verify_ssgn_reply1(X, [{fl([TCnt2,2]), 100}]) 
 	     end,
     ?line ok = do_simple_get_next(3, 
-				  MgrNode, TargetName, Oids03, VF03),
+				  MgrNode, TargetName, Oids03, VF03, 
+				  GetNext, PostVerify),
     
     %% -- 4 --
     Oids04 = [[TCnt2, 2]], 
@@ -1769,7 +1956,8 @@ simple_sync_get_next2(Config) when is_list(Config) ->
 		     verify_ssgn_reply1(X, [{fl([TCnt2,2]), endOfMibView}]) 
 	     end,
     ?line ok = do_simple_get_next(4, 
-				  MgrNode, TargetName, Oids04, VF04),
+				  MgrNode, TargetName, Oids04, VF04, 
+				  GetNext, PostVerify),
     
     %% -- 5 --
     ?line {ok, [TGenErr1|_]} = mgr_user_name_to_oid(MgrNode, tGenErr1),
@@ -1778,7 +1966,8 @@ simple_sync_get_next2(Config) when is_list(Config) ->
 		     verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}) 
 	     end,
     ?line ok = do_simple_get_next(5, 
-				  MgrNode, TargetName, Oids05, VF05),
+				  MgrNode, TargetName, Oids05, VF05, 
+				  GetNext, PostVerify),
     
     %% -- 6 --
     ?line {ok, [TGenErr2|_]} = mgr_user_name_to_oid(MgrNode, tGenErr2),
@@ -1787,7 +1976,8 @@ simple_sync_get_next2(Config) when is_list(Config) ->
 		     verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}) 
 	     end,
     ?line ok = do_simple_get_next(6, 
-				  MgrNode, TargetName, Oids06, VF06),
+				  MgrNode, TargetName, Oids06, VF06, 
+				  GetNext, PostVerify),
     
     %% -- 7 --
     ?line {ok, [TGenErr3|_]} = mgr_user_name_to_oid(MgrNode, tGenErr3),
@@ -1797,7 +1987,8 @@ simple_sync_get_next2(Config) when is_list(Config) ->
 					   [?sysDescr, TGenErr3]}) 
 	     end,
     ?line ok = do_simple_get_next(7, 
-				  MgrNode, TargetName, Oids07, VF07),
+				  MgrNode, TargetName, Oids07, VF07, 
+				  GetNext, PostVerify),
     
     %% -- 8 --
     ?line {ok, [TTooBig|_]} = mgr_user_name_to_oid(MgrNode, tTooBig),
@@ -1806,18 +1997,19 @@ simple_sync_get_next2(Config) when is_list(Config) ->
 		     verify_ssgn_reply2(X, {tooBig, 0, []}) 
 	     end,
     ?line ok = do_simple_get_next(8, 
-				  MgrNode, TargetName, Oids08, VF08),
+				  MgrNode, TargetName, Oids08, VF08, 
+				  GetNext, PostVerify),
     ok.
 
 
-do_simple_get_next(N, Node, TargetName, Oids, Verify) ->
+do_simple_get_next(N, Node, TargetName, Oids, Verify, GetNext, PostVerify) ->
     p("issue get-next command ~w", [N]),
-    case mgr_user_sync_get_next(Node, TargetName, Oids) of
+    case GetNext(Node, TargetName, Oids) of
 	{ok, Reply, Rem} ->
 	    ?DBG("get-next ok:"
 		 "~n   Reply: ~p"
 		 "~n   Rem:   ~w", [Reply, Rem]),
-	    Verify(Reply);
+	    PostVerify(Verify(Reply));
 
 	Error ->
 	    {error, {unexpected_reply, Error}}
@@ -1826,6 +2018,33 @@ do_simple_get_next(N, Node, TargetName, Oids, Verify) ->
 
 %%======================================================================
 
+simple_sync_get_next3(doc) -> 
+    ["Simple (sync) get_next-request - "
+     "Version 3 API (TargetName with send-opts)"];
+simple_sync_get_next3(suite) -> [];
+simple_sync_get_next3(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssgn3),
+    p("starting with Config: ~p~n", [Config]),
+    Self  = self(), 
+    Msg   = simple_sync_get_next3, 
+    Fun   = fun() -> Self ! Msg end,
+    Extra = {?SNMPM_EXTRA_INFO_TAG, Fun}, 
+    SendOpts = 
+	[
+	 {extra, Extra}
+	], 
+    GetNext = fun(Node, TargetName, Oids) -> 
+		      mgr_user_sync_get_next2(Node, TargetName, Oids, SendOpts) 
+	      end,
+    PostVerify = fun(ok)    -> receive Msg -> ok end;
+		    (Error) -> Error 
+		 end,
+    do_simple_sync_get_next2(Config, GetNext, PostVerify).
+
+
+%%======================================================================
+
 simple_async_get_next1(doc) -> ["Simple (async) get_next-request - "
 				"Old style (Addr & Port)"];
 simple_async_get_next1(suite) -> [];
@@ -1923,8 +2142,8 @@ async_gn_exec1(Node, Addr, Port, Oids) ->
 
 %%======================================================================
 
-simple_async_get_next2(doc) -> ["Simple (async) get_next-request - "
-				"New style (TargetName)"];
+simple_async_get_next2(doc) -> 
+    ["Simple (async) get_next-request - Version 2 API (TargetName)"];
 simple_async_get_next2(suite) -> [];
 simple_async_get_next2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
@@ -1939,11 +2158,14 @@ simple_async_get_next2(Config) when is_list(Config) ->
     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,
-
+    GetNext = fun(Oids) ->
+		      async_gn_exec2(MgrNode, TargetName, Oids)
+	      end,
+    PostVerify = fun(Res) -> Res end,
+    do_simple_async_get_next2(MgrNode, AgentNode, GetNext, PostVerify).
+
+do_simple_async_get_next2(MgrNode, AgentNode, GetNext, PostVerify) 
+  when is_function(GetNext, 1) andalso is_function(PostVerify, 1) ->
     ?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),
@@ -1954,51 +2176,60 @@ simple_async_get_next2(Config) when is_list(Config) ->
 	[
 	 {1, 
 	  [[1,3,7,1]], 
-	  Exec, 
+	  GetNext, 
 	  fun(X) ->
-		  verify_ssgn_reply1(X, [{[1,3,7,1], endOfMibView}])
+		  PostVerify(
+		    verify_ssgn_reply1(X, [{[1,3,7,1], endOfMibView}])) 
+		  
 	  end}, 
 	 {2, 
 	  [[sysDescr], [1,3,7,1]], 
-	  Exec, 
+	  GetNext, 
 	  fun(X) ->
-		  verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView])
+		  PostVerify(
+		    verify_ssgn_reply1(X, [?sysDescr_instance, endOfMibView]))
 	  end}, 
 	 {3, 
 	  [[TCnt2, 1]], 
-	  Exec, 
+	  GetNext, 
 	  fun(X) ->
-		  verify_ssgn_reply1(X, [{fl([TCnt2,2]), 100}])
+		  PostVerify(
+		    verify_ssgn_reply1(X, [{fl([TCnt2,2]), 100}]))
 	  end}, 
 	 {4, 
 	  [[TCnt2, 2]], 
-	  Exec, 
+	  GetNext, 
 	  fun(X) ->
-		  verify_ssgn_reply1(X, [{fl([TCnt2,2]), endOfMibView}])
+		  PostVerify(
+		    verify_ssgn_reply1(X, [{fl([TCnt2,2]), endOfMibView}]))
 	  end}, 
 	 {5, 
 	  [TGenErr1], 
-	  Exec, 
+	  GetNext, 
 	  fun(X) ->
-		  verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}) 
+		  PostVerify(
+		    verify_ssgn_reply2(X, {genErr, 1, [TGenErr1]}))
 	  end}, 
 	 {6, 
 	  [TGenErr2], 
-	  Exec, 
+	  GetNext, 
 	  fun(X) ->
-		  verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}) 
+		  PostVerify(
+		    verify_ssgn_reply2(X, {genErr, 1, [TGenErr2]}))
 	  end}, 
 	 {7, 
 	  [[sysDescr], TGenErr3], 
-	  Exec, 
+	  GetNext, 
 	  fun(X) ->
-		  verify_ssgn_reply2(X, {genErr, 2, [TGenErr3]}) 
+		  PostVerify(
+		    verify_ssgn_reply2(X, {genErr, 2, [TGenErr3]}))
 	  end}, 
 	 {8, 
 	  [TTooBig], 
-	  Exec, 
+	  GetNext, 
 	  fun(X) ->
-		  verify_ssgn_reply2(X, {tooBig, 0, []}) 
+		  PostVerify(
+		    verify_ssgn_reply2(X, {tooBig, 0, []}))
 	  end}
 	],
 
@@ -2019,6 +2250,48 @@ async_gn_exec2(Node, TargetName, Oids) ->
 
 %%======================================================================
 
+simple_async_get_next3(doc) -> 
+    ["Simple (async) get_next-request - "
+     "Version 3 API (TargetName with send-opts)"];
+simple_async_get_next3(suite) -> [];
+simple_async_get_next3(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),
+
+    Self  = self(), 
+    Msg   = simple_async_get_next3, 
+    Fun   = fun() -> Self ! Msg end,
+    Extra = {?SNMPM_EXTRA_INFO_TAG, Fun}, 
+    SendOpts = 
+	[
+	 {extra, Extra}
+	], 
+
+    GetNext = fun(Oids) ->
+		      async_gn_exec3(MgrNode, TargetName, Oids, SendOpts)
+	      end,
+    PostVerify = fun(ok)    -> receive Msg -> ok end;
+		    (Error) -> Error 
+		 end,
+
+    do_simple_async_get_next2(MgrNode, AgentNode, GetNext, PostVerify).
+
+async_gn_exec3(Node, TargetName, Oids, SendOpts) ->
+    mgr_user_async_get_next2(Node, TargetName, Oids, SendOpts).
+
+
+%%======================================================================
+
 simple_sync_set1(doc) -> ["Simple (sync) set-request - "
 			  "Old style (Addr & Port)"];
 simple_sync_set1(suite) -> [];
@@ -2088,14 +2361,25 @@ value_of_vavs([{_Oid, Val}|VAVs], Acc) ->
 			       
 %%======================================================================
 
-simple_sync_set2(doc) -> ["Simple (sync) set-request - New style (TargetName)"];
+simple_sync_set2(doc) -> 
+    ["Simple (sync) set-request - Version 2 API (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),
+    Set = fun(Node, TargetName, VAVs) -> 
+		  mgr_user_sync_set(Node, TargetName, VAVs) 
+	  end,
+    PostVerify = fun() -> ok end,
+
+    do_simple_sync_set2(Config, Set, PostVerify).
+
+do_simple_sync_set2(Config, Set, PostVerify) 
+  when is_function(Set, 3) andalso is_function(PostVerify, 0) ->
+
+    Node       = ?config(manager_node, Config),
     TargetName = ?config(manager_agent_target_name, Config),
 
     p("issue set-request without loading the mib"),
@@ -2105,7 +2389,7 @@ simple_sync_set2(Config) when is_list(Config) ->
 	     {?sysName_instance,     s, Val11},
 	     {?sysLocation_instance, s, Val12}
 	    ],
-    ?line ok = do_simple_set2(Node, TargetName, VAVs1),
+    ?line ok = do_simple_set2(Node, TargetName, VAVs1, Set, PostVerify),
 
     p("issue set-request after first loading the mibs"),
     ?line ok = mgr_user_load_mib(Node, std_mib()),
@@ -2115,12 +2399,12 @@ simple_sync_set2(Config) when is_list(Config) ->
 	     {[sysName, 0],     Val21},
 	     {[sysLocation, 0], Val22}
 	    ],
-    ?line ok = do_simple_set2(Node, TargetName, VAVs2),
+    ?line ok = do_simple_set2(Node, TargetName, VAVs2, Set, PostVerify),
     ok.
 
-do_simple_set2(Node, TargetName, VAVs) ->
+do_simple_set2(Node, TargetName, VAVs, Set, PostVerify) ->
     [SysName, SysLoc] = value_of_vavs(VAVs),
-    ?line {ok, Reply, Rem} = mgr_user_sync_set(Node, TargetName, VAVs),
+    ?line {ok, Reply, Rem} = Set(Node, TargetName, VAVs),
 
     ?DBG("~n   Reply: ~p"
 	 "~n   Rem:   ~w", [Reply, Rem]),
@@ -2133,7 +2417,7 @@ do_simple_set2(Node, TargetName, VAVs) ->
 					  value = SysName},
 				 #varbind{oid   = ?sysLocation_instance,
 					  value = SysLoc}]} ->
-		       ok;
+		       PostVerify();
 		   {noError, 0, Vbs} ->
 		       {error, {unexpected_vbs, Vbs}};
 		   Else ->
@@ -2145,6 +2429,33 @@ do_simple_set2(Node, TargetName, VAVs) ->
 
 %%======================================================================
 
+simple_sync_set3(doc) -> 
+    ["Simple (sync) set-request - Version 3 API (TargetName with send-opts)"];
+simple_sync_set3(suite) -> [];
+simple_sync_set3(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sss3),
+    p("starting with Config: ~p~n", [Config]),
+
+    Self  = self(), 
+    Msg   = simple_sync_set3, 
+    Fun   = fun() -> Self ! Msg end,
+    Extra = {?SNMPM_EXTRA_INFO_TAG, Fun}, 
+    SendOpts = 
+	[
+	 {extra, Extra}
+	], 
+    
+    Set = fun(Node, TargetName, VAVs) -> 
+		  mgr_user_sync_set2(Node, TargetName, VAVs, SendOpts) 
+	  end,
+    PostVerify = fun() -> receive Msg -> ok end end,
+
+    do_simple_sync_set2(Config, Set, PostVerify).
+
+
+%%======================================================================
+
 simple_async_set1(doc) -> ["Simple (async) set-request - "
 			   "Old style (Addr & Port)"];
 simple_async_set1(suite) -> [];
@@ -2237,8 +2548,8 @@ sas_verify_vbs([Vb|_], [E|_]) ->
     
 %%======================================================================
 
-simple_async_set2(doc) -> ["Simple (async) set-request - "
-			   "New style (TargetName)"];
+simple_async_set2(doc) -> 
+    ["Simple (async) set-request - Version 2 API (TargetName)"];
 simple_async_set2(suite) -> [];
 simple_async_set2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
@@ -2254,31 +2565,40 @@ simple_async_set2(Config) when is_list(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,
+    Set = 
+	fun(Oids) ->
+		async_s_exec2(MgrNode, TargetName, Oids)
+	end,
+    PostVerify = fun(Res) -> Res end,
+
+    do_simple_async_set2(MgrNode, AgentNode, Set, PostVerify).
 
+do_simple_async_set2(MgrNode, AgentNode, Set, PostVerify) ->
     Requests = 
 	[
 	 {1,
 	  [{?sysName_instance, s, "Arne Anka"}],
-	  Exec,
+	  Set,
 	  fun(X) ->
-		  sas_verify(X, [?sysName_instance])
+		  PostVerify(sas_verify(X, [?sysName_instance]))
 	  end},
 	 {2,
 	  [{?sysLocation_instance, s, "Stockholm"}, 
 	   {?sysName_instance,     s, "Arne Anka"}],
-	  Exec,
+	  Set,
 	  fun(X) ->
-		  sas_verify(X, [?sysLocation_instance, ?sysName_instance])
+		  PostVerify(sas_verify(X, 
+					[?sysLocation_instance, 
+					 ?sysName_instance]))
 	  end},
 	 {3,
 	  [{[sysName, 0],     "Gothenburg"}, 
 	   {[sysLocation, 0], "Sune Anka"}],
-	  Exec,
+	  Set,
 	  fun(X) ->
-		  sas_verify(X, [?sysName_instance, ?sysLocation_instance])
+		  PostVerify(sas_verify(X, 
+					[?sysName_instance, 
+					 ?sysLocation_instance]))
 	  end}
 	],
 
@@ -2299,6 +2619,48 @@ async_s_exec2(Node, TargetName, VAVs) ->
 
 %%======================================================================
 
+simple_async_set3(doc) -> 
+    ["Simple (async) set-request - Version 3 API (TargetName with send-opts)"];
+simple_async_set3(suite) -> [];
+simple_async_set3(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sas3),
+    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),
+
+    Self  = self(), 
+    Msg   = simple_async_set3, 
+    Fun   = fun() -> Self ! Msg end,
+    Extra = {?SNMPM_EXTRA_INFO_TAG, Fun}, 
+    SendOpts = 
+	[
+	 {extra, Extra}
+	], 
+
+    Set = 
+	fun(Oids) ->
+		async_s_exec3(MgrNode, TargetName, Oids, SendOpts)
+	end,
+    PostVerify = fun(ok)  -> receive Msg -> ok end; 
+		    (Res) -> Res 
+		 end,
+
+    do_simple_async_set2(MgrNode, AgentNode, Set, PostVerify).
+
+async_s_exec3(Node, TargetName, VAVs, SendOpts) ->
+    mgr_user_async_set2(Node, TargetName, VAVs, SendOpts).
+
+
+%%======================================================================
+
 simple_sync_get_bulk1(doc) -> ["Simple (sync) get_bulk-request - "
 			       "Old style (Addr & Port)"];
 simple_sync_get_bulk1(suite) -> [];
@@ -2470,8 +2832,8 @@ check_ssgb_vbs([R|_], [E|_]) ->
 
 %%======================================================================
 
-simple_sync_get_bulk2(doc) -> ["Simple (sync) get_bulk-request - "
-			       "New style (TargetName)"];
+simple_sync_get_bulk2(doc) -> 
+    ["Simple (sync) get_bulk-request - Version 2 API (TargetName)"];
 simple_sync_get_bulk2(suite) -> [];
 simple_sync_get_bulk2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
@@ -2482,20 +2844,33 @@ simple_sync_get_bulk2(Config) when is_list(Config) ->
     AgentNode  = ?config(agent_node, Config),
     TargetName = ?config(manager_agent_target_name, Config),
 
+    GetBulk = 
+	fun(NonRep, MaxRep, Oids) ->
+		mgr_user_sync_get_bulk(MgrNode, TargetName, 
+				       NonRep, MaxRep, Oids)    
+	end,
+    PostVerify = fun(Res) -> Res end,
+
+    do_simple_sync_get_bulk2(Config, MgrNode, AgentNode, GetBulk, PostVerify).
+
+do_simple_sync_get_bulk2(Config, MgrNode, AgentNode, GetBulk, PostVerify) ->
     %% -- 1 --
     ?line ok = do_simple_get_bulk2(1,
-				   MgrNode, TargetName,  1,  1, [], 
-				   fun verify_ssgb_reply1/1), 
+				   1,  1, [], 
+				   fun verify_ssgb_reply1/1, 
+				   GetBulk, PostVerify), 
     
     %% -- 2 --
     ?line ok = do_simple_get_bulk2(2, 
-				   MgrNode, TargetName, -1,  1, [], 
-				   fun verify_ssgb_reply1/1), 
+				   -1,  1, [], 
+				   fun verify_ssgb_reply1/1, 
+				   GetBulk, PostVerify), 
 
     %% -- 3 --
     ?line ok = do_simple_get_bulk2(3, 
-				   MgrNode, TargetName, -1, -1, [], 
-				   fun verify_ssgb_reply1/1), 
+				   -1, -1, [], 
+				   fun verify_ssgb_reply1/1, 
+				   GetBulk, PostVerify), 
 
     ?line ok = mgr_user_load_mib(MgrNode, std_mib()),
     %% -- 4 --
@@ -2503,13 +2878,13 @@ simple_sync_get_bulk2(Config) when is_list(Config) ->
 		   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),
+				   2, 0, [[sysDescr],[1,3,7,1]], VF04, 
+				   GetBulk, PostVerify),
 
     %% -- 5 --
     ?line ok = do_simple_get_bulk2(5,
-				   MgrNode, TargetName,  
-				   1, 2, [[sysDescr],[1,3,7,1]], VF04),
+				   1, 2, [[sysDescr],[1,3,7,1]], VF04, 
+				   GetBulk, PostVerify),
 
     %% -- 6 --
     VF06 = fun(X) -> 
@@ -2518,8 +2893,8 @@ simple_sync_get_bulk2(Config) when is_list(Config) ->
 				       ?sysObjectID_instance, endOfMibView]) 
 	   end,
     ?line ok = do_simple_get_bulk2(6,
-				   MgrNode, TargetName,  
-				   0, 2, [[sysDescr],[1,3,7,1]], VF06), 
+				   0, 2, [[sysDescr],[1,3,7,1]], VF06, 
+				   GetBulk, PostVerify), 
 
     %% -- 7 --
     VF07 = fun(X) -> 
@@ -2529,10 +2904,10 @@ simple_sync_get_bulk2(Config) when is_list(Config) ->
 				       ?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), 
+				   VF07, 
+				   GetBulk, PostVerify), 
 
     Test2Mib = test2_mib(Config), 
     ?line ok = mgr_user_load_mib(MgrNode, Test2Mib),
@@ -2545,17 +2920,17 @@ simple_sync_get_bulk2(Config) when is_list(Config) ->
 				       ?sysDescr_instance]) 
 	   end,
     ?line ok = do_simple_get_bulk2(8,
-				   MgrNode, TargetName, 
 				   1, 2, 
 				   [[sysDescr],[sysDescr],[tTooBig]],
-				   VF08), 
+				   VF08, 
+				   GetBulk, PostVerify), 
 
     %% -- 9 --
     ?line ok = do_simple_get_bulk2(9,
-				   MgrNode, TargetName, 
 				   1, 12, 
 				   [[tDescr2], [sysDescr]], 
-				   fun verify_ssgb_reply1/1),
+				   fun verify_ssgb_reply1/1, 
+				   GetBulk, PostVerify),
 
     %% -- 10 --
     VF10 = fun(X) -> 
@@ -2566,13 +2941,13 @@ simple_sync_get_bulk2(Config) when is_list(Config) ->
 				       {?sysDescr,    'NULL'}]) 
 	   end,
     ?line ok = do_simple_get_bulk2(10,
-				   MgrNode, TargetName,  
 				   2, 2, 
 				   [[sysDescr], 
 				    [sysObjectID], 
 				    [tGenErr1], 
 				    [sysDescr]],
-				   VF10), 
+				   VF10, 
+				   GetBulk, PostVerify), 
 
     %% -- 11 --
     ?line {ok, [TCnt2|_]} = mgr_user_name_to_oid(MgrNode, tCnt2),
@@ -2583,20 +2958,25 @@ simple_sync_get_bulk2(Config) when is_list(Config) ->
 				       {fl([TCnt2,2]), endOfMibView}]) 
 	   end,
     ?line ok = do_simple_get_bulk2(11,
-				   MgrNode, TargetName,  
 				   0, 2, 
-				   [[TCnt2, 1]], VF11),
+				   [[TCnt2, 1]], VF11, 
+				   GetBulk, PostVerify),
     
     ok.
 
-do_simple_get_bulk2(N, Node, TargetName, NonRep, MaxRep, Oids, Verify) ->
+do_simple_get_bulk2(N, 
+		    NonRep, MaxRep, Oids, 
+		    Verify, GetBulk, PostVerify) 
+  when is_function(Verify, 1) andalso 
+       is_function(GetBulk, 3) andalso 
+       is_function(PostVerify) ->
     p("issue get-bulk command ~w", [N]),
-    case mgr_user_sync_get_bulk(Node, TargetName, NonRep, MaxRep, Oids) of
+    case GetBulk(NonRep, MaxRep, Oids) of
 	{ok, Reply, Rem} ->
 	    ?DBG("get-bulk ok:"
 		 "~n   Reply: ~p"
 		 "~n   Rem:   ~w", [Reply, Rem]),
-	    Verify(Reply);
+	    PostVerify(Verify(Reply));
 
 	Error ->
 	    {error, {unexpected_reply, Error}}
@@ -2605,6 +2985,42 @@ do_simple_get_bulk2(N, Node, TargetName, NonRep, MaxRep, Oids, Verify) ->
 
 %%======================================================================
 
+simple_sync_get_bulk3(doc) -> 
+    ["Simple (sync) get_bulk-request - "
+     "Version 3 API (TargetName with send-opts)"];
+simple_sync_get_bulk3(suite) -> [];
+simple_sync_get_bulk3(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, ssgb3),
+    p("starting with Config: ~p~n", [Config]),
+
+    MgrNode    = ?config(manager_node, Config),
+    AgentNode  = ?config(agent_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    Self  = self(), 
+    Msg   = simple_async_set3, 
+    Fun   = fun() -> Self ! Msg end,
+    Extra = {?SNMPM_EXTRA_INFO_TAG, Fun}, 
+    SendOpts = 
+	[
+	 {extra, Extra}
+	], 
+
+    GetBulk = 
+	fun(NonRep, MaxRep, Oids) ->
+		mgr_user_sync_get_bulk2(MgrNode, TargetName, 
+					NonRep, MaxRep, Oids, SendOpts)    
+	end,
+    PostVerify = fun(ok) -> receive Msg -> ok end;
+		    (Res) -> Res 
+		 end,
+
+    do_simple_sync_get_bulk2(Config, MgrNode, AgentNode, GetBulk, PostVerify).
+
+
+%%======================================================================
+
 simple_async_get_bulk1(doc) -> ["Simple (async) get_bulk-request - "
 				"Old style (Addr & Port)"];
 simple_async_get_bulk1(suite) -> [];
@@ -2748,8 +3164,8 @@ async_gb_exec1(Node, Addr, Port, {NR, MR, Oids}) ->
 
 %%======================================================================
 
-simple_async_get_bulk2(doc) -> ["Simple (async) get_bulk-request - "
-				"New style (TargetName)"];
+simple_async_get_bulk2(doc) -> 
+    ["Simple (async) get_bulk-request - Version 2 API (TargetName)"];
 simple_async_get_bulk2(suite) -> [];
 simple_async_get_bulk2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
@@ -2765,111 +3181,122 @@ simple_async_get_bulk2(Config) when is_list(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,
+    GetBulk = 
+	fun(Data) ->
+		async_gb_exec2(MgrNode, TargetName, Data)
+	end,
+    PostVerify = fun(Res) -> Res end,
 
+    do_simple_async_get_bulk2(MgrNode, AgentNode, GetBulk, PostVerify).
+
+do_simple_async_get_bulk2(MgrNode, AgentNode, GetBulk, PostVerify) ->
     %% We re-use the verification functions from the ssgb test-case
     VF04 = fun(X) -> 
-		   verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]) 
+		   PostVerify(
+		     verify_ssgb_reply2(X, [?sysDescr_instance, endOfMibView]))
 	   end,
     VF06 = fun(X) -> 
-		   verify_ssgb_reply2(X, 
-				      [?sysDescr_instance,    endOfMibView,
-				       ?sysObjectID_instance, endOfMibView]) 
+		   PostVerify(
+		     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]) 
+		   PostVerify(
+		     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]) 
+		   PostVerify(
+		     verify_ssgb_reply2(X, 
+					[?sysDescr_instance, 
+					 ?sysDescr_instance])) 
 	   end,
     VF10 = fun(X) -> 
-		   verify_ssgb_reply3(X, 
-				      [{?sysDescr,    'NULL'}, 
-				       {?sysObjectID, 'NULL'},
-				       {?tGenErr1,    'NULL'},
-				       {?sysDescr,    'NULL'}]) 
+		   PostVerify(
+		     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}]) 
+		   PostVerify(
+		     verify_ssgb_reply2(X, 
+					[{fl([TCnt2,2]), 100}, 
+					 {fl([TCnt2,2]), endOfMibView}]))
 	   end,
     Requests = [
 		{ 1,  
 		  {1,  1, []}, 
-		  Exec, 
-		  fun verify_ssgb_reply1/1},
+		  GetBulk, 
+		  fun(X) -> PostVerify(verify_ssgb_reply1(X)) end},
 		{ 2, 
 		  {-1,  1, []}, 
-		  Exec, 
-		  fun verify_ssgb_reply1/1},
+		  GetBulk, 
+		  fun(X) -> PostVerify(verify_ssgb_reply1(X)) end},
 		{ 3, 
 		  {-1, -1, []}, 
-		  Exec, 
-		  fun verify_ssgb_reply1/1},
+		  GetBulk, 
+		  fun(X) -> PostVerify(verify_ssgb_reply1(X)) end},
 		{ 4,  
 		  {2,  0, [[sysDescr],[1,3,7,1]]}, 
-		  Exec, 
+		  GetBulk, 
 		  VF04},
 		{ 5,  
 		  {1,  2, [[sysDescr],[1,3,7,1]]}, 
-		  Exec, 
+		  GetBulk, 
 		  VF04},
 		{ 6,  
 		  {0,  2, [[sysDescr],[1,3,7,1]]}, 
-		  Exec, 
+		  GetBulk, 
 		  VF06},
 		{ 7,  
 		  {2,  2, [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]]}, 
-		  Exec, 
+		  GetBulk, 
 		  VF07},
 		{ 8,  
 		  {1,  2, [[sysDescr],[sysDescr],[tTooBig]]}, 
-		  Exec, 
+		  GetBulk, 
 		  VF08},
 		{ 9,  
 		  {1, 12, [[tDescr2], [sysDescr]]}, 
-		  Exec, 
-		  fun verify_ssgb_reply1/1},
+		  GetBulk, 
+		  fun(X) -> PostVerify(verify_ssgb_reply1(X)) end},
 		{10,  
 		 {2,  2, [[sysDescr],[sysObjectID], [tGenErr1],[sysDescr]]}, 
-		 Exec, 
+		 GetBulk, 
 		 VF10},
 		{11,  
 		 {0,  2, [[TCnt2, 1]]}, 
-		 Exec,
+		 GetBulk,
 		 VF11}, 
 		{12,  
 		 {2,  0, [[sysDescr],[1,3,7,1]]}, 
-		 Exec,
+		 GetBulk,
 		 VF04},
 		{13,  
 		 {1, 12, [[tDescr2], [sysDescr]]},
-		 Exec, 
-		 fun verify_ssgb_reply1/1},
+		 GetBulk, 
+		 fun(X) -> PostVerify(verify_ssgb_reply1(X)) end},
 		{14,  
 		 {2,  2, [[sysDescr],[sysObjectID],[tGenErr1],[sysDescr]]},
-		 Exec, 
+		 GetBulk, 
 		 VF10},
 		{15,  
 		 {0,  2, [[TCnt2, 1]]},
-		 Exec, 
+		 GetBulk, 
 		 VF11},
 		{16,  
 		 {2,  2, [[sysDescr],[1,3,7,1],[sysDescr],[1,3,7,1]]},
-		 Exec, 
+		 GetBulk, 
 		 VF07},
 		{17,  
 		 {2,  2, [[sysDescr],[sysObjectID], [tGenErr1],[sysDescr]]},
-		 Exec, 
+		 GetBulk, 
 		 VF10}
 	       ],
 
@@ -2890,6 +3317,49 @@ async_gb_exec2(Node, TargetName, {NR, MR, Oids}) ->
 
 %%======================================================================
 
+simple_async_get_bulk3(doc) -> 
+    ["Simple (async) get_bulk-request - "
+     "Version 3 API (TargetName with send-opts)"];
+simple_async_get_bulk3(suite) -> [];
+simple_async_get_bulk3(Config) when is_list(Config) ->
+    process_flag(trap_exit, true),
+    put(tname, sagb3),
+    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),
+
+    Self  = self(), 
+    Msg   = simple_async_get_bulk3, 
+    Fun   = fun() -> Self ! Msg end,
+    Extra = {?SNMPM_EXTRA_INFO_TAG, Fun}, 
+    SendOpts = 
+	[
+	 {extra, Extra}
+	], 
+
+    GetBulk = 
+	fun(Data) ->
+		async_gb_exec3(MgrNode, TargetName, Data, SendOpts)
+	end,
+    PostVerify = fun(ok)  -> receive Msg -> ok end;
+		    (Res) -> Res 
+		 end,
+
+    do_simple_async_get_bulk2(MgrNode, AgentNode, GetBulk, PostVerify).
+
+async_gb_exec3(Node, TargetName, {NR, MR, Oids}, SendOpts) ->
+    mgr_user_async_get_bulk2(Node, TargetName, NR, MR, Oids, SendOpts).
+
+
+%%======================================================================
+
 misc_async1(doc) -> ["Misc (async) request(s) - "
 		     "Old style (Addr & Port)"];
 misc_async1(suite) -> [];
@@ -3079,8 +3549,8 @@ misc_async1(Config) when is_list(Config) ->
 
 %%======================================================================
 
-misc_async2(doc) -> ["Misc (async) request(s) - "
-		     "New style (TargetName)"];
+misc_async2(doc) -> 
+    ["Misc (async) request(s) - Version 2 API (TargetName)"];
 misc_async2(suite) -> [];
 misc_async2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
@@ -4440,7 +4910,7 @@ otp8395_1(suite) -> [];
 otp8395_1(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     put(tname, otp8395_1),
-    do_simple_get(Config).
+    do_simple_sync_get2(Config).
 
 
 %%======================================================================
@@ -4986,6 +5456,9 @@ mgr_user_sync_get(Node, Addr_or_TargetName, Oids) ->
 mgr_user_sync_get(Node, Addr, Port, Oids) ->
     rcall(Node, snmp_manager_user, sync_get, [Addr, Port, Oids]).
 
+mgr_user_sync_get2(Node, TargetName, Oids, SendOpts) ->
+    rcall(Node, snmp_manager_user, sync_get2, [TargetName, Oids, SendOpts]).
+
 %% mgr_user_async_get(Node, Oids) ->
 %%     mgr_user_async_get(Node, ?LOCALHOST(), ?AGENT_PORT, Oids).
 mgr_user_async_get(Node, Addr_or_TargetName, Oids) ->
@@ -4993,6 +5466,9 @@ mgr_user_async_get(Node, Addr_or_TargetName, Oids) ->
 mgr_user_async_get(Node, Addr, Port, Oids) ->
     rcall(Node, snmp_manager_user, async_get, [Addr, Port, Oids]).
 
+mgr_user_async_get2(Node, TargetName, Oids, SendOpts) ->
+    rcall(Node, snmp_manager_user, async_get2, [TargetName, Oids, SendOpts]).
+
 %% 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) ->
@@ -5000,6 +5476,9 @@ mgr_user_sync_get_next(Node, 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_sync_get_next2(Node, TargetName, Oids, SendOpts) ->
+    rcall(Node, snmp_manager_user, sync_get_next2, [TargetName, Oids, SendOpts]).
+
 %% 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) ->
@@ -5007,6 +5486,9 @@ mgr_user_async_get_next(Node, 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_async_get_next2(Node, TargetName, Oids, SendOpts) ->
+    rcall(Node, snmp_manager_user, async_get_next2, [TargetName, Oids, SendOpts]).
+
 %% mgr_user_sync_set(Node, VAV) ->
 %%     mgr_user_sync_set(Node, ?LOCALHOST(), ?AGENT_PORT, VAV).
 mgr_user_sync_set(Node, Addr_or_TargetName, VAV) ->
@@ -5014,6 +5496,9 @@ mgr_user_sync_set(Node, Addr_or_TargetName, VAV) ->
 mgr_user_sync_set(Node, Addr, Port, VAV) ->
     rcall(Node, snmp_manager_user, sync_set, [Addr, Port, VAV]).
 
+mgr_user_sync_set2(Node, TargetName, VAV, SendOpts) ->
+    rcall(Node, snmp_manager_user, sync_set2, [TargetName, VAV, SendOpts]).
+
 %% mgr_user_async_set(Node, VAV) ->
 %%     mgr_user_async_set(Node, ?LOCALHOST(), ?AGENT_PORT, VAV).
 mgr_user_async_set(Node, Addr_or_TargetName, VAV) ->
@@ -5021,26 +5506,37 @@ mgr_user_async_set(Node, Addr_or_TargetName, VAV) ->
 mgr_user_async_set(Node, Addr, Port, VAV) ->
     rcall(Node, snmp_manager_user, async_set, [Addr, Port, VAV]).
 
+mgr_user_async_set2(Node, TargetName, VAV, SendOpts) ->
+    rcall(Node, snmp_manager_user, async_set2, [TargetName, VAV, SendOpts]).
+
 %% 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]).
+	  [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_sync_get_bulk2(Node, TargetName, NonRep, MaxRep, Oids, SendOpts) ->
+    rcall(Node, snmp_manager_user, sync_get_bulk2, 
+	  [TargetName, NonRep, MaxRep, Oids, SendOpts]).
+
 %% 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]).
+	  [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_async_get_bulk2(Node, TargetName, NonRep, MaxRep, Oids, SendOpts) ->
+    rcall(Node, snmp_manager_user, async_get_bulk2, 
+	  [TargetName, NonRep, MaxRep, Oids, SendOpts]).
+
 mgr_user_purify_oid(Node, Oid) ->
     rcall(Node, snmp_manager_user, purify_oid, [Oid]).