tunnel: T2028: migrate tunnel interface definition to XML/Python

23 files changed, 0 insertions, 425 deletions

diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def
deleted file mode 100644
index d42f6560..00000000
--- a/templates/interfaces/tunnel/node.def
+++ /dev/null
@@ -1,122 +0,0 @@
-tag:
-priority: 380
-type: txt
-help: Tunnel interface
-val_help: <tunN>; Tunnel interface name
-syntax:expression: pattern $VAR(@) "^tun[0-9]+$" \
-		   ; "tunnel must be (tun0-tun999)"
-
-commit:expression: $VAR(./local-ip/) != "" || $VAR(./dhcp-interface/) != "";  \
-                   "Must configure either local-ip or dhcp-interface for tunnel $VAR(@)"
-commit:expression: $VAR(./local-ip/) == "" || $VAR(./dhcp-interface/) == "";  \
-                   "Must configure only one of local-ip or dhcp-interface for tunnel $VAR(@)"
-commit:expression: $VAR(./encapsulation/) != "" ;               \
-                   "Must configure the tunnel encapsulation for $VAR(@)"
-commit:expression:
-exec "
-        if [ $VAR(./encapsulation/@) = gre  ] && [ ! -n \"$VAR(./remote-ip/)\" ]; then  \
-                echo \"No remote-ip configured for $VAR(@), tunnel can only be used for mGRE.\";   \
-        fi; \
-        if [ -n \"$VAR(./6rd-prefix/)\" ]; then \
-            if [ $VAR(./encapsulation/@) != sit ]; then \
-                echo \"6rd-prefix can only be set for SIT tunnels\"; \
-                exit 1; \
-            fi \
-        fi; \
-        if [ $VAR(./encapsulation/@) != gre  ] && [ ! -n \"$VAR(./remote-ip/)\" ]; then  \
-                echo \"Must configure the tunnel remote-ip for $VAR(@)\";   \
-                exit 1;                                                  \
-        fi;
-
-        exit 0"
-commit:expression: (!(pattern $VAR(./local-ip/@) ".*:.*") && $VAR(./encapsulation/@) == "gre" && $VAR(./remote-ip/) == "") || \
-                   $VAR(./encapsulation/@) != "gre" || ($VAR(./encapsulation/@) == "gre" && $VAR(./remote-ip/) != ""); "IPv6 local-ip ($VAR(./local-ip/@)) is forbidden for mGRE tunnels."
-
-commit:expression: (!(pattern $VAR(./address/@@) ".*:.*") && $VAR(./encapsulation/@) == "gre" && $VAR(./remote-ip/) == "") || \
-                   $VAR(./encapsulation/@) != "gre" || ($VAR(./encapsulation/@) == "gre" && $VAR(./remote-ip/) != ""); "IPv6 addresses ($VAR(./address/@@)) are forbidden for mGRE tunnels."
-
-commit:expression: !($VAR(./encapsulation/@) == "gre" && ((pattern $VAR(./local-ip/@@) ".*:.*") || (pattern $VAR(./remote-ip/@@) ".*:.*"))); \
-                   "Using IPv6 address in local-ip or remote-ip is not possible with \"encapsulation gre\". Use \"encapsulation ip6gre\" instead."
-
-create:
-  if [ $VAR(./encapsulation/@) == gre  ] && [ -z $VAR(./remote-ip/) ]; then
-     sudo invoke-rc.d opennhrp.init start;
-  fi
-  if [ x$VAR(./multicast/@) == xenable ]; then
-    MC="multicast on allmulticast on";
-  fi
-  if [ -n "$VAR(./local-ip/@)" ]; then
-    LIP=$VAR(./local-ip/@)
-  else
-    LIP=$(/opt/vyatta/sbin/vyatta-dhcp-helper.pl --interface=$VAR(./dhcp-interface/@) --want=local)
-  fi
-  case "$VAR(./encapsulation/@)" in
-	  "gre" | "ipip" | "sit" | "ip6gre")
-        if [ -n "$VAR(./parameters/ip/bridge-group/)" ] ; then
-            echo "interfaces tunnel $VAR(@): Tunnel encapsulation type must be gre-bridge if a bridge group is defined";
-            exit 1;
-        fi
-        if [ -n "$VAR(./parameters/ip/tos/@)" ]; then
-            TOS="tos $VAR(./parameters/ip/tos/@)"
-        else
-            TOS="tos inherit"
-        fi
-        if [ -n "$VAR(./parameters/ip/ttl/@)" ]; then
-            TTL="ttl $VAR(./parameters/ip/ttl/@)"
-        else
-            TTL="ttl 255"
-        fi
-        if [ -n "$VAR(./parameters/ip/key/@)" ]; then
-            KEY="key $VAR(./parameters/ip/key/@)"
-        fi
-        if [ "$VAR(./encapsulation/@)" == "gre" ] && [ -z $VAR(./remote-ip/) ]; then
-            sudo ip tunnel add $VAR(@) local $LIP mode gre $KEY $TTL $TOS
-        elif [ "$VAR(./encapsulation/@)" == "ip6gre" ] && [ -z $VAR(./remote-ip/) ]; then
-            sudo ip tunnel add $VAR(@) local $LIP mode ip6gre $KEY $TTL $TOS
-        elif [ "$VAR(./encapsulation/@)" == "sit" ] && [ -n "$VAR(./6rd-prefix/@)" ]; then
-            if [ -n "$VAR(./6rd-relay-prefix/@)" ]; then
-                RP="6rd-relay_prefix $VAR(./6rd-relay-prefix/@)"
-            fi
-            sudo ip tunnel add $VAR(@) remote $VAR(./remote-ip/@) mode sit
-            sudo ip tunnel 6rd dev $VAR(@) 6rd-prefix $VAR(./6rd-prefix/@) $RP
-        else
-            sudo ip tunnel add $VAR(@) local $LIP remote $VAR(./remote-ip/@) mode $VAR(./encapsulation/@) $KEY $TTL $TOS
-        fi
-        if [ -z "`ip tunnel show | grep $VAR(@)`" ] && [ -z "`ip -6 tunnel show | grep $VAR(@)`" ]; then
-            echo interfaces tunnel $VAR(@): error creating tunnel interface
-            exit 1
-        fi
-	  ;;
-	  "gre-bridge")
-	    sudo ip link add $VAR(@) type gretap local $LIP remote $VAR(./remote-ip/@) ||
-        echo "interfaces tunnel $VAR(@): error creating tunnel interface"
-	  ;;
-	  "ipip6" | "ip6ip6")
-        sudo ip -6 tunnel add $VAR(@) local $LIP remote $VAR(./remote-ip/@) mode $VAR(./encapsulation/@) ||
-        echo "interfaces tunnel $VAR(@): error creating tunnel interface"
-	  ;;
-    esac
-      sudo ip link set $VAR(@) $MC up ||
-      echo "interfaces tunnel $VAR(@): error setting tunnel interface active"
-
-delete:
-  /opt/vyatta/sbin/vyos-update-nhrp.pl --checkref --tun $VAR(@)
-  sudo ip link set $VAR(@) down
-  case "$VAR(./encapsulation/@)" in
-    "gre" | "ipip" | "sit")
-      if [ -z $VAR(./remote-ip/) ]; then
-        sudo ip tunnel del $VAR(@) mode gre
-      else
-        sudo ip tunnel del $VAR(@) mode $VAR(./encapsulation/@)
-      fi;;
-    "gre-bridge")
-      sudo ip link delete $VAR(@) ;;
-    "ipip6" | "ip6ip6")
-      sudo ip -6 tunnel del $VAR(@) mode $VAR(./encapsulation/@);;
-  esac
-
-
-end:
-  if [ "${COMMIT_ACTION}" == DELETE ]; then
-    /opt/vyatta/sbin/vyatta-tunnel-cleanup $VAR(@)
-  fi
diff --git a/templates/interfaces/tunnel/node.tag/6rd-prefix/node.def b/templates/interfaces/tunnel/node.tag/6rd-prefix/node.def
deleted file mode 100644
index c5f7f02c..00000000
--- a/templates/interfaces/tunnel/node.tag/6rd-prefix/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: ipv6net
-val_help: ipv6net; IPv6 address and prefix length
-help: 6rd network prefix
-
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
-
-create:expression: "true"
-update:expression: "false" ; \
-               "6rd-prefix can only be modified at tunnel creation for $VAR(../@)"
diff --git a/templates/interfaces/tunnel/node.tag/6rd-relay-prefix/node.def b/templates/interfaces/tunnel/node.tag/6rd-relay-prefix/node.def
deleted file mode 100644
index 224c3b7e..00000000
--- a/templates/interfaces/tunnel/node.tag/6rd-relay-prefix/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: ipv4net
-val_help: ipv4net; IPv4 prefix of interface for 6rd
-help: 6rd relay prefix
-
-syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
-
-create:expression: "true"
-update:expression: "false" ; \
-               "6rd-relay-prefix can only be modified at tunnel creation for $VAR(../@)"
diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def
deleted file mode 100644
index 26c2f860..00000000
--- a/templates/interfaces/tunnel/node.tag/address/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-multi:
-type: ipv4net,ipv6net
-val_help: ipv4net; IPv4 address and prefix length
-val_help: ipv6net; IPv6 address and prefix length [NOTICE: unavailable for mGRE tunnels]
-help: IP address
-
-syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
-
-create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../@) $VAR(@)
-
-delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../@) $VAR(@)
-
diff --git a/templates/interfaces/tunnel/node.tag/description/node.def b/templates/interfaces/tunnel/node.tag/description/node.def
deleted file mode 100644
index c6d2789d..00000000
--- a/templates/interfaces/tunnel/node.tag/description/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Description
-
-syntax:expression: pattern $VAR(@) "^.{1,256}$" \
-	; "interface description is too long (limit 256 characters)"
-
-update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
-delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def b/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def
deleted file mode 100644
index d2a4e3d6..00000000
--- a/templates/interfaces/tunnel/node.tag/dhcp-interface/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: DHCP interface that supplies the local IP address for this tunnel
-allowed:
-        local -a array ;
-        array=( /var/lib/dhcp/en* /var/lib/dhcp/eth* /var/lib/dhcp/br* /var/lib/dhcp/bond* ) ;
-        echo  -n ${array[@]##*/}
-create:
-        sudo /opt/vyatta/sbin/vyatta-update-tunnel.pl --interface=$VAR(@) --tunnel=$VAR(../@) --option=create
-        LIP=$(/opt/vyatta/sbin/vyatta-dhcp-helper.pl --interface=$VAR(@) --want=local)
-	    sudo ip tunnel cha $VAR(../@) local $LIP
-update:
-        sudo /opt/vyatta/sbin/vyatta-update-tunnel.pl --interface=$VAR(@) --tunnel=$VAR(../@) --option=create
-        LIP=$(/opt/vyatta/sbin/vyatta-dhcp-helper.pl --interface=$VAR(@) --want=local)
-	    sudo ip tunnel cha $VAR(../@) local $LIP
-delete:
-        sudo /opt/vyatta/sbin/vyatta-update-tunnel.pl --interface=$VAR(@) --tunnel=$VAR(../@) --option=delete
diff --git a/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def b/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 7129ff33..00000000
--- a/templates/interfaces/tunnel/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Ignore link state changes
-update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
-delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
diff --git a/templates/interfaces/tunnel/node.tag/disable/node.def b/templates/interfaces/tunnel/node.tag/disable/node.def
deleted file mode 100644
index 8c580c95..00000000
--- a/templates/interfaces/tunnel/node.tag/disable/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Disable interface
-update: sudo ip link set $VAR(../@) down
-
-delete: sudo ip link set $VAR(../@) up
diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def
deleted file mode 100644
index b8f38c0a..00000000
--- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Encapsulation of this tunnel interface [REQUIRED]
-
-syntax:expression: ((pattern $VAR(@) "^[-a-zA-Z0-9_]+$") && \
-                   ($VAR(@) in "gre", "gre-bridge", "ipip", "sit", "ipip6", "ip6ip6", "ip6gre"; \
-                   "Must be (gre gre-bridge ipip sit ipip6 ip6ip6 ip6gre)\n"))
-
-create:expression: "true"
-update:expression: "false" ; \
-               "Encapsulation can only be set at tunnel creation for $VAR(../@)"
-
-val_help: gre; Generic Routing Encapsulation
-val_help: gre-bridge; Generic Routing Encapsulation bridge interface
-val_help: ipip; IP in IP encapsulation
-val_help: sit; Simple Internet Transition encapsulation
-val_help: ipip6; IP in IP6 encapsulation
-val_help: ip6ip6; IP6 in IP6 encapsulation
-val_help: ip6gre; GRE over IPv6 network
diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def
deleted file mode 100644
index 4a1cbc15..00000000
--- a/templates/interfaces/tunnel/node.tag/local-ip/node.def
+++ /dev/null
@@ -1,42 +0,0 @@
-type: ipv4, ipv6
-help: Local IP address for this tunnel
-val_help: ipv4; Local IPv4 address for this tunnel
-val_help: ipv6; Local IPv6 address for this tunnel [NOTICE: unavailable for mGRE tunnels]
-
-update:if ! /opt/vyatta/sbin/local_ip $VAR(@)
-	then
-           echo Warning! IP address $VAR(@) does not exist on this system
-	fi
-
-    sudo /opt/vyatta/sbin/vyatta-update-tunnel.pl --interface=unusedarg --tunnel=$VAR(../@) --option=delete
-
-	case "$VAR(../encapsulation/@)" in
-	  "gre-bridge")
-	     ;;
-	  "gre" | "ipip" | "sit")
-	     sudo ip tunnel cha $VAR(../@) local $VAR(@)
-             if [ -e "/opt/vyatta/sbin/dmvpn-config.pl" ]; then
-               sudo /opt/vyatta/sbin/dmvpn-config.pl \
-                  --config_file='/etc/swanctl/swanctl.conf' \
-                  --init_script='/etc/init.d/ipsec' \
-                  --tunnel_context --tun_id=$VAR(../@) || exit 1
-             fi
-	     ;;
-	  "ipip6" | "ip6ip6")
-	     if [ -n "$VAR(../parameters/ipv6/encaplimit/@)" ]; then
-	        ECL="encaplimit $VAR(../parameters/ipv6/encaplimit/@)"
-	     fi
-	     if [ -n "$VAR(../parameters/ipv6/hoplimit/@)" ]; then
-	        HL="hoplimit $VAR(../parameters/ipv6/hoplimit/@)"
-	     fi
-	     if [ -n "$VAR(../parameters/ipv6/tclass/@)" ]; then
-	        TC="tclass $VAR(../parameters/ipv6/tclass/@)"
-	     fi
-	     if [ -n "$VAR(../parameters/ipv6/flowlabel/@)" ]; then
-	        FL="flowlabel $VAR(../parameters/ipv6/flowlabel/@)"
-	     fi
-	     sudo ip -6 tunnel cha $VAR(../@) local $VAR(@) \
-		  remote $VAR(../remote-ip/@) mode $VAR(../encapsulation/@) \
-      $HL $ECL $TC $FL
-	     ;;
-	  esac
diff --git a/templates/interfaces/tunnel/node.tag/mtu/node.def b/templates/interfaces/tunnel/node.tag/mtu/node.def
deleted file mode 100644
index 6753bea7..00000000
--- a/templates/interfaces/tunnel/node.tag/mtu/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-priority: 381
-help: Maximum Transmission Unit (MTU)
-syntax:expression: $VAR(@) >= 64 && $VAR(@) <= 8024; "Must be between 64-8024"
-val_help: u32:64-8024; Maximum Transmission Unit (MTU)
-
-update: sudo ip link set $VAR(../@) mtu $VAR(@)
-delete: sudo ip link set $VAR(../@) mtu 1476
diff --git a/templates/interfaces/tunnel/node.tag/multicast/node.def b/templates/interfaces/tunnel/node.tag/multicast/node.def
deleted file mode 100644
index 505b8cf8..00000000
--- a/templates/interfaces/tunnel/node.tag/multicast/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-help: Multicast operation over tunnel
-default: "disable"
-val_help: enable; Enable Multicast
-val_help: disable; Disable Multicast (default)
-allowed: echo enable disable
-
-syntax:expression: $VAR(@) in "enable", "disable"; \
-                   "Must be 'disable' or 'enable'"
-
-update:if [ "$VAR(../encapsulation/@)" != "gre-bridge" ]; then 
-   if [ "$VAR(@)" == "enable" ]; then 
-      sudo ip link set $VAR(../@) multicast on allmulticast on
-   else
-      sudo ip link set $VAR(../@) multicast off allmulticast off
-   fi
-       fi
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/key/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/key/node.def
deleted file mode 100644
index 1142d2de..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ip/key/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: u32
-help: Tunnel key
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4294967295; \
-                   "Must be between 0-4294967295 for $VAR(../../../@)"
-val_help: u32:0-4294967295; Tunnel key
-
-syntax:expression: exec " \
-   if [ -n \"`ip tunnel show $VAR(../../../@) | grep $VAR(../../../@) `\" ]; then \
-       echo Key can only be set at tunnel creation for $VAR(../../../@); \
-       exit 1 ;  \
-   fi ; "
-
-commit:expression: $VAR(../../../encapsulation/@) in "gre" ; \
-                   "Key only valid for GRE for $VAR(../../../@)"
-
-create:expression: "true"
-update:expression: "false" ; \
-                   "Key can only be set at tunnel creation for $VAR(../../../@)"
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/node.def
deleted file mode 100644
index 9ec0a606..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv4 specific tunnel parameters
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/tos/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/tos/node.def
deleted file mode 100644
index 83f1ac62..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ip/tos/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Type of Service (TOS)
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 99; "Must be between 0-99"
-val_help: u32:0-99; Type Of Service (TOS)
-
-commit:expression: $VAR(../../../encapsulation/@) in "gre", "sit", "ipip" ; \
-                   "tunnel encapsulation must be GRE, SIT or IPIP"
-
-update: sudo ip tunnel change $VAR(../../../@) tos $VAR(@)
-delete: sudo ip tunnel change $VAR(../../../@) tos inherit
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/ttl/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/ttl/node.def
deleted file mode 100644
index 24d27104..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ip/ttl/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Time to live field
-val_help: u32:0-255; Time to live (default 255)
-
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-commit:expression: $VAR(../../../encapsulation/@) in "gre", "sit", "ipip" ; \
-                   "tunnel encapsulation must be GRE, SIT or IPIP"
-
-update:sudo ip tunnel change $VAR(../../../@) ttl $VAR(@)
-delete:sudo ip tunnel change $VAR(../../../@) ttl inherit
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ipv6/encaplimit/node.def b/templates/interfaces/tunnel/node.tag/parameters/ipv6/encaplimit/node.def
deleted file mode 100644
index 80d90cfa..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ipv6/encaplimit/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-type: txt
-help: Encaplimit field
-default: "4"
-val_help: <0-255>; Encaplimit (default 4)
-val_help: none; Encaplimit disabled
-
-syntax:expression: $VAR(@) == "none" || (pattern $VAR(@) "^([01]?[[:digit:]][[:digit:]]?|2[0-4][[:digit:]]|25[0-5])$"); "Must be 'none' or a number <0-255>"
-update:if [ -n "$VAR(../hoplimit/@)" ]; then
-	  HL="hoplimit $VAR(../hoplimit/@)"
-       fi;
-       if [ -n "$VAR(../tclass/@)" ]; then
-	  TC="tclass $VAR(../tclass/@)"
-       fi;
-       if [ -n "$VAR(../flowlabel/@)" ]; then
-	  FL="flowlabel $VAR(../flowlabel/@)"
-       fi;
-       sudo ip -6 tunnel change $VAR(../../../@) \
-       local $VAR(../../../local-ip/@) remote $VAR(../../../remote-ip/@) \
-	     encaplimit $VAR(@) mode $VAR(../../../encapsulation/@) $HL $TC $FL
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ipv6/flowlabel/node.def b/templates/interfaces/tunnel/node.tag/parameters/ipv6/flowlabel/node.def
deleted file mode 100644
index f6d062c7..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ipv6/flowlabel/node.def
+++ /dev/null
@@ -1,21 +0,0 @@
-type: txt
-help: Flowlabel
-default: "0x00000"
-syntax:expression: $VAR(@) == "inherit" || (pattern $VAR(@) "^0x([0]?[[:xdigit:]][[:xdigit:]]?[[:xdigit:]]?[[:xdigit:]]?[[:xdigit:]]?)$") ; "Must be 'inherit' or a number"
-val_help: <0-0xfffff>; Flowlabel
-val_help: inherit; Flowlabel (default)
-
-update:if [ -n "$VAR(../hoplimit/@)" ]; then
-	  HL="hoplimit $VAR(../hoplimit/@)"
-       fi;
-       if [ -n "$VAR(../encaplimit/@)" ]; then
-	  ECL="encaplimit $VAR(../encaplimit/@)"
-       fi;
-       if [ -n "$VAR(../tclass/@)" ]; then
-	  TC="tclass $VAR(../tclass/@)"
-       fi;
-       sudo ip -6 tunnel change $VAR(../../../@) \
-	   local $VAR(../../../local-ip/@) \
-	   remote $VAR(../../../remote-ip/@) \
-           mode $VAR(../../../encapsulation/@) \
-	     $HL $ECL $TC flowlabel $VAR(@)
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ipv6/hoplimit/node.def b/templates/interfaces/tunnel/node.tag/parameters/ipv6/hoplimit/node.def
deleted file mode 100644
index 5c4c29ea..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ipv6/hoplimit/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-type: u32
-help: Hoplimit
-default: 64
-val_help: u32:0-255; Hoplimit (default 64)
-
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:if [ -n "$VAR(../encaplimit/@)" ]; then
-	  ECL="encaplimit $VAR(../encaplimit/@)"
-       fi;
-       if [ -n "$VAR(../tclass/@)" ]; then
-	  TC="tclass $VAR(../tclass/@)"
-       fi;
-       if [ -n "$VAR(../flowlabel/@)" ]; then
-	  FL="flowlabel $VAR(../flowlabel/@)"
-       fi;
-       sudo ip -6 tunnel change $VAR(../../../@) \
-       local $VAR(../../../local-ip/@) remote $VAR(../../../remote-ip/@) \
-       mode $VAR(../../../encapsulation/@) \
-	     hoplimit $VAR(@) $ECL $TC $FL
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ipv6/node.def b/templates/interfaces/tunnel/node.tag/parameters/ipv6/node.def
deleted file mode 100644
index f7c85768..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ipv6/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: IPv6 specific tunnel parameters
-delete:
-  # set all parameters back to defaults if deleting this node
-    sudo ip -6 tunnel change $VAR(../../@) \
-         local $VAR(../../local-ip/@) remote $VAR(../../remote-ip/@) \
-         hoplimit 64 encaplimit 4 tclass 0x00 flowlabel 0x00000 \
-         mode $VAR(../../encapsulation/@)
-
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ipv6/tclass/node.def b/templates/interfaces/tunnel/node.tag/parameters/ipv6/tclass/node.def
deleted file mode 100644
index 35da99c7..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ipv6/tclass/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Traffic class (Tclass)
-default: "0x00"
-syntax:expression: $VAR(@) == "inherit" || (pattern $VAR(@) "^0x([0]?[[:xdigit:]][[:xdigit:]]?)$"); "Must be 'inherit' or a hexnumber <0-0xff>"
-val_help: <0-0xff>; Traffic class (tclass)
-val_help: inherit; Traffic class (default)
-
-update:if [ -n "$VAR(../hoplimit/@)" ]; then
-	  HL="hoplimit $VAR(../hoplimit/@)"
-       fi;
-       if [ -n "$VAR(../encaplimit/@)" ]; then
-	  ECL="encaplimit $VAR(../encaplimit/@)"
-       fi;
-       if [ -n "$VAR(../flowlabel/@)" ]; then
-	  FL="flowlabel $VAR(../flowlabel/@)"
-       fi;
-       sudo ip -6 tunnel change $VAR(../../../@) \
-       local $VAR(../../../local-ip/@) remote $VAR(../../../remote-ip/@) \
-       mode $VAR(../../../encapsulation/@) \
-	     $HL $ECL tclass $VAR(@) $FL
diff --git a/templates/interfaces/tunnel/node.tag/parameters/node.def b/templates/interfaces/tunnel/node.tag/parameters/node.def
deleted file mode 100644
index 0c732174..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Tunnel parameters
diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def
deleted file mode 100644
index 6da2fb4d..00000000
--- a/templates/interfaces/tunnel/node.tag/remote-ip/node.def
+++ /dev/null
@@ -1,30 +0,0 @@
-type: ipv4, ipv6
-help: Remote IP address for this tunnel
-val_help: ipv4; Remote IPv4 address for this tunnel
-val_help: ipv6; Remote IPv6 address for this tunnel
->>>>>>> b2159cb... Bugfix 8526: don't use REQUIRED on remote-ip
-
-update:case "$VAR(../encapsulation/@)" in
-	  "gre-bridge")
-	     ;;
-	  "gre" | "ipip" | "sit")
-    sudo ip tunnel cha $VAR(../@) remote $VAR(@)
-	     ;;
-	  "ipip6" | "ip6ip6")
-	     if [ -n "$VAR(../parameters/ipv6/encaplimit/@)" ]; then
-	        ECL="encaplimit $VAR(../parameters/ipv6/encaplimit/@)"
- fi
-	     if [ -n "$VAR(../parameters/ipv6/hoplimit/@)" ]; then
-	        HL="hoplimit $VAR(../parameters/ipv6/hoplimit/@)"
-	     fi
-	     if [ -n "$VAR(../parameters/ipv6/tclass/@)" ]; then
-	        TC="tclass $VAR(../parameters/ipv6/tclass/@)"
-	     fi
-	     if [ -n "$VAR(../parameters/ipv6/flowlabel/@)" ]; then
-	        FL="flowlabel $VAR(../parameters/ipv6/flowlabel/@)"
-	     fi
-	     sudo ip -6 tunnel cha $VAR(../@) local $VAR(../local-ip/@) \
-		  remote $VAR(@) mode $VAR(../encapsulation/@) \
-      $HL $ECL $TC $FL
-	     ;;
-	  esac