Changeset 305 for trunk/ddt

Timestamp:

Jul 18, 2018, 7:19:20 PM (7 years ago)

Author:

g7moreau

Message:

• Change some code order

File:

• trunk/ddt/ddt (modified) (1 diff)

trunk/ddt/ddt

@@ -1158 +1158 @@
          next LOOP_ON_COMPUTER if $attribute->{'hostname'} ne $hostname;
 
-         if ($attribute->{'address_type'} ne 'pool-dhcp') {
-
-            if ($attribute->{'enabled'} eq 'no') {
-               print "Info: Host $hostname from domain set $domainset is already disable [OK]" .
-                  " ... Status: $attribute->{'enabled'}\n";
-               exit;
-               }
-
-            my $timestamp = time;
-            $attribute->{'modify_time'} = $timestamp;
-            $attribute->{'enabled'}     = 'no';
-            ipamdb_save("$COMPUTER_YAML", $computer_db);
-            print "Info: Disabling host $hostname from domain set $domainset [OK]" .
+         if ($attribute->{'address_type'} eq 'pool-dhcp') {
+            die "Error: Host $hostname from domain set $domainset belongs to a a pool [FAILED]" .
+               " ... use 'disable-float' command instead";
+            }
+
+         if ($attribute->{'enabled'} eq 'no') {
+            print "Info: Host $hostname from domain set $domainset is already disable [OK]" .
                " ... Status: $attribute->{'enabled'}\n";
             exit;
             }
 
-         if ($attribute->{'address_type'} eq 'pool-dhcp') {
-            die "Error: Host $hostname from domain set $domainset inside a pool [FAILED]" .
-            }
+         my $timestamp = time;
+         $attribute->{'modify_time'} = $timestamp;
+         $attribute->{'enabled'}     = 'no';
+         ipamdb_save("$COMPUTER_YAML", $computer_db);
+         print "Info: Disabling host $hostname from domain set $domainset [OK]" .
+            " ... Status: $attribute->{'enabled'}\n";
+         exit;
          }
       }