Merge branch 'bmk/snmp/manager/threaded_net_if/OTP-9876' into bmk/snmp/snmp422_integration/r15

Conflicts:
	lib/snmp/doc/src/notes.xml
	lib/snmp/src/app/snmp.appup.src
	lib/snmp/test/snmp_agent_test.erl
	lib/snmp/vsn.mk

3 files changed, 170 insertions, 153 deletions

diff --git a/lib/snmp/src/app/snmp.app.src b/lib/snmp/src/app/snmp.app.src
index a880a14696..b11c1ef934 100644
--- a/lib/snmp/src/app/snmp.app.src
+++ b/lib/snmp/src/app/snmp.app.src
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2012. 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
@@ -91,6 +91,7 @@
              snmpm_mpd,
              snmpm_net_if,
              snmpm_net_if_filter,
+             snmpm_net_if_mt,
              snmpm_network_interface,
              snmpm_network_interface_filter,
              snmpm_server,
diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index c8e5eec6db..c716e420e7 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,16 +22,43 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.21.7", 
+   [
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+    {add_module,  snmpm_net_if_mt}
+   ]
+  }, 
+
   {"4.21.6",
    [
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
     {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
     {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
+
+    {add_module,  snmpm_net_if_mt}
    ]
   },
   {"4.21.5",
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib,   soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib,     soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap,        soft_purge, soft_purge, []}, 
@@ -39,12 +66,20 @@
     {update,      snmpa_local_db,   soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_mib,        soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}
+    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}, 
+
+    {add_module,  snmpm_net_if_mt}
    ]
   },
   {"4.21.4", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -55,12 +90,20 @@
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {update,      snmpa_local_db, soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}
+    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
+
+    {add_module,  snmpm_net_if_mt}
    ]
   }, 
   {"4.21.3", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -71,12 +114,20 @@
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {update,      snmpa_local_db, soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}
+    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
+
+    {add_module,  snmpm_net_if_mt}
    ]
   }, 
   {"4.21.2", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
@@ -89,12 +140,20 @@
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
     {update,      snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}
+    {update,      snmpa_agent,    soft, soft_purge, soft_purge, []}, 
+
+    {add_module,  snmpm_net_if_mt}
    ]
   }, 
   {"4.21.1", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
@@ -108,12 +167,20 @@
     {update,      snmpa_local_db,  soft, soft_purge, soft_purge, []},
     {update,      snmpa_mib,       soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}
+    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}, 
+
+    {add_module,  snmpm_net_if_mt}
    ]
   }, 
   {"4.21", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
 
@@ -127,72 +194,9 @@
     {update,      snmpa_local_db,  soft, soft_purge, soft_purge, []},
     {update,      snmpa_mib,       soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.20.1", 
-   [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
+    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}, 
 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmpm, soft_purge, soft_purge, 
-     [snmpm_server, snmpm_config, snmp_config]}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, 
-     [snmp_conf, snmp_config, snmpm_config]}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, 
-     [snmp_conf, snmp_config]}, 
-    {load_module, snmpa_conf, soft_purge, soft_purge, [snmp_config]}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update,      snmpa_mib,    soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,  soft, soft_purge, soft_purge, [snmpa_mpd]}, 
-    {update,      snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, 
-    {update,      snmpm_server, soft, soft_purge, soft_purge, 
-     [snmpm_net_if, snmpm_mpd, snmpm_config]}, 
-    {update,      snmpm_net_if, soft, soft_purge, soft_purge, 
-     [snmp_conf, snmpm_mpd, snmpm_config]}
-   ]
-  }, 
-  {"4.20", 
-   [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, 
-     [snmpa_mib_lib, snmp_conf]}, 
-    {load_module, snmpm, soft_purge, soft_purge, 
-     [snmpm_server, snmpm_config, snmp_config]}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, 
-     [snmp_conf, snmp_config, snmpm_config]}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, 
-     [snmp_conf, snmp_config]}, 
-    {load_module, snmpa_conf, soft_purge, soft_purge, [snmp_config]}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update,      snmpa_mib,    soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mpd]}, 
-    {update,      snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, 
-    {update,      snmpm_server, soft, soft_purge, soft_purge, 
-     [snmpm_net_if, snmpm_mpd, snmpm_config]}, 
-    {update,      snmpm_net_if, soft, soft_purge, soft_purge, 
-     [snmp_conf, snmpm_mpd, snmpm_config]}
+    {add_module,  snmpm_net_if_mt}
    ]
   }
  ], 
@@ -200,16 +204,43 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.21.7", 
+   [
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
+   ]
+  }, 
+
   {"4.21.6",
    [
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
     {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
     {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
+
+    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
    ]
   },
   {"4.21.5",
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib,   soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib,     soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap,        soft_purge, soft_purge, []}, 
@@ -217,12 +248,20 @@
     {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_local_db,   soft, soft_purge, soft_purge, []}, 
     {update,      snmpa_mib,        soft, soft_purge, soft_purge, []}, 
-    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}
+    {update,      snmpa_agent,      soft, soft_purge, soft_purge, []}, 
+
+    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
    ]
   },
   {"4.21.4", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -233,12 +272,20 @@
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
     {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
+
+    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
    ]
   }, 
   {"4.21.3", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
@@ -249,12 +296,20 @@
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
     {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
+
+    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
    ]
   }, 
   {"4.21.2", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
@@ -267,12 +322,20 @@
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
     {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}
+    {update, snmpa_agent,    soft, soft_purge, soft_purge, []}, 
+
+    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
    ]
   }, 
   {"4.21.1", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmp_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
@@ -286,12 +349,20 @@
     {update, snmpa_local_db,  soft, soft_purge, soft_purge, []},
     {update, snmpa_mib,       soft, soft_purge, soft_purge, []}, 
     {update, snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}
+    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
+
+    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
    ]
   }, 
   {"4.21", 
    [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {load_module, snmp, soft_purge, soft_purge, [snmp_log]}, 
+    {load_module, snmpm, soft_purge, soft_purge, [snmp]}, 
+    {load_module, snmp_log, soft_purge, soft_purge, []}, 
+    {load_module, snmp_verbosity, soft_purge, soft_purge, []}, 
+    {load_module, snmpm_mpd, soft_purge, soft_purge, []}, 
+
+    {load_module, snmpa, soft_purge, soft_purge, [snmp]}, 
     {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
     {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
 
@@ -305,71 +376,9 @@
     {update, snmpa_local_db,  soft, soft_purge, soft_purge, []},
     {update, snmpa_mib,       soft, soft_purge, soft_purge, []}, 
     {update, snmpa_agent,     soft, soft_purge, soft_purge, []}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}
-   ]
-  }, 
-  {"4.20.1", 
-   [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
-
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmpm, soft_purge, soft_purge, 
-     [snmpm_server, snmpm_config, snmp_config]}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, 
-     [snmp_conf, snmp_config, snmpm_config]}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, 
-     [snmp_conf, snmp_config]}, 
-    {load_module, snmpa_conf, soft_purge, soft_purge, [snmp_config]}, 
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, [snmpa_mpd]}, 
-    {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, 
-    {update, snmpm_server, soft, soft_purge, soft_purge, 
-     [snmpm_net_if, snmpm_mpd, snmpm_config]}, 
-    {update, snmpm_net_if, soft, soft_purge, soft_purge, 
-     [snmp_conf, snmpm_mpd, snmpm_config]}
-   ]
-  }, 
-  {"4.20", 
-   [
-    {load_module, snmpa, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_mib_lib, soft_purge, soft_purge, []}, 
-    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
 
-    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
-    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
-    {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, soft_purge, soft_purge, [snmp_conf]}, 
-    {load_module, snmpm, soft_purge, soft_purge, 
-     [snmpm_server, snmpm_config, snmp_config]}, 
-    {load_module, snmp_conf, soft_purge, soft_purge, []}, 
-    {load_module, snmp_config, soft_purge, soft_purge, []}, 
-    {load_module, snmpm_mpd, soft_purge, soft_purge, 
-     [snmp_conf, snmp_config, snmpm_config]}, 
-    {load_module, snmpa_mpd, soft_purge, soft_purge, 
-     [snmp_conf, snmp_config]}, 
-    {load_module, snmpa_conf, soft_purge, soft_purge, [snmp_config]}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-    {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_mib,      soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent,    soft, soft_purge, soft_purge, [snmpa_mpd]}, 
-    {update, snmpm_config, soft, soft_purge, soft_purge, [snmp_conf]}, 
-    {update, snmpm_server, soft, soft_purge, soft_purge, 
-     [snmpm_net_if, snmpm_mpd, snmpm_config]}, 
-    {update, snmpm_net_if, soft, soft_purge, soft_purge, 
-     [snmp_conf, snmpm_mpd, snmpm_config]}
+    {remove, {snmpm_net_if_mt, soft_purge, soft_purge}}
    ]
   }
  ]
diff --git a/lib/snmp/src/app/snmp.erl b/lib/snmp/src/app/snmp.erl
index 3e0f05e604..fc03757e3f 100644
--- a/lib/snmp/src/app/snmp.erl
+++ b/lib/snmp/src/app/snmp.erl
@@ -50,6 +50,7 @@
 	 read_mib/1, 
  
 	 log_to_txt/5, log_to_txt/6, log_to_txt/7,
+	 log_to_io/4,  log_to_io/5,  log_to_io/6,
 	 change_log_size/2,
 
 	 octet_string_to_bits/1, bits_to_octet_string/1, 
@@ -843,6 +844,12 @@ log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start) ->
 log_to_txt(LogDir, Mibs, OutFile, LogName, LogFile, Start, Stop) -> 
     snmp_log:log_to_txt(LogName, LogFile, LogDir, Mibs, OutFile, Start, Stop).
 
+log_to_io(LogDir, Mibs, LogName, LogFile) -> 
+    snmp_log:log_to_io(LogName, LogFile, LogDir, Mibs).
+log_to_io(LogDir, Mibs, LogName, LogFile, Start) -> 
+    snmp_log:log_to_io(LogName, LogFile, LogDir, Mibs, Start).
+log_to_io(LogDir, Mibs, LogName, LogFile, Start, Stop) -> 
+    snmp_log:log_to_io(LogName, LogFile, LogDir, Mibs, Start, Stop).
 
 change_log_size(LogName, NewSize) -> 
     snmp_log:change_size(LogName, NewSize).