proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-07-15 22:17:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cleanup: whitespace and error message consistency

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2018-07-10 11:53:01 +02:00
parent 9b053d70de
commit 94d786b393
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/PVE/INotify.pm
View File

@ -756,8 +756,8 @@ my $extract_ovs_option = sub {
my $check_mtu = sub { my $check_mtu = sub {
my ($ifaces, $parent, $child) = @_; my ($ifaces, $parent, $child) = @_;
die "check mtu : missing parent interface\n" if !$parent; die "check mtu - missing parent interface\n" if !$parent;
die "check mtu : missing child interface\n" if !$child; die "check mtu - missing child interface\n" if !$child;
my $pmtu = $ifaces->{$parent}->{mtu} ? $ifaces->{$parent}->{mtu} : 1500; my $pmtu = $ifaces->{$parent}->{mtu} ? $ifaces->{$parent}->{mtu} : 1500;
my $cmtu = $ifaces->{$child}->{mtu} ? $ifaces->{$child}->{mtu} : 1500; my $cmtu = $ifaces->{$child}->{mtu} ? $ifaces->{$child}->{mtu} : 1500;
@ -1153,7 +1153,7 @@ sub __interface_to_string {
} elsif ($d->{type} eq 'vxlan') { } elsif ($d->{type} eq 'vxlan') {
foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) { foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
$raw .= "\t$k $d->{$k}\n" if $d->{$k}; $raw .= "\t$k $d->{$k}\n" if defined $d->{$k};
$done->{$k} = 1; $done->{$k} = 1;
} }
@ -1360,7 +1360,7 @@ sub __write_etc_network_interfaces {
if ($d->{type} eq 'vxlan' && $d->{'vxlan-id'}) { if ($d->{type} eq 'vxlan' && $d->{'vxlan-id'}) {
my $vxlanid = $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; $vxlans->{$vxlanid} = $iface;
} }
@ -1369,11 +1369,11 @@ sub __write_etc_network_interfaces {
++$ips if defined $d->{'vxlan-remoteip'}; ++$ips if defined $d->{'vxlan-remoteip'};
++$ips if defined $d->{'vxlan-local-tunnelip'}; ++$ips if defined $d->{'vxlan-local-tunnelip'};
if ($ips > 1) { 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'})) { 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 #fixme : check if vxlan mtu is lower than 50bytes than physical interface where tunnel is going out
} }
@ -1419,12 +1419,12 @@ sub __write_etc_network_interfaces {
my $d = $ifaces->{$iface}; my $d = $ifaces->{$iface};
foreach my $k (qw(bridge-learning bridge-arp-nd-suppress bridge-unicast-flood bridge-multicast-flood bridge-access)) { foreach my $k (qw(bridge-learning bridge-arp-nd-suppress bridge-unicast-flood bridge-multicast-flood bridge-access)) {
die "iface $iface : bridgeports options can be used only if interface is in a bridge\n" 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->{$k} && !$bridgeports->{$iface};
} }
if ($d->{'bridge-access'} && !$bridges->{$bridgeports->{$iface}}->{bridge_vlan_aware}) { 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"; die "iface $iface - bridge-access option can be only used if interface is in a vlan aware bridge\n";
} }
} }