From nobody Wed May 14 09:42:23 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 1525423146248633.2188410846302; Fri, 4 May 2018 01:39:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2675A30F086E; Fri, 4 May 2018 08:39:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC81C27180; Fri, 4 May 2018 08:39:04 +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 8BE334CAB6; Fri, 4 May 2018 08:39:04 +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 w448cjV2028997 for ; Fri, 4 May 2018 04:38:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4349C7C36; Fri, 4 May 2018 08:38:45 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAF4E83B8B for ; Fri, 4 May 2018 08:38:44 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 4 May 2018 10:38:34 +0200 Message-Id: <20180504083835.26984-9-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 8/9] Remove state to string translation in virtDBusDomainGetState 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 04 May 2018 08:39:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Adjust tests to comply with the new type. Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- data/org.libvirt.Domain.xml | 2 +- src/domain.c | 31 +------------------------------ tests/libvirttest.py | 12 ++++++++++++ tests/test_domain.py | 10 +++++----- 4 files changed, 19 insertions(+), 36 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 98c018c..3627b1b 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -32,7 +32,7 @@ - + diff --git a/src/domain.c b/src/domain.c index 40cf2f7..059cd3e 100644 --- a/src/domain.c +++ b/src/domain.c @@ -251,7 +251,6 @@ virtDBusDomainGetState(const gchar *objectPath, virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; gint state =3D 0; - const gchar *string; =20 domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) @@ -260,35 +259,7 @@ virtDBusDomainGetState(const gchar *objectPath, if (virDomainGetState(domain, &state, NULL, 0) < 0) return virtDBusUtilSetLastVirtError(error); =20 - switch (state) { - case VIR_DOMAIN_NOSTATE: - default: - string =3D "nostate"; - break; - case VIR_DOMAIN_RUNNING: - string =3D "running"; - break; - case VIR_DOMAIN_BLOCKED: - string =3D "blocked"; - break; - case VIR_DOMAIN_PAUSED: - string =3D "paused"; - break; - case VIR_DOMAIN_SHUTDOWN: - string =3D "shutdown"; - break; - case VIR_DOMAIN_SHUTOFF: - string =3D "shutoff"; - break; - case VIR_DOMAIN_CRASHED: - string =3D "crashed"; - break; - case VIR_DOMAIN_PMSUSPENDED: - string =3D "pmsuspended"; - break; - } - - *value =3D g_variant_new("s", string); + *value =3D g_variant_new("u", state); } =20 static void diff --git a/tests/libvirttest.py b/tests/libvirttest.py index 0e84a94..06ac0e4 100644 --- a/tests/libvirttest.py +++ b/tests/libvirttest.py @@ -100,6 +100,18 @@ class DomainEvent(IntEnum): CRASHED =3D 8 =20 =20 +class DomainState(IntEnum): + NOSTATE =3D 0 + RUNNING =3D 1 + BLOCKED =3D 2 + PAUSED =3D 3 + SHUTDOWN =3D 4 + SHUTOFF =3D 5 + CRASHED =3D 6 + PMSUSPENDED =3D 7 + LAST =3D 8 + + class NetworkEvent(IntEnum): DEFINED =3D 0 UNDEFINED =3D 1 diff --git a/tests/test_domain.py b/tests/test_domain.py index 2def6c1..c7e09cd 100755 --- a/tests/test_domain.py +++ b/tests/test_domain.py @@ -19,7 +19,7 @@ class TestDomain(libvirttest.BaseTestClass): assert any([isinstance(props['SchedulerType'], dbus.Struct), isinstance(props['SchedulerType'][0], dbus.String), isinstance(props['SchedulerType'][1], dbus.Int32)]) - assert isinstance(props['State'], dbus.String) + assert isinstance(props['State'], dbus.UInt32) assert isinstance(props['Updated'], dbus.Boolean) assert isinstance(props['UUID'], dbus.String) =20 @@ -59,7 +59,7 @@ class TestDomain(libvirttest.BaseTestClass): domain.ManagedSave(0) assert domain.HasManagedSaveImage(0) =3D=3D dbus.Boolean(True) state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) - assert state =3D=3D 'shutoff' + assert state =3D=3D libvirttest.DomainState.SHUTOFF domain.ManagedSaveRemove(0) assert domain.HasManagedSaveImage(0) =3D=3D dbus.Boolean(False) =20 @@ -87,7 +87,7 @@ class TestDomain(libvirttest.BaseTestClass): domain.Resume() =20 state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) - assert state =3D=3D 'running' + assert state =3D=3D libvirttest.DomainState.RUNNING =20 self.main_loop() =20 @@ -104,7 +104,7 @@ class TestDomain(libvirttest.BaseTestClass): domain.Shutdown(0) =20 state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) - assert state =3D=3D 'shutoff' + assert state =3D=3D libvirttest.DomainState.SHUTOFF =20 self.main_loop() =20 @@ -121,7 +121,7 @@ class TestDomain(libvirttest.BaseTestClass): domain.Suspend() =20 state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) - assert state =3D=3D 'paused' + assert state =3D=3D libvirttest.DomainState.PAUSED =20 self.main_loop() =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list