Changeset 2569

Timestamp:

04/27/23 12:01:22 (12 months ago)

Author:

nanardon

Message:

Manage par host radius parameters

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Sql/Nethost.pm (modified) (1 diff)
• Bases/Sql/Netzone.pm (modified) (1 diff)
• Task/Buildnet.pm (modified) (4 diffs)

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

@@ -272 +272 @@
                 label => l('Support'),
             },
+            radiusParams => { multiple => 1 },
             vlan => { },
         }

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

@@ -204 +204 @@
             description => { },
             hostParams => { multiple => 1 }, 
+            radiusParams => { iname => 'hostParams', ro => 1 },
             vlan => { },
         }

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

@@ -931 +931 @@
     my $output = '';
 
-    my $zoneVLan = $outzone->get_attributes( 'vlan' );
-
     my @net;
     if ($outzone->get_attributes('net')) {
@@ -1028 +1026 @@
     }
 
-    my @parameters = grep { $_ } $outzone->get_attributes('hostParams');
+    my %zRadius = ();
+    foreach ( $outzone->get_attributes('hostParams') ) {
+        /^\s*(\S+)(?:\s*(.*))$/;
+        $zRadius{ $1 } = $2;
+    }
+    if ( my $zoneVLan = $outzone->get_attributes( 'vlan' ) ) {
+        $zRadius{'Tunnel-Type'} ||= '= VLAN';
+        $zRadius{'Tunnel-Medium-Type'} ||= '= 6';
+        $zRadius{'Tunnel-Private-Group-ID'} ||= "= $zoneVLan";
+    }
+
     foreach my $nethost (sort keys %hosts) {
         my $obj = $self->_base->get_object('nethost', $nethost);
@@ -1035 +1043 @@
         $obj->get_attributes('noDynamic') and next;
 
-        my $vlan = $obj->get_attributes( 'vlan' ) || $zoneVLan;
+        my %hRadius = %zRadius;
+        foreach ( $obj->get_attributes('radiusParams') ) {
+            /^\s*(\S+)(?:\s*(.*))$/;
+            $hRadius{ $1 } = $2;
+        }
+        if ( my $vlan = $obj->get_attributes( 'vlan' ) ) {
+            $hRadius{'Tunnel-Type'} ||= '= VLAN';
+            $hRadius{'Tunnel-Medium-Type'} ||= '= 6';
+            $hRadius{'Tunnel-Private-Group-ID'} = "= $vlan";
+        }
+
+        my @parameters = map { "$_ " . $hRadius{ $_ } } grep { $hRadius{ $_ } } keys ( %hRadius );
 
         $output .= "# Host: $nethost\n";
@@ -1046 +1065 @@
             $fmac =~ s/://g;
             $output .= sprintf("%s ClearText-Password := \"%s\"\n", lc($fmac), lc($fmac));
-            $output .= join (",\n", map { "    $_" } @parameters) . "\n" if(@parameters);
-            if ( $vlan ) {
-                $output .= "    Tunnel-Type = VLAN\n";
-                $output .= "    Tunnel-Medium-Type = 6\n";
-                $output .= "    Tunnel-Private-Group-ID = $vlan\n";
-            }
+            $output .= join (",\n", map { "    $_" } @parameters) if( @parameters );
+            $output .= "\n";
         }
         $output .= "\n";