bump version to 8.2.1

[pve-common.git] / test / etc_network_interfaces / t.ovs_bridge_allow.pl

diff --git a/test/etc_network_interfaces/t.ovs_bridge_allow.pl b/test/etc_network_interfaces/t.ovs_bridge_allow.pl
index 7a0b8cec7103d42b52220079703d321da16933b5..742c9efa3d50355ea2ef5dfa14b1ce18534f3e87 100644 (file)
--- a/test/etc_network_interfaces/t.ovs_bridge_allow.pl
+++ b/test/etc_network_interfaces/t.ovs_bridge_allow.pl
@@ -1,7 +1,6 @@
 use strict;
 
-my $ip = '192.168.0.100';
-my $nm = '255.255.255.0';
+my $ip = '192.168.0.100/24';
 my $gw = '192.168.0.1';
 
 # replace proc_net_dev with one with a bunch of interfaces
@@ -17,7 +16,6 @@ r('');
 new_iface('vmbr0', 'OVSBridge',
     [ { family => 'inet',
         address => $ip,
-        netmask => $nm,
         gateway => $gw } ],
     autostart => 1);
 
@@ -41,27 +39,25 @@ iface eth3 inet manual
 
 auto vmbr0
 iface vmbr0 inet static
-       address  $ip
-       netmask  $nm
-       gateway  $gw
+       address $ip
+       gateway $gw
        ovs_type OVSBridge
 
 /etc/network/interfaces
 
-# Adding an interface to the bridge needs to add allow- lines:
+# Adding an interface to the bridge needs to add allow- lines and remove
+# its autostart property.
 update_iface('vmbr0', [], ovs_ports => 'eth1 eth2');
 expect load('loopback') . <<"/etc/network/interfaces";
 auto eth0
 iface eth0 inet manual
 
 auto eth1
-allow-vmbr0 eth1
 iface eth1 inet manual
        ovs_type OVSPort
        ovs_bridge vmbr0
 
 auto eth2
-allow-vmbr0 eth2
 iface eth2 inet manual
        ovs_type OVSPort
        ovs_bridge vmbr0
@@ -70,9 +66,8 @@ iface eth3 inet manual
 
 auto vmbr0
 iface vmbr0 inet static
-       address  $ip
-       netmask  $nm
-       gateway  $gw
+       address $ip
+       gateway $gw
        ovs_type OVSBridge
        ovs_ports eth1 eth2
 
@@ -94,7 +89,7 @@ expect load('loopback') . <<"/etc/network/interfaces";
 auto eth0
 iface eth0 inet manual
 
-allow-vmbr0 eth1
+auto eth1
 iface eth1 inet manual
        ovs_type OVSPort
        ovs_bridge vmbr0
@@ -105,9 +100,8 @@ iface eth2 inet manual
 
 auto vmbr0
 iface vmbr0 inet static
-       address  $ip
-       netmask  $nm
-       gateway  $gw
+       address $ip
+       gateway $gw
        ovs_type OVSBridge
        ovs_ports eth1