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

ospf6d: add a knob to generate Type-7 default routes #9585

Merged
merged 4 commits into from
Sep 24, 2021

Conversation

rwestphal
Copy link
Member

Add a knob to generate Type-7 default routes on NSSA ABRs/ASBRs.

Syntax: area A.B.C.D nssa default-information-originate [{metric (0-16777214)|metric-type (1-2)}].

Example:

router ospf6
 area 1 nssa default-information-originate
!

This PR also includes a few assorted fixes. Please refer to the individual commits for details.

@qlyoung
Copy link
Member

qlyoung commented Sep 8, 2021

@frrbot rereview

@LabN-CI
Copy link
Collaborator

LabN-CI commented Sep 8, 2021

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/9585 0986409
Date 09/08/2021
Start 12:57:37
Finish 13:23:52
Run-Time 26:15
Total 1813
Pass 1813
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-09-08-12:57:37.txt
Log autoscript-2021-09-08-12:58:51.log.bz2
Memory 487 503 425

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Sep 8, 2021

Continuous Integration Result: FAILED

Continuous Integration Result: FAILED

See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-82/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Successful

Basic Tests: Failed

Topotests Ubuntu 18.04 amd64 part 1: Failed (click for details)

Topology Test Results are at https://ci1.netdef.org/browse/FRR-PULLREQ2-TP1U1804AMD64-82/test

Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 1:

r1 failed SHOW IP BGP SUMMARY check:
--- actual SHOW IP BGP SUMMARY 
+++ expected SHOW IP BGP SUMMARY 
@@ -6,5 +6,5 @@
 Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt Desc
 192.168.7.10     4        100         0         0        0    0    0    never       Active        0 Transit_cogent
 192.168.7.20     4        200         0         0        0    0    0    never       Active        0 Client_Bibi_Full
-fc00:0:0:8::1000 4        100         0         0        0    0    0    never      Connect        0 Transit_cogent_v6
-fc00:0:0:8::2000 4        200         0         0        0    0    0    never      Connect        0 Client_Toto_default
+fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active        0 Transit_cogent_v6
+fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active        0 Client_Toto_default
r1 failed SHOW BGP IPv6 SUMMARY check:
--- actual SHOW BGP IPv6 SUMMARY
+++ expected SHOW BGP IPv6 SUMMARY
@@ -4,5 +4,5 @@
 Peers 2, using XXXX KiB of memory
 
 Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt Desc
-fc00:0:0:8::1000 4        100         0         0        0    0    0    never      Connect        0 Transit_cogent_v6
-fc00:0:0:8::2000 4        200         0         0        0    0    0    never      Connect        0 Client_Toto_default
+fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active        0 Transit_cogent_v6
+fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active        0 Client_Toto_default

see full log at https://ci1.netdef.org/browse/FRR-PULLREQ2-82/artifact/TP1U1804AMD64/ErrorLog/log_topotests.txt

Topotests debian 10 amd64 part 1: Failed (click for details)

Topology Test Results are at https://ci1.netdef.org/browse/FRR-PULLREQ2-TOPO1DEB10AMD64-82/test

Topology Tests failed for Topotests debian 10 amd64 part 1:

r1 failed SHOW BGP IPv6 SUMMARY check:
--- actual SHOW BGP IPv6 SUMMARY
+++ expected SHOW BGP IPv6 SUMMARY
@@ -4,5 +4,5 @@
 Peers 2, using XXXX KiB of memory
 
 Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt Desc
-fc00:0:0:8::1000 4        100         0         0        0    0    0    never      Connect        0 Transit_cogent_v6
-fc00:0:0:8::2000 4        200         0         0        0    0    0    never      Connect        0 Client_Toto_default
+fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active        0 Transit_cogent_v6
+fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active        0 Client_Toto_default

see full log at https://ci1.netdef.org/browse/FRR-PULLREQ2-82/artifact/TOPO1DEB10AMD64/ErrorLog/log_topotests.txt

Successful on other platforms/tests
  • Topotests debian 10 amd64 part 5
  • Topotests Ubuntu 18.04 arm8 part 2
  • Topotests debian 10 amd64 part 0
  • Ubuntu 16.04 deb pkg check
  • Topotests Ubuntu 18.04 arm8 part 7
  • Topotests Ubuntu 18.04 i386 part 6
  • Addresssanitizer topotests part 9
  • Topotests Ubuntu 18.04 i386 part 1
  • IPv4 ldp protocol on Ubuntu 18.04
  • Addresssanitizer topotests part 7
  • Topotests Ubuntu 18.04 arm8 part 8
  • Topotests Ubuntu 18.04 arm8 part 1
  • Topotests Ubuntu 18.04 arm8 part 6
  • Topotests Ubuntu 18.04 i386 part 7
  • Topotests Ubuntu 18.04 amd64 part 7
  • Topotests Ubuntu 18.04 amd64 part 5
  • Topotests debian 10 amd64 part 6
  • Topotests Ubuntu 18.04 i386 part 2
  • Fedora 29 rpm pkg check
  • Addresssanitizer topotests part 6
  • Topotests Ubuntu 18.04 i386 part 5
  • Topotests Ubuntu 18.04 amd64 part 2
  • Topotests Ubuntu 18.04 i386 part 0
  • Addresssanitizer topotests part 3
  • Topotests Ubuntu 18.04 i386 part 3
  • Topotests Ubuntu 18.04 amd64 part 4
  • CentOS 7 rpm pkg check
  • Topotests debian 10 amd64 part 8
  • Topotests debian 10 amd64 part 9
  • Topotests Ubuntu 18.04 arm8 part 4
  • Topotests Ubuntu 18.04 amd64 part 3
  • Topotests Ubuntu 18.04 amd64 part 0
  • Topotests Ubuntu 18.04 arm8 part 9
  • Addresssanitizer topotests part 2
  • IPv6 protocols on Ubuntu 18.04
  • Static analyzer (clang)
  • Addresssanitizer topotests part 1
  • Topotests Ubuntu 18.04 i386 part 4
  • Ubuntu 18.04 deb pkg check
  • Topotests Ubuntu 18.04 i386 part 9
  • Topotests Ubuntu 18.04 amd64 part 8
  • Topotests debian 10 amd64 part 2
  • Topotests debian 10 amd64 part 7
  • IPv4 protocols on Ubuntu 18.04
  • Topotests Ubuntu 18.04 arm8 part 0
  • Debian 9 deb pkg check
  • Topotests Ubuntu 18.04 amd64 part 6
  • Topotests Ubuntu 18.04 i386 part 8
  • Addresssanitizer topotests part 8
  • Topotests Ubuntu 18.04 amd64 part 9
  • Ubuntu 20.04 deb pkg check
  • Debian 10 deb pkg check
  • Addresssanitizer topotests part 5
  • Topotests Ubuntu 18.04 arm8 part 3
  • Topotests debian 10 amd64 part 4
  • Addresssanitizer topotests part 4
  • Topotests Ubuntu 18.04 arm8 part 5
  • Addresssanitizer topotests part 0
  • Topotests debian 10 amd64 part 3

Warnings Generated during build:

Checkout code: Successful with additional warnings
Topotests Ubuntu 18.04 amd64 part 1: Failed (click for details)

Topology Test Results are at https://ci1.netdef.org/browse/FRR-PULLREQ2-TP1U1804AMD64-82/test

Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 1:

r1 failed SHOW IP BGP SUMMARY check:
--- actual SHOW IP BGP SUMMARY 
+++ expected SHOW IP BGP SUMMARY 
@@ -6,5 +6,5 @@
 Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt Desc
 192.168.7.10     4        100         0         0        0    0    0    never       Active        0 Transit_cogent
 192.168.7.20     4        200         0         0        0    0    0    never       Active        0 Client_Bibi_Full
-fc00:0:0:8::1000 4        100         0         0        0    0    0    never      Connect        0 Transit_cogent_v6
-fc00:0:0:8::2000 4        200         0         0        0    0    0    never      Connect        0 Client_Toto_default
+fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active        0 Transit_cogent_v6
+fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active        0 Client_Toto_default
r1 failed SHOW BGP IPv6 SUMMARY check:
--- actual SHOW BGP IPv6 SUMMARY
+++ expected SHOW BGP IPv6 SUMMARY
@@ -4,5 +4,5 @@
 Peers 2, using XXXX KiB of memory
 
 Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt Desc
-fc00:0:0:8::1000 4        100         0         0        0    0    0    never      Connect        0 Transit_cogent_v6
-fc00:0:0:8::2000 4        200         0         0        0    0    0    never      Connect        0 Client_Toto_default
+fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active        0 Transit_cogent_v6
+fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active        0 Client_Toto_default

see full log at https://ci1.netdef.org/browse/FRR-PULLREQ2-82/artifact/TP1U1804AMD64/ErrorLog/log_topotests.txt

Topotests debian 10 amd64 part 1: Failed (click for details)

Topology Test Results are at https://ci1.netdef.org/browse/FRR-PULLREQ2-TOPO1DEB10AMD64-82/test

Topology Tests failed for Topotests debian 10 amd64 part 1:

r1 failed SHOW BGP IPv6 SUMMARY check:
--- actual SHOW BGP IPv6 SUMMARY
+++ expected SHOW BGP IPv6 SUMMARY
@@ -4,5 +4,5 @@
 Peers 2, using XXXX KiB of memory
 
 Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt Desc
-fc00:0:0:8::1000 4        100         0         0        0    0    0    never      Connect        0 Transit_cogent_v6
-fc00:0:0:8::2000 4        200         0         0        0    0    0    never      Connect        0 Client_Toto_default
+fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active        0 Transit_cogent_v6
+fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active        0 Client_Toto_default

see full log at https://ci1.netdef.org/browse/FRR-PULLREQ2-82/artifact/TOPO1DEB10AMD64/ErrorLog/log_topotests.txt

Report for ospf6_zebra.h | 2 issues
===============================================
< WARNING: function definition argument 'struct thread_master *' should also have an identifier name
< #58: FILE: /tmp/f1-10600/ospf6_zebra.h:58:

@rwestphal
Copy link
Member Author

CI:rerun

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Sep 9, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-100/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings
Report for ospf6_zebra.h | 2 issues
===============================================
< WARNING: function definition argument 'struct thread_master *' should also have an identifier name
< #58: FILE: /tmp/f1-32472/ospf6_zebra.h:58:

@rwestphal rwestphal force-pushed the ospf6d-nssa-dflt-originate branch from 0986409 to ddbce5b Compare September 14, 2021 03:18
@LabN-CI
Copy link
Collaborator

LabN-CI commented Sep 14, 2021

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/9585 ddbce5b
Date 09/13/2021
Start 23:46:04
Finish 00:12:30
Run-Time 26:26
Total 1813
Pass 1813
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-09-13-23:46:04.txt
Log autoscript-2021-09-13-23:47:24.log.bz2
Memory 506 513 426

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Sep 14, 2021

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-154/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

@riw777 riw777 self-requested a review September 14, 2021 15:14
Copy link
Member

@riw777 riw777 left a comment

Choose a reason for hiding this comment

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

just one comment to @donaldsharp 's comment ... the code and operation look fine

Copy link
Member

@riw777 riw777 left a comment

Choose a reason for hiding this comment

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

waiting on conflicts at this point

@Jafaral Jafaral added this to the 8.1 milestone Sep 21, 2021
Fix wrong comparison since route->path.metric_type is always set
to either 1 or 2. The OSPF6_PATH_TYPE_EXTERNAL2 constant, whose
value is 4, refers to a route type so its usage was incorrect here.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
When set to its default value, the metric type associated to a
"redistribute" statement shouldn't be displayed as part of the
running configuration.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
…mation-originate"

The route created by the "default-information-originate" command
isn't a regular external route. As such, an NSSA ABR shouldn't
originate a corresponding Type-7 LSA for it (there's a separate
configuration knob to generate Type-7 default routes).

While here, fix a small issue in ospf6_asbr_redistribute_add()
where routes created by "default-information-originate" were being
displayed with an incorrect "unknown" type.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Add the "default-information-originate" option to the "area X nssa"
command. That option allows the origination of Type-7 default routes
on NSSA ABRs and ASBRs.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
@rwestphal rwestphal force-pushed the ospf6d-nssa-dflt-originate branch from ddbce5b to 6735622 Compare September 21, 2021 20:52
@LabN-CI
Copy link
Collaborator

LabN-CI commented Sep 21, 2021

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/9585 6735622
Date 09/21/2021
Start 17:32:20
Finish 17:58:48
Run-Time 26:28
Total 1813
Pass 1813
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2021-09-21-17:32:20.txt
Log autoscript-2021-09-21-17:33:34.log.bz2
Memory 512 502 436

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-291/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

@riw777 riw777 merged commit b8beb67 into FRRouting:master Sep 24, 2021
@eqvinox eqvinox deleted the ospf6d-nssa-dflt-originate branch May 26, 2022 09:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants