8 files changed, 68 insertions, 5 deletions
diff --git a/tests/topotests/bfd_topo3/test_bfd_topo3.py b/tests/topotests/bfd_topo3/test_bfd_topo3.py
index f767b0e7b9..d7b2542f9f 100644
--- a/tests/topotests/bfd_topo3/test_bfd_topo3.py
+++ b/tests/topotests/bfd_topo3/test_bfd_topo3.py
@@ -189,7 +189,7 @@ def test_wait_bfd_convergence():
             "show bfd peers json",
             bfd_config,
         )
-        _, result = topotest.run_and_expect(test_func, None, count=130, wait=1)
+        _, result = topotest.run_and_expect(test_func, None, count=200, wait=1)
         assertmsg = '"{}" BFD configuration failure'.format(router)
         assert result is None, assertmsg
 
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
index c98d837069..489c59fa40 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
+++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/scripts/add_routes.py
@@ -1,13 +1,13 @@
 from lib.lutil import luCommand
 
 luCommand(
-    "r1", 'vtysh -c "show bgp next"', "99.0.0.. valid", "wait", "See CE static NH"
+    "r1", 'vtysh -c "show bgp nexthop"', "99.0.0.. valid", "wait", "See CE static NH"
 )
 luCommand(
-    "r3", 'vtysh -c "show bgp next"', "99.0.0.. valid", "wait", "See CE static NH"
+    "r3", 'vtysh -c "show bgp nexthop"', "99.0.0.. valid", "wait", "See CE static NH"
 )
 luCommand(
-    "r4", 'vtysh -c "show bgp next"', "99.0.0.. valid", "wait", "See CE static NH"
+    "r4", 'vtysh -c "show bgp nexthop"', "99.0.0.. valid", "wait", "See CE static NH"
 )
 luCommand("r1", 'vtysh -c "show bgp ipv4 uni"', "i 5.*i 5", "wait", "See CE routes")
 luCommand("r3", 'vtysh -c "show bgp ipv4 uni"', "i 5.*i 5", "wait", "See CE routes")
diff --git a/tests/topotests/bgp_peer_group/r1/bgpd.conf b/tests/topotests/bgp_peer_group/r1/bgpd.conf
index 19b490a359..68d8e61a59 100644
--- a/tests/topotests/bgp_peer_group/r1/bgpd.conf
+++ b/tests/topotests/bgp_peer_group/r1/bgpd.conf
@@ -5,4 +5,8 @@ router bgp 65001
   neighbor PG timers 3 10
   neighbor 192.168.255.3 peer-group PG
   neighbor r1-eth0 interface peer-group PG
+  neighbor PG1 peer-group
+  neighbor PG1 remote-as external
+  neighbor PG1 timers 3 20
+  neighbor 192.168.251.2 peer-group PG1
 !
diff --git a/tests/topotests/bgp_peer_group/r1/zebra.conf b/tests/topotests/bgp_peer_group/r1/zebra.conf
index e2c399e536..16fd8c538c 100644
--- a/tests/topotests/bgp_peer_group/r1/zebra.conf
+++ b/tests/topotests/bgp_peer_group/r1/zebra.conf
@@ -2,5 +2,8 @@
 interface r1-eth0
  ip address 192.168.255.1/24
 !
+interface r1-eth1
+ ip address 192.168.251.1/30
+!
 ip forwarding
 !
diff --git a/tests/topotests/bgp_peer_group/r2/bgpd.conf b/tests/topotests/bgp_peer_group/r2/bgpd.conf
index 0880ee9fae..d0e8f017d1 100644
--- a/tests/topotests/bgp_peer_group/r2/bgpd.conf
+++ b/tests/topotests/bgp_peer_group/r2/bgpd.conf
@@ -4,4 +4,8 @@ router bgp 65002
   neighbor PG remote-as external
   neighbor PG timers 3 10
   neighbor r2-eth0 interface peer-group PG
+  neighbor PG1 peer-group
+  neighbor PG1 remote-as external
+  neighbor PG1 timers 3 20
+  neighbor 192.168.251.1 peer-group PG1
 !
diff --git a/tests/topotests/bgp_peer_group/r2/zebra.conf b/tests/topotests/bgp_peer_group/r2/zebra.conf
index 606c17bec9..c2ad956c9c 100644
--- a/tests/topotests/bgp_peer_group/r2/zebra.conf
+++ b/tests/topotests/bgp_peer_group/r2/zebra.conf
@@ -2,5 +2,8 @@
 interface r2-eth0
  ip address 192.168.255.2/24
 !
+interface r2-eth1
+ ip address 192.168.251.2/30
+!
 ip forwarding
 !
diff --git a/tests/topotests/bgp_peer_group/test_bgp_peer-group.py b/tests/topotests/bgp_peer_group/test_bgp_peer-group.py
index a91fade049..5cbcd19be9 100644
--- a/tests/topotests/bgp_peer_group/test_bgp_peer-group.py
+++ b/tests/topotests/bgp_peer_group/test_bgp_peer-group.py
@@ -22,7 +22,7 @@ sys.path.append(os.path.join(CWD, "../"))
 # pylint: disable=C0413
 from lib import topotest
 from lib.topogen import Topogen, TopoRouter, get_topogen
-
+from lib.topolog import logger
 
 pytestmark = [pytest.mark.bgpd]
 
@@ -36,6 +36,10 @@ def build_topo(tgen):
     switch.add_link(tgen.gears["r2"])
     switch.add_link(tgen.gears["r3"])
 
+    switch = tgen.add_switch("s2")
+    switch.add_link(tgen.gears["r1"])
+    switch.add_link(tgen.gears["r2"])
+
 
 def setup_module(mod):
     tgen = Topogen(build_topo, mod.__name__)
@@ -70,6 +74,7 @@ def test_bgp_peer_group():
         expected = {
             "r1-eth0": {"peerGroup": "PG", "bgpState": "Established"},
             "192.168.255.3": {"peerGroup": "PG", "bgpState": "Established"},
+            "192.168.251.2": {"peerGroup": "PG1", "bgpState": "Established"},
         }
         return topotest.json_cmp(output, expected)
 
@@ -96,6 +101,48 @@ def test_bgp_peer_group():
     assert result is None, "Failed checking advertised routes from r3"
 
 
+def test_bgp_peer_group_remote_as_del_readd():
+    tgen = get_topogen()
+
+    if tgen.routers_have_failure():
+        pytest.skip(tgen.errors)
+
+    r1 = tgen.gears["r1"]
+    logger.info("Remove bgp peer-group PG1 remote-as neighbor should be retained")
+    r1.cmd(
+        'vtysh -c "config t" -c "router bgp 65001" '
+        + ' -c "no neighbor PG1 remote-as external" '
+    )
+
+    def _bgp_peer_group_remoteas_del():
+        output = json.loads(tgen.gears["r1"].vtysh_cmd("show bgp neighbor json"))
+        expected = {
+            "192.168.251.2": {"peerGroup": "PG1", "bgpState": "Active"},
+        }
+        return topotest.json_cmp(output, expected)
+
+    test_func = functools.partial(_bgp_peer_group_remoteas_del)
+    _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+    assert result is None, "Failed bgp convergence in r1"
+
+    logger.info("Re-add bgp peer-group PG1 remote-as neighbor should be established")
+    r1.cmd(
+        'vtysh -c "config t" -c "router bgp 65001" '
+        + ' -c "neighbor PG1 remote-as external" '
+    )
+
+    def _bgp_peer_group_remoteas_add():
+        output = json.loads(tgen.gears["r1"].vtysh_cmd("show bgp neighbor json"))
+        expected = {
+            "192.168.251.2": {"peerGroup": "PG1", "bgpState": "Established"},
+        }
+        return topotest.json_cmp(output, expected)
+
+    test_func = functools.partial(_bgp_peer_group_remoteas_add)
+    _, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+    assert result is None, "Failed bgp convergence in r1"
+
+
 if __name__ == "__main__":
     args = ["-s"] + sys.argv[1:]
     sys.exit(pytest.main(args))
diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 2f69f7364b..985ba536dd 100644
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -1296,6 +1296,8 @@ def fix_netns_limits(ns):
 
     sysctl_assure(ns, "net.ipv4.conf.all.ignore_routes_with_linkdown", 1)
     sysctl_assure(ns, "net.ipv6.conf.all.ignore_routes_with_linkdown", 1)
+    sysctl_assure(ns, "net.ipv4.conf.default.ignore_routes_with_linkdown", 1)
+    sysctl_assure(ns, "net.ipv6.conf.default.ignore_routes_with_linkdown", 1)
 
     # igmp
     sysctl_atleast(ns, "net.ipv4.igmp_max_memberships", 1000)