Skip to content

Commit 5913258

Browse files
authored
Merge pull request ceph#61765 from Kushal-deb/fix_orch_ls_to_display_smb_ports
cephadm: ceph orch ls to Display SMB Service Ports Reviewed-by: Adam King <[email protected]> Reviewed-by: John Mulligan <[email protected]>
2 parents 8b833f5 + 9bc321e commit 5913258

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

src/pybind/mgr/cephadm/tests/test_services.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3738,10 +3738,12 @@ def test_deploy_smb(
37383738
'name': 'smb.tango.briskly',
37393739
'image': '',
37403740
'deploy_arguments': [],
3741-
'params': {},
3741+
'params': {
3742+
"tcp_ports": [445, 9922]
3743+
},
37423744
'meta': {
37433745
'service_name': 'smb',
3744-
'ports': [],
3746+
'ports': [445, 9922],
37453747
'ip': None,
37463748
'deployed_by': [],
37473749
'rank': None,
@@ -3801,10 +3803,12 @@ def test_deploy_smb_join_dns(
38013803
'name': 'smb.tango.briskly',
38023804
'image': '',
38033805
'deploy_arguments': [],
3804-
'params': {},
3806+
'params': {
3807+
'tcp_ports': [445, 9922]
3808+
},
38053809
'meta': {
38063810
'service_name': 'smb',
3807-
'ports': [],
3811+
'ports': [445, 9922],
38083812
'ip': None,
38093813
'deployed_by': [],
38103814
'rank': None,

src/python-common/ceph/deployment/service_spec.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3179,6 +3179,9 @@ def _derive_cluster_uri(self, uri: str, objname: str) -> str:
31793179
uri = 'rados://' + '/'.join(parts)
31803180
return uri
31813181

3182+
def get_port_start(self) -> List[int]:
3183+
return [445, 9922] # SMB service runs on port 445, and smbmetrics uses 9922
3184+
31823185
def strict_cluster_ip_specs(self) -> List[Dict[str, Any]]:
31833186
return [s.to_strict() for s in (self.cluster_public_addrs or [])]
31843187

0 commit comments

Comments
 (0)