template updates

8 files changed, 28 insertions, 23 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 49b185d1..7b7d73b8 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,8 @@
 help: "Filter any IP address"
-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 \
   <2000-2699>  IP extended access list (expanded range) \n"
-commit: $(../../action/@) != ""; "You must specify an action before committing"
+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 cf235bdd..13c3ae78 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,8 +1,9 @@
 type: ipv4
 help: "Filter a host IP address"
-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 \
   <2000-2699>  IP extended access list (expanded range) \n" 
-commit: $(../../action/@) != ""; "You must specify an action before committing"
+# 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 6f10c045..e9d61cdb 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,10 +1,10 @@
 type: ipv4
 help: "Filter a network IP netmask"
-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 \
   <100-199>    IP extended access list \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"
+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 3f5b0261..ca98a8f1 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
@@ -1,10 +1,10 @@
 type: ipv4
 help: "Filter a network IP address"
-syntax: $(../host/@) != "" || $(../any/@) != ""; "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 \
   <100-199>    IP extended access list \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"
+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 224c58b2..3985197c 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)"
-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)"
+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 52175605..9136ce01 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,5 @@
 type: ipv4
 help: "Filter a host IP address"
-syntax: $(../any/@) = "" && $(../network/@) = ""; "You may only define one filter type. (host|network|any)"
-commit: $(../../action/@) != ""; "You must specify an action before committing"
+# 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 ce7813bc..929ccb3d 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,6 @@
 type: ipv4
 help: "Filter a network IP netmask"
-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"
+# 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 d124b83d..53e3375b 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,6 @@
 type: ipv4
 help: "Filter a network IP address"
-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"
+# 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"