summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-01-16 14:55:48 +0100
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-01-16 14:05:53 +0000
commit93dc024fccd1b653428f7fe9a1faa4f8e6ba7248 (patch)
tree6af3dada0cd814a1669a3ec11d320de37e4caaaf /src/conf_mode
parentb2fbff135fe4b83093b36927a8dcaa43ba4ecb9a (diff)
downloadvyos-1x-93dc024fccd1b653428f7fe9a1faa4f8e6ba7248.tar.gz
vyos-1x-93dc024fccd1b653428f7fe9a1faa4f8e6ba7248.zip
bgp: T5937: fix migration script for IPv6 AFI peer-group
Migrate "bgp <ASN> neighbor <NEIGH> address-family ipv6-unicast peer-group" to "bgp neighbor <NEIGH> peer-group" (cherry picked from commit 9febed1344e93815dc3a94047daa69967c3af160)
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/protocols_bgp.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index e8bb11828..f6f3370c3 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -220,9 +220,12 @@ def verify_afi(peer_config, bgp_config):
# If address_family configured under peer-group
# if neighbor interface configured
- peer_group_name = ''
+ peer_group_name = None
if dict_search('interface.peer_group', peer_config):
peer_group_name = peer_config['interface']['peer_group']
+ elif dict_search('interface.v6only.peer_group', peer_config):
+ peer_group_name = peer_config['interface']['v6only']['peer_group']
+
# if neighbor IP configured.
if 'peer_group' in peer_config:
peer_group_name = peer_config['peer_group']