summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Xiong <arthur@vyatta.com>2008-03-07 16:12:42 -0800
committerArthur Xiong <arthur@vyatta.com>2008-03-07 16:12:42 -0800
commitd2e6296040ebb45d01764895f8a1bb1b5ab8ad20 (patch)
tree6fabc6816a012c843e26712272fad734b12e4991
parent92b82dcd4b08f03337a0bf06a78dd2fca30fd208 (diff)
parent710e4f9bd7dff504a70b9dd8c65cfefab176d8c6 (diff)
downloadvyatta-cfg-quagga-d2e6296040ebb45d01764895f8a1bb1b5ab8ad20.tar.gz
vyatta-cfg-quagga-d2e6296040ebb45d01764895f8a1bb1b5ab8ad20.zip
Merge branch 'glendale' of git.vyatta.com:/git/vyatta-cfg-quagga into glendale
-rw-r--r--templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def13
-rw-r--r--templates/protocols/ospf/access-list/node.tag/export/node.def2
2 files changed, 14 insertions, 1 deletions
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def
new file mode 100644
index 00000000..318def7e
--- /dev/null
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/metric-type/node.def
@@ -0,0 +1,13 @@
+type: txt
+help: Set OSPF external metric-type
+syntax:expression: $VAR(@) in "type-1", "type-2"; "Must be (type-1, type-2)"
+commit:expression: $VAR(../../action/) != ""; "You must specify an action for route-map $VAR(../../../@) rule $VAR(../../@)"
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)\" \
+ -c \"set metric-type $VAR(@)\" "
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
+ -c \"route-map $VAR(../../../@) $VAR(../../action/@) $VAR(../../@)\" \
+ -c \"no set metric-type \" "
+comp_help: possible completions:
+ type-1 OSPF external type 1 metric
+ type-2 OSPF external type 2 metric
diff --git a/templates/protocols/ospf/access-list/node.tag/export/node.def b/templates/protocols/ospf/access-list/node.tag/export/node.def
index d70f6ded..98e6e169 100644
--- a/templates/protocols/ospf/access-list/node.tag/export/node.def
+++ b/templates/protocols/ospf/access-list/node.tag/export/node.def
@@ -1,5 +1,5 @@
multi:
-type: u32
+type: txt
help: Filter outgoing routing updates
syntax:expression: $VAR(@) in "bgp", "connected", "isis", "kernel", "rip", "static"; "Must be (bgp, connected, isis, kernel, rip, or static)"
create:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \