<div dir="ltr">Addition to the commit log:<div><br><div><font face="arial, sans-serif">tests/qemuagenttest.c</font><br style="font-family:arial,sans-serif;font-size:13px"><span style="font-family:arial,sans-serif;font-size:13px"> * Add a test case for qemuAgentGetInterfaces</span><br style="font-family:arial,sans-serif;font-size:13px">
</div></div><div><br></div><div><br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 23, 2013 at 3:48 AM, nehaljwani <span dir="ltr"><<a href="mailto:nehaljw.kkd1@gmail.com" target="_blank">nehaljw.kkd1@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">By querying the qemu guest agent with the QMP command<br>
"guest-network-get-interfaces" and converting the received<br>
JSON output to structured objects.<br>
<br>
src/qemu/qemu_agent.h:<br>
* Define qemuAgentGetInterfaces<br>
<br>
src/qemu/qemu_agent.c:<br>
* Implement qemuAgentGetInterface<br>
<br>
src/qemu/qemu_driver.c:<br>
* New function qemuDomainInterfacesAddresses<br>
<br>
src/remote_protocol-sructs:<br>
* Define new structs<br>
<br>
---<br>
src/qemu/qemu_agent.c | 157 +++++++++++++++++++++++++++++++++++++++++++++++++<br>
src/qemu/qemu_agent.h | 3 +<br>
src/qemu/qemu_driver.c | 55 +++++++++++++++++<br>
tests/qemuagenttest.c | 90 +++++++++++++++++++++++++++-<br>
4 files changed, 304 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c<br>
index 2cd0ccc..015e752 100644<br>
--- a/src/qemu/qemu_agent.c<br>
+++ b/src/qemu/qemu_agent.c<br>
@@ -844,6 +844,7 @@ static int qemuAgentSend(qemuAgentPtr mon,<br>
VIR_DEBUG("Attempt to send command while error is set %s",<br>
NULLSTR(mon->lastError.message));<br>
virSetError(&mon->lastError);<br>
+ printf("Upper\n");<br>
return -1;<br>
}<br>
<br>
@@ -862,6 +863,7 @@ static int qemuAgentSend(qemuAgentPtr mon,<br>
while (!mon->msg->finished) {<br>
if ((then && virCondWaitUntil(&mon->notify, &mon->parent.lock, then) < 0) ||<br>
(!then && virCondWait(&mon->notify, &mon->parent.lock) < 0)) {<br>
+<br>
if (errno == ETIMEDOUT) {<br>
virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s",<br>
_("Guest agent not available for now"));<br>
@@ -1319,6 +1321,161 @@ cleanup:<br>
return ret;<br>
}<br>
<br>
+<br>
+int<br>
+qemuAgentGetInterfaces(qemuAgentPtr mon,<br>
+ virDomainInterfacePtr **ifaces)<br>
+{<br>
+ int ret = -1;<br>
+ size_t i, j;<br>
+ int size = -1;<br>
+ virJSONValuePtr cmd = NULL;<br>
+ virJSONValuePtr reply = NULL;<br>
+ virJSONValuePtr ret_array = NULL;<br>
+ int ifaces_count = 0;<br>
+ virDomainInterfacePtr *ifaces_ret = NULL;<br>
+<br>
+ if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL)))<br>
+ return -1;<br>
+<br>
+ if (qemuAgentCommand(mon, cmd, &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 ||<br>
+ qemuAgentCheckError(cmd, reply) < 0) {<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ if (!(ret_array = virJSONValueObjectGet(reply, "return"))) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",<br>
+ _("qemu agent didn't provide 'return' field"));<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ if ((size = virJSONValueArraySize(ret_array)) < 0) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",<br>
+ _("qemu agent didn't return an array of interfaces"));<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ ifaces_count = (unsigned int) size;<br>
+<br>
+ if (VIR_ALLOC_N(ifaces_ret, size) < 0)<br>
+ goto cleanup;<br>
+<br>
+ for (i = 0; i < size; i++) {<br>
+ virJSONValuePtr tmp_iface = virJSONValueArrayGet(ret_array, i);<br>
+ virJSONValuePtr ip_addr_arr = NULL;<br>
+ const char *name, *hwaddr;<br>
+ int ip_addr_arr_size;<br>
+<br>
+ if (VIR_ALLOC(ifaces_ret[i]) < 0)<br>
+ goto cleanup;<br>
+<br>
+ /* Shouldn't happen but doesn't hurt to check neither */<br>
+ if (!tmp_iface) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",<br>
+ _("something has went really wrong"));<br>
+ goto error;<br>
+ }<br>
+<br>
+ /* interface name is required to be presented */<br>
+ name = virJSONValueObjectGetString(tmp_iface, "name");<br>
+ if (!name) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",<br>
+ _("qemu agent didn't provide 'name' field"));<br>
+ goto error;<br>
+ }<br>
+<br>
+ if (VIR_STRDUP(ifaces_ret[i]->name, name) < 0)<br>
+ goto error;<br>
+<br>
+ /* hwaddr might be omitted */<br>
+ hwaddr = virJSONValueObjectGetString(tmp_iface, "hardware-address");<br>
+ if (hwaddr && VIR_STRDUP(ifaces_ret[i]->hwaddr, hwaddr) < 0)<br>
+ goto error;<br>
+<br>
+ /* as well as IP address which - moreover -<br>
+ * can be presented multiple times */<br>
+ ip_addr_arr = virJSONValueObjectGet(tmp_iface, "ip-addresses");<br>
+ if (!ip_addr_arr)<br>
+ continue;<br>
+<br>
+ if ((ip_addr_arr_size = virJSONValueArraySize(ip_addr_arr)) < 0)<br>
+ /* Mmm, empty 'ip-address'? */<br>
+ continue;<br>
+<br>
+ (*(ifaces_ret)[i]).naddrs = (unsigned int) ip_addr_arr_size;<br>
+<br>
+ if (VIR_ALLOC_N((*(ifaces_ret)[i]).addrs, ip_addr_arr_size) < 0)<br>
+ goto error;<br>
+<br>
+ for (j = 0; j < ip_addr_arr_size; j++) {<br>
+ virJSONValuePtr ip_addr_obj = virJSONValueArrayGet(ip_addr_arr, j);<br>
+ virDomainIPAddressPtr ip_addr = &ifaces_ret[i]->addrs[j];<br>
+ const char *type, *addr;<br>
+<br>
+ /* Shouldn't happen but doesn't hurt to check neither */<br>
+ if (!ip_addr_obj) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",<br>
+ _("something has went really wrong"));<br>
+ goto error;<br>
+ }<br>
+<br>
+ type = virJSONValueObjectGetString(ip_addr_obj, "ip-address-type");<br>
+ if (!type) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR,<br>
+ _("qemu agent didn't provide 'ip-address-type'"<br>
+ " field for interface '%s'"), name);<br>
+ goto error;<br>
+ } else if (STREQ(type, "ipv4")) {<br>
+ ip_addr->type = VIR_IP_ADDR_TYPE_IPV4;<br>
+ } else if (STREQ(type, "ipv6")) {<br>
+ ip_addr->type = VIR_IP_ADDR_TYPE_IPV6;<br>
+ } else {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR,<br>
+ _("unknown ip address type '%s'"),<br>
+ type);<br>
+ goto error;<br>
+ }<br>
+<br>
+ addr = virJSONValueObjectGetString(ip_addr_obj, "ip-address");<br>
+ if (!addr) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR,<br>
+ _("qemu agent didn't provide 'ip-address'"<br>
+ " field for interface '%s'"), name);<br>
+ goto error;<br>
+ }<br>
+ if (VIR_STRDUP(ip_addr->addr, addr) < 0)<br>
+ goto error;<br>
+<br>
+ if (virJSONValueObjectGetNumberInt(ip_addr_obj, "prefix",<br>
+ &ip_addr->prefix) < 0) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",<br>
+ _("malformed 'prefix' field"));<br>
+ goto error;<br>
+ }<br>
+ }<br>
+ }<br>
+<br>
+ *ifaces = ifaces_ret;<br>
+ ifaces_ret = NULL;<br>
+ ret = ifaces_count;<br>
+<br>
+cleanup:<br>
+ virJSONValueFree(cmd);<br>
+ virJSONValueFree(reply);<br>
+ return ret;<br>
+<br>
+error:<br>
+ if (ifaces_ret) {<br>
+ for (i = 0; i < ifaces_count; i++) {<br>
+ if (ifaces_ret[i])<br>
+ virDomainInterfaceFree(ifaces_ret[i]);<br>
+ }<br>
+ }<br>
+ VIR_FREE(ifaces_ret);<br>
+ goto cleanup;<br>
+}<br>
+<br>
+<br>
/*<br>
* qemuAgentFSThaw:<br>
* @mon: Agent<br>
diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h<br>
index 5fbacdb..58b56fd 100644<br>
--- a/src/qemu/qemu_agent.h<br>
+++ b/src/qemu/qemu_agent.h<br>
@@ -76,6 +76,9 @@ int qemuAgentFSThaw(qemuAgentPtr mon);<br>
int qemuAgentSuspend(qemuAgentPtr mon,<br>
unsigned int target);<br>
<br>
+int qemuAgentGetInterfaces(qemuAgentPtr mon,<br>
+ virDomainInterfacePtr **ifaces);<br>
+<br>
int qemuAgentArbitraryCommand(qemuAgentPtr mon,<br>
const char *cmd,<br>
char **result,<br>
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c<br>
index 0a8e518..0cd266f 100644<br>
--- a/src/qemu/qemu_driver.c<br>
+++ b/src/qemu/qemu_driver.c<br>
@@ -16035,6 +16035,60 @@ qemuNodeSuspendForDuration(virConnectPtr conn,<br>
return nodeSuspendForDuration(target, duration, flags);<br>
}<br>
<br>
+static int<br>
+qemuDomainInterfacesAddresses(virDomainPtr dom,<br>
+ virDomainInterfacePtr **ifaces,<br>
+ unsigned int flags)<br>
+{<br>
+ virQEMUDriverPtr driver = dom->conn->privateData;<br>
+ qemuDomainObjPrivatePtr priv = NULL;<br>
+ virDomainObjPtr vm = NULL;<br>
+ int ret = -1;<br>
+<br>
+ virCheckFlags(0, -1);<br>
+<br>
+ if (!(vm = qemuDomObjFromDomain(dom)))<br>
+ goto cleanup;<br>
+<br>
+ if (!virDomainObjIsActive(vm)) {<br>
+ virReportError(VIR_ERR_OPERATION_INVALID, "%s",<br>
+ _("domain is not running"));<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ priv = vm->privateData;<br>
+<br>
+ if (virDomainInterfacesAddressesEnsureACL(dom->conn, vm->def) < 0)<br>
+ goto cleanup;<br>
+<br>
+ if (priv->agentError) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",<br>
+ _("QEMU guest agent is not "<br>
+ "available due to an error"));<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ if (!priv->agent) {<br>
+ virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",<br>
+ _("QEMU guest agent is not configured"));<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)<br>
+ goto cleanup;<br>
+<br>
+ qemuDomainObjEnterAgent(vm);<br>
+ ret = qemuAgentGetInterfaces(priv->agent, ifaces);<br>
+ qemuDomainObjExitAgent(vm);<br>
+<br>
+ if (qemuDomainObjEndJob(driver, vm) == 0)<br>
+ vm = NULL;<br>
+<br>
+cleanup:<br>
+ if (vm)<br>
+ virObjectUnlock(vm);<br>
+ return ret;<br>
+}<br>
<br>
static virDriver qemuDriver = {<br>
.no = VIR_DRV_QEMU,<br>
@@ -16130,6 +16184,7 @@ static virDriver qemuDriver = {<br>
.domainMemoryPeek = qemuDomainMemoryPeek, /* 0.4.4 */<br>
.domainGetBlockInfo = qemuDomainGetBlockInfo, /* 0.8.1 */<br>
.nodeGetCPUStats = qemuNodeGetCPUStats, /* 0.9.3 */<br>
+ .domainInterfacesAddresses = qemuDomainInterfacesAddresses, /* 1.1.2 */<br>
.nodeGetMemoryStats = qemuNodeGetMemoryStats, /* 0.9.3 */<br>
.nodeGetCellsFreeMemory = qemuNodeGetCellsFreeMemory, /* 0.4.4 */<br>
.nodeGetFreeMemory = qemuNodeGetFreeMemory, /* 0.4.4 */<br>
diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c<br>
index 4e27981..6b6c47f 100644<br>
--- a/tests/qemuagenttest.c<br>
+++ b/tests/qemuagenttest.c<br>
@@ -31,6 +31,8 @@<br>
<br>
#define VIR_FROM_THIS VIR_FROM_NONE<br>
<br>
+<br>
+<br>
static int<br>
testQemuAgentFSFreeze(const void *data)<br>
{<br>
@@ -271,6 +273,7 @@ cleanup:<br>
}<br>
<br>
<br>
+<br>
static int<br>
testQemuAgentShutdown(const void *data)<br>
{<br>
@@ -496,7 +499,7 @@ testQemuAgentArbitraryCommand(const void *data)<br>
goto cleanup;<br>
<br>
if (qemuAgentArbitraryCommand(qemuMonitorTestGetAgent(test),<br>
- "{\"execute\":\"ble\"}",<br>
+ "{\"execute\":\"ble\"}",<br>
&reply,<br>
VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0)<br>
goto cleanup;<br>
@@ -576,6 +579,90 @@ cleanup:<br>
return ret;<br>
}<br>
<br>
+static const char testQemuAgentGetInterfacesResponse[] =<br>
+ "{\"return\": "<br>
+ " ["<br>
+ " {\"name\":\"lo\","<br>
+ " \"ip-addresses\":"<br>
+ " ["<br>
+ " {\"ip-address-type\":\"ipv4\","<br>
+ " \"ip-address\":\"127.0.0.1\","<br>
+ " \"prefix\":8"<br>
+ " },"<br>
+ " {\"ip-address-type\":\"ipv6\","<br>
+ " \"ip-address\":\"::1\","<br>
+ " \"prefix\":128"<br>
+ " }"<br>
+ " ],"<br>
+ " \"hardware-address\":\"00:00:00:00:00:00\""<br>
+ " },"<br>
+ " {\"name\":\"eth0\","<br>
+ " \"ip-addresses\":"<br>
+ " ["<br>
+ " {\"ip-address-type\":\"ipv4\","<br>
+ " \"ip-address\":\"192.168.102.142\","<br>
+ " \"prefix\":24"<br>
+ " },"<br>
+ " {\"ip-address-type\":\"ipv6\","<br>
+ " \"ip-address\":\"fe80::5054:ff:fe89:ad35\","<br>
+ " \"prefix\":64"<br>
+ " }"<br>
+ " ],"<br>
+ " \"hardware-address\":\"52:54:00:89:ad:35\""<br>
+ " },"<br>
+ " {\"name\":\"eth1\","<br>
+ " \"ip-addresses\":"<br>
+ " ["<br>
+ " {\"ip-address-type\":\"ipv4\","<br>
+ " \"ip-address\":\"192.168.103.83\","<br>
+ " \"prefix\":24"<br>
+ " },"<br>
+ " {\"ip-address-type\":\"ipv6\","<br>
+ " \"ip-address\":\"fe80::5054:ff:fed3:39ee\","<br>
+ " \"prefix\":64"<br>
+ " }"<br>
+ " ],"<br>
+ " \"hardware-address\":\"52:54:00:d3:39:ee\""<br>
+ " }"<br>
+ " ]"<br>
+ "}";<br>
+<br>
+static int<br>
+testQemuAgentGetInterfaces(const void *data)<br>
+{<br>
+ virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;<br>
+ qemuMonitorTestPtr test = qemuMonitorTestNewAgent(xmlopt);<br>
+ int ret = -1;<br>
+ int ifaces_count = 0;<br>
+ virDomainInterfacePtr *ifaces;<br>
+<br>
+ if (!test)<br>
+ return -1;<br>
+<br>
+ if (qemuMonitorTestAddAgentSyncResponse(test) < 0)<br>
+ goto cleanup;<br>
+<br>
+ if (qemuMonitorTestAddItem(test, "guest-network-get-interfaces",<br>
+ testQemuAgentGetInterfacesResponse) < 0)<br>
+ goto cleanup;<br>
+<br>
+ if ((ifaces_count = qemuAgentGetInterfaces(qemuMonitorTestGetAgent(test),<br>
+ &ifaces)) < 0) {<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ if (ifaces_count != 3) {<br>
+ virReportError(VIR_ERR_INTERNAL_ERROR,<br>
+ "expected 3 interfaces, got %d", ret);<br>
+ goto cleanup;<br>
+ }<br>
+<br>
+ ret = 0;<br>
+<br>
+cleanup:<br>
+ qemuMonitorTestFree(test);<br>
+ return ret;<br>
+}<br>
<br>
static int<br>
mymain(void)<br>
@@ -605,6 +692,7 @@ mymain(void)<br>
DO_TEST(Shutdown);<br>
DO_TEST(CPU);<br>
DO_TEST(ArbitraryCommand);<br>
+ DO_TEST(GetInterfaces);<br>
<br>
DO_TEST(Timeout); /* Timeout should always be called last */<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.7.11.7<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div dir="ltr">Nehal J. Wani<br>
UG3, BTech CS+MS(CL)<br>
IIIT-Hyderabad<div><a href="http://commandlinewani.blogspot.com" target="_blank">http://commandlinewani.blogspot.com</a></div></div>
</div>