Changeset 361 for trunk

Timestamp:

Sep 14, 2018, 10:03:14 PM (6 years ago)

Author:

g7moreau

Message:

• Change ip-range in db to ip_range

File:

• trunk/ddt/ddt (modified) (6 diffs)

trunk/ddt/ddt

@@ -1668 +1668 @@
 
    my $timestamp = time;
-   $computer_db->{'dset'}{$sector}{'ip-range'} ||= [];
+   $computer_db->{'dset'}{$sector}{'ip_range'} ||= [];
    LOOP_ON_CIDR:
-   for my $cidr_current (@{$computer_db->{'dset'}{$sector}{'ip-range'}}) {
+   for my $cidr_current (@{$computer_db->{'dset'}{$sector}{'ip_range'}}) {
       next LOOP_ON_CIDR if $cidr_current ne $ip_range;
       
@@ -1677 +1677 @@
 
    my $timestamp = time;
-   push @{$computer_db->{'dset'}{$sector}{'ip-range'}}, $ip_range;
+   push @{$computer_db->{'dset'}{$sector}{'ip_range'}}, $ip_range;
    $computer_db->{'dset'}{$sector}{'modify_time'} = $timestamp;
    ipamdb_save("$COMPUTER_YAML", $computer_db);
@@ -2251 +2251 @@
 
       my $ip_range;
-      $ip_range = join ',', @{$computer_db->{'dset'}{$sector_current}{'ip-range'}} if exists $computer_db->{'dset'}{$sector_current}{'ip-range'};
+      $ip_range = join ',', @{$computer_db->{'dset'}{$sector_current}{'ip_range'}} if exists $computer_db->{'dset'}{$sector_current}{'ip_range'};
 
       my $category;
@@ -2769 +2769 @@
             LOOP_ON_IP:
             for my $ip (NetAddr::IP->new($ip_range)->hostenum()) {
+               $ip =~ s{/32$}{};
                print "$ip\n";
                
@@ -2786 +2787 @@
                # Verify direct return same host
                LOOP_ON_COMPUTER:
-               for my $computer (@{$computer_db->{$sector_current}) {
+               for my $computer (@{$computer_db->{$sector_current}}) {
                   my ($mac_address, $attribute) = %{$computer};
 
@@ -2798 +2799 @@
 
                # Declare in DNS but not in DDT
-               print "Error: DNS host $dns_hostname with IP $ip not declare in DDT database\n" if $dns_hostname ne '';
+               print "Error: DNS host $dns_hostname in sector $sector_current with IP $ip not declare in DDT database\n" if $dns_hostname ne '';
                # Normally never arrive here