From a2679b38845eb652f31130c1335f071d2f4f9d89 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 17 Jun 2021 21:30:48 -0400 Subject: [PATCH] mgr/nfs: fix tests Signed-off-by: Sage Weil --- qa/tasks/cephfs/test_nfs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qa/tasks/cephfs/test_nfs.py b/qa/tasks/cephfs/test_nfs.py index f97c4000acd..72cde67bd7c 100644 --- a/qa/tasks/cephfs/test_nfs.py +++ b/qa/tasks/cephfs/test_nfs.py @@ -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') -- 2.39.5