Fix 2805 'show configuration all' does not display all default values for ospf

5 files changed, 30 insertions, 25 deletions

diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
index 3b940cf3..78005e38 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Interval after which a neighbor is declared dead
+default: 40
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@)\" \
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf dead-interval \"; "
 comp_help: possible completions:
- <1-65535>          Seconds
+ <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
index e3676ffa..3ae56a7f 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Interval between HELLO packets
+default: 10
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@) \" \
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl               \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
        -c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@) \" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl               \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@) \" \
        -c \"no ip ospf hello-interval \"; "
 comp_help: possible completions:
- <1-65535>          Seconds
+ <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
index 94e4522b..7224417b 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Router priority
+default: 1
 syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@)\" \
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf priority \"; "
 comp_help: possible completions:
- <0-255>            Priority
+ <0-255>            Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
index 56e8a243..90205584 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Interval between retransmitting lost link state advertisements
+default: 5
 syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@)\" \
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf retransmit-interval \"; "
 comp_help: possible completions:
- <3-65535>          Seconds
+ <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
index c53c775d..39ba835f 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
+++ b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
@@ -1,11 +1,12 @@
 type: u32
 help: Link state transmit delay
+default: 1
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@)\" \
+update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" \
-       -c \"interface $VAR(../../../@)\" \
+delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl              \
+       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
        -c \"no ip ospf transmit-delay \"; "
 comp_help: possible completions:
- <1-65535>          Seconds
+ <1-65535>          Seconds (default 1)