diff --git a/test/etc_network_interfaces/runtest.pl b/test/etc_network_interfaces/runtest.pl index f92f5ae..10fafae 100755 --- a/test/etc_network_interfaces/runtest.pl +++ b/test/etc_network_interfaces/runtest.pl @@ -78,7 +78,7 @@ sub r($;$$) { sub w() { # write shouldn't be able to change a previously parsed config my $config_clone = dclone($config); - return PVE::INotify::__write_etc_network_interfaces($config_clone); + return PVE::INotify::__write_etc_network_interfaces($config_clone, 1); } ## diff --git a/test/etc_network_interfaces/t.bridge_eth_remove_auto.pl b/test/etc_network_interfaces/t.bridge_eth_remove_auto.pl deleted file mode 100644 index 98f5df8..0000000 --- a/test/etc_network_interfaces/t.bridge_eth_remove_auto.pl +++ /dev/null @@ -1,24 +0,0 @@ -use strict; - -# access to the current config -our $config; - -# replace proc_net_dev with one with a bunch of interfaces -save('proc_net_dev', <<'/proc/net/dev'); -eth0: -eth1: -/proc/net/dev - -r(''); -update_iface('eth0', [], autostart => 1); -update_iface('eth1', [], autostart => 1); -r(w()); -die "autostart lost" if !$config->{ifaces}->{eth0}->{autostart}; -die "autostart lost" if !$config->{ifaces}->{eth1}->{autostart}; -new_iface("vmbr0", 'bridge', [{ family => 'inet' }], bridge_ports => 'eth0'); -new_iface("vmbr1", 'OVSBridge', [{ family => 'inet' }], ovs_ports => 'eth1'); -r(w()); -die "autostart wrongly removed for linux bridge port" if !$config->{ifaces}->{eth0}->{autostart}; -die "autostart not removed for ovs bridge port" if $config->{ifaces}->{eth1}->{autostart}; - -1; diff --git a/test/etc_network_interfaces/t.create_network.pl b/test/etc_network_interfaces/t.create_network.pl index b8da513..6aad74c 100644 --- a/test/etc_network_interfaces/t.create_network.pl +++ b/test/etc_network_interfaces/t.create_network.pl @@ -420,7 +420,7 @@ auto eth1.100 iface eth1.100 inet manual mtu 1400 -allow-vmbr6 ovsintvlan +auto ovsintvlan iface ovsintvlan inet manual ovs_type OVSIntPort ovs_bridge vmbr6 @@ -429,7 +429,7 @@ iface ovsintvlan inet manual $bond0_part -allow-vmbr6 bond1 +auto bond1 iface bond1 inet manual ovs_bonds eth4 eth5 ovs_type OVSBond @@ -464,7 +464,7 @@ iface vmbr5 inet manual bridge-fd 0 mtu 1100 -allow-ovs vmbr6 +auto vmbr6 iface vmbr6 inet manual ovs_type OVSBridge ovs_ports bond1 ovsintvlan diff --git a/test/etc_network_interfaces/t.ovs_bridge_allow.pl b/test/etc_network_interfaces/t.ovs_bridge_allow.pl index 9479ff5..742c9ef 100644 --- a/test/etc_network_interfaces/t.ovs_bridge_allow.pl +++ b/test/etc_network_interfaces/t.ovs_bridge_allow.pl @@ -37,7 +37,7 @@ iface eth2 inet manual iface eth3 inet manual -allow-ovs vmbr0 +auto vmbr0 iface vmbr0 inet static address $ip gateway $gw @@ -52,19 +52,19 @@ 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 -allow-vmbr0 eth2 +auto eth2 iface eth2 inet manual ovs_type OVSPort ovs_bridge vmbr0 iface eth3 inet manual -allow-ovs vmbr0 +auto vmbr0 iface vmbr0 inet static address $ip gateway $gw @@ -89,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 @@ -98,7 +98,7 @@ iface eth3 inet manual iface eth2 inet manual -allow-ovs vmbr0 +auto vmbr0 iface vmbr0 inet static address $ip gateway $gw