From 890c9e8984c6b4eeef7ee277c88777416e1fb340 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 16 Jun 2019 15:13:21 +0200
Subject: T849: move BGP peer-group node to ipv4 address family

To have a consitent IPv4/IPv6 CLI a lot of BGP neighbor nodes have been
migrated. The IPv4 peer-group has been forgotten, leaving a non consistent CLI.

Previously:
-----------

neighbor 2001:DB8:FFFF::1 {
     address-family {
         ipv6-unicast {
             peer-group iBGP
         }
     }
     peer-group iBGP
}

Now:
----

neighbor 2001:DB8:FFFF::1 {
     address-family {
         ipv6-unicast {
             peer-group iBGP
         }
     }
     address-family {
         ipv4-unicast {
             peer-group iBGP
         }
     }
}
---
 .../node.tag/address-family/ipv4-unicast/peer-group/node.def        | 6 ++++++
 .../protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def    | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def
 delete mode 100644 templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def

(limited to 'templates/protocols')

diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def
new file mode 100644
index 00000000..5da142d6
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/address-family/ipv4-unicast/peer-group/node.def
@@ -0,0 +1,6 @@
+type: txt
+help: IPv4 peer group for this peer
+allowed: local -a params
+        params=$( /opt/vyatta/sbin/vyatta-bgp.pl --list-peer-groups --as $VAR(../../@) )
+        echo -n ${params[@]##*/}
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../@) peer-group $VAR(@)\" "; "protocols bgp $VAR(../../@) peer-group $VAR(@) doesn't exist"
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
deleted file mode 100644
index 5da142d6..00000000
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/peer-group/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: IPv4 peer group for this peer
-allowed: local -a params
-        params=$( /opt/vyatta/sbin/vyatta-bgp.pl --list-peer-groups --as $VAR(../../@) )
-        echo -n ${params[@]##*/}
-commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"protocols bgp $VAR(../../@) peer-group $VAR(@)\" "; "protocols bgp $VAR(../../@) peer-group $VAR(@) doesn't exist"
-- 
cgit v1.2.3