From 5b0c7bbf8c82a0e68462e035add6a3c9da988b29 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Tue, 19 Dec 2023 06:51:42 +0100 Subject: smoketest: bgp: T4163: add explicit timeout when starting BMP (cherry picked from commit 259a3d637081fad9f86a8edb39814d8f0fbf7b95) --- smoketest/scripts/cli/test_protocols_bgp.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py index 8102a3153..4697d4970 100755 --- a/smoketest/scripts/cli/test_protocols_bgp.py +++ b/smoketest/scripts/cli/test_protocols_bgp.py @@ -15,7 +15,9 @@ # along with this program. If not, see . import unittest + from subprocess import run +from time import sleep from base_vyostest_shim import VyOSUnitTestSHIM @@ -1160,13 +1162,12 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): mirror_buffer = '32000000' bmp_path = base_path + ['bmp'] target_path = bmp_path + ['target', target_name] - bgpd_bmp_pid = process_named_running('bgpd', 'bmp') command = ['/opt/vyatta/bin/vyatta-op-cmd-wrapper', 'restart', 'bgp'] self.cli_set(bmp_path) # by default the 'bmp' module not loaded for the bgpd # expect Error - if not bgpd_bmp_pid: + if not process_named_running('bgpd', 'bmp'): with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -1174,8 +1175,12 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): self.cli_delete(bmp_path) self.cli_set(['system', 'frr', 'bmp']) self.cli_commit() + # restart bgpd to apply "-M bmp" and update PID run(command, input='Y', text=True) + # let the bgpd process recover + sleep(10) + # update daemon PID - this was a planned daemon restart self.daemon_pid = process_named_running(PROCESS_NAME) # set bmp config but not set address -- cgit v1.2.3 From c0fbfe8aea4ca0cc5c39638db8e58f648c662b3c Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Tue, 19 Dec 2023 06:59:48 +0100 Subject: smoketest: bgp: T4163: use explicit kill to respawn bgpd process (cherry picked from commit b873112dd7253b64d323e183758dbabaa0f28b6e) --- smoketest/scripts/cli/test_protocols_bgp.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py index 4697d4970..ebc9eeaaa 100755 --- a/smoketest/scripts/cli/test_protocols_bgp.py +++ b/smoketest/scripts/cli/test_protocols_bgp.py @@ -16,7 +16,6 @@ import unittest -from subprocess import run from time import sleep from base_vyostest_shim import VyOSUnitTestSHIM @@ -25,6 +24,7 @@ from vyos.ifconfig import Section from vyos.configsession import ConfigSessionError from vyos.template import is_ipv6 from vyos.utils.process import process_named_running +from vyos.utils.process import cmd PROCESS_NAME = 'bgpd' ASN = '64512' @@ -1162,11 +1162,9 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): mirror_buffer = '32000000' bmp_path = base_path + ['bmp'] target_path = bmp_path + ['target', target_name] - command = ['/opt/vyatta/bin/vyatta-op-cmd-wrapper', 'restart', 'bgp'] + # by default the 'bmp' module not loaded for the bgpd expect Error self.cli_set(bmp_path) - # by default the 'bmp' module not loaded for the bgpd - # expect Error if not process_named_running('bgpd', 'bmp'): with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -1177,7 +1175,7 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase): self.cli_commit() # restart bgpd to apply "-M bmp" and update PID - run(command, input='Y', text=True) + cmd(f'sudo kill -9 {self.daemon_pid}') # let the bgpd process recover sleep(10) # update daemon PID - this was a planned daemon restart -- cgit v1.2.3