diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-12 18:30:15 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-11-15 20:23:49 +0100 |
| commit | 6b44aa0692653493b8d0e0c639a4369860ec603f (patch) | |
| tree | 5f162f1b038dd5d7a5cba45b8d594f4075a76f2c /smoketest/scripts/cli/base_vyostest_shim.py | |
| parent | 7b0eaba2d365e5bdf28d74e5b6cca629ff03c5da (diff) | |
| download | vyos-1x-6b44aa0692653493b8d0e0c639a4369860ec603f.tar.gz vyos-1x-6b44aa0692653493b8d0e0c639a4369860ec603f.zip | |
pim: T5733: add missing FRR PIM related features
Migrate CLI configuration retrival to common get_config_dict(). In addition
add new functionality to VyOS that is PIM related and already available in FRR.
(cherry picked from commit 9abc02edcc237760f1f8aa1b3f08d7f4d18f866c)
# Conflicts:
# python/vyos/frr.py
# src/op_mode/restart_frr.py
Diffstat (limited to 'smoketest/scripts/cli/base_vyostest_shim.py')
| -rw-r--r-- | smoketest/scripts/cli/base_vyostest_shim.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/smoketest/scripts/cli/base_vyostest_shim.py b/smoketest/scripts/cli/base_vyostest_shim.py index f694f539d..140642806 100644 --- a/smoketest/scripts/cli/base_vyostest_shim.py +++ b/smoketest/scripts/cli/base_vyostest_shim.py @@ -78,9 +78,10 @@ class VyOSUnitTestSHIM: while run(f'sudo lsof -nP {commit_lock}') == 0: sleep(0.250) - def getFRRconfig(self, string, end='$', endsection='^!', daemon=''): + def getFRRconfig(self, string=None, end='$', endsection='^!', daemon=''): """ Retrieve current "running configuration" from FRR """ - command = f'vtysh -c "show run {daemon} no-header" | sed -n "/^{string}{end}/,/{endsection}/p"' + command = f'vtysh -c "show run {daemon} no-header"' + if string: command += f' | sed -n "/^{string}{end}/,/{endsection}/p"' out = cmd(command) if self.debug: import pprint |