[NF] Add option for ipv6 max prefixes rather than joint v4/v6 setting [#937]

Author: barryo

app/Console/Commands/SetupWizard.php

@@ -218,7 +218,8 @@ public function handle(): int
                 'type'                         => Customer::TYPE_INTERNAL,
                 'shortname'                    => $data['ixp-shortname'],
                 'autsys'                       => $data['asn'],
-                'maxprefixes'                  => 1,
+                'maxprefixes'                  => config( 'ixp.default_maxprefixes.v4' ),
+                'maxprefixesv6'                => config( 'ixp.default_maxprefixes.v6' ),
                 'peeringemail'                 => $data['ixp-email'],
                 'peeringpolicy'                => Customer::PEERING_POLICY_MANDATORY,
                 'nocphone'                     => $data['ixp-phone'],

app/Http/Controllers/Api/V4/IrrdbPrefixController.php

@@ -62,7 +62,7 @@ public function byCustomerAndProtocol( Request $r ): JsonResponse
 
         $prefixes = false;
 
-        if( $cust->maxprefixes < 2000 ){
+        if( ( $cust->maxprefixes ?? 0 ) < 2000 ){
             $prefixes = IrrdbPrefix::where( 'customer_id', $cust->id )->where( 'protocol', $protocol )->get()->toArray();
         }
 

app/Http/Controllers/Customer/CustomerController.php

@@ -225,7 +225,8 @@ public function edit( Request $r, Customer $cust ): View
             'MD5Support'            => $r->old( 'MD5Support',          $cust->MD5Support            ),
             'abbreviatedName'       => $r->old( 'abbreviatedName',     $cust->abbreviatedName       ),
             'autsys'                => $r->old( 'autsys',              (string) $cust->autsys       ),
-            'maxprefixes'           => $r->old( 'maxprefixes',         (string) $cust->maxprefixes           ),
+            'maxprefixes'           => $r->old( 'maxprefixes',         (string) $cust->maxprefixes   ),
+            'maxprefixesv6'         => $r->old( 'maxprefixesv6',       (string) $cust->maxprefixesv6 ),
             'peeringpolicy'         => $r->old( 'peeringpolicy',       $cust->peeringpolicy         ),
             'peeringemail'          => $r->old( 'peeringemail',        $cust->peeringemail          ),
             'peeringmacro'          => $r->old( 'peeringmacro',        $cust->peeringmacro          ),

app/Http/Controllers/Interfaces/VlanInterfaceController.php

@@ -92,7 +92,7 @@ public function duplicateForm( VlanInterface $vli, Vlan $v ): View
     }
 
     /**
-     * Display the form to edit a VLAM interface
+     * Display the form to edit a VLAN interface
      *
      * @param Request $r
      * @param VirtualInterface $vi The virtual interface to add this VLI to
@@ -102,7 +102,8 @@ public function duplicateForm( VlanInterface $vli, Vlan $v ): View
     public function create( Request $r, VirtualInterface $vi ): View
     {
         Former::populate( [
-            'maxbgpprefix' => $r->old( 'maxbgpprefix', $vi->customer->maxprefixes ),
+            'ipv4maxbgpprefix' => $r->old( 'ipv4maxbgpprefix', (string)$vi->customer->maxprefixes   ),
+            'ipv6maxbgpprefix' => $r->old( 'ipv6maxbgpprefix', (string)$vi->customer->maxprefixesv6 ),
         ] );
 
         return view( 'interfaces/vlan/edit' )->with( [
@@ -160,9 +161,9 @@ public function edit( Request $r, VlanInterface $vli, VirtualInterface $vi = nul
             'ipv4address'      => $r->old( 'ipv4address', (string)$vli->ipv4addressid ),
             'ipv4hostname'     => $r->old( 'ipv4hostname', $vli->ipv4hostname ),
             'ipv4bgpmd5secret' => $r->old( 'ipv4bgpmd5secret', $vli->ipv4bgpmd5secret ),
+            'ipv4maxbgpprefix' => $r->old( 'ipv4maxbgpprefix', (string)$vli->ipv4maxbgpprefix ),
             'ipv4canping'      => $r->old( 'ipv4canping', (string)$vli->ipv4canping ),
             'ipv4monitorrcbgp' => $r->old( 'ipv4monitorrcbgp', (string)$vli->ipv4monitorrcbgp ),
-            'maxbgpprefix'     => $r->old( 'maxbgpprefix', (string)$vli->maxbgpprefix ),
             'rsclient'         => $r->old( 'rsclient', (string)$vli->rsclient ),
             'rsmorespecifics'  => $r->old( 'rsmorespecifics', (string)$vli->rsmorespecifics ),
             'as112client'      => $r->old( 'as112client', (string)$vli->as112client ),
@@ -171,6 +172,7 @@ public function edit( Request $r, VlanInterface $vli, VirtualInterface $vi = nul
             'ipv6address'      => $r->old( 'ipv6address', (string)$vli->ipv6addressid ),
             'ipv6hostname'     => $r->old( 'ipv6hostname', $vli->ipv6hostname ),
             'ipv6bgpmd5secret' => $r->old( 'ipv6bgpmd5secret', $vli->ipv6bgpmd5secret ),
+            'ipv6maxbgpprefix' => $r->old( 'ipv6maxbgpprefix', (string)$vli->ipv6maxbgpprefix ),
             'ipv6canping'      => $r->old( 'ipv6canping', (string)$vli->ipv6canping ),
             'ipv6monitorrcbgp' => $r->old( 'ipv6monitorrcbgp', (string)$vli->ipv6monitorrcbgp ),
         ] );

app/Http/Controllers/RsFilterController.php

@@ -166,7 +166,7 @@ public function create( Request $r,  Customer $cust ): View
         ] );
 
         $advertisedPrefixes = [];
-        if( $cust->maxprefixes < 2000 ) {
+        if( ( $cust->maxprefixes ?? 0 ) < 2000 ) {
             $advertisedPrefixes = IrrdbPrefix::where( 'customer_id', $cust->id )
                 ->where( 'protocol', $protocol )->get()->toArray();
         }

app/Http/Requests/Customer/Store.php

@@ -60,7 +60,7 @@ public function authorize(): bool
      *
      * @return (string|string[])[]
      *
-     * @psalm-return array{name: 'required|string|max:255', type: string, shortname: string, corpwww: 'nullable|url|max:255', datejoin: 'required|date', dateleft: 'nullable|date', status: string, md5support: string, abbreviatedName: 'required|string|max:30', autsys?: 'int|min:1', maxprefixes?: 'nullable|int|min:0', peeringemail?: 'email', peeringmacro?: list{'nullable', 'string', 'max:255', 'regex:/^(AS-[A-Z0-9]+(?:-[A-Z0-9]+)*|AS[1-9]\d*(?::AS-[A-Z0-9]+(?:-[A-Z0-9]+)*)?)$/i'}, peeringmacrov6?: list{'nullable', 'string', 'max:255', 'regex:/^(AS-[A-Z0-9]+(?:-[A-Z0-9]+)*|AS[1-9]\d*(?::AS-[A-Z0-9]+(?:-[A-Z0-9]+)*)?)$/i'}, peeringpolicy?: string, irrdb?: 'nullable|integer|exists:irrdbconfig,id', nocphone?: 'nullable|string|max:255', noc24hphone?: 'nullable|string|max:255', nocemail?: 'email|max:255', nochours?: string, nocwww?: 'nullable|url|max:255', reseller?: 'nullable|integer|exists:cust,id'}
+     * @psalm-return array{name: 'required|string|max:255', type: string, shortname: string, corpwww: 'nullable|url|max:255', datejoin: 'required|date', dateleft: 'nullable|date', status: string, md5support: string, abbreviatedName: 'required|string|max:30', autsys?: 'int|min:1', maxprefixes?: 'nullable|int|min:0', maxprefixesv6?: 'nullable|int|min:0', peeringemail?: 'email', peeringmacro?: list{'nullable', 'string', 'max:255', 'regex:/^(AS-[A-Z0-9]+(?:-[A-Z0-9]+)*|AS[1-9]\d*(?::AS-[A-Z0-9]+(?:-[A-Z0-9]+)*)?)$/i'}, peeringmacrov6?: list{'nullable', 'string', 'max:255', 'regex:/^(AS-[A-Z0-9]+(?:-[A-Z0-9]+)*|AS[1-9]\d*(?::AS-[A-Z0-9]+(?:-[A-Z0-9]+)*)?)$/i'}, peeringpolicy?: string, irrdb?: 'nullable|integer|exists:irrdbconfig,id', nocphone?: 'nullable|string|max:255', noc24hphone?: 'nullable|string|max:255', nocemail?: 'email|max:255', nochours?: string, nocwww?: 'nullable|url|max:255', reseller?: 'nullable|integer|exists:cust,id'}
      */
     public function rules(): array
     {
@@ -79,6 +79,7 @@ public function rules(): array
         $validateOtherDetails = [
             'autsys'                => 'int|min:1',
             'maxprefixes'           => 'nullable|int|min:0',
+            'maxprefixesv6'         => 'nullable|int|min:0',
             'peeringemail'          => 'email',
             'peeringmacro'          => [ 'nullable', 'string', 'max:255', 'regex:/^(AS-[A-Z0-9]+(?:-[A-Z0-9]+)*|AS[1-9]\d*(?::AS-[A-Z0-9]+(?:-[A-Z0-9]+)*)?)$/i' ],
             'peeringmacrov6'        => [ 'nullable', 'string', 'max:255', 'regex:/^(AS-[A-Z0-9]+(?:-[A-Z0-9]+)*|AS[1-9]\d*(?::AS-[A-Z0-9]+(?:-[A-Z0-9]+)*)?)$/i' ],

app/Http/Requests/StoreVirtualInterfaceWizard.php

@@ -62,7 +62,7 @@ public function authorize(): bool
      *
      * @return ((IdnValidate|string)[]|string)[]
      *
-     * @psalm-return array{custid: 'required|integer|exists:cust,id', vlanid: 'required|integer|exists:vlan,id', trunk: 'boolean', switch: 'required|integer|exists:switch,id', switchportid: 'required|integer|exists:switchport,id', status: string, speed: string, duplex: string, maxbgpprefix: 'integer|nullable', mcastenabled: 'boolean', rsclient: 'boolean', irrdbfilter: 'boolean', rsmorespecifics: 'boolean', as112client: 'boolean', ipv4enabled: 'boolean', ipv4address: 'ipv4|nullable'|'ipv4|required', ipv4hostname: list{'string', 'max:255', 'nullable'|'required', IdnValidate}, ipv4bgpmd5secret: 'string|max:255|nullable', ipv4canping: 'boolean', ipv4monitorrcbgp: 'boolean', ipv6enabled: 'boolean', ipv6address: 'ipv6|nullable'|'ipv6|required', ipv6hostname: list{'string', 'max:255', 'nullable'|'required', IdnValidate}, ipv6bgpmd5secret: 'string|max:255|nullable', ipv6canping: 'boolean', ipv6monitorrcbgp: 'boolean'}
+     * @psalm-return array{custid: 'required|integer|exists:cust,id', vlanid: 'required|integer|exists:vlan,id', trunk: 'boolean', switch: 'required|integer|exists:switch,id', switchportid: 'required|integer|exists:switchport,id', status: string, speed: string, duplex: string, ipv4maxbgpprefix: 'integer|nullable', ipv6maxbgpprefix: 'integer|nullable', mcastenabled: 'boolean', rsclient: 'boolean', irrdbfilter: 'boolean', rsmorespecifics: 'boolean', as112client: 'boolean', ipv4enabled: 'boolean', ipv4address: 'ipv4|nullable'|'ipv4|required', ipv4hostname: list{'string', 'max:255', 'nullable'|'required', IdnValidate}, ipv4bgpmd5secret: 'string|max:255|nullable', ipv4canping: 'boolean', ipv4monitorrcbgp: 'boolean', ipv6enabled: 'boolean', ipv6address: 'ipv6|nullable'|'ipv6|required', ipv6hostname: list{'string', 'max:255', 'nullable'|'required', IdnValidate}, ipv6bgpmd5secret: 'string|max:255|nullable', ipv6canping: 'boolean', ipv6monitorrcbgp: 'boolean'}
      */
     public function rules(): array
     {
@@ -77,7 +77,6 @@ public function rules(): array
             'speed'                 => 'required|integer|in:' . implode( ',', array_keys( PhysicalInterface::$SPEED ) ),
             'duplex'                => 'required|string|in:' . implode( ',', array_keys( PhysicalInterface::$DUPLEX ) ),
 
-            'maxbgpprefix'          => 'integer|nullable',
             'mcastenabled'          => 'boolean',
             'rsclient'              => 'boolean',
             'irrdbfilter'           => 'boolean',
@@ -88,13 +87,15 @@ public function rules(): array
             'ipv4address'           => 'ipv4|' . ( $this->ipv4enabled ? 'required' : 'nullable' ),
             'ipv4hostname'          => [ 'string', 'max:255' , ( ( config('ixp_fe.vlaninterfaces.hostname_required' ) && $this->ipv4enabled ) ? 'required' : 'nullable' ), new IdnValidate() ],
             'ipv4bgpmd5secret'      => 'string|max:255|nullable',
+            'ipv4maxbgpprefix'      => 'integer|nullable',
             'ipv4canping'           => 'boolean',
             'ipv4monitorrcbgp'      => 'boolean',
 
             'ipv6enabled'           => 'boolean',
             'ipv6address'           => 'ipv6|' . ( $this->ipv6enabled ? 'required' : 'nullable' ),
             'ipv6hostname'          => [ 'string', 'max:255' , ( ( config('ixp_fe.vlaninterfaces.hostname_required' ) && $this->ipv6enabled ) ? 'required' : 'nullable' ), new IdnValidate() ],
             'ipv6bgpmd5secret'      => 'string|max:255|nullable',
+            'ipv6maxbgpprefix'      => 'integer|nullable',
             'ipv6canping'           => 'boolean',
             'ipv6monitorrcbgp'      => 'boolean',
         ];

app/Http/Requests/StoreVlanInterface.php

@@ -60,7 +60,7 @@ public function authorize(): bool
      *
      * @return ((IdnValidate|string)[]|string)[]
      *
-     * @psalm-return array{vlanid: 'required|integer|exists:vlan,id', virtualinterfaceid: 'required|integer|exists:virtualinterface,id', irrdbfilter: 'boolean', mcastenabled: 'boolean', ipv4enabled: 'boolean', ipv4address: 'ipv4|nullable'|'ipv4|required', ipv4hostname: list{'string', 'max:255', 'nullable'|'required', IdnValidate}, ipv4bgpmd5secret: 'string|max:255|nullable', ipv4canping: 'boolean', ipv4monitorrcbgp: 'boolean', maxbgpprefix: 'integer|nullable', rsclient: 'boolean', rsmorespecifics: 'boolean', as112client: 'boolean', busyhost: 'boolean', ipv6enabled: 'boolean', ipv6address: 'ipv6|nullable'|'ipv6|required', ipv6hostname: list{'string', 'max:255', 'nullable'|'required', IdnValidate}, ipv6bgpmd5secret: 'string|max:255|nullable', ipv6canping: 'boolean', ipv6monitorrcbgp: 'boolean'}
+     * @psalm-return array{vlanid: 'required|integer|exists:vlan,id', virtualinterfaceid: 'required|integer|exists:virtualinterface,id', irrdbfilter: 'boolean', mcastenabled: 'boolean', ipv4enabled: 'boolean', ipv4address: 'ipv4|nullable'|'ipv4|required', ipv4hostname: list{'string', 'max:255', 'nullable'|'required', IdnValidate}, ipv4bgpmd5secret: 'string|max:255|nullable', ipv4canping: 'boolean', ipv4monitorrcbgp: 'boolean', ipv4maxbgpprefix: 'integer|nullable', ipv6maxbgpprefix: 'integer|nullable', rsclient: 'boolean', rsmorespecifics: 'boolean', as112client: 'boolean', busyhost: 'boolean', ipv6enabled: 'boolean', ipv6address: 'ipv6|nullable'|'ipv6|required', ipv6hostname: list{'string', 'max:255', 'nullable'|'required', IdnValidate}, ipv6bgpmd5secret: 'string|max:255|nullable', ipv6canping: 'boolean', ipv6monitorrcbgp: 'boolean'}
      */
     public function rules(): array
     {
@@ -73,9 +73,9 @@ public function rules(): array
             'ipv4address'           => 'ipv4' .  ( $this->ipv4enabled ? '|required' : '|nullable' ),
             'ipv4hostname'          => [ 'string', 'max:255' , ( ( config('ixp_fe.vlaninterfaces.hostname_required' ) && $this->ipv4enabled ) ? 'required' : 'nullable' ), new IdnValidate() ],
             'ipv4bgpmd5secret'      => 'string|max:255|nullable',
+            'ipv4maxbgpprefix'      => 'integer|nullable',
             'ipv4canping'           => 'boolean',
             'ipv4monitorrcbgp'      => 'boolean',
-            'maxbgpprefix'          => 'integer|nullable',
             'rsclient'              => 'boolean',
             'rsmorespecifics'       => 'boolean',
             'as112client'           => 'boolean',
@@ -84,6 +84,7 @@ public function rules(): array
             'ipv6address'           => 'ipv6' . ( $this->ipv6enabled ? '|required' : '|nullable' ),
             'ipv6hostname'          => [ 'string', 'max:255' , ( ( config('ixp_fe.vlaninterfaces.hostname_required' ) && $this->ipv6enabled ) ? 'required' : 'nullable' ), new IdnValidate() ],
             'ipv6bgpmd5secret'      => 'string|max:255|nullable',
+            'ipv6maxbgpprefix'      => 'integer|nullable',
             'ipv6canping'           => 'boolean',
             'ipv6monitorrcbgp'      => 'boolean',
         ];

app/Models/Aggregators/CustomerAggregator.php

@@ -184,6 +184,8 @@
  * @method static Builder|CustomerAggregator whereCreated($value)
  * @method static Builder|CustomerAggregator whereLastupdated($value)
  * @property-read \IXP\Models\IrrdbUpdateLog|null $irrdbUpdateLog
+ * @property int|null $maxprefixesv6
+ * @method static Builder<static>|CustomerAggregator whereMaxprefixesv6($value)
  * @mixin \Eloquent
  */
 class CustomerAggregator extends Customer
@@ -223,7 +225,7 @@ public static function getByVlanAndProtocol( ?int $vlanid = null, ?int $protocol
     }
 
     /**
-     * Build an array of data for the peering matrice
+     * Build an array of data for the peering matrix
      *
      * Sample return:
      *

app/Models/Aggregators/VlanInterfaceAggregator.php

@@ -47,7 +47,6 @@
  * @property string|null $bgpmd5secret
  * @property string|null $ipv4bgpmd5secret
  * @property string|null $ipv6bgpmd5secret
- * @property int|null $maxbgpprefix
  * @property int|null $rsclient
  * @property int|null $ipv4canping
  * @property int|null $ipv6canping
@@ -86,14 +85,17 @@
  * @method static Builder|VlanInterfaceAggregator whereIpv6hostname($value)
  * @method static Builder|VlanInterfaceAggregator whereIpv6monitorrcbgp($value)
  * @method static Builder|VlanInterfaceAggregator whereIrrdbfilter($value)
- * @method static Builder|VlanInterfaceAggregator whereMaxbgpprefix($value)
  * @method static Builder|VlanInterfaceAggregator whereMcastenabled($value)
  * @method static Builder|VlanInterfaceAggregator whereNotes($value)
  * @method static Builder|VlanInterfaceAggregator whereRsclient($value)
  * @method static Builder|VlanInterfaceAggregator whereRsmorespecifics($value)
  * @method static Builder|VlanInterfaceAggregator whereUpdatedAt($value)
  * @method static Builder|VlanInterfaceAggregator whereVirtualinterfaceid($value)
  * @method static Builder|VlanInterfaceAggregator whereVlanid($value)
+ * @property int|null $ipv4maxbgpprefix
+ * @property int|null $ipv6maxbgpprefix
+ * @method static Builder<static>|VlanInterfaceAggregator whereIpv4maxbgpprefix($value)
+ * @method static Builder<static>|VlanInterfaceAggregator whereIpv6maxbgpprefix($value)
  * @mixin \Eloquent
  */
 class VlanInterfaceAggregator extends VlanInterface
@@ -187,7 +189,8 @@ public static function forProto( Vlan $vlan, int $proto, ?int $pistatus = Physic
             'cust.id AS cid', 'cust.name AS cname',
             'cust.abbreviatedName AS abrevcname',
             'cust.shortname AS cshortname',
-            'cust.autsys AS autsys', 'cust.maxprefixes AS gmaxprefixes',
+            'cust.autsys AS autsys',
+            ( $proto === 4 ? 'cust.maxprefixes' : 'cust.maxprefixesv6' ) . ' AS gmaxprefixes',
             'cust.peeringmacro AS peeringmacro', 'cust.peeringmacrov6  AS peeringmacrov6',
 
             'v.id AS vid', 'v.number AS vtag', 'v.name AS vname', 'vi.id AS viid',
@@ -198,7 +201,7 @@ public static function forProto( Vlan $vlan, int $proto, ?int $pistatus = Physic
             "vli.ipv{$proto}hostname     AS hostname" ,
             "vli.ipv{$proto}monitorrcbgp AS monitorrcbgp" ,
             "vli.ipv{$proto}bgpmd5secret AS bgpmd5secret" ,
-            'vli.maxbgpprefix            AS maxbgpprefix' ,
+            "vli.ipv{$proto}maxbgpprefix AS maxbgpprefix" ,
             'vli.as112client             AS as112client' ,
             'vli.rsclient                AS rsclient' ,
             'vli.busyhost                AS busyhost' ,
@@ -239,8 +242,8 @@ public static function forProto( Vlan $vlan, int $proto, ?int $pistatus = Physic
         }
 
         $q->groupByRaw( "vli.id, cust.id, cust.name, cust.abbreviatedName, cust.shortname, cust.autsys,
-                        cust.maxprefixes, cust.peeringmacro, cust.peeringmacrov6,
-                        vli.ipv{$proto}enabled, addr.address, vli.ipv{$proto}bgpmd5secret, vli.maxbgpprefix,
+                        cust.maxprefixes" . ( $proto === 4 ? '' : 'v6' ) . ", cust.peeringmacro, cust.peeringmacrov6,
+                        vli.ipv{$proto}enabled, addr.address, vli.ipv{$proto}bgpmd5secret, vli.ipv{$proto}maxbgpprefix,
                         vli.ipv{$proto}hostname, vli.ipv{$proto}monitorrcbgp, vli.busyhost,
                         vli.as112client, vli.rsclient, vli.irrdbfilter, vli.ipv{$proto}canping,
                         s.id, s.name,
@@ -382,14 +385,14 @@ public static function sanitiseVlanInterfaces( Vlan $vlan, int $protocol = 4, in
 
             $int['fvliid'] = sprintf( '%04d', $int['vliid'] );
 
-            if( $int['maxbgpprefix'] && $int['maxbgpprefix'] > $int['gmaxprefixes'] ) {
+            if( $int['maxbgpprefix'] && $int['maxbgpprefix'] > 0 ) {
                 $int['maxprefixes'] = $int['maxbgpprefix'];
             } else {
                 $int['maxprefixes'] = $int['gmaxprefixes'];
             }
 
-            if( !$int['maxprefixes'] ) {
-                $int['maxprefixes'] = 250;
+            if( !( is_numeric( $int['maxprefixes'] ) && $int['maxprefixes'] > 0 ) ) {
+                $int['maxprefixes'] = ( $protocol === 4 ? config( 'ixp.default_maxprefixes.v4' ) : config( 'ixp.default_maxprefixes.v6' ) );
             }
 
             unset( $int['gmaxprefixes'] );