From nobody Mon Feb 9 02:12:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1586967570; cv=none; d=zohomail.com; s=zohoarc; b=hQLeKTqXnpMs/WNub0jG+Fs0+NOvEapc43bZwSkH5chD1IUbxdnPp2PbTWJhoY/cIbPEn5kXSFcNfremFTl0OJEVRS0LXcQc0724yXTCYXwtveTuCVzdi4ejqYE2T4qFZbsk0Nc8YNcOkHBpK6QxGBRQWiVIYTFUs7d2ONHEJn0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1586967570; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LVg0aJWLRocXku2gc02ZAiHKmKAZf5I9DOL/9A8ZGso=; b=lRU6ayaCeE+3k/vP0JHueb88euiEic4Y/+A/EufqT1sANv9wKhLeBEPAUOnmuO5F4JmQJwQf7ZhcnD7273GhiMIJBgjsyrY5V66+qNUQk8nbqFY/RB3+OpjhWjD1azZVSsMws1EE8/qBDlqnfcs/cD9Ww1mrZOM9Yyo9dg3Lp3g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1586967570913159.99474484992425; Wed, 15 Apr 2020 09:19:30 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-447-d7ETV69xP327S6qu9Z8Yhw-1; Wed, 15 Apr 2020 12:19:27 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7F4E8010E4; Wed, 15 Apr 2020 16:19:20 +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 9B7DA118DFC; Wed, 15 Apr 2020 16:19:20 +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 4699718089D0; Wed, 15 Apr 2020 16:19:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03FGJIKG014127 for ; Wed, 15 Apr 2020 12:19:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id CFF4C114D17; Wed, 15 Apr 2020 16:19:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB77E11515F for ; Wed, 15 Apr 2020 16:19:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 76CE0800297 for ; Wed, 15 Apr 2020 16:19:16 +0000 (UTC) Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-248-4aMhxrMtOnijxbrSL-NDCw-1; Wed, 15 Apr 2020 12:19:14 -0400 Received: by mail-qk1-f171.google.com with SMTP id v7so17901242qkc.0 for ; Wed, 15 Apr 2020 09:19:14 -0700 (PDT) Received: from localhost.localdomain ([179.98.95.94]) by smtp.gmail.com with ESMTPSA id r51sm9977929qtk.89.2020.04.15.09.19.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 09:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586967569; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LVg0aJWLRocXku2gc02ZAiHKmKAZf5I9DOL/9A8ZGso=; b=SuaK4sddu9qOZ9aDl83Nds8sQmBenonF8++zf9dI1B7RqQEr3TE/ag/MHygAVvj+B+3o7f 6Bq+/IRSlHBOjHEQ/ODD+NXYCDKLkg3ova/lWww+Bta7YJ1GTzeyhyBgWDOGeXtGE/ZF/9 rBMd1OtAOTqj9mLnuzKr7Hg2J4q3yW8= X-MC-Unique: d7ETV69xP327S6qu9Z8Yhw-1 X-MC-Unique: 4aMhxrMtOnijxbrSL-NDCw-1 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=M0/JjrB5gI9Y24r/lCdSqgR4+LsE/jPSy2rtdQJq0Ao=; b=Hj9n/ZaTQMZS42cGraLTpLvI/C/r+49boz5bFAW7Dj0qtOKaki4aEtn0SzzO3+lrBL IrgsmULlhfGYYoXLBfsUomP5luEWkKhVXScUmtZ6JU+UwS4aXf0oItcfP4j144q2P6ex o+tCqSPLN/Gz2hmIxMuVCOIW8goBpXiVPH8eqVa8PVTgKDI1y3PDO5SGMlKwLRigSM9F LvLocKjI/DRJVeije8W6npkKSGO5IzzALEgWZ2t54dpCSfj8cimCG4jY+e4ALxfDB2lU RjqWXhj6BGJge0CNJwVZTtZOUEfFkMItb+YFKV/wFbialz2h9kzbAelwdwpw1rC+8zao TI/Q== X-Gm-Message-State: AGi0Pubz9k1NSm1VY30/DUVZFojRUFULpnPp1PeDE1D+5lng6MCeqhXQ w9izPA3/P4jNGI1ianjIzDRv3rPALhg= X-Google-Smtp-Source: APiQypIU/GStB0Ancizwvq2P9tw+Jkg1utZj0xMFuSdlnXpUt0vAiwablYC7wsqBNCU2MkyD/QjWeA== X-Received: by 2002:a37:dd5:: with SMTP id 204mr17623658qkn.321.1586967552925; Wed, 15 Apr 2020 09:19:12 -0700 (PDT) From: Julio Faracco To: libvir-list@redhat.com Subject: [PATCH 2/2] tests: Add tests for to cover dnsmasq settings Date: Wed, 15 Apr 2020 13:18:50 -0300 Message-Id: <20200415161850.240862-3-jcfaracco@gmail.com> In-Reply-To: <20200415161850.240862-1-jcfaracco@gmail.com> References: <20200415161850.240862-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03FGJIKG014127 X-loop: libvir-list@redhat.com 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: , 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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" New tests are required to cover some new XML syntax entry for option. This includes schema testing and other features like unit attribute and leasetime value. Signed-off-by: Julio Faracco --- tests/networkxml2confdata/leasetime-hours.conf | 16 ++++++++++++++++ tests/networkxml2confdata/leasetime-hours.xml | 12 ++++++++++++ .../networkxml2confdata/leasetime-infinite.conf | 16 ++++++++++++++++ tests/networkxml2confdata/leasetime-infinite.xml | 12 ++++++++++++ tests/networkxml2confdata/leasetime-minutes.conf | 16 ++++++++++++++++ tests/networkxml2confdata/leasetime-minutes.xml | 12 ++++++++++++ tests/networkxml2confdata/leasetime-seconds.conf | 16 ++++++++++++++++ tests/networkxml2confdata/leasetime-seconds.xml | 12 ++++++++++++ tests/networkxml2conftest.c | 4 ++++ tests/networkxml2xmlin/leasetime-hours.xml | 12 ++++++++++++ tests/networkxml2xmlin/leasetime-infinite.xml | 12 ++++++++++++ tests/networkxml2xmlin/leasetime-minutes.xml | 12 ++++++++++++ tests/networkxml2xmlin/leasetime-seconds.xml | 12 ++++++++++++ tests/networkxml2xmlout/leasetime-hours.xml | 14 ++++++++++++++ tests/networkxml2xmlout/leasetime-infinite.xml | 14 ++++++++++++++ tests/networkxml2xmlout/leasetime-minutes.xml | 14 ++++++++++++++ tests/networkxml2xmlout/leasetime-seconds.xml | 14 ++++++++++++++ tests/networkxml2xmltest.c | 4 ++++ 18 files changed, 224 insertions(+) create mode 100644 tests/networkxml2confdata/leasetime-hours.conf create mode 100644 tests/networkxml2confdata/leasetime-hours.xml create mode 100644 tests/networkxml2confdata/leasetime-infinite.conf create mode 100644 tests/networkxml2confdata/leasetime-infinite.xml create mode 100644 tests/networkxml2confdata/leasetime-minutes.conf create mode 100644 tests/networkxml2confdata/leasetime-minutes.xml create mode 100644 tests/networkxml2confdata/leasetime-seconds.conf create mode 100644 tests/networkxml2confdata/leasetime-seconds.xml create mode 100644 tests/networkxml2xmlin/leasetime-hours.xml create mode 100644 tests/networkxml2xmlin/leasetime-infinite.xml create mode 100644 tests/networkxml2xmlin/leasetime-minutes.xml create mode 100644 tests/networkxml2xmlin/leasetime-seconds.xml create mode 100644 tests/networkxml2xmlout/leasetime-hours.xml create mode 100644 tests/networkxml2xmlout/leasetime-infinite.xml create mode 100644 tests/networkxml2xmlout/leasetime-minutes.xml create mode 100644 tests/networkxml2xmlout/leasetime-seconds.xml diff --git a/tests/networkxml2confdata/leasetime-hours.conf b/tests/network= xml2confdata/leasetime-hours.conf new file mode 100644 index 0000000000..1599d4633e --- /dev/null +++ b/tests/networkxml2confdata/leasetime-hours.conf @@ -0,0 +1,16 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made usin= g: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +except-interface=3Dlo +bind-dynamic +interface=3Dvirbr0 +dhcp-range=3D192.168.122.2,192.168.122.254,255.255.255.0,1h +dhcp-no-override +dhcp-authoritative +dhcp-lease-max=3D253 +dhcp-hostsfile=3D/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=3D/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/leasetime-hours.xml b/tests/networkx= ml2confdata/leasetime-hours.xml new file mode 100644 index 0000000000..8df196e84e --- /dev/null +++ b/tests/networkxml2confdata/leasetime-hours.xml @@ -0,0 +1,12 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + 1 + + + diff --git a/tests/networkxml2confdata/leasetime-infinite.conf b/tests/netw= orkxml2confdata/leasetime-infinite.conf new file mode 100644 index 0000000000..883ced6ade --- /dev/null +++ b/tests/networkxml2confdata/leasetime-infinite.conf @@ -0,0 +1,16 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made usin= g: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +except-interface=3Dlo +bind-dynamic +interface=3Dvirbr0 +dhcp-range=3D192.168.122.2,192.168.122.254,255.255.255.0,infinite +dhcp-no-override +dhcp-authoritative +dhcp-lease-max=3D253 +dhcp-hostsfile=3D/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=3D/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/leasetime-infinite.xml b/tests/netwo= rkxml2confdata/leasetime-infinite.xml new file mode 100644 index 0000000000..9ae3c4f7f7 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-infinite.xml @@ -0,0 +1,12 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + + + + diff --git a/tests/networkxml2confdata/leasetime-minutes.conf b/tests/netwo= rkxml2confdata/leasetime-minutes.conf new file mode 100644 index 0000000000..c093501a35 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-minutes.conf @@ -0,0 +1,16 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made usin= g: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +except-interface=3Dlo +bind-dynamic +interface=3Dvirbr0 +dhcp-range=3D192.168.122.2,192.168.122.254,255.255.255.0,10m +dhcp-no-override +dhcp-authoritative +dhcp-lease-max=3D253 +dhcp-hostsfile=3D/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=3D/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/leasetime-minutes.xml b/tests/networ= kxml2confdata/leasetime-minutes.xml new file mode 100644 index 0000000000..e531db2848 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-minutes.xml @@ -0,0 +1,12 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + 10 + + + diff --git a/tests/networkxml2confdata/leasetime-seconds.conf b/tests/netwo= rkxml2confdata/leasetime-seconds.conf new file mode 100644 index 0000000000..4acc2839c5 --- /dev/null +++ b/tests/networkxml2confdata/leasetime-seconds.conf @@ -0,0 +1,16 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made usin= g: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +except-interface=3Dlo +bind-dynamic +interface=3Dvirbr0 +dhcp-range=3D192.168.122.2,192.168.122.254,255.255.255.0,1000s +dhcp-no-override +dhcp-authoritative +dhcp-lease-max=3D253 +dhcp-hostsfile=3D/var/lib/libvirt/dnsmasq/default.hostsfile +addn-hosts=3D/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/leasetime-seconds.xml b/tests/networ= kxml2confdata/leasetime-seconds.xml new file mode 100644 index 0000000000..4b4a57110e --- /dev/null +++ b/tests/networkxml2confdata/leasetime-seconds.xml @@ -0,0 +1,12 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + 1000 + + + diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index a8355272b9..3cb6658f51 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -142,6 +142,10 @@ mymain(void) DO_TEST("dhcp6host-routed-network", dhcpv6); DO_TEST("ptr-domains-auto", dhcpv6); DO_TEST("dnsmasq-options", dhcpv6); + DO_TEST("leasetime-seconds", full); + DO_TEST("leasetime-minutes", full); + DO_TEST("leasetime-hours", full); + DO_TEST("leasetime-infinite", full); =20 virObjectUnref(dhcpv6); virObjectUnref(full); diff --git a/tests/networkxml2xmlin/leasetime-hours.xml b/tests/networkxml2= xmlin/leasetime-hours.xml new file mode 100644 index 0000000000..d8075111a4 --- /dev/null +++ b/tests/networkxml2xmlin/leasetime-hours.xml @@ -0,0 +1,12 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + 1 + + + diff --git a/tests/networkxml2xmlin/leasetime-infinite.xml b/tests/networkx= ml2xmlin/leasetime-infinite.xml new file mode 100644 index 0000000000..d0357620b0 --- /dev/null +++ b/tests/networkxml2xmlin/leasetime-infinite.xml @@ -0,0 +1,12 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + + + + diff --git a/tests/networkxml2xmlin/leasetime-minutes.xml b/tests/networkxm= l2xmlin/leasetime-minutes.xml new file mode 100644 index 0000000000..21169766a4 --- /dev/null +++ b/tests/networkxml2xmlin/leasetime-minutes.xml @@ -0,0 +1,12 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + 10 + + + diff --git a/tests/networkxml2xmlin/leasetime-seconds.xml b/tests/networkxm= l2xmlin/leasetime-seconds.xml new file mode 100644 index 0000000000..4cf64b851e --- /dev/null +++ b/tests/networkxml2xmlin/leasetime-seconds.xml @@ -0,0 +1,12 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + 200 + + + diff --git a/tests/networkxml2xmlout/leasetime-hours.xml b/tests/networkxml= 2xmlout/leasetime-hours.xml new file mode 100644 index 0000000000..ed85f77569 --- /dev/null +++ b/tests/networkxml2xmlout/leasetime-hours.xml @@ -0,0 +1,14 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + + + 1 + + + diff --git a/tests/networkxml2xmlout/leasetime-infinite.xml b/tests/network= xml2xmlout/leasetime-infinite.xml new file mode 100644 index 0000000000..4373357588 --- /dev/null +++ b/tests/networkxml2xmlout/leasetime-infinite.xml @@ -0,0 +1,14 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + + + + + + diff --git a/tests/networkxml2xmlout/leasetime-minutes.xml b/tests/networkx= ml2xmlout/leasetime-minutes.xml new file mode 100644 index 0000000000..9e3d8591fa --- /dev/null +++ b/tests/networkxml2xmlout/leasetime-minutes.xml @@ -0,0 +1,14 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + + + 10 + + + diff --git a/tests/networkxml2xmlout/leasetime-seconds.xml b/tests/networkx= ml2xmlout/leasetime-seconds.xml new file mode 100644 index 0000000000..a4e428f84b --- /dev/null +++ b/tests/networkxml2xmlout/leasetime-seconds.xml @@ -0,0 +1,14 @@ + + default + 81ff0d90-c91e-6742-64da-4a736edb9a9b + + + + + + + + 200 + + + diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index ec679e72ee..700744785a 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -160,6 +160,10 @@ mymain(void) DO_TEST("metadata"); DO_TEST("set-mtu"); DO_TEST("dnsmasq-options"); + DO_TEST("leasetime-seconds"); + DO_TEST("leasetime-minutes"); + DO_TEST("leasetime-hours"); + DO_TEST("leasetime-infinite"); DO_TEST("isolated-ports"); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; --=20 2.24.1