summaryrefslogtreecommitdiffstats
path: root/tests/functional/quota
diff options
context:
space:
mode:
authorNigel Babu <nigelb@redhat.com>2018-06-13 15:43:09 +0530
committerNigel Babu <nigelb@redhat.com>2018-06-13 15:43:09 +0530
commiteca6357a316ea9b1278b6134ad05d26f7847d4f6 (patch)
tree71a3159c67348eb308c483d6c5b7051a18070e88 /tests/functional/quota
parent3227067da22348d07eb379a195ab59bfe5383eec (diff)
Fix tests with old quota functions
We renamed the quota functions, so this caused some conflicts on master. Change-Id: I5eb6381dc77dcd99929cbc20173941bf1bd2290d
Diffstat (limited to 'tests/functional/quota')
-rwxr-xr-xtests/functional/quota/test_quota_limit_dir_breadth.py20
-rw-r--r--tests/functional/quota/test_quota_single_brick_volume.py14
2 files changed, 17 insertions, 17 deletions
diff --git a/tests/functional/quota/test_quota_limit_dir_breadth.py b/tests/functional/quota/test_quota_limit_dir_breadth.py
index 020e4fa..7674773 100755
--- a/tests/functional/quota/test_quota_limit_dir_breadth.py
+++ b/tests/functional/quota/test_quota_limit_dir_breadth.py
@@ -17,9 +17,9 @@
from glusto.core import Glusto as g
from glustolibs.gluster.gluster_base_class import (GlusterBaseClass,
runs_on)
-from glustolibs.gluster.quota_ops import (enable_quota,
- get_quota_list,
- set_quota_limit_usage)
+from glustolibs.gluster.quota_ops import (quota_enable,
+ quota_fetch_list,
+ quota_limit_usage)
from glustolibs.gluster.exceptions import ExecutionError
from glustolibs.misc.misc_libs import upload_scripts
from glustolibs.io.utils import validate_io_procs
@@ -90,7 +90,7 @@ class QuotaLimitDirBreadth(GlusterBaseClass):
"""
# Enable Quota
g.log.info("Enabling quota on the volume %s", self.volname)
- ret, _, _ = enable_quota(self.mnode, self.volname)
+ ret, _, _ = quota_enable(self.mnode, self.volname)
self.assertEqual(ret, 0, ("Failed to enable quota on the volume %s",
self.volname))
g.log.info("Successfully enabled quota on the volume %s", self.volname)
@@ -125,8 +125,8 @@ class QuotaLimitDirBreadth(GlusterBaseClass):
g.log.info("Set Quota Limit on each directory of the volume %s",
self.volname)
for dir_name in dir_list:
- ret, _, _ = set_quota_limit_usage(self.mnode, self.volname,
- dir_name, '1GB')
+ ret, _, _ = quota_limit_usage(self.mnode, self.volname,
+ dir_name, '1GB')
self.assertFalse(ret, "Failed to set Quota for dir %s" % dir_name)
g.log.info("Set quota for dir %s successfully", dir_name)
g.log.info("Successfully set the Quota limit on each path of the "
@@ -136,8 +136,8 @@ class QuotaLimitDirBreadth(GlusterBaseClass):
g.log.info("Get Quota list for every directory on the volume %s",
self.volname)
for dir_name in dir_list:
- quota_list = get_quota_list(self.mnode, self.volname,
- path=dir_name)
+ quota_list = quota_fetch_list(self.mnode, self.volname,
+ path=dir_name)
self.assertIsNotNone(quota_list, ("Failed to get the quota list "
"for the volume %s",
self.volname))
@@ -171,8 +171,8 @@ class QuotaLimitDirBreadth(GlusterBaseClass):
g.log.info("Get Quota list for every directory on the volume %s",
self.volname)
for dir_name in dir_list:
- quota_list = get_quota_list(self.mnode, self.volname,
- path=dir_name)
+ quota_list = quota_fetch_list(self.mnode, self.volname,
+ path=dir_name)
self.assertIsNotNone(quota_list, ("Failed to get the quota list "
"for the volume %s",
self.volname))
diff --git a/tests/functional/quota/test_quota_single_brick_volume.py b/tests/functional/quota/test_quota_single_brick_volume.py
index c6d0bbf..d2ca8d6 100644
--- a/tests/functional/quota/test_quota_single_brick_volume.py
+++ b/tests/functional/quota/test_quota_single_brick_volume.py
@@ -17,9 +17,9 @@
from glusto.core import Glusto as g
from glustolibs.gluster.gluster_base_class import (GlusterBaseClass,
runs_on)
-from glustolibs.gluster.quota_ops import (enable_quota,
- set_quota_limit_usage,
- get_quota_list)
+from glustolibs.gluster.quota_ops import (quota_enable,
+ quota_limit_usage,
+ quota_fetch_list)
from glustolibs.io.utils import list_all_files_and_dirs_mounts
from glustolibs.gluster.exceptions import ExecutionError
from glustolibs.misc.misc_libs import upload_scripts
@@ -97,7 +97,7 @@ class QuotaListPathValues(GlusterBaseClass):
# Enable Quota
g.log.info("Enabling quota on the volume %s", self.volname)
- ret, _, _ = enable_quota(self.mnode, self.volname)
+ ret, _, _ = quota_enable(self.mnode, self.volname)
self.assertEqual(ret, 0, ("Failed to enable quota on the "
"volume %s", self.volname))
g.log.info("Successfully enabled quota on the volume %s", self.volname)
@@ -108,8 +108,8 @@ class QuotaListPathValues(GlusterBaseClass):
# Set Quota limit on the root of the volume
g.log.info("Set Quota Limit on the path %s of the volume %s",
path, self.volname)
- ret, _, _ = set_quota_limit_usage(self.mnode, self.volname,
- path=path, limit="1GB")
+ ret, _, _ = quota_limit_usage(self.mnode, self.volname,
+ path=path, limit="1GB")
self.assertEqual(ret, 0, ("Failed to set quota limit on path %s of "
"the volume %s", path, self.volname))
g.log.info("Successfully set the Quota limit on %s of the volume %s",
@@ -142,7 +142,7 @@ class QuotaListPathValues(GlusterBaseClass):
# Get Quota list on Volume
g.log.info("Get Quota list for the volume %s", self.volname)
- quota_list1 = get_quota_list(self.mnode, self.volname)
+ quota_list1 = quota_fetch_list(self.mnode, self.volname)
self.assertIsNotNone(quota_list1, ("Failed to get the quota list for "
"the volume %s", self.volname))
self.assertIn(path, quota_list1.keys(),