Merge branch 'bmk/snmp/snmp4216_integration/r14' into maint-r14

* bmk/snmp/snmp4216_integration/r14:
  [snmp] Releasse notes cleanup
  [snmp/agent] Incorrect mib server cache gclimit update
  [snmp] Updated doc and fixed wrequest create macros
  [snmp] Be more verbose in the worker procs
  [snmp] Add a more informative return value when the trap sending fails
  [snmp] Fixed the mt_trap test-case
  [snmp] Maximum number of varbinds in a Get-BULK response
  [snmp] Correted the expect bug in the snmp test utility
  [snmp] Mostly added some more verbosity stuff

1 files changed, 115 insertions, 24 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index 589b728dc5..254e697039 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,68 +22,109 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.21.5",
+   [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
+    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, []}
+   ]
+  },
   {"4.21.4", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.3", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []}, 
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
+    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.2", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
+    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21.1", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
     {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}
+    {update,      snmpa_local_db, soft, soft_purge, soft_purge, []},
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, []}, 
+    {update,      snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21", 
    [
+    {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, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, 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_target_mib, soft_purge, soft_purge, [snmpa_mib_lib]},
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
-    {update, snmpa_local_db, soft, soft_purge, soft_purge, []},
-    {update, snmpa_agent, soft, soft_purge, soft_purge, []}, 
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}
+    {update,      snmpa_local_db, 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_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]}, 
@@ -96,22 +137,27 @@
     {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_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, 
+    {update,      snmpa_local_db, 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, 
+    {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, 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, []}, 
@@ -123,12 +169,12 @@
     {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_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, 
+    {update,      snmpa_local_db, 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, 
+    {update,      snmpm_net_if, soft, soft_purge, soft_purge, 
      [snmp_conf, snmpm_mpd, snmpm_config]}
    ]
   }
@@ -137,8 +183,25 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.21.5",
+   [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+    {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
+    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
+    {update,      snmpa_agent, soft, soft_purge, soft_purge, []}
+   ]
+  },
   {"4.21.4", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
@@ -147,6 +210,12 @@
   }, 
   {"4.21.3", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+    {update,      snmpa_supervisor, soft, soft_purge, soft_purge, []}, 
+
     {load_module, snmp_generic_mnesia, soft_purge, soft_purge, []}, 
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
@@ -156,6 +225,11 @@
   }, 
   {"4.21.2", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
@@ -168,6 +242,11 @@
   }, 
   {"4.21.1", 
    [
+    {load_module, snmpa, soft_purge, soft_purge, []}, 
+    {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, []}, 
+
     {load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
@@ -181,6 +260,10 @@
   }, 
   {"4.21", 
    [
+    {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, snmp_view_based_acm_mib, soft_purge, soft_purge, []}, 
     {load_module, snmpa_vacm, soft_purge, soft_purge, []}, 
     {load_module, snmpa_mpd, soft_purge, soft_purge, []}, 
@@ -195,6 +278,10 @@
   }, 
   {"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, []}, 
@@ -222,6 +309,10 @@
   }, 
   {"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, []},