Changeset 311

Timestamp:

Jul 18, 2018, 10:50:02 PM (6 years ago)

Author:

g7moreau

Message:

• Update some more command

File:

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

trunk/ddt/ddt

@@ -923 +923 @@
    my $computer_db = ipamdb_load($COMPUTER_YAML);
 
-   control_exist_domainset($computer_db, $domainset)   or exit;
+   control_exist_domainset($computer_db, $domainset)  or exit;
    control_syntax_mac_address($mac)                   or exit;
    control_syntax_comment($comment)                   or exit;
 
    my @domainsetdb = @{$computer_db->{$domainset}};
-   my $cpt = 0;
-   for my $value (@domainsetdb) {
-      for my $id (keys %{$value}) {
-         if ($id eq $mac) {
-            my $host = $computer_db->{$domainset}[$cpt]{$mac};
-            $host->{'comment'}     = $comment;
-            $host->{'modify_time'} = time;
-
-            ipamdb_save("$COMPUTER_YAML", $computer_db);
-            exit;
-            }
-         }
-      $cpt++;
-      }
-   print "Mise à jour du commentaire de la machine [FAILED]\n";
-   print "L'adresse MAC: $mac n'existe pas dans le domaine: $domainset.\n";
+
+   LOOP_ON_COMPUTER:
+   for my $computer (@domainsetdb) {
+      my ($mac_address, $attribute) = %{$computer};
+
+      next LOOP_ON_COMPUTER if $mac_address ne $mac;
+
+      $attribute->{'modify_time'} = time;
+      $attribute->{'comment'}     = $comment;
+      ipamdb_save("$COMPUTER_YAML", $computer_db);
+      exit;
+      }
+   die "Error : Host $attribute->{'hostname'} comment [FAILED]\n" .
+      " ... No MAC: $mac belongs to the domaine set $domainset.\n";
    }
 
@@ -983 +981 @@
       my @domainsetdb = @{$computer_db->{$domainset_current}};
       my $computer_index = 0;
-      for my $value (@domainsetdb) {
-         for my $id (keys %{$value}) {
-            if ($id eq $mac) {
-               my $host = $computer_db->{$domainset_current}[$computer_index]{$mac};
-               next LOOP_ON_DOMAINSET if $host->{'ip'} ne $ip;
-
-               $host->{'modify_time'} = time;
-               splice(@{$computer_db->{$domainset_current}}, $computer_index => 1);
-               push @{$computer_db->{$domainset}}, { $mac => $host };
-
-               ipamdb_save("$COMPUTER_YAML", $computer_db);
-               exit;
-               }
-            }
-         $computer_index++;
-         }
-      }
-   print "Update of domain set $domainset [FAILED]\n";
-   print "L'adresse MAC: $mac ou l'adresse IP: $ip n'existe pas dans la base\n";
+      LOOP_ON_COMPUTER:
+      for my $computer (@domainsetdb) {
+         my ($mac_address, $attribute) = %{$computer};
+
+         $computer_index++ and next LOOP_ON_COMPUTER if $mac_address ne $mac;
+         next LOOP_ON_DOMAINSET if $attribute->{'ip'} ne $ip;
+
+         $attribute->{'modify_time'} = time;
+         splice(@{$computer_db->{$domainset_current}}, $computer_index => 1);
+         push @{$computer_db->{$domainset}}, { $mac => attribute };
+
+         ipamdb_save("$COMPUTER_YAML", $computer_db);
+         exit;
+         }
+      }
+   die "Error: Update of domain set $domainset [FAILED]\n" .
+      " ... MAC $mac and IP $ip don't exists in the database\n";
    }