diff options
Diffstat (limited to 'tests/distaf/distaf_libs/distaflibs-gluster/distaflibs/gluster/mount_ops.py')
| -rw-r--r-- | tests/distaf/distaf_libs/distaflibs-gluster/distaflibs/gluster/mount_ops.py | 174 |
1 files changed, 22 insertions, 152 deletions
diff --git a/tests/distaf/distaf_libs/distaflibs-gluster/distaflibs/gluster/mount_ops.py b/tests/distaf/distaf_libs/distaflibs-gluster/distaflibs/gluster/mount_ops.py index 2ee5b815c53..2d435f40d53 100644 --- a/tests/distaf/distaf_libs/distaflibs-gluster/distaflibs/gluster/mount_ops.py +++ b/tests/distaf/distaf_libs/distaflibs-gluster/distaflibs/gluster/mount_ops.py @@ -18,139 +18,15 @@ from distaf.util import tc -class GlusterMount(): - """Gluster Mount class - Args: - mount (dict): Mount dict with 'mount_protocol', 'mountpoint', - 'server', 'client', 'volname', 'options' as keys - - Returns: - Instance of GlusterMount class - """ - client_register = 0 - - def __init__(self, mount): - if mount['protocol']: - self.mounttype = mount['protocol'] - else: - self.mounttype = "glusterfs" - - if mount['mountpoint']: - self.mountpoint = mount['mountpoint'] - else: - self.mountpoint = "/mnt/%s" % self.mounttype - - self.server_system = mount['server'] - self.client_system = mount['client'] - self.volname = mount['volname'] - self.options = mount['options'] - - def mount(self): - """Mounts the volume - - Args: - uses instance args passed at init - - Returns: - bool: True on success and False on failure. - """ - (_retcode, _, _) = mount_volume(self.volname, - mtype=self.mounttype, - mpoint=self.mountpoint, - mserver=self.server_system, - mclient=self.client_system, - options=self.options) - - if _retcode == 0: - return True - else: - return False - - def is_mounted(self): - """Tests for mount on client - - Args: - uses instance args passed at init - - Returns: - bool: True on success and False on failure. - """ - _retcode = is_mounted(self.volname, - mpoint=self.mountpoint, - mserver=self.server_system, - mclient=self.client_system) - - if _retcode: - return True - else: - return False - - def unmount(self): - """Unmounts the volume - - Args: - uses instance args passed at init - - Returns: - bool: True on success and False on failure. - """ - (_retcode, _, _) = umount_volume(self.client_system, - self.mountpoint) - - if _retcode == 0: - return True - else: - return False - -def is_mounted(volname, mpoint, mserver, mclient): - """Check if mount exist. - - Args: - volname (str): Name of the volume - mpoint (str): Mountpoint dir - mserver (str): Server to which it is mounted to - mclient (str): Client from which it is mounted. - - Returns: - bool: True if mounted and False otherwise. +def mount_volume(volname, mtype='glusterfs', mpoint='/mnt/glusterfs', \ + mserver='', mclient='', options=''): """ - # python will error on missing arg, so just checking for empty args here - if not volname or not mpoint or not mserver or not mclient: - tc.logger.error("Missing arguments for mount.") - return False - - ret, _, _ = tc.run(mclient, "mount | grep %s | grep %s | grep \"%s\"" - % (volname, mpoint, mserver), verbose=False) - if ret == 0: - tc.logger.debug("Volume %s is mounted at %s:%s" % (volname, - mclient, - mpoint)) - return True - else: - tc.logger.error("Volume %s is not mounted at %s:%s" % (volname, - mclient, - mpoint)) - return False - -def mount_volume(volname, mtype='glusterfs', mpoint='/mnt/glusterfs', - mserver='', mclient='', options=''): - """Mount the gluster volume with specified options. - - Args: - volname (str): Name of the volume to mount. + Mount the gluster volume with specified options + Takes the volume name as mandatory argument - Kwargs: - mtype (str): Protocol to be used to mount. - mpoint (str): Mountpoint dir. - mserver (str): Server to mount. - mclient (str): Client from which it has to be mounted. - option (str): Options for the mount command. - - Returns: - tuple: Tuple containing three elements (ret, out, err). - (0, '', '') if already mounted. - (ret, out, err) of mount commnd execution otherwise. + Returns a tuple of (returncode, stdout, stderr) + Returns (0, '', '') if already mounted """ global tc if mserver == '': @@ -163,30 +39,24 @@ def mount_volume(volname, mtype='glusterfs', mpoint='/mnt/glusterfs', options = "%s" % options elif mtype == 'nfs' and options == '': options = '-o vers=3' - - if is_mounted(volname, mpoint, mserver, mclient): - tc.logger.debug("Volume %s is already mounted at %s" % - (volname, mpoint)) + ret, _, _ = tc.run(mclient, "mount | grep %s | grep %s | grep \"%s\"" \ + % (volname, mpoint, mserver), verbose=False) + if ret == 0: + tc.logger.debug("Volume %s is already mounted at %s" \ + % (volname, mpoint)) return (0, '', '') - - mcmd = ("mount -t %s %s %s:/%s %s" % - (mtype, options, mserver, volname, mpoint)) - _, _, _ = tc.run(mclient, "test -d %s || mkdir -p %s" % (mpoint, mpoint), - verbose=False) + mcmd = "mount -t %s %s %s:/%s %s" % \ + (mtype, options, mserver, volname, mpoint) + tc.run(mclient, "test -d %s || mkdir -p %s" % (mpoint, mpoint), \ + verbose=False) return tc.run(mclient, mcmd) -def umount_volume(mclient, mpoint): - """Unmounts the mountpoint. - - Args: - mclient (str): Client from which it has to be mounted. - mpoint (str): Mountpoint dir. - - Returns: - tuple: Tuple containing three elements (ret, out, err) as returned by - umount command execution. +def umount_volume(client, mountpoint): + """ + unmounts the mountpoint + Returns the output of umount command """ - cmd = ("umount %s || umount -f %s || umount -l %s" % - (mpoint, mpoint, mpoint)) - return tc.run(mclient, cmd) + cmd = "umount %s || umount -f %s || umount -l %s" \ + % (mountpoint, mountpoint, mountpoint) + return tc.run(client, cmd) |