Merge pull request #27 from ruben-herold/current

12 files changed, 45 insertions, 16 deletions

diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def
index a41fc20d..c2a810e4 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.def
@@ -1,8 +1,9 @@
 tag:
-type: ipv4, ipv6
+type: txt
 help: BGP neighbor
-val_help: ipv4; BGP neighbor IP address
-val_help: ipv6; BGP neighbor IPv6 address
+val_help: txt; BGP neighbor IP address
+val_help: txt; BGP neighbor IPv6 address
+val_help: txt; Interface name
 
 syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
-                           --check-neighbor-ip --neighbor $VAR(@)"
+                           --check-neighbor-ip --neighbor $VAR(@)" 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/extended-nexthop/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/extended-nexthop/node.def
new file mode 100644
index 00000000..dcc3cef6
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/capability/extended-nexthop/node.def
@@ -0,0 +1 @@
+help: Advertise extended-nexthop capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def
index 4f49f816..41ecd0d7 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/node.def
@@ -1,2 +1 @@
-type: txt
-help: Network interface to use for the BGP session
+help: interface parameters
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/peer-group/node.def
new file mode 100644
index 00000000..cbad3a03
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/peer-group/node.def
@@ -0,0 +1,6 @@
+type: txt
+help: 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/interface/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/remote-as/node.def
new file mode 100644
index 00000000..61cd13a0
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/remote-as/node.def
@@ -0,0 +1,6 @@
+type: txt
+help: Neighbor BGP AS number [REQUIRED]
+val_help: txt: 1-4294967294; Neighbor AS number
+val_help: txt: external; except that if the peers ASN is different than mine
+val_help: txt: internal; except that if the peers ASN is the same as mine
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)" 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/node.def
new file mode 100644
index 00000000..0c454278
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/node.def
@@ -0,0 +1 @@
+help: Enable BGP with v6 link-local only 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/peer-group/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/peer-group/node.def
new file mode 100644
index 00000000..5a5257e2
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/peer-group/node.def
@@ -0,0 +1,6 @@
+type: txt
+help: 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/interface/v6only/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/remote-as/node.def
new file mode 100644
index 00000000..61cd13a0
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/remote-as/node.def
@@ -0,0 +1,6 @@
+type: txt
+help: Neighbor BGP AS number [REQUIRED]
+val_help: txt: 1-4294967294; Neighbor AS number
+val_help: txt: external; except that if the peers ASN is different than mine
+val_help: txt: internal; except that if the peers ASN is the same as mine
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)" 
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
index 5e1a2447..61cd13a0 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def
@@ -1,6 +1,6 @@
-type: u32
+type: txt
 help: Neighbor BGP AS number [REQUIRED]
-val_help: u32: 1-4294967294; Neighbor AS number
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; \
-                   "remote-as must be between 1 and 4294967294"
-commit:expression: $VAR(@) != $VAR(../../@); "remote-as and router AS can\'t be the same value"
+val_help: txt: 1-4294967294; Neighbor AS number
+val_help: txt: external; except that if the peers ASN is different than mine
+val_help: txt: internal; except that if the peers ASN is the same as mine
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)" 
diff --git a/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/multipath-relax/node.def b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/multipath-relax/node.def
new file mode 100644
index 00000000..08570159
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/parameters/bestpath/as-path/multipath-relax/node.def
@@ -0,0 +1 @@
+help: specifies that BGP decision process should consider paths of equal AS_PATH length candidates for multipath computation 
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/extended-nexthop/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/extended-nexthop/node.def
new file mode 100644
index 00000000..dcc3cef6
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/capability/extended-nexthop/node.def
@@ -0,0 +1 @@
+help: Advertise extended-nexthop capability to this neighbor
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def
index ab3913c7..61cd13a0 100644
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def
@@ -1,5 +1,6 @@
-type: u32
-help: Peer-group BGP AS number [REQUIRED]
-val_help: u32:1-4294967294; AS number
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; \
-                   "remote-as must be between 1 and 4294967294"
+type: txt
+help: Neighbor BGP AS number [REQUIRED]
+val_help: txt: 1-4294967294; Neighbor AS number
+val_help: txt: external; except that if the peers ASN is different than mine
+val_help: txt: internal; except that if the peers ASN is the same as mine
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)"