From: Kushal Deb <Kushal.Deb@ibm.com>
Date: Wed, 12 Feb 2025 09:33:04 +0000 (+0530)
Subject: Fix 'orch ls' to display SMB ports
X-Git-Tag: testing/wip-pdonnell-testing-20250220.015803-debug~12^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9bc321e743320b6eac094d72239519567a678913;p=ceph-ci.git

Fix 'orch ls' to display SMB ports

Signed-off-by: Kushal Deb <Kushal.Deb@ibm.com>
---

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index ebdbcc4991d..9df2f2b28a1 100644
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -3722,10 +3722,12 @@ class TestSMB:
             'name': 'smb.tango.briskly',
             'image': '',
             'deploy_arguments': [],
-            'params': {},
+            'params': {
+                "tcp_ports": [445, 9922]
+            },
             'meta': {
                 'service_name': 'smb',
-                'ports': [],
+                'ports': [445, 9922],
                 'ip': None,
                 'deployed_by': [],
                 'rank': None,
@@ -3785,10 +3787,12 @@ class TestSMB:
             'name': 'smb.tango.briskly',
             'image': '',
             'deploy_arguments': [],
-            'params': {},
+            'params': {
+                'tcp_ports': [445, 9922]
+            },
             'meta': {
                 'service_name': 'smb',
-                'ports': [],
+                'ports': [445, 9922],
                 'ip': None,
                 'deployed_by': [],
                 'rank': None,
diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index 054f90e55f4..22a8ddff636 100644
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -3161,6 +3161,9 @@ class SMBSpec(ServiceSpec):
         uri = 'rados://' + '/'.join(parts)
         return uri
 
+    def get_port_start(self) -> List[int]:
+        return [445, 9922]  # SMB service runs on port 445, and smbmetrics uses 9922
+
     def strict_cluster_ip_specs(self) -> List[Dict[str, Any]]:
         return [s.to_strict() for s in (self.cluster_public_addrs or [])]