bgpd: Fix bgp peer solo option

Signed-off-by: Alexander Skorichenko <askorichenko@netgate.com>

4 files changed, 160 insertions, 2 deletions

diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
index 35ddfc34f..c6b1ff1d2 100644
--- a/bgpd/bgp_updgrp.c
+++ b/bgpd/bgp_updgrp.c
@@ -2037,13 +2037,16 @@ int update_group_adjust_soloness(struct peer *peer, int set)
 	struct peer_group *group;
 	struct listnode *node, *nnode;
 
-	peer_flag_set(peer, PEER_FLAG_LONESOUL);
-
 	if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
 		peer_lonesoul_or_not(peer, set);
 		if (peer_established(peer->connection))
 			bgp_announce_route_all(peer);
 	} else {
+		if (set)
+			peer_flag_set(peer, PEER_FLAG_LONESOUL);
+		else
+			peer_flag_unset(peer, PEER_FLAG_LONESOUL);
+
 		group = peer->group;
 		for (ALL_LIST_ELEMENTS(group->peer, node, nnode, peer)) {
 			peer_lonesoul_or_not(peer, set);
diff --git a/tests/topotests/bgp_peer_solo/r1/frr.conf b/tests/topotests/bgp_peer_solo/r1/frr.conf
new file mode 100644
index 000000000..6ef3688b8
--- /dev/null
+++ b/tests/topotests/bgp_peer_solo/r1/frr.conf
@@ -0,0 +1,10 @@
+!
+int r1-eth0
+ ip address 10.255.0.1/24
+!
+router bgp 65001
+ no bgp ebgp-requires-policy
+ neighbor 10.255.0.2 timers 1 3
+ neighbor 10.255.0.2 timers connect 1
+ neighbor 10.255.0.2 remote-as external
+!
diff --git a/tests/topotests/bgp_peer_solo/r2/frr.conf b/tests/topotests/bgp_peer_solo/r2/frr.conf
new file mode 100644
index 000000000..c58e32741
--- /dev/null
+++ b/tests/topotests/bgp_peer_solo/r2/frr.conf
@@ -0,0 +1,14 @@
+!
+int r2-eth0
+ ip address 10.255.0.2/24
+!
+router bgp 65002
+ no bgp ebgp-requires-policy
+ no bgp network import-check
+ neighbor 10.255.0.1 remote-as external
+ neighbor 10.255.0.1 timers 1 3
+ neighbor 10.255.0.1 timers connect 1
+ address-family ipv4 unicast
+  network 10.0.0.1/32
+ exit-address-family
+!
diff --git a/tests/topotests/bgp_peer_solo/test_bgp_peer_solo.py b/tests/topotests/bgp_peer_solo/test_bgp_peer_solo.py
new file mode 100644
index 000000000..6bd2430ae
--- /dev/null
+++ b/tests/topotests/bgp_peer_solo/test_bgp_peer_solo.py
@@ -0,0 +1,131 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: ISC
+
+import os
+import re
+import sys
+import json
+import pytest
+import functools
+
+CWD = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(os.path.join(CWD, "../"))
+
+from lib import topotest
+from lib.topogen import Topogen, get_topogen
+
+pytestmark = [pytest.mark.bgpd]
+
+
+def setup_module(mod):
+    topodef = {"s1": ("r1", "r2")}
+    tgen = Topogen(topodef, mod.__name__)
+    tgen.start_topology()
+
+    router_list = tgen.routers()
+
+    for _, (rname, router) in enumerate(router_list.items(), 1):
+        router.load_frr_config(os.path.join(CWD, "{}/frr.conf".format(rname)))
+
+    tgen.start_router()
+
+
+def teardown_module(mod):
+    tgen = get_topogen()
+    tgen.stop_topology()
+
+
+def test_bgp_peer_solo():
+    tgen = get_topogen()
+
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    r1 = tgen.gears["r1"]
+
+    def _bgp_converge():
+        output = json.loads(r1.vtysh_cmd("show bgp ipv4 unicast summary json"))
+        print("output=", output)
+        expected = {
+            "peers": {
+                "10.255.0.2": {
+                    "remoteAs": 65002,
+                    "state": "Established",
+                    "peerState": "OK",
+                },
+            },
+            "totalPeers": 1,
+        }
+
+        return topotest.json_cmp(output, expected)
+
+    test_func = functools.partial(
+        _bgp_converge,
+    )
+    _, result = topotest.run_and_expect(test_func, None, count=30, wait=1)
+    assert result is None, "Can't converge initial state"
+
+    def _bgp_advertised():
+        output = json.loads(r1.vtysh_cmd("show bgp ipv4 neighbors 10.255.0.2 advertised-routes json"))
+        print("output adv=", output)
+        expected = {
+            "advertisedRoutes": {
+                "10.0.0.1/32": {},
+            },
+            "totalPrefixCounter": 1,
+        }
+
+        return topotest.json_cmp(output, expected)
+
+    test_func = functools.partial(
+        _bgp_advertised,
+    )
+    _, result = topotest.run_and_expect(test_func, None, count=20, wait=1)
+    assert result is None, "Should contain an advertised route"
+
+    #
+    # Apply solo option
+    #
+    r1.vtysh_cmd(
+        """
+        configure terminal
+          router bgp 65001
+            neighbor 10.255.0.2 solo
+    """
+    )
+
+    def _bgp_no_advertised():
+        output = json.loads(r1.vtysh_cmd("show bgp ipv4 neighbors 10.255.0.2 advertised-routes json"))
+        expected = {
+            "totalPrefixCounter": 0,
+        }
+
+        return topotest.json_cmp(output, expected)
+
+    test_func = functools.partial(
+        _bgp_no_advertised,
+    )
+    _, result = topotest.run_and_expect(test_func, None, count=20, wait=1)
+    assert result is None, "Shouldn't contain advertised routes"
+
+    #
+    # Unset solo option
+    #
+    r1.vtysh_cmd(
+        """
+        configure terminal
+          router bgp 65001
+            no neighbor 10.255.0.2 solo
+    """
+    )
+
+    test_func = functools.partial(
+        _bgp_advertised,
+    )
+    _, result = topotest.run_and_expect(test_func, None, count=20, wait=1)
+    assert result is None, "Should contain an advertised route"
+
+
+if __name__ == "__main__":
+    args = ["-s"] + sys.argv[1:]
+    sys.exit(pytest.main(args))