aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2019-04-01 18:13:59 +0200
committerMicael Karlberg <[email protected]>2019-04-11 18:53:02 +0200
commit2d9d8b868e8a816b8baf08b65035c1e274f3e5b2 (patch)
tree0881edb72a642ca7a498c5d72cc961568ab75ac9 /lib/snmp
parent7c7f5bc9bbf84055637eb01d5dae3e9db8a2fffc (diff)
downloadotp-2d9d8b868e8a816b8baf08b65035c1e274f3e5b2.tar.gz
otp-2d9d8b868e8a816b8baf08b65035c1e274f3e5b2.tar.bz2
otp-2d9d8b868e8a816b8baf08b65035c1e274f3e5b2.zip
[snmp|agent|test] Some minor tweaking of (agent) test suite
Improved the test manager printouts to make it easier to diagnose problems...
Diffstat (limited to 'lib/snmp')
-rw-r--r--lib/snmp/test/snmp_agent_test.erl18
-rw-r--r--lib/snmp/test/snmp_test_mgr_misc.erl18
2 files changed, 19 insertions, 17 deletions
diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index f9c18af6ea..b71614ed51 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -1116,15 +1116,15 @@ init_ms(Config, Opts) when is_list(Config) ->
Opts1 = [MasterAgentVerbosity, MibsVerbosity, SymStoreVerbosity | Opts],
[{vsn, v1} | start_v1_agent(Config, Opts1)].
-init_size_check_mse(Config) when is_list(Config) ->
- MibStorage = {mib_storage, [{module, snmpa_mib_storage_ets}]},
- init_size_check_ms(Config, [MibStorage]).
-
-init_size_check_msd(Config) when is_list(Config) ->
- AgentDbDir = ?GCONF(agent_db_dir, Config),
- MibStorage = {mib_storage, [{module, snmpa_mib_storage_dets},
- {options, [{dir, AgentDbDir}]}]},
- init_size_check_ms(Config, [MibStorage]).
+%% init_size_check_mse(Config) when is_list(Config) ->
+%% MibStorage = {mib_storage, [{module, snmpa_mib_storage_ets}]},
+%% init_size_check_ms(Config, [MibStorage]).
+
+%% init_size_check_msd(Config) when is_list(Config) ->
+%% AgentDbDir = ?GCONF(agent_db_dir, Config),
+%% MibStorage = {mib_storage, [{module, snmpa_mib_storage_dets},
+%% {options, [{dir, AgentDbDir}]}]},
+%% init_size_check_ms(Config, [MibStorage]).
init_size_check_msm(Config) when is_list(Config) ->
?line AgentNode = ?GCONF(snmp_master, Config),
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index 274fb5be26..f3f97b5ac4 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -211,12 +211,14 @@ handle_udp_packet(_V, undefined,
case SnmpMgr of
{pdu, Pid} ->
Pdu = get_pdu(Msg),
- d("packet_loop -> "
- "send pdu to manager (~w): ~p", [Pid, Pdu]),
+ d("handle_udp_packet -> "
+ "send pdu(v3) to manager (~w): "
+ "~n ~p", [Pid, Pdu]),
Pid ! {snmp_pdu, Pdu};
{msg, Pid} ->
d("packet_loop -> "
- "send msg to manager (~w): ~p", [Pid, Msg]),
+ "send msg(v3) to manager (~p): "
+ "~n ~p", [Pid, Msg]),
Pid ! {snmp_msg, Msg, Ip, UdpPort}
end,
MsgData2;
@@ -247,8 +249,8 @@ handle_udp_packet(_V, undefined,
Pid ! {snmp_pdu, Pdu};
{msg, Pid} ->
d("handle_udp_packet -> "
- "send pdu-msg to manager (~w): ~p",
- [Pid, Pdu]),
+ "send msg to manager (~p): "
+ "~n ~p", [Pid, Pdu]),
Msg = Message#message{data = Pdu},
Pid ! {snmp_msg, Msg, Ip, UdpPort}
end;
@@ -256,13 +258,13 @@ handle_udp_packet(_V, undefined,
case SnmpMgr of
{pdu, Pid} ->
d("handle_udp_packet -> "
- "send trap to manager (~w): ~p",
+ "send trap-pdu to manager (~w): ~p",
[Pid, Pdu]),
Pid ! {snmp_pdu, Pdu};
{msg, Pid} ->
d("handle_udp_packet -> "
- "send trap-msg to manager (~w): ~p",
- [Pid, Pdu]),
+ "send trap-msg to manager (~w): "
+ "~n ~p", [Pid, Pdu]),
Msg = Message#message{data = Pdu},
Pid ! {snmp_msg, Msg, Ip, UdpPort}
end;