From: pujaoshahu <pshahu@redhat.com>
Date: Thu, 9 Jan 2025 05:14:43 +0000 (+0530)
Subject: mgr/dashboard: Add RGW topic listing in dashboard
X-Git-Tag: testing/wip-jcollin-testing-20250821.034803-tentacle~55^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=52e2d7dbd63673d633a21f0bd463919a77964870;p=ceph-ci.git

mgr/dashboard: Add RGW topic listing in dashboard

Fixes: https://tracker.ceph.com/issues/69143

Signed-off-by: pujaoshahu <pshahu@redhat.com>
(cherry picked from commit 8f65f0e905177b0dd212f54d7799fffd9052d4d2)
---

diff --git a/src/pybind/mgr/dashboard/tests/test_rgw.py b/src/pybind/mgr/dashboard/tests/test_rgw.py
index 298b6a4c213..00b2f5aff88 100644
--- a/src/pybind/mgr/dashboard/tests/test_rgw.py
+++ b/src/pybind/mgr/dashboard/tests/test_rgw.py
@@ -535,28 +535,25 @@ class TestRgwTopicController(ControllerTestCase):
     def test_list_topic_with_details(self, mock_list_topics):
         mock_return_value = [
             {
-                "topic": {
-                    "owner": "dashboard",
-                    "name": "HttpTest",
-                    "dest": {
-                        "push_endpoint": "https://10.0.66.13:443",
-                        "push_endpoint_args": "verify_ssl=true",
-                        "push_endpoint_topic": "HttpTest",
-                        "stored_secret": False,
-                        "persistent": True,
-                        "persistent_queue": ":HttpTest",
-                        "time_to_live": "5",
-                        "max_retries": "2",
-                        "retry_sleep_duration": "2"
-                    },
-                    "arn": "arn:aws:sns:zg1-realm1::HttpTest",
-                    "opaqueData": "test123",
-                    "policy": "{}",
-                    "subscribed_buckets": []
-                }
+                "owner": "dashboard",
+                "name": "HttpTest",
+                "dest": {
+                    "push_endpoint": "https://10.0.66.13:443",
+                    "push_endpoint_args": "verify_ssl=true",
+                    "push_endpoint_topic": "HttpTest",
+                    "stored_secret": False,
+                    "persistent": True,
+                    "persistent_queue": ":HttpTest",
+                    "time_to_live": "5",
+                    "max_retries": "2",
+                    "retry_sleep_duration": "2"
+                },
+                "arn": "arn:aws:sns:zg1-realm1::HttpTest",
+                "opaqueData": "test123",
+                "policy": "{}",
+                "subscribed_buckets": []
             }
         ]
-
         mock_list_topics.return_value = mock_return_value
         controller = RgwTopic()
         result = controller.list(True, None)
@@ -565,8 +562,8 @@ class TestRgwTopicController(ControllerTestCase):
 
     @patch('dashboard.controllers.rgw.RgwTopic.get')
     def test_get_topic(self, mock_get_topic):
-        mock_return_value = {
-            "topic": {
+        mock_return_value = [
+            {
                 "owner": "dashboard",
                 "name": "HttpTest",
                 "dest": {
@@ -585,7 +582,7 @@ class TestRgwTopicController(ControllerTestCase):
                 "policy": "{}",
                 "subscribed_buckets": []
             }
-        }
+        ]
         mock_get_topic.return_value = mock_return_value
 
         controller = RgwTopic()