Merge pull request #68411 from rhcs-dashboard/fix-76054-main

mgr/dashboard: Option to select archive option while Import Multi-site token

Reviewed-by: Naman Munet <nmunet@redhat.com>

diff --cc src/pybind/mgr/dashboard/controllers/rgw.py
index 6c3b6718dca937dde12e48d80c7128ec8170fa2b,35a8b3eebb239da846a1f0667a57d30c57104cd9..63a419912aa4b761a0c441843bd877528f9d906a
--- 1/src/pybind/mgr/dashboard/controllers/rgw.py
--- 2/src/pybind/mgr/dashboard/controllers/rgw.py
+++ b/src/pybind/mgr/dashboard/controllers/rgw.py
@@@ -130,10 -130,10 +130,10 @@@ class RgwMultisiteStatus(RESTController
      @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, tier_type=None,
 +                                    zonegroup_endpoints=None, zone_name=None,
                                      zone_endpoints=None, username=None, cluster_fsid=None,
                                      replication_zone_name=None, cluster_details=None,
-                                     selectedRealmName=None):
+                                     selectedRealmName=None, secondary_tier_type=None):
          multisite_instance = RgwMultisiteAutomation()
          result = multisite_instance.setup_multisite_replication(realm_name, zonegroup_name,
                                                                  zonegroup_endpoints, zone_name,

diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-wizard/rgw-multisite-wizard.component.html
Simple merge

diff --cc src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-multisite-wizard/rgw-multisite-wizard.component.ts
Simple merge

diff --cc src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-multisite.service.ts
Simple merge

diff --cc src/pybind/mgr/dashboard/openapi.yaml
Simple merge

diff --cc src/pybind/mgr/dashboard/services/rgw_client.py
index bdc49c41a009bed386dc6295b7075c3e7c783fd6,bb80c5f01ffb155521beb468f99a46cf94cefe07..3062460ad7cb7da1e34b49dc9ca42ed219db1cb1
--- 1/src/pybind/mgr/dashboard/services/rgw_client.py
--- 2/src/pybind/mgr/dashboard/services/rgw_client.py
+++ b/src/pybind/mgr/dashboard/services/rgw_client.py
@@@ -1345,11 -1332,12 +1345,12 @@@ class RgwMultisiteAutomation
  
      def setup_multisite_replication(self, realm_name: str, zonegroup_name: str,
                                      zonegroup_endpoints: str, zone_name: str,
 -                                    tier_type: str, zone_endpoints: str,
 -                                    username: str, cluster_fsid: Optional[str] = None,
 +                                    zone_endpoints: str, username: str,
 +                                    cluster_fsid: Optional[str] = None,
                                      replication_zone_name: Optional[str] = None,
                                      cluster_details: Optional[str] = None,
-                                     selectedRealmName: Optional[str] = None):
+                                     selectedRealmName: Optional[str] = None,
+                                     secondary_tier_type: Optional[str] = None):
  
          logger.info("Starting multisite replication setup")