From: Shweta Bhosale <Shweta.Bhosale1@ibm.com>
Date: Wed, 22 Apr 2026 05:38:20 +0000 (+0530)
Subject: mgr/cephadm: fixed tests for haproxy peer communication port
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F68152%2Fhead;p=ceph.git

mgr/cephadm: fixed tests for haproxy peer communication port

Fixes: https://tracker.ceph.com/issues/75704
Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>
---

diff --git a/src/pybind/mgr/cephadm/tests/services/test_ingress.py b/src/pybind/mgr/cephadm/tests/services/test_ingress.py
index 08df613a1023..03ce00578f9e 100644
--- a/src/pybind/mgr/cephadm/tests/services/test_ingress.py
+++ b/src/pybind/mgr/cephadm/tests/services/test_ingress.py
@@ -273,7 +273,7 @@ class TestIngressService:
             '    stick-table type ip size 200k expire 30m peers haproxy_peers\n'
             '    stick on src\n'
             '    hash-type   consistent\n'
-            '    server nfs.foo.0 192.168.122.111:12049 check\n'
+            '    server nfs.foo.0 192.168.122.111:12049 check inter 30s\n'
         )
         haproxy_expected_conf = {
             'files': {'haproxy.cfg': haproxy_txt}
diff --git a/src/pybind/mgr/cephadm/tests/test_scheduling.py b/src/pybind/mgr/cephadm/tests/test_scheduling.py
index 7712dbb0a590..5c8301b05fc9 100644
--- a/src/pybind/mgr/cephadm/tests/test_scheduling.py
+++ b/src/pybind/mgr/cephadm/tests/test_scheduling.py
@@ -1881,7 +1881,7 @@ def test_blocking_daemon_host(
                 DaemonDescription('nfs', 'nfs3', 'host3'),
             ],
             None,
-            ['haproxy:host1(*:443,8888)', 'haproxy:host3(*:443,8888)', 'keepalived:host1', 'keepalived:host3'],
+            ['haproxy:host1(*:443,8888,1024)', 'haproxy:host3(*:443,8888,1024)', 'keepalived:host1', 'keepalived:host3'],
             [],
             ['haproxy.ingress2', 'haproxy.ingress4', 'keepalived.ingress2', 'keepalived.ingress4']  # to_remove
         ),
@@ -1902,7 +1902,7 @@ def test_blocking_daemon_host(
                 DaemonDescription('nfs', 'nfs2', 'host2'),
             ],
             None,
-            ['haproxy:host1(*:443,8888)', 'keepalived:host1'],
+            ['haproxy:host1(*:443,8888,1024)', 'keepalived:host1'],
             [],
             ['haproxy.ingress2', 'haproxy.ingress3', 'keepalived.ingress2', 'keepalived.ingress3']  # to_remove
         ),
@@ -1939,7 +1939,7 @@ def test_blocking_daemon_host(
                 DaemonDescription('nfs', 'nfs6', 'host6'),
             ],
             None,
-            ['haproxy:host1(*:443,8888)', 'haproxy:host2(*:443,8888)', 'keepalived:host1', 'keepalived:host2'],
+            ['haproxy:host1(*:443,8888,1024)', 'haproxy:host2(*:443,8888,1024)', 'keepalived:host1', 'keepalived:host2'],
             [],
             ['haproxy.ingress3', 'haproxy.ingress4', 'keepalived.ingress3', 'keepalived.ingress4']  # to_remove
         ),