Changeset 333 for trunk

Timestamp:

Aug 28, 2018, 3:07:40 PM (6 years ago)

Author:

g7moreau

Message:

• Rewrite enable_pxe

File:

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

trunk/ddt/ddt

@@ -1133 +1133 @@
 
          if ($attribute->{'enabled'} eq 'no') {
-            print "Info: Host $hostname from domain set $domainset is already disable [OK]" .
+            print "Info: host $hostname from domain set $domainset is already disable [OK]" .
                " ... Status: $attribute->{'enabled'}\n";
             exit;
@@ -1156 +1156 @@
    my $computer_db = ipamdb_load($COMPUTER_YAML);
 
-   my $computer_index;
    if ( control_exist_mac($computer_db, $mac) == 1 ) {
       die "Error: unkown physical MAC address: $mac [FAILED]\n";
@@ -1177 +1176 @@
          if ($attribute->{'ip'} eq $pool) {
             if ($attribute->{'enabled'} eq 'no') {
-               print "Info: Host $mac from pool $pool is already disable [OK]" .
+               print "Info: host $mac from pool $pool is already disable [OK]" .
                   " ... Status: $attribute->{'enabled'}\n";
                exit;
@@ -1185 +1184 @@
             $attribute->{'enabled'}     = 'no';
             ipamdb_save("$COMPUTER_YAML", $computer_db);
-            print "Info: Disabling host $mac from pool $pool [OK]" .
+            print "Info: disabling host $mac from pool $pool [OK]" .
                " ... Status: $attribute->{'enabled'}\n";
             exit;
@@ -1262 +1261 @@
 
          if ($attribute->{'enabled'} eq 'yes') {
-            print "Info: Host $hostname belongs to domain set $domainset is already enable [OK]" .
+            print "Info: host $hostname belongs to domain set $domainset is already enable [OK]" .
                " ... Status: $attribute->{'enabled'}\n";
             exit;
@@ -1271 +1270 @@
          $attribute->{'enabled'}     = 'yes';
          ipamdb_save("$COMPUTER_YAML", $computer_db);
-         print "Info: Host $hostname is now enable [OK]" .
+         print "Info: host $hostname is now enable [OK]" .
             " ... Status: $attribute->{'enabled'}\n";
          exit;
@@ -1309 +1308 @@
 
          if ($attribute->{'enabled'} eq 'yes') {
-            print "Info: Host $mac from pool $pool is already enable [OK]" .
+            print "Info: host $mac from pool $pool is already enable [OK]" .
                " ... Status: $attribute->{'enabled'}\n";
             exit;
@@ -1450 +1449 @@
          splice(@{$computer_db->{$domainset}}, $computer_index => 1);
          ipamdb_save("$COMPUTER_YAML", $computer_db);
-         print "Info: Host $ip has been removed from the domain set $domainset [OK]\n";
+         print "Info: host $ip has been removed from the domain set $domainset [OK]\n";
          exit;
          }
@@ -1474 +1473 @@
          splice(@{$computer_db->{$domainset}}, $computer_index => 1);
          ipamdb_save("$COMPUTER_YAML", $computer_db);
-         print "Info: Host $hostname has been removed from the domain set $domainset [OK]\n";
+         print "Info: host $hostname has been removed from the domain set $domainset [OK]\n";
          exit;
          }
@@ -1869 +1868 @@
          next if $domainset_current eq 'version';
 
-         my $computer_index = 0;
+         LOOP_ON_COMPUTER:
          for my $computer (@{$computer_db->{$domainset_current}}) {
-            for my $id (keys %{$computer}) {
-               if ($computer->{$id}->{'ip'} eq $ip) {
-                  my $timestamp = time;
-                  $computer_db->{$domainset_current}[$computer_index]->{$id}->{'modify_time'} = $timestamp;
-                  $computer_db->{$domainset_current}[$computer_index]->{$id}->{'pxe_config'}  = $pxe_config;
-                  print "IP address: $ip, PXE enabled in config: $pxe_config\n";
-                  ipamdb_save("$COMPUTER_YAML", $computer_db);
-                  exit;
-                  }
-               $computer_index++;
-               }
+            my ($mac_address, $attribute) = %{$computer};
+            next LOOP_ON_COMPUTER if $attribute->{'ip'} ne $ip;
+
+            $attribute->{'modify_time'} = time;
+            $attribute->{'pxe_config'}  = $pxe_config;
+            ipamdb_save("$COMPUTER_YAML", $computer_db);
+            print "Info: host $attribute->{'hostname'} ($domainset_current), IP $ip, PXE enabled: $pxe_config\n";
+            exit;
             }
          }
@@ -1902 +1898 @@
          $attribute->{'pxe_config'}  = $pxe_config;
          ipamdb_save("$COMPUTER_YAML", $computer_db);
-         print "Info: Host $hostname ($domainset), PXE enabled in config: $pxe_config [OK]\n";
+         print "Info: host $hostname ($domainset), IP $attribute->{'ip'}, PXE enabled: $pxe_config [OK]\n";
          exit;
          }
@@ -1985 +1981 @@
          delete $attribute->{'pxe_config'};
          ipamdb_save("$COMPUTER_YAML", $computer_db);
-         print "Info: Host $hostname ($domainset), PXE disable from config: $pxe_config [OK]\n";
+         print "Info: host $hostname ($domainset), PXE disable from config: $pxe_config [OK]\n";
          exit;
          }