INotify: use cidr for address on config change

[pve-common.git] / test / etc_network_interfaces / t.bridge-v4-v6.pl

diff --git a/test/etc_network_interfaces/t.bridge-v4-v6.pl b/test/etc_network_interfaces/t.bridge-v4-v6.pl
index 93e5bb59b3b09b3b9921730f0eb95a8829646398..8a8007443fcf7c3e6be541a081d085bb2530ec2b 100644 (file)
--- a/test/etc_network_interfaces/t.bridge-v4-v6.pl
+++ b/test/etc_network_interfaces/t.bridge-v4-v6.pl
@@ -1,8 +1,6 @@
-my $ip = '10.0.0.2';
-my $nm = '255.255.255.0';
+my $ip = '10.0.0.2/24';
 my $gw = '10.0.0.1';
-my $ip6 = 'fc05::1:2';
-my $nm6 = '112';
+my $ip6 = 'fc05::1:2/112';
 my $gw6 = 'fc05::1:1';
 
 r(load('base'));
@@ -12,9 +10,9 @@ new_iface('vmbr0', 'bridge', [{ family => 'inet' }], autostart => 1, bridge_port
 expect load('base') . <<"EOF";
 auto vmbr0
 iface vmbr0 inet manual
-       bridge_ports eth0
-       bridge_stp off
-       bridge_fd 0
+       bridge-ports eth0
+       bridge-stp off
+       bridge-fd 0
 
 EOF
 
@@ -22,18 +20,16 @@ EOF
 update_iface('vmbr0',
     [ { family => 'inet',
        address => $ip,
-       netmask => $nm,
        gateway => $gw } ],
     autostart => 0);
 
 expect load('base') . <<"EOF";
 iface vmbr0 inet static
        address  $ip
-       netmask  $nm
        gateway  $gw
-       bridge_ports eth0
-       bridge_stp off
-       bridge_fd 0
+       bridge-ports eth0
+       bridge-stp off
+       bridge-fd 0
 
 EOF
 save('with-ipv4', w());
@@ -41,13 +37,11 @@ save('with-ipv4', w());
 update_iface('vmbr0',
     [ { family => 'inet6',
        address => $ip6,
-       netmask => $nm6,
        gateway => $gw6 } ]);
 
 expect load('with-ipv4') . <<"EOF";
 iface vmbr0 inet6 static
        address  $ip6
-       netmask  $nm6
        gateway  $gw6
 
 EOF
@@ -64,11 +58,10 @@ delete_iface('vmbr0', 'inet');
 expect load('base') . <<"EOF";
 iface vmbr0 inet6 static
        address  $ip6
-       netmask  $nm6
        gateway  $gw6
-       bridge_ports eth0
-       bridge_stp off
-       bridge_fd 0
+       bridge-ports eth0
+       bridge-stp off
+       bridge-fd 0
 
 EOF