summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_bgp.py
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-12-13 13:07:16 +0100
committerGitHub <noreply@github.com>2023-12-13 13:07:16 +0100
commitfd74eb2e388308b9bd50ccc4236d53baa53a8da2 (patch)
tree4f3be6ea2a1d80f3795bec344af85e680ced2545 /src/conf_mode/protocols_bgp.py
parent6b18f0d0bd6d688b84d54aec8f5a46687c7317f6 (diff)
parent5904a4163d004561b8cb51ad76212a841ce85832 (diff)
downloadvyos-1x-fd74eb2e388308b9bd50ccc4236d53baa53a8da2.tar.gz
vyos-1x-fd74eb2e388308b9bd50ccc4236d53baa53a8da2.zip
Merge pull request #2626 from vyos/mergify/bp/sagitta/pr-2606
SRv6: T591: initial implementation to support locator definition (backport #2606)
Diffstat (limited to 'src/conf_mode/protocols_bgp.py')
-rwxr-xr-xsrc/conf_mode/protocols_bgp.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index 00015023c..557f0a9e9 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -93,6 +93,7 @@ def get_config(config=None):
tmp = conf.get_config_dict(['policy'])
# Merge policy dict into "regular" config dict
bgp = dict_merge(tmp, bgp)
+
return bgp