From: Nizamudeen A Date: Wed, 17 May 2023 11:54:52 +0000 (+0530) Subject: mgr/dashboard: reorder rgw daemons list items X-Git-Tag: v18.1.2~81^2~15 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c8d8018d7eb23203a39cd67909605d1187eb52bd;p=ceph-ci.git mgr/dashboard: reorder rgw daemons list items Fixes: https://tracker.ceph.com/issues/61212 Signed-off-by: Nizamudeen A (cherry picked from commit 130a52ed508761dcbf5f722ba98ffb4500a6a5b3) --- diff --git a/qa/tasks/mgr/dashboard/test_rgw.py b/qa/tasks/mgr/dashboard/test_rgw.py index 16ad6324ed7..01dbae59feb 100644 --- a/qa/tasks/mgr/dashboard/test_rgw.py +++ b/qa/tasks/mgr/dashboard/test_rgw.py @@ -467,6 +467,7 @@ class RgwDaemonTest(RgwTestCase): self.assertIn('server_hostname', data) self.assertIn('zonegroup_name', data) self.assertIn('zone_name', data) + self.assertIn('port', data) def test_get(self): data = self._get('/api/rgw/daemon') diff --git a/src/pybind/mgr/dashboard/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py index b7680c7860a..36282654c5d 100644 --- a/src/pybind/mgr/dashboard/controllers/rgw.py +++ b/src/pybind/mgr/dashboard/controllers/rgw.py @@ -32,7 +32,8 @@ RGW_DAEMON_SCHEMA = { "version": (str, "Ceph Version"), "server_hostname": (str, ""), "zonegroup_name": (str, "Zone Group"), - "zone_name": (str, "Zone") + "zone_name": (str, "Zone"), + "port": (int, "Port"), } RGW_USER_SCHEMA = { @@ -103,7 +104,8 @@ class RgwDaemon(RESTController): 'realm_name': metadata['realm_name'], 'zonegroup_name': metadata['zonegroup_name'], 'zone_name': metadata['zone_name'], - 'default': instance.daemon.name == metadata['id'] + 'default': instance.daemon.name == metadata['id'], + 'port': int(metadata['frontend_config#0'].split('port=')[1]) } daemons.append(daemon) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-daemon.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-daemon.ts index 445f2a5acc8..c685ba02700 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-daemon.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/models/rgw-daemon.ts @@ -7,4 +7,5 @@ export class RgwDaemon { zonegroup_name: string; zone_name: string; default: boolean; + port: number; } diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts index c8cddfdc8a9..3f333adb583 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts @@ -33,7 +33,8 @@ describe('RgwDaemonListComponent', () => { realm_name: 'realm1', zonegroup_name: 'zg1-realm1', zone_name: 'zone1-zg1-realm1', - default: true + default: true, + port: 80 }; const expectTabsAndHeading = (length: number, heading: string) => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts index c620843fb8a..94a0823c36e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.ts @@ -33,19 +33,19 @@ export class RgwDaemonListComponent extends ListWithDetails implements OnInit { ngOnInit(): void { this.grafanaPermission = this.authStorageService.getPermissions().grafana; this.columns = [ - { - name: $localize`ID`, - prop: 'id', - flexGrow: 2 - }, { name: $localize`Hostname`, prop: 'server_hostname', flexGrow: 2 }, { - name: $localize`Zone`, - prop: 'zone_name', + name: $localize`Port`, + prop: 'port', + flexGrow: 1 + }, + { + name: $localize`Realm`, + prop: 'realm_name', flexGrow: 2 }, { @@ -54,8 +54,8 @@ export class RgwDaemonListComponent extends ListWithDetails implements OnInit { flexGrow: 2 }, { - name: $localize`Realm`, - prop: 'realm_name', + name: $localize`Zone`, + prop: 'zone_name', flexGrow: 2 }, { diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml index 3768a5e7fa9..196ad1d93a4 100644 --- a/src/pybind/mgr/dashboard/openapi.yaml +++ b/src/pybind/mgr/dashboard/openapi.yaml @@ -8244,6 +8244,9 @@ paths: id: description: Daemon ID type: string + port: + description: Port + type: integer server_hostname: description: '' type: string @@ -8263,6 +8266,7 @@ paths: - server_hostname - zonegroup_name - zone_name + - port type: array description: OK '400': diff --git a/src/pybind/mgr/dashboard/tests/test_rgw.py b/src/pybind/mgr/dashboard/tests/test_rgw.py index ce1b5fd928f..5c543cd817a 100644 --- a/src/pybind/mgr/dashboard/tests/test_rgw.py +++ b/src/pybind/mgr/dashboard/tests/test_rgw.py @@ -77,14 +77,16 @@ class RgwDaemonControllerTestCase(ControllerTestCase): 'id': 'daemon1', 'realm_name': 'realm1', 'zonegroup_name': 'zg1', - 'zone_name': 'zone1' + 'zone_name': 'zone1', + 'frontend_config#0': 'beast port=80' }, { 'ceph_version': 'ceph version master (dev)', 'id': 'daemon2', 'realm_name': 'realm2', 'zonegroup_name': 'zg2', - 'zone_name': 'zone2' + 'zone_name': 'zone2', + 'frontend_config#0': 'beast port=80' }] self._get('/test/api/rgw/daemon') self.assertStatus(200) @@ -95,7 +97,8 @@ class RgwDaemonControllerTestCase(ControllerTestCase): 'server_hostname': 'host1', 'realm_name': 'realm1', 'zonegroup_name': 'zg1', - 'zone_name': 'zone1', 'default': True + 'zone_name': 'zone1', 'default': True, + 'port': 80 }, { 'id': 'daemon2', @@ -105,7 +108,8 @@ class RgwDaemonControllerTestCase(ControllerTestCase): 'realm_name': 'realm2', 'zonegroup_name': 'zg2', 'zone_name': 'zone2', - 'default': False + 'default': False, + 'port': 80 }]) def test_list_empty(self):