Changeset 295 for trunk

Timestamp:

Jul 18, 2018, 11:51:42 AM (7 years ago)

Author:

g7moreau

Message:

• Small change in show command

File:

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

trunk/ddt/ddt

@@ -2268 +2268 @@
       next if $domainset_current eq 'version';
 
-      print "\n# *** List of computers without IP in the domain set: $domainset_current ***\n";
+      print "\n# *** List of pool computers in the domain set: $domainset_current ***\n";
       printf "%-30s  %-20s %17s %5s %7s %-10s %s\n",
          'Hostname',
@@ -2282 +2282 @@
       for my $computer (@domainsetdb) {
          my ($mac_address, $attribute) = %{$computer};
-
-         if ($attribute->{'ip'} =~ m/$DDT::RE::IPv4_ADDRESS/xms) {
-            if ( not exists $ipdb{ $attribute->{'ip'} } ) {
-               $ipdb{ $attribute->{'ip'} } = {
+         my $ip = $attribute->{'ip'};
+
+         if ($ip =~ m/$DDT::RE::IPv4_ADDRESS/xms) {
+            if ( not exists $ipdb{$ip} ) {
+               $ipdb{$ip} = {
                   'mac_address'  => $mac_address,
                   %{$attribute},
-                  'domain'       => $domainset_current,
+                  'domainset'    => $domainset_current,
                   };
                next LOOP_ON_COMPUTER;
                }
             else {
-               print {*STDERR} "# Warning: $attribute->{'ip'} already exists in the database !\n";
+               print {*STDERR} "# Warning: $ip already exists in the database !\n";
                }
             }
@@ -2305 +2306 @@
          $comment =~ s/^\d\d\d\d-\d\d-\d\d\s//;
 
-         my $ip = $attribute->{'ip'};
-
          my $enable = $attribute->{'enabled'};
          if (exists $attribute->{'pxe_config'}) {
             $enable .= '/' . $attribute->{'pxe_config'};
             }
-         if (exists $ipdb{$ip}->{'tag'}) {
-            $enable .= ':' . $ipdb{$ip}->{'tag'};
+         if (exists $attribute->{'tag'}) {
+            $enable .= ':' . $attribute->{'tag'};
             }
 
@@ -2346 +2345 @@
 
       printf "%-30s %-20s %17s %9s %3s %10s %s\n",
-         $ipdb{$ip}->{'hostname'} . '.' . $ipdb{$ip}->{'domain'},
+         $ipdb{$ip}->{'hostname'} . '.' . $ipdb{$ip}->{'domainset'},
          $ip,
          normalize_mac_address($ipdb{$ip}->{'mac_address'}),