From c4901896a59e6d7e210ef20f13b434acdfa8f018 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 14 Jan 2021 17:33:17 +0100
Subject: bgp: T2174: enable new implementation

---
 Makefile                                   | 1 -
 interface-definitions/protocols-bgp.xml.in | 2 +-
 src/conf_mode/protocols_bgp.py             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 11e96d25a..0fd23f713 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ interface_definitions: $(config_xml_obj)
 	rm -f $(TMPL_DIR)/firewall/node.def
 	rm -f $(TMPL_DIR)/interfaces/node.def
 	rm -f $(TMPL_DIR)/protocols/node.def
-	rm -rf $(TMPL_DIR)/protocols/nbgp
 	rm -f $(TMPL_DIR)/protocols/static/node.def
 	rm -f $(TMPL_DIR)/policy/node.def
 	rm -f $(TMPL_DIR)/system/node.def
diff --git a/interface-definitions/protocols-bgp.xml.in b/interface-definitions/protocols-bgp.xml.in
index f152021fb..61bc6ce86 100644
--- a/interface-definitions/protocols-bgp.xml.in
+++ b/interface-definitions/protocols-bgp.xml.in
@@ -3,7 +3,7 @@
 <interfaceDefinition>
   <node name="protocols">
     <children>
-      <tagNode name="nbgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py">
+      <tagNode name="bgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py">
         <properties>
           <help>Border Gateway Protocol (BGP) parameters</help>
           <valueHelp>
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index a511b10ff..e77b1fc28 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -31,7 +31,7 @@ config_file = r'/tmp/bgp.frr'
 
 def get_config():
     conf = Config()
-    base = ['protocols', 'nbgp']
+    base = ['protocols', 'bgp']
     bgp = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
 
     if not conf.exists(base):
-- 
cgit v1.2.3