Re: [libvirt] [dbus PATCH v2 02/17] Implement InterfaceDefineXML method for Connect Interface

2018-07-23 Thread Ján Tomko

On Fri, Jul 20, 2018 at 02:34:46PM -0400, Anya Harter wrote:

Signed-off-by: Anya Harter 
---
data/org.libvirt.Connect.xml |  7 +++
src/connect.c| 30 ++
tests/test_connect.py|  4 
tests/xmldata.py | 12 
4 files changed, 53 insertions(+)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [dbus PATCH v2 02/17] Implement InterfaceDefineXML method for Connect Interface

2018-07-20 Thread Anya Harter
Signed-off-by: Anya Harter 
---
 data/org.libvirt.Connect.xml |  7 +++
 src/connect.c| 30 ++
 tests/test_connect.py|  4 
 tests/xmldata.py | 12 
 4 files changed, 53 insertions(+)

diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml
index 7014a09..f690bab 100644
--- a/data/org.libvirt.Connect.xml
+++ b/data/org.libvirt.Connect.xml
@@ -148,6 +148,13 @@
   
   
 
+
+  https://libvirt.org/html/libvirt-libvirt-interface.html#virInterfaceDefineXML"/>
+  
+  
+  
+
 
   https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListAllDomains"/>
diff --git a/src/connect.c b/src/connect.c
index 3dc434d..304a56f 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -735,6 +735,35 @@ virtDBusConnectGetSysinfo(GVariant *inArgs,
 *outArgs = g_variant_new("(s)", sysinfo);
 }
 
+static void
+virtDBusConnectInterfaceDefineXML(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(virInterface) interface = NULL;
+g_autofree gchar *path = NULL;
+const gchar *xml;
+guint flags;
+
+g_variant_get(inArgs, "()", , );
+
+if (!virtDBusConnectOpen(connect, error))
+return;
+
+interface = virInterfaceDefineXML(connect->connection, xml, flags);
+if (!interface)
+return virtDBusUtilSetLastVirtError(error);
+
+path = virtDBusUtilBusPathForVirInterface(interface, 
connect->interfacePath);
+
+*outArgs = g_variant_new("(o)", path);
+}
+
 static void
 virtDBusConnectListDomains(GVariant *inArgs,
GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -1766,6 +1795,7 @@ static virtDBusGDBusMethodTable 
virtDBusConnectMethodTable[] = {
 { "GetCPUModelNames", virtDBusConnectGetCPUModelNames },
 { "GetDomainCapabilities", virtDBusConnectGetDomainCapabilities },
 { "GetSysinfo", virtDBusConnectGetSysinfo },
+{ "InterfaceDefineXML", virtDBusConnectInterfaceDefineXML },
 { "ListDomains", virtDBusConnectListDomains },
 { "ListNetworks", virtDBusConnectListNetworks },
 { "ListNodeDevices", virtDBusConnectListNodeDevices },
diff --git a/tests/test_connect.py b/tests/test_connect.py
index 2299b8a..d21b366 100755
--- a/tests/test_connect.py
+++ b/tests/test_connect.py
@@ -84,6 +84,10 @@ class TestConnect(libvirttest.BaseTestClass):
 sysinfo = self.connect.GetSysinfo(0)
 assert isinstance(sysinfo, dbus.String)
 
+def test_connect_interface_define_xml(self):
+path = self.connect.InterfaceDefineXML(xmldata.minimal_interface_xml, 
0)
+assert isinstance(path, dbus.ObjectPath)
+
 def test_connect_list_networks(self):
 networks = self.connect.ListNetworks(0)
 assert isinstance(networks, dbus.Array)
diff --git a/tests/xmldata.py b/tests/xmldata.py
index 25bb089..a70bac1 100644
--- a/tests/xmldata.py
+++ b/tests/xmldata.py
@@ -12,6 +12,18 @@ minimal_domain_xml = '''
 
 '''
 
+minimal_interface_xml = '''
+
+  
+  
+  
+  
+
+
+  
+
+'''
+
 minimal_network_xml = '''
 
   bar
-- 
2.17.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list