summaryrefslogtreecommitdiff
path: root/interface-templates
diff options
context:
space:
mode:
Diffstat (limited to 'interface-templates')
-rw-r--r--interface-templates/input-policy/mirror/node.def3
-rw-r--r--interface-templates/input-policy/node.def4
-rw-r--r--interface-templates/input-policy/redirect/node.def3
-rw-r--r--interface-templates/mirror/node.def15
-rw-r--r--interface-templates/redirect/node.def12
-rw-r--r--interface-templates/traffic-policy/in/node.def (renamed from interface-templates/qos-policy/in/node.def)2
-rw-r--r--interface-templates/traffic-policy/node.def1
-rw-r--r--interface-templates/traffic-policy/out/node.def (renamed from interface-templates/qos-policy/node.def)8
8 files changed, 33 insertions, 15 deletions
diff --git a/interface-templates/input-policy/mirror/node.def b/interface-templates/input-policy/mirror/node.def
deleted file mode 100644
index 49fb3df..0000000
--- a/interface-templates/input-policy/mirror/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Set incoming packet mirroring destination
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show=all
diff --git a/interface-templates/input-policy/node.def b/interface-templates/input-policy/node.def
deleted file mode 100644
index 8062561..0000000
--- a/interface-templates/input-policy/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Set incoming packet policy
-commit:expression:exec "/opt/vyatta/sbin/vyatta-qos.pl --check-ingress $IFNAME"
-end: /opt/vyatta/sbin/vyatta-qos.pl --update-ingress $IFNAME
-
diff --git a/interface-templates/input-policy/redirect/node.def b/interface-templates/input-policy/redirect/node.def
deleted file mode 100644
index 5582d07..0000000
--- a/interface-templates/input-policy/redirect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-type: txt
-help: Set incoming packet redirection destination
-allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show=all
diff --git a/interface-templates/mirror/node.def b/interface-templates/mirror/node.def
new file mode 100644
index 0000000..cbb3bde
--- /dev/null
+++ b/interface-templates/mirror/node.def
@@ -0,0 +1,15 @@
+type: txt
+help: Set incoming packet mirroring destination
+allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --skip=$IFNAME --show=all
+
+syntax: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$IFNAME --check=all
+
+commit:expression: $VAR(../redirect) == ""; \
+ "interface $VAR(../@) : can not redirect and mirror on $IFNAME"
+
+commit:expression: $VAR(../traffic-policy/in) == ""; \
+ "interface $VAR(../@) : can not use ingress policy and mirror on $IFNAME"
+
+end: /opt/vyatta/sbin/vyatta-qos.pl --update-action $IFNAME
+
+
diff --git a/interface-templates/redirect/node.def b/interface-templates/redirect/node.def
new file mode 100644
index 0000000..6f0bd60
--- /dev/null
+++ b/interface-templates/redirect/node.def
@@ -0,0 +1,12 @@
+type: txt
+help: Set incoming packet redirection destination
+allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --skip=$IFNAME --show=all
+
+syntax: /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$IFNAME --check=all
+commit:expression: $VAR(../mirror) == "";\
+ "interface $VAR(../@) : can not redirect and mirror on $IFNAME"
+
+commit:expression: $VAR(../traffic-policy/in) == ""; \
+ "interface $VAR(../@) : can not use ingress policy and redirect on $IFNAME"
+
+end: /opt/vyatta/sbin/vyatta-qos.pl --update-action $IFNAME
diff --git a/interface-templates/qos-policy/in/node.def b/interface-templates/traffic-policy/in/node.def
index 67d3e4b..901fae8 100644
--- a/interface-templates/qos-policy/in/node.def
+++ b/interface-templates/traffic-policy/in/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set inbound QOS policy for interface
+help: Set ingress traffic policy for interface
allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy in
update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $IFNAME in $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $IFNAME in
diff --git a/interface-templates/traffic-policy/node.def b/interface-templates/traffic-policy/node.def
new file mode 100644
index 0000000..d13c6cd
--- /dev/null
+++ b/interface-templates/traffic-policy/node.def
@@ -0,0 +1 @@
+help: Set traffic-policy for interface
diff --git a/interface-templates/qos-policy/node.def b/interface-templates/traffic-policy/out/node.def
index 2b8a36f..e22793b 100644
--- a/interface-templates/qos-policy/node.def
+++ b/interface-templates/traffic-policy/out/node.def
@@ -1,5 +1,5 @@
type: txt
-help: Set outbound QOS policy for interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $IFNAME $VAR(@)
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $IFNAME
+help: Set egress traffic policy for interface
+allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
+update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $IFNAME out $VAR(@)
+delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $IFNAME out