From nobody Mon May 13 05:56:29 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551750919463708.0838027585878; Mon, 4 Mar 2019 17:55:19 -0800 (PST) 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 AE0A259449; Tue, 5 Mar 2019 01:55:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48B8A2A2FF; Tue, 5 Mar 2019 01:55:17 +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 F20DD41F3C; Tue, 5 Mar 2019 01:55:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x251siKg021347 for ; Mon, 4 Mar 2019 20:54:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 19FED60261; Tue, 5 Mar 2019 01:54:44 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 144A160F8D for ; Tue, 5 Mar 2019 01:54:42 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D7F1959445 for ; Tue, 5 Mar 2019 01:54:40 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id y140so3973292qkb.9 for ; Mon, 04 Mar 2019 17:54:40 -0800 (PST) Received: from localhost.localdomain ([177.188.104.249]) by smtp.gmail.com with ESMTPSA id s76sm4810049qki.42.2019.03.04.17.54.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 17:54:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EJ/Gug8zWUdbCeQUxA5EroJueMn5sDITJYDUzmpwWyg=; b=N9AF8LrDtPD7O7uQ2HmiwADQaRhkV8wGso5EVzGVwEeta1wWtqGzFCRsBOsaEUPKXI VsLnVqK2Q+lsLFnAcSpk1tJjYs/Op4tYi5PPnBvB/aeq2U+jHCCC4aEgJpW68mHQd7mL PwwNRuyevy6SSrUIaqJQNqPmwoLshxaxc6adatYMEJ4eor+pTam5kioZl/yjcPdjFbSl /mObQCoy4L1ymnRD7gh0uNlBAmOIg7s53faciWWMOMKpHO7nPNjnDw06h6NHXXHydfT3 WHzyo7bdyx2ymRd7qtlDQwXBJMPjtWIwjCAbdqpCbBobr16YYGXnC8rJZ8F8sgcnpP8O f2sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EJ/Gug8zWUdbCeQUxA5EroJueMn5sDITJYDUzmpwWyg=; b=jwOnFeyZA1ojNWQKKptTlgyskXt66quRr7U7ODCoH/fjdzfJw5fL5rk6MnVyCVAXDN njFapLZXmeS9jLzhEvK06XPGgI6hh2gNV8BCBn2s6VNNFWA46pHsr4oymSOcJSHu+yuz DSEtRKp6z3L8kZOhOd5v+J8S5ZKydRH8d+gH3dyeAOMa8bLHOGdu5toJzXxbWA/qITBM cKdEwGL7MSz09xuzIf86oePHrYZZpNJEewV97MSs7/WUIUptfSzxvAQpWdrfChe90bTr IDRKUz9I3El506w9ymZnxbMgsglxaA0zPi6vR5DQl2ZvlFoPKvgAQgOs9kwXO4FbhOs+ 9pmg== X-Gm-Message-State: APjAAAX64IYxKF2Wgu0PWt9P2cbMI8lRIZRo9ZdsxrhKuYVbt/3RxVE+ RcRhdOjE/3bngdsKRnR0lIqmtN4S X-Google-Smtp-Source: APXvYqzENS2wpgz5ezH3DPLhcX/PdFYTEiYWoozmSX2DwIAOu0+0atwh9Iav/JlPHWKWoxZJJ87WRA== X-Received: by 2002:a37:32d4:: with SMTP id y203mr61896qky.282.1551750879782; Mon, 04 Mar 2019 17:54:39 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Mon, 4 Mar 2019 22:54:27 -0300 Message-Id: <20190305015432.8537-2-jcfaracco@gmail.com> In-Reply-To: <20190305015432.8537-1-jcfaracco@gmail.com> References: <20190305015432.8537-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 05 Mar 2019 01:54:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 05 Mar 2019 01:54:40 +0000 (UTC) for IP:'209.85.222.193' DOMAIN:'mail-qk1-f193.google.com' HELO:'mail-qk1-f193.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.222.193 mail-qk1-f193.google.com 209.85.222.193 mail-qk1-f193.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/6] lxc: Rebase lxcNetworkParseData struct to support indexes. 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: , 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.39]); Tue, 05 Mar 2019 01:55:18 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The current logic of lxcNetworkParseData uses one single structure to record data over the network definitions inside config files. The logic consider the entry 'type' as a new network definition, every time that algorithm find this tag. This new structure was designed to consider network definitions as an array of network structures. Signed-off-by: Julio Faracco --- src/lxc/lxc_native.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 2fd349ac1d..bf82cd1e98 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -423,8 +423,9 @@ lxcCreateHostdevDef(int mode, int type, const char *dat= a) return hostdev; } =20 -typedef struct { - virDomainDefPtr def; +typedef struct _lxcNetworkParseData lxcNetworkParseData; +typedef lxcNetworkParseData *lxcNetworkParseDataPtr; +struct _lxcNetworkParseData { char *type; char *link; char *mac; @@ -436,9 +437,14 @@ typedef struct { size_t nips; char *gateway_ipv4; char *gateway_ipv6; - bool privnet; - size_t networks; -} lxcNetworkParseData; + size_t index; +}; + +typedef struct { + lxcNetworkParseDataPtr *data; + size_t nnetworks; +} lxcNetworkParseArray; + =20 static int lxcAddNetworkRouteDefinition(const char *address, --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 13 05:56:29 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551750928724934.4795706099472; Mon, 4 Mar 2019 17:55:28 -0800 (PST) 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 F2EAA81F0D; Tue, 5 Mar 2019 01:55:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C903E600D7; Tue, 5 Mar 2019 01:55:26 +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 887AD41F3D; Tue, 5 Mar 2019 01:55:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x251shjL021340 for ; Mon, 4 Mar 2019 20:54:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id B19E41753C; Tue, 5 Mar 2019 01:54:43 +0000 (UTC) Received: from mx1.redhat.com (ext-mx18.extmail.prod.ext.phx2.redhat.com [10.5.110.47]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC3EE5C207 for ; Tue, 5 Mar 2019 01:54:43 +0000 (UTC) Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9B38B30821B2 for ; Tue, 5 Mar 2019 01:54:42 +0000 (UTC) Received: by mail-qk1-f196.google.com with SMTP id x6so3981714qki.6 for ; Mon, 04 Mar 2019 17:54:42 -0800 (PST) Received: from localhost.localdomain ([177.188.104.249]) by smtp.gmail.com with ESMTPSA id s76sm4810049qki.42.2019.03.04.17.54.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 17:54:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ogCiwNXjR19raWuFnAda1tqS6xxTDAJYsGVzLsKRp6s=; b=VvqpM/i7Yz0hnHvrX/IQ6n+zHFYblyx9Ff9FRAK2cUN4jDOKOk72SPjRVlSmYZtBOL metInRqtshpnMamyYbFe5PauMqgaowQcr3oNUzJ7Vr8LlA4Sy6Q4feWDwaOW/5APwJaQ Zt8pRlXakZZVVdvZTBvQLF+TlgPt2DmDGlM2vlMW0jMdGsEBeaJDZwnnDC26xlMEkx4w KqxxGqXtpuz+pDfTqCgroNpSqVdiheiwOoZZ51TZtDPVEWcRWGhTzlCg0qrvJrlkmb4Z TPiz0jf8dEDG35rHxge/0s+FWET9zphi9bQdSq3I0X5BILO9rYACVGgS9CaA94p/YGII oSaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ogCiwNXjR19raWuFnAda1tqS6xxTDAJYsGVzLsKRp6s=; b=HE7eesZfBw4smtXdYej1CBiiTgl2iSQx75U8wCzbpjzH8sQsmn3c6M9Yjou3CmhHcA 4Y4Ha4wZKY2yqlmAdvXpKDEk2MMsXErHAlfF0CgV7tNtDkSWx6dY7v54PSBnCWKa2Sw6 vcSrIF/JKBaVD2v15c0uCVqSL9zE7z1FfrifyFxWk6VYoe/rS8E0jHEDdPBmHpXPJONp 55H/cHHD3b35Ft1F04IiEDLxT2Q0/PQ0i0zftIskWh4S3QSiqAsqara7cGNe/WzGsRJ/ zJnhWOm/OQ+RZDtTp5qFPKdwxLrfS9POj+9UFy1U5o/scpq3PikV9K3uVtqsRC3faWbg u8Tw== X-Gm-Message-State: APjAAAWxGDJr/pRIbDEDVqywPzvwjt0J7gCn+BX3R/KRtolcxv9k9gk1 wNtAeOJyco8y7wlVPdU37ZZL50d9 X-Google-Smtp-Source: APXvYqzVXk0HuwkKUi7dILI1SFfhIBrCxnoZigC8fDAthYji8UP563GVHWyHSJ9nyoTWWW/G6p3zug== X-Received: by 2002:a05:620a:11b8:: with SMTP id c24mr56516qkk.57.1551750881542; Mon, 04 Mar 2019 17:54:41 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Mon, 4 Mar 2019 22:54:28 -0300 Message-Id: <20190305015432.8537-3-jcfaracco@gmail.com> In-Reply-To: <20190305015432.8537-1-jcfaracco@gmail.com> References: <20190305015432.8537-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 05 Mar 2019 01:54:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 05 Mar 2019 01:54:42 +0000 (UTC) for IP:'209.85.222.196' DOMAIN:'mail-qk1-f196.google.com' HELO:'mail-qk1-f196.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.222.196 mail-qk1-f196.google.com 209.85.222.196 mail-qk1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.47 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/6] lxc: Rebase lxcNetworkParseData pointers to use new structures. 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: , 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, 05 Mar 2019 01:55:27 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This commit refactor the code logic to introduce new array structures instead of single lxcNetworkParseData struct. Signed-off-by: Julio Faracco --- src/lxc/lxc_native.c | 94 +++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 62 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index bf82cd1e98..a6afbbe865 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -484,7 +484,7 @@ lxcAddNetworkRouteDefinition(const char *address, } =20 static int -lxcAddNetworkDefinition(lxcNetworkParseData *data) +lxcAddNetworkDefinition(virDomainDefPtr def, lxcNetworkParseDataPtr data) { virDomainNetDefPtr net =3D NULL; virDomainHostdevDefPtr hostdev =3D NULL; @@ -532,9 +532,9 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) &hostdev->source.caps.u.net.ip.nr= outes) < 0) goto error; =20 - if (VIR_EXPAND_N(data->def->hostdevs, data->def->nhostdevs, 1) < 0) + if (VIR_EXPAND_N(def->hostdevs, def->nhostdevs, 1) < 0) goto error; - data->def->hostdevs[data->def->nhostdevs - 1] =3D hostdev; + def->hostdevs[def->nhostdevs - 1] =3D hostdev; } else { if (!(net =3D lxcCreateNetDef(data->type, data->link, data->mac, data->flag, data->macvlanmode, @@ -556,9 +556,9 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) &net->guestIP.nroutes) < 0) goto error; =20 - if (VIR_EXPAND_N(data->def->nets, data->def->nnets, 1) < 0) + if (VIR_EXPAND_N(def->nets, def->nnets, 1) < 0) goto error; - data->def->nets[data->def->nnets - 1] =3D net; + def->nets[def->nnets - 1] =3D net; } =20 return 1; @@ -572,44 +572,10 @@ lxcAddNetworkDefinition(lxcNetworkParseData *data) return -1; } =20 - -static int -lxcNetworkParseDataType(virConfValuePtr value, - lxcNetworkParseData *parseData) -{ - virDomainDefPtr def =3D parseData->def; - size_t networks =3D parseData->networks; - bool privnet =3D parseData->privnet; - int status; - - /* Store the previous NIC */ - status =3D lxcAddNetworkDefinition(parseData); - - if (status < 0) - return -1; - else if (status > 0) - networks++; - else if (parseData->type !=3D NULL && STREQ(parseData->type, "none")) - privnet =3D false; - - /* clean NIC to store a new one */ - memset(parseData, 0, sizeof(*parseData)); - - parseData->def =3D def; - parseData->networks =3D networks; - parseData->privnet =3D privnet; - - /* Keep the new value */ - parseData->type =3D value->str; - - return 0; -} - - static int lxcNetworkParseDataIPs(const char *name, virConfValuePtr value, - lxcNetworkParseData *parseData) + lxcNetworkParseDataPtr parseData) { int family =3D AF_INET; char **ipparts =3D NULL; @@ -648,14 +614,13 @@ lxcNetworkParseDataIPs(const char *name, static int lxcNetworkParseDataSuffix(const char *entry, virConfValuePtr value, - lxcNetworkParseData *parseData) + lxcNetworkParseDataPtr parseData) { int elem =3D virLXCNetworkConfigEntryTypeFromString(entry); =20 switch (elem) { case VIR_LXC_NETWORK_CONFIG_TYPE: - if (lxcNetworkParseDataType(value, parseData) < 0) - return -1; + parseData->type =3D value->str; break; case VIR_LXC_NETWORK_CONFIG_LINK: parseData->link =3D value->str; @@ -700,7 +665,7 @@ lxcNetworkParseDataSuffix(const char *entry, static int lxcNetworkParseDataEntry(const char *name, virConfValuePtr value, - lxcNetworkParseData *parseData) + lxcNetworkParseDataPtr parseData) { const char *suffix =3D STRSKIP(name, "lxc.network."); =20 @@ -711,7 +676,8 @@ lxcNetworkParseDataEntry(const char *name, static int lxcNetworkWalkCallback(const char *name, virConfValuePtr value, void *data) { - lxcNetworkParseData *parseData =3D data; + lxcNetworkParseArray *networks =3D data; + lxcNetworkParseDataPtr parseData =3D NULL; =20 if (STRPREFIX(name, "lxc.network.")) return lxcNetworkParseDataEntry(name, value, parseData); @@ -724,26 +690,26 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virCon= fPtr properties) { int status; int result =3D -1; - size_t i; - lxcNetworkParseData data =3D {def, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, 0, - NULL, NULL, true, 0}; + size_t i, j; + bool privnet =3D true; + lxcNetworkParseArray nets =3D {NULL, 0}; =20 - if (virConfWalk(properties, lxcNetworkWalkCallback, &data) < 0) + if (virConfWalk(properties, lxcNetworkWalkCallback, &nets) < 0) goto error; =20 + for (i =3D 0; i < nets.nnetworks; i++) { + lxcNetworkParseDataPtr data =3D nets.data[i]; =20 - /* Add the last network definition found */ - status =3D lxcAddNetworkDefinition(&data); + /* Add network definitions */ + status =3D lxcAddNetworkDefinition(def, data); =20 - if (status < 0) - goto error; - else if (status > 0) - data.networks++; - else if (data.type !=3D NULL && STREQ(data.type, "none")) - data.privnet =3D false; + if (status < 0) + goto error; + else if (data->type !=3D NULL && STREQ(data->type, "none")) + privnet =3D false; + } =20 - if (data.networks =3D=3D 0 && data.privnet) { + if (nets.nnetworks =3D=3D 0 && privnet) { /* When no network type is provided LXC only adds loopback */ def->features[VIR_DOMAIN_FEATURE_PRIVNET] =3D VIR_TRISTATE_SWITCH_= ON; } @@ -752,9 +718,13 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConf= Ptr properties) return result; =20 error: - for (i =3D 0; i < data.nips; i++) - VIR_FREE(data.ips[i]); - VIR_FREE(data.ips); + for (i =3D 0; i < nets.nnetworks; i++) { + for (j =3D 0; j < nets.data[i]->nips; j++) + VIR_FREE(nets.data[i]->ips[j]); + VIR_FREE(nets.data[i]->ips); + } + for (i =3D 0; i < nets.nnetworks; i++) + VIR_FREE(nets.data[i]); return -1; } =20 --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 13 05:56:29 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551750987014251.06380288844252; Mon, 4 Mar 2019 17:56:27 -0800 (PST) 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 7D75B59445; Tue, 5 Mar 2019 01:56: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 579255D9D4; Tue, 5 Mar 2019 01:56: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 135DB181A010; Tue, 5 Mar 2019 01:56:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x251sm5Q021364 for ; Mon, 4 Mar 2019 20:54:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 00046600D7; Tue, 5 Mar 2019 01:54:48 +0000 (UTC) Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE0E3600C2 for ; Tue, 5 Mar 2019 01:54:45 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4022D81F10 for ; Tue, 5 Mar 2019 01:54:44 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id o6so7415238qtk.6 for ; Mon, 04 Mar 2019 17:54:44 -0800 (PST) Received: from localhost.localdomain ([177.188.104.249]) by smtp.gmail.com with ESMTPSA id s76sm4810049qki.42.2019.03.04.17.54.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 17:54:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lXqNn4VPmIpyupH8YTiJl1BpJMmWszcZharc68rqDjg=; b=uSk5A1ADIVu4xzqapjkd3ky0WlR3aFg2p003HUs4ZOhmdx+g2T/tv6BXZEwQSK3ROD qeVGHASmwbYTgrEZA6GlxrLQ0PyJT813TxBMjvvwTy92P+uB9lrVDbjfpgNBJfmtezEf YT3HpcNzosrV9IHHJznWfEe5glUPXyEBrQHJOiCCIK15DiUDmYYjD2j70F1D3/QMFp/2 fMklHjidzIdoAcry9oq51TEdK4wnQc2uAwX0j+8wVOeLhqCpFQnubtI6en/5NNdfKssU Nib3+OxZWSPx/0F9m1+S2eKm4TKFLZKw5RvVR3EB7b3t1r17c3EPr9vgtGU/TrpP0ugi xOJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lXqNn4VPmIpyupH8YTiJl1BpJMmWszcZharc68rqDjg=; b=PhsbeoBwiTRqnyz7BfjtEtnE7pd6geXk+zsOvS2OV9MvdSK3pQfZ8IhfrZeiPu8YJp 7WX+U+faBRplT2ALuAHvCXApzttyefSk47G1+IMs+8ZZldyxd5UFCXgWx3lHVqxXtgYe wQbT5jZLLGcahoHpYjsMmPp6/CZ2I+VpTc3CmZ/4a3tnlEWUn7ttsVSKujFI+2y83ZmX jZAd8OqferfUErUmXvlNssLeng7IIodmAKe+mEKxpD4sz+11Arl/4jUREIsWUDEj8LZk oXpKX6LJpN3rm5Br/ZUk8IG9ur7XmCWqsvzveP43jmIuB7eWPSBMhngvRq2XGDKC3SMb xZJA== X-Gm-Message-State: APjAAAXLYtdoZ1BSXb74LRIrsR3rjaIcnJYYS9O9gWMa5pjUahbR9mHi KQ1GkanMCiFtUt53WoMGsjCDHxYe X-Google-Smtp-Source: APXvYqxBwECaiHbnQdkUlwX+rUlhgwKmHpV4wPGtZ+yp4r0gdWQ8kO3Ycbf5djrmatFaBtzaRyiVSQ== X-Received: by 2002:a0c:d4ab:: with SMTP id u40mr318305qvh.30.1551750883165; Mon, 04 Mar 2019 17:54:43 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Mon, 4 Mar 2019 22:54:29 -0300 Message-Id: <20190305015432.8537-4-jcfaracco@gmail.com> In-Reply-To: <20190305015432.8537-1-jcfaracco@gmail.com> References: <20190305015432.8537-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 05 Mar 2019 01:54:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 05 Mar 2019 01:54:44 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.13 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.83 on 10.5.110.25 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 3/6] lxc: Introduce lxcNetworkGetParseDataLegacy() method. 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: , 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.39]); Tue, 05 Mar 2019 01:56:25 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This function was introduced to fetch/alloc new data for legacy entries inside config file: 'lxc.network.foo'. Libvirt still need to support both versions. So, this function can be easy to remove in the future. Signed-off-by: Julio Faracco --- src/lxc/lxc_native.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index a6afbbe865..1ecbae0e31 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -572,6 +572,37 @@ lxcAddNetworkDefinition(virDomainDefPtr def, lxcNetwor= kParseDataPtr data) return -1; } =20 +static lxcNetworkParseDataPtr +lxcNetworkGetParseDataLegacy(lxcNetworkParseArray *networks, + const char *name) +{ + const char *suffix =3D STRSKIP(name, "lxc.network."); + int elem =3D virLXCNetworkConfigEntryTypeFromString(suffix); + size_t index =3D networks->nnetworks; + + if (elem =3D=3D VIR_LXC_NETWORK_CONFIG_TYPE) { + if (!networks->data) { + if (VIR_ALLOC_N(networks->data, index + 1) < 0) + return NULL; + } else { + if (VIR_REALLOC_N(networks->data, index + 1) < 0) + return NULL; + } + + if (VIR_ALLOC(networks->data[index]) < 0) + return NULL; + + networks->data[index]->index =3D index; + networks->nnetworks++; + + /* Return a new network. */ + return networks->data[index]; + } + + /* Return the last network. */ + return networks->data[index-1]; +} + static int lxcNetworkParseDataIPs(const char *name, virConfValuePtr value, @@ -679,8 +710,12 @@ lxcNetworkWalkCallback(const char *name, virConfValueP= tr value, void *data) lxcNetworkParseArray *networks =3D data; lxcNetworkParseDataPtr parseData =3D NULL; =20 - if (STRPREFIX(name, "lxc.network.")) + if (STRPREFIX(name, "lxc.network.")) { + if (!(parseData =3D lxcNetworkGetParseDataLegacy(networks, name))) + return -1; + return lxcNetworkParseDataEntry(name, value, parseData); + } =20 return 0; } --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 13 05:56:29 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155175093185984.73499866407974; Mon, 4 Mar 2019 17:55:31 -0800 (PST) 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 48C0288304; Tue, 5 Mar 2019 01:55:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 194A16013F; Tue, 5 Mar 2019 01:55:30 +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 C51293FB11; Tue, 5 Mar 2019 01:55:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x251smET021370 for ; Mon, 4 Mar 2019 20:54:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id BA8061001DF8; Tue, 5 Mar 2019 01:54:48 +0000 (UTC) Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B41331001DC5 for ; Tue, 5 Mar 2019 01:54:46 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3663307E042 for ; Tue, 5 Mar 2019 01:54:45 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id a48so7419358qtb.4 for ; Mon, 04 Mar 2019 17:54:45 -0800 (PST) Received: from localhost.localdomain ([177.188.104.249]) by smtp.gmail.com with ESMTPSA id s76sm4810049qki.42.2019.03.04.17.54.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 17:54:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EyecPGFW8ifYsd+JpA6SUjm1eXELG3xTTmsl3Oc8+ns=; b=XVmpmBruVXiZZ2z/3zfHp5E9v747q+l/C4Dvy29MI+qpaElaRw/2NVZegHgXezDD/8 9JKoZFLdLkfxJeUMfaZDrBnhtY17a2MBMznhTBAitAL6qdVlIqw20po7G2CJ5SeN7/fV TPYJHdNklZA9d1ZQ3O/QmWxbARk6lTTOjes9JI2EuGLvZmrJ0s9zX6eGhlYmWy+U3QIZ 0hhkzjPN28SXP0TfNnOpT/jOgzLsmVoAl3dRrW9nEMOtZJm/XcsPHL7MGWApW9/b/b3c 2nu1UP/7Ix5pWmTuD/S5H/HhEhunBgvt0mJLbLHvFhU8gIPNgszOTg31B6t7TDdhEkmr 4sSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EyecPGFW8ifYsd+JpA6SUjm1eXELG3xTTmsl3Oc8+ns=; b=mHBhi58857XauvEy3YpbrF3tuCoSYbel7NDf3JjkACdHP2uVGPZr9awZCYhJDLpRhX 1cbfwH+oibOxjE1InN3jyBOyyd1zTVmJMufDuq0tm+uabGAwNZ5vwiiSxN3y6ISBr+CX YwPYrC5/68YpAVEip9ho4hYUbTkUcWTwOj5X2ljmMkaaUMNP+r9VxvsqBoVdecHT4WdZ PufBfzCE5W8szGsD5kBiyKzCYZZSnAGCKFNJ8ARMQJwqmdsnAXY7bo28AojWQKRIP/oo ColTehuunNvCUzBDhQMmqEdTegztEGiWqecpZMFs664+npKMTsgH+JGAHVolABBoANK9 2UAA== X-Gm-Message-State: APjAAAUDnuFQ+HS21ywLDXNvrGoTVpp0A+H8pEmwvNQgs737qV7UnP5P 0FXwV7Dzy0OirC57OxIRzFRiW9DK X-Google-Smtp-Source: APXvYqzEISH7sVpxBFetXPASiVcWQ/NdQr6LPeVtGwEOCrIs3fAKnpABG0athzl9lFb2cxm33NiodQ== X-Received: by 2002:a0c:8807:: with SMTP id 7mr285639qvl.67.1551750884685; Mon, 04 Mar 2019 17:54:44 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Mon, 4 Mar 2019 22:54:30 -0300 Message-Id: <20190305015432.8537-5-jcfaracco@gmail.com> In-Reply-To: <20190305015432.8537-1-jcfaracco@gmail.com> References: <20190305015432.8537-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 05 Mar 2019 01:54:45 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 05 Mar 2019 01:54:45 +0000 (UTC) for IP:'209.85.160.193' DOMAIN:'mail-qt1-f193.google.com' HELO:'mail-qt1-f193.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.13 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.193 mail-qt1-f193.google.com 209.85.160.193 mail-qt1-f193.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.42 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 4/6] lxc: Introduce lxcNetworkGetParseData() for 'lxc.net.' entry. 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: , 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.28]); Tue, 05 Mar 2019 01:55:30 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This commit moves old lxcNetworkGetParseData() to lxcNetworkGetParseDataLegacy() and create a new method for LXC version 3.X called lxcNetworkGetParseData(). This is same idea of method lxcNetworkGetParseDataLegacy(). In the future, it can be easy to remove or rebase, in case of deprecate 'lxc.network.foo' style. Signed-off-by: Julio Faracco --- src/lxc/lxc_native.c | 65 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 1ecbae0e31..22b74d10fb 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -603,6 +603,53 @@ lxcNetworkGetParseDataLegacy(lxcNetworkParseArray *net= works, return networks->data[index-1]; } =20 +static lxcNetworkParseDataPtr +lxcNetworkGetParseData(lxcNetworkParseArray *networks, + const char *name) +{ + size_t index, nnetworks =3D networks->nnetworks; + size_t i; + + sscanf(name, "lxc.net.%zu", &index); + + if (!nnetworks) { + if (VIR_ALLOC_N(networks->data, 1) < 0) + return NULL; + + if (VIR_ALLOC(networks->data[0]) < 0) + return NULL; + + networks->data[0]->index =3D index; + networks->nnetworks++; + + return networks->data[0]; + } + + for (i =3D 0; i < nnetworks; i++) { + if (networks->data[i]->index =3D=3D index) + return networks->data[i]; + } + + /* This is a new element in an existing array. */ + if (VIR_REALLOC_N(networks->data, nnetworks + 1) < 0) + return NULL; + + if (VIR_ALLOC(networks->data[nnetworks]) < 0) + return NULL; + + networks->nnetworks++; + + for (i =3D nnetworks; i > 0; i--) { + if (networks->data[i-1]->index < index) { + networks->data[i]->index =3D index; + return networks->data[i]; + } + memcpy(networks->data[i], networks->data[i-1], sizeof(lxcNetworkPa= rseData)); + } + + return NULL; +} + static int lxcNetworkParseDataIPs(const char *name, virConfValuePtr value, @@ -692,14 +739,25 @@ lxcNetworkParseDataSuffix(const char *entry, return 0; } =20 +static int +lxcNetworkParseDataEntryLegacy(const char *name, + virConfValuePtr value, + lxcNetworkParseData *parseData) +{ + const char *suffix =3D STRSKIP(name, "lxc.network."); + + return lxcNetworkParseDataSuffix(suffix, value, parseData); +} =20 static int lxcNetworkParseDataEntry(const char *name, virConfValuePtr value, lxcNetworkParseDataPtr parseData) { - const char *suffix =3D STRSKIP(name, "lxc.network."); + const char *suffix =3D STRSKIP(name, "lxc.net."); =20 + suffix =3D strchr(suffix, '.'); + suffix =3D STRSKIP(suffix, "."); return lxcNetworkParseDataSuffix(suffix, value, parseData); } =20 @@ -714,6 +772,11 @@ lxcNetworkWalkCallback(const char *name, virConfValueP= tr value, void *data) if (!(parseData =3D lxcNetworkGetParseDataLegacy(networks, name))) return -1; =20 + return lxcNetworkParseDataEntryLegacy(name, value, parseData); + } else if (STRPREFIX(name, "lxc.net.")) { + if (!(parseData =3D lxcNetworkGetParseData(networks, name))) + return -1; + return lxcNetworkParseDataEntry(name, value, parseData); } =20 --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 13 05:56:29 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551750991274787.457972481608; Mon, 4 Mar 2019 17:56:31 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CCF781F0D; Tue, 5 Mar 2019 01:56:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 70F2C5D6B3; Tue, 5 Mar 2019 01:56:29 +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 34A543FB11; Tue, 5 Mar 2019 01:56:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x251spIX021385 for ; Mon, 4 Mar 2019 20:54:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1F43D291EB; Tue, 5 Mar 2019 01:54:51 +0000 (UTC) Received: from mx1.redhat.com (ext-mx20.extmail.prod.ext.phx2.redhat.com [10.5.110.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1ADAD5D9D4 for ; Tue, 5 Mar 2019 01:54:48 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8A28D302451C for ; Tue, 5 Mar 2019 01:54:47 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id o6so7415357qtk.6 for ; Mon, 04 Mar 2019 17:54:47 -0800 (PST) Received: from localhost.localdomain ([177.188.104.249]) by smtp.gmail.com with ESMTPSA id s76sm4810049qki.42.2019.03.04.17.54.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 17:54:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=z/2qQf+it4QbW/Nf3xe/thdClF9rxMTSGUBJRhj9Af0=; b=j4O3e6VRdAjoNzM00HiOu50X0zG4++tnECtUc+JNb4o406UfGOWRtLRIIHen9zWd87 1fBWfo0P/nRArXg0SoOlJ8ZB4CC3E5gqezodpRq/ihGg2loKU1k8/wKnWijx7OZw/oQL gKRJsV/+ifFV5Vd8HSvpZ0T++Ks2cajhl3yz7VML0YPgrto9n4Rxh7y++6Ihkr0HEYh3 h72ZVbs6SMq6JBexYPWnltz1CbzCPAOpLt2z3nnsZTDd9/lUzvnL/CL1wQPUPe6y9dI5 vNHAoMpaHPAHygdczxqVNu7OAe9ghACn9X17k6GDRsLDZ6s+fmjbsPnabvaVlNr8tkVY 4OzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z/2qQf+it4QbW/Nf3xe/thdClF9rxMTSGUBJRhj9Af0=; b=CgOm+fJnC92j/mvY2ocf0fQqZ8L7sbDTCYdTvonF3HwSxJwjoG2OqUoiQLd9QFL7Ll oQF8tCDTDLvntW1qKwgii2KmFt64pgC4ec2/Xkqctoci/wzi0DfFgdhS5FRJwB9M9vvd 91+QmB1dqOTh2h07KlIvR83epFxqjU0rkn2a1cctdq3I2Wcq/d2B+Nkjp8/rz+EXsTIo +AcP9SzkaKGG0+qN2YzUF4a8vVInqsG/Gk/KXQ+dSQWRNDeH9OdHGvHkBSoOkDzGjOO/ KCmgruTDKrsoBAnVHkRtA4DYJW8cRQBQA5Wn1Lh0R5AGfKYULjidLfZKR83oJLfbrdQ+ mQZA== X-Gm-Message-State: APjAAAVczU4dATwUqAfzu0ulm/s6KXeY1Oc187Iv0K2j5NrhCWFl4xp9 o/xO0jTINtPKZ/bmbh2R3bCuSmXb X-Google-Smtp-Source: APXvYqyVuJb757Y1/0AbMIdMRsZ9drgESDkDeNctZU8RhnIPIuGkqcsn8szglxNZBoL5lh5D+O0mHg== X-Received: by 2002:ac8:3474:: with SMTP id v49mr16828497qtb.132.1551750886426; Mon, 04 Mar 2019 17:54:46 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Mon, 4 Mar 2019 22:54:31 -0300 Message-Id: <20190305015432.8537-6-jcfaracco@gmail.com> In-Reply-To: <20190305015432.8537-1-jcfaracco@gmail.com> References: <20190305015432.8537-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 05 Mar 2019 01:54:47 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 05 Mar 2019 01:54:47 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.13 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.49 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 5/6] tests: Change network settings of V3 testcase set. 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: , 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 05 Mar 2019 01:56:30 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Now, it is time to use the new pattern for LXC 3.X inside config test cases. In the past, we kept the old style to keep all functionalities. Now, it is possible to use indexes properly. Signed-off-by: Julio Faracco --- .../lxcconf2xml-ethernet-v3.config | 16 ++++---- .../lxcconf2xml-fstab-v3.config | 10 ++--- .../lxcconf2xml-macvlannetwork-v3.config | 10 ++--- .../lxcconf2xml-miscnetwork-v3.config | 38 +++++++++---------- .../lxcconf2xml-nonenetwork-v3.config | 2 +- .../lxcconf2xml-physnetwork-v3.config | 14 +++---- .../lxcconf2xml-simple-v3.config | 18 ++++----- .../lxcconf2xmldata/lxcconf2xml-simple.config | 18 ++++----- .../lxcconf2xml-vlannetwork-v3.config | 10 ++--- 9 files changed, 68 insertions(+), 68 deletions(-) diff --git a/tests/lxcconf2xmldata/lxcconf2xml-ethernet-v3.config b/tests/l= xcconf2xmldata/lxcconf2xml-ethernet-v3.config index 630cb2ebb6..0a641549f3 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-ethernet-v3.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-ethernet-v3.config @@ -1,14 +1,14 @@ # Template used to create this container: opensuse # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075= ef =20 -lxc.network.type =3D veth -lxc.network.flags =3D up -lxc.network.hwaddr =3D 02:00:15:8f:05:c1 -lxc.network.name =3D eth0 -lxc.network.ipv4 =3D 192.168.122.2/24 -lxc.network.ipv4.gateway =3D 192.168.122.1 -lxc.network.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 -lxc.network.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 +lxc.net.0.type =3D veth +lxc.net.0.flags =3D up +lxc.net.0.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.0.name =3D eth0 +lxc.net.0.ipv4 =3D 192.168.122.2/24 +lxc.net.0.ipv4.gateway =3D 192.168.122.1 +lxc.net.0.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.net.0.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 =20 #remove next line if host DNS configuration should not be available to con= tainer lxc.mount.entry =3D proc proc proc nodev,noexec,nosuid 0 0 diff --git a/tests/lxcconf2xmldata/lxcconf2xml-fstab-v3.config b/tests/lxcc= onf2xmldata/lxcconf2xml-fstab-v3.config index 8b62818657..315ad45ad1 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-fstab-v3.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-fstab-v3.config @@ -1,11 +1,11 @@ # Template used to create this container: opensuse # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075= ef =20 -lxc.network.type =3D veth -lxc.network.flags =3D up -lxc.network.link =3D virbr0 -lxc.network.hwaddr =3D 02:00:15:8f:05:c1 -lxc.network.name =3D eth0 +lxc.net.1.type =3D veth +lxc.net.1.flags =3D up +lxc.net.1.link =3D virbr0 +lxc.net.1.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.1.name =3D eth0 =20 #remove next line if host DNS configuration should not be available to con= tainer lxc.mount.fstab =3D /var/lib/lxc/migrate_test/fstab diff --git a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config b/t= ests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config index 631f07ecca..ab8d85361f 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork-v3.config @@ -1,11 +1,11 @@ # Template used to create this container: opensuse # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075= ef =20 -lxc.network.type =3D macvlan -lxc.network.flags =3D up -lxc.network.link =3D eth0 -lxc.network.hwaddr =3D 02:00:15:8f:05:c1 -lxc.network.macvlan.mode =3D vepa +lxc.net.0.type =3D macvlan +lxc.net.0.flags =3D up +lxc.net.0.link =3D eth0 +lxc.net.0.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.0.macvlan.mode =3D vepa =20 #remove next line if host DNS configuration should not be available to con= tainer lxc.rootfs.path =3D /var/lib/lxc/migrate_test/rootfs diff --git a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config b/test= s/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config index b46cb3ee7d..9be8cf95ea 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config @@ -1,23 +1,23 @@ -lxc.network.type =3D phys -lxc.network.link =3D eth0 -lxc.network.name =3D eth1 -lxc.network.ipv4 =3D 192.168.122.2/24 -lxc.network.ipv4.gateway =3D 192.168.122.1 -lxc.network.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 -lxc.network.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 +lxc.net.0.type =3D phys +lxc.net.0.link =3D eth0 +lxc.net.0.name =3D eth1 +lxc.net.0.ipv4 =3D 192.168.122.2/24 +lxc.net.0.ipv4.gateway =3D 192.168.122.1 +lxc.net.0.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.net.0.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 =20 -lxc.network.type =3D vlan -lxc.network.flags =3D up -lxc.network.link =3D eth0 -lxc.network.hwaddr =3D 02:00:15:8f:05:c1 -lxc.network.vlan.id =3D 2 +lxc.net.1.type =3D vlan +lxc.net.1.flags =3D up +lxc.net.1.link =3D eth0 +lxc.net.1.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.1.vlan.id =3D 2 =20 -lxc.network.type =3D macvlan -lxc.network.flags =3D up -lxc.network.link =3D eth0 -lxc.network.hwaddr =3D 02:00:15:8f:05:c1 -lxc.network.macvlan.mode =3D vepa +lxc.net.2.type =3D macvlan +lxc.net.2.flags =3D up +lxc.net.2.link =3D eth0 +lxc.net.2.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.2.macvlan.mode =3D vepa =20 -lxc.rootfs =3D /var/lib/lxc/migrate_test/rootfs -lxc.utsname =3D migrate_test +lxc.rootfs.path =3D /var/lib/lxc/migrate_test/rootfs +lxc.uts.name =3D migrate_test lxc.autodev=3D1 diff --git a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config b/test= s/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config index f81a786f1e..2402723d9e 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-nonenetwork-v3.config @@ -1,4 +1,4 @@ lxc.rootfs.path =3D /var/lib/lxc/migrate_test/rootfs lxc.uts.name =3D migrate_test lxc.autodev=3D1 -lxc.network.type =3D none +lxc.net.0.type =3D none diff --git a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config b/test= s/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config index 92729841d7..23f9d78dbd 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config @@ -1,10 +1,10 @@ -lxc.network.type =3D phys -lxc.network.link =3D eth0 -lxc.network.name =3D eth1 -lxc.network.ipv4 =3D 192.168.122.2/24 -lxc.network.ipv4.gateway =3D 192.168.122.1 -lxc.network.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 -lxc.network.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 +lxc.net.1.type =3D phys +lxc.net.1.link =3D eth0 +lxc.net.1.name =3D eth1 +lxc.net.1.ipv4 =3D 192.168.122.2/24 +lxc.net.1.ipv4.gateway =3D 192.168.122.1 +lxc.net.1.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.net.1.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 =20 lxc.rootfs.path =3D /var/lib/lxc/migrate_test/rootfs lxc.uts.name =3D migrate_test diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple-v3.config b/tests/lxc= conf2xmldata/lxcconf2xml-simple-v3.config index a0036a482e..b0656571b2 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-simple-v3.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-simple-v3.config @@ -1,15 +1,15 @@ # Template used to create this container: opensuse # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075= ef =20 -lxc.network.type =3D veth -lxc.network.flags =3D up -lxc.network.link =3D virbr0 -lxc.network.hwaddr =3D 02:00:15:8f:05:c1 -lxc.network.name =3D eth0 -lxc.network.ipv4 =3D 192.168.122.2/24 -lxc.network.ipv4.gateway =3D 192.168.122.1 -lxc.network.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 -lxc.network.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 +lxc.net.0.type =3D veth +lxc.net.0.flags =3D up +lxc.net.0.link =3D virbr0 +lxc.net.0.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.0.name =3D eth0 +lxc.net.0.ipv4 =3D 192.168.122.2/24 +lxc.net.0.ipv4.gateway =3D 192.168.122.1 +lxc.net.0.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.net.0.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 =20 #remove next line if host DNS configuration should not be available to con= tainer lxc.mount.entry =3D proc proc proc nodev,noexec,nosuid 0 0 diff --git a/tests/lxcconf2xmldata/lxcconf2xml-simple.config b/tests/lxccon= f2xmldata/lxcconf2xml-simple.config index 50a44bba95..a8429e4657 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-simple.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-simple.config @@ -1,15 +1,15 @@ # Template used to create this container: opensuse # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075= ef =20 -lxc.network.type =3D veth -lxc.network.flags =3D up -lxc.network.link =3D virbr0 -lxc.network.hwaddr =3D 02:00:15:8f:05:c1 -lxc.network.name =3D eth0 -lxc.network.ipv4 =3D 192.168.122.2/24 -lxc.network.ipv4.gateway =3D 192.168.122.1 -lxc.network.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 -lxc.network.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 +lxc.net.0.type =3D veth +lxc.net.0.flags =3D up +lxc.net.0.link =3D virbr0 +lxc.net.0.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.0.name =3D eth0 +lxc.net.0.ipv4 =3D 192.168.122.2/24 +lxc.net.0.ipv4.gateway =3D 192.168.122.1 +lxc.net.0.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.net.0.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 =20 #remove next line if host DNS configuration should not be available to con= tainer lxc.mount.entry =3D proc proc proc nodev,noexec,nosuid 0 0 diff --git a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config b/test= s/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config index 31e26997dd..fb4539261f 100644 --- a/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config +++ b/tests/lxcconf2xmldata/lxcconf2xml-vlannetwork-v3.config @@ -1,11 +1,11 @@ # Template used to create this container: opensuse # Template script checksum (SHA-1): 27307e0a95bd81b2c0bd82d6f87fdbe83be075= ef =20 -lxc.network.type =3D vlan -lxc.network.flags =3D up -lxc.network.link =3D eth0 -lxc.network.hwaddr =3D 02:00:15:8f:05:c1 -lxc.network.vlan.id =3D 2 +lxc.net.1.type =3D vlan +lxc.net.1.flags =3D up +lxc.net.1.link =3D eth0 +lxc.net.1.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.1.vlan.id =3D 2 =20 lxc.rootfs.path =3D /var/lib/lxc/migrate_test/rootfs lxc.uts.name =3D migrate_test --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 13 05:56:29 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1551750936067892.7976314683982; Mon, 4 Mar 2019 17:55:36 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1C322C0740CE; Tue, 5 Mar 2019 01:55:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E64685D77D; Tue, 5 Mar 2019 01:55:33 +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 A836C3FB14; Tue, 5 Mar 2019 01:55:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x251sqcj021391 for ; Mon, 4 Mar 2019 20:54:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4EF865D71A; Tue, 5 Mar 2019 01:54:52 +0000 (UTC) Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 494AD5D6B3 for ; Tue, 5 Mar 2019 01:54:49 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EAA08307E040 for ; Tue, 5 Mar 2019 01:54:48 +0000 (UTC) Received: by mail-qt1-f175.google.com with SMTP id a48so7419473qtb.4 for ; Mon, 04 Mar 2019 17:54:48 -0800 (PST) Received: from localhost.localdomain ([177.188.104.249]) by smtp.gmail.com with ESMTPSA id s76sm4810049qki.42.2019.03.04.17.54.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 17:54:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7oX1n0Mxrmr3C8az55tbCMfx0XXvluUyoUlM18brbJk=; b=bmsu5nlp4lw0tPprrTq4kuuKziloA62NfpBuZxIJuiVhC/DWw4+2YVKxAyTk19XTSA OuzFCNuVECIMdGFUyNGy5Fksy68OC/FHXy384u4y4GTUGpJey+82YLB88w0neeTWZgjU T3yIrVWDr2h0XCE4uQxm4Zic88YCwsz0mejDdswYYx/lcr84lfrp0xuQn7rBZiIt/fF/ 7QimISNxBF2EUcKQxsbL+42CGL3pYjHPXvoPm1WqGVRlQ8ffj6onfpOgpuk4L4kC3IoZ IgAr/aEvW1EjV6o1P/TPyubDdFDShYiDf459ZKjHeFWQpBV0hudiyOfJNWHH8bmv3eea 92QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7oX1n0Mxrmr3C8az55tbCMfx0XXvluUyoUlM18brbJk=; b=tA08xNFY0KMNrUmZbqeWKHb/TDWI71/Yv59XTdk5c+L8sJUZ8MFiU9NMgYR8bAysR3 j+I8WfSaFKr9sBuR/20AXgVw2Yq00IPo9J1wMhwHRtdFnIr4WFvCGdAj7SHdCMIvages SDA+sPQl4jHprgq0vYmKNPboaLX3fy6vgUc1FzGtuAec7/ME3mHmpFFWpQ+C1xhTZuea jHp4RkCNFFuATsEBpLi65XLW9zq2Q9m3+4Up7FuGDvGYv/HbqUnV13swausTVAqyaCV4 zZJRqnP8KkK4Q7JccdhGS5puX3KTP6/TAyd9F3hde/PvFHEIY8VEMjHZ491bhoeShTvt 3f4w== X-Gm-Message-State: APjAAAUpeuC8hxFM7arkUU6K0mGIsE/bPXRSc4FNSZZ0uBfB/C+juJhc drrEFwrGjDNeisbDlrFrtlZKZxDg X-Google-Smtp-Source: APXvYqxIZfq0DhL3WSWBHwFb3TdUR+VzS7TErxHU1UpYuPTyHMN7nKMihX/6s/jVjIhiVS6t0dD1UQ== X-Received: by 2002:ac8:372b:: with SMTP id o40mr16830335qtb.73.1551750887915; Mon, 04 Mar 2019 17:54:47 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Mon, 4 Mar 2019 22:54:32 -0300 Message-Id: <20190305015432.8537-7-jcfaracco@gmail.com> In-Reply-To: <20190305015432.8537-1-jcfaracco@gmail.com> References: <20190305015432.8537-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 05 Mar 2019 01:54:49 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 05 Mar 2019 01:54:49 +0000 (UTC) for IP:'209.85.160.175' DOMAIN:'mail-qt1-f175.google.com' HELO:'mail-qt1-f175.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.11 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS) 209.85.160.175 mail-qt1-f175.google.com 209.85.160.175 mail-qt1-f175.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.42 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 6/6] tests: Introduce random network settings to test indexes. 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: , 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 05 Mar 2019 01:55:34 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This is the same test of miscnetwork. The XML output needs to be the same. It contains random networks entries separated by indexes and it needs to produce the order XML definition. Signed-off-by: Julio Faracco --- .../lxcconf2xml-randomnetwork-v3.config | 21 +++++++++ .../lxcconf2xml-randomnetwork.xml | 45 +++++++++++++++++++ tests/lxcconf2xmltest.c | 1 + 3 files changed, 67 insertions(+) create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-randomnetwork-v3.conf= ig create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-randomnetwork.xml diff --git a/tests/lxcconf2xmldata/lxcconf2xml-randomnetwork-v3.config b/te= sts/lxcconf2xmldata/lxcconf2xml-randomnetwork-v3.config new file mode 100644 index 0000000000..8d898fa6e0 --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-randomnetwork-v3.config @@ -0,0 +1,21 @@ +lxc.net.0.type =3D phys +lxc.net.1.flags =3D up +lxc.net.0.link =3D eth0 +lxc.net.2.link =3D eth0 +lxc.net.1.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.1.link =3D eth0 +lxc.net.0.name =3D eth1 +lxc.net.2.macvlan.mode =3D vepa +lxc.net.2.type =3D macvlan +lxc.net.1.type =3D vlan +lxc.net.0.ipv4 =3D 192.168.122.2/24 +lxc.net.0.ipv4.gateway =3D 192.168.122.1 +lxc.net.1.vlan.id =3D 2 +lxc.net.0.ipv6 =3D 2003:db8:1:0:214:1234:fe0b:3596/64 +lxc.net.2.flags =3D up +lxc.net.2.hwaddr =3D 02:00:15:8f:05:c1 +lxc.net.0.ipv6.gateway =3D 2003:db8:1:0:214:1234:fe0b:3595 + +lxc.rootfs.path =3D /var/lib/lxc/migrate_test/rootfs +lxc.uts.name =3D migrate_test +lxc.autodev=3D1 diff --git a/tests/lxcconf2xmldata/lxcconf2xml-randomnetwork.xml b/tests/lx= cconf2xmldata/lxcconf2xml-randomnetwork.xml new file mode 100644 index 0000000000..63189cfaec --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-randomnetwork.xml @@ -0,0 +1,45 @@ + + migrate_test + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 65536 + 65536 + 1 + + exe + /sbin/init + + + + + + + destroy + restart + destroy + + /usr/libexec/libvirt_lxc + + + + + + + + + + + + eth0 + + + + + + + + + eth0.2 + + + + diff --git a/tests/lxcconf2xmltest.c b/tests/lxcconf2xmltest.c index 2a277042ce..78927d29b1 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -163,6 +163,7 @@ mymain(void) DO_TEST3("macvlannetwork", false); DO_TEST3("vlannetwork", false); DO_TEST3("miscnetwork", false); + DO_TEST3("randomnetwork", false); DO_TEST3("idmap", false); DO_TEST3("memtune", false); DO_TEST3("cputune", false); --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list