From 26d5202b151cf966d291543bc2ca2d70d8f57036 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 22 Jan 2021 16:29:54 +0100
Subject: bgp: T1875: support processing by vyos-configd

---
 data/configd-include.json      |  1 +
 src/conf_mode/protocols_bgp.py | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/data/configd-include.json b/data/configd-include.json
index eb1dd13f9..8369f0e13 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -30,6 +30,7 @@
 "nat.py",
 "ntp.py",
 "policy-local-route.py",
+"protocols_bgp.py",
 "protocols_igmp.py",
 "protocols_isis.py",
 "protocols_mpls.py",
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index 2a1e5f50a..41d89e03b 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -30,6 +30,7 @@ from vyos import airbag
 airbag.enable()
 
 config_file = r'/tmp/bgp.frr'
+frr_daemon = 'bgpd'
 
 DEBUG = os.path.exists('/tmp/bgp.debug')
 if DEBUG:
@@ -39,11 +40,15 @@ if DEBUG:
     ch = logging.StreamHandler()
     lg.addHandler(ch)
 
-def get_config():
-    conf = Config()
+def get_config(config=None):
+    if config:
+        conf = config
+    else:
+        conf = Config()
     base = ['protocols', 'bgp']
     bgp = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
 
+    # Bail out early if configuration tree does not exist
     if not conf.exists(base):
         return bgp
 
@@ -160,7 +165,7 @@ def generate(bgp):
 def apply(bgp):
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
-    frr_cfg.load_configuration(daemon='bgpd')
+    frr_cfg.load_configuration(frr_daemon)
     frr_cfg.modify_section(f'router bgp \S+', '')
     frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', bgp['new_frr_config'])
 
@@ -178,13 +183,13 @@ def apply(bgp):
         print(f'Modified config:\n')
         print(f'{frr_cfg}')
 
-    frr_cfg.commit_configuration(daemon='bgpd')
+    frr_cfg.commit_configuration(frr_daemon)
 
     # If FRR config is blank, rerun the blank commit x times due to frr-reload
     # behavior/bug not properly clearing out on one commit.
     if bgp['new_frr_config'] == '':
         for a in range(5):
-            frr_cfg.commit_configuration(daemon='bgpd')
+            frr_cfg.commit_configuration(frr_daemon)
 
 
     return None
-- 
cgit v1.2.3