Re: [libvirt] [tck PATCH 2/3] network: Fix the dhcp range output being matched

2020-01-21 Thread Daniel P . Berrangé 
On Wed, Jan 15, 2020 at 03:23:59PM +0100, Erik Skultety wrote:
> Since libvirt commit 82fe58ff libvirt has been formatting the network
> mask to the dnsmasq's dhcp-range config option which broke a few of the
> networking tests.
> 
> Signed-off-by: Erik Skultety 
> ---
>  scripts/networks/networkxml2hostout/tck-testnet-1.dat | 2 +-
>  scripts/networks/networkxml2hostout/tck-testnet-2.dat | 2 +-
>  scripts/networks/networkxml2hostout/tck-testnet-3.dat | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Daniel P. Berrangé 


Regards,
Daniel
-- 
|: https://berrange.com  -o-https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o-https://fstop138.berrange.com :|
|: https://entangle-photo.org-o-https://www.instagram.com/dberrange :|

[libvirt] [tck PATCH 2/3] network: Fix the dhcp range output being matched

2020-01-15 Thread Erik Skultety 
Since libvirt commit 82fe58ff libvirt has been formatting the network
mask to the dnsmasq's dhcp-range config option which broke a few of the
networking tests.

Signed-off-by: Erik Skultety 
---
 scripts/networks/networkxml2hostout/tck-testnet-1.dat | 2 +-
 scripts/networks/networkxml2hostout/tck-testnet-2.dat | 2 +-
 scripts/networks/networkxml2hostout/tck-testnet-3.dat | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/networks/networkxml2hostout/tck-testnet-1.dat 
b/scripts/networks/networkxml2hostout/tck-testnet-1.dat
index eacd4c4..cf6f150 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-1.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-1.dat
@@ -15,7 +15,7 @@ ACCEPT all  --  10.1.2.0/24  0.0.0.0/0
 #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ 
s|.*--conf-file=\(.*tck-testnet.conf\).*|\1|p'`
 bind-dynamic
 #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ 
s|.*--conf-file=\(.*tck-testnet.conf\).*|\1|p'`
-dhcp-range=10.1.2.2,10.1.2.254
+dhcp-range=10.1.2.2,10.1.2.254,255.255.255.0
 #ip link show type bridge | grep tck-testbr | gawk '{print $2}'
 tck-testbr:
 #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}'
diff --git a/scripts/networks/networkxml2hostout/tck-testnet-2.dat 
b/scripts/networks/networkxml2hostout/tck-testnet-2.dat
index 9c90348..aabd959 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-2.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-2.dat
@@ -10,7 +10,7 @@ ACCEPT all  --  10.1.2.0/24  0.0.0.0/0
 #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ 
s|.*--conf-file=\(.*tck-testnet.conf\).*|\1|p'`
 bind-dynamic
 #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ 
s|.*--conf-file=\(.*tck-testnet.conf\).*|\1|p'`
-dhcp-range=10.1.2.2,10.1.2.254
+dhcp-range=10.1.2.2,10.1.2.254,255.255.255.0
 #ip link show type bridge | grep tck-testbr | gawk '{print $2}'
 tck-testbr:
 #ip -o addr show dev tck-testbr | gawk '{print $4" "$6}'
diff --git a/scripts/networks/networkxml2hostout/tck-testnet-3.dat 
b/scripts/networks/networkxml2hostout/tck-testnet-3.dat
index 77664ba..cb3dd18 100644
--- a/scripts/networks/networkxml2hostout/tck-testnet-3.dat
+++ b/scripts/networks/networkxml2hostout/tck-testnet-3.dat
@@ -19,7 +19,7 @@ ACCEPT all  2001:db8:ac10:fe01::/64  ::/0
 #grep bind-dynamic `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ 
s|.*--conf-file=\(.*tck-testnet.conf\).*|\1|p'`
 bind-dynamic
 #grep dhcp-range `ps aux | sed -n '0,/dnsmasq .*tck-testnet/ 
s|.*--conf-file=\(.*tck-testnet.conf\).*|\1|p'`
-dhcp-range=10.1.2.2,10.1.2.254
+dhcp-range=10.1.2.2,10.1.2.254,255.255.255.0
 dhcp-range=2001:db8:ac10:fe01::1,ra-only
 dhcp-range=2001:db8:ac10:fd01::1,ra-only
 #ip link show type bridge | grep tck-testbr | gawk '{print $2}'
-- 
2.24.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list