bgp: defining peer-group for neighbor will remove remote-as setting

[c-po]

Description

When assigning a BGP neighbor to a peer-group the per neighbor remote-as option is removed which will place the neighbor in an unconfigured state.

Version

FRR stable/10.2 commit 1e23469

How to reproduce

Define neighbor with explicit remote-as

router bgp 100
 neighbor SMOKETESTEXT peer-group
 neighbor 192.122.2.2 remote-as 200
exit
!

LR1.wue3(config)# do sh ip bgp sum

IPv4 Unicast Summary:
BGP router identifier 172.18.254.201, local AS number 100 VRF default vrf-id 0
BGP table version 0
RIB entries 0, using 0 bytes of memory
Peers 1, using 24 KiB of memory
Peer groups 1, using 64 bytes of memory

Neighbor        V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt Desc
192.122.2.2     4        200         0         0        0    0    0    never       Active        0 N/A

Total number of neighbors 1

Assign neighbor to peer-group

LR1.wue3(config)# router bgp 100
LR1.wue3(config-router)# neighbor 192.122.2.2  peer-group SMOKETESTEXT
LR1.wue3(config-router)# end

Check Configuration

LR1.wue3# show run
...
!
router bgp 100
 neighbor SMOKETESTEXT peer-group
 neighbor 192.122.2.2 peer-group SMOKETESTEXT
exit
!

LR1.wue3# sh ip bgp sum

IPv4 Unicast Summary:
BGP router identifier 172.18.254.201, local AS number 100 VRF default vrf-id 0
BGP table version 0
RIB entries 0, using 0 bytes of memory
Peers 1, using 24 KiB of memory
Peer groups 1, using 64 bytes of memory

Neighbor        V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt Desc
192.122.2.2     4        200         0         0        0    0    0    never       Active        0 N/A

Total number of neighbors 1

Expected behavior

!
router bgp 100
 neighbor SMOKETESTEXT peer-group
 neighbor 192.122.2.2 remote-as 200
 neighbor 192.122.2.2 peer-group SMOKETESTEXT
exit
!

Actual behavior

remote-as is removed from individual neighbor configuration

Additional context

No response

Checklist

• I have searched the open issues for this bug.
• I have not included sensitive information in this report.

[ton31337]

Should be fixed here #17542, possible to test it out?

[c-po]

Should be fixed here #17542, possible to test it out?

I manually cherry-picked those two commits into 10.2 and can confirm it fixes the issue. Thanks!
Please create a backport for stable/10.2