diff options
17 files changed, 9 insertions, 26 deletions
diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def index 2a9500e8..999c4d21 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/any/node.def @@ -4,5 +4,4 @@ To set destination filter parameters, the access-list rule number must be \n \ <100-199> IP extended access list \n \ <2000-2699> IP extended access list (expanded range) \n" commit: $(../../action/) != ""; "You must specify an action before committing" -# TODO - comparison not working commit: ($(../host/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def index ba796170..ee9cfe34 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/host/node.def @@ -4,6 +4,5 @@ syntax: ($(../../@) >= 100 && $(../../@) <= 199) || ($(../../@) >= 2000) && $(.. To set destination filter parameters, the access-list rule number must be \n \ <100-199> IP extended access list \n \ <2000-2699> IP extended access list (expanded range) \n" -# TODO - comparison not working commit: ($(../any/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def index 1bcd8278..ef3585a0 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/inverse-mask/node.def @@ -6,5 +6,4 @@ To set destination filter parameters, the access-list rule number must be \n \ <2000-2699> IP extended access list (expanded range) \n" commit: $(../network/) != ""; "You must specify a network before committing" commit: $(../../action/) != ""; "You must specify an action before committing" -# TODO - comparison not working commit: ($(../any/) == "") && ($(../host/) == ""); "You may only define one filter type. (host|network|any)" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def index edf91253..a4479105 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/destination/network/node.def @@ -6,5 +6,4 @@ To set destination filter parameters, the access-list rule number must be \n \ <2000-2699> IP extended access list (expanded range) \n" commit: $(../inverse-mask/) != ""; "You must specify an inverse-mask before committing" commit: $(../../action/) != ""; "You must specify an action before committing" -# TODO - comaprison not working commit: ($(../host/) == "") && ($(../any/) == ""); "You may only define one filter type (host|network|any)" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def index b9ec61a2..09a4a0cc 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/any/node.def @@ -1,4 +1,3 @@ help: "Filter any IP address" -# TODO - comparison not working commit: ($(../host/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def index b4b8d569..f835f45d 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/host/node.def @@ -1,5 +1,4 @@ type: ipv4 help: "Filter a host IP address" -# TODO - comparison not working commit: ($(../any/) == "") && ($(../network/) == ""); "You may only define one filter type. (host|network|any)" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def index a4d80f72..2f068156 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/inverse-mask/node.def @@ -1,6 +1,5 @@ type: ipv4 help: "Filter a network IP netmask" -# TODO - comparison not working commit: ($(../any/) == "") && ($(../host/) == ""); "You may only define one filter type. (host|network|any)" commit: $(../network/) != ""; "You must specify a network before committing" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def index 9d9098cc..55a0a725 100644 --- a/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def +++ b/templates/policy/access-list/node.tag/rule/node.tag/source/network/node.def @@ -1,6 +1,5 @@ type: ipv4 help: "Filter a network IP address" -# TODO - commparison not working commit: ($(../host/) == "") && ($(../any/) == ""); "You may only define one filter type (host|network|any)" commit: $(../inverse-mask/) != ""; "You must specify an inverse-mask before committing" commit: $(../../action/) != ""; "You must specify an action before committing" diff --git a/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def b/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def index f46fd5dd..3c3fa8d1 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/continue/node.def @@ -1,8 +1,7 @@ type: u32 help: "Continue on a different entry within the route-map" syntax: $(@) >= 1 && $(@) <= 65535; "continue must be between 1 and 65535" -# TODO - conditional not working -#syntax: $(@) > $(../../@); "you may only continue forward in the route-map" +syntax: $(@) > $(../../@); "you may only continue forward in the route-map" update: "/usr/bin/vtysh -c \"configure terminal\" -c \"route-map $(../../@) $(../action/@) $(../@)\" \ -c \"continue $(@)\" " diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def index 33c698b1..08f834b7 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def @@ -1,7 +1,6 @@ type: u32 help: "access-list number" -# TODO - comparison not working -#commit: $(../prefix-list/) == ""; "You may only specify a prefix-list or access-list" +commit: $(../prefix-list/) == ""; "You may only specify a prefix-list or access-list" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist" update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../../../@) $(../../../../action/@) $(../../../../@)\" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def index b7870eb4..c1a8cdbb 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def @@ -1,7 +1,6 @@ type: txt help: "prefix-list name" -# TODO - comparison not working -#commit: $(../access-list/) == ""; "You can only specify a prefix-list or access-list" +commit: $(../access-list/) == ""; "You can only specify a prefix-list or access-list" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist" update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../../../@) $(../../../../action/@) $(../../../../@)\" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def index d83479e9..00972d5c 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/access-list/node.def @@ -1,7 +1,6 @@ type: u32 help: "access-list number" -# TODO - comparison not working -#commit: $(../prefix-list/) == ""; "You may only specify a prefix-list or access-list" +commit: $(../prefix-list/) == ""; "You may only specify a prefix-list or access-list" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist" update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../../../@) $(../../../../action/@) $(../../../../@)\" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def index cf8a0844..3f88c51d 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/nexthop/prefix-list/node.def @@ -1,7 +1,6 @@ type: txt help: "prefix-list name" -# TODO - comparison not working -#commit: $(../access-list/) == ""; "You can only specify a prefix-list or access-list" +commit: $(../access-list/) == ""; "You can only specify a prefix-list or access-list" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist" update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../../../@) $(../../../../action/@) $(../../../../@)\" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def index 18b46ebb..c323adbb 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/access-list/node.def @@ -1,7 +1,6 @@ type: u32 help: "access-list number" -# TODO - comparison not working -#commit: $(../prefix-list/) == ""; "You may only specify a prefix-list or access-list" +commit: $(../prefix-list/) == ""; "You may only specify a prefix-list or access-list" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist" update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../../../@) $(../../../../action/@) $(../../../../@)\" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def index c8016bcc..26b7f47d 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/route-source/prefix-list/node.def @@ -1,7 +1,6 @@ type: txt help: "prefix-list name" -# TODO - comparison not working -#commit: $(../access-list/) == ""; "You can only specify a prefix-list or access-list" +commit: $(../access-list/) == ""; "You can only specify a prefix-list or access-list" commit: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist" update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../../../@) $(../../../../action/@) $(../../../../@)\" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def index deaa79b7..d519dfbb 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/goto/node.def @@ -1,7 +1,6 @@ type: u32 help: "Goto sequence number" -# TODO - comparison doesn't work -#syntax: $(../next/) == ""; "you can set only goto or next" +syntax: $(../next/) == ""; "you can set only goto or next" syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535" commit: $(../../action/) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" update: "/usr/bin/vtysh -c \"configure terminal\" \ diff --git a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def index 839a5c37..43a66465 100644 --- a/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def +++ b/templates/policy/route-map/node.tag/rule/node.tag/on-match/next/node.def @@ -1,6 +1,5 @@ help: "Goto next sequence number" -# TODO - comparison doesn't work -#syntax: $(../goto/) == ""; "you can set only goto or next" +syntax: $(../goto/) == ""; "you can set only goto or next" commit: $(../../action/) != ""; "You must specify an action for route-map $(../../../@) rule $(../../@)" update: "/usr/bin/vtysh -c \"configure terminal\" \ -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \ |