]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/nfs: fix tests
authorSage Weil <sage@newdream.net>
Fri, 18 Jun 2021 01:30:48 +0000 (21:30 -0400)
committerSage Weil <sage@newdream.net>
Mon, 21 Jun 2021 18:13:15 +0000 (14:13 -0400)
Signed-off-by: Sage Weil <sage@newdream.net>
qa/tasks/cephfs/test_nfs.py

index f97c4000acdfe887859b4e51c7a89c327730e235..72cde67bd7cf6c8264d6f884e53e68cec1a86390 100644 (file)
@@ -96,9 +96,9 @@ class TestNFS(MgrTestCase):
         output = self._cmd('auth', 'ls')
         client_id = f'client.nfs.{self.cluster_id}'
         if check_in:
-            self.assertIn(f'{cient_id}.{export_id}', output)
+            self.assertIn(f'{client_id}.{export_id}', output)
         else:
-            self.assertNotIn(client_id, output)
+            self.assertNotIn(f'{client_id}.{export_id}', output)
 
     def _test_idempotency(self, cmd_func, cmd_args):
         '''
@@ -555,7 +555,7 @@ class TestNFS(MgrTestCase):
         new_pseudo_path = '/testing'
         export_block['pseudo'] = new_pseudo_path
         export_block['access_type'] = 'RO'
-        self.ctx.cluster.run(args=['sudo', 'ceph', 'nfs', 'export', 'update',
+        self.ctx.cluster.run(args=['sudo', 'ceph', 'nfs', 'export', 'apply',
                                    self.cluster_id, '-i', '-'],
                              stdin=json.dumps(export_block))
         self._check_nfs_cluster_status('running', 'NFS Ganesha cluster restart failed')
@@ -577,7 +577,7 @@ class TestNFS(MgrTestCase):
             else:
                 export_block_new[key] = value
             try:
-                self.ctx.cluster.run(args=['sudo', 'ceph', 'nfs', 'export', 'update',
+                self.ctx.cluster.run(args=['sudo', 'ceph', 'nfs', 'export', 'apply',
                                            self.cluster_id, '-i', '-'],
                         stdin=json.dumps(export_block_new))
             except CommandFailedError:
@@ -621,4 +621,4 @@ class TestNFS(MgrTestCase):
         exec_cmd_invalid('export', 'delete', 'clusterid')
         exec_cmd_invalid('export', 'info')
         exec_cmd_invalid('export', 'info', 'clusterid')
-        exec_cmd_invalid('export', 'update')
+        exec_cmd_invalid('export', 'apply')