Re-add "plain" tunnels in post-DP L3 topology

[progwriter]

Keep a topology of non-IPsec tunnels, re-add edges during dataplane
computation.

[batfish-bot]

This change is 

[progwriter]

a discussion (no related file):
Working on figuring out if we're tracerouting to the right IPs (we might be missing some info in VI model)

---

[codecov]

Codecov Report

Merging #4280 into master will increase coverage by <.01%.
The diff coverage is 91.42%.

@@             Coverage Diff              @@
##             master    #4280      +/-   ##
============================================
+ Coverage     75.49%    75.5%   +<.01%     
- Complexity    25825    25855      +30     
============================================
  Files          2106     2107       +1     
  Lines        102384   102500     +116     
  Branches      12276    12292      +16     
============================================
+ Hits          77293    77390      +97     
- Misses        19444    19453       +9     
- Partials       5647     5657      +10

Impacted Files	Coverage Δ	Complexity Δ
...va/org/batfish/dataplane/ibdp/TopologyContext.java	100% <100%> (+1.2%)	29 <1> (+3)	⬆️
...g/batfish/dataplane/ibdp/IncrementalBdpEngine.java	90.42% <100%> (+0.1%)	87 <0> (ø)	⬇️
...java/org/batfish/common/topology/TopologyUtil.java	92.17% <90.21%> (-0.56%)	139 <33> (+22)
...ava/org/batfish/topology/TopologyProviderImpl.java	79.61% <90.9%> (+0.85%)	28 <2> (+2)	⬆️
...va/org/batfish/common/topology/TunnelTopology.java	91.3% <91.3%> (ø)	9 <9> (?)
...org/batfish/datamodel/flow/BidirectionalTrace.java	79.54% <0%> (-4.55%)	13% <0%> (-2%)
...src/main/java/org/batfish/coordinator/PoolMgr.java	60.67% <0%> (-4.5%)	14% <0%> (-2%)
...java/org/batfish/symbolic/state/EdgeStateExpr.java	73.91% <0%> (-4.35%)	10% <0%> (-1%)
...ain/java/org/batfish/coordinator/WorkQueueMgr.java	70.84% <0%> (-0.59%)	90% <0%> (-1%)
...src/main/java/org/batfish/coordinator/WorkMgr.java	69.04% <0%> (-0.28%)	277% <0%> (-1%)
... and 4 more

[haverma]

Reviewed 7 of 15 files at r1.
Reviewable status: 7 of 15 files reviewed, 2 unresolved discussions (waiting on @haverma and @progwriter)

a discussion (no related file):
changes make sense and same as the offline discussion:

1. source and destination should match in the tunnels to make them eligible to be in the initial tunnel topology and subsequently in the pruned one.
2. traceroute should be done between source addresses of the two tunnel interfaces

---

[progwriter]

Reviewable status: 6 of 15 files reviewed, all discussions resolved (waiting on @haverma)

a discussion (no related file):

Previously, haverma (Harsh Verma) wrote…

changes make sense and same as the offline discussion:

1. source and destination should match in the tunnels to make them eligible to be in the initial tunnel topology and subsequently in the pruned one.
2. traceroute should be done between source addresses of the two tunnel interfaces

Done

---

[haverma]

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

[haverma]

once unit tests pass

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

[haverma]

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