File 1548-snmp-manager-Test-cases-for-manager.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1548-snmp-manager-Test-cases-for-manager.patch of Package erlang (Revision 740810ae07adffc1a50bb3a32135aa98)

Currently displaying revision 740810ae07adffc1a50bb3a32135aa98 , Show latest

From eaba829da5b0c23ff8e829960bc90b0def84427b Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 6 Oct 2021 18:52:53 +0200
Subject: [PATCH 8/9] [snmp|manager] Test cases for manager

Including a lot of verbosity printout tweaking.

OTP-17615
---
 lib/snmp/src/agent/snmpa_usm.erl      |  22 +-
 lib/snmp/src/manager/snmpm_config.erl |   3 +-
 lib/snmp/src/manager/snmpm_mpd.erl    |  13 +-
 lib/snmp/src/manager/snmpm_usm.erl    |  59 +++-
 lib/snmp/src/misc/snmp_usm.erl        |  14 +
 lib/snmp/test/snmp_manager_SUITE.erl  | 461 +++++++++++++++++++-------
 lib/snmp/test/snmp_manager_user.erl   |  32 +-
 7 files changed, 437 insertions(+), 167 deletions(-)

diff --git a/lib/snmp/src/agent/snmpa_usm.erl b/lib/snmp/src/agent/snmpa_usm.erl
index 4ed201b4ac..c65fcf2f8c 100644
--- a/lib/snmp/src/agent/snmpa_usm.erl
+++ b/lib/snmp/src/agent/snmpa_usm.erl
@@ -103,6 +103,7 @@ process_incoming_msg(Packet, Data, SecParams, SecLevel, LocalEngineID) ->
 		true ->
 		    ok;
 		false ->
+                    ?vlog("process_incoming_msg -> engine id *not* known"),
 		    SecData1 = [MsgUserName],
 		    error(usmStatsUnknownEngineIDs, 
 			  ?usmStatsUnknownEngineIDs_instance, %% OTP-3542
@@ -116,14 +117,15 @@ process_incoming_msg(Packet, Data, SecParams, SecLevel, LocalEngineID) ->
 		    User when element(?usmUserStatus, User) =:= ?'RowStatus_active' ->
 			User;
 		    {_, Name,_,_,_,_,_,_,_,_,_,_,_, RowStatus,_,_} ->
-			?vdebug("process_incoming_msg -> "
-				"found user ~p with wrong row status: ~p", 
-				[Name, RowStatus]),
+			?vlog("process_incoming_msg -> "
+                              "found user ~p with wrong row status: ~p", 
+                              [Name, RowStatus]),
 			SecData2 = [MsgUserName],
 			error(usmStatsUnknownUserNames, 
 			      ?usmStatsUnknownUserNames_instance, %% OTP-3542
 			      undefined, [{sec_data, SecData2}]);
 		    _ -> % undefined or not active user
+                        ?vlog("process_incoming_msg -> unknown user"),
 			SecData2 = [MsgUserName],
 			error(usmStatsUnknownUserNames, 
 			      ?usmStatsUnknownUserNames_instance, %% OTP-3542
@@ -359,7 +361,11 @@ is_auth(AuthProtocol, AuthKey, AuthParams, Packet, SecName,
 				   (MsgAuthEngineTime =:= 0) andalso 
 				   (TermDiscoEnabled =:= true) andalso 
 				   (TermDiscoStage2 =:= discovery)) -> %% 3.2.7a
-		    ?vtrace("is_auth -> terminating discovery stage 2 - discovery",[]),
+		    ?vtrace("is_auth -> terminating discovery stage 2 - discovery:"
+                            "~n      Local Boots: ~p"
+                            "~n      Local Time:  ~p",
+                            [get_local_engine_boots(LocalEngineID),
+                             get_local_engine_time(LocalEngineID)]),
 		    discovery;
 		SnmpEngineID when ((MsgAuthEngineBoots =:= 0) andalso 
 				   (MsgAuthEngineTime =:= 0) andalso 
@@ -455,16 +461,16 @@ generate_outgoing_msg(Message, SecEngineID, SecName, SecData, SecLevel,
 	case SecData of
 	    [] -> % 3.1.1b
 		%% Not a response - read from LCD
-                ?vtrace("generate_outgoing_msh -> [3.2.1b] get user from sec name"),
+                ?vtrace("generate_outgoing_msh -> [3.1.1b] get user from sec name"),
 		case snmp_user_based_sm_mib:get_user_from_security_name(
 		       SecEngineID, SecName) of
 		    User when element(?usmUserStatus, User) =:=
 			      ?'RowStatus_active' ->
-			{element(?usmUserName, User),
+			{element(?usmUserName,         User),
 			 element(?usmUserAuthProtocol, User),
 			 element(?usmUserPrivProtocol, User),
-			 element(?usmUserAuthKey, User),
-			 element(?usmUserPrivKey, User)};
+			 element(?usmUserAuthKey,      User),
+			 element(?usmUserPrivKey,      User)};
 		    {_, Name,_,_,_,_,_,_,_,_,_,_,_, RowStatus,_,_} ->
 			?vdebug("generate_outgoing_msg -> "
 				"found not active user ~p: ~p", 
diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index fa3bf0ef25..8e3dc3be6e 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -713,7 +713,8 @@ get_usm_etime(SnmpEngineID) ->
     Key = {etime, SnmpEngineID},
     case get_usm_cache(Key) of
 	{ok, Diff} ->
-	    {ok, snmp_misc:now(sec) - Diff};
+            ETime = snmp_misc:now(sec) - Diff,
+            {ok, ETime};
 	_ ->
 	    {ok, 0}
     end.
diff --git a/lib/snmp/src/manager/snmpm_mpd.erl b/lib/snmp/src/manager/snmpm_mpd.erl
index a33ae9d710..85821ccb94 100644
--- a/lib/snmp/src/manager/snmpm_mpd.erl
+++ b/lib/snmp/src/manager/snmpm_mpd.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2019. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2021. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -310,7 +310,16 @@ process_v3_msg(NoteStore, Msg, Hdr, Data, Address, Log) ->
  		    {ok, 'version-3', PDU, PduMMS, ok};
  		_ when is_tuple(Note) ->
  		    ?vlog("process_v3_msg -> 7.2.11b: error"
- 			  "~n   Note: ~p", [Note]),
+ 			  "~n      Note:        ~p"
+ 			  "~n      SecEngineID: ~p"
+ 			  "~n      MsgSecModel: ~p"
+ 			  "~n      SecName:     ~p"
+ 			  "~n      SecLevel:    ~p"
+ 			  "~n      CtxEngineID: ~p"
+ 			  "~n      CtxName:     ~p",
+                          [Note,
+                           SecEngineID, MsgSecModel, SecName, SecLevel,
+                           CtxEngineID, CtxName]),
 		    Recv  = {SecEngineID, MsgSecModel, SecName, SecLevel,
 			     CtxEngineID, CtxName, PDU#pdu.request_id}, 
 		    Err   = sec_error(Note, Recv), 
diff --git a/lib/snmp/src/manager/snmpm_usm.erl b/lib/snmp/src/manager/snmpm_usm.erl
index 6b13c67bea..441618ec86 100644
--- a/lib/snmp/src/manager/snmpm_usm.erl
+++ b/lib/snmp/src/manager/snmpm_usm.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2021. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -80,8 +80,8 @@ process_incoming_msg(Packet, Data, SecParams, SecLevel) ->
     #usmSecurityParameters{msgAuthoritativeEngineID = MsgAuthEngineID,
 			   msgUserName = MsgUserName} = UsmSecParams,
     ?vlog("process_incoming_msg -> [3.2.2]"
-	  "~n   authEngineID: ~p"
-	  "~n   userName:     ~p", [MsgAuthEngineID, MsgUserName]),
+	  "~n      authEngineID: ~p"
+	  "~n      userName:     ~p", [MsgAuthEngineID, MsgUserName]),
 
     %% 3.2.3 (b)
     ?vtrace("process_incoming_msg -> [3.2.3-b] check engine id",[]),
@@ -132,14 +132,21 @@ process_incoming_msg(Packet, Data, SecParams, SecLevel) ->
 
 authenticate_incoming(Packet, UsmSecParams, UsmUser, SecLevel) ->
     %% 3.2.6
-    ?vtrace("authenticate incoming: 3.2.6",[]),
+    ?vtrace("authenticate incoming -> 3.2.6"
+            "~n      SecLevel: ~p", [SecLevel]),
     #usmSecurityParameters{msgAuthoritativeEngineID    = MsgAuthEngineID,
 			   msgAuthoritativeEngineBoots = MsgAuthEngineBoots,
 			   msgAuthoritativeEngineTime  = MsgAuthEngineTime,
 			   msgAuthenticationParameters = MsgAuthParams} =
 	UsmSecParams,
+    ?vtrace("authenticate_incoming -> Sec params: "
+	    "~n      MsgAuthEngineID:    ~w"
+	    "~n      MsgAuthEngineBoots: ~p"
+	    "~n      MsgAuthEngineTime:  ~p",
+	    [MsgAuthEngineID, MsgAuthEngineBoots, MsgAuthEngineTime]),
     case snmp_misc:is_auth(SecLevel) of
 	true ->
+            ?vtrace("authenticate_incoming -> authenticate"),
 	    SecName = UsmUser#usm_user.sec_name,
 	    case is_auth(UsmUser#usm_user.auth, 
 			 UsmUser#usm_user.auth_key,
@@ -156,6 +163,7 @@ authenticate_incoming(Packet, UsmSecParams, UsmUser, SecLevel) ->
 			  ?usmStatsWrongDigests_instance, SecName)
 	    end;
 	false ->  % noAuth
+            ?vtrace("authenticate_incoming -> don't authenticate"),
 	    ok
     end.
 
@@ -198,13 +206,13 @@ is_auth(AuthProtocol, AuthKey, AuthParams, Packet, SecName,
 				  [{securityLevel, 1}]) % authNoPriv
 		    end;
 		_ -> %% 3.2.7b - we're non-authoritative
-		    ?vtrace("we are non-authoritative: 3.2.7b",[]),
+		    ?vtrace("is_auth -> we are non-authoritative: 3.2.7b"),
 		    SnmpEngineBoots = get_engine_boots(MsgAuthEngineID),
-		    ?vtrace("SnmpEngineBoots: ~p",[SnmpEngineBoots]),
+		    ?vtrace("is_auth -> SnmpEngineBoots: ~p", [SnmpEngineBoots]),
 		    SnmpEngineTime = get_engine_time(MsgAuthEngineID),
-		    ?vtrace("SnmpEngineTime: ~p",[SnmpEngineTime]),
+		    ?vtrace("is_auth -> SnmpEngineTime: ~p", [SnmpEngineTime]),
 		    LatestRecvTime = get_engine_latest_time(MsgAuthEngineID),
-		    ?vtrace("LatestRecvTime: ~p",[LatestRecvTime]),
+		    ?vtrace("is_auth -> LatestRecvTime: ~p", [LatestRecvTime]),
 		    UpdateLCD =
 			if
 			    MsgAuthEngineBoots > SnmpEngineBoots -> true;
@@ -212,10 +220,11 @@ is_auth(AuthProtocol, AuthKey, AuthParams, Packet, SecName,
 			    MsgAuthEngineTime > LatestRecvTime -> true;
 			    true -> false
 			end,
+		    ?vtrace("is_auth -> UpdateLCD: ~p", [UpdateLCD]),
 		    case UpdateLCD of
 			true -> %% 3.2.7b1
-			    ?vtrace("update msgAuthoritativeEngineID: 3.2.7b1",
-				    []),
+			    ?vtrace("is_auth -> "
+                                    "[3.2.7b1] update msgAuthoritativeEngineID"),
 			    set_engine_boots(MsgAuthEngineID,
 					     MsgAuthEngineBoots),
 			    set_engine_time(MsgAuthEngineID,
@@ -226,8 +235,7 @@ is_auth(AuthProtocol, AuthKey, AuthParams, Packet, SecName,
 			    ok
 		    end,
 		    %% 3.2.7.b2
-		    ?vtrace("check if message is outside time window: 3.2.7b2",
-			    []),
+		    ?vtrace("is_auth -> [3.2.7b2] is message outside time window"),
 		    InTimeWindow =
 			if
 			    SnmpEngineBoots == 2147483647 ->
@@ -242,6 +250,7 @@ is_auth(AuthProtocol, AuthKey, AuthParams, Packet, SecName,
 					 {time,   MsgAuthEngineTime}]};
 			    true -> true
 			end,
+		    ?vtrace("is_auth -> InTimeWindow: ~p", [InTimeWindow]),
 		    case InTimeWindow of
 			{false, Reason} ->
 			    ?vinfo("not in time window[3.2.7b2]: ~p", 
@@ -307,12 +316,18 @@ try_decrypt(usmAesCfb128Protocol,
 %%-----------------------------------------------------------------
 generate_outgoing_msg(Message, SecEngineID, SecName, SecData, SecLevel) ->
     %% 3.1.1
-    ?vtrace("generate_outgoing_msg -> entry (3.1.1)",[]),
+    ?vtrace("generate_outgoing_msg -> entry (3.1.1) when"
+            "~n      SecEngineID: ~p"
+            "~n      SecName:     ~p"
+            "~n      SecData:     ~p"
+            "~n      SecLevel:    ~p", [SecEngineID, SecName, SecData, SecLevel]),
     {UserName, AuthProtocol, AuthKey, PrivProtocol, PrivKey} = 
 	case SecData of
 	    [] -> % 3.1.1b
+                ?vdebug("generate_outgoing_msg -> "
+                        "[(3.1.1b] not a response - read from LCD"),
 		%% Not a response - read from LCD
-		case snmpm_config:get_usm_user_from_sec_name(SecEngineID, 
+		case snmpm_config:get_usm_user_from_sec_name(SecEngineID,
 							     SecName) of
 		    {ok, User} ->
  			{User#usm_user.name, 
@@ -321,6 +336,7 @@ generate_outgoing_msg(Message, SecEngineID, SecName, SecData, SecLevel) ->
 			 User#usm_user.priv,
  			 User#usm_user.priv_key};
 		    _ ->
+                        ?vlog("generate_outgoing_msg -> (usm) user not found"),
 			error(unknownSecurityName)
 		end;
 	    [MsgUserName] ->
@@ -330,24 +346,31 @@ generate_outgoing_msg(Message, SecEngineID, SecName, SecData, SecLevel) ->
 		SecData
 	end,
     SnmpEngineID = get_engine_id(),
-    ?vtrace("SnmpEngineID: ~p (3.1.6)",[SnmpEngineID]),
+    ?vtrace("generate_outgoing_msg -> [3.1.6] SnmpEngineID: ~p", [SnmpEngineID]),
     %% 3.1.6
     {MsgAuthEngineBoots, MsgAuthEngineTime} =
 	case snmp_misc:is_auth(SecLevel) of
 	    false when SecData == [] -> % not a response
 		{0, 0}; 
 	    true when SecEngineID /= SnmpEngineID ->
+                ?vtrace("generate_outgoing_msg -> "
+                        "~n      SecEngineID:  ~p"
+                        "~n      SnmpEngineID: ~p",
+                        [SecEngineID, SnmpEngineID]),
 		{get_engine_boots(SecEngineID), get_engine_time(SecEngineID)};
 	    _ ->
+                ?vtrace("generate_outgoing_msg -> use local boots and time"),
 		{get_engine_boots(), get_engine_time()}
 	end,
     %% 3.1.4
-    ?vtrace("generate_outgoing_msg -> (3.1.4)",[]),
+    ?vtrace("generate_outgoing_msg -> [3.1.4]"),
     ScopedPduBytes = Message#message.data,
-    {ScopedPduData, MsgPrivParams} = encrypt(ScopedPduBytes, PrivProtocol, PrivKey, SecLevel, MsgAuthEngineBoots,
+    {ScopedPduData, MsgPrivParams} = encrypt(ScopedPduBytes,
+                                             PrivProtocol, PrivKey,
+                                             SecLevel, MsgAuthEngineBoots,
         MsgAuthEngineTime),
     %% 3.1.5 - 3.1.7
-    ?vtrace("generate_outgoing_msg -> (3.1.5 - 3.1.7)",[]),
+    ?vtrace("generate_outgoing_msg -> [3.1.5 - 3.1.7]",[]),
     UsmSecParams =
 	#usmSecurityParameters{msgAuthoritativeEngineID = SecEngineID,
 			       msgAuthoritativeEngineBoots = MsgAuthEngineBoots,
diff --git a/lib/snmp/src/misc/snmp_usm.erl b/lib/snmp/src/misc/snmp_usm.erl
index 90c9bfb954..9652e3a3ff 100644
--- a/lib/snmp/src/misc/snmp_usm.erl
+++ b/lib/snmp/src/misc/snmp_usm.erl
@@ -201,53 +201,67 @@ auth_in(?usmHMAC384SHA512AuthProtocol, AuthKey, AuthParams, Packet) ->
                  ?usmHMAC384SHA512AuthProtocol_mac_length).
 
 auth_out(usmNoAuthProtocol, _AuthKey, _Message, _UsmSecParams) -> % 3.1.3
+    %% ?vtrace("auth_out(noAuth) -> entry"),
     error(unSupportedSecurityLevel);
 auth_out(?usmNoAuthProtocol, _AuthKey, _Message, _UsmSecParams) -> % 3.1.3
+    %% ?vtrace("auth_out(noAuth) -> entry"),
     error(unSupportedSecurityLevel);
 auth_out(usmHMACMD5AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(md5) -> entry"),
     md5_auth_out(AuthKey, Message, UsmSecParams);
 auth_out(?usmHMACMD5AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(md5) -> entry"),
     md5_auth_out(AuthKey, Message, UsmSecParams);
 auth_out(usmHMACSHAAuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha) -> entry"),
     sha_auth_out(AuthKey, Message, UsmSecParams);
 auth_out(?usmHMACSHAAuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha) -> entry"),
     sha_auth_out(AuthKey, Message, UsmSecParams);
 auth_out(usmHMAC128SHA224AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha224) -> entry"),
     sha2_auth_out(AuthKey, Message, UsmSecParams,
                   sha224,
                   ?usmHMAC128SHA224AuthProtocol_secret_key_length,
                   ?usmHMAC128SHA224AuthProtocol_mac_length);
 auth_out(?usmHMAC128SHA224AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha224) -> entry"), 
     sha2_auth_out(AuthKey, Message, UsmSecParams,
                   sha224,
                   ?usmHMAC128SHA224AuthProtocol_secret_key_length,
                   ?usmHMAC128SHA224AuthProtocol_mac_length);
 auth_out(usmHMAC192SHA256AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha256) -> entry"),
     sha2_auth_out(AuthKey, Message, UsmSecParams,
                   sha256,
                   ?usmHMAC192SHA256AuthProtocol_secret_key_length,
                   ?usmHMAC192SHA256AuthProtocol_mac_length);
 auth_out(?usmHMAC192SHA256AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha256) -> entry"),
     sha2_auth_out(AuthKey, Message, UsmSecParams,
                   sha256,
                   ?usmHMAC192SHA256AuthProtocol_secret_key_length,
                   ?usmHMAC192SHA256AuthProtocol_mac_length);
 auth_out(usmHMAC256SHA384AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha384) -> entry"),
     sha2_auth_out(AuthKey, Message, UsmSecParams,
                   sha384,
                   ?usmHMAC256SHA384AuthProtocol_secret_key_length,
                   ?usmHMAC256SHA384AuthProtocol_mac_length);
 auth_out(?usmHMAC256SHA384AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha384) -> entry"),
     sha2_auth_out(AuthKey, Message, UsmSecParams,
                   sha384,
                   ?usmHMAC256SHA384AuthProtocol_secret_key_length,
                   ?usmHMAC256SHA384AuthProtocol_mac_length);
 auth_out(usmHMAC384SHA512AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha512) -> entry"),
     sha2_auth_out(AuthKey, Message, UsmSecParams,
                   sha512,
                   ?usmHMAC384SHA512AuthProtocol_secret_key_length,
                   ?usmHMAC384SHA512AuthProtocol_mac_length);
 auth_out(?usmHMAC384SHA512AuthProtocol, AuthKey, Message, UsmSecParams) ->
+    %% ?vtrace("auth_out(sha512) -> entry"),
     sha2_auth_out(AuthKey, Message, UsmSecParams,
                   sha512,
                   ?usmHMAC384SHA512AuthProtocol_secret_key_length,
diff --git a/lib/snmp/test/snmp_manager_SUITE.erl b/lib/snmp/test/snmp_manager_SUITE.erl
index a472cf02b2..caedd52e07 100644
--- a/lib/snmp/test/snmp_manager_SUITE.erl
+++ b/lib/snmp/test/snmp_manager_SUITE.erl
@@ -38,6 +38,7 @@
 
 -include_lib("snmp/include/snmp_types.hrl").
 -include_lib("snmp/include/STANDARD-MIB.hrl").
+-include_lib("snmp/include/SNMP-USER-BASED-SM-MIB.hrl").
 -include_lib("snmp/src/manager/snmpm_internal.hrl").
 
 
@@ -90,6 +91,8 @@
          simple_async_get_bulk3_cbp_temp/1,
          simple_async_get_bulk3_cbp_perm/1,
 	 
+	 simple_v3_exchange/1, 
+
 	 discovery/1,
 	 
 	 trap1/1,
@@ -188,8 +191,9 @@ groups() ->
      {otp8015,              [], otp8015_cases()},
      {otp8395,              [], otp8395_cases()},
      {ipv6,                 [], ipv6_tests()},
-     {ipv6_mt,              [], ipv6_tests()}
+     {ipv6_mt,              [], ipv6_tests()},
 
+     {v3,                   [], v3_cases()}
     ].
 
 inet_backend_default_cases() ->
@@ -214,7 +218,8 @@ all_cases() ->
      discovery, 
      {group, tickets}, 
      {group, ipv6},
-     {group, ipv6_mt}
+     {group, ipv6_mt},
+     {group, v3}
     ].
 
 start_and_stop_tests_cases() ->
@@ -319,6 +324,12 @@ event_tests_cases() ->
      report
     ].
 
+v3_cases() ->
+    [
+     simple_v3_exchange
+    ].
+    
+
 event_tests_mt_cases() -> event_tests_cases().
 
 tickets_cases() ->
@@ -446,17 +457,19 @@ init_per_group2(all = GroupName, Config) ->
     ?LIB:init_group_top_dir(GroupName, Config);
 init_per_group2(request_tests_mt = GroupName, Config) ->
     ?LIB:init_group_top_dir(
-      GroupName, 
+      GroupName,
       [{manager_net_if_module, snmpm_net_if_mt} | Config]);
 init_per_group2(event_tests_mt = GroupName, Config) ->
     ?LIB:init_group_top_dir(
-      GroupName, 
+      GroupName,
       [{manager_net_if_module, snmpm_net_if_mt} | Config]);
 init_per_group2(ipv6_mt = GroupName, Config) ->
     init_per_group_ipv6(GroupName,
                         [{manager_net_if_module, snmpm_net_if_mt} | Config]);   
-init_per_group2(ipv6 = GroupName, Config) -> 
-    init_per_group_ipv6(GroupName, Config);   
+init_per_group2(ipv6 = GroupName, Config) ->
+    init_per_group_ipv6(GroupName, Config);
+%% init_per_group2(v3 = GroupName, Config) ->
+%%     ?LIB:init_group_top_dir(GroupName, Config);
 init_per_group2(GroupName, Config) ->
     ?LIB:init_group_top_dir(GroupName, Config).
 
@@ -610,6 +623,25 @@ init_per_testcase2(Case, Config) ->
     ?DBG("init [~w] Nodes [2]: ~p", [Case, erlang:nodes()]),
     Conf2.
 
+init_per_testcase3(simple_v3_exchange = _Case, Config) ->
+    Conf2 = init_v3_agent(Config),
+    Conf3 = try init_v3_manager(Conf2)
+            catch AC:AE:_ ->
+                    %% Ouch we need to clean up:
+                    %% The init_agent starts an agent node!
+                    init_per_testcase_fail_agent_cleanup(Config),
+                    throw({skip, {manager_init_failed, AC, AE}})
+            end,
+    Conf4 = try init_mgr_user(Conf3)
+            catch MC:ME:_ ->
+                    %% Ouch we need to clean up:
+                    %% The init_agent starts an agent node!
+                    %% The init_magager starts an manager node!
+                    init_per_testcase_fail_manager_cleanup(Conf2),
+                    init_per_testcase_fail_agent_cleanup(Conf2),
+                    throw({skip, {manager_user_init_failed, MC, ME}})
+            end,
+    init_mgr_v3_user_data(Conf4);
 init_per_testcase3(Case, Config) ->
     ApiCases02 = 
 	[
@@ -739,6 +771,11 @@ end_per_testcase(Case, Config) when is_list(Config) ->
 
     Conf2.
 
+end_per_testcase2(simple_v3_exchange = _Case, Config) ->
+    Conf1 = fin_mgr_user_data2(Config),
+    Conf2 = fin_mgr_user(Conf1),
+    Conf3 = fin_v3_manager(Conf2),
+    fin_v3_agent(Conf3);
 end_per_testcase2(Case, Config) ->
     ApiCases02 = 
 	[
@@ -1680,11 +1717,11 @@ usm_sha512_priv_aes(Config) when is_list(Config) ->
     ?TC_TRY(usm_priv_aes, Pre, Case, Post).
 
 
-select_auth_alg(sha)    -> usmHMACSHAAuthProtocol;
-select_auth_alg(sha224) -> usmHMAC128SHA224AuthProtocol;
-select_auth_alg(sha256) -> usmHMAC192SHA256AuthProtocol;
-select_auth_alg(sha384) -> usmHMAC256SHA384AuthProtocol;
-select_auth_alg(sha512) -> usmHMAC384SHA512AuthProtocol.
+select_auth_proto(sha)    -> usmHMACSHAAuthProtocol;
+select_auth_proto(sha224) -> usmHMAC128SHA224AuthProtocol;
+select_auth_proto(sha256) -> usmHMAC192SHA256AuthProtocol;
+select_auth_proto(sha384) -> usmHMAC256SHA384AuthProtocol;
+select_auth_proto(sha512) -> usmHMAC384SHA512AuthProtocol.
 
 do_usm_priv_aes(AuthAlg, Config) ->
     ?IPRINT("starting with Config: "
@@ -1706,7 +1743,7 @@ do_usm_priv_aes(AuthAlg, Config) ->
       snmp:passwd2localized_key(md5, PrivPass, EngineID),
 
     Credentials =
-      [ {auth,     select_auth_alg(AuthAlg)},
+      [ {auth,     select_auth_proto(AuthAlg)},
         {auth_key, AuthKey},
         {priv,     usmAesCfb128Protocol},
         {priv_key, PrivKey}
@@ -3540,6 +3577,40 @@ simple_async_get_bulk3_cbp_perm(Config) when is_list(Config) ->
     simple_async_get_bulk3(sagb3_cbp_perm, Config).
 
 
+%%======================================================================
+
+simple_v3_exchange(doc) ->
+    ["Simple message exchange using v3 messages"];
+simple_v3_exchange(suite) -> [];
+simple_v3_exchange(Config) when is_list(Config) ->
+    ?IPRINT("starting with Config: "
+            "~n      ~p", [Config]),
+
+    Node       = ?config(manager_node, Config),
+    TargetName = ?config(manager_agent_target_name, Config),
+
+    Oids1 = [?sysDescr_instance],
+    ?IPRINT("initial try get (expect failure and a report)"),
+    {error, timeout} = mgr_user_sync_get2(Node, TargetName, Oids1, []),
+    receive
+        {async_event, TargetName, {report, {noError, 0, [#varbind{oid = ?usmStatsNotInTimeWindows_instance}]}} = Report1} ->
+            ?IPRINT("received expected report: "
+                    "~n      ~p", [Report1]),
+            ok
+    end,
+    ?IPRINT("second try get (expect success)"),
+    {ok, Reply2, _} = mgr_user_sync_get2(Node, TargetName, Oids1, []),
+    case Reply2 of
+        {noError, 0, [#varbind{oid = ?sysDescr_instance}]} ->
+            ?IPRINT("expected get success"),
+            display_log(Config),
+            ok;
+        X ->
+            {error, X}
+    end.
+
+
+
 %%======================================================================
 
 discovery(suite) -> [];
@@ -4948,15 +5019,15 @@ init_manager(AutoInform, Config) ->
 	    %% -- 
 	    %% 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;
@@ -4985,6 +5056,67 @@ init_manager(AutoInform, Config) ->
 	    ?FAIL({failed_starting_manager, C, E, S})
     end.
 
+init_v3_manager(Config) ->
+
+    ?IPRINT("init_v3_manager -> entry with"
+            "~n   Config: ~p", [Config]),
+
+    %% -- 
+    %% Start node
+    %% 
+
+    %% ?line Node = self(),
+    ?line Node = start_unique_manager_node(),
+
+    %% The point with this (try catch block) is to be 
+    %% able to do some cleanup in case we fail to 
+    %% start some of the apps. That is, if we fail to 
+    %% start the apps (mnesia, crypto and snmp agent) 
+    %% we stop the (agent) node!
+
+    try
+	begin
+
+	    %% -- 
+	    %% Start and initiate crypto on manager node
+	    %% 
+
+	    ?line ok = init_crypto(Node),
+
+	    %% 
+	    %% Write manager config
+	    %% 
+
+            %% DomainType is just a "dummy" arg to make the 
+            %% function choose transportDomainUdpIpv4 as transport domain.
+	    ?line ok = write_manager_config(transport, Config),
+
+	    IRB  = auto,
+	    Conf = [{manager_node, Node}, {irb, IRB} | Config],
+	    Vsns = [v3], 
+	    start_manager(Node, Vsns, Conf)
+	end
+    catch
+	C:{suite_failed, Reason, _M, _L} = E:S when (C =:= exit) ->
+	    ?EPRINT("Failure during manager start (suite-failed):"
+                    "~n      Reason:      ~p"
+                    "~n      StackTrace:  ~p", [Reason, S]), 
+	    %% And now, *try* to cleanup
+	    (catch stop_node(Node)),
+	    erlang:raise(C, E, S);
+	C:E:S ->
+	    ?EPRINT("Failure during manager start: "
+                    "~n      Error Class: ~p"
+                    "~n      Error:       ~p"
+                    "~n      StackTrace:  ~p", [C, E, S]), 
+	    %% And now, *try* to cleanup
+	    (catch stop_node(Node)), 
+	    ?FAIL({failed_starting_manager, C, E, S})
+    end.
+
+fin_v3_manager(Config) ->
+    fin_manager(Config).
+
 fin_manager(Config) ->
     Node = ?config(manager_node, Config),
     StopMgrRes    = stop_manager(Node),
@@ -5024,35 +5156,103 @@ init_agent(Config) ->
 
     try
 	begin
-	    
+
 	    %% -- 
 	    %% Start and initiate mnesia on agent node
 	    %% 
-	    
+
 	    ?line ok = init_mnesia(Node, Dir, ?config(mnesia_debug, Config)),
-	    
-	    
+
+
 	    %% -- 
 	    %% 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,    MibDir} | Config],
-    
+
+	    %% 
+	    %% Start the agent 
+	    %% 
+
+	    start_agent(Node, Vsns, Conf)
+	end
+    catch
+	C:{suite_failed, Reason, _M, _L} = E:S when (C =:= exit) ->
+	    ?EPRINT("Failure during agent start (suite-failed):"
+                    "~n   Reason:     ~p"
+                    "~n   StackTrace: ~p", [Reason, S]), 
+	    %% And now, *try* to cleanup
+	    (catch stop_node(Node)),
+	    erlang:raise(C, E, S);
+	C:E:S ->
+	    ?EPRINT("Failure during agent start: "
+                    "~n   Error Class: ~p"
+                    "~n   Error:       ~p"
+                    "~n   StackTrace:  ~p", [C, E, S]), 
+	    %% And now, *try* to cleanup
+	    (catch stop_node(Node)), 
+	    ?FAIL({failed_starting_agent, C, E, S})
+    end.
+
+
+init_v3_agent(Config) ->
+    ?IPRINT("init_v3_agent -> entry with"
+            "~n   Config: ~p", [Config]),
+
+    %% -- 
+    %% Retrieve some dir's
+    %% 
+    _Dir    = ?config(agent_dir, Config),
+    MibDir = ?config(mib_dir,  Config),
+
+    %% -- 
+    %% Start node
+    %% 
+
+    %% ?line Node = self(),
+    ?line Node = start_unique_agent_node(),
+
+    %% The point with this (try catch block) is to be 
+    %% able to do some cleanup in case we fail to 
+    %% start some of the apps. That is, if we fail to 
+    %% start the apps (mnesia, crypto and snmp agent) 
+    %% we stop the (agent) node!
+
+    try
+	begin
+
+	    %% -- 
+	    %% Start and initiate crypto on agent node
+	    %% 
+
+	    ?line ok = init_crypto(Node),
+
+
+	    %% 
+	    %% Write agent config
+	    %% 
+
+	    Vsns = [v3], 
+	    ?line ok = write_agent_config(Vsns, Config),
+
+	    Conf = [{agent_node, Node},
+		    {mib_dir,    MibDir} | Config],
+
 	    %% 
 	    %% Start the agent 
 	    %% 
-	    
+
 	    start_agent(Node, Vsns, Conf)
 	end
     catch
@@ -5072,7 +5272,7 @@ init_agent(Config) ->
 	    (catch stop_node(Node)), 
 	    ?FAIL({failed_starting_agent, C, E, S})
     end.
-	      
+
 
 fin_agent(Config) ->
     Node          = ?config(agent_node, Config),
@@ -5088,6 +5288,18 @@ fin_agent(Config) ->
             [Node, StopAgentRes, StopCryptoRes, StopMnesiaRes, StopNode]),
     Config.
 
+fin_v3_agent(Config) ->
+    Node          = ?config(agent_node, Config),
+    StopAgentRes  = stop_agent(Node),
+    StopCryptoRes = fin_crypto(Node),
+    StopNode      = stop_node(Node),
+    ?IPRINT("fin_agent -> stop apps and (agent node ~p) node results: "
+            "~n   SNMP Agent: ~p"
+            "~n   Crypto:     ~p"
+            "~n   Node:       ~p", 
+            [Node, StopAgentRes, StopCryptoRes, StopNode]),
+    Config.
+
 init_mnesia(Node, Dir, MnesiaDebug) 
   when ((MnesiaDebug =/= none) andalso 
 	(MnesiaDebug =/= debug) andalso (MnesiaDebug =/= trace)) ->
@@ -5245,24 +5457,21 @@ mgr_info(Node) ->
 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_register_usm_user(Node, EngineID, SecName, Credentials)
+  when (Node =:= node()) ->
+    snmpm:register_usm_user(EngineID, SecName, Credentials);
+mgr_register_usm_user(Node, EngineID, SecName, Credentials) ->
+    rcall(Node, snmpm, register_usm_user, [EngineID, SecName, Credentials]).
+
 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(),
@@ -5275,9 +5484,6 @@ 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]);
@@ -5365,6 +5571,18 @@ init_mgr_user(Conf) ->
     ?line {ok, User} = mgr_user_start(Node),
     ?DBG("start_mgr_user -> User: ~p", [User]),
     link(User),
+
+    EngineID    = "agentEngine",
+    SecName     = "authSHA224",
+    AuthAlg     = sha224,
+    %% AuthPass    = "passwd_sha224xxxxxxxxxxxxxxx",
+    %% AuthKey     = snmp:passwd2localized_key(AuthAlg, AuthPass, EngineID),
+    AuthKey     = "passwd_sha224xxxxxxxxxxxxxxx",
+    Credentials =
+      [ {auth,     select_auth_proto(AuthAlg)},
+        {auth_key, AuthKey}
+      ],
+    ?line ok = mgr_register_usm_user(Node, EngineID, SecName, Credentials),
     
     [{user_pid, User} | Conf].
 
@@ -5455,6 +5673,52 @@ init_mgr_user_data2(Conf) ->
     ?DBG("Updated agent config: ~n~p", [_AgentConf]),
     Conf.
 
+init_mgr_v3_user_data(Conf) ->
+    ?IPRINT("init_mgr_v3_user_data -> entry with"
+            "~n   Conf: ~p", [Conf]),
+    Node       = ?config(manager_node, Conf),
+    TargetName = ?config(manager_agent_target_name, Conf),
+    IpFamily   = ?config(ipfamily, Conf),
+    Ip         = ?config(ip, Conf),
+    Port       = ?AGENT_PORT,
+    ?line ok =
+	case IpFamily of
+	    inet ->
+		mgr_user_register_agent(
+		  Node, TargetName,
+		  [{tdomain,   transportDomainUdpIpv4},
+		   {taddress,  {Ip, Port}},
+		   {engine_id, "agentEngine"},
+                   {version,   v3}]);
+	    inet6 ->
+		mgr_user_register_agent(
+		  Node, TargetName,
+		  [{tdomain,   transportDomainUdpIpv6},
+		   {taddress,  {Ip, Port}},
+		   {engine_id, "agentEngine"},
+                   {version,   v3}])
+	end,
+    _Agents = mgr_user_which_own_agents(Node),
+    ?IPRINT("Own agents: ~p", [_Agents]),
+
+    ?line {ok, _DefAgentConf} = mgr_user_agent_info(Node, TargetName, all),
+    ?IPRINT("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, "authSHA224"),
+    ?line ok = mgr_user_update_agent_info(Node, TargetName,
+					  sec_level, authNoPriv),
+    ?line ok = mgr_user_update_agent_info(Node, TargetName,
+					  sec_model, usm),
+    ?line ok = mgr_user_update_agent_info(Node, TargetName, 
+					  max_message_size, 1024),
+
+    ?line {ok, _AgentConf} = mgr_user_agent_info(Node, TargetName, all),
+    ?IPRINT("Updated agent config: ~n~p", [_AgentConf]),
+    Conf.
+
 fin_mgr_user_data1(Conf) ->
     Node = ?config(manager_node, Conf),
     TargetName = ?config(manager_agent_target_name, Conf),
@@ -5477,18 +5741,10 @@ mgr_user_start(Node, 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_unregister_agent(Node) ->
-%%     mgr_user_unregister_agent(Node, ?LOCALHOST(), ?AGENT_PORT).
 mgr_user_unregister_agent(Node, TargetName) when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, unregister_agent, [TargetName]).
 
@@ -5496,93 +5752,45 @@ mgr_user_agent_info(Node, TargetName, Item)
   when is_list(TargetName) andalso is_atom(Item) ->
     rcall(Node, snmp_manager_user, agent_info, [TargetName, 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, TargetName, Item, Val) 
   when is_list(TargetName) andalso is_atom(Item) ->
     rcall(Node, snmp_manager_user, update_agent_info, [TargetName, 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, TargetName, Oids) when is_list(TargetName) ->
-%%     rcall(Node, snmp_manager_user, sync_get, [TargetName, Oids]).
+mgr_user_sync_get2(Node, TargetName, Oids) when is_list(TargetName) ->
+    mgr_user_sync_get2(Node, TargetName, Oids, []).
 
 mgr_user_sync_get2(Node, TargetName, Oids, SendOpts) when is_list(TargetName) ->
     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, TargetName, Oids) when is_list(TargetName) ->
-%%     rcall(Node, snmp_manager_user, async_get, [TargetName, Oids]).
-
 mgr_user_async_get2(Node, TargetName, Oids, SendOpts) 
   when is_list(TargetName) ->
     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, TargetName, Oids) when is_list(TargetName) ->
-%%     rcall(Node, snmp_manager_user, sync_get_next, [TargetName, Oids]).
-
 mgr_user_sync_get_next2(Node, TargetName, Oids, SendOpts) 
   when is_list(TargetName) ->
     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, TargetName, Oids) when is_list(TargetName) ->
-%%     rcall(Node, snmp_manager_user, async_get_next, [TargetName, Oids]).
-
 mgr_user_async_get_next2(Node, TargetName, Oids, SendOpts) 
   when is_list(TargetName) ->
     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, TargetName, VAV) when is_list(TargetName) ->
-%%     rcall(Node, snmp_manager_user, sync_set, [TargetName, VAV]).
-
 mgr_user_sync_set2(Node, TargetName, VAV, SendOpts) when is_list(TargetName) ->
     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, TargetName, VAV) when is_list(TargetName) ->
-%%     rcall(Node, snmp_manager_user, async_set, [TargetName, VAV]).
-
 mgr_user_async_set2(Node, TargetName, VAV, SendOpts) when is_list(TargetName) ->
     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, TargetName, NonRep, MaxRep, Oids) 
-%%   when is_list(TargetName) ->
-%%     rcall(Node, snmp_manager_user, sync_get_bulk, 
-%% 	  [TargetName, NonRep, MaxRep, Oids]).
-
 mgr_user_sync_get_bulk2(Node, TargetName, NonRep, MaxRep, Oids, SendOpts) 
   when is_list(TargetName) ->
     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, TargetName, NonRep, MaxRep, Oids) 
-%%   when is_list(TargetName) ->
-%%     rcall(Node, snmp_manager_user, async_get_bulk, 
-%% 	  [TargetName, NonRep, MaxRep, Oids]).
-
 mgr_user_async_get_bulk2(Node, TargetName, NonRep, MaxRep, Oids, SendOpts) 
   when is_list(TargetName) ->
     rcall(Node, snmp_manager_user, async_get_bulk2, 
@@ -5690,7 +5898,8 @@ start_agent(Node, Vsns, Conf0, _Opts) ->
     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),
+    %% NIV  = get_opt(agent_net_if_verbosity,         Conf0, log),
+    NIV  = get_opt(agent_net_if_verbosity,         Conf0, trace),
 
     Env = [{versions,        Vsns},
 	   {type,            master},
@@ -5710,7 +5919,7 @@ start_agent(Node, Vsns, Conf0, _Opts) ->
 	   {note_store,      [{verbosity, NSV}]},
 	   {stymbolic_store, [{verbosity, SSV}]},
 	   {net_if,          [{verbosity, NIV},
-                              %% On some linux "they" add a 127.0.1.1 or somthing
+                              %% On some linux "they" add a 127.0.1.1 or something
                               %% similar, so if we don't specify bind_to
                               %% we don't know which address will be selected
                               %% (which will cause problems for some test cases).
@@ -5736,12 +5945,6 @@ stop_agent(Node) ->
 
 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],
@@ -5760,18 +5963,28 @@ agent_send_notif(Node, Trap, Recv, Name, VBs) ->
 agent_info(Node) ->
     rcall(Node, snmpa, info, []).
 
-%% agent_which_mibs(Node) ->
-%%     rcall(Node, snmpa, which_mibs, []).
-
 
 %% -- Misc node operation wrapper functions --
 
+unique(PreName) ->
+    list_to_atom(?F("~w_~w", [PreName, erlang:system_time(millisecond)])).
+
 start_agent_node() ->
     start_node(snmp_agent).
 
+start_unique_agent_node() ->
+    start_unique_node(snmp_agent).
+
 start_manager_node() ->
     start_node(snmp_manager).
 
+start_unique_manager_node() ->
+    start_unique_node(snmp_manager).
+
+%% Generate a "unique" (node-) name and start a node with this name.
+start_unique_node(BaseName) when is_atom(BaseName) ->
+    start_node(unique(BaseName), false).
+
 start_node(Name) ->
     start_node(Name, true).
 start_node(Name, Retry) ->
@@ -5823,6 +6036,8 @@ start_node(Name, Retry) ->
     end.
 
 
+stop_node(Node) when (Node =:= self()) ->
+    ok;%?line ?FAIL({stop_own_node, Node});
 stop_node(Node) ->
     case ?STOP_NODE(Node) of
         true ->
@@ -5836,12 +6051,21 @@ stop_node(Node) ->
 %% -- Misc config wrapper functions --
 
 write_manager_config(Config) ->
-    Dir  = ?config(manager_conf_dir, Config),
-    Ip = tuple_to_list(?config(ip, Config)),
+    write_manager_config(default, Config).
+
+write_manager_config(DomainType, Config) ->
+    Dir = ?config(manager_conf_dir, Config),
+    Ip  = tuple_to_list(?config(ip, Config)),
+    %% Note that Addr and Port are actually only Addr and Port
+    %% when DomainType is default.
+    %% In all other cases the Addr is TransportDomain and 
+    %% port is {Addr, Port}...
     {Addr, Port} =
 	case ?config(ipfamily, Config) of
-	    inet ->
+	    inet when (DomainType =:= default) ->
 		{Ip, ?MGR_PORT};
+	    inet ->
+		{transportDomainUdpIpv4, {Ip, ?MGR_PORT}};
 	    inet6 ->
 		{transportDomainUdpIpv6, {Ip, ?MGR_PORT}}
 	end,
@@ -5860,15 +6084,6 @@ write_manager_conf(Dir) ->
                           [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).
 
@@ -5879,7 +6094,7 @@ write_agent_config(Vsns, Conf) ->
     ?line Domain =
 	case ?config(ipfamily, Conf) of
 	    inet ->
-		snmpUDPDomain;
+		transportDomainUdpIpv4;
 	    inet6 ->
 		transportDomainUdpIpv6
 	end,
@@ -6104,6 +6319,8 @@ get_opt(Key, Opts, Def) ->
 
 %% ------
 
+rcall(Node, Mod, Func, Args) when (Node =:= self()) ->
+    apply(Mod, Func, Args);
 rcall(Node, Mod, Func, Args) ->
     case rpc:call(Node, Mod, Func, Args) of
 	{badrpc, nodedown} ->
diff --git a/lib/snmp/test/snmp_manager_user.erl b/lib/snmp/test/snmp_manager_user.erl
index 5c56ed5c15..cc62551cec 100644
--- a/lib/snmp/test/snmp_manager_user.erl
+++ b/lib/snmp/test/snmp_manager_user.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2021. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -39,28 +39,28 @@
 %% External exports
 %%----------------------------------------------------------------------
 -export([
-         start_link/0, start_link/1, start_link/2, 
-	 start/0, start/1, start/2, 
+         start_link/0, start_link/1, start_link/2,
+	 start/0, start/1, start/2,
 	 stop/0,
-	 info/0, 
-	 system_info/0, 
+	 info/0,
+	 system_info/0,
 	 simulate_crash/1,
-	 register_agent/2, 
-	 unregister_agent/1, 
-	 agent_info/2, 
-	 update_agent_info/3, 
-	 which_all_agents/0, which_own_agents/0, 
-	 load_mib/1, unload_mib/1, 
-         sync_get2/3, 
+	 register_agent/2,
+	 unregister_agent/1,
+	 agent_info/2,
+	 update_agent_info/3,
+	 which_all_agents/0, which_own_agents/0,
+	 load_mib/1, unload_mib/1,
+         sync_get2/3,
          async_get2/3,
          sync_get_next2/3,
          async_get_next2/3,
-         sync_set2/3, 
-         async_set2/3, 
+         sync_set2/3,
+         async_set2/3,
          sync_get_bulk2/5,
          async_get_bulk2/5,
-	 name_to_oid/1, oid_to_name/1, 
-	 purify_oid/1	 
+	 name_to_oid/1, oid_to_name/1,
+	 purify_oid/1
         ]).
 
 
-- 
2.31.1

Places

File 1548-snmp-manager-Test-cases-for-manager.patch of Package erlang (Revision 740810ae07adffc1a50bb3a32135aa98)

Places