Changeset 2117

Timestamp:

10/20/17 19:31:15 (7 years ago)

Author:

nanardon

Message:

Add attribute physicalDeliveryOfficeName and netLocked to nethost

Attribute netLocked make dhcp zone assigning localhost IP (127.0.0.1 or ::1)
addresses to deny to computer to connect to network.

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Nethost.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (3 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -164 +164 @@
             inventoryNumber
             expire
+            netLocked
             related
             encryptKey
             site
+            physicalDeliveryOfficeName
             owner
             user

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Nethost.pm

@@ -126 +126 @@
                 delayed => 1,
                 label => l('User'),
+                monitored => 1,
             },
             netZone => {
@@ -252 +253 @@
                 label => l('Site'),
             },
+            physicalDeliveryOfficeName => {
+                label => l('Office'),
+            },
+            netLocked => {
+                formtype => 'CHECKBOX',
+                monitored => 1,
+                label => l('Locked'),
+            },
+
         }
     )

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

@@ -702 +702 @@
                        ? '# ' . $desc . "\n"
                         : '';
-                    my ($fixedparam, $label) = $retainip =~ /^\d+(\.\d+){3}$/
-                        ? ('fixed-address', '')
-                        : ('fixed-address6', '-6');
+                    my ($fixedparam, $label, $netLockIp) = $retainip =~ /^\d+(\.\d+){3}$/
+                        ? ('fixed-address', '', '127.0.0.1')
+                        : ('fixed-address6', '-6', '::1');
                     # If two ip are given for same protocol keep only first
                     $done{$fixedparam} and next;
@@ -712 +712 @@
                     $output .= sprintf("host %s-%s%s {\n", $nethost, lc($fmac), $label);
                     $output .= sprintf("    hardware ethernet %s;\n", $mac);
-                    $output .= sprintf("    $fixedparam %s;\n", $retainip)
-                    if ($retainip);
+                    if ($obj->get_attributes('netLocked')) {
+                        $output .= sprintf("    $fixedparam %s;\n", $netLockIp);
+                    } else {
+                        $output .= sprintf("    $fixedparam %s;\n", $retainip)
+                            if ($retainip);
+                    }
                     $output .= "}\n\n";
                 }
@@ -780 +784 @@
                 my $fmac = $mac;
                 $fmac =~ s/://g;
-                $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));
-                $output .= sprintf("    hardware ethernet %s;\n", $mac);
-                $output .= "}\n\n";
+                if ($obj->get_attributes('netLocked')) {
+                    my ($ipv4, $ipv6);
+                    foreach ($ozone->get_attributes('net')) {
+                        if ($_ =~ /^\d+(\.\d+){3}\/(\d+)$/) {
+                            $ipv4 = 1;
+                        } else {
+                            $ipv6 = 1;
+                        }
+                    }
+
+                    if ($ipv4) {
+                        $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));
+                        $output .= sprintf("    hardware ethernet %s;\n", $mac);
+                        $output .= sprintf("    fixed-address 127.0.0.1;\n");
+                        $output .= "}\n\n";
+                    }
+                    if ($ipv6) {
+                        $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));
+                        $output .= sprintf("    hardware ethernet %s;\n", $mac);
+                        $output .= sprintf("    fixed-address6 ::1\n");
+                        $output .= "}\n\n";
+                    }
+                } else {
+                    $output .= sprintf("host %s-%s {\n", $nethost, lc($fmac));
+                    $output .= sprintf("    hardware ethernet %s;\n", $mac);
+                    $output .= "}\n\n";
+                }
             }
         }