Changeset 299

Timestamp:

Jul 18, 2018, 1:08:50 PM (7 years ago)

Author:

g7moreau

Message:

• Use table for command show

File:

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

trunk/ddt/ddt

@@ -2261 +2261 @@
    my $computer_db = ipamdb_load($COMPUTER_YAML);
 
-   LOOP_ON_DOMAIN:
+   my $tb_computer = Text::Table->new(
+     {align  => 'left',   align_title => 'left',   title => 'Hostname.DomainSet'},
+     {is_sep => 1,        body        => '  '},
+     {align  => 'left',   align_title => 'left',   title => 'IPv4-Address'},
+     {is_sep => 1,        body        => '  '},
+     {align  => 'center', align_title => 'center', title => 'MAC-Address'},
+     {is_sep => 1,        body        => '  '},
+     {align  => 'right',  align_title => 'right',  title => 'Type'},
+     {align  => 'right',  align_title => 'right',  title => 'Status'},
+     {is_sep => 1,        body        => '  '},
+     {align  => 'left',   align_title => 'left',   title => 'Date'},
+     {align  => 'left',   align_title => 'left',   title => 'Comment'},
+     );
+
+  LOOP_ON_DOMAIN:
    for my $domainset_current (sort keys %{$computer_db}) {
       next if $domainset_current eq 'dset';
@@ -2269 +2283 @@
       next if $domainset_current eq 'version';
 
-      my $tb_computer = Text::Table->new(
-         {align  => 'left',   align_title => 'left',   title => 'Hostname.DomainSet'},
-         {is_sep => 1,        body        => '  '},
-         {align  => 'left',   align_title => 'left',   title => 'IPv4-Address'},
-         {is_sep => 1,        body        => '  '},
-         {align  => 'center', align_title => 'center', title => 'MAC-Address'},
-         {is_sep => 1,        body        => '  '},
-         {align  => 'right',  align_title => 'right',  title => 'Type'},
-         {align  => 'right',  align_title => 'right',  title => 'Status'},
-         {is_sep => 1,        body        => '  '},
-         {align  => 'left',   align_title => 'left',   title => 'Date'},
-         {align  => 'left',   align_title => 'left',   title => 'Comment'},
-         );
-
-      #printf "%-30s  %-20s %17s %5s %7s %-10s %s\n",
-      #   'Hostname',
-      #   'IPv4-Address',
-      #   'MAC-Address',
-      #   'Type',
-      #   'Status',
-      #   'Date',
-      #   'Comment';
       my @domainsetdb = @{$computer_db->{$domainset_current}};
 
@@ -2305 +2297 @@
                   'domainset'    => $domainset_current,
                   };
-               next LOOP_ON_COMPUTER;
                }
             else {
-               print {*STDERR} "# Warning: $ip already exists in the database !\n";
+               print {*STDERR} "# Warning: $ip already exists in the database with MAC $mac_address!\n";
                }
+            next LOOP_ON_COMPUTER;
             }
 
@@ -2339 +2331 @@
             );
          }
-
-      if ($tb_computer->body_height) {
-         print "\n# *** List of pool computers in the domain set: $domainset_current ***\n";
-         print $tb_computer->title();
-         print $tb_computer->rule('-');
-         print $tb_computer->body();
-         }
-      }
-
-   print "\n# *** List of computers ordered by IP and domain set ***\n";
+      #print "\n# *** List of pool computers in the domain set: $domainset_current ***\n";
+      }
+
+   #print "\n# *** List of computers ordered by IP and domain set ***\n";
    LOOP_ON_IP_ADDRESS:
    foreach my $ip (Net::Netmask::sort_by_ip_address(keys %ipdb)) {
@@ -2367 +2353 @@
          }
 
-      printf "%-30s %-20s %17s %9s %3s %10s %s\n",
+      #printf "%-30s %-20s %17s %9s %3s %10s %s\n",
+      $tb_computer->add(
          $ipdb{$ip}->{'hostname'} . '.' . $ipdb{$ip}->{'domainset'},
          $ip,
@@ -2374 +2361 @@
          $enable,
          $date,
-         $comment;
-      }
+         $comment
+         );
+      }
+
+   print $tb_computer->title();
+   print $tb_computer->rule('-');
+   print $tb_computer->body();
    }