Add container tests including replication

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

Author: phracek

test/run

@@ -8,7 +8,6 @@
 
 set -o nounset
 shopt -s nullglob
-
 THISDIR=$(dirname ${BASH_SOURCE[0]})
 source ${THISDIR}/test-lib.sh
 

test/test_container_password.py

@@ -13,16 +13,15 @@ class TestMySqlPasswordContainer:
     """
 
     def setup_method(self):
-        self.ssl_db = ContainerTestLib(image_name=VARS.IMAGE_NAME)
-        self.ssl_db.set_new_db_type(db_type="mysql")
-        self.db_connector = DatabaseWrapper(image_name=VARS.IMAGE_NAME, db_type="mysql")
+        self.pwd_change = ContainerTestLib(image_name=VARS.IMAGE_NAME)
+        self.pwd_change.set_new_db_type(db_type="mysql")
 
     def teardown_method(self):
-        self.ssl_db.cleanup()
+        self.pwd_change.cleanup()
 
     def test_password_change(self):
         """ """
-        cid_file_name = "test_password_change"
+        cid_file_name1 = "test_password_change"
         pwd_dir = tempfile.mkdtemp(prefix="/tmp/mysql-pwd")
         username = "user"
         password = "foo"
@@ -31,41 +30,50 @@ def test_password_change(self):
                 f"chmod -R a+rwx {pwd_dir}",
             ]
         )
-        assert self.ssl_db.create_container(
-            cid_file_name=cid_file_name,
+        assert self.pwd_change.create_container(
+            cid_file_name=cid_file_name1,
             container_args=[
                 f"-e MYSQL_USER={username}",
                 f"-e MYSQL_PASSWORD={password}",
                 "-e MYSQL_DATABASE=db",
                 f"-v {pwd_dir}:/var/lib/mysql/data:Z",
             ],
         )
-        cip = self.ssl_db.get_cip(cid_file_name=cid_file_name)
-        assert cip
-        assert self.ssl_db.test_db_connection(
-            container_ip=cip, username=username, password=password
+        cip1 = self.pwd_change.get_cip(cid_file_name=cid_file_name1)
+        assert cip1
+        assert self.pwd_change.test_db_connection(
+            container_ip=cip1, username=username, password=password
         )
-        cid = self.ssl_db.get_cid(cid_file_name=cid_file_name)
-        assert cid
-        PodmanCLIWrapper.call_podman_command(cmd=f"stop {cid}")
-        cid_file_name = "test_password_change_2"
+        cid1 = self.pwd_change.get_cid(cid_file_name=cid_file_name1)
+        assert cid1
+        PodmanCLIWrapper.call_podman_command(cmd=f"stop {cid1}")
+        cid_file_name2 = "test_password_change_2"
         new_password = "bar"
-        assert self.ssl_db.create_container(
-            cid_file_name=cid_file_name,
+        assert self.pwd_change.create_container(
+            cid_file_name=cid_file_name2,
             container_args=[
                 f"-e MYSQL_USER={username}",
                 f"-e MYSQL_PASSWORD={new_password}",
                 "-e MYSQL_DATABASE=db",
                 f"-v {pwd_dir}:/var/lib/mysql/data:Z",
             ],
         )
+        cip2 = self.pwd_change.get_cip(cid_file_name=cid_file_name2)
+        assert cip2
+        assert self.pwd_change.test_db_connection(
+            container_ip=cip2, username=username, password=new_password
+        )
         podman_cmd = (
-            f"--rm {VARS.IMAGE_NAME} mysql --host {cip} -u{username} -p{password}"
+            f"--rm {VARS.IMAGE_NAME} mysql --host {cip2} -u{username} -p{password}"
         )
         output = PodmanCLIWrapper.podman_run_command(
             cmd=f"{podman_cmd} -e 'SELECT 1;' db",
+            ignore_error=True,
+        )
+        print(output)
+        assert f"Access denied for user '{username}'@" in output, (
+            f"The old password {password} should not work, but it does"
         )
-        assert output == "1"
 
     def test_password_change_new_user_test(self):
         """ """
@@ -78,7 +86,7 @@ def test_password_change_new_user_test(self):
                 f"chmod -R a+rwx {pwd_dir}",
             ]
         )
-        assert self.ssl_db.create_container(
+        assert self.pwd_change.create_container(
             cid_file_name=cid_file_name,
             container_args=[
                 f"-e MYSQL_USER={username1}",
@@ -87,19 +95,19 @@ def test_password_change_new_user_test(self):
                 f"-v {pwd_dir}:/var/lib/mysql/data:Z",
             ],
         )
-        cip = self.ssl_db.get_cip(cid_file_name=cid_file_name)
-        assert cip
-        assert self.ssl_db.test_db_connection(
-            container_ip=cip, username=username1, password=password1
+        cip1 = self.pwd_change.get_cip(cid_file_name=cid_file_name)
+        assert cip1
+        assert self.pwd_change.test_db_connection(
+            container_ip=cip1, username=username1, password=password1
         )
-        cid = self.ssl_db.get_cid(cid_file_name=cid_file_name)
+        cid = self.pwd_change.get_cid(cid_file_name=cid_file_name)
         assert cid
         PodmanCLIWrapper.call_podman_command(cmd=f"stop {cid}")
         cid_file_name = "test_password_change2"
         username2 = "user2"
         password2 = "bar"
         # Create second container with changed password
-        assert self.ssl_db.create_container(
+        assert self.pwd_change.create_container(
             cid_file_name=cid_file_name,
             container_args=[
                 f"-e MYSQL_USER={username2}",
@@ -108,20 +116,23 @@ def test_password_change_new_user_test(self):
                 f"-v {pwd_dir}:/var/lib/mysql/data:Z",
             ],
         )
-        cip2 = self.ssl_db.get_cip(cid_file_name=cid_file_name)
+        cip2 = self.pwd_change.get_cip(cid_file_name=cid_file_name)
         assert cip2
-        assert self.ssl_db.test_db_connection(
+        assert self.pwd_change.test_db_connection(
             container_ip=cip2, username=username1, password=password1
         )
-        cid2 = self.ssl_db.get_cid(cid_file_name=cid_file_name)
+        cid2 = self.pwd_change.get_cid(cid_file_name=cid_file_name)
         mysql_logs = PodmanCLIWrapper.podman_logs(
-            conatiner_id=cid2,
+            container_id=cid2,
         )
         assert "User user2 does not exist in database" in mysql_logs
         podman_cmd = (
             f"--rm {VARS.IMAGE_NAME} mysql --host {cip2} -u{username1} -p{password2}"
         )
         output = PodmanCLIWrapper.podman_run_command(
             cmd=f"{podman_cmd} -e 'SELECT 1;' db",
+            ignore_error=True,
+        )
+        assert f"Access denied for user '{username1}'@" in output, (
+            f"The new password {password2} should not work, but it does"
         )
-        assert output == "1"

test/test_container_replication.py

@@ -0,0 +1,104 @@
+import tempfile
+import re
+from time import sleep
+
+from container_ci_suite.container_lib import ContainerTestLib, DatabaseWrapper
+from container_ci_suite.container_lib import ContainerTestLibUtils
+from container_ci_suite.engines.podman_wrapper import PodmanCLIWrapper
+
+from conftest import VARS
+
+
+class TestMySqlReplicationContainer:
+    """
+    Test MySQL container configuration.
+    """
+
+    def setup_method(self):
+        self.replication_db = ContainerTestLib(image_name=VARS.IMAGE_NAME)
+        self.replication_db.set_new_db_type(db_type="mysql")
+
+    def teardown_method(self):
+        self.replication_db.cleanup()
+
+    def test_replication(self):
+        """ """
+        cluster_args = "-e MYSQL_SOURCE_USER=source -e MYSQL_SOURCE_PASSWORD=source -e MYSQL_DATABASE=db"
+        source_cid = "source.cid"
+        username = "user"
+        password = "foo"
+        # Run the MySQL source
+        assert self.replication_db.create_container(
+            cid_file_name=source_cid,
+            container_args=[
+                f"-e MYSQL_USER={username}",
+                f"-e MYSQL_PASSWORD={password}",
+                "-e MYSQL_ROOT_PASSWORD=root",
+                "-e MYSQL_INNODB_BUFFER_POOL_SIZE=5M",
+            ],
+            docker_args=cluster_args,
+            command="run-mysqld-source",
+        )
+        source_cip = self.replication_db.get_cip(cid_file_name=source_cid)
+        print(f"Source IP: {source_cip}")
+        source_cid = self.replication_db.get_cid(cid_file_name=source_cid)
+        assert source_cid
+        # Run the MySQL replica
+        replica_cid = "replica.cid"
+        assert self.replication_db.create_container(
+            cid_file_name=replica_cid,
+            container_args=[
+                f"-e MYSQL_SOURCE_SERVICE_NAME={source_cip}",
+                "-e MYSQL_INNODB_BUFFER_POOL_SIZE=5M",
+            ],
+            docker_args=cluster_args,
+            command="run-mysqld-replica",
+        )
+        replica_cip = self.replication_db.get_cip(cid_file_name=replica_cid)
+        assert replica_cip
+        replica_cid = self.replication_db.get_cid(cid_file_name=replica_cid)
+        assert replica_cid
+        print(f"Replica IP: {replica_cip}")
+        # Now wait till the SOURCE will see the REPLICA
+        result = self.replication_db.test_db_connection(
+            container_ip=replica_cip,
+            username=username,
+            password=password,
+        )
+        result = PodmanCLIWrapper.call_podman_command(
+            cmd=f"exec {source_cid} mysql -e 'SHOW REPLICAS;' db",
+            ignore_error=True,
+            debug=True,
+        )
+        print(f"Showing replicas: {result}")
+        assert replica_cip in result, (
+            f"Replica {replica_cip} not found in SOURCE {source_cip}"
+        )
+        # do some real work to test replication in practice
+        result = self.replication_db.test_db_connection(
+            container_ip=source_cip,
+            username=username,
+            password=password,
+            max_attempts=120,
+            sql_cmd="-e 'CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (24);'",
+        )
+        print(f"Creating table: {result}")
+        # let's wait for the table to be created and available for replication
+        sleep(3)
+
+        result = self.replication_db.test_db_connection(
+            container_ip=replica_cip,
+            username=username,
+            password=password,
+            max_attempts=120,
+            sql_cmd="-e 'select * from t1;'",
+        )
+        assert result
+        podman_cmd = f"--rm {VARS.IMAGE_NAME} mysql --host {replica_cip} -u{username} -p{password}"
+        table_output = PodmanCLIWrapper.podman_run_command(
+            cmd=f"{podman_cmd} -e 'select * from t1;' db",
+        )
+        print(f"Selecting from table: {table_output}")
+        assert re.search(r"^a\n^24", table_output.strip(), re.MULTILINE), (
+            f"Replica {replica_cip} did not get value from SOURCE {source_cip}"
+        )

test/test_container_ssl.py

@@ -32,16 +32,17 @@ def test_ssl(self):
                 "ssl-cert=${APP_DATA}/mysql-certs/server-cert-selfsigned.pem",
             ]
             f.write("\n".join(lines))
-        server_key_pem = f"{ssl_dir}/server-key.pem"
-        server_req_pem = f"{ssl_dir}/server-req.pem"
-        server_cert_selfsigned_pem = f"{ssl_dir}/server-cert-selfsigned.pem"
+        srv_key_pem = f"{ssl_dir}/server-key.pem"
+        srv_req_pem = f"{ssl_dir}/server-req.pem"
+        srv_self_pem = f"{ssl_dir}/server-cert-selfsigned.pem"
+        openssl_cmd = "openssl req -newkey rsa:2048 -nodes"
+        openssl_cmd_new = "openssl req -new -x509 -nodes"
+        subj = "/C=GB/ST=Berkshire/L=Newbury/O=My Server Company"
         ContainerTestLibUtils.run_command(
-            cmd=f"openssl req -newkey rsa:2048 -nodes -keyout {server_key_pem} -subj "
-            + f"/C=GB/ST=Berkshire/L=Newbury/O=My Server Company' > {server_req_pem}"
+            cmd=f"{openssl_cmd} -keyout {srv_key_pem} -subj '{subj}' > {srv_req_pem}"
         )
         ContainerTestLibUtils.run_command(
-            cmd=f"openssl req -new -x509 -nodes -key {server_key_pem} -batch > "
-            + f"{server_cert_selfsigned_pem}"
+            cmd=f"{openssl_cmd_new} -key {srv_key_pem} -batch > {srv_self_pem}"
         )
         assert ContainerTestLibUtils.commands_to_run(
             commands_to_run=[
@@ -74,7 +75,7 @@ def test_ssl(self):
 
         mysql_cmd = (
             f"mysql --host {cip} -u{username} -p{password} --ssl-ca={ca_cert_path}"
-            + "-e 'show status like \"Ssl_cipher\" \\G' db"
+            + " -e 'show status like \"Ssl_cipher\" \\G' db"
         )
         ssl_output = PodmanCLIWrapper.podman_run_command(
             cmd=f"--rm -v {ssl_dir}:/opt/app-root/src/:z {VARS.IMAGE_NAME} {mysql_cmd}",