Skip to content

Fix ssl_multicert.yaml usage in two 10.2.x autests #13448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmcfarlen merged 1 commit into from
Jul 29, 2026
Merged

Fix ssl_multicert.yaml usage in two 10.2.x autests #13448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions tests/gold_tests/h2/http2_max_active_streams.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,7 @@ def run(self) -> None:
'proxy.config.http2.max_concurrent_streams_in': 100,
})
ts.Disk.remap_config.AddLine(f'map / http://127.0.0.1:{server.Variables.http_port}')
ts.Disk.ssl_multicert_yaml.AddLines(
"""
ssl_multicert:
- dest_ip: "*"
ssl_cert_name: server.pem
ssl_key_name: server.key
""".split('\n'))
ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key')

tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
Expand Down
15 changes: 5 additions & 10 deletions tests/gold_tests/tls/tls_secret_update_default.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,10 @@ def _configure_traffic_server(self) -> 'Process':
'proxy.config.url_remap.pristine_host_hdr': 1,
})

ts.Disk.ssl_multicert_yaml.AddLines(
ts.Disk.ssl_multicert_config.AddLines(
[
'ssl_multicert:',
' - dest_ip: "*"',
f' ssl_cert_name: {self.initial_cert}',
f' ssl_key_name: {self.key_file}',
' - dest_ip: "*"',
f' ssl_cert_name: {self.shadowed_cert}',
f' ssl_key_name: {self.shadowed_key_file}',
f'dest_ip=* ssl_cert_name={self.initial_cert} ssl_key_name={self.key_file}',
f'dest_ip=* ssl_cert_name={self.shadowed_cert} ssl_key_name={self.shadowed_key_file}',
])
ts.Disk.remap_config.AddLine(f'map / http://127.0.0.1:{self._server.Variables.Port}')
return ts
Expand All @@ -122,7 +117,7 @@ def _add_config_reload_run(self) -> 'TestRun':
def _add_config_touch_run(self) -> 'TestRun':
'''Mark the multicert configuration for reload.'''
tr = Test.AddTestRun('Mark the multicert configuration for reload')
tr.Processes.Default.Command = f'touch {self._ts.Disk.ssl_multicert_yaml.AbsPath}'
tr.Processes.Default.Command = f'touch {self._ts.Disk.ssl_multicert_config.AbsPath}'
tr.Processes.Default.ReturnCode = 0
Comment thread
cmcfarlen marked this conversation as resolved.
self._keep_processes_running(tr)
return tr
Expand All @@ -134,7 +129,7 @@ def _add_config_reload_wait_run(self) -> 'TestRun':
tr.Processes.Default.Env = self._ts.Env
tr.Processes.Default.ReturnCode = 0
await_reload = tr.Processes.Process('await_reload', 'sleep 30')
await_reload.Ready = When.FileContains(self._ts.Disk.diags_log.Name, 'ssl_multicert.yaml finished loading', 2)
await_reload.Ready = When.FileContains(self._ts.Disk.diags_log.Name, 'ssl_multicert.config finished loading', 2)
tr.Processes.Default.StartBefore(await_reload)
self._keep_processes_running(tr)
return tr
Expand Down