remove old style type config from bgp and policy templates

16 files changed, 16 insertions, 16 deletions

diff --git a/templates/policy/prefix-list/node.tag/rule/node.def b/templates/policy/prefix-list/node.tag/rule/node.def
index 55c1e70c..12a6bfb3 100644
--- a/templates/policy/prefix-list/node.tag/rule/node.def
+++ b/templates/policy/prefix-list/node.tag/rule/node.def
@@ -1,5 +1,5 @@
 tag:
-type: u32; "prefix-list rule number must be an integer"
+type: u32
 help: "Specify prefix-list rule number"
 delete: "touch /tmp/protocols-$(../@)-$(@).\\$PPID \
          LEN=`echo $(@) | awk -F/ '{ print \\$2 }'` ; \
diff --git a/templates/policy/prefix-list/node.tag/rule/node.tag/prefix/node.def b/templates/policy/prefix-list/node.tag/rule/node.tag/prefix/node.def
index 089e6dd6..5da0b4f5 100644
--- a/templates/policy/prefix-list/node.tag/rule/node.tag/prefix/node.def
+++ b/templates/policy/prefix-list/node.tag/rule/node.tag/prefix/node.def
@@ -1,2 +1,2 @@
-type: ipv4net; "prefix-list $(../../@) rule $(../@) prefix: must be an IPv4 prefix"
+type: ipv4net
 help: "Prefix to match against this rule"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
index dafc37e2..db104da3 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/metric/node.def
@@ -1,4 +1,4 @@
-type: u32; "route-map $(../../../@) $(../../action/@) $(../../@) metric: must be an integer"
+type: u32
 help: "Match metric of route"
 commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
 create: "/usr/bin/vtysh -c \"configure terminal\" \
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
index 5f18167a..9691282e 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/set/as-path-prepend/node.def
@@ -1,4 +1,4 @@
-type: txt;
+type: txt
 help: "Prepend string for a BGP AS-path attribute"
 commit: $(../../action/@) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
 create: "/usr/bin/vtysh -c \"configure terminal\" \
diff --git a/templates/protocols/bgp/node.tag/aggregate-address/node.def b/templates/protocols/bgp/node.tag/aggregate-address/node.def
index 63c6fe0c..5094bd84 100644
--- a/templates/protocols/bgp/node.tag/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/aggregate-address/node.def
@@ -1,5 +1,5 @@
 tag:
-type: ipv4net; "aggregate-entry must be and IPv4 network"
+type: ipv4net
 help: "Configure BGP aggregate entries"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $(@)"
 delete: "touch /tmp/`echo $(@) | sed 's!/!!'`.\\$PPID" 
diff --git a/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def b/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def
index ba15ece1..624b9ad1 100644
--- a/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/cluster-id/node.def
@@ -1,4 +1,4 @@
-type: ipv4; "protocols bgp $(../../) cluster-id must be and IPv4 address"
+type: ipv4
 help: "Configure route-reflector cluster-id\n"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp cluster-id $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def b/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def
index eee4fa65..5e73a0b6 100644
--- a/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/confederation/identifier/node.def
@@ -1,4 +1,4 @@
-type: u32; "protocols bgp $(../../../) confederation identifier must be a u32"
+type: u32
 help: "Configure confederation AS id"
 syntax: $(@) >= 1 && $(@) <= 65535; "confederation AS id must be between 1 and 65535"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def b/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def
index 4f28ec13..e82b3239 100644
--- a/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/confederation/peers/node.def
@@ -1,5 +1,5 @@
 multi:
-type: u32; "protocols bgp $(../../../@) confederation peer must be a u32"
+type: u32
 help: "Peer ASs in BGP confederation"
 syntax: $(@) >= 1 && $(@) <= 65535; "confederation AS id must be between 1 and 65535"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/dampening/half-life/node.def b/templates/protocols/bgp/node.tag/bgp/dampening/half-life/node.def
index dbff0dcf..aa710acf 100644
--- a/templates/protocols/bgp/node.tag/bgp/dampening/half-life/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/dampening/half-life/node.def
@@ -1,3 +1,3 @@
-type: u32; "protocols bgp $(../../../@) dampening half-life must be a u32"
+type: u32
 help: "Half-life time for the penalty"
 syntax: $(@) >= 1 && $(@) <= 45; "Half-life penalty must be between 1 and 45"
diff --git a/templates/protocols/bgp/node.tag/bgp/dampening/max-suppress-time/node.def b/templates/protocols/bgp/node.tag/bgp/dampening/max-suppress-time/node.def
index 5ae075e2..1231e799 100644
--- a/templates/protocols/bgp/node.tag/bgp/dampening/max-suppress-time/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/dampening/max-suppress-time/node.def
@@ -1,4 +1,4 @@
-type: u32; "protocols bgp $(../../../@) dampening max-suppress-time must be a u32"
+type: u32
 help: "Maximum duration to suppress a stable route"
 syntax: $(@) >= 1 && $(@) <= 255; "Max-suppress-time must be between 1 and 255"
 commit: $(../re-use/@) != ""; "Re-use value must be set"
diff --git a/templates/protocols/bgp/node.tag/bgp/dampening/re-use/node.def b/templates/protocols/bgp/node.tag/bgp/dampening/re-use/node.def
index 0555c81f..60a4cd8b 100644
--- a/templates/protocols/bgp/node.tag/bgp/dampening/re-use/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/dampening/re-use/node.def
@@ -1,4 +1,4 @@
-type: u32; "protocols bgp $(../../../@) dampening re-use must be a u32"
+type: u32
 help: "Value to start reusing a route"
 syntax: $(@) >= 1 && $(@) <= 20000; "Re-use value must be between 1 and 20000"
 commit: $(../start-suppress-time/@) != ""; "Start-suppress-time must be set"
diff --git a/templates/protocols/bgp/node.tag/bgp/dampening/start-suppress-time/node.def b/templates/protocols/bgp/node.tag/bgp/dampening/start-suppress-time/node.def
index 07f8e566..d2cc069c 100644
--- a/templates/protocols/bgp/node.tag/bgp/dampening/start-suppress-time/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/dampening/start-suppress-time/node.def
@@ -1,4 +1,4 @@
-type: u32; "protocols bgp $(../../../@) dampening start-suppress-time must be a u32"
+type: u32
 help: "Value to start suppressing a route"
 syntax: $(@) >= 1 && $(@) <= 20000; "Start-suppress-time must be between 1 and 20000"
 commit: $(../re-use/@) != ""; "Re-use value must be set"
diff --git a/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def b/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def
index 538dbb23..82d8e95d 100644
--- a/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/default/local-pref/node.def
@@ -1,4 +1,4 @@
-type: u32; "protocols bgp $(../../../@) bgp default local-pref must be a u32"
+type: u32
 help: "Local preference (higher=more preferred)"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
            -c \"bgp default local-preference $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def b/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def
index 36e7791b..c7ddd5ae 100644
--- a/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/graceful-restart/stalepath-time/node.def
@@ -1,4 +1,4 @@
-type: u32; "protocols bgp $(../../../@) bgp graceful-restart stalepath-time must be a u32"
+type: u32
 help: "Set the max time in seconds to hold onto restarting peer's stale paths"
 syntax: $(@) >= 1 && $(@) <= 3600; "stalepath-time must be between 1 and 3600"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../../@)\" \
diff --git a/templates/protocols/bgp/node.tag/bgp/router-id/node.def b/templates/protocols/bgp/node.tag/bgp/router-id/node.def
index 9e74bc4f..accb7677 100644
--- a/templates/protocols/bgp/node.tag/bgp/router-id/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/router-id/node.def
@@ -1,4 +1,4 @@
-type: ipv4; "protocols bgp $(../../@) bgp router-id must be an IPv4 address"
+type: ipv4
 help: "Override configured router identifier"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \
            -c \"bgp router-id $(@)\" "
diff --git a/templates/protocols/bgp/node.tag/bgp/scan-time/node.def b/templates/protocols/bgp/node.tag/bgp/scan-time/node.def
index d0886846..45637e06 100644
--- a/templates/protocols/bgp/node.tag/bgp/scan-time/node.def
+++ b/templates/protocols/bgp/node.tag/bgp/scan-time/node.def
@@ -1,4 +1,4 @@
-type: u32; "protocols bgp $(../../@) bgp scan-time must be a u32"
+type: u32
 syntax: $(@) >= 5 && $(@) <= 60; "scan-time must be between 5 and 60 seconds"
 help: "Configure background scanner interval"
 create: "/usr/bin/vtysh -c \"configure terminal\" -c \"router bgp $(../../@)\" \