Fix broken pre-17.4 appup

Upgrade instructions have been added for each 17.X release without
adjusting the instructions for preceeding releases: the instructions
have only been sufficient to upgrading one release at a time: 17.0 to
17.1, 17.1 to 17.2, etc.

Conficting load order requirements make smooth upgrade from an
arbitrarily old release impossible. In this case, 17.3 looks to be as
far back as we can go, so require restart from 17.[0-2] or older.

Update the app suite to deal with binary regexps in appup, and to match
version numbers harder.

1 files changed, 8 insertions, 52 deletions

diff --git a/lib/diameter/src/diameter.appup.src b/lib/diameter/src/diameter.appup.src
index cff936d893..0ef0fd35a9 100644
--- a/lib/diameter/src/diameter.appup.src
+++ b/lib/diameter/src/diameter.appup.src
@@ -35,32 +35,10 @@
   {"1.4.3",   [{restart_application, diameter}]},  %% R16B02
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},  %% R16B03
-  {"1.6",     [{load_module, diameter_lib},        %% 17.0
-               {load_module, diameter_traffic},
-               {load_module, diameter_watchdog},
-               {load_module, diameter_peer_fsm},
-               {load_module, diameter_service},
-               {load_module, diameter_gen_base_rfc6733},
-               {load_module, diameter_gen_acct_rfc6733},
-               {load_module, diameter_gen_base_rfc3588},
-               {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_relay},
-               {load_module, diameter_codec},
-               {load_module, diameter_sctp}]},
-  {"1.7",     [{load_module, diameter_service},    %% 17.1
-               {load_module, diameter_codec},
-               {load_module, diameter_gen_base_rfc6733},
-               {load_module, diameter_gen_acct_rfc6733},
-               {load_module, diameter_gen_base_rfc3588},
-               {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_relay},
-               {load_module, diameter_traffic},
-               {load_module, diameter_peer_fsm}]},
-  {"1.7.1",   [{load_module, diameter_traffic},    %% 17.3
-               {load_module, diameter_watchdog},
-               {load_module, diameter_peer_fsm},
-               {load_module, diameter_service}]},
-  {"1.8",     [{load_module, diameter_lib},        %% 17.4
+  {"1.6",     [{restart_application, diameter}]},  %% 17.0
+  {"1.7",     [{restart_application, diameter}]},  %% 17.[12]
+  {<<"^1\\.(7\\.1|8)$">>,                          %% 17.[34]
+              [{load_module, diameter_lib},
                {load_module, diameter_peer},
                {load_module, diameter_reg},
                {load_module, diameter_session},
@@ -109,32 +87,10 @@
   {"1.4.3",   [{restart_application, diameter}]},
   {"1.4.4",   [{restart_application, diameter}]},
   {"1.5",     [{restart_application, diameter}]},
-  {"1.6",     [{load_module, diameter_sctp},
-               {load_module, diameter_codec},
-               {load_module, diameter_gen_relay},
-               {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_base_rfc3588},
-               {load_module, diameter_gen_acct_rfc6733},
-               {load_module, diameter_gen_base_rfc6733},
-               {load_module, diameter_service},
-               {load_module, diameter_peer_fsm},
-               {load_module, diameter_watchdog},
-               {load_module, diameter_traffic},
-               {load_module, diameter_lib}]},
-  {"1.7",     [{load_module, diameter_peer_fsm},
-               {load_module, diameter_traffic},
-               {load_module, diameter_gen_relay},
-               {load_module, diameter_gen_base_accounting},
-               {load_module, diameter_gen_base_rfc3588},
-               {load_module, diameter_gen_acct_rfc6733},
-               {load_module, diameter_gen_base_rfc6733},
-               {load_module, diameter_codec},
-               {load_module, diameter_service}]},
-  {"1.7.1",   [{load_module, diameter_service},
-               {load_module, diameter_peer_fsm},
-               {load_module, diameter_watchdog},
-               {load_module, diameter_traffic}]},
-  {"1.8",     [{update, diameter_sup, supervisor},
+  {"1.6",     [{restart_application, diameter}]},
+  {"1.7",     [{restart_application, diameter}]},
+  {<<"^1\\.(7\\.1|8)$">>,
+              [{update, diameter_sup, supervisor},
                {update, diameter_service_sup, supervisor},
                {update, diameter_transport_sup, supervisor},
                {load_module, diameter_gen_relay},