Merge pull request ceph#57716 from rhcs-dashboard/add-rgw-multisite-wizard-api

mgr/dashboard: add api for rgw multisite replication wizard

Reviewed-by: Nizamudeen A <[email protected]>

Author: aaSharma14

src/pybind/mgr/dashboard/controllers/multi_cluster.py

@@ -5,6 +5,7 @@
 import re
 import tempfile
 import time
+from typing import Any, Dict
 from urllib.parse import urlparse
 
 import requests
@@ -230,7 +231,7 @@ def load_multi_cluster_config(self):
 
     @Endpoint('PUT')
     @UpdatePermission
-    def set_config(self, config: object):
+    def set_config(self, config: Dict[str, Any]):
         multicluster_config = self.load_multi_cluster_config()
         multicluster_config.update({'current_url': config['url']})
         multicluster_config.update({'current_user': config['user']})

src/pybind/mgr/dashboard/controllers/rgw.py

@@ -15,6 +15,7 @@
 from ..services.auth import AuthManager, JwtManager
 from ..services.ceph_service import CephService
 from ..services.rgw_client import _SYNC_GROUP_ID, NoRgwDaemonsException, RgwClient, RgwMultisite
+from ..services.service import RgwServiceManager
 from ..tools import json_str_to_object, str_to_bool
 from . import APIDoc, APIRouter, BaseController, CreatePermission, \
     CRUDCollectionMethod, CRUDEndpoint, DeletePermission, Endpoint, \
@@ -112,6 +113,27 @@ def migrate(self, daemon_name=None, realm_name=None, zonegroup_name=None, zone_n
                                                          secret_key)
         return result
 
+    @RESTController.Collection(method='POST', path='/multisite-replications')
+    @allow_empty_body
+    # pylint: disable=W0102,W0613
+    def setup_multisite_replication(self, daemon_name=None, realm_name=None, zonegroup_name=None,
+                                    zonegroup_endpoints=None, zone_name=None, zone_endpoints=None,
+                                    username=None, cluster_fsid=None):
+        multisite_instance = RgwMultisite()
+        result = multisite_instance.setup_multisite_replication(realm_name, zonegroup_name,
+                                                                zonegroup_endpoints, zone_name,
+                                                                zone_endpoints, username,
+                                                                cluster_fsid)
+        return result
+
+    @RESTController.Collection(method='PUT', path='/setup-rgw-credentials')
+    @allow_empty_body
+    # pylint: disable=W0102,W0613
+    def restart_rgw_daemons_and_set_credentials(self):
+        rgw_service_manager_instance = RgwServiceManager()
+        result = rgw_service_manager_instance.restart_rgw_daemons_and_set_credentials()
+        return result
+
 
 @APIRouter('rgw/multisite', Scope.RGW)
 @APIDoc("RGW Multisite Management API", "RgwMultisite")
@@ -1075,11 +1097,9 @@ def get_realm_tokens(self):
     @UpdatePermission
     @allow_empty_body
     # pylint: disable=W0613
-    def import_realm_token(self, realm_token, zone_name, port, placement_spec):
+    def import_realm_token(self, realm_token, zone_name, port, placement_spec=None):
         try:
-            multisite_instance = RgwMultisite()
             result = CephService.import_realm_token(realm_token, zone_name, port, placement_spec)
-            multisite_instance.update_period()
             return result
         except NoRgwDaemonsException as e:
             raise DashboardException(e, http_status_code=404, component='rgw')

src/pybind/mgr/dashboard/module.py

@@ -32,7 +32,7 @@
 from .services import nvmeof_cli  # noqa # pylint: disable=unused-import
 from .services.auth import AuthManager, AuthManagerTool, JwtManager
 from .services.exception import dashboard_exception_handler
-from .services.rgw_client import configure_rgw_credentials
+from .services.service import RgwServiceManager
 from .services.sso import SSO_COMMANDS, handle_sso_command
 from .settings import handle_option_command, options_command_list, options_schema_list
 from .tools import NotificationQueue, RequestLoggingTool, TaskManager, \
@@ -417,7 +417,8 @@ def set_mgr_created_self_signed_cert(self):
     @CLIWriteCommand("dashboard set-rgw-credentials")
     def set_rgw_credentials(self):
         try:
-            configure_rgw_credentials()
+            rgw_service_manager = RgwServiceManager()
+            rgw_service_manager.configure_rgw_credentials()
         except Exception as error:
             return -errno.EINVAL, '', str(error)
 

src/pybind/mgr/dashboard/openapi.yaml

@@ -11669,7 +11669,6 @@ paths:
               - realm_token
               - zone_name
               - port
-              - placement_spec
               type: object
       responses:
         '201':

src/pybind/mgr/dashboard/services/orchestrator.py

@@ -130,11 +130,9 @@ def reload(self, service_type, service_ids):
             service_ids = [service_ids]
 
         completion_list = [
-            self.api.service_action('reload', service_type, service_name,
-                                    service_id)
-            for service_name, service_id in service_ids
+            self.api.service_action('restart', f'{service_type}.{service_id}')
+            for service_id in service_ids
         ]
-        self.api.orchestrator_wait(completion_list)
         for c in completion_list:
             raise_if_exception(c)