misc: use remote.sh instead of remote.run

To ease porting and compatibility in order to avoid
usage of cStringIO.StringIO it is better to use
remote.sh method which supposed to return captured
value as a string.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 832c726e8976e749ac52d8bb4ef762dae19f0287..c5e2d5a5ff718014eb03d89a74f71c723486c92a 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -511,11 +511,7 @@ def create_simple_monmap(ctx, remote, conf, path=None,
         path
     ])
 
-    r = remote.run(
-        args=args,
-        stdout=StringIO()
-    )
-    monmap_output = r.stdout.getvalue()
+    monmap_output = remote.sh(args)
     fsid = re.search("generated fsid (.+)$",
                      monmap_output, re.MULTILINE).group(1)
     return fsid
@@ -600,11 +596,7 @@ def move_file(remote, from_path, to_path, sudo=False, preserve_perms=True):
             '\"%a\"',
             to_path
         ])
-        proc = remote.run(
-            args=args,
-            stdout=StringIO(),
-        )
-        perms = proc.stdout.getvalue().rstrip().strip('\"')
+        perms = remote.sh(args).rstrip().strip('\"')
 
     args = []
     if sudo:
@@ -615,10 +607,7 @@ def move_file(remote, from_path, to_path, sudo=False, preserve_perms=True):
         from_path,
         to_path,
     ])
-    proc = remote.run(
-        args=args,
-        stdout=StringIO(),
-    )
+    remote.sh(args)
 
     if preserve_perms:
         # reset the file back to the original permissions
@@ -630,10 +619,7 @@ def move_file(remote, from_path, to_path, sudo=False, preserve_perms=True):
             perms,
             to_path,
         ])
-        proc = remote.run(
-            args=args,
-            stdout=StringIO(),
-        )
+        remote.sh(args)
 
 
 def delete_file(remote, path, sudo=False, force=False, check=True):
@@ -651,11 +637,7 @@ def delete_file(remote, path, sudo=False, force=False, check=True):
         '--',
         path,
     ])
-    remote.run(
-        args=args,
-        stdout=StringIO(),
-        check_status=check
-    )
+    remote.sh(args, check_status=check)
 
 
 def remove_lines_from_file(remote, path, line_is_valid_test,
@@ -757,10 +739,7 @@ def create_file(remote, path, data="", permissions=str(644), sudo=False):
         '--',
         path
     ])
-    remote.run(
-        args=args,
-        stdout=StringIO(),
-    )
+    remote.sh(args)
     # now write out the data if any was passed in
     if "" != data:
         append_lines_to_file(remote, path, data, sudo)
@@ -832,15 +811,7 @@ def get_wwn_id_map(remote, devs):
     """
     stdout = None
     try:
-        r = remote.run(
-            args=[
-                'ls',
-                '-l',
-                '/dev/disk/by-id/wwn-*',
-            ],
-            stdout=StringIO(),
-        )
-        stdout = r.stdout.getvalue()
+        stdout = remote.sh('ls -l /dev/disk/by-id/wwn-*')
     except Exception:
         log.info('Failed to get wwn devices! Using /dev/sd* devices...')
         return dict((d, d) for d in devs)
@@ -877,11 +848,7 @@ def get_scratch_devices(remote):
         file_data = get_file(remote, "/scratch_devs")
         devs = file_data.split()
     except Exception:
-        r = remote.run(
-            args=['ls', run.Raw('/dev/[sv]d?')],
-            stdout=StringIO()
-        )
-        devs = r.stdout.getvalue().strip().split('\n')
+        devs = remote.sh('ls /dev/[sv]d?').strip().split('\n')
 
     # Remove root device (vm guests) from the disk list
     for dev in devs:
@@ -933,12 +900,7 @@ def wait_until_healthy(ctx, remote, ceph_cluster='ceph', use_sudo=False):
     args.extend(cmd)
     with safe_while(tries=(900 / 6), action="wait_until_healthy") as proceed:
         while proceed():
-            r = remote.run(
-                args=args,
-                stdout=StringIO(),
-                logger=log.getChild('health'),
-            )
-            out = r.stdout.getvalue()
+            out = remote.sh(args, logger=log.getChild('health'))
             log.debug('Ceph health: %s', out.rstrip('\n'))
             if out.split(None, 1)[0] == 'HEALTH_OK':
                 break
@@ -954,8 +916,8 @@ def wait_until_osds_up(ctx, cluster, remote, ceph_cluster='ceph'):
             daemons = ctx.daemons.iter_daemons_of_role('osd', ceph_cluster)
             for daemon in daemons:
                 daemon.check_status()
-            r = remote.run(
-                args=[
+            out = remote.sh(
+                [
                     'adjust-ulimits',
                     'ceph-coverage',
                     '{tdir}/archive/coverage'.format(tdir=testdir),
@@ -963,10 +925,8 @@ def wait_until_osds_up(ctx, cluster, remote, ceph_cluster='ceph'):
                     '--cluster', ceph_cluster,
                     'osd', 'dump', '--format=json'
                 ],
-                stdout=StringIO(),
                 logger=log.getChild('health'),
             )
-            out = r.stdout.getvalue()
             j = json.loads('\n'.join(out.split('\n')[1:]))
             up = len(filter(lambda o: 'up' in o['state'], j['osds']))
             log.debug('%d of %d OSDs are up' % (up, num_osds))
@@ -1262,17 +1222,10 @@ def get_system_type(remote, distro=False, version=False):
     If neither, return 'deb' or 'rpm' if distro is known to be one of those
     Finally, if unknown, return the unfiltered distro (from lsb_release -is)
     """
-    r = remote.run(
-        args=[
-            'sudo', 'lsb_release', '-is',
-        ],
-        stdout=StringIO(),
-    )
-    system_value = r.stdout.getvalue().strip()
+    system_value = remote.sh('sudo lsb_release -is').strip()
     log.debug("System to be installed: %s" % system_value)
     if version:
-        v = remote.run(args=['sudo', 'lsb_release', '-rs'], stdout=StringIO())
-        version = v.stdout.getvalue().strip()
+        version = remote.sh('sudo lsb_release -rs').strip()
     if distro and version:
         return system_value.lower(), version
     if distro:

diff --git a/teuthology/test/test_misc.py b/teuthology/test/test_misc.py
index 98fe251531ae948c7246d16af3cf4b4a600f9d4e..b0b6b8772ed4aa3f1875ee5de8ae49f53ae8ccd5 100644 (file)
--- a/teuthology/test/test_misc.py
+++ b/teuthology/test/test_misc.py
@@ -56,13 +56,10 @@ def test_wait_until_osds_up():
     ctx.daemons.iter_daemons_of_role.return_value = list()
     remote = FakeRemote()
 
-    class r():
-        class o:
-            def getvalue(self):
-                return 'IGNORED\n{"osds":[{"state":["up"]}]}'
-        stdout = o()
+    def s(self, **kwargs):
+        return 'IGNORED\n{"osds":[{"state":["up"]}]}'
 
-    remote.run = lambda **kwargs: r()
+    remote.sh = s
     ctx.cluster = cluster.Cluster(
         remotes=[
             (remote, ['osd.0', 'client.1'])