Changeset 2102 for trunk

Timestamp:

09/21/17 10:22:41 (7 years ago)

Author:

nanardon

Message:

Ensure host are uniq in dhcp zone

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (1 diff)

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

@@ -692 +692 @@
             my $desc = $self->_comment_nethost($obj);
             foreach my $mac (sort grep { $_ } $obj->get_attributes('macaddr')) {
-                foreach my $retainip (@retainip) {
+                my %done;
+                foreach my $retainip (sort @retainip) {
                     $output .= $desc
                        ? '# ' . $desc . "\n"
                         : '';
-                    my $fixedparam = $retainip =~ /^\d+(\.\d+){3}$/
-                        ? ''
-                        : '6';
+                    my ($fixedparam, $label) = $retainip =~ /^\d+(\.\d+){3}$/
+                        ? ('fixed-address', '')
+                        : ('fixed-address6', '-6');
+                    # If two ip are given for same protocol keep only first
+                    $done{$fixedparam} and next;
+                    $done{$fixedparam} = 1;
                     my $fmac = $mac;
                     $fmac =~ s/://g;
-                    $output .= sprintf("host %s$fixedparam-%s {\n", $nethost, lc($fmac));
+                    $output .= sprintf("host %s-%s$label {\n", $nethost, lc($fmac));
                     $output .= sprintf("    hardware ethernet %s;\n", $mac);
                     $output .= sprintf("    fixed-address$fixedparam %s;\n", $retainip)