Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cisco IOS: improve ospf->bgp redistribution, support matching on route types #6392

Merged
merged 1 commit into from
Nov 5, 2020

Conversation

progwriter
Copy link
Contributor

This fixes 3 bugs:

  1. A spurious warning since ctx.MATCH() is a list and always non-null
  2. Adds support for matching specific route types in redistribute statement
  3. Not specifying match types means redistributing both OSPF and OSPF_IA, not just OSPF (intra-area)

I'm aware this is a subpar solution and we need to make VS datamodel for redistribution more NXOS-like, but wasn't going to overhaul a lot of the VS model to unblock this bug fix.

…e types

This fixes 3 bugs:
1. A spurious warning since ctx.MATCH() is a list and always non-null
2. Adds support for matching specific route types in redistribute statement
3. Not specifying match types means redistibuting both OSPF and OSPF_IA, not just OSPF (intra-area)
@batfish-bot
Copy link

This change is Reviewable

@codecov
Copy link

codecov bot commented Nov 5, 2020

Codecov Report

Merging #6392 into master will decrease coverage by 0.00%.
The diff coverage is 82.60%.

@@             Coverage Diff              @@
##             master    #6392      +/-   ##
============================================
- Coverage     73.07%   73.07%   -0.01%     
- Complexity    35222    35226       +4     
============================================
  Files          2817     2817              
  Lines        142760   142780      +20     
  Branches      17177    17181       +4     
============================================
+ Hits         104326   104339      +13     
- Misses        30182    30187       +5     
- Partials       8252     8254       +2     
Impacted Files Coverage Δ Complexity Δ
.../representation/cisco/BgpRedistributionPolicy.java 100.00% <ø> (+20.00%) 3.00 <0.00> (+1.00)
...fish/grammar/cisco/CiscoControlPlaneExtractor.java 66.07% <76.47%> (+0.08%) 1241.00 <3.00> (+6.00)
...tfish/representation/cisco/CiscoConfiguration.java 86.06% <100.00%> (+0.03%) 493.00 <0.00> (ø)
.../org/batfish/dataplane/rib/RouteAdvertisement.java 83.67% <0.00%> (-4.09%) 18.00% <0.00%> (-1.00%)
...col/src/main/java/org/batfish/role/InferRoles.java 88.18% <0.00%> (-1.37%) 49.00% <0.00%> (-1.00%)
...java/org/batfish/dataplane/ibdp/VirtualRouter.java 90.54% <0.00%> (-0.34%) 208.00% <0.00%> (-1.00%)
...src/main/java/org/batfish/coordinator/WorkMgr.java 75.75% <0.00%> (-0.16%) 246.00% <0.00%> (ø%)
...a/org/batfish/representation/aws/LoadBalancer.java 82.50% <0.00%> (+0.31%) 71.00% <0.00%> (+1.00%)

Copy link
Member

@dhalperi dhalperi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 11 of 11 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@progwriter progwriter merged commit 0ccc96e into batfish:master Nov 5, 2020
@progwriter progwriter deleted the ios-fixup-ospf-to-bgp-redist branch November 5, 2020 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants