Skip to content

Commit

Permalink
Merge branch 'bmk/snmp/prepare_for_r14b' of ../bjorn_otp into dev
Browse files Browse the repository at this point in the history 
* 'bmk/snmp/prepare_for_r14b' of ../bjorn_otp:
  Prepare for R14B
  • Loading branch information
Erlang/OTP committed Sep 13, 2010
2 parents d93f6b2 + a94780a commit a1a4c79
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 246 deletions.
306 changes: 61 additions & 245 deletions lib/snmp/src/app/snmp.appup.src
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,271 +22,87 @@
%% ----- U p g r a d e -------------------------------------------------------

[
{"4.17",
[
{load_module, snmpa_net_if, soft_purge, soft_purge, []}
]
},
{"4.16.2",
{"4.17.1",
[
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmp_community_mib, soft_purge, soft_purge, []},
{load_module, snmp_framework_mib, soft_purge, soft_purge, []},
{load_module, snmp_generic, soft_purge, soft_purge, []},
{load_module, snmp_notification_mib, soft_purge, soft_purge, []},
{load_module, snmp_standard_mib, soft_purge, soft_purge, []},
{load_module, snmp_target_mib, soft_purge, soft_purge, []},
{load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []},
{load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []},
{load_module, snmpa_conf, soft_purge, soft_purge, []},
{update, snmpa_target_cache, soft, soft_purge, soft_purge, []},
{load_module, snmpa_usm, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, []},
{load_module, snmpa_net_if, soft_purge, soft_purge, []},

{load_module, snmpm_mpd, soft_purge, soft_purge, []}
]
},
{"4.16.1",
[
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_mib, soft, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
{load_module, snmpa_net_if, soft_purge, soft_purge, []},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, []}
]
},
{"4.16",
[
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
{load_module, snmpa_general_db, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_mib, soft, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
{load_module, snmpa_net_if, soft_purge, soft_purge, []},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{update, snmpm_net_if, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, []}
]
},
{"4.15",
[
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
{load_module, snmpa_general_db, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_net_if, {advanced, upgrade_from_pre_4_16},
soft_purge, soft_purge, [snmpa_agent, snmp_log]},
{update, snmpa_mib, soft, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{update, snmpm_net_if, {advanced, upgrade_from_pre_4_16},
soft_purge, soft_purge, [snmpm_config, snmp_log]},
{load_module, snmpm, soft_purge, soft_purge, []},
{load_module, snmpm_conf, soft_purge, soft_purge, []},
{update, snmpm_config, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, []}
{load_module, snmpm_usm, soft_purge, soft_purge, []}
]
},
{"4.14",
},
{"4.17",
[
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
{load_module, snmpa_general_db, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_net_if, {advanced, upgrade_from_pre_4_16},
soft_purge, soft_purge, [snmp_log, snmpa_agent]},
{update, snmpa_mib, soft, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{load_module, snmpm_user, soft_purge, soft_purge, []},
{load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]},
{update, snmpm_net_if, {advanced, upgrade_from_pre_4_16},
soft_purge, soft_purge, [snmpm_config, snmp_log]},
{load_module, snmp_community_mib, soft_purge, soft_purge, []},
{load_module, snmp_framework_mib, soft_purge, soft_purge, []},
{load_module, snmp_generic, soft_purge, soft_purge, []},
{load_module, snmp_notification_mib, soft_purge, soft_purge, []},
{load_module, snmp_standard_mib, soft_purge, soft_purge, []},
{load_module, snmp_target_mib, soft_purge, soft_purge, []},
{load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []},
{load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []},
{load_module, snmpa_conf, soft_purge, soft_purge, []},
{update, snmpa_target_cache, soft, soft_purge, soft_purge, []},
{load_module, snmpa_usm, soft_purge, soft_purge, []},
{load_module, snmpm, soft_purge, soft_purge, []},
{load_module, snmpm_conf, soft_purge, soft_purge, []},
{update, snmpm_config, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge,
[snmpm_user_default]}
]
},
{"4.13.5",
[
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
{load_module, snmpa_general_db, soft_purge, soft_purge, []},
{load_module, snmpa_mib_data, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_net_if, {advanced, upgrade_from_pre_4_16},
soft_purge, soft_purge, [snmpa_agent, snmp_log]},
{update, snmpa_mib, soft, soft_purge, soft_purge, [snmpa_mib_data]},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{load_module, snmpm_user, soft_purge, soft_purge, []},
{load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]},
{update, snmpm_net_if, {advanced, upgrade_from_pre_4_14},
soft_purge, soft_purge, [snmpm_config, snmp_log]},
{update, snmpm_config, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_user_default]},
{add_module, snmpm_net_if_filter},
{add_module, snmpm_network_interface_filter}
{load_module, snmpm_usm, soft_purge, soft_purge, []},
{load_module, snmpa_net_if, soft_purge, soft_purge, []}
]
}
],

%% ------D o w n g r a d e ---------------------------------------------------

[
{"4.17",
{"4.17.1",
[
{load_module, snmpa_net_if, soft_purge, soft_purge, []}
]
},
{"4.16.2",
[
{load_module, snmp_log, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmp_community_mib, soft_purge, soft_purge, []},
{load_module, snmp_framework_mib, soft_purge, soft_purge, []},
{load_module, snmp_generic, soft_purge, soft_purge, []},
{load_module, snmp_notification_mib, soft_purge, soft_purge, []},
{load_module, snmp_standard_mib, soft_purge, soft_purge, []},
{load_module, snmp_target_mib, soft_purge, soft_purge, []},
{load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []},
{load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []},
{load_module, snmpa_conf, soft_purge, soft_purge, []},
{update, snmpa_target_cache, soft, soft_purge, soft_purge, []},
{load_module, snmpa_usm, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, []},
{load_module, snmpa_net_if, soft_purge, soft_purge, []},

{load_module, snmpm_mpd, soft_purge, soft_purge, []}
]
},
{"4.16.1",
[
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_mib, soft, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
{load_module, snmpa_net_if, soft_purge, soft_purge, []},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, []}
]
},
{"4.16",
[
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmpa_agent]},
{load_module, snmpa_general_db, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_mib, soft, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},
{load_module, snmpa_net_if, soft_purge, soft_purge, []},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{update, snmpm_net_if, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, []}
]
},
{"4.15",
[
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
{load_module, snmpa_general_db, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_net_if, {advanced, downgrade_to_pre_4_16},
soft_purge, soft_purge, [snmpa_agent, snmp_log]},
{update, snmpa_mib, soft, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{update, snmpm_net_if, {advanced, downgrade_to_pre_4_16},
soft_purge, soft_purge, [snmpm_config, snmp_log]},
{load_module, snmpm, soft_purge, soft_purge, []},
{load_module, snmpm_conf, soft_purge, soft_purge, []},
{update, snmpm_config, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, []}
{load_module, snmpm_usm, soft_purge, soft_purge, []}
]
},
{"4.14",
{"4.17",
[
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmpa_agent, snmp_log]},
{load_module, snmpa_general_db, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_net_if, {advanced, downgrade_to_pre_4_16},
soft_purge, soft_purge, [snmpa_agent, snmp_log]},
{update, snmpa_mib, soft, soft_purge, soft_purge, []},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{load_module, snmpm_user, soft_purge, soft_purge, []},
{load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]},
{update, snmpm_net_if, {advanced, downgrade_to_pre_4_16},
soft_purge, soft_purge, [snmpm_config, snmp_log]},
{load_module, snmp_community_mib, soft_purge, soft_purge, []},
{load_module, snmp_framework_mib, soft_purge, soft_purge, []},
{load_module, snmp_generic, soft_purge, soft_purge, []},
{load_module, snmp_notification_mib, soft_purge, soft_purge, []},
{load_module, snmp_standard_mib, soft_purge, soft_purge, []},
{load_module, snmp_target_mib, soft_purge, soft_purge, []},
{load_module, snmp_user_based_sm_mib, soft_purge, soft_purge, []},
{load_module, snmp_view_based_acm_mib, soft_purge, soft_purge, []},
{load_module, snmpa_conf, soft_purge, soft_purge, []},
{update, snmpa_target_cache, soft, soft_purge, soft_purge, []},
{load_module, snmpa_usm, soft_purge, soft_purge, []},
{load_module, snmpm, soft_purge, soft_purge, []},
{load_module, snmpm_conf, soft_purge, soft_purge, []},
{update, snmpm_config, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge,
[snmpm_user_default]}
]
},
{"4.13.5",
[
{load_module, snmp_config, soft_purge, soft_purge, []},
{load_module, snmp_log, soft_purge, soft_purge, []},
{load_module, snmp_pdus, soft_purge, soft_purge, []},
{load_module, snmp_usm, soft_purge, soft_purge, []},

{load_module, snmpa, soft_purge, soft_purge, [snmp_log, snmpa_agent]},
{load_module, snmpa_general_db, soft_purge, soft_purge, []},
{load_module, snmpa_mib_data, soft_purge, soft_purge, []},
{load_module, snmpa_mpd, soft_purge, soft_purge, [snmpa_usm]},
{load_module, snmpa_usm, soft_purge, soft_purge, [snmp_usm]},
{update, snmpa_net_if, {advanced, downgrade_to_pre_4_16},
soft_purge, soft_purge, [snmpa_agent, snmp_log]},
{update, snmpa_mib, soft, soft_purge, soft_purge, [snmpa_mib_data]},
{update, snmpa_agent, soft, soft_purge, soft_purge, [snmpa_mib]},

{load_module, snmpm_mpd, soft_purge, soft_purge, []},
{load_module, snmpm_user, soft_purge, soft_purge, []},
{load_module, snmpm_user_default, soft_purge, soft_purge, [snmpm_user]},
{update, snmpm_net_if, {advanced, downgrade_to_pre_4_14},
soft_purge, soft_purge, [snmpm_config, snmp_log]},
{update, snmpm_config, soft, soft_purge, soft_purge, []},
{update, snmpm_server, soft, soft_purge, soft_purge, [snmpm_user_default]},

{remove, {snmpm_net_if_filter, soft_purge, brutal_purge}},
{remove, {snmpm_network_interface_filter, soft_purge, brutal_purge}}
{load_module, snmpm_usm, soft_purge, soft_purge, []},
{load_module, snmpa_net_if, soft_purge, soft_purge, []}
]
}
]
Expand Down
2 changes: 1 addition & 1 deletion lib/snmp/vsn.mk
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SNMP_VSN = 4.17.1
SNMP_VSN = 4.18
PRE_VSN =
APP_VSN = "snmp-$(SNMP_VSN)$(PRE_VSN)"

0 comments on commit a1a4c79

Please sign in to comment.