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

Cumulus/FRR: split NCLU and FRR #6630

Merged
merged 7 commits into from Feb 16, 2021
Merged

Conversation

dhalperi
Copy link
Member

@dhalperi dhalperi commented Feb 15, 2021

These are two completely different implementations, and the weird things we've done to
make them one are holding us back.

  1. Naively create a copy under the cumulus_nclu package.
  2. Delete obvious stuff and then rewrite tests to be all of the same type
  3. Remove the now-unused CumulusNodeConfiguration abstraction

    - NCLU from FRR side
    - Concat, Frr, Interfaces, Ports from NCLU side
* Rewrite some VS tests with the appropriate vendor
* Delete InterfaceConverter in NCLU side
@batfish-bot
Copy link

This change is Reviewable

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.

Reviewed 108 of 113 files at r1.
Reviewable status: 96 of 118 files reviewed, all discussions resolved (waiting on @dhalperi)

They were always unused, just became exposed by this work
@codecov
Copy link

codecov bot commented Feb 15, 2021

Codecov Report

Merging #6630 (3780c0d) into master (16f0cd2) will decrease coverage by 0.03%.
The diff coverage is 81.04%.

@@             Coverage Diff              @@
##             master    #6630      +/-   ##
============================================
- Coverage     73.41%   73.37%   -0.04%     
- Complexity    35871    36365     +494     
============================================
  Files          2847     2916      +69     
  Lines        144720   146708    +1988     
  Branches      17514    17686     +172     
============================================
+ Hits         106249   107650    +1401     
- Misses        30047    30567     +520     
- Partials       8424     8491      +67     
Impacted Files Coverage Δ Complexity Δ
...erfaces/CumulusInterfacesConfigurationBuilder.java 80.43% <0.00%> (ø) 53.00 <0.00> (ø)
.../cumulus_nclu/CumulusNcluConfigurationBuilder.java 86.76% <ø> (ø) 254.00 <0.00> (ø)
...cumulus_nclu/CumulusNcluControlPlaneExtractor.java 100.00% <ø> (ø) 3.00 <0.00> (ø)
...umulus_ports/CumulusPortsConfigurationBuilder.java 88.23% <ø> (ø) 9.00 <0.00> (ø)
...ish/representation/cumulus/CumulusConversions.java 81.34% <0.00%> (-10.49%) 175.00 <0.00> (-17.00)
...epresentation/cumulus/CumulusFrrConfiguration.java 96.55% <ø> (ø) 16.00 <0.00> (ø)
...sh/representation/cumulus/InterfacesInterface.java 91.76% <ø> (ø) 48.00 <0.00> (ø)
...sh/representation/cumulus/RouteMapMatchAsPath.java 100.00% <ø> (ø) 4.00 <0.00> (ø)
...representation/cumulus/RouteMapMatchCommunity.java 100.00% <ø> (ø) 4.00 <0.00> (ø)
...representation/cumulus/RouteMapMatchInterface.java 68.42% <ø> (-5.27%) 5.00 <0.00> (-1.00)
... and 172 more

Copy link
Member

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

Reviewed 4 of 113 files at r1, 25 of 27 files at r2, 23 of 23 files at r4, 23 of 24 files at r5, 4 of 4 files at r6, 1 of 1 files at r7.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @anothermattbrown and @sfraint)

@dhalperi dhalperi merged commit cce1623 into batfish:master Feb 16, 2021
@dhalperi dhalperi deleted the cumulus-split branch February 16, 2021 04:46
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