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

IOS-XR: honor ipv4 acl sequence numbers out of order #7798

Merged
merged 1 commit into from
Dec 14, 2021

Conversation

dhalperi
Copy link
Member

Supports differential changes to ACLs.

Supports differential changes to ACLs.
@batfish-bot
Copy link

This change is Reviewable

@codecov
Copy link

codecov bot commented Dec 14, 2021

Codecov Report

Merging #7798 (d83bbf2) into master (a700981) will decrease coverage by 0.00%.
The diff coverage is 94.44%.

@@             Coverage Diff              @@
##             master    #7798      +/-   ##
============================================
- Coverage     73.93%   73.92%   -0.01%     
+ Complexity    42062    42061       -1     
============================================
  Files          3304     3304              
  Lines        165738   165747       +9     
  Branches      19857    19858       +1     
============================================
- Hits         122531   122526       -5     
- Misses        33692    33703      +11     
- Partials       9515     9518       +3     
Impacted Files Coverage Δ
...atfish/representation/cisco_xr/Ipv4AccessList.java 68.75% <83.33%> (+7.21%) ⬆️
...grammar/cisco_xr/CiscoXrControlPlaneExtractor.java 42.99% <100.00%> (+0.02%) ⬆️
.../representation/cisco_xr/CiscoXrConfiguration.java 61.87% <100.00%> (ø)
...sh/representation/cisco_xr/CiscoXrConversions.java 50.76% <100.00%> (ø)
...sh/representation/cisco_xr/Ipv4AccessListLine.java 85.10% <100.00%> (+1.38%) ⬆️
...src/main/java/org/batfish/coordinator/PoolMgr.java 55.95% <0.00%> (-3.58%) ⬇️
...fish/bddreachability/BDDLoopDetectionAnalysis.java 80.23% <0.00%> (-2.33%) ⬇️
...ain/java/org/batfish/coordinator/WorkQueueMgr.java 70.93% <0.00%> (-0.59%) ⬇️
...src/main/java/org/batfish/coordinator/WorkMgr.java 75.50% <0.00%> (-0.31%) ⬇️
...tfish/representation/cisco/CiscoConfiguration.java 84.51% <0.00%> (-0.16%) ⬇️

Copy link
Member

@ratulm ratulm left a comment

Choose a reason for hiding this comment

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

Reviewed 9 of 9 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @sfraint)


projects/batfish/src/main/java/org/batfish/grammar/cisco_xr/CiscoXrControlPlaneExtractor.java, line 3630 at r1 (raw file):

    }

    long seq = ctx.num != null ? toLong(ctx.num) : _currentIpv4Acl.getNextSeq();

So, if we have lines

ip acl FOO
  10 permit ..
  20 permit ...

followed by

  ip acl FOO
    5 permit ...
    permit ...

The last line will get sequence number 25 (not 15)?

Copy link
Member Author

@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.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @sfraint)


projects/batfish/src/main/java/org/batfish/grammar/cisco_xr/CiscoXrControlPlaneExtractor.java, line 3630 at r1 (raw file):

Previously, ratulm wrote…

So, if we have lines

ip acl FOO
  10 permit ..
  20 permit ...

followed by

  ip acl FOO
    5 permit ...
    permit ...

The last line will get sequence number 25 (not 15)?

Right.

@dhalperi dhalperi merged commit 618263d into batfish:master Dec 14, 2021
@dhalperi dhalperi deleted the xr-acl branch December 14, 2021 04:14
Copy link
Member Author

@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.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


projects/batfish/src/main/java/org/batfish/grammar/cisco_xr/CiscoXrControlPlaneExtractor.java, line 3630 at r1 (raw file):

Previously, dhalperi (Dan Halperin) wrote…

Right.

well, no it will get 30. But same thing holds.

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