From nobody Mon Feb 9 01:21:19 2026 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 1547175731289379.82746181734126; Thu, 10 Jan 2019 19:02:11 -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 8C5A8DF88E; Fri, 11 Jan 2019 03:02:08 +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 24561600C3; Fri, 11 Jan 2019 03:02:08 +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 987DB3F602; Fri, 11 Jan 2019 03:02:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0B31mWl026473 for ; Thu, 10 Jan 2019 22:01:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id A9A4426357; Fri, 11 Jan 2019 03:01:48 +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 9FC3226353 for ; Fri, 11 Jan 2019 03:01:46 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (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 6204258E32 for ; Fri, 11 Jan 2019 03:01:44 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id r14so16787530qtp.1 for ; Thu, 10 Jan 2019 19:01:44 -0800 (PST) Received: from localhost.localdomain ([177.103.107.138]) by smtp.gmail.com with ESMTPSA id r18sm48539521qta.83.2019.01.10.19.01.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jan 2019 19:01: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=8OO2oSM1tGPpwVPUhFQ3FsegzlLFjUQPSYoM+PmbHbM=; b=Wt2Jfo1i1GQ+PePRgFRiufi2sCcVORKNR/GukMG9YQLSORKmQjALe/QZgOaul9yr5L 99KbXugFExq7zFdC8Sk2EwHmLOslyIcrqcwHriCaUZvfyDyqLgcgptkR5yRh3wQThpWM mhY3krXfonHs8mSsQY85jAJlhKYqNPPcN41zzDclbthnuTUqiUkMYXh1oSyIMjqPUGxW nifEjpvpO+0xwge6H56KZBSe8VLHQtlMt6Sp9k4888hlNKcSurgmN8Ev0rN/C2RF32gM ZFZRgZHjIJ1fbYw0t4yk94Ya5OEaruowHwiPMIcbRM25ePWPNxGM0xxdHQINIoBaP9Hh vKsw== 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=8OO2oSM1tGPpwVPUhFQ3FsegzlLFjUQPSYoM+PmbHbM=; b=VCSTbslrfEfir+rs1GCjnlUF1DCMqSzVUbaFzlN61vIb4jFPC8RuMwAT4O6892ujxd TQrX6GEp8P/GGymMN8veE5EFW0oB60ne4u88uq9ik7heiYRxmsuOsQ2+IJgPkeCoxASK uLbin6mVHErDOW1JP6f5i4aICMZunAivHL27TJK8m9nwvA/gqXGHdO/gF8BDpyg/tsr5 r2idE3J0N0K8y3VWOLyGHlDcE0PsjiZcNoeI/XpGpB2GNjefb4JnD+xDQmNmCTZViEgQ F7vV7c0X33z6G4+olk812t3xEpvdYg/Dgv3gKUQ5NC1UMzoEjuv5t3b8YHcfQU3+wny7 /rbg== X-Gm-Message-State: AJcUukeA+8bc9E6CwzhaqtGcNnrht9+Tgxt3A3Oos7O5eybv6pItBr6w gzagyjKoIOk6Tr2zhB6D70cKf/z/ X-Google-Smtp-Source: ALg8bN659Cbq3WCj1YnP62o+2B7oxXpn0YS6BVPcIjAn+ENwDMQ8vtHDuAuFfPPkCzjVS60QAlj19Q== X-Received: by 2002:a0c:ad48:: with SMTP id v8mr12259986qvc.83.1547175702971; Thu, 10 Jan 2019 19:01:42 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Fri, 11 Jan 2019 01:01:22 -0200 Message-Id: <20190111030123.25211-3-jcfaracco@gmail.com> In-Reply-To: <20190111030123.25211-1-jcfaracco@gmail.com> References: <20190111030123.25211-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]); Fri, 11 Jan 2019 03:01:44 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 11 Jan 2019 03:01:44 +0000 (UTC) for IP:'209.85.160.195' DOMAIN:'mail-qt1-f195.google.com' HELO:'mail-qt1-f195.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.195 mail-qt1-f195.google.com 209.85.160.195 mail-qt1-f195.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/3] tests: Change legacy network configs to version 3.0 with 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 11 Jan 2019 03:02:09 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This commit only change the legacy network settings ("lxc.network.") inside v3 tests to the new format ("lxc.net.X.") adopted in version 3.0. It enhaces some test cases to cover other scenarions. 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-physnetwork-v3.config | 14 +++---- .../lxcconf2xml-simple-v3.config | 18 ++++----- .../lxcconf2xml-vlannetwork-v3.config | 10 ++--- 7 files changed, 58 insertions(+), 58 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..3034e4d1ca 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.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.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.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 =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-physnetwork-v3.config b/test= s/lxcconf2xmldata/lxcconf2xml-physnetwork-v3.config index 92729841d7..9cf96163b3 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.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.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..09cc91c2c6 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.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 +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 #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..172211c21f 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.0.type =3D vlan +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.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