mgr/nfs: Update cluster qos_type from int to str

Fixes: https://tracker.ceph.com/issues/69861
Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>

diff --git a/src/pybind/mgr/nfs/qos_conf.py b/src/pybind/mgr/nfs/qos_conf.py
index 1eb9eaaec471fb43ae94559cf20c0ac99d746956..dbebc11c60a74cad564a7f01497d47c0621ea96b 100644 (file)
--- a/src/pybind/mgr/nfs/qos_conf.py
+++ b/src/pybind/mgr/nfs/qos_conf.py
@@ -34,9 +34,9 @@ class UserQoSType(Enum):
 
 
 class QOSType(Enum):
-    PerShare = 1
-    PerClient = 2
-    PerShare_PerClient = 3
+    PerShare = "Per_Export"
+    PerClient = "Per_Client"
+    PerShare_PerClient = "Per_Export_Per_Client"
 
 
 def _validate_qos_bw(bandwidth: str) -> int:

diff --git a/src/pybind/mgr/nfs/tests/test_nfs.py b/src/pybind/mgr/nfs/tests/test_nfs.py
index b5b8645a9350b8ce0cef130ee486a1fabd3188cd..35e56224784af6a398a79e3f0402503916172dde 100644 (file)
--- a/src/pybind/mgr/nfs/tests/test_nfs.py
+++ b/src/pybind/mgr/nfs/tests/test_nfs.py
@@ -150,7 +150,7 @@ QOS {
     enable_cluster_qos = true;
     enable_bw_control = true;
     combined_rw_bw_control = false;
-    qos_type = 3;
+    qos_type = "Per_Export_Per_Client";
     max_export_write_bw = 2000000;
     max_export_read_bw = 2000000;
     max_client_write_bw = 3000000;