return $v;
};
+my $check_mtu = sub {
+ my ($ifaces, $parent, $child) = @_;
+
+ die "check mtu - missing parent interface\n" if !$parent;
+ die "check mtu - missing child interface\n" if !$child;
+
+ my $pmtu = $ifaces->{$parent}->{mtu} ? $ifaces->{$parent}->{mtu} : 1500;
+ my $cmtu = $ifaces->{$child}->{mtu} ? $ifaces->{$child}->{mtu} : 1500;
+
+ die "interface '$parent' - mtu $pmtu is bigger than '$child' - mtu $cmtu\n"
+ if $pmtu > $cmtu;
+};
+
# config => {
# ifaces => {
# $ifname => {
$id = $options_alternatives->{$id} if $options_alternatives->{$id};
+ my $simple_options = {
+ 'mtu' => 1,
+ 'ovs_type' => 1,
+ 'ovs_options' => 1,
+ 'ovs_bridge' => 1,
+ 'ovs_bonds' => 1,
+ 'ovs_ports' => 1,
+ 'bridge_fd' => 1,
+ 'bridge_vids' => 1,
+ 'bridge-access' => 1,
+ 'bridge-learning' => 1,
+ 'bridge-arp-nd-suppress' => 1,
+ 'bridge-unicast-flood' => 1,
+ 'bridge-multicast-flood' => 1,
+ 'bond_miimon' => 1,
+ 'bond_xmit_hash_policy' => 1,
+ 'vxlan-id' => 1,
+ 'vxlan-svcnodeip' => 1,
+ 'vxlan-physdev' => 1,
+ 'vxlan-local-tunnelip' => 1 };
+
if (($id eq 'address') || ($id eq 'netmask') || ($id eq 'broadcast') || ($id eq 'gateway')) {
$f->{$id} = $value;
- } elsif ($id eq 'ovs_type' || $id eq 'ovs_options'|| $id eq 'ovs_bridge' ||
- $id eq 'ovs_bonds' || $id eq 'ovs_ports') {
+ } elsif ($simple_options->{$id}) {
$d->{$id} = $value;
} elsif ($id eq 'slaves' || $id eq 'bridge_ports') {
my $devs = {};
} else {
$d->{$id} = 'off';
}
- } elsif ($id eq 'bridge_fd' || $id eq 'bridge_vids') {
- $d->{$id} = $value;
} elsif ($id eq 'bridge_vlan_aware') {
$d->{$id} = 1;
- } elsif ($id eq 'bond_miimon') {
- $d->{$id} = $value;
- } elsif ($id eq 'bond_xmit_hash_policy') {
- $d->{$id} = $value;
} elsif ($id eq 'bond_mode') {
# always use names
foreach my $bm (keys %$bond_modes) {
}
}
$d->{$id} = $value;
- } elsif ($id eq 'vxlan-id' || $id eq 'vxlan-svcnodeip' ||
- $id eq 'vxlan-physdev' || $id eq 'vxlan-local-tunnelip') {
- $d->{$id} = $value;
} elsif ($id eq 'vxlan-remoteip') {
push @{$d->{$id}}, $value;
} else {
$done->{'bond_xmit_hash_policy'} = 1;
} elsif ($d->{type} eq 'vxlan') {
- foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
- $raw .= "\t$k $d->{$k}\n" if $d->{$k};
+ foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
+ $raw .= "\t$k $d->{$k}\n" if defined $d->{$k};
$done->{$k} = 1;
- }
+ }
if ($d->{'vxlan-remoteip'}) {
foreach my $remoteip (@{$d->{'vxlan-remoteip'}}) {
}
$done->{'vxlan-remoteip'} = 1;
}
-
} elsif ($d->{type} eq 'OVSBridge') {
$raw .= "\tovs_type $d->{type}\n";
if ($first_block) {
# print other settings
- foreach my $k (keys %$d) {
+ foreach my $k (sort keys %$d) {
next if $done->{$k};
next if !$d->{$k};
$raw .= "\t$k $d->{$k}\n";
# delete unused OVS ports
foreach my $iface (keys %$ifaces) {
my $d = $ifaces->{$iface};
- if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' ||
+ if ($d->{type} eq 'OVSPort' || $d->{type} eq 'OVSIntPort' ||
$d->{type} eq 'OVSBond') {
my $brname = $used_ports->{$iface};
- if (!$brname || !$ifaces->{$brname}) {
+ if (!$brname || !$ifaces->{$brname}) {
if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
$ifaces->{$iface} = { type => 'eth',
exists => 1,
$n->{autostart} = 0;
if ($n->{type} eq 'eth') {
$n->{type} = 'OVSPort';
- $n->{ovs_bridge} = $iface;
+ $n->{ovs_bridge} = $iface;
} elsif ($n->{type} eq 'OVSBond' || $n->{type} eq 'OVSPort' ||
$n->{type} eq 'OVSIntPort') {
$n->{ovs_bridge} = $iface;
} else {
die "interface '$p' is not defined as OVS port/bond\n";
}
+
+ &$check_mtu($ifaces, $iface, $p);
}
}
}
if !$n;
die "OVS bond '$iface' - wrong interface type on slave '$p' " .
"('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth';
+ &$check_mtu($ifaces, $iface, $p);
+ }
+ }
+ }
+
+ # check bond
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+ if ($d->{type} eq 'bond' && $d->{slaves}) {
+ foreach my $p (split (/\s+/, $d->{slaves})) {
+ my $n = $ifaces->{$p};
+
+ die "bond '$iface' - unable to find slave '$p'\n"
+ if !$n;
+ die "bond '$iface' - wrong interface type on slave '$p' " .
+ "('$n->{type}' != 'eth')\n" if $n->{type} ne 'eth';
+ &$check_mtu($ifaces, $iface, $p);
}
}
}
if ($d->{type} eq 'vxlan' && $d->{'vxlan-id'}) {
my $vxlanid = $d->{'vxlan-id'};
- die "iface $iface : duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid};
+ die "iface $iface - duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid};
$vxlans->{$vxlanid} = $iface;
}
++$ips if defined $d->{'vxlan-remoteip'};
++$ips if defined $d->{'vxlan-local-tunnelip'};
if ($ips > 1) {
- die "ifac $iface : vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n";
+ die "iface $iface - vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n";
}
if (defined($d->{'vxlan-svcnodeip'}) != defined($d->{'vxlan-physdev'})) {
- die "iface $iface : vxlan-svcnodeip and vxlan-physdev must be define together\n";
+ die "iface $iface - vxlan-svcnodeip and vxlan-physdev must be define together\n";
+ }
+ #fixme : check if vxlan mtu is lower than 50bytes than physical interface where tunnel is going out
+ }
+
+ # check vlan
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+ if ($d->{type} eq 'vlan' && $iface =~ m/^(\S+)\.\d+$/) {
+ my $p = $1;
+ my $n = $ifaces->{$p};
+
+ die "vlan '$iface' - unable to find parent '$p'\n"
+ if $n->{exists} eq 0;
+
+ if ($n->{type} eq 'bridge' && !$n->{bridge_vlan_aware}) {
+ die "vlan '$iface' - bridge vlan aware is not enabled on parent '$p'\n";
+ } elsif ($n->{type} ne 'eth' && $n->{type} ne 'bridge' && $n->{type} ne 'bond') {
+ die "vlan '$iface' - wrong interface type on parent '$p' " .
+ "('$n->{type}' != 'eth|bond|bridge' )\n";
+ }
+ &$check_mtu($ifaces, $iface, $p);
+ }
+ }
+
+ # check bridgeport option
+ my $bridgeports = {};
+ my $bridges = {};
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+ if ($d->{type} eq 'bridge') {
+ foreach my $p (split (/\s+/, $d->{bridge_ports})) {
+ my $n = $ifaces->{$p};
+ die "bridge '$iface' - unable to find bridge port '$p'\n"
+ if !$n;
+ &$check_mtu($ifaces, $iface, $p);
+ $bridgeports->{$p} = $iface;
+ }
+ $bridges->{$iface} = $d;
+ }
+ }
+
+ foreach my $iface (keys %$ifaces) {
+ my $d = $ifaces->{$iface};
+
+ foreach my $k (qw(bridge-learning bridge-arp-nd-suppress bridge-unicast-flood bridge-multicast-flood bridge-access)) {
+ die "iface $iface - $k: bridge port specific options can be used only on interfaces attached to a bridge\n"
+ if $d->{$k} && !$bridgeports->{$iface};
+ }
+
+ if ($d->{'bridge-access'} && !$bridges->{$bridgeports->{$iface}}->{bridge_vlan_aware}) {
+ die "iface $iface - bridge-access option can be only used if interface is in a vlan aware bridge\n";
}
}