From: dparmar18 <dparmar@redhat.com>
Date: Thu, 1 Dec 2022 09:57:32 +0000 (+0530)
Subject: mgr/nfs: handle bad cluster name during info command
X-Git-Tag: v17.2.6~55^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f5fa826feb4dd8b52ad39f406ff8e5738ee0de51;p=ceph.git

mgr/nfs: handle bad cluster name during info command

It should say the cluster does not exist

Fixes: https://tracker.ceph.com/issues/58138
Signed-off-by: Dhairya Parmar <dparmar@redhat.com>
(cherry picked from commit cddaef44ea85bf171ee5c87a8f7d2c098a16819b)
---

diff --git a/src/pybind/mgr/nfs/cluster.py b/src/pybind/mgr/nfs/cluster.py
index 61bc477727ba..d0adaa49d7de 100644
--- a/src/pybind/mgr/nfs/cluster.py
+++ b/src/pybind/mgr/nfs/cluster.py
@@ -201,6 +201,8 @@ class NFSCluster:
 
     def show_nfs_cluster_info(self, cluster_id: Optional[str] = None) -> Tuple[int, str, str]:
         try:
+            if cluster_id and cluster_id not in available_clusters(self.mgr):
+                raise ClusterNotFound()
             info_res = {}
             if cluster_id:
                 cluster_ls = [cluster_id]