From 59f0ec24f67982dabda69fbb8675e71226c79f0e Mon Sep 17 00:00:00 2001
From: Stefan Darius <94108614+dariusstefan@users.noreply.github.com>
Date: Tue, 3 Sep 2024 13:38:11 +0300
Subject: [PATCH 1/3] Use healthy dependency to wait for mysql init

---
 accounting/01.db-transaction/opensips.sql                  | 1 -
 accounting/01.db-transaction/scenario.yml                  | 2 +-
 accounting/02.db-transaction-failed/opensips.sql           | 2 +-
 accounting/02.db-transaction-failed/scenario.yml           | 2 +-
 accounting/03.db-cdr/opensips.sql                          | 2 +-
 accounting/03.db-cdr/scenario.yml                          | 2 +-
 auth/01.password-db-www/opensips.sql                       | 2 +-
 auth/01.password-db-www/scenario.yml                       | 2 +-
 auth/02.password-db-www-domain/opensips.sql                | 2 +-
 auth/02.password-db-www-domain/scenario.yml                | 2 +-
 auth/03.password-db-proxy/opensips.sql                     | 2 +-
 auth/03.password-db-proxy/scenario.yml                     | 2 +-
 auth/04.password-db-proxy-domain/opensips.sql              | 2 +-
 auth/04.password-db-proxy-domain/scenario.yml              | 2 +-
 auth/05.ha1-db-www/opensips.sql                            | 2 +-
 auth/05.ha1-db-www/scenario.yml                            | 2 +-
 auth/06.ha1-db-www-domain/opensips.sql                     | 2 +-
 auth/06.ha1-db-www-domain/scenario.yml                     | 2 +-
 auth/07.ha1-db-proxy/opensips.sql                          | 2 +-
 auth/07.ha1-db-proxy/scenario.yml                          | 2 +-
 auth/08.ha1-db-proxy-domain/opensips.sql                   | 2 +-
 auth/08.ha1-db-proxy-domain/scenario.yml                   | 2 +-
 config.yml                                                 | 7 ++++++-
 defines.yml                                                | 1 +
 dialog/01.dialog/opensips.sql                              | 2 +-
 dialog/01.dialog/scenario.yml                              | 2 +-
 dialog/02.pinging/opensips.sql                             | 2 +-
 dialog/02.pinging/scenario.yml                             | 2 +-
 dialog/03.reinvite-pinging/opensips.sql                    | 2 +-
 dialog/03.reinvite-pinging/scenario.yml                    | 2 +-
 dialog/04.expire/opensips.sql                              | 2 +-
 dialog/04.expire/scenario.yml                              | 2 +-
 dialog/05.reinvite-auth/opensips.sql                       | 2 +-
 dialog/06.auth-update/opensips.sql                         | 2 +-
 permissions/01.check-address/opensips.sql                  | 2 +-
 permissions/01.check-address/scenario.yml                  | 2 +-
 permissions/02.check-address-fail/opensips.sql             | 2 +-
 permissions/02.check-address-fail/scenario.yml             | 2 +-
 presence/01.presence/opensips.sql                          | 2 +-
 presence/01.presence/scenario.yml                          | 2 +-
 registration/02.db/opensips.sql                            | 2 +-
 registration/02.db/scenario.yml                            | 2 +-
 registration/03.expire/opensips.sql                        | 2 +-
 registration/03.expire/scenario.yml                        | 2 +-
 registration/04.expire-min/opensips.sql                    | 2 +-
 registration/04.expire-min/scenario.yml                    | 2 +-
 registration/05.expire-max/opensips.sql                    | 2 +-
 registration/05.expire-max/scenario.yml                    | 2 +-
 registration/06.reregister-expire/opensips.sql             | 2 +-
 registration/06.reregister-expire/scenario.yml             | 2 +-
 registration/07.limit/opensips.sql                         | 2 +-
 registration/07.limit/scenario.yml                         | 2 +-
 registration/08.overwrite/opensips.sql                     | 2 +-
 registration/08.overwrite/scenario.yml                     | 2 +-
 startup/02.gen-residential-cfg/opensips.sql                | 2 +-
 startup/02.gen-residential-cfg/scenario.yml                | 2 +-
 startup/03.gen-trunking-cfg/opensips.sql                   | 2 +-
 startup/03.gen-trunking-cfg/scenario.yml                   | 2 +-
 startup/04.gen-loadbalancer-cfg/opensips.sql               | 2 +-
 startup/04.gen-loadbalancer-cfg/scenario.yml               | 2 +-
 stir-shaken/02.auth-diverted-cached/opensips.sql           | 2 +-
 stir-shaken/02.auth-diverted-cached/scenario.yml           | 2 +-
 stir-shaken/27.acc-stats-200/opensips.sql                  | 2 +-
 stir-shaken/27.acc-stats-200/scenario.yml                  | 2 +-
 stir-shaken/28.acc-stats-error-403-wrong-iat/opensips.sql  | 2 +-
 stir-shaken/28.acc-stats-error-403-wrong-iat/scenario.yml  | 2 +-
 .../29.acc-stats-error-403-no-kill-call/opensips.sql       | 2 +-
 .../29.acc-stats-error-403-no-kill-call/scenario.yml       | 2 +-
 topology-hiding/03.th-dialog/opensips.sql                  | 2 +-
 topology-hiding/03.th-dialog/scenario.yml                  | 2 +-
 topology-hiding/04.th-dialog-username/opensips.sql         | 2 +-
 topology-hiding/04.th-dialog-username/scenario.yml         | 2 +-
 topology-hiding/05.th-dialog-did/opensips.sql              | 2 +-
 topology-hiding/05.th-dialog-did/scenario.yml              | 2 +-
 topology-hiding/06.th-dialog-callid/opensips.sql           | 2 +-
 topology-hiding/06.th-dialog-callid/scenario.yml           | 2 +-
 76 files changed, 80 insertions(+), 75 deletions(-)

diff --git a/accounting/01.db-transaction/opensips.sql b/accounting/01.db-transaction/opensips.sql
index 983cff9..54e67a3 100644
--- a/accounting/01.db-transaction/opensips.sql
+++ b/accounting/01.db-transaction/opensips.sql
@@ -1,4 +1,3 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/accounting/01.db-transaction/scenario.yml b/accounting/01.db-transaction/scenario.yml
index a58170d..79c9a83 100644
--- a/accounting/01.db-transaction/scenario.yml
+++ b/accounting/01.db-transaction/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/accounting/02.db-transaction-failed/opensips.sql b/accounting/02.db-transaction-failed/opensips.sql
index 983cff9..9332b41 100644
--- a/accounting/02.db-transaction-failed/opensips.sql
+++ b/accounting/02.db-transaction-failed/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/accounting/02.db-transaction-failed/scenario.yml b/accounting/02.db-transaction-failed/scenario.yml
index a58170d..79c9a83 100644
--- a/accounting/02.db-transaction-failed/scenario.yml
+++ b/accounting/02.db-transaction-failed/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/accounting/03.db-cdr/opensips.sql b/accounting/03.db-cdr/opensips.sql
index 983cff9..9332b41 100644
--- a/accounting/03.db-cdr/opensips.sql
+++ b/accounting/03.db-cdr/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/accounting/03.db-cdr/scenario.yml b/accounting/03.db-cdr/scenario.yml
index 244a818..4e75828 100644
--- a/accounting/03.db-cdr/scenario.yml
+++ b/accounting/03.db-cdr/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/auth/01.password-db-www/opensips.sql b/auth/01.password-db-www/opensips.sql
index 97619e6..546af0c 100644
--- a/auth/01.password-db-www/opensips.sql
+++ b/auth/01.password-db-www/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/auth/01.password-db-www/scenario.yml b/auth/01.password-db-www/scenario.yml
index 2032657..a98e7d8 100644
--- a/auth/01.password-db-www/scenario.yml
+++ b/auth/01.password-db-www/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/auth/02.password-db-www-domain/opensips.sql b/auth/02.password-db-www-domain/opensips.sql
index 0e508e2..1d54615 100644
--- a/auth/02.password-db-www-domain/opensips.sql
+++ b/auth/02.password-db-www-domain/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/auth/02.password-db-www-domain/scenario.yml b/auth/02.password-db-www-domain/scenario.yml
index 3ce45ca..71521ca 100644
--- a/auth/02.password-db-www-domain/scenario.yml
+++ b/auth/02.password-db-www-domain/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/auth/03.password-db-proxy/opensips.sql b/auth/03.password-db-proxy/opensips.sql
index 97619e6..546af0c 100644
--- a/auth/03.password-db-proxy/opensips.sql
+++ b/auth/03.password-db-proxy/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/auth/03.password-db-proxy/scenario.yml b/auth/03.password-db-proxy/scenario.yml
index f5e6c3c..0485a12 100644
--- a/auth/03.password-db-proxy/scenario.yml
+++ b/auth/03.password-db-proxy/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/auth/04.password-db-proxy-domain/opensips.sql b/auth/04.password-db-proxy-domain/opensips.sql
index 0e508e2..1d54615 100644
--- a/auth/04.password-db-proxy-domain/opensips.sql
+++ b/auth/04.password-db-proxy-domain/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/auth/04.password-db-proxy-domain/scenario.yml b/auth/04.password-db-proxy-domain/scenario.yml
index f5e6c3c..0485a12 100644
--- a/auth/04.password-db-proxy-domain/scenario.yml
+++ b/auth/04.password-db-proxy-domain/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/auth/05.ha1-db-www/opensips.sql b/auth/05.ha1-db-www/opensips.sql
index f47ca54..5ce6827 100644
--- a/auth/05.ha1-db-www/opensips.sql
+++ b/auth/05.ha1-db-www/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/auth/05.ha1-db-www/scenario.yml b/auth/05.ha1-db-www/scenario.yml
index 3ce45ca..71521ca 100644
--- a/auth/05.ha1-db-www/scenario.yml
+++ b/auth/05.ha1-db-www/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/auth/06.ha1-db-www-domain/opensips.sql b/auth/06.ha1-db-www-domain/opensips.sql
index 7629668..d009856 100644
--- a/auth/06.ha1-db-www-domain/opensips.sql
+++ b/auth/06.ha1-db-www-domain/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/auth/06.ha1-db-www-domain/scenario.yml b/auth/06.ha1-db-www-domain/scenario.yml
index 3ce45ca..71521ca 100644
--- a/auth/06.ha1-db-www-domain/scenario.yml
+++ b/auth/06.ha1-db-www-domain/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/auth/07.ha1-db-proxy/opensips.sql b/auth/07.ha1-db-proxy/opensips.sql
index f47ca54..5ce6827 100644
--- a/auth/07.ha1-db-proxy/opensips.sql
+++ b/auth/07.ha1-db-proxy/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/auth/07.ha1-db-proxy/scenario.yml b/auth/07.ha1-db-proxy/scenario.yml
index f5e6c3c..0485a12 100644
--- a/auth/07.ha1-db-proxy/scenario.yml
+++ b/auth/07.ha1-db-proxy/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/auth/08.ha1-db-proxy-domain/opensips.sql b/auth/08.ha1-db-proxy-domain/opensips.sql
index 7629668..d009856 100644
--- a/auth/08.ha1-db-proxy-domain/opensips.sql
+++ b/auth/08.ha1-db-proxy-domain/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/auth/08.ha1-db-proxy-domain/scenario.yml b/auth/08.ha1-db-proxy-domain/scenario.yml
index f5e6c3c..0485a12 100644
--- a/auth/08.ha1-db-proxy-domain/scenario.yml
+++ b/auth/08.ha1-db-proxy-domain/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/config.yml b/config.yml
index b72a833..6837f94 100644
--- a/config.yml
+++ b/config.yml
@@ -36,9 +36,14 @@ defaults:
     stop_timeout: 5
   mysql:
     ip: {{ mysql_ip }}
-    image: mysql:5.7
+    image: mysql/mysql-server:8.0
     label: mysql
     stop_timeout: 5
+    healthcheck:
+      test: /healthcheck.sh
+      start_period: 30000000000
+    env:
+      MYSQL_ROOT_HOST: {{ mysql_root_host }}
     ready:
       wait: {{ mysql_ready_timeout }}
   mysql-client:
diff --git a/defines.yml b/defines.yml
index 2857e48..a461968 100644
--- a/defines.yml
+++ b/defines.yml
@@ -13,6 +13,7 @@ uas_ip_osbr1: 10.52.0.3
 uas_port: 5080
 mysql_ip: 192.168.52.2
 mysql_ready_timeout: 15
+mysql_root_host: 192.168.52.%
 username: testing
 password: T3st|n6
 nonce: 035cf70b1c4fcf4731150330410151743443
diff --git a/dialog/01.dialog/opensips.sql b/dialog/01.dialog/opensips.sql
index 37dee1d..d9263c7 100644
--- a/dialog/01.dialog/opensips.sql
+++ b/dialog/01.dialog/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/dialog/01.dialog/scenario.yml b/dialog/01.dialog/scenario.yml
index 4afb58b..a5b3c65 100644
--- a/dialog/01.dialog/scenario.yml
+++ b/dialog/01.dialog/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/dialog/02.pinging/opensips.sql b/dialog/02.pinging/opensips.sql
index 37dee1d..d9263c7 100644
--- a/dialog/02.pinging/opensips.sql
+++ b/dialog/02.pinging/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/dialog/02.pinging/scenario.yml b/dialog/02.pinging/scenario.yml
index 2a57276..ade9c3e 100644
--- a/dialog/02.pinging/scenario.yml
+++ b/dialog/02.pinging/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/dialog/03.reinvite-pinging/opensips.sql b/dialog/03.reinvite-pinging/opensips.sql
index 37dee1d..d9263c7 100644
--- a/dialog/03.reinvite-pinging/opensips.sql
+++ b/dialog/03.reinvite-pinging/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/dialog/03.reinvite-pinging/scenario.yml b/dialog/03.reinvite-pinging/scenario.yml
index 2a57276..ade9c3e 100644
--- a/dialog/03.reinvite-pinging/scenario.yml
+++ b/dialog/03.reinvite-pinging/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/dialog/04.expire/opensips.sql b/dialog/04.expire/opensips.sql
index 37dee1d..d9263c7 100644
--- a/dialog/04.expire/opensips.sql
+++ b/dialog/04.expire/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/dialog/04.expire/scenario.yml b/dialog/04.expire/scenario.yml
index f67500f..6b21af5 100644
--- a/dialog/04.expire/scenario.yml
+++ b/dialog/04.expire/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/dialog/05.reinvite-auth/opensips.sql b/dialog/05.reinvite-auth/opensips.sql
index 37dee1d..d9263c7 100644
--- a/dialog/05.reinvite-auth/opensips.sql
+++ b/dialog/05.reinvite-auth/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/dialog/06.auth-update/opensips.sql b/dialog/06.auth-update/opensips.sql
index 37dee1d..d9263c7 100644
--- a/dialog/06.auth-update/opensips.sql
+++ b/dialog/06.auth-update/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/permissions/01.check-address/opensips.sql b/permissions/01.check-address/opensips.sql
index 3525e17..8747728 100644
--- a/permissions/01.check-address/opensips.sql
+++ b/permissions/01.check-address/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/permissions/01.check-address/scenario.yml b/permissions/01.check-address/scenario.yml
index 2f76d85..1e37de1 100644
--- a/permissions/01.check-address/scenario.yml
+++ b/permissions/01.check-address/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/permissions/02.check-address-fail/opensips.sql b/permissions/02.check-address-fail/opensips.sql
index 6ec241a..553ea2d 100644
--- a/permissions/02.check-address-fail/opensips.sql
+++ b/permissions/02.check-address-fail/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/permissions/02.check-address-fail/scenario.yml b/permissions/02.check-address-fail/scenario.yml
index 47dbba9..a564964 100644
--- a/permissions/02.check-address-fail/scenario.yml
+++ b/permissions/02.check-address-fail/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAC
     type: uac-sipp
diff --git a/presence/01.presence/opensips.sql b/presence/01.presence/opensips.sql
index 229fcc4..9669625 100644
--- a/presence/01.presence/opensips.sql
+++ b/presence/01.presence/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/presence/01.presence/scenario.yml b/presence/01.presence/scenario.yml
index 6b8b839..92fd81c 100644
--- a/presence/01.presence/scenario.yml
+++ b/presence/01.presence/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Publish
     type: uac-sipp
diff --git a/registration/02.db/opensips.sql b/registration/02.db/opensips.sql
index 07c5d54..15d6967 100644
--- a/registration/02.db/opensips.sql
+++ b/registration/02.db/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/registration/02.db/scenario.yml b/registration/02.db/scenario.yml
index 8db2834..784adf3 100644
--- a/registration/02.db/scenario.yml
+++ b/registration/02.db/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/registration/03.expire/opensips.sql b/registration/03.expire/opensips.sql
index 07c5d54..15d6967 100644
--- a/registration/03.expire/opensips.sql
+++ b/registration/03.expire/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/registration/03.expire/scenario.yml b/registration/03.expire/scenario.yml
index 56048ec..ef3e815 100644
--- a/registration/03.expire/scenario.yml
+++ b/registration/03.expire/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/registration/04.expire-min/opensips.sql b/registration/04.expire-min/opensips.sql
index 07c5d54..15d6967 100644
--- a/registration/04.expire-min/opensips.sql
+++ b/registration/04.expire-min/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/registration/04.expire-min/scenario.yml b/registration/04.expire-min/scenario.yml
index 4fb1c52..6523fbf 100644
--- a/registration/04.expire-min/scenario.yml
+++ b/registration/04.expire-min/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/registration/05.expire-max/opensips.sql b/registration/05.expire-max/opensips.sql
index 07c5d54..15d6967 100644
--- a/registration/05.expire-max/opensips.sql
+++ b/registration/05.expire-max/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/registration/05.expire-max/scenario.yml b/registration/05.expire-max/scenario.yml
index 56048ec..ef3e815 100644
--- a/registration/05.expire-max/scenario.yml
+++ b/registration/05.expire-max/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/registration/06.reregister-expire/opensips.sql b/registration/06.reregister-expire/opensips.sql
index 07c5d54..15d6967 100644
--- a/registration/06.reregister-expire/opensips.sql
+++ b/registration/06.reregister-expire/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/registration/06.reregister-expire/scenario.yml b/registration/06.reregister-expire/scenario.yml
index faad17e..814c766 100644
--- a/registration/06.reregister-expire/scenario.yml
+++ b/registration/06.reregister-expire/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register
     type: uac-sipp
diff --git a/registration/07.limit/opensips.sql b/registration/07.limit/opensips.sql
index 07c5d54..15d6967 100644
--- a/registration/07.limit/opensips.sql
+++ b/registration/07.limit/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/registration/07.limit/scenario.yml b/registration/07.limit/scenario.yml
index 4103497..9445b35 100644
--- a/registration/07.limit/scenario.yml
+++ b/registration/07.limit/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register UAC 1
     type: uac-sipp
diff --git a/registration/08.overwrite/opensips.sql b/registration/08.overwrite/opensips.sql
index 07c5d54..15d6967 100644
--- a/registration/08.overwrite/opensips.sql
+++ b/registration/08.overwrite/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/registration/08.overwrite/scenario.yml b/registration/08.overwrite/scenario.yml
index a5fda91..5281e76 100644
--- a/registration/08.overwrite/scenario.yml
+++ b/registration/08.overwrite/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register UAC 1
     type: uac-sipp
diff --git a/startup/02.gen-residential-cfg/opensips.sql b/startup/02.gen-residential-cfg/opensips.sql
index 4231382..a8599be 100644
--- a/startup/02.gen-residential-cfg/opensips.sql
+++ b/startup/02.gen-residential-cfg/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/startup/02.gen-residential-cfg/scenario.yml b/startup/02.gen-residential-cfg/scenario.yml
index 6fc12b6..7b69412 100644
--- a/startup/02.gen-residential-cfg/scenario.yml
+++ b/startup/02.gen-residential-cfg/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: MI check PS
     type: opensips-cli
diff --git a/startup/03.gen-trunking-cfg/opensips.sql b/startup/03.gen-trunking-cfg/opensips.sql
index 44c0607..eb71bb6 100644
--- a/startup/03.gen-trunking-cfg/opensips.sql
+++ b/startup/03.gen-trunking-cfg/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/startup/03.gen-trunking-cfg/scenario.yml b/startup/03.gen-trunking-cfg/scenario.yml
index b12fc85..dc0e8bf 100644
--- a/startup/03.gen-trunking-cfg/scenario.yml
+++ b/startup/03.gen-trunking-cfg/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: MI check PS
     type: opensips-cli
diff --git a/startup/04.gen-loadbalancer-cfg/opensips.sql b/startup/04.gen-loadbalancer-cfg/opensips.sql
index 6259a36..9f6523a 100644
--- a/startup/04.gen-loadbalancer-cfg/opensips.sql
+++ b/startup/04.gen-loadbalancer-cfg/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/startup/04.gen-loadbalancer-cfg/scenario.yml b/startup/04.gen-loadbalancer-cfg/scenario.yml
index 6fc12b6..7b69412 100644
--- a/startup/04.gen-loadbalancer-cfg/scenario.yml
+++ b/startup/04.gen-loadbalancer-cfg/scenario.yml
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: MI check PS
     type: opensips-cli
diff --git a/stir-shaken/02.auth-diverted-cached/opensips.sql b/stir-shaken/02.auth-diverted-cached/opensips.sql
index 398e197..795918f 100644
--- a/stir-shaken/02.auth-diverted-cached/opensips.sql
+++ b/stir-shaken/02.auth-diverted-cached/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/stir-shaken/02.auth-diverted-cached/scenario.yml b/stir-shaken/02.auth-diverted-cached/scenario.yml
index 4d3506c..e546aab 100644
--- a/stir-shaken/02.auth-diverted-cached/scenario.yml
+++ b/stir-shaken/02.auth-diverted-cached/scenario.yml
@@ -11,7 +11,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/stir-shaken/27.acc-stats-200/opensips.sql b/stir-shaken/27.acc-stats-200/opensips.sql
index 9b7d3be..c15bf39 100644
--- a/stir-shaken/27.acc-stats-200/opensips.sql
+++ b/stir-shaken/27.acc-stats-200/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/stir-shaken/27.acc-stats-200/scenario.yml b/stir-shaken/27.acc-stats-200/scenario.yml
index a84d95f..c0ebb92 100644
--- a/stir-shaken/27.acc-stats-200/scenario.yml
+++ b/stir-shaken/27.acc-stats-200/scenario.yml
@@ -11,7 +11,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/stir-shaken/28.acc-stats-error-403-wrong-iat/opensips.sql b/stir-shaken/28.acc-stats-error-403-wrong-iat/opensips.sql
index 9b7d3be..c15bf39 100644
--- a/stir-shaken/28.acc-stats-error-403-wrong-iat/opensips.sql
+++ b/stir-shaken/28.acc-stats-error-403-wrong-iat/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/stir-shaken/28.acc-stats-error-403-wrong-iat/scenario.yml b/stir-shaken/28.acc-stats-error-403-wrong-iat/scenario.yml
index cd0214a..1df1fc6 100644
--- a/stir-shaken/28.acc-stats-error-403-wrong-iat/scenario.yml
+++ b/stir-shaken/28.acc-stats-error-403-wrong-iat/scenario.yml
@@ -11,7 +11,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAC
     type: uac-sipp-stir-shaken
diff --git a/stir-shaken/29.acc-stats-error-403-no-kill-call/opensips.sql b/stir-shaken/29.acc-stats-error-403-no-kill-call/opensips.sql
index 9b7d3be..c15bf39 100644
--- a/stir-shaken/29.acc-stats-error-403-no-kill-call/opensips.sql
+++ b/stir-shaken/29.acc-stats-error-403-no-kill-call/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/stir-shaken/29.acc-stats-error-403-no-kill-call/scenario.yml b/stir-shaken/29.acc-stats-error-403-no-kill-call/scenario.yml
index a84d95f..c0ebb92 100644
--- a/stir-shaken/29.acc-stats-error-403-no-kill-call/scenario.yml
+++ b/stir-shaken/29.acc-stats-error-403-no-kill-call/scenario.yml
@@ -11,7 +11,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/topology-hiding/03.th-dialog/opensips.sql b/topology-hiding/03.th-dialog/opensips.sql
index 37dee1d..d9263c7 100644
--- a/topology-hiding/03.th-dialog/opensips.sql
+++ b/topology-hiding/03.th-dialog/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/topology-hiding/03.th-dialog/scenario.yml b/topology-hiding/03.th-dialog/scenario.yml
index 4afb58b..a5b3c65 100644
--- a/topology-hiding/03.th-dialog/scenario.yml
+++ b/topology-hiding/03.th-dialog/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/topology-hiding/04.th-dialog-username/opensips.sql b/topology-hiding/04.th-dialog-username/opensips.sql
index 37dee1d..d9263c7 100644
--- a/topology-hiding/04.th-dialog-username/opensips.sql
+++ b/topology-hiding/04.th-dialog-username/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/topology-hiding/04.th-dialog-username/scenario.yml b/topology-hiding/04.th-dialog-username/scenario.yml
index 4afb58b..a5b3c65 100644
--- a/topology-hiding/04.th-dialog-username/scenario.yml
+++ b/topology-hiding/04.th-dialog-username/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/topology-hiding/05.th-dialog-did/opensips.sql b/topology-hiding/05.th-dialog-did/opensips.sql
index 37dee1d..d9263c7 100644
--- a/topology-hiding/05.th-dialog-did/opensips.sql
+++ b/topology-hiding/05.th-dialog-did/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/topology-hiding/05.th-dialog-did/scenario.yml b/topology-hiding/05.th-dialog-did/scenario.yml
index 4afb58b..a5b3c65 100644
--- a/topology-hiding/05.th-dialog-did/scenario.yml
+++ b/topology-hiding/05.th-dialog-did/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp
diff --git a/topology-hiding/06.th-dialog-callid/opensips.sql b/topology-hiding/06.th-dialog-callid/opensips.sql
index 37dee1d..d9263c7 100644
--- a/topology-hiding/06.th-dialog-callid/opensips.sql
+++ b/topology-hiding/06.th-dialog-callid/opensips.sql
@@ -1,4 +1,4 @@
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
+
 CREATE DATABASE opensips;
 
 USE opensips;
diff --git a/topology-hiding/06.th-dialog-callid/scenario.yml b/topology-hiding/06.th-dialog-callid/scenario.yml
index 4afb58b..a5b3c65 100644
--- a/topology-hiding/06.th-dialog-callid/scenario.yml
+++ b/topology-hiding/06.th-dialog-callid/scenario.yml
@@ -9,7 +9,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: SIPP UAS
     type: uas-sipp

From 070dd26b5a47c25719d6f470c0b46ab94be803f2 Mon Sep 17 00:00:00 2001
From: Razvan Crainea <razvan@opensips.org>
Date: Tue, 3 Sep 2024 15:43:09 +0300
Subject: [PATCH 2/3] drop mysql_ready_timeout and ready dependency

---
 config.yml  | 3 +--
 defines.yml | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config.yml b/config.yml
index 6837f94..bca0f15 100644
--- a/config.yml
+++ b/config.yml
@@ -42,9 +42,8 @@ defaults:
     healthcheck:
       test: /healthcheck.sh
       start_period: 30000000000
+      start_interval: 1000000000
     env:
       MYSQL_ROOT_HOST: {{ mysql_root_host }}
-    ready:
-      wait: {{ mysql_ready_timeout }}
   mysql-client:
     host: {{ mysql_ip }}
diff --git a/defines.yml b/defines.yml
index a461968..15b5cf1 100644
--- a/defines.yml
+++ b/defines.yml
@@ -12,7 +12,6 @@ uas_ip: 192.168.52.3
 uas_ip_osbr1: 10.52.0.3
 uas_port: 5080
 mysql_ip: 192.168.52.2
-mysql_ready_timeout: 15
 mysql_root_host: 192.168.52.%
 username: testing
 password: T3st|n6

From 9b2f335ec39e00f20733c0ea141318f33415b00f Mon Sep 17 00:00:00 2001
From: Stefan Darius <94108614+dariusstefan@users.noreply.github.com>
Date: Thu, 19 Sep 2024 17:52:33 +0300
Subject: [PATCH 3/3] fix healthcheck for MySQL Server

Drop start_period and start_interval, use interval and more retries
instead.
---
 config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config.yml b/config.yml
index bca0f15..cb538f4 100644
--- a/config.yml
+++ b/config.yml
@@ -41,8 +41,9 @@ defaults:
     stop_timeout: 5
     healthcheck:
       test: /healthcheck.sh
-      start_period: 30000000000
-      start_interval: 1000000000
+      interval: 2500000000
+      timeout: 2500000000
+      retries: 10
     env:
       MYSQL_ROOT_HOST: {{ mysql_root_host }}
   mysql-client: