From nobody Thu Apr 25 17:48:44 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 1543376355443415.84983739925076; Tue, 27 Nov 2018 19:39:15 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 627C8811DA; Wed, 28 Nov 2018 03:39:13 +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 300785C1B2; Wed, 28 Nov 2018 03:39:13 +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 D7BA941FB9; Wed, 28 Nov 2018 03:39:12 +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 wAS3dAU0025508 for ; Tue, 27 Nov 2018 22:39:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1182D1054FAE; Wed, 28 Nov 2018 03:39:10 +0000 (UTC) Received: from mx1.redhat.com (ext-mx17.extmail.prod.ext.phx2.redhat.com [10.5.110.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 07ED51019624 for ; Wed, 28 Nov 2018 03:39:08 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (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 2807B3082DDC for ; Wed, 28 Nov 2018 03:39:07 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id e5so24414506qtr.12 for ; Tue, 27 Nov 2018 19:39:07 -0800 (PST) Received: from localhost.localdomain ([2804:431:b704:2a6e:f5c0:e531:dcb0:2cf6]) by smtp.gmail.com with ESMTPSA id p75sm3354137qki.90.2018.11.27.19.39.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 19:39:05 -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=fhbL8frDPYSFG1pwlaxPhfl/uQwqjU2/n07h1j5+Ur8=; b=toB6AKIGq26t5rI3xgrerGQb5k17SLHntLfwrrGXiNcOJ9kuXL2CffdUM2VMaBqT6o jM5OSb2y8b4Hqv7NnllOU6Uf8DUC//0wpHuu7VtWMKTvugDrTyETPSeMFtG8D8KTzou2 M0JMOZ+hElEEcsKKfRpcDNqV7ZsnuoyVWatJA7QbJsubj/1qkE44pyf8Fch53lZf/sZv T9bNFFf0RZBJhsXCS4NugOacn0YRqYYqPkOY+ecdoXFH2zoyCpr0TOUQbFQxpVyaq/vT 7WQgx98oRLMUolPgOD8judjQqJ3y3aSIEoCPV8pS8CkF9jq15WmNW6FuJvMLs57novtm 86Zw== 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=fhbL8frDPYSFG1pwlaxPhfl/uQwqjU2/n07h1j5+Ur8=; b=tMjbmKKqLu6Z/viiIZB9Ajoerq1D4ePnAmD8sC8uDaBITRhSrA3G8JCEW+sYyyB9PA 4BsxNOsYcSnr5twMmxCRdfi9l+LgFlen+cljSs3gcZQC7SnXskxkRz97uZI3sAKa3Hu1 XYgPv5QuMfqvI6tcrHayvTw3EUBK9JNtWiGZBsOlYuImIoy+djfldwV+upttYtIAQ7QJ hD6MrVR3yq8fe4Du60rkzoNAXwfpGfLFiqNVJfMrRwd+GNRso3gTYHLWLHmOeSdluBh0 qbZ4wB1KflM/XwfA9Um9FJ80ywxzlm/xYo9M/Drua3PI8tyIuFU7ZvyO5xqCBR2LtOe9 s3oA== X-Gm-Message-State: AA+aEWbBM9NbB938G1cmiG2FxDd+Q84vbPXh9hfxenFxQ2jZPR5snBHp YthHIfZBsUJDYZpjvD9Sy4cNJTCw X-Google-Smtp-Source: AFSGD/XOQDT0skYAFFDSy+fIdiS0ZUnmz/5frGuMtAxtfrD/P5/LPVbwxDdp6eCC9NTWYqvd+giOKQ== X-Received: by 2002:a0c:9359:: with SMTP id e25mr33744987qve.203.1543376346167; Tue, 27 Nov 2018 19:39:06 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Wed, 28 Nov 2018 11:38:56 +0800 Message-Id: <20181128033857.30303-2-jcfaracco@gmail.com> In-Reply-To: <20181128033857.30303-1-jcfaracco@gmail.com> References: <20181128033857.30303-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.46]); Wed, 28 Nov 2018 03:39:07 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 28 Nov 2018 03:39:07 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.108 (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.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.46 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/2] lxc: Initializing IPv6 and IPv4 gateway to overwrite old settings. 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 28 Nov 2018 03:39:14 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This commit fixes a bug when you have multiple network settings defined. Basically, if you set an IPv6 or IPv4 gateway, it carries on next network settings. It is happening because the data is not being initialized when a new network type is defined. So, the old data still persists into the pointer. Signed-off-by: Julio Faracco --- src/lxc/lxc_native.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 9f6d4b3de8..246623d4a1 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -583,6 +583,9 @@ lxcNetworkWalkCallback(const char *name, virConfValuePt= r value, void *data) parseData->ips =3D NULL; parseData->nips =3D 0; =20 + parseData->gateway_ipv4 =3D NULL; + parseData->gateway_ipv6 =3D NULL; + /* Keep the new value */ parseData->type =3D value->str; } --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 17:48:44 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 1543376709571222.74211469358386; Tue, 27 Nov 2018 19:45:09 -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 B792D30024EA; Wed, 28 Nov 2018 03:45:06 +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 1A41E600C0; Wed, 28 Nov 2018 03:45:06 +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 D10B03F7CD; Wed, 28 Nov 2018 03:45:04 +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 wAS3dCUR025521 for ; Tue, 27 Nov 2018 22:39:12 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4B13460BE8; Wed, 28 Nov 2018 03:39:12 +0000 (UTC) Received: from mx1.redhat.com (ext-mx03.extmail.prod.ext.phx2.redhat.com [10.5.110.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 418AB60BE0 for ; Wed, 28 Nov 2018 03:39:09 +0000 (UTC) Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) (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 93DBA83F3E for ; Wed, 28 Nov 2018 03:39:08 +0000 (UTC) Received: by mail-qt1-f173.google.com with SMTP id y20so24392122qtm.13 for ; Tue, 27 Nov 2018 19:39:08 -0800 (PST) Received: from localhost.localdomain ([2804:431:b704:2a6e:f5c0:e531:dcb0:2cf6]) by smtp.gmail.com with ESMTPSA id p75sm3354137qki.90.2018.11.27.19.39.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 19:39:07 -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=srrsmgTP+bb+AjIjTDOUeRtSDIKpqn1veeSEamiPDnE=; b=b1jKEDmD8HjbpbcRZPM/Vh2kbMGTDwrI7hKYs1bbIMCtTjhdI+jzjSo0mXQMM4IcaU ve0daySGmoWQQbdGEbLmTdEK5sygcsY5wEsJw1Kg0sjpw+ixIAqQl7RiJalGjm6Pf+Ea z+pQkKx5RVzg9gLKVn3aBeR2EsecXEQoiRC3h+e3LgxhyGQOgC7+6Z/Tv9c9EaggzqN+ 5TdoQ+aaqwfh26J6hndJS5nQtKGQSEFv9PjEExUprvQovmLC5Ijkn/Vh3rnYrgFOHwU3 tizjF+k+DW6Fx8LY0sjJU/d5MHPM9cPjms2HNNyR5xUSMlFmFJAYKEztLT4Lq15zq6VI IyjQ== 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=srrsmgTP+bb+AjIjTDOUeRtSDIKpqn1veeSEamiPDnE=; b=AY309BxZijVEMsrDgzNFVw3KvcZ4XQBT0/PHSCbCsu7VGktI245VLbjfMT+pV7UXNz CpmOVNijrOacpinQEyRWMOeIPxDNRUm9lL0P3BCafXjWTwjXatS6N8uB/kPFh8997tq/ ppDI2JxhHewnfZbhHcv/gjzTwDYE/DsTZA19fB8/li3tEH43LMevjvYDxyqCCX6m7a6F NG2SpxAvF345w6JkRux5wyPZxtcQG2cnx/ud+Z4o2OwIUeTY01G+0cKU/8HEsJ+eFajR 8iRcVpD23+RPz9giCSP1a+3HKzPJELnSqRHaIT9MXvZnNcoqGIzXtSIt4yhoUN4yE6al oiCw== X-Gm-Message-State: AA+aEWYJgOJvJathhKhNDiGFLhzYoHEeeUnwJauLdYK9WGb+4U6/OcDO wnpU5BRR/8xddMGOLSSNhYdSNDTf X-Google-Smtp-Source: AFSGD/WGr0IS9hQDBLS8nDuCPt18CPib+dDiAhGYUfV6vOdF74YRU5jEQl4w6m3VQiHzyV57v611EA== X-Received: by 2002:a0c:bd9f:: with SMTP id n31mr33624734qvg.193.1543376347520; Tue, 27 Nov 2018 19:39:07 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Wed, 28 Nov 2018 11:38:57 +0800 Message-Id: <20181128033857.30303-3-jcfaracco@gmail.com> In-Reply-To: <20181128033857.30303-1-jcfaracco@gmail.com> References: <20181128033857.30303-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.27]); Wed, 28 Nov 2018 03:39:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 28 Nov 2018 03:39:08 +0000 (UTC) for IP:'209.85.160.173' DOMAIN:'mail-qt1-f173.google.com' HELO:'mail-qt1-f173.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.173 mail-qt1-f173.google.com 209.85.160.173 mail-qt1-f173.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.27 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/2] tests: Adding test case to include multiple network definitions. 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.43]); Wed, 28 Nov 2018 03:45:07 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This commit includes a test case for multiple network definitions. It is useful right now, but it will be more useful when the index used by LXC version 3.X is implemented to support this new settings. Signed-off-by: Julio Faracco --- .../lxcconf2xml-miscnetwork-v3.config | 23 ++++++++++ .../lxcconf2xml-miscnetwork.config | 23 ++++++++++ .../lxcconf2xml-miscnetwork.xml | 45 +++++++++++++++++++ tests/lxcconf2xmltest.c | 2 + 4 files changed, 93 insertions(+) create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml diff --git a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config b/test= s/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config new file mode 100644 index 0000000000..b46cb3ee7d --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork-v3.config @@ -0,0 +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.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.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.rootfs =3D /var/lib/lxc/migrate_test/rootfs +lxc.utsname =3D migrate_test +lxc.autodev=3D1 diff --git a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.config b/tests/l= xcconf2xmldata/lxcconf2xml-miscnetwork.config new file mode 100644 index 0000000000..b46cb3ee7d --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.config @@ -0,0 +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.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.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.rootfs =3D /var/lib/lxc/migrate_test/rootfs +lxc.utsname =3D migrate_test +lxc.autodev=3D1 diff --git a/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.xml b/tests/lxcc= onf2xmldata/lxcconf2xml-miscnetwork.xml new file mode 100644 index 0000000000..63189cfaec --- /dev/null +++ b/tests/lxcconf2xmldata/lxcconf2xml-miscnetwork.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 0766239ec4..2a277042ce 100644 --- a/tests/lxcconf2xmltest.c +++ b/tests/lxcconf2xmltest.c @@ -137,6 +137,7 @@ mymain(void) DO_TEST("physnetwork", false); DO_TEST("macvlannetwork", false); DO_TEST("vlannetwork", false); + DO_TEST("miscnetwork", false); DO_TEST("idmap", false); DO_TEST("memtune", false); DO_TEST("cputune", false); @@ -161,6 +162,7 @@ mymain(void) DO_TEST3("physnetwork", false); DO_TEST3("macvlannetwork", false); DO_TEST3("vlannetwork", false); + DO_TEST3("miscnetwork", 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