Merge pull request #12 from dariusstefan/3.5

3.5
OpenSIPS · Oct 29, 2024 · 250de3b · 250de3b
2 parents 7c13811 + 9b2f335
commit 250de3b
Show file tree

Hide file tree

Showing 76 changed files with 82 additions and 78 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -36,10 +36,15 @@ defaults:
     stop_timeout: 5
   mysql:
     ip: {{ mysql_ip }}
-    image: mysql:5.7
+    image: mysql/mysql-server:8.0
     label: mysql
     stop_timeout: 5
-    ready:
-      wait: {{ mysql_ready_timeout }}
+    healthcheck:
+      test: /healthcheck.sh
+      interval: 2500000000
+      timeout: 2500000000
+      retries: 10
+    env:
+      MYSQL_ROOT_HOST: {{ mysql_root_host }}
   mysql-client:
     host: {{ mysql_ip }}
diff --git a/defines.yml b/defines.yml
@@ -12,7 +12,7 @@ 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
 nonce: 035cf70b1c4fcf4731150330410151743443
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,7 +8,7 @@ tasks:
   - name: OpenSIPS
     type: opensips
     require:
-      ready: mysql
+      healthy: mysql
 
   - name: Register UAC 1
     type: uac-sipp