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 ASA redundant interface support #5542

Merged
merged 2 commits into from
Feb 12, 2020

Conversation

arifogel
Copy link
Member

No description provided.

@batfish-bot
Copy link

This change is Reviewable

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 15 of 15 files at r1.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @arifogel)


projects/batfish/src/main/java/org/batfish/main/Batfish.java, line 748 at r1 (raw file):

                      .filter(Objects::nonNull)
                      .mapToDouble(Double::doubleValue)
                      .findFirst()
  1. Use something more deterministic, like min()?
  2. By having 0 here, you're risking division by 0 exceptions in OSPF computation. Is there a better default value? Or just leave it null?

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

  }

  @JsonProperty(PROP_REDUNDANCY_GROUP_MEMBERS)

Why plumb this through to VI? who will use it? We do not do this for Juniper, for example.

- update new ref
- add stupid changed aws topology ref
  - non-determinism to be fixed later
Copy link
Member Author

@arifogel arifogel 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: all files reviewed, 2 unresolved discussions (waiting on @progwriter)


projects/batfish/src/main/java/org/batfish/main/Batfish.java, line 748 at r1 (raw file):

Previously, progwriter (Victor Heorhiadi) wrote…
  1. Use something more deterministic, like min()?
  2. By having 0 here, you're risking division by 0 exceptions in OSPF computation. Is there a better default value? Or just leave it null?
  1. ok
  2. i'm just copying logic for computeAggergatedInterfaceBandwidths above, which results in 0 if there are no live dependencies (uses sum()).

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

Previously, progwriter (Victor Heorhiadi) wrote…

Why plumb this through to VI? who will use it? We do not do this for Juniper, for example.

awesome, removed

@codecov
Copy link

codecov bot commented Feb 12, 2020

Codecov Report

Merging #5542 into master will increase coverage by 0.02%.
The diff coverage is 94.66%.

@@             Coverage Diff              @@
##             master    #5542      +/-   ##
============================================
+ Coverage     73.58%    73.6%   +0.02%     
- Complexity    32448    32491      +43     
============================================
  Files          2647     2649       +2     
  Lines        130034   130192     +158     
  Branches      15543    15550       +7     
============================================
+ Hits          95680    95826     +146     
- Misses        26773    26781       +8     
- Partials       7581     7585       +4
Impacted Files Coverage Δ Complexity Δ
...src/main/java/org/batfish/datamodel/pojo/Link.java 80% <ø> (ø) 12 <0> (ø) ⬇️
...tfish/representation/cisco/CiscoConfiguration.java 86.22% <100%> (+0.07%) 549 <1> (+4) ⬆️
...main/java/org/batfish/datamodel/InterfaceType.java 100% <100%> (ø) 1 <0> (ø) ⬇️
...fish/representation/cisco/CiscoStructureUsage.java 100% <100%> (ø) 3 <0> (ø) ⬇️
...src/main/java/org/batfish/datamodel/Interface.java 84.93% <100%> (+0.19%) 214 <2> (+5) ⬆️
...va/org/batfish/representation/cisco/Interface.java 90.51% <100%> (+0.08%) 129 <1> (+1) ⬆️
...fish/grammar/cisco/CiscoControlPlaneExtractor.java 67.6% <62.5%> (-0.01%) 1419 <1> (+1)
...atfish/src/main/java/org/batfish/main/Batfish.java 75.86% <97.56%> (+0.57%) 298 <13> (+15) ⬆️
...col/src/main/java/org/batfish/role/InferRoles.java 88.18% <0%> (-2.73%) 49% <0%> (-2%)
...fish/question/testfilters/TestFiltersAnswerer.java 87.68% <0%> (-2.55%) 19% <0%> (+2%)
... and 19 more

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 5 of 5 files at r2.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @arifogel)


projects/batfish/src/main/java/org/batfish/main/Batfish.java, line 748 at r1 (raw file):

Previously, arifogel (Ari Fogel) wrote…
  1. ok
  2. i'm just copying logic for computeAggergatedInterfaceBandwidths above, which results in 0 if there are no live dependencies (uses sum()).

Yeah computeAggergatedInterfaceBandwidths is likely going to have this bug too, but we can fix that separately

Copy link
Member Author

@arifogel arifogel 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/main/Batfish.java, line 748 at r1 (raw file):

Previously, progwriter (Victor Heorhiadi) wrote…

Yeah computeAggergatedInterfaceBandwidths is likely going to have this bug too, but we can fix that separately

punting for now

@arifogel arifogel merged commit f693458 into batfish:master Feb 12, 2020
@arifogel arifogel deleted the ari-asa-redundant-interface branch February 12, 2020 23:13
arifogel added a commit to arifogel/batfish that referenced this pull request Feb 13, 2020
- set type of  juniper reth units as REDUNDANT_CHILD
- remove unnecessary datamodel additions from batfish#5542
arifogel added a commit that referenced this pull request Feb 13, 2020
- set type of  juniper reth units as REDUNDANT_CHILD
- remove unnecessary datamodel additions from #5542
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