From nobody Sat Apr 27 22:43:26 2024 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 1522144760917578.9627937376733; Tue, 27 Mar 2018 02:59:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6AAA573C; Tue, 27 Mar 2018 09:59:19 +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 2E03F600D2; Tue, 27 Mar 2018 09:59:19 +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 84338181BA07; Tue, 27 Mar 2018 09:59:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2R9xFjk013629 for ; Tue, 27 Mar 2018 05:59:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 368D11049460; Tue, 27 Mar 2018 09:59:15 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id D17C110EE963 for ; Tue, 27 Mar 2018 09:59:14 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Tue, 27 Mar 2018 11:59:08 +0200 Message-Id: <20180327095910.1423-2-kkoukiou@redhat.com> In-Reply-To: <20180327095910.1423-1-kkoukiou@redhat.com> References: <20180327095910.1423-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 1/3] Implement LookupByID method for Connect Interface. 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 27 Mar 2018 09:59:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" tests: Moved `domain` method from test_domain.py to libvirttest.py so that it can be reused from test_connect.py. Signed-off-by: Katerina Koukiou --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ src/domain.c | 1 + test/libvirttest.py | 5 +++++ test/test_connect.py | 13 ++++++++++++- test/test_domain.py | 5 ----- 6 files changed, 53 insertions(+), 6 deletions(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 8260a63..53f996b 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -26,6 +26,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index 8898e6d..f1177d2 100644 --- a/src/connect.c +++ b/src/connect.c @@ -195,6 +195,34 @@ virtDBusConnectDefineXML(GVariant *inArgs, *outArgs =3D g_variant_new("(o)", path); } =20 +static void +virtDBusDomainLookupByID(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virDomain) domain =3D NULL; + g_autofree gchar *path =3D NULL; + guint id; + + g_variant_get(inArgs, "(u)", &id); + + if (!virtDBusConnectOpen(connect, NULL)) + return; + + domain =3D virDomainLookupByID(connect->connection, id); + if (!domain) + return virtDBusUtilSetLastVirtError(error); + + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + *outArgs =3D g_variant_new("(o)", path); +} + static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] =3D { { "Version", virtDBusConnectGetVersion, NULL }, { NULL, NULL, NULL } @@ -204,6 +232,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "ListDomains", virtDBusConnectListDomains }, { "CreateXML", virtDBusConnectCreateXML }, { "DefineXML", virtDBusConnectDefineXML }, + { "LookupByID", virtDBusDomainLookupByID }, { NULL, NULL } }; =20 diff --git a/src/domain.c b/src/domain.c index 3c09351..c9f9e2b 100644 --- a/src/domain.c +++ b/src/domain.c @@ -450,6 +450,7 @@ virtDBusDomainUndefine(GVariant *inArgs G_GNUC_UNUSED, virtDBusUtilSetLastVirtError(error); } =20 + static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] =3D { { "Name", virtDBusDomainGetName, NULL }, { "UUID", virtDBusDomainGetUUID, NULL }, diff --git a/test/libvirttest.py b/test/libvirttest.py index 23fe536..c4dc96f 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -65,3 +65,8 @@ class BaseTestClass(): self.loop =3D GLib.MainLoop() GLib.timeout_add(1000, timeout) self.loop.run() + + def domain(self): + path =3D self.connect.ListDomains(0)[0] + obj =3D self.bus.get_object('org.libvirt', path) + return obj, dbus.Interface(obj, 'org.libvirt.Domain') diff --git a/test/test_connect.py b/test/test_connect.py index 01d4d41..ea6fdde 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -15,7 +15,6 @@ class TestConnect(libvirttest.BaseTestClass): ''' - def test_list_domains(self): domains =3D self.connect.ListDomains(0) assert isinstance(domains, dbus.Array) @@ -54,6 +53,18 @@ class TestConnect(libvirttest.BaseTestClass): =20 self.main_loop() =20 + @pytest.mark.parametrize("lookup_method_name,lookup_item", [ + ("LookupByID", 'Id'), + ]) + def test_connect_lookup_by_id(self, lookup_method_name, lookup_item): + """Parameterized test for all LookupBy* API calls of Connect inter= face + """ + original_path =3D self.connect.ListDomains(0)[0] + obj, _ =3D self.domain() + props =3D obj.GetAll('org.libvirt.Domain', dbus_interface=3Ddbus.P= ROPERTIES_IFACE) + path =3D getattr(self.connect, lookup_method_name)(props[lookup_it= em]) + assert original_path =3D=3D path + @pytest.mark.parametrize("property_name,expected_type", [ ("Version", dbus.UInt64), ]) diff --git a/test/test_domain.py b/test/test_domain.py index 73737d7..e617b1b 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -6,11 +6,6 @@ import libvirttest DBUS_EXCEPTION_MISSING_FUNCTION =3D 'this function is not supported by the= connection driver' =20 class TestDomain(libvirttest.BaseTestClass): - def domain(self): - path =3D self.connect.ListDomains(0)[0] - obj =3D self.bus.get_object('org.libvirt', path) - return obj, dbus.Interface(obj, 'org.libvirt.Domain') - def test_api(self): obj, domain =3D self.domain() =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 22:43:26 2024 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 1522144760694324.6142042023787; Tue, 27 Mar 2018 02:59:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 695277E9CD; Tue, 27 Mar 2018 09:59:19 +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 3DACD5D72A; Tue, 27 Mar 2018 09:59:19 +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 9E972181BA08; Tue, 27 Mar 2018 09:59:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2R9xFSW013636 for ; Tue, 27 Mar 2018 05:59:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id C83C610EE963; Tue, 27 Mar 2018 09:59:15 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F94B10AF9CA for ; Tue, 27 Mar 2018 09:59:15 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Tue, 27 Mar 2018 11:59:09 +0200 Message-Id: <20180327095910.1423-3-kkoukiou@redhat.com> In-Reply-To: <20180327095910.1423-1-kkoukiou@redhat.com> References: <20180327095910.1423-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 2/3] Implement LookupByName method for Connect Interface 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 27 Mar 2018 09:59:19 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ test/test_connect.py | 1 + 3 files changed, 36 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 53f996b..c99f700 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -32,6 +32,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index f1177d2..5952ff3 100644 --- a/src/connect.c +++ b/src/connect.c @@ -223,6 +223,34 @@ virtDBusDomainLookupByID(GVariant *inArgs, *outArgs =3D g_variant_new("(o)", path); } =20 +static void +virtDBusDomainLookupByName(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virDomain) domain =3D NULL; + g_autofree gchar *path =3D NULL; + const gchar *name; + + g_variant_get(inArgs, "(s)", &name); + + if (!virtDBusConnectOpen(connect, NULL)) + return; + + domain =3D virDomainLookupByName(connect->connection, name); + if (!domain) + return virtDBusUtilSetLastVirtError(error); + + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + *outArgs =3D g_variant_new("(o)", path); +} + static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] =3D { { "Version", virtDBusConnectGetVersion, NULL }, { NULL, NULL, NULL } @@ -233,6 +261,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "CreateXML", virtDBusConnectCreateXML }, { "DefineXML", virtDBusConnectDefineXML }, { "LookupByID", virtDBusDomainLookupByID }, + { "LookupByName", virtDBusDomainLookupByName }, { NULL, NULL } }; =20 diff --git a/test/test_connect.py b/test/test_connect.py index ea6fdde..a7a6a91 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -55,6 +55,7 @@ class TestConnect(libvirttest.BaseTestClass): =20 @pytest.mark.parametrize("lookup_method_name,lookup_item", [ ("LookupByID", 'Id'), + ("LookupByName", 'Name'), ]) def test_connect_lookup_by_id(self, lookup_method_name, lookup_item): """Parameterized test for all LookupBy* API calls of Connect inter= face --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sat Apr 27 22:43:26 2024 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 1522144766973267.55181145880476; Tue, 27 Mar 2018 02:59:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5820A7FD41; Tue, 27 Mar 2018 09:59:25 +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 32B8D620C6; Tue, 27 Mar 2018 09:59:25 +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 E84E7181BA08; Tue, 27 Mar 2018 09:59:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2R9xGsL013644 for ; Tue, 27 Mar 2018 05:59:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 663E61049460; Tue, 27 Mar 2018 09:59:16 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DA4110B008F for ; Tue, 27 Mar 2018 09:59:15 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Tue, 27 Mar 2018 11:59:10 +0200 Message-Id: <20180327095910.1423-4-kkoukiou@redhat.com> In-Reply-To: <20180327095910.1423-1-kkoukiou@redhat.com> References: <20180327095910.1423-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 3/3] Implement LookupByUUID method for Connect Interface 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 27 Mar 2018 09:59:25 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ test/test_connect.py | 1 + 3 files changed, 36 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index c99f700..5b5dd4c 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -38,6 +38,12 @@ + + + + + diff --git a/src/connect.c b/src/connect.c index 5952ff3..f580d30 100644 --- a/src/connect.c +++ b/src/connect.c @@ -251,6 +251,34 @@ virtDBusDomainLookupByName(GVariant *inArgs, *outArgs =3D g_variant_new("(o)", path); } =20 +static void +virtDBusDomainLookupByUUID(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virDomain) domain =3D NULL; + g_autofree gchar *path =3D NULL; + const gchar *uuidstr; + + g_variant_get(inArgs, "(s)", &uuidstr); + + if (!virtDBusConnectOpen(connect, NULL)) + return; + + domain =3D virDomainLookupByUUIDString(connect->connection, uuidstr); + if (!domain) + return virtDBusUtilSetLastVirtError(error); + + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + *outArgs =3D g_variant_new("(o)", path); +} + static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] =3D { { "Version", virtDBusConnectGetVersion, NULL }, { NULL, NULL, NULL } @@ -262,6 +290,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTa= ble[] =3D { { "DefineXML", virtDBusConnectDefineXML }, { "LookupByID", virtDBusDomainLookupByID }, { "LookupByName", virtDBusDomainLookupByName }, + { "LookupByUUID", virtDBusDomainLookupByUUID }, { NULL, NULL } }; =20 diff --git a/test/test_connect.py b/test/test_connect.py index a7a6a91..2d0f051 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -56,6 +56,7 @@ class TestConnect(libvirttest.BaseTestClass): @pytest.mark.parametrize("lookup_method_name,lookup_item", [ ("LookupByID", 'Id'), ("LookupByName", 'Name'), + ("LookupByUUID", 'UUID'), ]) def test_connect_lookup_by_id(self, lookup_method_name, lookup_item): """Parameterized test for all LookupBy* API calls of Connect inter= face --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list