New subject: Change in vdsm[master]: v2v: Add helper that redirects stdin/out/err

Monday, 8 August 2016

Tomas Golembiovsky has uploaded a new change for review.

Change subject: v2v: Add execCmd() that accepts stdin/out/err
......................................................................

v2v: Add execCmd() that accepts stdin/out/err

There is no way to pass stdin, stdout and stderr streams to Popen via
execCmd. This will be useful in subsequent changes introducing logging
of virt-v2v output.

Change-Id: I6c748155e233ebfb2c0c223308693ccaab0ebc18
Bug-Url: https://bugzilla.redhat.com/1350465
Signed-off-by: Tomáš Golembiovský <tgolembi(a)redhat.com&gt;
---
M lib/vdsm/v2v.py
M tests/v2vTests.py
2 files changed, 29 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/62092/1

diff --git a/lib/vdsm/v2v.py b/lib/vdsm/v2v.py
index c6a9943..860768e 100644
--- a/lib/vdsm/v2v.py
+++ b/lib/vdsm/v2v.py
@@ -42,9 +42,10 @@
 
 from vdsm.commands import execCmd
 from vdsm.common import zombiereaper
+from vdsm.compat import CPopen
 from vdsm.constants import P_VDSM_RUN, EXT_KVM_2_OVIRT
 from vdsm.define import errCode, doneCode
-from vdsm import libvirtconnection, response, concurrent
+from vdsm import cmdutils, concurrent, libvirtconnection, response
 from vdsm.utils import traceback, CommandPath, NICENESS, IOCLASS
 
 try:
@@ -1139,3 +1140,18 @@
         else:
             net['type'] = 'interface'
         vm['networks'].append(net)
+
+
+def _simple_exec_cmd(command, env=None, nice=None, ioclass=None,
+                     stdin=None, stdout=None, stderr=None):
+
+    command = cmdutils.wrap_command(command, with_ioclass=ioclass,
+                                    ioclassdata=None, with_nice=nice,
+                                    with_setsid=False, with_sudo=False,
+                                    reset_cpu_affinity=True)
+
+    logging.debug(cmdutils.command_log_line(command, cwd=None))
+
+    p = CPopen(command, close_fds=True, cwd=None, env=env,
+               stdin=stdin, stdout=stdout, stderr=stderr)
+    return p
diff --git a/tests/v2vTests.py b/tests/v2vTests.py
index b7bfc54..3978035 100644
--- a/tests/v2vTests.py
+++ b/tests/v2vTests.py
@@ -20,6 +20,7 @@
 from collections import namedtuple
 from contextlib import contextmanager
 from StringIO import StringIO
+import subprocess
 import tarfile
 import zipfile
 import uuid
@@ -559,6 +560,17 @@
 
             self.assertEqual(job.status, v2v.STATUS.DONE)
 
+    def testSimpleExecCmd(self):
+        p = v2v._simple_exec_cmd(['cat'],
+                                 stdin=subprocess.PIPE,
+                                 stdout=subprocess.PIPE)
+        msg = "test\ntest"
+        p.stdin.write(msg)
+        p.stdin.close()
+        p.wait()
+        out = p.stdout.read()
+        self.assertEqual(out, msg)
+
 
 class MockVirConnectTests(TestCaseBase):
     def setUp(self):


-- 
To view, visit https://gerrit.ovirt.org/62092
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c748155e233ebfb2c0c223308693ccaab0ebc18
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Tomas Golembiovsky <tgolembi(a)redhat.com&gt;
    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Change in vdsm[master]: v2v: Add execCmd() that accepts stdin/out/err