bgpd: Stop prepending peer-as if self-originated and lastas configured (backport #9394)

[mergify]

This is an automatic backport of pull request #9394 done by Mergify.

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

[polychaeta]

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/5c9e40de754df925837430f0f7e56ab0/raw/9e994a6619e0feaca0054de6f20817bbeb58a8ad/cr_9398_1628929609.diff | git apply

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 22df4ee7fd..720cad25d7 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -4908,14 +4908,13 @@ DEFUN_YANG (set_aspath_prepend_asn,
 	return ret;
 }
 
-DEFUN_YANG (set_aspath_prepend_lastas,
-	    set_aspath_prepend_lastas_cmd,
-	    "set as-path prepend last-as (1-10)",
-	    SET_STR
-	    "Transform BGP AS_PATH attribute\n"
-	    "Prepend to the as-path\n"
-	    "Use the last AS-number in the as-path\n"
-	    "Number of times to insert\n")
+DEFUN_YANG(set_aspath_prepend_lastas, set_aspath_prepend_lastas_cmd,
+	   "set as-path prepend last-as (1-10)",
+	   SET_STR
+	   "Transform BGP AS_PATH attribute\n"
+	   "Prepend to the as-path\n"
+	   "Use the last AS-number in the as-path\n"
+	   "Number of times to insert\n")
 {
 	int idx_num = 4;
 

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

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

[LabN-CI]

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table

_	_
Result	SUCCESS git merge/9398 ea138f5
Date	08/14/2021
Start	04:30:22
Finish	04:56:04
Run-Time	25:42
Total	1813
Pass	1813
Fail	0
Valgrind-Errors
Valgrind-Loss
Details	vncregress-2021-08-14-04:30:22.txt
Log	autoscript-2021-08-14-04:31:35.log.bz2
Memory	509 492 428

For details, please contact louberger

[NetDEF-CI]

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-21059/

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.