[libvirt] [dbus PATCH v2 0/4] Implement LookupBy* methods for Connect
Changes from v1: * Added to method names Domain prefix. * Seperated move of domain method in seperate commit. Katerina Koukiou (4): tests: Moved `domain` method from test_domain.py to libvirttest.py Implement DomainLookupByID method for Connect Interface. Implement DomainLookupByName method for Connect Interface Implement DomainLookupByUUID method for Connect Interface data/org.libvirt.Connect.xml | 18 +++++++++ src/connect.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ test/libvirttest.py | 5 +++ test/test_connect.py | 14 +++++++ test/test_domain.py | 5 --- 5 files changed, 124 insertions(+), 5 deletions(-) -- 2.15.0
From there it can be reused from test_connect.py.
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- test/libvirttest.py | 5 +++++ test/test_domain.py | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) 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 = GLib.MainLoop() GLib.timeout_add(1000, timeout) self.loop.run() + + def domain(self): + path = self.connect.ListDomains(0)[0] + obj = self.bus.get_object('org.libvirt', path) + return obj, dbus.Interface(obj, 'org.libvirt.Domain') 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 = 'this function is not supported by the connection driver' class TestDomain(libvirttest.BaseTestClass): - def domain(self): - path = self.connect.ListDomains(0)[0] - obj = self.bus.get_object('org.libvirt', path) - return obj, dbus.Interface(obj, 'org.libvirt.Domain') - def test_api(self): obj, domain = self.domain() -- 2.15.0
On Tue, 2018-03-27 at 16:20 +0200, Pavel Hrdina wrote:
On Tue, Mar 27, 2018 at 03:29:56PM +0200, Katerina Koukiou wrote:
From there it can be reused from test_connect.py.
I'll remove the ">" before pushing :).
ACK.
Pavel
Thanks, Katerina
On Tue, 2018-03-27 at 16:20 +0200, Pavel Hrdina wrote:
On Tue, Mar 27, 2018 at 03:29:56PM +0200, Katerina Koukiou wrote:
From there it can be reused from test_connect.py.
I'll remove the ">" before pushing :).
The >From is clearly an artifact of sending patches over email; I fully expected 'git am' to deal with it transparently, but alas it doesn't. Weird. -- Andrea Bolognani / Red Hat / Virtualization
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ test/test_connect.py | 12 ++++++++++++ 3 files changed, 47 insertions(+) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 8260a63..7c31f89 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -26,6 +26,12 @@ <arg name="xml" type="s" direction="in"/> <arg name="domain" type="o" direction="out"/> </method> + <method name="DomainLookupByID"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByID"/> + <arg name="id" type="u" direction="in"/> + <arg name="domain" type="o" direction="out"/> + </method> <signal name="DomainCrashed"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#VIR_DOMAIN_EVENT_CRASHED"/> diff --git a/src/connect.c b/src/connect.c index 8898e6d..47ab2f8 100644 --- a/src/connect.c +++ b/src/connect.c @@ -195,6 +195,34 @@ virtDBusConnectDefineXML(GVariant *inArgs, *outArgs = g_variant_new("(o)", path); } +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 = userData; + g_autoptr(virDomain) domain = NULL; + g_autofree gchar *path = NULL; + guint id; + + g_variant_get(inArgs, "(u)", &id); + + if (!virtDBusConnectOpen(connect, NULL)) + return; + + domain = virDomainLookupByID(connect->connection, id); + if (!domain) + return virtDBusUtilSetLastVirtError(error); + + path = virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + *outArgs = g_variant_new("(o)", path); +} + static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = { { "Version", virtDBusConnectGetVersion, NULL }, { NULL, NULL, NULL } @@ -204,6 +232,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "ListDomains", virtDBusConnectListDomains }, { "CreateXML", virtDBusConnectCreateXML }, { "DefineXML", virtDBusConnectDefineXML }, + { "DomainLookupByID", virtDBusDomainLookupByID }, { NULL, NULL } }; diff --git a/test/test_connect.py b/test/test_connect.py index 01d4d41..d6c2ab9 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -54,6 +54,18 @@ class TestConnect(libvirttest.BaseTestClass): self.main_loop() + @pytest.mark.parametrize("lookup_method_name,lookup_item", [ + ("DomainLookupByID", 'Id'), + ]) + def test_connect_lookup_by_id(self, lookup_method_name, lookup_item): + """Parameterized test for all LookupBy* API calls of Connect interface + """ + original_path = self.connect.ListDomains(0)[0] + obj, _ = self.domain() + props = obj.GetAll('org.libvirt.Domain', dbus_interface=dbus.PROPERTIES_IFACE) + path = getattr(self.connect, lookup_method_name)(props[lookup_item]) + assert original_path == path + @pytest.mark.parametrize("property_name,expected_type", [ ("Version", dbus.UInt64), ]) -- 2.15.0
On Tue, Mar 27, 2018 at 03:29:57PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ test/test_connect.py | 12 ++++++++++++ 3 files changed, 47 insertions(+)
diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 8260a63..7c31f89 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -26,6 +26,12 @@ <arg name="xml" type="s" direction="in"/> <arg name="domain" type="o" direction="out"/> </method> + <method name="DomainLookupByID"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByID"/> + <arg name="id" type="u" direction="in"/> + <arg name="domain" type="o" direction="out"/> + </method> <signal name="DomainCrashed"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#VIR_DOMAIN_EVENT_CRASHED"/> diff --git a/src/connect.c b/src/connect.c index 8898e6d..47ab2f8 100644 --- a/src/connect.c +++ b/src/connect.c @@ -195,6 +195,34 @@ virtDBusConnectDefineXML(GVariant *inArgs, *outArgs = g_variant_new("(o)", path); }
+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 = userData; + g_autoptr(virDomain) domain = NULL; + g_autofree gchar *path = NULL; + guint id; + + g_variant_get(inArgs, "(u)", &id); + + if (!virtDBusConnectOpen(connect, NULL)) + return; + + domain = virDomainLookupByID(connect->connection, id); + if (!domain) + return virtDBusUtilSetLastVirtError(error); + + path = virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + *outArgs = g_variant_new("(o)", path); +} + static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = { { "Version", virtDBusConnectGetVersion, NULL }, { NULL, NULL, NULL } @@ -204,6 +232,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "ListDomains", virtDBusConnectListDomains }, { "CreateXML", virtDBusConnectCreateXML }, { "DefineXML", virtDBusConnectDefineXML }, + { "DomainLookupByID", virtDBusDomainLookupByID }, { NULL, NULL } };
diff --git a/test/test_connect.py b/test/test_connect.py index 01d4d41..d6c2ab9 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -54,6 +54,18 @@ class TestConnect(libvirttest.BaseTestClass):
self.main_loop()
+ @pytest.mark.parametrize("lookup_method_name,lookup_item", [ + ("DomainLookupByID", 'Id'), + ]) + def test_connect_lookup_by_id(self, lookup_method_name, lookup_item):
This function should be renamed into test_connect_domain_lookup_by_id since we will have to have different tests for other libvirt objects. I'll fix that before pushing. Pavel
+ """Parameterized test for all LookupBy* API calls of Connect interface + """ + original_path = self.connect.ListDomains(0)[0] + obj, _ = self.domain() + props = obj.GetAll('org.libvirt.Domain', dbus_interface=dbus.PROPERTIES_IFACE) + path = getattr(self.connect, lookup_method_name)(props[lookup_item]) + assert original_path == path + @pytest.mark.parametrize("property_name,expected_type", [ ("Version", dbus.UInt64), ]) -- 2.15.0
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On Tue, 2018-03-27 at 16:14 +0200, Pavel Hrdina wrote:
On Tue, Mar 27, 2018 at 03:29:57PM +0200, Katerina Koukiou wrote:
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- data/org.libvirt.Connect.xml | 6 ++++++ src/connect.c | 29 +++++++++++++++++++++++++++++ test/test_connect.py | 12 ++++++++++++ 3 files changed, 47 insertions(+)
diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 8260a63..7c31f89 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -26,6 +26,12 @@ <arg name="xml" type="s" direction="in"/> <arg name="domain" type="o" direction="out"/> </method> + <method name="DomainLookupByID"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain .html#virDomainLookupByID"/>; + <arg name="id" type="u" direction="in"/> + <arg name="domain" type="o" direction="out"/> + </method> <signal name="DomainCrashed"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain .html#VIR_DOMAIN_EVENT_CRASHED"/>; diff --git a/src/connect.c b/src/connect.c index 8898e6d..47ab2f8 100644 --- a/src/connect.c +++ b/src/connect.c @@ -195,6 +195,34 @@ virtDBusConnectDefineXML(GVariant *inArgs, *outArgs = g_variant_new("(o)", path); }
domainPath);
+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 = userData; + g_autoptr(virDomain) domain = NULL; + g_autofree gchar *path = NULL; + guint id; + + g_variant_get(inArgs, "(u)", &id); + + if (!virtDBusConnectOpen(connect, NULL)) + return; + + domain = virDomainLookupByID(connect->connection, id); + if (!domain) + return virtDBusUtilSetLastVirtError(error); + + path = virtDBusUtilBusPathForVirDomain(domain, connect- + + *outArgs = g_variant_new("(o)", path); +} + static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = { { "Version", virtDBusConnectGetVersion, NULL }, { NULL, NULL, NULL } @@ -204,6 +232,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "ListDomains", virtDBusConnectListDomains }, { "CreateXML", virtDBusConnectCreateXML }, { "DefineXML", virtDBusConnectDefineXML }, + { "DomainLookupByID", virtDBusDomainLookupByID }, { NULL, NULL } };
diff --git a/test/test_connect.py b/test/test_connect.py index 01d4d41..d6c2ab9 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -54,6 +54,18 @@ class TestConnect(libvirttest.BaseTestClass):
self.main_loop()
+ @pytest.mark.parametrize("lookup_method_name,lookup_item", [ + ("DomainLookupByID", 'Id'), + ]) + def test_connect_lookup_by_id(self, lookup_method_name, lookup_item):
This function should be renamed into test_connect_domain_lookup_by_id since we will have to have different tests for other libvirt objects.
Right, I missed this one. Rename to test_connect_domain_lookup_by is fine.
I'll fix that before pushing.
Pavel
Thanks, Katerina
+ """Parameterized test for all LookupBy* API calls of Connect interface + """ + original_path = self.connect.ListDomains(0)[0] + obj, _ = self.domain() + props = obj.GetAll('org.libvirt.Domain', dbus_interface=dbus.PROPERTIES_IFACE) + path = getattr(self.connect, lookup_method_name)(props[lookup_item]) + assert original_path == path + @pytest.mark.parametrize("property_name,expected_type", [ ("Version", dbus.UInt64), ]) -- 2.15.0
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- 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 7c31f89..fd673c8 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -32,6 +32,12 @@ <arg name="id" type="u" direction="in"/> <arg name="domain" type="o" direction="out"/> </method> + <method name="DomainLookupByName"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByName"/> + <arg name="name" type="s" direction="in"/> + <arg name="domain" type="o" direction="out"/> + </method> <signal name="DomainCrashed"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#VIR_DOMAIN_EVENT_CRASHED"/> diff --git a/src/connect.c b/src/connect.c index 47ab2f8..b94360f 100644 --- a/src/connect.c +++ b/src/connect.c @@ -223,6 +223,34 @@ virtDBusDomainLookupByID(GVariant *inArgs, *outArgs = g_variant_new("(o)", path); } +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 = userData; + g_autoptr(virDomain) domain = NULL; + g_autofree gchar *path = NULL; + const gchar *name; + + g_variant_get(inArgs, "(s)", &name); + + if (!virtDBusConnectOpen(connect, NULL)) + return; + + domain = virDomainLookupByName(connect->connection, name); + if (!domain) + return virtDBusUtilSetLastVirtError(error); + + path = virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + *outArgs = g_variant_new("(o)", path); +} + static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = { { "Version", virtDBusConnectGetVersion, NULL }, { NULL, NULL, NULL } @@ -233,6 +261,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "CreateXML", virtDBusConnectCreateXML }, { "DefineXML", virtDBusConnectDefineXML }, { "DomainLookupByID", virtDBusDomainLookupByID }, + { "DomainLookupByName", virtDBusDomainLookupByName }, { NULL, NULL } }; diff --git a/test/test_connect.py b/test/test_connect.py index d6c2ab9..8a0f8ba 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", [ ("DomainLookupByID", 'Id'), + ("DomainLookupByName", 'Name'), ]) def test_connect_lookup_by_id(self, lookup_method_name, lookup_item): """Parameterized test for all LookupBy* API calls of Connect interface -- 2.15.0
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- 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 fd673c8..f24dff4 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -38,6 +38,12 @@ <arg name="name" type="s" direction="in"/> <arg name="domain" type="o" direction="out"/> </method> + <method name="DomainLookupByUUID"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainLookupByUUIDString"/> + <arg name="uuid" type="s" direction="in"/> + <arg name="domain" type="o" direction="out"/> + </method> <signal name="DomainCrashed"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#VIR_DOMAIN_EVENT_CRASHED"/> diff --git a/src/connect.c b/src/connect.c index b94360f..56ead8d 100644 --- a/src/connect.c +++ b/src/connect.c @@ -251,6 +251,34 @@ virtDBusDomainLookupByName(GVariant *inArgs, *outArgs = g_variant_new("(o)", path); } +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 = userData; + g_autoptr(virDomain) domain = NULL; + g_autofree gchar *path = NULL; + const gchar *uuidstr; + + g_variant_get(inArgs, "(s)", &uuidstr); + + if (!virtDBusConnectOpen(connect, NULL)) + return; + + domain = virDomainLookupByUUIDString(connect->connection, uuidstr); + if (!domain) + return virtDBusUtilSetLastVirtError(error); + + path = virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + *outArgs = g_variant_new("(o)", path); +} + static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = { { "Version", virtDBusConnectGetVersion, NULL }, { NULL, NULL, NULL } @@ -262,6 +290,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "DefineXML", virtDBusConnectDefineXML }, { "DomainLookupByID", virtDBusDomainLookupByID }, { "DomainLookupByName", virtDBusDomainLookupByName }, + { "DomainLookupByUUID", virtDBusDomainLookupByUUID }, { NULL, NULL } }; diff --git a/test/test_connect.py b/test/test_connect.py index 8a0f8ba..2b3c5c3 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -57,6 +57,7 @@ class TestConnect(libvirttest.BaseTestClass): @pytest.mark.parametrize("lookup_method_name,lookup_item", [ ("DomainLookupByID", 'Id'), ("DomainLookupByName", 'Name'), + ("DomainLookupByUUID", 'UUID'), ]) def test_connect_lookup_by_id(self, lookup_method_name, lookup_item): """Parameterized test for all LookupBy* API calls of Connect interface -- 2.15.0
On Tue, Mar 27, 2018 at 03:29:55PM +0200, Katerina Koukiou wrote:
Changes from v1: * Added to method names Domain prefix. * Seperated move of domain method in seperate commit.
Katerina Koukiou (4): tests: Moved `domain` method from test_domain.py to libvirttest.py Implement DomainLookupByID method for Connect Interface. Implement DomainLookupByName method for Connect Interface Implement DomainLookupByUUID method for Connect Interface
data/org.libvirt.Connect.xml | 18 +++++++++ src/connect.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ test/libvirttest.py | 5 +++ test/test_connect.py | 14 +++++++ test/test_domain.py | 5 --- 5 files changed, 124 insertions(+), 5 deletions(-)
ACK Jano
participants (4)
-
Andrea Bolognani -
Ján Tomko -
Katerina Koukiou -
Pavel Hrdina