summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-07-08 19:30:21 +0200
committerDaniil Baturin <daniil@baturin.org>2019-07-08 19:32:56 +0200
commit7ac4d9e3dbc8c01b17cf1c89675ddf1286338fc2 (patch)
tree6a36e4f34cc4012c48d546320765f46b0b066731
parent8abf1b30555822f4948088db3abf6654a71f7325 (diff)
downloadvyatta-cfg-quagga-7ac4d9e3dbc8c01b17cf1c89675ddf1286338fc2.tar.gz
vyatta-cfg-quagga-7ac4d9e3dbc8c01b17cf1c89675ddf1286338fc2.zip
Improve CLI help for the new BGP remote-as external/internal options.
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.def6
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/interface/remote-as/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/remote-as/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def7
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/remote-as/node.def7
5 files changed, 19 insertions, 15 deletions
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def
index c2a810e4..ac51c00b 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.def
@@ -1,9 +1,9 @@
tag:
type: txt
help: BGP neighbor
-val_help: txt; BGP neighbor IP address
-val_help: txt; BGP neighbor IPv6 address
-val_help: txt; Interface name
+val_help: ipv4; BGP neighbor IP address
+val_help: ipv6; BGP neighbor IPv6 address
+val_help: <interface>; Interface name
syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \
--check-neighbor-ip --neighbor $VAR(@)"
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
index 61cd13a0..80edfd4d 100644
--- 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
@@ -1,6 +1,7 @@
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
+allowed: echo "internal external"
+val_help: u32:1-4294967294; Neighbor AS number
+val_help: external; any AS different from the local AS
+val_help: internal; same as the local AS
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/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/interface/v6only/remote-as/node.def
index 61cd13a0..80edfd4d 100644
--- 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
@@ -1,6 +1,7 @@
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
+allowed: echo "internal external"
+val_help: u32:1-4294967294; Neighbor AS number
+val_help: external; any AS different from the local AS
+val_help: internal; same as the local AS
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 61cd13a0..79939380 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,7 @@
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
+allowed: echo "internal external"
+val_help: u32:1-4294967294; AS number
+val_help: external; any AS different from the local AS
+val_help: internal; same as local AS
syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)"
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 61cd13a0..80edfd4d 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,6 +1,7 @@
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
+allowed: echo "internal external"
+val_help: u32:1-4294967294; Neighbor AS number
+val_help: external; any AS different from the local AS
+val_help: internal; same as the local AS
syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-remote-as $VAR(@)"