[pve-devel] applied: [RFC common] add and use physical NIC regexp

[Wolfgang Bumiller]

applied

On Mon, May 22, 2017 at 09:44:17AM +0200, Fabian Grünbichler wrote:
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> ---
> this was strangely redundant ;) name and placement in Network.pm up for
> discussion of course
> 
>  src/PVE/INotify.pm | 9 +++++----
>  src/PVE/Network.pm | 2 ++
>  2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
> index b2a5802..a383040 100644
> --- a/src/PVE/INotify.pm
> +++ b/src/PVE/INotify.pm
> @@ -13,6 +13,7 @@ use File::Basename;
>  use Fcntl qw(:DEFAULT :flock);
>  use PVE::SafeSyslog;
>  use PVE::Exception qw(raise_param_exc);
> +use PVE::Network;
>  use PVE::Tools;
>  use PVE::ProcFSTools;
>  use Clone qw(clone);
> @@ -801,7 +802,7 @@ sub __read_etc_network_interfaces {
>  
>      if ($proc_net_dev) {
>  	while (defined ($line = <$proc_net_dev>)) {
> -	    if ($line =~ m/^\s*(eth\d+|en[^:.]+|ib\d+):.*/) {
> +	    if ($line =~ m/^\s*($PVE::Network::PHYSICAL_NIC_RE):.*/) {
>  		$ifaces->{$1}->{exists} = 1;
>  	    }
>  	}
> @@ -974,7 +975,7 @@ sub __read_etc_network_interfaces {
>  		$ifaces->{$1}->{exists} = 0;
>  		$d->{exists} = 0;
>  	    }
> -	} elsif ($iface =~ m/^(?:eth\d+|en[^:.]+|ib\d+)$/) {
> +	} elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
>  	    if (!$d->{ovs_type}) {
>  		$d->{type} = 'eth';
>  	    } elsif ($d->{ovs_type} eq 'OVSPort') {
> @@ -1203,7 +1204,7 @@ sub __write_etc_network_interfaces {
>  	    $d->{type} eq 'OVSBond') {
>  	    my $brname = $used_ports->{$iface};
>  	    if (!$brname || !$ifaces->{$brname}) { 
> -		if ($iface =~ /^(?:eth|en|ib)/) {
> +		if ($iface =~ /^$PVE::Network::PHYSICAL_NIC_RE/) {
>  		    $ifaces->{$iface} = { type => 'eth',
>  					  exists => 1,
>  					  method => 'manual',
> @@ -1292,7 +1293,7 @@ NETWORKDOC
>  	my $pri;
>  	if ($iface eq 'lo') {
>  	    $pri = $if_type_hash->{loopback};
> -	} elsif ($iface =~ m/^(?:eth\d+|ib\d+|en[^:.]+)$/) {
> +	} elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
>  	    $pri = $if_type_hash->{eth} + $child;
>  	} elsif ($iface =~ m/^bond\d+$/) {
>  	    $pri = $if_type_hash->{bond} + $child;
> diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm
> index babc204..f91d151 100644
> --- a/src/PVE/Network.pm
> +++ b/src/PVE/Network.pm
> @@ -14,6 +14,8 @@ use Net::IP;
>  
>  # host network related utility functions
>  
> +our $PHYSICAL_NIC_RE = qr/(?:eth\d+|en[^:.]+|ib\d+)/;
> +
>  our $ipv4_reverse_mask = [
>      '0.0.0.0',
>      '128.0.0.0',
> -- 
> 2.1.4