Merge branch 'maint'

6 files changed, 220 insertions, 41 deletions

diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index 9a9258aa91..b4770ad0a9 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -532,6 +532,7 @@ groups() ->
      {v3_inform,                     [], v3_inform_cases()}, 
      {v3_security,                   [], v3_security_cases()}, 
      {standard_mibs,                 [], standard_mibs_cases()}, 
+     {standard_mibs_ipv6,            [], standard_mibs_cases_ipv6()},
      {standard_mibs_2,               [], standard_mibs2_cases()}, 
      {standard_mibs_3,               [], standard_mibs3_cases()}, 
      {reported_bugs,                 [], reported_bugs_cases()}, 
@@ -651,11 +652,18 @@ init_per_group(GroupName, Config) ->
 init_per_group_ipv6(GroupName, Config, Init) ->
     case ct:require(ipv6_hosts) of
 	ok ->
-	    Init(
-	      snmp_test_lib:init_group_top_dir(
-		GroupName,
-		[{ipfamily, inet6},
-		 {ip, ?LOCALHOST(inet6)} | lists:keydelete(ip, 1, Config)]));
+	    case gen_udp:open(0, [inet6]) of
+		{ok, S} ->
+		    ok = gen_udp:close(S),
+		    Init(
+		      snmp_test_lib:init_group_top_dir(
+			GroupName,
+			[{ipfamily, inet6},
+			 {ip, ?LOCALHOST(inet6)}
+			 | lists:keydelete(ip, 1, Config)]));
+		{error, _} ->
+		    {skip, "Host seems to not support IPv6"}
+	    end;
 	_ ->
 	    {skip, "Host does not support IPV6"}
     end.
@@ -1714,7 +1722,7 @@ v1_cases_ipv6() ->
      next_across_sa,
      undo,
 %%     {group, reported_bugs},
-     {group, standard_mibs}, % snmp_standard_mib still failing, sends v1 trap
+     {group, standard_mibs_ipv6},
      sparse_table,
 %%     cnt_64, % sends v1 trap
      opaque
@@ -4836,6 +4844,15 @@ standard_mibs_cases() ->
      snmp_view_based_acm_mib
     ].
     
+standard_mibs_cases_ipv6() ->
+    [
+     %% snmp_standard_mib, % Sending v1 traps does not work over IPv6
+     snmp_community_mib,
+     snmp_framework_mib,
+     snmp_target_mib,
+     snmp_notification_mib,
+     snmp_view_based_acm_mib
+    ].
 
 %%-----------------------------------------------------------------
 %% For this test, the agent is configured for v1.
diff --git a/lib/snmp/test/snmp_manager_config_test.erl b/lib/snmp/test/snmp_manager_config_test.erl
index 2f5c68d14d..f37e957dae 100644
--- a/lib/snmp/test/snmp_manager_config_test.erl
+++ b/lib/snmp/test/snmp_manager_config_test.erl
@@ -1048,7 +1048,7 @@ start_with_invalid_agents_conf_file1(Conf) when is_list(Conf) ->
     case config_start(Opts) of
 	{error, Reason51} ->
 	    p("start failed (as expected): ~p", [Reason51]),
-	    ?line {failed_check, _, _, _, {bad_address, _}} = Reason51,
+	    ?line {failed_check, _, _, _, {bad_domain, _}} = Reason51,
 	    await_config_not_running();
 	OK_51 ->
 	    exit({error, {unexpected_success, "51", OK_51}})
diff --git a/lib/snmp/test/snmp_manager_test.erl b/lib/snmp/test/snmp_manager_test.erl
index 78352e59cf..fa90872172 100644
--- a/lib/snmp/test/snmp_manager_test.erl
+++ b/lib/snmp/test/snmp_manager_test.erl
@@ -584,17 +584,30 @@ init_per_group(event_tests_mt = GroupName, Config) ->
 init_per_group(ipv6_mt = GroupName, Config) ->
     case ct:require(ipv6_hosts) of
 	ok ->
-	    ipv6_init(
-	      snmp_test_lib:init_group_top_dir(
-		GroupName,
-		[{manager_net_if_module, snmpm_net_if_mt} | Config]));
+	    case gen_udp:open(0, [inet6]) of
+		{ok, S} ->
+		    ok = gen_udp:close(S),
+		    ipv6_init(
+		      snmp_test_lib:init_group_top_dir(
+			GroupName,
+			[{manager_net_if_module, snmpm_net_if_mt}
+			 | Config]));
+		{error, _} ->
+		    {skip, "Host seems to not support IPv6"}
+	    end;
 	_ ->
 	    {skip, "Host does not support IPV6"}
     end;
 init_per_group(ipv6 = GroupName, Config) -> 
     case ct:require(ipv6_hosts) of
 	ok ->
-	    ipv6_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
+	    case gen_udp:open(0, [inet6]) of
+		{ok, S} ->
+		    ok = gen_udp:close(S),
+		    ipv6_init(snmp_test_lib:init_group_top_dir(GroupName, Config));
+		{error, _} ->
+		    {skip, "Host seems to not support IPv6"}
+	    end;
 	_ ->
 	    {skip, "Host does not support IPV6"}
     end;
diff --git a/lib/snmp/test/snmp_manager_user.erl b/lib/snmp/test/snmp_manager_user.erl
index ddbe156130..46c2b316be 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-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2014. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -109,7 +109,18 @@ start_link(Parent, Id) ->
     proc_lib:start_link(?MODULE, main, [true, Parent, self(), Id]).
 
 stop() ->
-    cast(stop).
+    MRef = erlang:monitor(process, ?SERVER),
+    cast(stop),
+    receive {'DOWN', MRef, _, _, Info} ->
+	    case Info of
+		noproc ->
+		    ok;
+		noconnection ->
+		    ok;
+		normal ->
+		    ok
+	    end
+    end.
 
 info() ->
     call(info).
diff --git a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
index 6e9c57bce9..2f96493ac5 100644
--- a/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
+++ b/lib/snmp/test/snmp_to_snmpnet_SUITE.erl
@@ -19,6 +19,7 @@
 %% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% This test suite uses the following external programs:
 %%     snmpget    From packet 'snmp' (in Ubuntu 12.04)
+%%     snmpd      From packet 'snmpd' (in Ubuntu 12.04)
 %%     snmptrapd  From packet 'snmpd' (in Ubuntu 12.04)
 %% They originate from the Net-SNMP applications, see:
 %%     http://net-snmp.sourceforge.net/
@@ -33,6 +34,7 @@
 -include_lib("snmp/include/STANDARD-MIB.hrl").
 
 -define(AGENT_ENGINE_ID, "ErlangSnmpAgent").
+-define(MANAGER_ENGINE_ID, "ErlangSnmpManager").
 -define(AGENT_PORT, 4000).
 -define(MANAGER_PORT, 8989).
 -define(DEFAULT_MAX_MESSAGE_SIZE, 484).
@@ -56,22 +58,32 @@ all() ->
 
 groups() ->
     [{ipv4, [],
-      [{group, get},
-       {group, inform}
+      [{group, snmpget},
+       {group, snmptrapd},
+       {group, snmpd_mt},
+       {group, snmpd}
       ]},
      {ipv6, [],
-      [{group, get},
-       {group, inform}
+      [{group, snmpget},
+       {group, snmptrapd},
+       {group, snmpd_mt},
+       {group, snmpd}
       ]},
      {ipv4_ipv6, [],
-      [{group, get},
-       {group, inform}
+      [{group, snmpget},
+       {group, snmptrapd},
+       {group, snmpd_mt},
+       {group, snmpd}
       ]},
      %%
-     {get, [],
+     {snmpget, [],
       [erlang_agent_netsnmp_get]},
-     {inform, [],
-      [erlang_agent_netsnmp_inform]}
+     {snmptrapd, [],
+      [erlang_agent_netsnmp_inform]},
+     {snmpd_mt, [],
+      [erlang_manager_netsnmp_get]},
+     {snmpd, [],
+      [erlang_manager_netsnmp_get]}
     ].
 
 init_per_suite(Config) ->
@@ -87,12 +99,22 @@ init_per_group(ipv6, Config) ->
 init_per_group(ipv4_ipv6, Config) ->
     init_per_group_ipv6([inet, inet6], Config);
 %%
-init_per_group(get, Config) ->
+init_per_group(snmpget = Exec, Config) ->
     %% From Ubuntu package snmp
-    find_executable(snmpget, Config);
-init_per_group(inform, Config) ->
+    init_per_group_agent(Exec, Config);
+init_per_group(snmptrapd = Exec, Config) ->
     %% From Ubuntu package snmpd
-    find_executable(snmptrapd, Config);
+    init_per_group_agent(Exec, Config);
+init_per_group(snmpd_mt, Config) ->
+    %% From Ubuntu package snmp
+    init_per_group_manager(
+      snmpd,
+      [{manager_net_if_module, snmpm_net_if_mt} | Config]);
+init_per_group(snmpd = Exec, Config) ->
+    %% From Ubuntu package snmp
+    init_per_group_manager(
+      Exec,
+      [{manager_net_if_module, snmpm_net_if} | Config]);
 %%
 init_per_group(_, Config) ->
     Config.
@@ -100,16 +122,20 @@ init_per_group(_, Config) ->
 init_per_group_ipv6(Families, Config) ->
     case ct:require(ipv6_hosts) of
 	ok ->
-	    init_per_group_ip(Families, Config);
+	    case gen_udp:open(0, [inet6]) of
+		{ok, S} ->
+		    ok = gen_udp:close(S),
+		    init_per_group_ip(Families, Config);
+		{error, _} ->
+		    {skip, "Host seems to not support IPv6"}
+	    end;
 	_ ->
-	    {skip, "Host does not support IPV6"}
+	    {skip, "Test config ipv6_hosts is missing"}
     end.
 
 init_per_group_ip(Families, Config) ->
-    Dir = ?config(priv_dir, Config),
     AgentPort = ?config(agent_port, Config),
     ManagerPort = ?config(manager_port, Config),
-    Versions = [v2],
     {ok, Host} = inet:gethostname(),
     Transports =
 	[begin
@@ -121,10 +147,22 @@ init_per_group_ip(Families, Config) ->
 	     {ok, Addr} = inet:getaddr(Host, Family),
 	     {domain(Family), {Addr, ManagerPort}}
 	 end || Family <- Families],
+    [{transports, Transports}, {targets, Targets} | Config].
+
+init_per_group_agent(Exec, Config) ->
+    Versions = [v2],
+    Dir = ?config(priv_dir, Config),
+    Transports = ?config(transports, Config),
+    Targets = ?config(targets, Config),
     agent_config(Dir, Transports, Targets, Versions),
-    [{port, ?AGENT_PORT}, {snmp_versions, Versions},
-     {transports, Transports}, {targets, Targets}
-     | Config].
+    find_executable(Exec, [{snmp_versions, Versions} | Config]).
+
+init_per_group_manager(Exec, Config) ->
+    Versions = [v2],
+    Dir = ?config(priv_dir, Config),
+    Targets = ?config(targets, Config),
+    manager_config(Dir, Targets),
+    find_executable(Exec, [{snmp_versions, Versions} | Config]).
 
 
 
@@ -132,7 +170,7 @@ end_per_group(_GroupName, Config) ->
     Config.
 
 init_per_testcase(_Case, Config) ->
-    Dog = ct:timetrap(10000),
+    Dog = ct:timetrap(20000),
     application:stop(snmp),
     application:unload(snmp),
     [{watchdog, Dog} | Config].
@@ -179,7 +217,12 @@ find_sys_executable(Exec, ExecStr, [Dir | Dirs], Config) ->
 
 start_agent(Config) ->
     ok = application:load(snmp),
-    ok = application:set_env(snmp, agent, app_env(Config)),
+    ok = application:set_env(snmp, agent, agent_app_env(Config)),
+    ok = application:start(snmp).
+
+start_manager(Config) ->
+    ok = application:load(snmp),
+    ok = application:set_env(snmp, manager, manager_app_env(Config)),
     ok = application:start(snmp).
 
 %%--------------------------------------------------------------------
@@ -199,6 +242,39 @@ erlang_agent_netsnmp_get(Config) when is_list(Config) ->
     ok.
 
 %%--------------------------------------------------------------------
+erlang_manager_netsnmp_get() ->
+    [{doc,"Test that the erlang snmp manager can access snmpnet agent"}].
+
+erlang_manager_netsnmp_get(Config) when is_list(Config) ->
+    Community = "happy-testing",
+    SysDescr = "Net-SNMP agent",
+    TargetName = "Target Net-SNMP agent",
+    Transports = ?config(transports, Config),
+    ProgHandle = start_snmpd(Community, SysDescr, Config),
+    start_manager(Config),
+    snmp_manager_user:start_link(self(), test_user),
+    [snmp_manager_user:register_agent(
+       TargetName++domain_suffix(Domain),
+       [{reg_type, target_name},
+	{tdomain, Domain}, {taddress, Addr},
+	{community, Community}, {engine_id, "EngineId"},
+	{version, v2}, {sec_model, v2c}, {sec_level, noAuthNoPriv}])
+     || {Domain, Addr} <- Transports],
+    Results =
+	[snmp_manager_user:sync_get(
+	   TargetName++domain_suffix(Domain),
+	   [?sysDescr_instance])
+	 || {Domain, _} <- Transports],
+    ct:pal("sync_get -> ~p", [Results]),
+    snmp_manager_user:stop(),
+    stop_program(ProgHandle),
+    [{ok,
+      {noError, 0,
+       [{varbind, ?sysDescr_instance, 'OCTET STRING', SysDescr,1}] },
+      _} = R || R <- Results],
+    ok.
+
+%%--------------------------------------------------------------------
 erlang_agent_netsnmp_inform(Config) when is_list(Config) ->
     DataDir = ?config(data_dir, Config),
     Mib = "TestTrapv2",
@@ -267,7 +343,29 @@ start_snmptrapd(Mibs, Config) ->
     {ok, StartCheckMP} = re:compile("NET-SNMP version ", [anchored]),
     start_program(snmptrapd, SnmptrapdArgs, StartCheckMP, Config).
 
+start_snmpd(Community, SysDescr, Config) ->
+    DataDir = ?config(data_dir, Config),
+    Targets = ?config(targets, Config),
+    Transports = ?config(transports, Config),
+    Port = mk_port_number(),
+    CommunityArgs =
+	["--rocommunity"++domain_suffix(Domain)++"="
+	 ++Community++" "++inet_parse:ntoa(Ip)
+	 || {Domain, {Ip, _}} <- Targets],
+    SnmpdArgs =
+	["-f", "-r", %"-Dverbose",
+	 "-c", filename:join(DataDir, "snmpd.conf"),
+	 "-C", "-Lo",
+	 "-m", "",
+	 "--sysDescr="++SysDescr,
+	 "--agentXSocket=tcp:localhost:"++integer_to_list(Port)]
+	++ CommunityArgs
+	++ [net_snmp_addr_str(Transports)],
+    {ok, StartCheckMP} = re:compile("NET-SNMP version ", [anchored]),
+    start_program(snmpd, SnmpdArgs, StartCheckMP, Config).
+
 start_program(Prog, Args, StartCheckMP, Config) ->
+    ct:pal("Starting program: ~w ~p", [Prog, Args]),
     Path = ?config(Prog, Config),
     DataDir = ?config(data_dir, Config),
     StartWrapper = filename:join(DataDir, "start_stop_wrapper"),
@@ -318,12 +416,13 @@ wait_program_stop({Pid, Mon}) ->
     end.
 
 run_program(Parent, StartWrapper, ProgAndArgs) ->
+    [Prog | _] = ProgAndArgs,
     Port =
 	open_port(
 	  {spawn_executable, StartWrapper},
 	  [{args, ProgAndArgs}, binary, stderr_to_stdout, {line, 80},
 	   exit_status]),
-    ct:pal("Prog ~p started: ~p", [Port, ProgAndArgs]),
+    ct:pal("Prog ~p started: ~p", [Port, Prog]),
     run_program_loop(Parent, Port, []).
 
 run_program_loop(Parent, Port, Buf) ->
@@ -352,7 +451,7 @@ run_program_loop(Parent, Port, Buf) ->
     end.
 
 
-app_env(Config) ->
+agent_app_env(Config) ->
     Dir = ?config(priv_dir, Config),
     Vsns = ?config(snmp_versions, Config),
     [{versions,         Vsns}, 
@@ -372,6 +471,20 @@ app_env(Config) ->
      {note_store,       [{verbosity, silence}]},
      {net_if,           [{verbosity, trace}]}].
 
+manager_app_env(Config) ->
+    Dir = ?config(priv_dir, Config),
+    Vsns = ?config(snmp_versions, Config),
+    NetIfModule = ?config(manager_net_if_module, Config),
+    [{versions,         Vsns},
+     {audit_trail_log,  [{type, read_write},
+			 {dir, Dir},
+			 {size, {10240, 10}}]},
+     {net_if,           [{module, NetIfModule}]},
+     {config,           [{dir, Dir},
+			 {db_dir, Dir},
+			 {verbosity, trace}]}
+    ].
+
 oid_str([1 | Ints]) ->
     "iso." ++ oid_str_tl(Ints);
 oid_str(Ints) ->
@@ -384,9 +497,6 @@ oid_str_tl([Int]) ->
 oid_str_tl([Int | Ints]) ->
     integer_to_list(Int) ++ "." ++ oid_str_tl(Ints).
 
-agent_config(Dir, Transports, TargetDomain, TargetAddr, Versions) ->
-    agent_config(Dir, Transports, [{TargetDomain, TargetAddr}], Versions).
-%%
 agent_config(Dir, Transports, Targets, Versions) ->
     EngineID = ?AGENT_ENGINE_ID,
     MMS = ?DEFAULT_MAX_MESSAGE_SIZE,
@@ -403,6 +513,11 @@ agent_config(Dir, Transports, Targets, Versions) ->
     ok = snmp_config:write_agent_snmp_notify_conf(Dir, inform),
     ok = snmp_config:write_agent_snmp_vacm_conf(Dir, Versions, none).
 
+manager_config(Dir, Targets) ->
+    EngineID = ?MANAGER_ENGINE_ID,
+    MMS = ?DEFAULT_MAX_MESSAGE_SIZE,
+    ok = snmp_config:write_manager_snmp_conf(Dir, Targets, MMS, EngineID).
+
 net_snmp_version([v3 | _]) ->
     "-v3";
 net_snmp_version([v2 | _]) ->
@@ -431,3 +546,14 @@ net_snmp_addr_str({transportDomainUdpIpv6, {Addr, Port}}) ->
     "udp6:[" ++
 	inet_parse:ntoa(Addr) ++ "]:" ++
 	integer_to_list(Port).
+
+domain_suffix(transportDomainUdpIpv4) ->
+    "";
+domain_suffix(transportDomainUdpIpv6) ->
+    "6".
+
+mk_port_number() ->
+    {ok, Socket} = gen_udp:open(0, [{reuseaddr, true}]),
+    {ok, PortNum} = inet:port(Socket),
+    ok = gen_udp:close(Socket),
+    PortNum.
diff --git a/lib/snmp/test/snmp_to_snmpnet_SUITE_data/snmpd.conf b/lib/snmp/test/snmp_to_snmpnet_SUITE_data/snmpd.conf
new file mode 100644
index 0000000000..2a5f31680f
--- /dev/null
+++ b/lib/snmp/test/snmp_to_snmpnet_SUITE_data/snmpd.conf
@@ -0,0 +1,12 @@
+sysLocation On the lab network
+sysContact otptest <[email protected]>
+
+createUser myinternaluser SHA dropdead
+
+agentSecName myinternaluser
+
+master agentx
+
+[snmp]
+noPersistentLoad yes
+noPersistentSave yes