From ab24d116f620a32618fcccaa8e6079001bddd9a1 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 5 Jun 2019 19:17:33 +0200 Subject: [PATCH] TT#59403 Do not require some properties on network interface aliases An alias for a vlan interface will not have a raw device, stop requiring it. And an alias for a bond interface might not have miimon, mode or slaves attributes. Change-Id: I4b0f547f1c1d02ee826ad97db1a1f44ab91c0e63 --- sbin/ngcp-network-validator | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sbin/ngcp-network-validator b/sbin/ngcp-network-validator index 33adbb7c..839e5e30 100755 --- a/sbin/ngcp-network-validator +++ b/sbin/ngcp-network-validator @@ -148,7 +148,7 @@ foreach my $hostname (sort keys %{$yaml->{hosts}}) { mapping => dclone($schema_iface->{ifacemap}), }; - if ($iface =~ m/^bond/) { + if ($iface =~ m/^bond/ && $iface !~ m/:/) { $ifacemap->{mapping}->{bond_miimon}->{required} = 'yes'; $ifacemap->{mapping}->{bond_mode}->{required} = 'yes'; $ifacemap->{mapping}->{bond_slaves}->{required} = 'yes'; @@ -156,7 +156,8 @@ foreach my $hostname (sort keys %{$yaml->{hosts}}) { $ifacemap->{mapping}->{hwaddr}->{required} = 'yes'; } elsif ($iface =~ m/^vlan/) { $ifacemap->{mapping}->{type}->{required} = 'yes'; - $ifacemap->{mapping}->{vlan_raw_device}->{required} = 'yes'; + $ifacemap->{mapping}->{vlan_raw_device}->{required} = 'yes' + if $iface !~ m/:/; } elsif ($iface =~ m/^idrac/) { $ifacemap->{mapping}->{type}->{required} = 'yes'; }