On Wed, May 22, 2019 at 10:10:34PM +0200, Ilias Stamatis wrote:
> Ignore @source in the case of the test driver and return fixed private
> IPv4 addresses for all the interfaces defined in the domain.
>
> Signed-off-by: Ilias Stamatis <stamatis.iliass@xxxxxxxxx>
> ---
>
> The default config of the test driver has no guest interfaces defined,
> so this must be tested with a custom config.
>
> Maybe it would be a good idea to add one or more guest interfaces in the
> default config. I could send an additional patch for this.
I agree and at the same time I think that patch and this one should be part of
the same series.
>
> src/test/test_driver.c | 71 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 71 insertions(+)
>
> diff --git a/src/test/test_driver.c b/src/test/test_driver.c
> index a4c17ef0df..3a81f51a88 100644
> --- a/src/test/test_driver.c
> +++ b/src/test/test_driver.c
> @@ -3220,6 +3220,76 @@ static int testDomainBlockStats(virDomainPtr domain,
> return ret;
> }
>
> +static int
> +testDomainInterfaceAddresses(virDomainPtr dom,
> + virDomainInterfacePtr **ifaces,
> + unsigned int source ATTRIBUTE_UNUSED,
> + unsigned int flags)
> +{
> + size_t i;
> + size_t ifaces_count = 0;
> + int ret = -1;
> + char ipaddr[32];
> + char macaddr[VIR_MAC_STRING_BUFLEN];
> + virDomainObjPtr vm = NULL;
> + virDomainInterfacePtr iface = NULL;
> + virDomainInterfacePtr *ifaces_ret = NULL;
> +
> + virCheckFlags(0, -1);
> +
> + if (!(vm = testDomObjFromDomain(dom)))
> + goto cleanup;
> +
> + if (virDomainObjCheckActive(vm) < 0)
> + goto cleanup;
> +
> + if (VIR_ALLOC_N(ifaces_ret, vm->def->nnets) < 0)
> + goto cleanup;
> +
> + for (i = 0; i < vm->def->nnets; i++) {
> + if (VIR_ALLOC(iface) < 0)
> + goto cleanup;
> +
> + if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0)
> + goto cleanup;
> +
> + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr);
> + if (VIR_STRDUP(iface->hwaddr, macaddr) < 0)
> + goto cleanup;
> +
> + if (VIR_ALLOC(iface->addrs) < 0)
> + goto cleanup;
> +
> + iface->addrs[0].type = VIR_IP_ADDR_TYPE_IPV4;
> + iface->addrs[0].prefix = 24;
> +
> + sprintf(ipaddr, "192.168.0.%ld", 100 + (i % 155));
It's test driver do we expect to be dealing with that many interfaces? I think
'100 + i' or even 'i + i' would be just fine, we don't need to overcomplicate
it.
> + if (VIR_STRDUP(iface->addrs[0].addr, ipaddr) < 0)
> + goto cleanup;
How about using virAsprintf directly into iface->addrs[0].addr? (sprintf is also
blacklisted by the syntax-check)
> +
> + iface->naddrs = 1;
> +
> + VIR_STEAL_PTR(ifaces_ret[i], iface);
We usually use VIR_APPEND_ELEMENT for ^this, it also takes the ifaces_count
counter which it increments for you, but since you already pre-allocated the
list earlier, you'd be interested in the _INPLACE version of the same macro.
Erik
> + ifaces_count++;
> + }
> +
> + VIR_STEAL_PTR(*ifaces, ifaces_ret);
> + ret = ifaces_count;
> +
> + cleanup:
> + virDomainObjEndAPI(&vm);
> +
> + if (ifaces_ret) {
> + for (i = 0; i < ifaces_count; i++)
> + virDomainInterfaceFree(ifaces_ret[i]);
> + }
> + virDomainInterfaceFree(iface);
> +
> + VIR_FREE(ifaces_ret);
> +
> + return ret;
> +}
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
