summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2009-07-07 16:30:19 -0700
committerBob Gilligan <gilligan@vyatta.com>2009-07-07 16:33:04 -0700
commitcd9803460b4d14ba22e1e34c995bf46ed9534e44 (patch)
tree6b39ae6f2ee9272e3d1ffd1d4a976acafa7ad17b
parent600566b3515014c260894068b3b20284d1f01091 (diff)
downloadvyatta-cfg-quagga-cd9803460b4d14ba22e1e34c995bf46ed9534e44.tar.gz
vyatta-cfg-quagga-cd9803460b4d14ba22e1e34c995bf46ed9534e44.zip
Bugfix 4546: Re-structure to avoid nested "end" field.
-rw-r--r--interface-templates/ip/ospf/authentication/md5/key-id/node.def14
-rw-r--r--interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def13
2 files changed, 17 insertions, 10 deletions
diff --git a/interface-templates/ip/ospf/authentication/md5/key-id/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.def
index 8f6d90ca..5ff617e6 100644
--- a/interface-templates/ip/ospf/authentication/md5/key-id/node.def
+++ b/interface-templates/ip/ospf/authentication/md5/key-id/node.def
@@ -1,19 +1,13 @@
tag:
+
type: u32
+
help: Set MD5 key id
+
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
+
commit:expression: $VAR(md5-key/) != ""; \
"Must add the md5-key for key-id $VAR(@)"
-delete:touch /tmp/ospf-md5.$PPID
-
-end: if [ -f /tmp/ospf-md5.$PPID ]; then
- vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
- -c "no ip ospf message-digest-key $VAR(@)"
- rm -f /tmp/ospf-md5.$PPID
- else
- vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
- -c "ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)"
- fi
comp_help: possible completions:
<1-255> Set the key id
diff --git a/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
index b928e426..24f96906 100644
--- a/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
@@ -1,5 +1,18 @@
type: txt
+
help: Set md5 key
+
syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$"; "MD5 key must be 16 characters or less"
+
comp_help: possible completions:
<text> MD5 Key (16 characters or less)
+
+# If this node is created or its value changed
+update:
+ vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "ip ospf message-digest-key $VAR(../@) md5 $VAR(@)"
+
+# If this node is deleted
+delete:
+ vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "no ip ospf message-digest-key $VAR(../@)"