Removing zonegroup creation code (was not used and it's not tested)

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit 09a77bf2f09b342c1ea3d16e807dd60f5934a104)

diff --git a/src/pybind/mgr/rgw/module.py b/src/pybind/mgr/rgw/module.py
index 1c3ee3cdf6b487d9e05b5a0323b0b411e9edbe0a..2b08151aa88fecf3b86786c662cc0819e5841f9f 100644 (file)
--- a/src/pybind/mgr/rgw/module.py
+++ b/src/pybind/mgr/rgw/module.py
@@ -287,25 +287,6 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
 
         return HandleCommandResult(retval=retval, stdout=out, stderr=err)
 
-    @CLICommand('rgw zonegroup create', perm='rw')
-    def _cmd_rgw_zonegroup_create(self,
-                                  realm_token: Optional[str] = None,
-                                  zonegroup_name: Optional[str] = None,
-                                  endpoints: Optional[str] = None,
-                                  zonegroup_is_master: Optional[bool] = True):
-        """Bootstrap new rgw zonegroup"""
-
-        try:
-            retval, out, err = RGWAM(self.env).zonegroup_create(realm_token,
-                                                                zonegroup_name,
-                                                                endpoints,
-                                                                zonegroup_is_master)
-        except RGWAMException as e:
-            self.log.error('cmd run exception: (%d) %s' % (e.retcode, e.message))
-            return HandleCommandResult(retval=e.retcode, stdout=e.stdout, stderr=e.stderr)
-
-        return HandleCommandResult(retval=retval, stdout=out, stderr=err)
-
     @CLICommand('rgw realm reconcile', perm='rw')
     def _cmd_rgw_realm_reconcile(self,
                                  realm_name: Optional[str] = None,

diff --git a/src/python-common/ceph/rgw/rgwam_core.py b/src/python-common/ceph/rgw/rgwam_core.py
index d6b42bcd4a1278160762d8fff6660d583e53438f..c19deaf0c105470b226a44c2e40c579e4e6f6b05 100644 (file)
--- a/src/python-common/ceph/rgw/rgwam_core.py
+++ b/src/python-common/ceph/rgw/rgwam_core.py
@@ -742,31 +742,6 @@ class RGWAM:
                                 "secret": secret})
         return realms_info
 
-    def zonegroup_create(self, realm_token_b64, zonegroup_name=None,
-                         endpoints=None, zonegroup_is_master=True):
-        if not realm_token_b64:
-            raise RGWAMException('missing realm access config')
-            return False
-
-        realm_token = RealmToken.from_base64_str(realm_token_b64)
-        access_key = realm_token.access_key
-        secret = realm_token.secret
-        try:
-            realm_info = self.realm_op().pull(EntityName(realm_token.realm_name),
-                                              realm_token.endpoint, access_key, secret)
-        except RGWAMException as e:
-            raise RGWAMException('failed to pull realm', e)
-
-        realm_name = realm_info['name']
-        realm_id = realm_info['id']
-        logging.info(f"Pulled realm {realm_name} ({realm_id})")
-
-        realm = EntityID(realm_id)
-        zonegroup = self.create_zonegroup(realm, zonegroup_name, zonegroup_is_master, endpoints)
-        self.update_period(realm, zonegroup)
-
-        return (0, f'Created zonegroup {zonegroup_name} on realm {realm.name}', '')
-
     def zone_create(self, rgw_spec, start_radosgw):
 
         if not rgw_spec.rgw_realm_token: