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: Convert route-map matching for static NAT #6573

Merged
merged 1 commit into from
Jan 18, 2021

Conversation

corinaminer
Copy link
Contributor

No description provided.

@batfish-bot
Copy link

This change is Reviewable

Copy link
Contributor Author

@corinaminer corinaminer 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: 0 of 6 files reviewed, all discussions resolved (waiting on @progwriter)


projects/batfish/src/main/java/org/batfish/representation/cisco/CiscoIosDynamicNat.java, line 98 at r1 (raw file):

  }

  /** Route-map specifying matching traffic (mutually exclusive with {@link #getAclName() ACL}) */

fyi, this isn't gone, just moved it into CiscoIosNat since both children can have route-maps now.


projects/batfish/src/test/java/org/batfish/grammar/cisco/CiscoGrammarTest.java, line 5804 at r1 (raw file):

      Interface outside = c.getAllInterfaces().get(outsideIntf);
      assertThat(outside.getIncomingTransformation(), notNullValue());
      assertThat(outside.getOutgoingTransformation(), notNullValue());

unnecessary because both transformations are further tested down the line (and can't pass those tests if null).

@codecov
Copy link

codecov bot commented Jan 16, 2021

Codecov Report

Merging #6573 (770865a) into master (1c14bbb) will decrease coverage by 0.00%.
The diff coverage is 71.42%.

@@             Coverage Diff              @@
##             master    #6573      +/-   ##
============================================
- Coverage     73.40%   73.39%   -0.01%     
  Complexity    35741    35741              
============================================
  Files          2837     2837              
  Lines        144244   144272      +28     
  Branches      17446    17455       +9     
============================================
+ Hits         105877   105885       +8     
- Misses        29976    29988      +12     
- Partials       8391     8399       +8     
Impacted Files Coverage Δ Complexity Δ
...tfish/representation/cisco/CiscoIosDynamicNat.java 72.41% <66.66%> (+0.19%) 52.00 <8.00> (-2.00) ⬆️
...atfish/representation/cisco/CiscoIosStaticNat.java 62.31% <67.74%> (-2.90%) 16.00 <8.00> (+3.00) ⬇️
...fish/grammar/cisco/CiscoControlPlaneExtractor.java 66.81% <100.00%> (+<0.01%) 1286.00 <0.00> (ø)
.../org/batfish/representation/cisco/CiscoIosNat.java 89.28% <100.00%> (+1.28%) 10.00 <2.00> (+2.00)
...src/main/java/org/batfish/coordinator/PoolMgr.java 59.52% <0.00%> (-1.20%) 15.00% <0.00%> (-1.00%)
...ain/java/org/batfish/storage/FileBasedStorage.java 86.19% <0.00%> (-0.41%) 249.00% <0.00%> (ø%)
...a/org/batfish/representation/aws/LoadBalancer.java 82.18% <0.00%> (-0.32%) 70.00% <0.00%> (-1.00%)
...src/main/java/org/batfish/coordinator/WorkMgr.java 75.81% <0.00%> (-0.16%) 247.00% <0.00%> (ø%)
...tfish/representation/cisco/CiscoConfiguration.java 86.46% <0.00%> (-0.14%) 503.00% <0.00%> (-1.00%)

Copy link
Contributor

@progwriter progwriter left a comment

Choose a reason for hiding this comment

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

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


projects/batfish/src/main/java/org/batfish/representation/cisco/CiscoIosNat.java, line 26 at r1 (raw file):

  private RuleAction _action;
  private boolean _addRoute;
  @Nullable private String _routeMap;

nit: I would have made this protected to not call the getter each time, but not a blocker

Copy link
Contributor Author

@corinaminer corinaminer 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/representation/cisco/CiscoIosNat.java, line 26 at r1 (raw file):

Previously, progwriter (Victor Heorhiadi) wrote…

nit: I would have made this protected to not call the getter each time, but not a blocker

yeahh it's kind of annoying, but i figured i'd follow the pattern set by the other fields

@corinaminer corinaminer merged commit 2a7073e into master Jan 18, 2021
@corinaminer corinaminer deleted the ios-convert-static-nat-rm branch January 18, 2021 18:57
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