Fix test manager in agent tests for IPv6

4 files changed, 60 insertions, 49 deletions

diff --git a/lib/snmp/test/snmp_agent_test.erl b/lib/snmp/test/snmp_agent_test.erl
index b181bf957d..9a9258aa91 100644
--- a/lib/snmp/test/snmp_agent_test.erl
+++ b/lib/snmp/test/snmp_agent_test.erl
@@ -653,7 +653,9 @@ init_per_group_ipv6(GroupName, Config, Init) ->
 	ok ->
 	    Init(
 	      snmp_test_lib:init_group_top_dir(
-		GroupName, [{ipfamily, inet6}|Config]));
+		GroupName,
+		[{ipfamily, inet6},
+		 {ip, ?LOCALHOST(inet6)} | lists:keydelete(ip, 1, Config)]));
 	_ ->
 	    {skip, "Host does not support IPV6"}
     end.
@@ -6654,6 +6656,7 @@ otp8395({init, Config}) when is_list(Config) ->
     %% SubAgentHost = ?HPSTNAME(SubAgentNode), 
     ManagerHost  = ?HOSTNAME(ManagerNode),
 
+    IpFamily          = inet,
     Host              = snmp_test_lib:hostname(), 
     Ip                = ?LOCALHOST(),
     {ok, AgentIP0}    = snmp_misc:ip(AgentHost),
@@ -6671,7 +6674,7 @@ otp8395({init, Config}) when is_list(Config) ->
     Vsns           = [v1], 
     AgentConfDir   = ?config(agent_conf_dir, Config),
     ManagerConfDir = ?config(manager_top_dir, Config),
-    config(Vsns, ManagerConfDir, AgentConfDir, ManagerIP, AgentIP),
+    config(Vsns, ManagerConfDir, AgentConfDir, ManagerIP, AgentIP, IpFamily),
 
 
     %% --
@@ -6680,6 +6683,7 @@ otp8395({init, Config}) when is_list(Config) ->
 
     Config2 = start_agent([{host,          Host}, 
 			   {ip,            Ip}, 
+			   {ipfamily,      IpFamily},
 			   {agent_node,    AgentNode}, 
 			   {agent_host,    AgentHost}, 
 			   {agent_ip,      AgentIP}, 
@@ -6759,6 +6763,7 @@ otp8395(Config) when is_list(Config) ->
     put(mib_dir,  ?config(mib_dir, Config)),
     put(vsn, v1), 
     put(master_host, ?config(agent_host, Config)),
+    put(ipfamily, ?config(ipfamily, Config)),
     try_test(simple_standard_test),
 
     ?SLEEP(1000),
diff --git a/lib/snmp/test/snmp_agent_test_lib.erl b/lib/snmp/test/snmp_agent_test_lib.erl
index 6925c16ffb..333fe6eb66 100644
--- a/lib/snmp/test/snmp_agent_test_lib.erl
+++ b/lib/snmp/test/snmp_agent_test_lib.erl
@@ -251,6 +251,7 @@ init_case(Config) when is_list(Config) ->
     put(mip,         tuple_to_list(MIP)),
     put(masterip,    tuple_to_list(MasterIP)),
     put(sip,         tuple_to_list(SIP)),
+    put(ipfamily,    IpFamily),
     
     MibDir = ?config(mib_dir, Config),
     put(mib_dir, MibDir),
@@ -359,6 +360,7 @@ run(Mod, Func, Args, Opts) ->
 			      {packet_server_debug,true},
 			      {debug,true},
 			      {agent, get(master_host)}, 
+			      {ipfamily, get(ipfamily)},
 			      {agent_udp, 4000},
 			      {trap_udp, 5000},
 			      {recbuf,65535},
@@ -1383,12 +1385,9 @@ config(Vsns, MgrDir, AgentConfDir, MIp, AIp, IpFamily) ->
     ?line {Domain, ManagerAddr} =
 	case IpFamily of
 	    inet6 ->
-		%% XXX Run IPv6 tests over IPv4 compatibility address
-		%% since the test manager needs to be rewritten to
-		%% handle IPv6 before we can improve this.
 		Ipv6Domain = transportDomainUdpIpv6,
-		AgentIpv6Addr = {mk_ipv6_ip(AIp), 4000},
-		ManagerIpv6Addr = {mk_ipv6_ip(MIp), ?TRAP_UDP},
+		AgentIpv6Addr = {AIp, 4000},
+		ManagerIpv6Addr = {MIp, ?TRAP_UDP},
 		?line ok =
 		    snmp_config:write_agent_snmp_files(
 		      AgentConfDir, Vsns,
@@ -1416,9 +1415,6 @@ config(Vsns, MgrDir, AgentConfDir, MIp, AIp, IpFamily) ->
     ?line write_notify_conf(AgentConfDir),
     ok.
 
-mk_ipv6_ip([A,B,C,D]) ->
-    [0,0,0,0,0,0,0,0,0,0,255,255,A,B,C,D].
-
 delete_files(Config) ->
     AgentDir = ?config(agent_dir, Config),
     delete_files(AgentDir, [db, conf]).
diff --git a/lib/snmp/test/snmp_test_mgr.erl b/lib/snmp/test/snmp_test_mgr.erl
index d4eb00ff91..cf62edba1c 100644
--- a/lib/snmp/test/snmp_test_mgr.erl
+++ b/lib/snmp/test/snmp_test_mgr.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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
@@ -235,21 +235,23 @@ init({Options, CallerPid}) ->
 	    VsnHdrD = 
 		{Com, User, EngineId, CtxEngineId, mk_seclevel(SecLevel)},
 	    io:format("[~w] ~p -> VsnHdrD: ~p~n", [?MODULE, self(), VsnHdrD]),
+	    IpFamily = get_value(ipfamily, Options, inet),
+	    io:format("[~w] ~p -> IpFamily: ~p~n", [?MODULE, self(), IpFamily]),
 	    AgIp = case snmp_misc:assq(agent, Options) of
 		       {value, Tuple4} when is_tuple(Tuple4) andalso 
 					    (size(Tuple4) =:= 4) ->
 			   Tuple4;
 		       {value, Host} when is_list(Host) ->
-			   {ok, Ip} = snmp_misc:ip(Host),
+			   {ok, Ip} = snmp_misc:ip(Host, IpFamily),
 			   Ip
 		   end,
 	    io:format("[~w] ~p -> AgIp: ~p~n", [?MODULE, self(), AgIp]),
 	    Quiet = lists:member(quiet, Options),
 	    io:format("[~w] ~p -> Quiet: ~p~n", [?MODULE, self(), Quiet]),
-	    PackServ = start_packet_server(Quiet, Options, CallerPid, 
-					   AgIp, Udp, TrapUdp, 
-					   VsnHdrD, Version, Dir, RecBufSz, 
-					   PacksDbg),
+	    PackServ =
+		start_packet_server(
+		  Quiet, Options, CallerPid, AgIp, Udp, TrapUdp,
+		  VsnHdrD, Version, Dir, RecBufSz, PacksDbg, IpFamily),
 	    d("init -> packet server: ~p",[PackServ]),
 	    State = #state{parent        = CallerPid,
 			   quiet         = Quiet,
@@ -263,23 +265,21 @@ init({Options, CallerPid}) ->
     end.
 
 start_packet_server(false, _Options, _CallerPid, AgIp, Udp, TrapUdp, 
-		    VsnHdrD, Version, Dir, RecBufSz, PacksDbg) ->
+		    VsnHdrD, Version, Dir, RecBufSz, PacksDbg, IpFamily) ->
     d("start_packet_server -> entry", []),
-    ?PACK_SERV:start_link_packet({msg, self()}, 
-				 AgIp, Udp, TrapUdp, 
-				 VsnHdrD, Version, Dir, RecBufSz,
-				 PacksDbg);
+    ?PACK_SERV:start_link_packet(
+       {msg, self()}, AgIp, Udp, TrapUdp,
+       VsnHdrD, Version, Dir, RecBufSz, PacksDbg, IpFamily);
 start_packet_server(true, Options, CallerPid, AgIp, Udp, TrapUdp, 
-		    VsnHdrD, Version, Dir, RecBufSz, PacksDbg) ->
+		    VsnHdrD, Version, Dir, RecBufSz, PacksDbg, IpFamily) ->
     Type =  get_value(receive_type, Options, pdu),
     d("start_packet_server -> entry with"
       "~n   CallerPid: ~p"
       "~n   when"
       "~n   Type:      ~p",[CallerPid, Type]),
-    ?PACK_SERV:start_link_packet({Type, CallerPid}, 
-				    AgIp, Udp, TrapUdp,
-				    VsnHdrD, Version, Dir, RecBufSz,
-				    PacksDbg).
+    ?PACK_SERV:start_link_packet(
+       {Type, CallerPid}, AgIp, Udp, TrapUdp,
+       VsnHdrD, Version, Dir, RecBufSz, PacksDbg, IpFamily).
 
 is_options_ok([{mibs,List}|Opts]) when is_list(List) ->
     is_options_ok(Opts);
@@ -287,6 +287,10 @@ is_options_ok([quiet|Opts])  ->
     is_options_ok(Opts);
 is_options_ok([{agent,_}|Opts]) ->
     is_options_ok(Opts);
+is_options_ok([{ipfamily,IpFamily}|Opts])
+  when IpFamily =:= inet;
+       IpFamily =:= inet6 ->
+    is_options_ok(Opts);
 is_options_ok([{agent_udp,Int}|Opts]) when is_integer(Int) ->
     is_options_ok(Opts);
 is_options_ok([{trap_udp,Int}|Opts]) when is_integer(Int) ->
diff --git a/lib/snmp/test/snmp_test_mgr_misc.erl b/lib/snmp/test/snmp_test_mgr_misc.erl
index 5525c5c3ec..5274dcacd9 100644
--- a/lib/snmp/test/snmp_test_mgr_misc.erl
+++ b/lib/snmp/test/snmp_test_mgr_misc.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-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
@@ -23,7 +23,7 @@
 -module(snmp_test_mgr_misc).
 
 %% API
--export([start_link_packet/8, start_link_packet/9, 
+-export([start_link_packet/8, start_link_packet/9, start_link_packet/10,
 	 stop/1, 
 	 send_discovery_pdu/2, 
 	 send_pdu/2, send_msg/4, send_bytes/2,
@@ -31,7 +31,7 @@
 	 get_pdu/1, set_pdu/2, format_hdr/1]).
 
 %% internal exports
--export([init_packet/10]).
+-export([init_packet/11]).
 
 -compile({no_auto_import, [error/2]}).
 
@@ -42,22 +42,26 @@
 %%----------------------------------------------------------------------
 %% The InHandler process will receive messages on the form {snmp_pdu, Pdu}.
 %%----------------------------------------------------------------------
-start_link_packet(InHandler, 
-		  AgentIp, UdpPort, TrapUdp,
-		  VsnHdr, Version, Dir, BufSz) ->
-    start_link_packet(InHandler, 
-		      AgentIp, UdpPort, TrapUdp,
-		      VsnHdr, Version, Dir, BufSz, 
-		      false).
-
-start_link_packet(InHandler, 
-		  AgentIp, UdpPort, TrapUdp, 
-		  VsnHdr, Version, Dir, BufSz,
-		  Dbg) when is_integer(UdpPort) ->
-    Args = [self(), InHandler,
-	    AgentIp, UdpPort, TrapUdp, 
-	    VsnHdr, Version, Dir, BufSz, 
-	    Dbg],
+start_link_packet(
+  InHandler, AgentIp, UdpPort, TrapUdp, VsnHdr, Version, Dir, BufSz) ->
+    start_link_packet(
+      InHandler, AgentIp, UdpPort, TrapUdp, VsnHdr, Version, Dir, BufSz,
+      false).
+
+start_link_packet(
+  InHandler, AgentIp, UdpPort, TrapUdp, VsnHdr, Version, Dir, BufSz,
+  Dbg) ->
+    start_link_packet(
+      InHandler, AgentIp, UdpPort, TrapUdp, VsnHdr, Version, Dir, BufSz,
+      Dbg, inet).
+
+start_link_packet(
+  InHandler, AgentIp, UdpPort, TrapUdp, VsnHdr, Version, Dir, BufSz,
+  Dbg, IpFamily) when is_integer(UdpPort) ->
+    Args =
+	[self(),
+	 InHandler, AgentIp, UdpPort, TrapUdp,  VsnHdr, Version, Dir, BufSz,
+	 Dbg, IpFamily],
     proc_lib:start_link(?MODULE, init_packet, Args).
 
 stop(Pid) ->
@@ -90,12 +94,14 @@ send_bytes(Bytes, PacketPid) ->
 %%--------------------------------------------------
 %% The SNMP encode/decode process
 %%--------------------------------------------------
-init_packet(Parent, SnmpMgr,
-	    AgentIp, UdpPort, TrapUdp,
-	    VsnHdr, Version, Dir, BufSz, DbgOptions) ->
+init_packet(
+  Parent,
+  SnmpMgr, AgentIp, UdpPort, TrapUdp, VsnHdr, Version, Dir, BufSz,
+  DbgOptions, IpFamily) ->
     put(sname, mgr_misc),
     init_debug(DbgOptions),
-    {ok, UdpId} = gen_udp:open(TrapUdp, [{recbuf,BufSz},{reuseaddr, true}]),
+    {ok, UdpId} =
+	gen_udp:open(TrapUdp, [{recbuf,BufSz}, {reuseaddr, true}, IpFamily]),
     put(msg_id, 1),
     proc_lib:init_ack(Parent, self()),
     init_usm(Version, Dir),