From be3c7d86d1eac5f050619fba4998a22d896d9d47 Mon Sep 17 00:00:00 2001 From: Bala Konda Reddy M Date: Thu, 3 Oct 2019 17:02:43 +0530 Subject: Using set_acl in the testcase as existing functions are removed Earlier in nfs_ganesha_ops, two library functions enable_acl, disable_acl were implemented and later with changes to NFS Ganesha Base class both the functions are removed and made into single function set_acl. Change-Id: I5456adeeffa49c35a5ea19c8d11272f91ec4bdbf Signed-off-by: Bala Konda Reddy M --- tests/functional/nfs_ganesha/test_nfs_ganesha_acls.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tests/functional/nfs_ganesha') diff --git a/tests/functional/nfs_ganesha/test_nfs_ganesha_acls.py b/tests/functional/nfs_ganesha/test_nfs_ganesha_acls.py index 12a825c2e..991481e20 100644 --- a/tests/functional/nfs_ganesha/test_nfs_ganesha_acls.py +++ b/tests/functional/nfs_ganesha/test_nfs_ganesha_acls.py @@ -22,7 +22,7 @@ from glusto.core import Glusto as g from glustolibs.gluster.gluster_base_class import runs_on from glustolibs.gluster.nfs_ganesha_libs import NfsGaneshaVolumeBaseClass -from glustolibs.gluster.nfs_ganesha_ops import enable_acl, disable_acl +from glustolibs.gluster.nfs_ganesha_ops import set_acl from glustolibs.gluster.exceptions import ExecutionError import time import re @@ -41,7 +41,8 @@ class TestNfsGaneshaAcls(NfsGaneshaVolumeBaseClass): NfsGaneshaVolumeBaseClass.setUpClass.im_func(cls) def setUp(self): - ret = enable_acl(self.servers[0], self.volname) + ret = set_acl(self.mnode, self.volname, acl=True, + do_refresh_config=True) if not ret: raise ExecutionError("Failed to enable ACL on the nfs " "ganesha cluster") @@ -104,7 +105,8 @@ class TestNfsGaneshaAcls(NfsGaneshaVolumeBaseClass): "acl test" % dirname) def tearDown(self): - ret = disable_acl(self.servers[0], self.volname) + ret = set_acl(self.mnode, self.volname, acl=False, + do_refresh_config=True) if not ret: raise ExecutionError("Failed to disable ACL on nfs " "ganesha cluster") -- cgit