From: pujaoshahu <pshahu@redhat.com>
Date: Fri, 13 Dec 2024 05:11:13 +0000 (+0530)
Subject: mgr/dashboard: Add RGW topics endpoint creation for create ,delete and list in dashboard
X-Git-Tag: v20.1.1~147^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4f1423d03dddc412de6fea120897c762c49ee745;p=ceph.git

mgr/dashboard: Add RGW topics endpoint creation for create ,delete and list in dashboard

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

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

diff --git a/src/pybind/mgr/dashboard/tests/test_rgw.py b/src/pybind/mgr/dashboard/tests/test_rgw.py
index 00b2f5aff8818..298b6a4c21361 100644
--- a/src/pybind/mgr/dashboard/tests/test_rgw.py
+++ b/src/pybind/mgr/dashboard/tests/test_rgw.py
@@ -535,25 +535,28 @@ class TestRgwTopicController(ControllerTestCase):
     def test_list_topic_with_details(self, mock_list_topics):
         mock_return_value = [
             {
-                "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": []
+                "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": []
+                }
             }
         ]
+
         mock_list_topics.return_value = mock_return_value
         controller = RgwTopic()
         result = controller.list(True, None)
@@ -562,8 +565,8 @@ class TestRgwTopicController(ControllerTestCase):
 
     @patch('dashboard.controllers.rgw.RgwTopic.get')
     def test_get_topic(self, mock_get_topic):
-        mock_return_value = [
-            {
+        mock_return_value = {
+            "topic": {
                 "owner": "dashboard",
                 "name": "HttpTest",
                 "dest": {
@@ -582,7 +585,7 @@ class TestRgwTopicController(ControllerTestCase):
                 "policy": "{}",
                 "subscribed_buckets": []
             }
-        ]
+        }
         mock_get_topic.return_value = mock_return_value
 
         controller = RgwTopic()