ospf6: decimal area format in interface command #6700
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
polychaeta
reviewed
Jul 9, 2020
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/ae7eee2bd441427161bf2e1d8f4765a6/raw/e36089ad8244a5c3c167c58286bc3aaf5e0eb214/cr_6700_1594293964.diff | git apply
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 8ab483c08..6c915157c 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -642,15 +642,12 @@ DEFUN (no_ospf6_distance_source,
}
#endif
-DEFUN (ospf6_interface_area,
- ospf6_interface_area_cmd,
- "interface IFNAME [area <A.B.C.D|(0-4294967295)>] ",
- "Enable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(ospf6_interface_area, ospf6_interface_area_cmd,
+ "interface IFNAME [area <A.B.C.D|(0-4294967295)>] ",
+ "Enable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
VTY_DECLVAR_CONTEXT(ospf6, o);
int idx_ifname = 1;
@@ -693,16 +690,12 @@ DEFUN (ospf6_interface_area,
return CMD_SUCCESS;
}
-DEFUN (no_ospf6_interface_area,
- no_ospf6_interface_area_cmd,
- "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
- NO_STR
- "Disable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(no_ospf6_interface_area, no_ospf6_interface_area_cmd,
+ "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
+ NO_STR "Disable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
int idx_ifname = 2;
int idx_ipv4 = 4;
If you are a new contributor to FRR, please see our contributing guidelines.
|
Please update documentation. Otherwise looks ok. |
polychaeta
previously requested changes
Jul 9, 2020
There was a problem hiding this comment.
Thanks for your contribution to FRR!
- One of your commits has a missing or badly formatted
Signed-off-byline; we can't accept your contribution until all of your commits have one
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/b63b31e4e821a53bd947f1c19040249c/raw/e36089ad8244a5c3c167c58286bc3aaf5e0eb214/cr_6700_1594295631.diff | git apply
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 8ab483c08..6c915157c 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -642,15 +642,12 @@ DEFUN (no_ospf6_distance_source,
}
#endif
-DEFUN (ospf6_interface_area,
- ospf6_interface_area_cmd,
- "interface IFNAME [area <A.B.C.D|(0-4294967295)>] ",
- "Enable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(ospf6_interface_area, ospf6_interface_area_cmd,
+ "interface IFNAME [area <A.B.C.D|(0-4294967295)>] ",
+ "Enable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
VTY_DECLVAR_CONTEXT(ospf6, o);
int idx_ifname = 1;
@@ -693,16 +690,12 @@ DEFUN (ospf6_interface_area,
return CMD_SUCCESS;
}
-DEFUN (no_ospf6_interface_area,
- no_ospf6_interface_area_cmd,
- "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
- NO_STR
- "Disable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(no_ospf6_interface_area, no_ospf6_interface_area_cmd,
+ "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
+ NO_STR "Disable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
int idx_ifname = 2;
int idx_ipv4 = 4;
If you are a new contributor to FRR, please see our contributing guidelines.
deastoe
force-pushed
the
ospf6-interface-decimal-area
branch
from
22c761d to
f48892e
Compare
polychaeta
reviewed
Jul 9, 2020
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/7437720e41367f5428a7b7cbc1874903/raw/e36089ad8244a5c3c167c58286bc3aaf5e0eb214/cr_6700_1594295669.diff | git apply
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 8ab483c08..6c915157c 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -642,15 +642,12 @@ DEFUN (no_ospf6_distance_source,
}
#endif
-DEFUN (ospf6_interface_area,
- ospf6_interface_area_cmd,
- "interface IFNAME [area <A.B.C.D|(0-4294967295)>] ",
- "Enable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(ospf6_interface_area, ospf6_interface_area_cmd,
+ "interface IFNAME [area <A.B.C.D|(0-4294967295)>] ",
+ "Enable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
VTY_DECLVAR_CONTEXT(ospf6, o);
int idx_ifname = 1;
@@ -693,16 +690,12 @@ DEFUN (ospf6_interface_area,
return CMD_SUCCESS;
}
-DEFUN (no_ospf6_interface_area,
- no_ospf6_interface_area_cmd,
- "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
- NO_STR
- "Disable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(no_ospf6_interface_area, no_ospf6_interface_area_cmd,
+ "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
+ NO_STR "Disable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
int idx_ifname = 2;
int idx_ipv4 = 4;
If you are a new contributor to FRR, please see our contributing guidelines.
Sure, done. Thanks for the quick review! |
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
deastoe
force-pushed
the
ospf6-interface-decimal-area
branch
from
f48892e to
286a41e
Compare
polychaeta
reviewed
Jul 9, 2020
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/63f194ce70469e90ff8a41214364077d/raw/e36089ad8244a5c3c167c58286bc3aaf5e0eb214/cr_6700_1594295824.diff | git apply
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index 8ab483c08..6c915157c 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -642,15 +642,12 @@ DEFUN (no_ospf6_distance_source,
}
#endif
-DEFUN (ospf6_interface_area,
- ospf6_interface_area_cmd,
- "interface IFNAME [area <A.B.C.D|(0-4294967295)>] ",
- "Enable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(ospf6_interface_area, ospf6_interface_area_cmd,
+ "interface IFNAME [area <A.B.C.D|(0-4294967295)>] ",
+ "Enable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
VTY_DECLVAR_CONTEXT(ospf6, o);
int idx_ifname = 1;
@@ -693,16 +690,12 @@ DEFUN (ospf6_interface_area,
return CMD_SUCCESS;
}
-DEFUN (no_ospf6_interface_area,
- no_ospf6_interface_area_cmd,
- "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
- NO_STR
- "Disable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(no_ospf6_interface_area, no_ospf6_interface_area_cmd,
+ "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
+ NO_STR "Disable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
int idx_ifname = 2;
int idx_ipv4 = 4;
If you are a new contributor to FRR, please see our contributing guidelines.
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedIPv6 protocols on Ubuntu 18.04: Failed (click for details)Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsIPv6 protocols on Ubuntu 18.04: Failed (click for details)Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedIPv6 protocols on Ubuntu 18.04: Failed (click for details)Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsIPv6 protocols on Ubuntu 18.04: Failed (click for details)Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
|
lgtm - Thanks Duncan. |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedIPv6 protocols on Ubuntu 18.04: Failed (click for details)Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsIPv6 protocols on Ubuntu 18.04: Failed (click for details)Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopo tests part 1 on Ubuntu 16.04 i386: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TP1U1604I386-13013/test Topology Tests failed for Topo tests part 1 on Ubuntu 16.04 i386: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-13013/artifact/TP1U1604I386/ErrorLog/log_topotests.txt IPv6 protocols on Ubuntu 18.04: Failed (click for details)Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopo tests part 1 on Ubuntu 16.04 i386: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TP1U1604I386-13013/test Topology Tests failed for Topo tests part 1 on Ubuntu 16.04 i386: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-13013/artifact/TP1U1604I386/ErrorLog/log_topotests.txt IPv6 protocols on Ubuntu 18.04: Failed (click for details)Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
|
ci:rerun |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopo tests part 1 on Ubuntu 16.04 i386: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TP1U1604I386-13078/test Topology Tests failed for Topo tests part 1 on Ubuntu 16.04 i386: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-13078/artifact/TP1U1604I386/ErrorLog/log_topotests.txt IPv6 protocols on Ubuntu 18.04: Failed (click for details)Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopo tests part 1 on Ubuntu 16.04 i386: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TP1U1604I386-13078/test Topology Tests failed for Topo tests part 1 on Ubuntu 16.04 i386: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-13078/artifact/TP1U1604I386/ErrorLog/log_topotests.txt IPv6 protocols on Ubuntu 18.04: Failed (click for details)Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
qlyoung
reviewed
Jul 13, 2020
The ospf6 "interface <blah> area <x>" command only allows the area to be specified in the ipv4 address format, whereas the show run command always shows it in the format in which the area was created. This causes the frr-reload script to be unable to remove ospfv3 interfaces when the area was created in decimal format. The solution is to allow both formats to be configured as they can be for other area commands. Signed-off-by: Duncan Eastoe <duncan.eastoe@att.com>
"interface <ifname> area <area>" now accepts <area> in decimal or IP format. Signed-off-by: Duncan Eastoe <duncan.eastoe@att.com>
deastoe
force-pushed
the
ospf6-interface-decimal-area
branch
from
286a41e to
fb22083
Compare
polychaeta
reviewed
Jul 14, 2020
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/cd799eddbb8e211d6fed829da39f9df8/raw/bbd8621d4d4c8677706a7259b2fae087d7ecae91/cr_6700_1594745541.diff | git apply
diff --git a/ospf6d/ospf6_top.c b/ospf6d/ospf6_top.c
index f49ea9add..44f5c82f3 100644
--- a/ospf6d/ospf6_top.c
+++ b/ospf6d/ospf6_top.c
@@ -642,15 +642,12 @@ DEFUN (no_ospf6_distance_source,
}
#endif
-DEFUN (ospf6_interface_area,
- ospf6_interface_area_cmd,
- "interface IFNAME area <A.B.C.D|(0-4294967295)>",
- "Enable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(ospf6_interface_area, ospf6_interface_area_cmd,
+ "interface IFNAME area <A.B.C.D|(0-4294967295)>",
+ "Enable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
VTY_DECLVAR_CONTEXT(ospf6, o);
int idx_ifname = 1;
@@ -693,16 +690,12 @@ DEFUN (ospf6_interface_area,
return CMD_SUCCESS;
}
-DEFUN (no_ospf6_interface_area,
- no_ospf6_interface_area_cmd,
- "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
- NO_STR
- "Disable routing on an IPv6 interface\n"
- IFNAME_STR
- "Specify the OSPF6 area ID\n"
- "OSPF6 area ID in IPv4 address notation\n"
- "OSPF6 area ID in decimal notation\n"
- )
+DEFUN(no_ospf6_interface_area, no_ospf6_interface_area_cmd,
+ "no interface IFNAME area <A.B.C.D|(0-4294967295)>",
+ NO_STR "Disable routing on an IPv6 interface\n" IFNAME_STR
+ "Specify the OSPF6 area ID\n"
+ "OSPF6 area ID in IPv4 address notation\n"
+ "OSPF6 area ID in decimal notation\n")
{
int idx_ifname = 2;
int idx_ipv4 = 4;
If you are a new contributor to FRR, please see our contributing guidelines.
deastoe
commented
Jul 14, 2020
💚 Basic BGPD CI results: SUCCESS, 0 tests failedResults table
For details, please contact louberger |
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-13125/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warningsWarnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
|
@eqvinox Is there a chance this will be cherry-picked into 7.3 and 7.4 stable branches? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The ospf6 "interface area " command only allows the area to
be specified in the ipv4 address format, whereas the show run command
always shows it in the format in which the area was created. This causes
the frr-reload script to be unable to remove ospfv3 interfaces when the
area was created in decimal format. The solution is to allow both formats
to be configured as they can be for other area commands.
Signed-off-by: Duncan Eastoe duncan.eastoe@att.com
cc @pjdruddy