fix for changes in cli referencing

14 files changed, 19 insertions, 22 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 a3327bbf..49b185d1 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
@@ -1,7 +1,5 @@
 help: "Filter any IP address"
-# TODO: won't work until 2220 is fixed
-syntax: $(../host/@) == "" && $(../network/@) == ""; "You may only define one filter type. (host|network|any)"
-# TODO: pending 2284
+syntax: $(../host/@) = "" && $(../network/@) = ""; "You may only define one filter type. (host|network|any)"
 syntax: ($(../../@) >= 100 && $(../../@) <= 199) || ($(../../@) >= 2000) && $(../../@) <= 2699); " \
 To set destination filter parameters, the access-list rule number must be \n \
   <100-199>    IP extended access list \n \
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 aa6b5303..cf235bdd 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
@@ -1,7 +1,6 @@
 type: ipv4
 help: "Filter a host IP address"
-syntax: $(../any/@) == "" && $(../network/@) == ""; "You may only define one filter type. (host|network|any)"
-# TODO: pending 2284
+syntax: $(../any/@) = "" && $(../network/@) = ""; "You may only define one filter type. (host|network|any)"
 syntax: ($(../../@) >= 100 && $(../../@) <= 199) || ($(../../@) >= 2000) && $(../../@) <= 2699); " \
 To set destination filter parameters, the access-list rule number must be \n \
   <100-199>    IP extended access list \n \
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 36ad0253..6f10c045 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
@@ -1,6 +1,6 @@
 type: ipv4
 help: "Filter a network IP netmask"
-syntax: $(../any/@) == "" && $(../host/@) == ""; "You may only define one filter type. (host|network|any)"
+syntax: $(../any/@) = "" && $(../host/@) = ""; "You may only define one filter type. (host|network|any)"
 # TODO: pending 2284
 syntax: ($(../../@) >= 100 && $(../../@) <= 199) || ($(../../@) >= 2000) && $(../../@) <= 2699); " \
 To set destination filter parameters, the access-list rule number must be \n \
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 8d8af90f..224c58b2 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,4 @@
 help: "Filter any IP address"
 # TODO: won't work until 2220 is fixed
-syntax: $(../host/@) == "" && $(../network/@) == ""; "You may only define one filter type. (host|network|any)"
+syntax: $(../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 92530127..52175605 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,4 +1,4 @@
 type: ipv4
 help: "Filter a host IP address"
-syntax: $(../any/@) == "" && $(../network/@) == ""; "You may only define one filter type. (host|network|any)"
+syntax: $(../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 9340bd24..ce7813bc 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,5 +1,5 @@
 type: ipv4
 help: "Filter a network IP netmask"
-syntax: $(../any/@) == "" || $(../host/@) == ""; "You may only define one filter type. (host|network|any)"
+syntax: $(../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 e7c4fec7..d124b83d 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,5 +1,5 @@
 type: ipv4
 help: "Filter a network IP address"
-syntax: $(../host/@) == "" && $(../any/@) == ""; "You may only define one filter type (host|network|any)"
+syntax: $(../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/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 fad1c33f..a58e7e29 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,4 +1,4 @@
 type: u32
 help: "IP access-list number"
-syntax: $(../prefix-list/@) == ""; "You can only specify a prefix-list or access-list"
+syntax: $(../prefix-list/@) = ""; "You can only specify a prefix-list or access-list"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist"
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 a192a5f0..d2f4a1a1 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,4 +1,4 @@
-type: u32
-help: "IP access-list number"
-syntax: $(../access-list/@) == ""; "You can only specify a prefix-list or access-list"
+type: txt
+help: "prefix-list name"
+syntax: $(../access-list/@) = ""; "You can only specify a prefix-list or access-list"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist"
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 fad1c33f..a58e7e29 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,4 +1,4 @@
 type: u32
 help: "IP access-list number"
-syntax: $(../prefix-list/@) == ""; "You can only specify a prefix-list or access-list"
+syntax: $(../prefix-list/@) = ""; "You can only specify a prefix-list or access-list"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist"
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 a192a5f0..d2f4a1a1 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,4 +1,4 @@
-type: u32
-help: "IP access-list number"
-syntax: $(../access-list/@) == ""; "You can only specify a prefix-list or access-list"
+type: txt
+help: "prefix-list name"
+syntax: $(../access-list/@) = ""; "You can only specify a prefix-list or access-list"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist"
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 fad1c33f..a58e7e29 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,4 +1,4 @@
 type: u32
 help: "IP access-list number"
-syntax: $(../prefix-list/@) == ""; "You can only specify a prefix-list or access-list"
+syntax: $(../prefix-list/@) = ""; "You can only specify a prefix-list or access-list"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $(@)\" "; "access-list $(@) does not exist"
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 a192a5f0..9abb6032 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,4 +1,4 @@
 type: u32
-help: "IP access-list number"
-syntax: $(../access-list/@) == ""; "You can only specify a prefix-list or access-list"
+help: "prefix-list name"
+syntax: $(../access-list/@) = ""; "You can only specify a prefix-list or access-list"
 syntax: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list $(@)\" "; "prefix-list $(@) does not exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
index 8529d589..a8c05a15 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/tag/node.def
@@ -1,7 +1,7 @@
 type: u32
 help: "Match tag of route"
 syntax: $(@) >= 1 && $(@) <= 65535; "tag must be between 1 and 65535"
-commit: $(../../action/@); "You must specify an action for route-map $(../../../@) rule $(../../@)"
+commit: $(../../action/@) == ""; "You must specify an action for route-map $(../../../@) rule $(../../@)"
 update: "/usr/bin/vtysh -c \"configure terminal\" \
          -c \"route-map $(../../../@) $(../../action/@) $(../../@)\" \
          -c \"match tag $(@)\" "