summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--interface-templates/ipv6/ospfv3/cost/node.def2
-rw-r--r--templates/protocols/ospf/area/node.tag/network/node.def11
-rw-r--r--templates/protocols/ospf/passive-interface/node.def6
3 files changed, 5 insertions, 14 deletions
diff --git a/interface-templates/ipv6/ospfv3/cost/node.def b/interface-templates/ipv6/ospfv3/cost/node.def
index cee09b44..8640f859 100644
--- a/interface-templates/ipv6/ospfv3/cost/node.def
+++ b/interface-templates/ipv6/ospfv3/cost/node.def
@@ -1,7 +1,7 @@
type: u32
help: Set interface cost
+default: 1
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 cost $VAR(@)"
-delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 cost"
comp_help: possible completions:
<1-65535> Set cost
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index 17648610..6f8e69d6 100644
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ b/templates/protocols/ospf/area/node.tag/network/node.def
@@ -1,11 +1,8 @@
multi:
type: ipv4net
help: Set OSPF network
-priority: 1
syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
-create:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"network $VAR(@) area $VAR(../@)\"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"router ospf\" \
- -c \"no network $VAR(@) area $VAR(../@)\"; "
+update:vyatta-vtysh -c "configure terminal" \
+ -c "router ospf" -c "network $VAR(@) area $VAR(../@)"
+delete:vyatta-vtysh -c "configure terminal" \
+ -c "router ospf" -c "no network $VAR(@) area $VAR(../@)"
diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def
index d82edd03..b469f1c7 100644
--- a/templates/protocols/ospf/passive-interface/node.def
+++ b/templates/protocols/ospf/passive-interface/node.def
@@ -1,12 +1,6 @@
multi:
type: txt
help: Set to suppress routing updates on an interface
-
-commit:expression: exec "${vyatta_sbindir}/vyatta-interfaces.pl \
- --check all --dev $VAR(@) 2> /dev/null || \
- [ x$VAR(@) == xdefault ]"; \
- "$VAR(@) is not 'default' or a known interface name"
-
allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default
update: if [ -z $VAR(@) ]
then vyatta-vtysh -c "configure terminal" -c "router ospf" \