Add dictionary to configure delegations and async

ci_utils/nfs_ganesha/nfs_ganesha_setup.py

@@ -9,7 +9,7 @@ class GaneshaManager:
     """
     NFS-Ganesha Setup and Management for CephFS
     """
-    def __init__(self, session, subvol_path, cephfs_name="cephfs", export_id=101, test_type=None):
+    def __init__(self, session, subvol_path, ganesha_opts=None, cephfs_name="cephfs", export_id=101, test_type=None):
         """
         Manage NFS-Ganesha setup on a remote session.
 
@@ -23,17 +23,31 @@ def __init__(self, session, subvol_path, cephfs_name="cephfs", export_id=101, te
         self.cephfs_name = cephfs_name
         self.export_id = export_id
         self.test_type = test_type
+        self.ganesha_opts = ganesha_opts or {}
+
+        self.conf = self._generate_conf()
 
     # ------------------------
     # Internal helpers
     # ------------------------
     def _generate_conf(self):
-        delegations_v4 = ""
-        delegations_export = ""
 
-        if self.test_type == "pynfs":
-            delegations_v4 = "    Delegations = true;"
-            delegations_export = "    delegations = readwrite;"
+        # ---- defaults ----
+        deleg_v4 = "true"
+        deleg_export = "none"
+        ceph_async = "true"
+
+        # ---- override only if ganesha_opts are passed ----
+        if self.ganesha_opts:
+            if "delegations_v4" in self.ganesha_opts:
+                deleg_v4 = self.ganesha_opts["delegations_v4"]
+
+            if "delegations_export" in self.ganesha_opts:
+                deleg_export = self.ganesha_opts["delegations_export"]
+
+            if "ceph_async" in self.ganesha_opts:
+                ceph_async = self.ganesha_opts["ceph_async"]
+
         return f"""NFS_CORE_PARAM {{
     Enable_NLM = false;
     Enable_RQUOTA = false;
@@ -42,13 +56,17 @@ def _generate_conf(self):
 
 NFSv4 {{
     Enforce_UTF8_Validation = true;
-    {delegations_v4}
+    Delegations = {deleg_v4};
 }}
 
 EXPORT_DEFAULTS {{
     Access_Type = RW;
 }}
 
+CEPH {{
+    async = {ceph_async};
+}}
+
 EXPORT {{
     Export_ID = {self.export_id};
     Path = "{self.subvol_path}";
@@ -57,19 +75,19 @@ def _generate_conf(self):
     Transports = TCP;
     Access_Type = RW;
     Squash = None;
-    {delegations_export}
+    delegations = {deleg_export};
     FSAL {{
         Name = "CEPH";
     }}
 }}"""
 
+
     # ------------------------
     # Public methods
     # ------------------------
     def write_conf(self):
         """Write ganesha.conf to remote system."""
-        conf_content = self._generate_conf()
-        run_cmd(self.session, f"echo '{conf_content}' > /etc/ganesha/ganesha.conf")
+        run_cmd(self.session, f"echo '{self.conf}' > /etc/ganesha/ganesha.conf")
         run_cmd(self.session, "cat /etc/ganesha/ganesha.conf")
         logger.info("[OK] ganesha.conf written")
 

tests/dev_space/test_fsal.py

@@ -205,7 +205,12 @@ def test_bringup_cephfs(remote_sessions, reserved_nodes):
         ganesha_setup = GaneshaManager(
             session=server,
             subvol_path=subvol_path,
-            cephfs_name=ceph_setup.cephfs_name
+            cephfs_name=ceph_setup.cephfs_name,
+            ganesha_opts={
+            "delegations_v4": "true",
+            "delegations_export": "readwrite",
+            "ceph_async": "false",
+            }
         )
         ganesha_setup.setup()
         assert f"CephFS setup completed"
@@ -228,6 +233,34 @@ def test_cthon(remote_sessions, reserved_nodes):
 
     assert rc == 0, f"Cthon CephFS tests failed"
 
+'''
+@pytest.mark.timeout(1200)
+def test_delegation(remote_sessions, reserved_nodes):
+    logger.info("[TEST START]: Update ganesha conf with delegation parameters")
+
+    server = remote_sessions["servers"][0]
+    if len(remote_sessions["servers"]) > 1:
+        ceph_setup = CephGaneshaSetup(session=server, extra_sessions=remote_sessions["servers"][1:])
+    else:
+        ceph_setup = CephGaneshaSetup(session=remote_sessions["servers"][0])
+
+    subvol_path = ceph_setup.full_setup()
+
+    ganesha_setup = GaneshaManager(
+        session=server,
+        subvol_path=subvol_path,
+        cephfs_name=ceph_setup.cephfs_name,
+        ganesha_opts={
+            "delegations_v4": "true",
+            "delegations_export": "readwrite",
+            "ceph_async": "false",
+            }
+        )
+    ganesha_setup.setup()
+
+    logger.info("Delegation updation completed")
+'''
+
 def test_pynfs(remote_sessions, reserved_nodes):
     logger.info("[TEST START]: PyNFS with CephFS")
 
@@ -240,5 +273,5 @@ def test_pynfs(remote_sessions, reserved_nodes):
     pynfs = PyNFSManager(session=client, server_ip=server_ip, backend_type="ceph")
     _, failure_summary, code = pynfs.run_all_tests(export="/nfs/cephfs")
     logger.info("PyNFS test failure summary: %s", failure_summary)
-    
-    assert code == 0, f"PyNFS CephFS tests failed"
+
+    assert code == 0, f"PyNFS CephFS tests failed"

tests/test_pynfs_cthon.py

@@ -300,7 +300,12 @@ def test_pynfs_cephfs(create_session, cmake_flags):
             session=server_session,
             subvol_path=subvol_path,
             cephfs_name=ceph_setup.cephfs_name,
-            test_type="pynfs"
+            test_type="pynfs",
+            ganesha_opts={
+                "delegations_v4": "true",
+                "delegations_export": "readwrite",
+                "ceph_async": "false",
+            }
         )
         ganesha_setup.setup()