135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- add a function to avoid to have two times the same device exported in rancid config (#725)

Browse Source 
- avoid some strange warning message and add a default domain in makerancidconf plugin
This commit is contained in:
Ambroise
2020-06-05 10:08:19 +02:00
committed by GitHub
parent b8eab54010
commit 224bfbca52
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/App/Netdisco/Worker/Plugin/MakeRancidConf.pm
View File

@@ -18,7 +18,7 @@ register_worker({ phase => 'main' }, sub {
my ($job, $workerconf) = @_; my ($job, $workerconf) = @_;
my $config = setting('rancid') || {}; my $config = setting('rancid') || {};
my $domain_suffix = setting('domain_suffix'); my $domain_suffix = setting('domain_suffix') || '';
my $delimiter = $config->{delimiter} || ';'; my $delimiter = $config->{delimiter} || ';';
my $down_age = $config->{down_age} || '1 day'; my $down_age = $config->{down_age} || '1 day';
my $default_group = $config->{default_group} || 'default'; my $default_group = $config->{default_group} || 'default';
@@ -62,6 +62,7 @@ register_worker({ phase => 'main' }, sub {
} }
my $routerdb = {}; my $routerdb = {};
my $routerunicity = {};
while (my $d = $devices->next) { while (my $d = $devices->next) {
if (check_acl_no($d, $config->{excluded})) { if (check_acl_no($d, $config->{excluded})) {
@@ -70,11 +71,16 @@ register_worker({ phase => 'main' }, sub {
} }
my $name = check_acl_no($d, $config->{by_ip}) ? $d->ip : ($d->dns || $d->name); my $name = check_acl_no($d, $config->{by_ip}) ? $d->ip : ($d->dns || $d->name);
$name =~ s/$domain_suffix// if check_acl_no($d, $config->{by_hostname}); $name =~ s/$domain_suffix$// if check_acl_no($d, $config->{by_hostname});
my ($group) = my ($group) =
(pairkeys pairfirst { check_acl_no($d, $b) } %{ $config->{groups} }) || $default_group; (pairkeys pairfirst { check_acl_no($d, $b) } %{ $config->{groups} }) || $default_group;
if (exists($routerunicity->{$group}->{$name})) {
debug " skipping $d: device excluded because already present in export list";
next;
}
my ($vendor) = my ($vendor) =
(pairkeys pairfirst { check_acl_no($d, $b) } %{ $config->{vendormap} }) (pairkeys pairfirst { check_acl_no($d, $b) } %{ $config->{vendormap} })
|| $d->vendor; || $d->vendor;
@@ -93,6 +99,7 @@ register_worker({ phase => 'main' }, sub {
push @{$routerdb->{$group}}, push @{$routerdb->{$group}},
(sprintf "%s${delimiter}%s${delimiter}%s", $name, $vendor, (sprintf "%s${delimiter}%s${delimiter}%s", $name, $vendor,
($d->get_column('old') ? 'down' : 'up')); ($d->get_column('old') ? 'down' : 'up'));
$routerunicity->{$group}->{$name} = 1;
} }
foreach my $group (keys %$routerdb) { foreach my $group (keys %$routerdb) {