From: Sage Weil <sage@newdream.net>
Date: Fri, 11 Jun 2021 19:34:14 +0000 (-0400)
Subject: mgr/nfs: clean up test a bit
X-Git-Tag: v16.2.7~116^2~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=131036e3923b1d7b0ccf4bd8ce1ebe5b2a4141bd;p=ceph.git

mgr/nfs: clean up test a bit

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 59587fd0b4f27e6322935cc1d3773b057f6cb184)
---

diff --git a/src/pybind/mgr/nfs/tests/test_nfs.py b/src/pybind/mgr/nfs/tests/test_nfs.py
index a47ac57541de..9df9f39054a8 100644
--- a/src/pybind/mgr/nfs/tests/test_nfs.py
+++ b/src/pybind/mgr/nfs/tests/test_nfs.py
@@ -14,38 +14,6 @@ from orchestrator import ServiceDescription, DaemonDescription, OrchResult
 
 
 class TestNFS:
-    daemon_raw_config = """
-NFS_CORE_PARAM {
-            Enable_NLM = false;
-            Enable_RQUOTA = false;
-            Protocols = 4;
-            NFS_Port = 14000;
-        }
-
-        MDCACHE {
-           Dir_Chunk = 0;
-        }
-
-        NFSv4 {
-           RecoveryBackend = rados_cluster;
-           Minor_Versions = 1, 2;
-        }
-
-        RADOS_KV {
-           pool = nfs-ganesha;
-           namespace = vstart;
-           UserId = vstart;
-           nodeid = a;
-        }
-
-        RADOS_URLS {
-       Userid = vstart;
-       watch_url = 'rados://nfs-ganesha/vstart/conf-nfs.vstart';
-        }
-
-    %url rados://nfs-ganesha/vstart/conf-nfs.vstart
-"""
-
     export_1 = """
 EXPORT {
     Export_ID=1;
@@ -265,7 +233,38 @@ EXPORT
                 "value": "rados://nfs-ganesha/vstart/conf-nfs.vstart"
             })
         ]
-        daemon_config = GaneshaConfParser(self.daemon_raw_config).parse()
+        daemon_raw_config = """
+NFS_CORE_PARAM {
+            Enable_NLM = false;
+            Enable_RQUOTA = false;
+            Protocols = 4;
+            NFS_Port = 14000;
+        }
+
+        MDCACHE {
+           Dir_Chunk = 0;
+        }
+
+        NFSv4 {
+           RecoveryBackend = rados_cluster;
+           Minor_Versions = 1, 2;
+        }
+
+        RADOS_KV {
+           pool = nfs-ganesha;
+           namespace = vstart;
+           UserId = vstart;
+           nodeid = a;
+        }
+
+        RADOS_URLS {
+       Userid = vstart;
+       watch_url = 'rados://nfs-ganesha/vstart/conf-nfs.vstart';
+        }
+
+    %url rados://nfs-ganesha/vstart/conf-nfs.vstart
+"""
+        daemon_config = GaneshaConfParser(daemon_raw_config).parse()
         assert daemon_config == expected_daemon_config
 
     def _validate_export_1(self, export: Export):