From 9aa03c88b12a431df06d876caabc59ce703b346e Mon Sep 17 00:00:00 2001
From: DmitriyEshenko <dmitriy.eshenko@vyos.io>
Date: Fri, 17 Jan 2020 19:03:31 +0000
Subject: bgp: T1967: Change syntax for FRR, use enforce-first-as per neighbor

---
 scripts/bgp/vyatta-bgp.pl                                           | 6 +++---
 .../bgp/node.tag/neighbor/node.tag/enforce-first-as/node.def        | 1 +
 .../protocols/bgp/node.tag/parameters/enforce-first-as/node.def     | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 templates/protocols/bgp/node.tag/neighbor/node.tag/enforce-first-as/node.def
 delete mode 100644 templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def

diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 9a816344..5d182318 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -736,9 +736,9 @@ my %qcom = (
       set => 'router bgp #3 ; distance #9 #7 ',
       del => 'router bgp #3 ; no distance #9 #7',
   },
-  'protocols bgp var parameters enforce-first-as' => {
-      set => 'router bgp #3 ; bgp enforce-first-as',
-      del => 'router bgp #3 ; no bgp enforce-first-as',
+  'protocols bgp var neighbor var enforce-first-as' => {
+      set => 'router bgp #3 ; neighbor #5 enforce-first-as',
+      del => 'router bgp #3 ; no neighbor #5 enforce-first-as',
   },
   'protocols bgp var parameters graceful-restart' => {
       set => undef,
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/enforce-first-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/enforce-first-as/node.def
new file mode 100644
index 00000000..2263b31f
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/enforce-first-as/node.def
@@ -0,0 +1 @@
+help: Require first AS in the path to match peer's AS
diff --git a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def b/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
deleted file mode 100644
index 2263b31f..00000000
--- a/templates/protocols/bgp/node.tag/parameters/enforce-first-as/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Require first AS in the path to match peer's AS
-- 
cgit v1.2.3