Skip to content

Commit

Permalink
[BF] group by virtualinterface id (inex#758)
Browse files Browse the repository at this point in the history
See also inex#757

correctly group also by virtual interface id as well (was erroneously grouping interfaces together regardless of virtual interface id, so port in one VI rate_limit causes
ports in other VI to also be listed a rate_limt.
  • Loading branch information
listerr authored Dec 22, 2022
1 parent 6e543b1 commit 131ccc3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/Models/Aggregators/SwitcherAggregator.php
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public static function getConfiguration( int $switchid = null, int $infraid = nu
->when( $ipv6enabled , function( Builder $q ) {
return $q->where( 'vli.ipv6enabled', true );
})
->groupBy( 'customer', 'custid', 'asn', 'switchname', 'switchid', 'vlan' )
->groupBy( 'customer', 'custid', 'asn', 'switchname', 'switchid', 'vlan', 'vi.id' )
->orderBy( 'customer', 'ASC' )
->get()->toArray();
}
Expand Down Expand Up @@ -315,4 +315,4 @@ public static function coreBundleNeighbors( Switcher $switch ): array
->whereIn( 'cb.type', [ CoreBundle::TYPE_ECMP, CoreBundle::TYPE_L3_LAG ] )
->get()->toArray();
}
}
}

0 comments on commit 131ccc3

Please sign in to comment.