qemu_guest_agent: add new guest agent case #1032

xiangchunfu · 2017-07-31T06:52:46Z

1.frozen guest FS
2.send shutdown agent cmd to guest
3.send reboot agent cmd to guest
4.send fsthaw cmd to guest

id: 1468530, 1476648
Signed-off-by: Xiangchun Fu xfu@redhat.com

vivianQizhu · 2017-08-01T05:04:22Z

qemu/tests/qemu_guest_agent.py

+        :param env: Dictionary with test environment.
+        """
+        vm = env.get_vm(params["main_vm"])
+        if not self.vm.is_alive():


You have get vm in above line, so this line could be:

if not vm.is_alive():

I have removed self.

if not vm.is_alive():

vivianQizhu · 2017-08-01T05:06:38Z

qemu/tests/qemu_guest_agent.py

+        try:
+            self.gagent.shutdown(self.gagent.SHUTDOWN_MODE_POWERDOWN)
+        except Exception:
+            self.test.fail("guest-shutdown command returned a wrong message")


param 'test' is passed to this function, so could remove self.

I have removed self.

except Exception: test.fail("guest-shutdown command returned a wrong message")

vivianQizhu · 2017-08-01T05:09:51Z

qemu/tests/qemu_guest_agent.py

+        self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_FROZEN)
+
+        if vm.monitor.cmd("system_reset"):
+            self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_THAWED)


Do you need an else here to fail the case if above command does not perform as expected?

Add else

if vm.monitor.cmd("system_reset"): self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_THAWED) else: test.fail("system_reset command fail,please check qemu process")

xiywang · 2017-08-02T06:47:36Z

qemu/tests/qemu_guest_agent.py

+
+        """
+        Execute "system_reset" and send "shutdown,reboot" command to guest agent after FS fsreezed
+        :param test: kvm test objecti


s/objecti/object

s/fsreezed/freeze

xiywang · 2017-08-02T06:49:49Z

qemu/tests/qemu_guest_agent.py

@@ -722,6 +722,40 @@ def _action_after_fsfreeze(self, *args):
                                 " write file")

    @error.context_aware


better remove all the @error.context_aware and remove from autotest.client.shared import error
use test.error instead of error.TestError

Just confirm, Do I need remove all @error.context_aware and use test.error instead of error.TestError in this qemu_guest_agent.py?

I always @error.context_aware works.

if you remove all the @error.context_aware and use test.error will be better.

removed all the @error.context_aware and from autotest.client.shared import error. and use test.error instead of error.TestError in this qemu_guest_agent.py

xiywang · 2017-08-02T06:51:28Z

qemu/tests/qemu_guest_agent.py

+        try:
+            self.gagent.shutdown(self.gagent.SHUTDOWN_MODE_REBOOT)
+        except Exception:
+            self.test.fail("guest-reboot command returned a wrong message")


I have removed self.

except Exception: test.fail("guest-reboot command returned a wrong message")

xiywang · 2017-08-02T06:51:49Z

qemu/tests/qemu_guest_agent.py

+        if vm.monitor.cmd("system_reset"):
+            self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_THAWED)
+
+    @error.context_aware


Do I only need remove " @error.context_aware" or remove from 755~758 lines?

@error.context_aware only

xutian · 2017-08-04T01:23:16Z

qemu/tests/qemu_guest_agent.py

+            logging.info("guest FS is still freeze status")
+        self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_FROZEN)
+
+        try:


useless try, better to raise original exception

removed try. use 'if' to instead of try.
if self.gagent.shutdown(self.gagent.SHUTDOWN_MODE_POWERDOWN):
self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_FROZEN)

if self.gagent.shutdown(self.gagent.SHUTDOWN_MODE_REBOOT): self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_FROZEN) if vm.monitor.cmd("system_reset"): self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_THAWED)

xutian · 2017-08-04T01:24:52Z

qemu/tests/qemu_guest_agent.py

+
+        if vm.monitor.cmd("system_reset"):
+            self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_THAWED)
+        else:


this part will not be execute, because monitor.cmd() always return c,md output .

we have also discover this problem. monitor.cmd() can properly deal with cmd return. removed else part.

if vm.monitor.cmd("system_reset"):
self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_THAWED)

vivianQizhu · 2017-08-04T01:36:03Z

Why two commits?

suqinhuang · 2017-08-04T06:21:37Z

the configure file is a little long, do we need to seperate it?

xiangchunfu · 2017-08-07T03:23:44Z

@suqinhuang It is currently acceptable. As all test cases are very similar for this feature. the confiure file is more clear. I will consider to seperate when a large number of test case are added.

xiywang · 2017-08-09T02:02:07Z

qemu/tests/qemu_guest_agent.py

    def gagent_install(self, params, vm, *args):
        if args and isinstance(args, tuple):
            gagent_install_cmd = args[0]
        else:
-            raise error.TestError("Missing config 'gagent_install_cmd'")
+            raise test.error("Missing config 'gagent_install_cmd'")


do not need 'raise', remember to modify all in this file

modified the whole file

xiywang · 2017-08-09T02:03:50Z

qemu/tests/qemu_guest_agent.py

@@ -137,14 +134,13 @@ def gagent_start(self, params, vm, *args):
            raise error.TestFail("Could not start qemu-guest-agent in VM"
                                 " '%s', detail: '%s'" % (vm.name, o))

-    @error.context_aware
    def gagent_create(self, params, vm, *args):
        if self.gagent:
            return self.gagent

        error.context("Create a QemuAgent object.", logging.info)


if you remove "from autotest.client.shared import error", can this file still be execute successfully?
error.context should not be run correctly.

use logging.info instead of error.context

xiywang · 2017-08-09T02:05:58Z

qemu/tests/qemu_guest_agent.py

+        """
+        vm = env.get_vm(params["main_vm"])
+        if not vm.is_alive():
+            test.skip("VM died,can't continue the test loop.")


test.cancel should be better.

use test.cancel instead of test.skip

dinghuiqing · 2017-08-10T07:57:46Z

qemu/tests/qemu_guest_agent.py

@@ -582,7 +562,7 @@ def get_allocation_bitmap():
        bitmap = get_allocation_bitmap()
        if bitmap:
            logging.debug("block allocation bitmap: %s" % bitmap)
-            raise error.TestError("block allocation bitmap"
+            raise test.error("block allocation bitmap"
                                  " not empty before test.")


This line is failed checked by "inspekt style".

I resoved inspekt style's problem already

dinghuiqing · 2017-08-10T08:08:48Z

qemu/tests/cfg/qemu_guest_agent.cfg

@@ -86,6 +86,9 @@
            no Windows
            gagent_check_type = fsfreeze
            gagent_fs_test_cmd = "rm -f /tmp/foo; echo foo > /tmp/foo"
+        - check_reset_reboot_shutdown_fsfreeze:
+            no Windows


Checked polarion case https://polarion.engineering.redhat.com/polarion/#/project/RedHatEnterpriseLinux7/workitem?id=RHEL7-8350

This case is linux only?

no, this case supports windows guest. remove 'no windows' line

sssst315 · 2017-08-14T09:43:54Z

qemu/tests/qemu_guest_agent.py

+        if not vm.is_alive():
+            test.skip("VM died,can't continue the test loop.")
+        self.gagent.fsfreeze()
+        self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_FROZEN)


There is a status verify command in fsfreeze() function 'self.verify_fsfreeze_status(self.FSFREEZE_STATUS_FROZEN)'.

So I think this line can be deleted.

you are right, fsfreeze() function verified guest file system status after fsfreeze command. I haven't to verify it again. deleted this line.

sssst315 · 2017-08-14T10:21:01Z

qemu/tests/qemu_guest_agent.py

+            self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_FROZEN)
+
+        if vm.monitor.cmd("system_reset"):
+            self.gagent.verify_fsfreeze_status(self.gagent.FSFREEZE_STATUS_THAWED)


Do you need to check 'vm.is_alive()' again?

all guest agent command need agent service response in guest. if send agent command to vm but vm is dead. I am afraid that agent command will get error message.

Thanks for explaining.

sssst315 · 2017-08-16T08:39:12Z

smp_4.2048m.repeat1.pre_test.Host_RHEL.m7.u4.qcow2.virtio_blk.up.virtio_net.RHEL.7.4.x86_64.myprovider.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_native: PASS (1699.28 s)

smp_4.2048m.repeat1.pre_test.Host_RHEL.m7.u4.qcow2.virtio_blk.up.virtio_net.RHEL.7.4.x86_64.myprovider.rh_kernel_update: PASS (957.87 s)

smp_4.2048m.repeat1.run_test.Host_RHEL.m7.u4.qcow2.virtio_blk.up.virtio_net.RHEL.7.4.x86_64.myprovider.qemu_guest_agent.virtio_serial.check_reset_reboot_shutdown_fsfreeze: PASS (426.97 s)

Acked-by: Sitong Liu siliu@redhat.com

xiangchunfu · 2017-08-16T10:28:37Z

Thanks Sitong,

(1/1) smp_2.512m.repeat1.run_test.Host_RHEL.m7.u4.qcow2.virtio_blk.up.virtio_net.RHEL.7.4.x86_64.myprovider.qemu_guest_agent.virtio_serial.check_reset_reboot_shutdown_fsfreeze: PASS

vivianQizhu · 2017-08-17T01:04:35Z

qemu/tests/qemu_guest_agent.py

        session = self._get_session(params, vm)
        s, o = session.cmd_status_output(gagent_install_cmd)
        if s:
-            raise error.TestFail("Could not install qemu-guest-agent package"
-                                 " in VM '%s', detail: '%s'" % (vm.name, o))
+            error.TestFail("Could not install qemu-guest-agent package in VM '%s'",


test.fail()

vivianQizhu · 2017-08-17T01:05:38Z

qemu/tests/qemu_guest_agent.py


        if not gagent_start_cmd:
            return

-        error.context("Try to start 'qemu-guest-agent'.", logging.info)
+        logging.info("Try to start 'qemu-guest-agent'.")
        session = self._get_session(params, vm)
        s, o = self._session_cmd_close(session, gagent_start_cmd)
        if s and "already been started" not in o:
            raise error.TestFail("Could not start qemu-guest-agent in VM"


test.fail(), please check again to make sure all error module replaced.

vivianQizhu · 2017-08-17T01:07:13Z

qemu/tests/qemu_guest_agent.py

        rebooted = self.__gagent_check_serial_output(pattern)
        if not rebooted:
            raise error.TestFail("Could not reboot VM via guest agent")
-        error.context("Try to re-login to guest after reboot")
+        logging.info("Try to re-login to guest after reboot")
        try:
            session = self._get_session(self.params, None)
            session.close()
        except Exception, detail:
            raise error.TestFail("Could not login to guest,"


test.fail()

vivianQizhu · 2017-08-17T01:08:11Z

qemu/tests/qemu_guest_agent.py

@@ -386,7 +366,6 @@ def gagent_check_set_vcpus(self, test, params, env):
        if vcpus_info[vcpus_num - 1]["online"] is not False:
            raise error.TestFail("the vcpu status is not changed as expected")


Same as above

vivianQizhu · 2017-08-17T01:08:37Z

qemu/tests/qemu_guest_agent.py

-                      % int(guest_time), logging.info)
+            test.error("can't get the guest time for contrast")
+        logging.info("the time get inside guest by shell cmd is '%d' "
+                     % int(guest_time))
        delta = abs(int(guest_time) - nanoseconds_time / 1000000000)
        if delta > 3:
            raise error.TestFail("the time get by guest agent is not the same "


Same as above

vivianQizhu · 2017-08-17T01:08:59Z

qemu/tests/qemu_guest_agent.py

-        error.context("the time after being moved back into past  is '%d' "
-                      % int(guest_time_after), logging.info)
+        logging.info("the time after being moved back into past  is '%d' "
+                     % int(guest_time_after))
        delta = abs(int(guest_time_after) - target_time / 1000000000)
        if delta > 3:
            raise error.TestFail("the time set for guest is not the same "


Same as above

xiangchunfu · 2018-03-22T02:46:25Z

@lijinlijin For debug log. As system_reset command is success. and check guest's status is correct. don't need wait guest boot up fully. It is normal debug log.

xiangchunfu · 2018-03-22T03:12:40Z

(1/2) smp_8.8192m.repeat1.run_test.Host_RHEL.m7.u3.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.4.x86_64.myprovider.qemu_guest_agent.virtio_serial.check_reset_reboot_shutdown_fsfreeze: PASS (93.19 s)
(2/2) smp_8.8192m.repeat1.run_test.Host_RHEL.m7.u3.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.4.x86_64.myprovider.qemu_guest_agent.isa_serial.check_reset_reboot_shutdown_fsfreeze: PASS (74.06 s)

lijinlijin · 2018-03-26T07:31:58Z

qemu/tests/qemu_guest_agent.py

+                    test.fail("agent shutdown command shouldn't succeed for freeze FS")
+            except guest_agent.VAgentCmdError as detail:
+                if not re.search('guest-shutdown has been disabled', str(detail)):
+                    test.fail("qemu monitor return error msg")


show "detail" is better:
test.fail(detail)

lijinlijin · 2018-03-29T02:04:58Z

qemu/tests/qemu_guest_agent.py

+            gagent.verify_fsfreeze_status(gagent.FSFREEZE_STATUS_FROZEN)
+
+        if not vm.monitor.cmd("system_reset"):
+            time.sleep(120)


why need to sleep 120s ?

lijinlijin · 2018-03-29T07:28:36Z

Acked-by: Li Jin lijin@redhat.com

miyachen · 2018-07-27T06:17:22Z

@luckyh @hereischen Hi Hanxu, Haotong, please give suggestion to this pr since it has been pending for more than 100 days, Thanks.

hereischen · 2018-08-01T07:00:35Z

This patch depends on avocado-framework/avocado-vt#1391.

xiangchunfu · 2018-08-20T07:56:00Z

@hereischen I have updated avocado-vt patch 1391. and re-tested this 2 patches.

(1/2) Host_RHEL.m7.u6.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.6.x86_64.io-github-autotest-qemu.qemu_guest_agent.virtio_serial.check_reset_reboot_shutdown_fsfreeze: PASS (120.34 s)
(2/2) Host_RHEL.m7.u6.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.6.x86_64.io-github-autotest-qemu.qemu_guest_agent.isa_serial.check_reset_reboot_shutdown_fsfreeze: PASS (117.38 s)

vivianQizhu · 2018-09-04T08:13:08Z

qemu/tests/qemu_guest_agent.py

+                    test.fail("agent shutdown command shouldn't succeed for freeze FS")
+            except guest_agent.VAgentCmdError as detail:
+                if not re.search('guest-shutdown has been disabled', str(detail)):
+                    test.fail(str(detail))


Per avocado-framework/avocado-vt#1391 You dropped return True, so should not judge it with if gagent.shutdow(). Here should be:

try: gagent.shutdown(mode) except guest_agent.VAgentCmdError as detail: if not re.search('guest-shutdown has been disabled', str(detail)): test.fail(str(detail)) else: test.fail("agent shutdown command shouldn't succeed for freeze FS")

xiangchunfu · 2018-09-19T00:52:44Z

@vivianQizhu updated

(1/4) Host_RHEL.m7.u6.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.6.x86_64.io-github-autotest-qemu.unattended_install.cdrom.extra_cdrom_ks.default_install.aio_threads: PASS (2186.04 s)
(2/4) Host_RHEL.m7.u6.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.6.x86_64.io-github-autotest-qemu.rh_kernel_update: PASS (377.02 s)
(3/4) Host_RHEL.m7.u6.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.6.x86_64.io-github-autotest-qemu.qemu_guest_agent.virtio_serial.check_reset_reboot_shutdown_fsfreeze: PASS (81.74 s)
(4/4) Host_RHEL.m7.u6.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.7.6.x86_64.io-github-autotest-qemu.qemu_guest_agent.isa_serial.check_reset_reboot_shutdown_fsfreeze: PASS (82.81 s)

vivianQizhu · 2018-09-28T03:24:24Z

@luckyh Would you help review it again? Thanks.

1.frozen guest FS 2.send shutdown agent cmd to guest 3.send reboot agent cmd to guest 4.send fsthaw cmd to guest Signed-off-by: Xiangchun Fu <xfu@redhat.com>

xiangchunfu · 2018-11-02T06:01:40Z

updated, and This is the latest testing result.

(1/2) Host_RHEL.m8.u0.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.0.x86_64.io-github-autotest-qemu.qemu_guest_agent.virtio_serial.check_reboot_shutdown_fsfreeze: PASS (56.43 s)
(2/2) Host_RHEL.m8.u0.qcow2.virtio_scsi.up.virtio_net.Guest.RHEL.8.0.x86_64.io-github-autotest-qemu.qemu_guest_agent.isa_serial.check_reboot_shutdown_fsfreeze: PASS (54.22 s)

luckyh

ACK

luckyh · 2018-11-02T06:09:27Z

Thanks all.

vivianQizhu reviewed Aug 1, 2017

View reviewed changes

xiywang reviewed Aug 2, 2017

View reviewed changes

xutian reviewed Aug 4, 2017

View reviewed changes

xiangchunfu force-pushed the qemu_guest_agent branch from aa1eab5 to f03fce1 Compare August 7, 2017 05:58

xiywang reviewed Aug 9, 2017

View reviewed changes

dinghuiqing reviewed Aug 10, 2017

View reviewed changes

sssst315 reviewed Aug 14, 2017

View reviewed changes

xiangchunfu force-pushed the qemu_guest_agent branch 2 times, most recently from ab288dd to 73fc57d Compare August 16, 2017 08:11

xiangchunfu force-pushed the qemu_guest_agent branch from 73fc57d to d45ca9b Compare August 16, 2017 10:23

vivianQizhu reviewed Aug 17, 2017

View reviewed changes

lijinlijin reviewed Mar 26, 2018

View reviewed changes

xiangchunfu force-pushed the qemu_guest_agent branch 2 times, most recently from 6814abd to 8ddea06 Compare March 28, 2018 03:18

lijinlijin reviewed Mar 29, 2018

View reviewed changes

xiangchunfu force-pushed the qemu_guest_agent branch 2 times, most recently from a29f154 to 91c5fb8 Compare March 29, 2018 06:42

vivianQizhu reviewed Sep 4, 2018

View reviewed changes

xiangchunfu force-pushed the qemu_guest_agent branch from 91c5fb8 to ef06f85 Compare September 17, 2018 10:33

xiangchunfu force-pushed the qemu_guest_agent branch 8 times, most recently from 9a3c396 to f8fbf3d Compare November 2, 2018 05:52

qemu_guest_agent: add new guest agent case

37c5f88

1.frozen guest FS 2.send shutdown agent cmd to guest 3.send reboot agent cmd to guest 4.send fsthaw cmd to guest Signed-off-by: Xiangchun Fu <xfu@redhat.com>

xiangchunfu force-pushed the qemu_guest_agent branch from f8fbf3d to 37c5f88 Compare November 2, 2018 05:59

luckyh approved these changes Nov 2, 2018

View reviewed changes

luckyh merged commit f3db11c into autotest:master Nov 2, 2018

		@@ -722,6 +722,40 @@ def _action_after_fsfreeze(self, *args):
		" write file")

		@error.context_aware

		@@ -386,7 +366,6 @@ def gagent_check_set_vcpus(self, test, params, env):
		if vcpus_info[vcpus_num - 1]["online"] is not False:
		raise error.TestFail("the vcpu status is not changed as expected")

qemu_guest_agent: add new guest agent case #1032

qemu_guest_agent: add new guest agent case #1032

Conversation

xiangchunfu commented Jul 31, 2017 • edited

vivianQizhu Aug 1, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vivianQizhu commented Aug 4, 2017

suqinhuang commented Aug 4, 2017

xiangchunfu commented Aug 7, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sssst315 commented Aug 16, 2017 • edited

xiangchunfu commented Aug 16, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xiangchunfu commented Mar 22, 2018

xiangchunfu commented Mar 22, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lijinlijin commented Mar 29, 2018

miyachen commented Jul 27, 2018

hereischen commented Aug 1, 2018

xiangchunfu commented Aug 20, 2018

Choose a reason for hiding this comment

xiangchunfu commented Sep 19, 2018

vivianQizhu commented Sep 28, 2018

xiangchunfu commented Nov 2, 2018

luckyh left a comment

Choose a reason for hiding this comment

luckyh commented Nov 2, 2018

xiangchunfu commented Jul 31, 2017 •

edited

vivianQizhu Aug 1, 2017 •

edited

sssst315 commented Aug 16, 2017 •

edited