From 3ebe612df61be97d428f3288905aca6486eab412 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Thu, 7 Sep 2023 13:45:00 +0530 Subject: [PATCH] mgr/dashboard: fix rgw port manipulation error in dashboard Fixes: https://tracker.ceph.com/issues/62735 Signed-off-by: Nizamudeen A (cherry picked from commit 9529163d29ab2d7fdb1e20b4066196dbb838917f) --- src/pybind/mgr/dashboard/controllers/rgw.py | 3 ++- src/pybind/mgr/dashboard/tests/test_rgw.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py index 766c8eadc51e5..67c7cbca26d32 100644 --- a/src/pybind/mgr/dashboard/controllers/rgw.py +++ b/src/pybind/mgr/dashboard/controllers/rgw.py @@ -2,6 +2,7 @@ import json import logging +import re from typing import Any, Dict, List, NamedTuple, Optional, Union import cherrypy @@ -143,7 +144,7 @@ class RgwDaemon(RESTController): 'zonegroup_name': metadata['zonegroup_name'], 'zone_name': metadata['zone_name'], 'default': instance.daemon.name == metadata['id'], - 'port': int(metadata['frontend_config#0'].split('port=')[1]) + 'port': int(re.findall(r'port=(\d+)', metadata['frontend_config#0'])[0]) } daemons.append(daemon) diff --git a/src/pybind/mgr/dashboard/tests/test_rgw.py b/src/pybind/mgr/dashboard/tests/test_rgw.py index 33b5ecb6cf909..bfb1dbc70355a 100644 --- a/src/pybind/mgr/dashboard/tests/test_rgw.py +++ b/src/pybind/mgr/dashboard/tests/test_rgw.py @@ -96,7 +96,7 @@ class RgwDaemonControllerTestCase(ControllerTestCase): 'realm_name': 'realm2', 'zonegroup_name': 'zg2', 'zone_name': 'zone2', - 'frontend_config#0': 'beast port=80' + 'frontend_config#0': 'beast port=80 ssl_port=443 ssl_certificate=config:/config' }] self._get('/test/api/rgw/daemon') self.assertStatus(200) -- 2.39.5