Merge branch 'bmk/snmp/agent/trapsending_from_subagents/OTP-9745' into bmk/snmp/snmp4213_integration

1 files changed, 40 insertions, 4 deletions

diff --git a/lib/snmp/src/app/snmp.appup.src b/lib/snmp/src/app/snmp.appup.src
index b4b5367169..c3075c2732 100644
--- a/lib/snmp/src/app/snmp.appup.src
+++ b/lib/snmp/src/app/snmp.appup.src
@@ -22,19 +22,34 @@
 %% ----- U p g r a d e -------------------------------------------------------
 
  [
+  {"4.21.2", 
+   [
+    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.21.1", 
    [
+    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}, 
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21", 
    [
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, 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, []},
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}, 
+    {update, snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.20.1", 
    [
+    {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, 
@@ -57,6 +72,8 @@
   }, 
   {"4.20", 
    [
+    {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, 
@@ -79,6 +96,7 @@
   }, 
   {"4.19", 
    [
+    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, 
      [snmpm_server, snmpm_config, snmp_config]}, 
@@ -124,19 +142,34 @@
 %% ------D o w n g r a d e ---------------------------------------------------
 
  [
+  {"4.21.2", 
+   [
+    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}
+   ]
+  }, 
   {"4.21.1", 
    [
+    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
+    {load_module, snmpa_trap, soft_purge, soft_purge, []}, 
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}, 
     {update, snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.21", 
    [
-    {update, snmp_note_store, soft, soft_purge, soft_purge, []}, 
-    {load_module, snmp_target_mib, 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, []},
+    {update, snmpa_agent, soft, soft_purge, soft_purge, []}, 
+    {update, snmp_note_store, soft, soft_purge, soft_purge, []}
    ]
   }, 
   {"4.20.1", 
    [
+    {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, 
@@ -159,6 +192,8 @@
   }, 
   {"4.20", 
    [
+    {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, 
@@ -181,6 +216,7 @@
   }, 
   {"4.19", 
    [
+    {load_module, snmpa_set_lib, soft_purge, soft_purge, []}, 
     {load_module, snmpa, soft_purge, soft_purge, []}, 
     {load_module, snmpm, soft_purge, soft_purge, 
      [snmpm_server, snmpm_config, snmp_config]},