[PATCH] virt.virt_env_process: Abstract screenshot production

[PATCH] virt.virt_env_process: Abstract screenshot production

[Lucas Meneghel Rodrigues]

In order to ease work with other virtualization types,
make virt_env_process to call vm.screendump() instead
of vm.monitor.screendump().

Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com>
---
 client/virt/virt_env_process.py |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/virt/virt_env_process.py b/client/virt/virt_env_process.py
index 789fa01..9999a2e 100644
--- a/client/virt/virt_env_process.py
+++ b/client/virt/virt_env_process.py
@@ -110,7 +110,7 @@ def preprocess_vm(test, params, env, name):
     scrdump_filename = os.path.join(test.debugdir, "pre_%s.ppm" % name)
     try:
         if vm.monitor and params.get("take_regular_screendumps") == "yes":
-            vm.monitor.screendump(scrdump_filename, debug=False)
+            vm.screendump(scrdump_filename, debug=False)
     except kvm_monitor.MonitorError, e:
         logging.warn(e)
 
@@ -151,7 +151,7 @@ def postprocess_vm(test, params, env, name):
     scrdump_filename = os.path.join(test.debugdir, "post_%s.ppm" % name)
     try:
         if vm.monitor and params.get("take_regular_screenshots") == "yes":
-            vm.monitor.screendump(scrdump_filename, debug=False)
+            vm.screendump(scrdump_filename, debug=False)
     except kvm_monitor.MonitorError, e:
         logging.warn(e)
 
@@ -460,7 +460,7 @@ def _take_screendumps(test, params, env):
             if not vm.is_alive():
                 continue
             try:
-                vm.monitor.screendump(filename=temp_filename, debug=False)
+                vm.screendump(filename=temp_filename, debug=False)
             except kvm_monitor.MonitorError, e:
                 logging.warn(e)
                 continue
-- 
1.7.6

Re: [PATCH] virt.virt_env_process: Abstract screenshot production

[Lukáš Doktor]

Hi,

vm.screendump() doesn't have parameter 'debug'.

So you should either add debug parameter to kvm_vm.py or remove this 
parameter (and perhaps add debug=False into kvm_vm.py).

Regards,
Lukáš


Dne 24.9.2011 01:27, Lucas Meneghel Rodrigues napsal(a):
> In order to ease work with other virtualization types,
> make virt_env_process to call vm.screendump() instead
> of vm.monitor.screendump().
>
> Signed-off-by: Lucas Meneghel Rodrigues<lmr@redhat.com>
> ---
>   client/virt/virt_env_process.py |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/client/virt/virt_env_process.py b/client/virt/virt_env_process.py
> index 789fa01..9999a2e 100644
> --- a/client/virt/virt_env_process.py
> +++ b/client/virt/virt_env_process.py
> @@ -110,7 +110,7 @@ def preprocess_vm(test, params, env, name):
>       scrdump_filename = os.path.join(test.debugdir, "pre_%s.ppm" % name)
>       try:
>           if vm.monitor and params.get("take_regular_screendumps") == "yes":
> -            vm.monitor.screendump(scrdump_filename, debug=False)
> +            vm.screendump(scrdump_filename, debug=False)
>       except kvm_monitor.MonitorError, e:
>           logging.warn(e)
>
> @@ -151,7 +151,7 @@ def postprocess_vm(test, params, env, name):
>       scrdump_filename = os.path.join(test.debugdir, "post_%s.ppm" % name)
>       try:
>           if vm.monitor and params.get("take_regular_screenshots") == "yes":
> -            vm.monitor.screendump(scrdump_filename, debug=False)
> +            vm.screendump(scrdump_filename, debug=False)
>       except kvm_monitor.MonitorError, e:
>           logging.warn(e)
>
> @@ -460,7 +460,7 @@ def _take_screendumps(test, params, env):
>               if not vm.is_alive():
>                   continue
>               try:
> -                vm.monitor.screendump(filename=temp_filename, debug=False)
> +                vm.screendump(filename=temp_filename, debug=False)
>               except kvm_monitor.MonitorError, e:
>                   logging.warn(e)
>                   continue

Re: [PATCH] virt.virt_env_process: Abstract screenshot production

[Lucas Meneghel Rodrigues]

On 09/26/2011 09:27 AM, Lukáš Doktor wrote:
> Hi,
>
> vm.screendump() doesn't have parameter 'debug'.

My fault, the screendump method on both qmp and human monitors does take 
this parameter, and since the implementation on virt_env_process was 
using the monitor method directly, I forgot to add the param to screendump.

It's fixed now. debug=True by default, the only place where it is False 
is during screendump thread (to avoid polluting the logs).

https://github.com/autotest/autotest/commit/49b1d9b65ab0061aaf631c19620987bc59592af6

> So you should either add debug parameter to kvm_vm.py or remove this
> parameter (and perhaps add debug=False into kvm_vm.py).
>
> Regards,
> Lukáš
>
>
> Dne 24.9.2011 01:27, Lucas Meneghel Rodrigues napsal(a):
>> In order to ease work with other virtualization types,
>> make virt_env_process to call vm.screendump() instead
>> of vm.monitor.screendump().
>>
>> Signed-off-by: Lucas Meneghel Rodrigues<lmr@redhat.com>
>> ---
>> client/virt/virt_env_process.py | 6 +++---
>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/client/virt/virt_env_process.py
>> b/client/virt/virt_env_process.py
>> index 789fa01..9999a2e 100644
>> --- a/client/virt/virt_env_process.py
>> +++ b/client/virt/virt_env_process.py
>> @@ -110,7 +110,7 @@ def preprocess_vm(test, params, env, name):
>> scrdump_filename = os.path.join(test.debugdir, "pre_%s.ppm" % name)
>> try:
>> if vm.monitor and params.get("take_regular_screendumps") == "yes":
>> - vm.monitor.screendump(scrdump_filename, debug=False)
>> + vm.screendump(scrdump_filename, debug=False)
>> except kvm_monitor.MonitorError, e:
>> logging.warn(e)
>>
>> @@ -151,7 +151,7 @@ def postprocess_vm(test, params, env, name):
>> scrdump_filename = os.path.join(test.debugdir, "post_%s.ppm" % name)
>> try:
>> if vm.monitor and params.get("take_regular_screenshots") == "yes":
>> - vm.monitor.screendump(scrdump_filename, debug=False)
>> + vm.screendump(scrdump_filename, debug=False)
>> except kvm_monitor.MonitorError, e:
>> logging.warn(e)
>>
>> @@ -460,7 +460,7 @@ def _take_screendumps(test, params, env):
>> if not vm.is_alive():
>> continue
>> try:
>> - vm.monitor.screendump(filename=temp_filename, debug=False)
>> + vm.screendump(filename=temp_filename, debug=False)
>> except kvm_monitor.MonitorError, e:
>> logging.warn(e)
>> continue
>

Re: [PATCH] virt.virt_env_process: Abstract screenshot production

[Lukáš Doktor]

Dne 26.9.2011 15:10, Lucas Meneghel Rodrigues napsal(a):
> On 09/26/2011 09:27 AM, Lukáš Doktor wrote:
>> Hi,
>>
>> vm.screendump() doesn't have parameter 'debug'.
>
> My fault, the screendump method on both qmp and human monitors does 
> take this parameter, and since the implementation on virt_env_process 
> was using the monitor method directly, I forgot to add the param to 
> screendump.
>
> It's fixed now. debug=True by default, the only place where it is 
> False is during screendump thread (to avoid polluting the logs).
>
> https://github.com/autotest/autotest/commit/49b1d9b65ab0061aaf631c19620987bc59592af6 
>
We used the same fix ;-)

Acked-by: Lukáš Doktor <ldoktor@redhat.com>

>
>> So you should either add debug parameter to kvm_vm.py or remove this
>> parameter (and perhaps add debug=False into kvm_vm.py).
>>
>> Regards,
>> Lukáš
>>
>>
>> Dne 24.9.2011 01:27, Lucas Meneghel Rodrigues napsal(a):
>>> In order to ease work with other virtualization types,
>>> make virt_env_process to call vm.screendump() instead
>>> of vm.monitor.screendump().
>>>
>>> Signed-off-by: Lucas Meneghel Rodrigues<lmr@redhat.com>
>>> ---
>>> client/virt/virt_env_process.py | 6 +++---
>>> 1 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/client/virt/virt_env_process.py
>>> b/client/virt/virt_env_process.py
>>> index 789fa01..9999a2e 100644
>>> --- a/client/virt/virt_env_process.py
>>> +++ b/client/virt/virt_env_process.py
>>> @@ -110,7 +110,7 @@ def preprocess_vm(test, params, env, name):
>>> scrdump_filename = os.path.join(test.debugdir, "pre_%s.ppm" % name)
>>> try:
>>> if vm.monitor and params.get("take_regular_screendumps") == "yes":
>>> - vm.monitor.screendump(scrdump_filename, debug=False)
>>> + vm.screendump(scrdump_filename, debug=False)
>>> except kvm_monitor.MonitorError, e:
>>> logging.warn(e)
>>>
>>> @@ -151,7 +151,7 @@ def postprocess_vm(test, params, env, name):
>>> scrdump_filename = os.path.join(test.debugdir, "post_%s.ppm" % name)
>>> try:
>>> if vm.monitor and params.get("take_regular_screenshots") == "yes":
>>> - vm.monitor.screendump(scrdump_filename, debug=False)
>>> + vm.screendump(scrdump_filename, debug=False)
>>> except kvm_monitor.MonitorError, e:
>>> logging.warn(e)
>>>
>>> @@ -460,7 +460,7 @@ def _take_screendumps(test, params, env):
>>> if not vm.is_alive():
>>> continue
>>> try:
>>> - vm.monitor.screendump(filename=temp_filename, debug=False)
>>> + vm.screendump(filename=temp_filename, debug=False)
>>> except kvm_monitor.MonitorError, e:
>>> logging.warn(e)
>>> continue
>>
>

Re: [PATCH] virt.virt_env_process: Abstract screenshot production

[Lucas Meneghel Rodrigues]

On 09/26/2011 10:20 AM, Lukáš Doktor wrote:
> Dne 26.9.2011 15:10, Lucas Meneghel Rodrigues napsal(a):
>> On 09/26/2011 09:27 AM, Lukáš Doktor wrote:
>>> Hi,
>>>
>>> vm.screendump() doesn't have parameter 'debug'.
>>
>> My fault, the screendump method on both qmp and human monitors does
>> take this parameter, and since the implementation on virt_env_process
>> was using the monitor method directly, I forgot to add the param to
>> screendump.
>>
>> It's fixed now. debug=True by default, the only place where it is
>> False is during screendump thread (to avoid polluting the logs).
>>
>> https://github.com/autotest/autotest/commit/49b1d9b65ab0061aaf631c19620987bc59592af6
>>
> We used the same fix ;-)

Yup :) Now, please rebase your topic branch, remove the fix and commit 
it with push --force. The pull request will be updated automatically, I 
will test it here and will let you know if there are more comments 
before I merge it with upstream.