summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--templates/interfaces/ethernet/node.tag/mirror/node.def (renamed from interface-templates/mirror/node.def)7
-rw-r--r--templates/interfaces/ethernet/node.tag/redirect/node.def (renamed from interface-templates/redirect/node.def)6
2 files changed, 6 insertions, 7 deletions
diff --git a/interface-templates/mirror/node.def b/templates/interfaces/ethernet/node.tag/mirror/node.def
index 599ccec..8541d4e 100644
--- a/interface-templates/mirror/node.def
+++ b/templates/interfaces/ethernet/node.tag/mirror/node.def
@@ -7,13 +7,12 @@ syntax:expression: $VAR(@) != $VAR(../@) ;\
val_help: Interface for packet mirroring
commit:expression: $VAR(../redirect) == ""; \
- "interface $VAR(../@) : can not redirect and mirror on $IFNAME"
+ "interface $VAR(../@) : can not do both redirect and mirror"
commit:expression: $VAR(../traffic-policy/in) == ""; \
"interface $VAR(../@) : can not use ingress policy and mirror on $IFNAME"
commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) --check=all"
-
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-action $IFNAME
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-action $IFNAME
+update: /opt/vyatta/sbin/vyatta-qos.pl --update-action $VAR(../@)
+delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-action $VAR(../@)
diff --git a/interface-templates/redirect/node.def b/templates/interfaces/ethernet/node.tag/redirect/node.def
index c836662..6475ad6 100644
--- a/interface-templates/redirect/node.def
+++ b/templates/interfaces/ethernet/node.tag/redirect/node.def
@@ -7,12 +7,12 @@ syntax:expression: $VAR(@) != $VAR(../@) ;\
val_help: Interface for packet redirection
commit:expression: $VAR(../mirror) == "";\
- "interface $VAR(../@) : can not redirect and mirror on $IFNAME"
+ "interface $VAR(../@) : can not do both redirect and mirror"
commit:expression: $VAR(../traffic-policy/in) == ""; \
"interface $VAR(../@) : can not use ingress policy and redirect on $IFNAME"
commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) --check=all"
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-action $IFNAME
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-action $IFNAME
+update: /opt/vyatta/sbin/vyatta-qos.pl --update-action $VAR(../@)
+delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-action $VAR(../@)