further to commit 5efdd750 also for csv output

This commit is contained in:
Oliver Gorwits
2017-07-08 19:32:12 +01:00
parent 07e93df37c
commit 46c0b6b6e0
2 changed files with 8 additions and 22 deletions

View File

@@ -190,30 +190,15 @@
[% mynode.push('') %]
[% SET has_ips = 0 %]
[% IF params.n_ip4 %]
[% FOREACH ip IN node.ip4s %]
[% SET has_ips = 1 %]
[% FOREACH ip IN node.$ips %]
[% SET has_ips = 1 %]
[% CALL mynode.splice(-3, 1, ip.ip) %]
[% CALL mynode.splice(-2, 1, ip.dns) %]
[% CALL mynode.splice(-1, 1, (ip.active ? 'No' : 'Yes')) %]
[% CALL mynode.splice(-3, 1, ip.ip) %]
[% CALL mynode.splice(-2, 1, ip.dns) %]
[% CALL mynode.splice(-1, 1, (ip.active ? 'No' : 'Yes')) %]
[% CALL myport.splice(c_nodes_pos, mynode.size, mynode) %]
[% CSV.dump(myport) %]
[% END %]
[% END %]
[% IF params.n_ip6 %]
[% FOREACH ip IN node.ip6s %]
[% SET has_ips = 1 %]
[% CALL mynode.splice(-3, 1, ip.ip) %]
[% CALL mynode.splice(-2, 1, ip.dns) %]
[% CALL mynode.splice(-1, 1, (ip.active ? 'No' : 'Yes')) %]
[% CALL myport.splice(c_nodes_pos, mynode.size, mynode) %]
[% CSV.dump(myport) %]
[% END %]
[% CALL myport.splice(c_nodes_pos, mynode.size, mynode) %]
[% CSV.dump(myport) %]
[% END %]
[% CSV.dump(myport) IF NOT has_ips %]