From nobody Wed May 14 09:37:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1525423316249682.2896039836347; Fri, 4 May 2018 01:41:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36BB530B7A09; Fri, 4 May 2018 08:41:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE008611C7; Fri, 4 May 2018 08:41:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5606E180BADA; Fri, 4 May 2018 08:41:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w448cgj9028967 for ; Fri, 4 May 2018 04:38:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id BF9AC83B88; Fri, 4 May 2018 08:38:42 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63A3783B8B for ; Fri, 4 May 2018 08:38:42 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 4 May 2018 10:38:30 +0200 Message-Id: <20180504083835.26984-5-kkoukiou@redhat.com> In-Reply-To: <20180504083835.26984-1-kkoukiou@redhat.com> References: <20180504083835.26984-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 4/9] Change DomainEvent argument from string to unsigned int X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 04 May 2018 08:41:55 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Modify the relevant tests to comply with the new signal. Note: argument matching in connect_to_signal method is only usable with string and thus had to be refactored. Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- data/org.libvirt.Connect.xml | 2 +- src/events.c | 26 +------------------------- tests/libvirttest.py | 13 +++++++++++++ tests/test_connect.py | 12 ++++++++---- tests/test_domain.py | 30 ++++++++++++++++++++---------- 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 7249fa4..386a7bb 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -170,7 +170,7 @@ - + =20 -VIRT_DBUS_ENUM_DECL(virtDBusEventsDomainEvent) -VIRT_DBUS_ENUM_IMPL(virtDBusEventsDomainEvent, - VIR_DOMAIN_EVENT_LAST, - "Defined", - "Undefined", - "Started", - "Suspended", - "Resumed", - "Stopped", - "Shutdown", - "PMSuspended", - "Crashed") - -static const gchar * -virtDBusEventsDomainEventToString(gint event) -{ - const gchar *str =3D virtDBusEventsDomainEventTypeToString(event); - return str ? str : "unknown"; -} - static gint virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, virDomainPtr domain, @@ -33,10 +13,6 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection G= _GNUC_UNUSED, { virtDBusConnect *connect =3D opaque; g_autofree gchar *path =3D NULL; - const gchar *eventStr =3D virtDBusEventsDomainEventToString(event); - - if (!eventStr) - return 0; =20 path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 @@ -45,7 +21,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection G_= GNUC_UNUSED, connect->connectPath, VIRT_DBUS_CONNECT_INTERFACE, "DomainEvent", - g_variant_new("(os)", path, eventStr), + g_variant_new("(ou)", path, event), NULL); =20 return 0; diff --git a/tests/libvirttest.py b/tests/libvirttest.py index d1b71cc..f7f48ed 100644 --- a/tests/libvirttest.py +++ b/tests/libvirttest.py @@ -1,3 +1,4 @@ +from enum import IntEnum from dbus.mainloop.glib import DBusGMainLoop from gi.repository import GLib import dbus @@ -85,3 +86,15 @@ class BaseTestClass(): path =3D self.connect.ListNetworks(0)[0] obj =3D self.bus.get_object('org.libvirt', path) return path, obj + + +class DomainEvent(IntEnum): + DEFINED =3D 0 + UNDEFINED =3D 1 + STARTED =3D 2 + SUSPENDED =3D 3 + RESUMED =3D 4 + STOPPED =3D 5 + SHUTDOWN =3D 6 + PMSUSPENDED =3D 7 + CRASHED =3D 8 diff --git a/tests/test_connect.py b/tests/test_connect.py index 57f0658..41cc134 100755 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -31,11 +31,13 @@ class TestConnect(libvirttest.BaseTestClass): ''' =20 def test_connect_domain_create_xml(self): - def domain_started(path, _event): + def domain_started(path, event): + if event !=3D libvirttest.DomainEvent.STARTED: + return assert isinstance(path, dbus.ObjectPath) self.loop.quit() =20 - self.connect.connect_to_signal('DomainEvent', domain_started, arg1= =3D'Started') + self.connect.connect_to_signal('DomainEvent', domain_started) =20 path =3D self.connect.DomainCreateXML(self.minimal_domain_xml, 0) assert isinstance(path, dbus.ObjectPath) @@ -43,11 +45,13 @@ class TestConnect(libvirttest.BaseTestClass): self.main_loop() =20 def test_comnect_domain_define_xml(self): - def domain_defined(path, _event): + def domain_defined(path, event): + if event !=3D libvirttest.DomainEvent.DEFINED: + return assert isinstance(path, dbus.ObjectPath) self.loop.quit() =20 - self.connect.connect_to_signal('DomainEvent', domain_defined, arg1= =3D'Defined') + self.connect.connect_to_signal('DomainEvent', domain_defined) =20 path =3D self.connect.DomainDefineXML(self.minimal_domain_xml) assert isinstance(path, dbus.ObjectPath) diff --git a/tests/test_domain.py b/tests/test_domain.py index 0e83f72..2def6c1 100755 --- a/tests/test_domain.py +++ b/tests/test_domain.py @@ -47,11 +47,13 @@ class TestDomain(libvirttest.BaseTestClass): assert autostart_current =3D=3D dbus.Boolean(autostart_expected) =20 def test_domain_managed_save(self): - def domain_stopped(path, _event): + def domain_stopped(path, event): + if event !=3D libvirttest.DomainEvent.STOPPED: + return assert isinstance(path, dbus.ObjectPath) self.loop.quit() =20 - self.connect.connect_to_signal('DomainEvent', domain_stopped, arg1= =3D'Stopped') + self.connect.connect_to_signal('DomainEvent', domain_stopped) =20 obj, domain =3D self.domain() domain.ManagedSave(0) @@ -72,11 +74,13 @@ class TestDomain(libvirttest.BaseTestClass): assert description_expected =3D=3D domain.GetMetadata(metadata_des= cription, "", 0) =20 def test_resume(self): - def domain_resumed(path, _event): + def domain_resumed(path, event): + if event !=3D libvirttest.DomainEvent.RESUMED: + return assert isinstance(path, dbus.ObjectPath) self.loop.quit() =20 - self.connect.connect_to_signal('DomainEvent', domain_resumed, arg1= =3D'Resumed') + self.connect.connect_to_signal('DomainEvent', domain_resumed) =20 obj, domain =3D self.domain() domain.Suspend() @@ -88,11 +92,13 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() =20 def test_shutdown(self): - def domain_stopped(path, _event): + def domain_stopped(path, event): + if event !=3D libvirttest.DomainEvent.STOPPED: + return assert isinstance(path, dbus.ObjectPath) self.loop.quit() =20 - self.connect.connect_to_signal('DomainEvent', domain_stopped, arg1= =3D'Stopped') + self.connect.connect_to_signal('DomainEvent', domain_stopped) =20 obj, domain =3D self.domain() domain.Shutdown(0) @@ -103,11 +109,13 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() =20 def test_suspend(self): - def domain_suspended(path, _event): + def domain_suspended(path, event): + if event !=3D libvirttest.DomainEvent.SUSPENDED: + return assert isinstance(path, dbus.ObjectPath) self.loop.quit() =20 - self.connect.connect_to_signal('DomainEvent', domain_suspended, ar= g1=3D'Suspended') + self.connect.connect_to_signal('DomainEvent', domain_suspended) =20 obj, domain =3D self.domain() domain.Suspend() @@ -118,11 +126,13 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() =20 def test_undefine(self): - def domain_undefined(path, _event): + def domain_undefined(path, event): + if event !=3D libvirttest.DomainEvent.UNDEFINED: + return assert isinstance(path, dbus.ObjectPath) self.loop.quit() =20 - self.connect.connect_to_signal('DomainEvent', domain_undefined, ar= g1=3D'Undefined') + self.connect.connect_to_signal('DomainEvent', domain_undefined) =20 _, domain =3D self.domain() domain.Shutdown(0) --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list