From 4fe015beec16b6d33c534ff609c13856f1ba4b94 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 24 Jun 2021 16:05:14 -0400 Subject: [PATCH] mgr/nfs/cluster: remove unused @cluster_setter Signed-off-by: Sage Weil (cherry picked from commit 51bb1703f1f44fc1182cc15154f7f5d8476ee805) --- src/pybind/mgr/nfs/cluster.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/pybind/mgr/nfs/cluster.py b/src/pybind/mgr/nfs/cluster.py index 63f55dd6c9645..ce6b2d63dd78b 100644 --- a/src/pybind/mgr/nfs/cluster.py +++ b/src/pybind/mgr/nfs/cluster.py @@ -2,7 +2,7 @@ import logging import json import re import socket -from typing import cast, Dict, List, Any, Union, Optional, TypeVar, Callable, TYPE_CHECKING, Tuple +from typing import cast, Dict, List, Any, Union, Optional, TYPE_CHECKING, Tuple from ceph.deployment.service_spec import NFSServiceSpec, PlacementSpec, IngressSpec @@ -16,7 +16,6 @@ if TYPE_CHECKING: from nfs.module import Module from mgr_module import MgrModule -FuncT = TypeVar('FuncT', bound=Callable) log = logging.getLogger(__name__) @@ -34,12 +33,6 @@ def resolve_ip(hostname: str) -> str: raise NFSInvalidOperation(f"Cannot resolve IP for host {hostname}: {e}") -def cluster_setter(func: FuncT) -> FuncT: - def set_pool_ns_clusterid(nfs: 'NFSCluster', *args: Any, **kwargs: Any) -> Any: - return func(nfs, *args, **kwargs) - return cast(FuncT, set_pool_ns_clusterid) - - def create_ganesha_pool(mgr: 'MgrModule', pool: str) -> None: pool_list = [p['pool_name'] for p in mgr.get_osdmap().dump().get('pools', [])] if pool not in pool_list: @@ -97,7 +90,6 @@ class NFSCluster: log.info(f"Deleted {self._get_common_conf_obj_name(cluster_id)} object and all objects in " f"{cluster_id}") - @cluster_setter def create_nfs_cluster(self, cluster_id: str, placement: Optional[str], @@ -124,7 +116,6 @@ class NFSCluster: except Exception as e: return exception_handler(e, f"NFS Cluster {cluster_id} could not be created") - @cluster_setter def delete_nfs_cluster(self, cluster_id: str) -> Tuple[int, str, str]: try: cluster_list = available_clusters(self.mgr) @@ -209,7 +200,6 @@ class NFSCluster: except Exception as e: return exception_handler(e, "Failed to show info for cluster") - @cluster_setter def set_nfs_cluster_config(self, cluster_id: str, nfs_config: str) -> Tuple[int, str, str]: try: if cluster_id in available_clusters(self.mgr): @@ -227,7 +217,6 @@ class NFSCluster: except Exception as e: return exception_handler(e, f"Setting NFS-Ganesha Config failed for {cluster_id}") - @cluster_setter def reset_nfs_cluster_config(self, cluster_id: str) -> Tuple[int, str, str]: try: if cluster_id in available_clusters(self.mgr): -- 2.39.5