From 9dcf890882ff97d43b12426316e1ed74782e5179 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Fri, 9 Nov 2018 15:02:44 +0100
Subject: T982: move IPv4-specific soft-reconfiguration option to
 "address-family ipv4-unicast" and fix the vtysh commands.

---
 scripts/bgp/vyatta-bgp.pl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 5b443301..a90462ff 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -482,6 +482,14 @@ my %qcom = (
       set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 route-server-client',
       del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 route-server-client',
   },
+  'protocols bgp var neighbor var address-family ipv4-unicast soft-reconfiguration' => {
+      set => undef,
+      del => undef,
+  },
+  'protocols bgp var neighbor var address-family ipv4-unicast soft-reconfiguration inbound' => {
+      set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 soft-reconfiguration inbound',
+      del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 soft-reconfiguration inbound',
+  },
   'protocols bgp var neighbor var remote-as' => {
       set => 'router bgp #3 ; neighbor #5 remote-as #7 ; neighbor #5 activate',
       del => 'router bgp #3 ; no neighbor #5 remote-as #7',
@@ -547,14 +555,6 @@ my %qcom = (
       set => 'router bgp #3 ; neighbor #5 shutdown',
       del => 'router bgp #3 ; no neighbor #5 shutdown',
   },
-  'protocols bgp var neighbor var soft-reconfiguration' => {
-      set => undef,
-      del => undef,
-  },
-  'protocols bgp var neighbor var soft-reconfiguration inbound' => {
-      set => 'router bgp #3 ; neighbor #5 soft-reconfiguration inbound',
-      del => 'router bgp #3 ; no neighbor #5 soft-reconfiguration inbound',
-  },
   'protocols bgp var neighbor var strict-capability-match' => {
       set => 'router bgp #3 ; neighbor #5 strict-capability-match',
       del => 'router bgp #3 ; no neighbor #5 strict-capability-match',
-- 
cgit v1.2.3