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: convert src/dst addresses for tunnel interfaces #4282

Merged
merged 3 commits into from
Jul 18, 2019

Conversation

progwriter
Copy link
Contributor

Pre-req for #4280

@progwriter progwriter requested a review from haverma July 18, 2019 19:31
@batfish-bot
Copy link

This change is Reviewable

Copy link

@haverma haverma left a comment

Choose a reason for hiding this comment

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

Reviewed 5 of 5 files at r1.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @progwriter)


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

                  _w.redFlag(
                      String.format(
                          "Could not determine src/dst IPs for tunnel %s", iface.getName()));

this will log the warning if the tunnel is IPsec, I am guessing that was not the intent


projects/batfish-common-protocol/src/main/java/org/batfish/datamodel/TunnelConfiguration.java, line 14 at r1 (raw file):

/**
 * Stores settings applicable to tunnel interfaces. Does not hanle IPSec configuration, for that see

typo in handle, also IPsec is the preferred case (sec in small)

Copy link

@haverma haverma left a comment

Choose a reason for hiding this comment

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

:lgtm:

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

@codecov
Copy link

codecov bot commented Jul 18, 2019

Codecov Report

Merging #4282 into master will increase coverage by 0.01%.
The diff coverage is 82.35%.

@@             Coverage Diff              @@
##             master    #4282      +/-   ##
============================================
+ Coverage     75.48%   75.49%   +0.01%     
- Complexity    25815    25825      +10     
============================================
  Files          2105     2106       +1     
  Lines        102350   102384      +34     
  Branches      12271    12276       +5     
============================================
+ Hits          77261    77298      +37     
+ Misses        19451    19439      -12     
- Partials       5638     5647       +9
Impacted Files Coverage Δ Complexity Δ
...src/main/java/org/batfish/datamodel/Interface.java 85.2% <66.66%> (-0.18%) 210 <2> (+2)
...ava/org/batfish/datamodel/TunnelConfiguration.java 80% <80%> (ø) 10 <10> (?)
...tfish/representation/cisco/CiscoConfiguration.java 84.73% <90%> (+0.64%) 533 <0> (+2) ⬆️
...java/org/batfish/symbolic/state/EdgeStateExpr.java 73.91% <0%> (-4.35%) 10% <0%> (-1%)
...c/main/java/org/batfish/dataplane/rib/RibTree.java 89.58% <0%> (-4.17%) 27% <0%> (-1%)
...src/main/java/org/batfish/coordinator/PoolMgr.java 64.04% <0%> (-1.13%) 15% <0%> (-1%)
...java/org/batfish/dataplane/ibdp/VirtualRouter.java 88.49% <0%> (-0.22%) 254% <0%> (-1%)
...rc/main/java/org/batfish/datamodel/flow/Trace.java 90.32% <0%> (+3.22%) 13% <0%> (+1%) ⬆️

Copy link
Contributor Author

@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 1 of 1 files at r3.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved


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

Previously, haverma (Harsh Verma) wrote…

this will log the warning if the tunnel is IPsec, I am guessing that was not the intent

done


projects/batfish-common-protocol/src/main/java/org/batfish/datamodel/TunnelConfiguration.java, line 14 at r1 (raw file):

Previously, haverma (Harsh Verma) wrote…

typo in handle, also IPsec is the preferred case (sec in small)

done

@progwriter progwriter merged commit 516b1b6 into batfish:master Jul 18, 2019
@progwriter progwriter deleted the cisco-tunnel-conversion branch July 18, 2019 20:07
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