Skip to content

Commit

Permalink
IGNITE-24001 Fixed the test_ssl_connection ducktest (#11748)
Browse files Browse the repository at this point in the history
(cherry picked from commit d3972b4)
  • Loading branch information
NSAmelchev committed Dec 17, 2024
1 parent 789ef9f commit 8fb0764
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions modules/ducktests/tests/ignitetest/tests/ssl_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
from ignitetest.services.utils.control_utility import ControlUtility
from ignitetest.services.utils.ignite_configuration import IgniteConfiguration
from ignitetest.services.utils.path import get_shared_root_path
from ignitetest.services.utils.ssl.client_connector_configuration import ClientConnectorConfiguration
from ignitetest.services.utils.ssl.connector_configuration import ConnectorConfiguration
from ignitetest.services.utils.ssl.ssl_params import SslParams, DEFAULT_SERVER_KEYSTORE, DEFAULT_CLIENT_KEYSTORE, \
DEFAULT_ADMIN_KEYSTORE
from ignitetest.utils import ignite_versions, cluster
from ignitetest.utils.ignite_test import IgniteTest
from ignitetest.utils.version import IgniteVersion, DEV_BRANCH, LATEST
from ignitetest.utils.version import IgniteVersion, DEV_BRANCH, LATEST, V_2_16_0


class SslTest(IgniteTest):
Expand All @@ -47,15 +48,20 @@ def test_ssl_connection(self, ignite_version):

server_configuration = IgniteConfiguration(
version=IgniteVersion(ignite_version), ssl_params=server_ssl,
connector_configuration=ConnectorConfiguration(ssl_enabled=True, ssl_params=server_ssl))
client_connector_configuration=ClientConnectorConfiguration(ssl_enabled=True, ssl_params=server_ssl))

if ignite_version <= V_2_16_0:
server_configuration = server_configuration._replace(
connector_configuration=ConnectorConfiguration(ssl_enabled=True, ssl_params=server_ssl))

ignite = IgniteService(self.test_context, server_configuration, num_nodes=2,
startup_timeout_sec=180)

client_configuration = server_configuration._replace(
client_mode=True,
ssl_params=SslParams(shared_root, key_store_jks=DEFAULT_CLIENT_KEYSTORE),
connector_configuration=None)
connector_configuration=None,
client_connector_configuration=None)

app = IgniteApplicationService(
self.test_context,
Expand Down

0 comments on commit 8fb0764

Please sign in to comment.