bgpd: Allow using add/subtract for local-preference in route-maps #5855

ton31337 · 2020-02-23T20:08:59Z

See individual commits.

polychaeta

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/0e239cb274c125c92bfd2c17381956b5/raw/f81fddff1b29c02a4a0c135263ec02279494323f/cr_5855_1582488543.diff | git apply

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 8f498fc3c..5330576ab 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -4398,12 +4398,10 @@ DEFUN (no_set_distance,
 				  "distance", NULL);
 }
 
-DEFUN (set_local_pref,
-       set_local_pref_cmd,
-       "set local-preference WORD",
-       SET_STR
-       "BGP local preference path attribute\n"
-       "Preference value\n")
+DEFUN(set_local_pref, set_local_pref_cmd, "set local-preference WORD",
+      SET_STR
+      "BGP local preference path attribute\n"
+      "Preference value\n")
 {
 	int idx_number = 2;
 	return generic_set_add(vty, VTY_GET_CONTEXT(route_map_index),
@@ -4411,13 +4409,10 @@ DEFUN (set_local_pref,
 }
 
 
-DEFUN (no_set_local_pref,
-       no_set_local_pref_cmd,
-       "no set local-preference WORD",
-       NO_STR
-       SET_STR
-       "BGP local preference path attribute\n"
-       "Preference value\n")
+DEFUN(no_set_local_pref, no_set_local_pref_cmd, "no set local-preference WORD",
+      NO_STR SET_STR
+      "BGP local preference path attribute\n"
+      "Preference value\n")
 {
 	int idx_localpref = 3;
 	if (argc <= idx_localpref)

If you are a new contributor to FRR, please see our contributing guidelines.

LabN-CI · 2020-02-23T20:36:31Z

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_	_
Result	0
Date	0
Start	0
Finish	vncregress-2020-02-23-15:10:27.txt
Run-Time	autoscript-2020-02-23-15:11:26.log.bz2
Total	494 466 418
Pass	SUCCESS git merge/5421 `b5d4d6a`
Fail	11/23/2019
Valgrind-Errors	15:10:21
Valgrind-Loss	15:36:16
Details	25:55
Log	1815
Memory	1815
SUCCESS git merge/5855 `1104603`	0
02/23/2020	0
15:10:27	0
15:36:27	vncregress-2019-11-23-15:10:21.txt
26:00	autoscript-2019-11-23-15:11:15.log.bz2
1815	435 425 361
1815

For details, please contact louberger

LabN-CI · 2020-02-23T21:06:20Z

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_	_
Result	0
Date	0
Start	0
Finish	vncregress-2020-02-23-15:40:27.txt
Run-Time	autoscript-2020-02-23-15:41:24.log.bz2
Total	479 486 418
Pass	SUCCESS git merge/5422 `a307391`
Fail	11/23/2019
Valgrind-Errors	15:40:27
Valgrind-Loss	16:06:14
Details	25:47
Log	1815
Memory	1815
SUCCESS git merge/5855 `3bbbc27`	0
02/23/2020	0
15:40:27	0
16:06:16	vncregress-2019-11-23-15:40:27.txt
25:49	autoscript-2019-11-23-15:41:21.log.bz2
1815	414 422 360
1815

For details, please contact louberger

NetDEF-CI · 2020-02-23T22:55:27Z

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-FRRPULLREQ-10842/

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.

CLANG Static Analyzer Summary

Github Pull Request 5855, comparing to Git base SHA 9a6e190
Base image data for Git 9a6e190 does not exist - compare skipped

2 Static Analyzer issues remaining.

See details at
https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10842/artifact/shared/static_analysis/index.html

NetDEF-CI · 2020-02-23T23:14:18Z

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-FRRPULLREQ-10841/

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:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10841/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: pkg-js-tools-test-is-missing
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200223-01-g110460327-0 (missing) -> 7.4-dev-20200223-01-g110460327-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200223-01-g110460327-0 (missing) -> 7.4-dev-20200223-01-g110460327-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200223-01-g110460327-0 (missing) -> 7.4-dev-20200223-01-g110460327-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200223-01-g110460327-0 (missing) -> 7.4-dev-20200223-01-g110460327-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200223-01-g110460327-0 (missing) -> 7.4-dev-20200223-01-g110460327-0~deb10u1

CLANG Static Analyzer Summary

Github Pull Request 5855, comparing to Git base SHA 9a6e190
Base image data for Git 9a6e190 does not exist - compare skipped

2 Static Analyzer issues remaining.

See details at
https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10841/artifact/shared/static_analysis/index.html

srimohans

Donatas, Is there any other attribute that we treat this way in route maps ? Just an example.

Also, now that this is a string, how to make sure the WORD entered is actually in the range of [0-4294967295], and other numerical validations ?

I will ping you offline for few more questions.

bgpd/bgp_routemap.c

ton31337 · 2020-02-25T08:51:07Z

@srimohans validation is done in route_value_compile().

We already have a generic support for add/sub in route-maps. It's already handled in route_value_compile(). Just convert to string (allow passing (-) minus sign) - works like expected. Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

LabN-CI · 2020-02-28T12:56:37Z

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table

_	_
Result	SUCCESS git merge/5855 `03252d6`
Date	02/28/2020
Start	07:30:28
Finish	07:56:32
Run-Time	26:04
Total	1815
Pass	1815
Fail	0
Valgrind-Errors	0
Valgrind-Loss	0
Details	vncregress-2020-02-28-07:30:28.txt
Log	autoscript-2020-02-28-07:31:24.log.bz2
Memory	494 495 418

For details, please contact louberger

NetDEF-CI · 2020-02-28T14:41:02Z

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-FRRPULLREQ-10899/

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:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10899/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: pkg-js-tools-test-is-missing
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200228-02-g03252d603-0 (missing) -> 7.4-dev-20200228-02-g03252d603-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200228-02-g03252d603-0 (missing) -> 7.4-dev-20200228-02-g03252d603-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200228-02-g03252d603-0 (missing) -> 7.4-dev-20200228-02-g03252d603-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200228-02-g03252d603-0 (missing) -> 7.4-dev-20200228-02-g03252d603-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200228-02-g03252d603-0 (missing) -> 7.4-dev-20200228-02-g03252d603-0~deb10u1

srimohans · 2020-02-28T19:34:06Z

@riw777 Is there anything pending on this ? I will go ahead and merge this otherwise.

polychaeta added bgp documentation tests Topotests, make check, etc labels Feb 23, 2020

polychaeta reviewed Feb 23, 2020

View reviewed changes

srimohans reviewed Feb 25, 2020

View reviewed changes

Spantik reviewed Feb 25, 2020

View reviewed changes

bgpd/bgp_routemap.c Show resolved Hide resolved

riw777 self-requested a review February 25, 2020 16:42

srimohans approved these changes Feb 26, 2020

View reviewed changes

ton31337 added 3 commits February 28, 2020 14:03

doc: Use +/- for set local-preference to add/subtract the value

94f7568

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

tests: Add a test case for set local-preference +/-LOCAL_PREF

03252d6

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

srimohans merged commit 200334e into FRRouting:master Mar 2, 2020

ton31337 deleted the fix/allow_using_add_sub_for_local-preference branch March 2, 2020 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bgpd: Allow using add/subtract for local-preference in route-maps #5855

bgpd: Allow using add/subtract for local-preference in route-maps #5855

ton31337 commented Feb 23, 2020

polychaeta left a comment

LabN-CI commented Feb 23, 2020 •

edited

Loading

Basic BGPD CI results: SUCCESS, 0 tests failed

LabN-CI commented Feb 23, 2020 •

edited

Loading

Basic BGPD CI results: SUCCESS, 0 tests failed

NetDEF-CI commented Feb 23, 2020

NetDEF-CI commented Feb 23, 2020

srimohans left a comment

ton31337 commented Feb 25, 2020

LabN-CI commented Feb 28, 2020

NetDEF-CI commented Feb 28, 2020

srimohans commented Feb 28, 2020

bgpd: Allow using add/subtract for local-preference in route-maps #5855

bgpd: Allow using add/subtract for local-preference in route-maps #5855

Conversation

ton31337 commented Feb 23, 2020

polychaeta left a comment

Choose a reason for hiding this comment

LabN-CI commented Feb 23, 2020 • edited Loading

Basic BGPD CI results: SUCCESS, 0 tests failed

LabN-CI commented Feb 23, 2020 • edited Loading

Basic BGPD CI results: SUCCESS, 0 tests failed

NetDEF-CI commented Feb 23, 2020

Continuous Integration Result: SUCCESSFUL

CLANG Static Analyzer Summary

2 Static Analyzer issues remaining.

NetDEF-CI commented Feb 23, 2020

Continuous Integration Result: SUCCESSFUL

Warnings Generated during build:

CLANG Static Analyzer Summary

2 Static Analyzer issues remaining.

srimohans left a comment

Choose a reason for hiding this comment

ton31337 commented Feb 25, 2020

LabN-CI commented Feb 28, 2020

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

NetDEF-CI commented Feb 28, 2020

Continuous Integration Result: SUCCESSFUL

Warnings Generated during build:

srimohans commented Feb 28, 2020

LabN-CI commented Feb 23, 2020 •

edited

Loading

LabN-CI commented Feb 23, 2020 •

edited

Loading