Changeset 2299

Timestamp:

11/26/19 16:21:33 (5 years ago)

Author:

nanardon

Message:

Ensure dhcp host are unique

Location:

trunk

Files:

• LATMOS-Accounts-Web/Changes (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (5 diffs)

trunk/LATMOS-Accounts-Web/Changes

@@ -1 +1 @@
 5.2.25
+    - Ensure host declaration in DHCP config are unique
 
 5.2.24

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm

@@ -645 +645 @@
     my $output = '';
 
+    my $ZoneId = sprintf('%04x', $outzone->get_attributes('ikey'));
+
     my @net;
     if ($outzone->get_attributes('net')) {
@@ -715 +717 @@
                     my $fmac = $mac;
                     $fmac =~ s/://g;
-                    $output .= sprintf("host %s-%s%s {\n", $nethost, lc($fmac), $label);
+                    $output .= sprintf("host %s-%s-%s%s {\n", $nethost, lc($fmac), $ZoneId, $label);
                     $output .= sprintf("    hardware ethernet %s;\n", $mac);
                     if ($obj->get_attributes('netLocked')) {
@@ -800 +802 @@
 
                     if ($ipv4) {
-                        $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));
+                        $output .= sprintf("host %s-%s-%s {\n", $nethost, lc($fmac), $ZoneId);
                         $output .= sprintf("    hardware ethernet %s;\n", $mac);
                         $output .= sprintf("    fixed-address 127.0.0.1;\n");
@@ -806 +808 @@
                     }
                     if ($ipv6) {
-                        $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));
+                        $output .= sprintf("host %s-%s-%s {\n", $nethost, lc($fmac), $ZoneId);
                         $output .= sprintf("    hardware ethernet %s;\n", $mac);
                         $output .= sprintf("    fixed-address6 ::1\n");
@@ -812 +814 @@
                     }
                 } else {
-                    $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));
+                    $output .= sprintf("host %s-%s-%s {\n", $nethost, lc($fmac), $ZoneId);
                     $output .= sprintf("    hardware ethernet %s;\n", $mac);
                     $output .= "}\n\n";