diff options
Diffstat (limited to 'templates')
111 files changed, 10 insertions, 1058 deletions
diff --git a/templates/interfaces/bonding/node.def b/templates/interfaces/bonding/node.def deleted file mode 100644 index 1fa270b4..00000000 --- a/templates/interfaces/bonding/node.def +++ /dev/null @@ -1,35 +0,0 @@ -tag: -priority: 315 -type: txt -help: Bonding interface name -val_help: <bondN>; Bonding interface name -syntax:expression: pattern $VAR(@) "^bond[0-9]+$" \ - ; "bonding must be (bond0-bond99)" - -begin: if [ ! -f /sys/class/net/bonding_masters ]; then - sudo modprobe bonding max_bonds=0 miimon=250 - fi - -create: sudo sh -c "echo +$VAR(@) > /sys/class/net/bonding_masters" || exit 1 - touch /tmp/bonding_$VAR(@).$PPID - -delete: SLAVES=`cat /sys/class/net/$VAR(@)/bonding/slaves`; - if [ -z "$SLAVES" ] - then - sudo sh -c "echo -$VAR(@) > /sys/class/net/bonding_masters" - else - echo "bonded interface $VAR(@) still has slaves: $SLAVES" - exit 1; - fi - -end: `/bin/cli-shell-api exists interfaces bonding $VAR(@) disable` - if [ $? -ne 0 ] - then - if [ -f /tmp/bonding_$VAR(@).$PPID ] - then rm -f /tmp/bonding_$VAR(@).$PPID - sudo ip link set "$VAR(@)" up - /opt/vyatta/sbin/vyatta-link-detect $VAR(@) on - fi - else - sudo ip link set "$VAR(@)" down - fi diff --git a/templates/interfaces/bonding/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/address/node.def deleted file mode 100644 index 2789d865..00000000 --- a/templates/interfaces/bonding/node.tag/address/node.def +++ /dev/null @@ -1,18 +0,0 @@ -multi: -priority: 320 # after ether device bonding groups -type: txt -help: IP address - -syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)" - -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../@)" - -create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../@) $VAR(@) - -delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../@) $VAR(@) - -allowed: echo "dhcp <>" -val_help: ipv4net; IP address and prefix length -val_help: ipv6net; IPv6 address and prefix length -val_help: dhcp; Dynamic Host Configuration Protocol -val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6 diff --git a/templates/interfaces/bonding/node.tag/arp-monitor/interval/node.def b/templates/interfaces/bonding/node.tag/arp-monitor/interval/node.def deleted file mode 100644 index 010a953b..00000000 --- a/templates/interfaces/bonding/node.tag/arp-monitor/interval/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: u32 -default: 0 -help: ARP link monitoring frequency in milliseconds - -update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../../@)/bonding/arp_interval" -delete: sudo sh -c 'echo 0 > /sys/class/net/$VAR(../../@)/bonding/arp_interval' - sudo sh -c 'echo 250 > /sys/class/net/$VAR(../../@)/bonding/miimon' diff --git a/templates/interfaces/bonding/node.tag/arp-monitor/node.def b/templates/interfaces/bonding/node.tag/arp-monitor/node.def deleted file mode 100644 index e1c392a7..00000000 --- a/templates/interfaces/bonding/node.tag/arp-monitor/node.def +++ /dev/null @@ -1 +0,0 @@ -help: ARP link monitoring parameters diff --git a/templates/interfaces/bonding/node.tag/arp-monitor/target/node.def b/templates/interfaces/bonding/node.tag/arp-monitor/target/node.def deleted file mode 100644 index 7dad4c4c..00000000 --- a/templates/interfaces/bonding/node.tag/arp-monitor/target/node.def +++ /dev/null @@ -1,7 +0,0 @@ -multi: -type: ipv4 -help: IP address to use for ARP monitoring - -create: sudo sh -c "echo +$VAR(@) >/sys/class/net/$VAR(../../@)/bonding/arp_ip_target" - -delete: sudo sh -c "echo -$VAR(@) >/sys/class/net/$VAR(../../@)/bonding/arp_ip_target" diff --git a/templates/interfaces/bonding/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/description/node.def deleted file mode 100644 index c6d2789d..00000000 --- a/templates/interfaces/bonding/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/bonding/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/bonding/node.tag/dhcp-options/client-id/node.def deleted file mode 100644 index 85ebe6e3..00000000 --- a/templates/interfaces/bonding/node.tag/dhcp-options/client-id/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: DHCP client identifier diff --git a/templates/interfaces/bonding/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/bonding/node.tag/dhcp-options/host-name/node.def deleted file mode 100644 index 80d28fbd..00000000 --- a/templates/interfaces/bonding/node.tag/dhcp-options/host-name/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: DHCP client host name (overrides the system host name) diff --git a/templates/interfaces/bonding/node.tag/dhcp-options/node.def b/templates/interfaces/bonding/node.tag/dhcp-options/node.def deleted file mode 100644 index e90406df..00000000 --- a/templates/interfaces/bonding/node.tag/dhcp-options/node.def +++ /dev/null @@ -1 +0,0 @@ -help: DHCP options diff --git a/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def deleted file mode 100644 index d25533f9..00000000 --- a/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def +++ /dev/null @@ -1,52 +0,0 @@ -# This node is run before the rest of the interface is configured. -# We first check to see if DHCPv6 is still configured on the interface by -# looking over at the interface address parameters. Then we check to see -# if the DHCPv6 client program is still running on this interface. If both -# of those are true, then any change to this tree means that the user -# has changed this tree ONLY, and that we are going to have to re-start -# the DHCPv6 client using the new parameters. - - -priority: 319 # Run before interface has been configured - -help: DHCPv6 options - -end: - ifname="$VAR(../@)" - echo "dhcpv6-options: ifname is $ifname" - - dhcpv6_set=0 - for param in $VAR(../address/@@); do - if [ "$param" = "dhcpv6" ]; then - dhcpv6_set=1 - fi - done - - if [ $dhcpv6_set -eq 0 ]; then - echo "DHCPv6 is not configured on this interface" - exit 0 - fi - - conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf - if [ ! -e $conffile ]; then - echo "Conf file $conffile doesn't exist" - exit 0 - fi - - if [ -n "$VAR(./parameters-only)" ]; then - arg1="--parameters-only" - fi - - if [ -n "$VAR(./temporary)" ]; then - arg2="--temporary" - fi - - echo "Re-starting DHCPv6 client on ${ifname}..." - sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ - --ifname $ifname $arg1 $arg2 - if [ $? != 0 ]; then - exit 1 - fi - - echo "Done." - exit 0 diff --git a/templates/interfaces/bonding/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/bonding/node.tag/dhcpv6-options/parameters-only/node.def deleted file mode 100644 index 0e407f81..00000000 --- a/templates/interfaces/bonding/node.tag/dhcpv6-options/parameters-only/node.def +++ /dev/null @@ -1,3 +0,0 @@ - -help: Acquire only config parameters, not address - diff --git a/templates/interfaces/bonding/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/bonding/node.tag/dhcpv6-options/temporary/node.def deleted file mode 100644 index a850ef4b..00000000 --- a/templates/interfaces/bonding/node.tag/dhcpv6-options/temporary/node.def +++ /dev/null @@ -1,3 +0,0 @@ - -help: IPv6 "temporary" address - diff --git a/templates/interfaces/bonding/node.tag/disable-link-detect/node.def b/templates/interfaces/bonding/node.tag/disable-link-detect/node.def deleted file mode 100644 index 7129ff33..00000000 --- a/templates/interfaces/bonding/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/bonding/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/disable/node.def deleted file mode 100644 index c4a4c681..00000000 --- a/templates/interfaces/bonding/node.tag/disable/node.def +++ /dev/null @@ -1,11 +0,0 @@ -help: Disable interface -create: /etc/netplug/linkdown.d/dhclient $VAR(../@) - if ! sudo ip link set $VAR(../@) down 2>/dev/null; then - echo "Error disabling dev $VAR(../@)" - /etc/netplug/linkup.d/dhclient $VAR(../@) - exit 1 - fi -delete: if ! sudo ip link set $VAR(../@) up; then - echo "Error enabling dev $VAR(../@)" - exit 1 - fi diff --git a/templates/interfaces/bonding/node.tag/hash-policy/node.def b/templates/interfaces/bonding/node.tag/hash-policy/node.def deleted file mode 100644 index 81fb2901..00000000 --- a/templates/interfaces/bonding/node.tag/hash-policy/node.def +++ /dev/null @@ -1,12 +0,0 @@ -type: txt -default: "layer2" -allowed: echo "layer2 layer2+3 layer3+4" -syntax:expression: $VAR(@) in "layer2", "layer2+3", "layer3+4" \ - ; "hash-policy must be layer2 layer3+4 or layer2+3" -help: Bonding transmit hash policy - -update: sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$VAR(../@) --hash=$VAR(@) - -val_help: layer2; use MAC addresses to generate the hash (802.3ad) -val_help: layer2+3; combine MAC address and IP address to make hash -val_help: layer3+4; combine IP address and port to make hash diff --git a/templates/interfaces/bonding/node.tag/ip/arp-cache-timeout/node.def b/templates/interfaces/bonding/node.tag/ip/arp-cache-timeout/node.def deleted file mode 100644 index 4441914c..00000000 --- a/templates/interfaces/bonding/node.tag/ip/arp-cache-timeout/node.def +++ /dev/null @@ -1,9 +0,0 @@ -help: ARP cache entry timeout in seconds - -type: u32 - -create:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" " - -update:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" " - -delete:expression: "sudo sh -c \"echo 30000 > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" " diff --git a/templates/interfaces/bonding/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/bonding/node.tag/ip/enable-proxy-arp/node.def deleted file mode 100644 index ae7ba09a..00000000 --- a/templates/interfaces/bonding/node.tag/ip/enable-proxy-arp/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Enable proxy-arp on this interface -create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" " -delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" " diff --git a/templates/interfaces/bonding/node.tag/ip/proxy-arp-pvlan/node.def b/templates/interfaces/bonding/node.tag/ip/proxy-arp-pvlan/node.def deleted file mode 100644 index a6cf9494..00000000 --- a/templates/interfaces/bonding/node.tag/ip/proxy-arp-pvlan/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Enable private VLAN proxy ARP on this interface -create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp_pvlan\" " -delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp_pvlan\" " diff --git a/templates/interfaces/bonding/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/mac/node.def deleted file mode 100644 index c315af71..00000000 --- a/templates/interfaces/bonding/node.tag/mac/node.def +++ /dev/null @@ -1,6 +0,0 @@ -type: macaddr -help: Media Access Control (MAC) address -syntax:expression: exec "\ - /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)" -update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@) -# delete does nothing since there is no hardware original value diff --git a/templates/interfaces/bonding/node.tag/mode/node.def b/templates/interfaces/bonding/node.tag/mode/node.def deleted file mode 100644 index a21d2961..00000000 --- a/templates/interfaces/bonding/node.tag/mode/node.def +++ /dev/null @@ -1,19 +0,0 @@ -type: txt -default: "802.3ad" -allowed: echo 802.3ad active-backup broadcast round-robin \ - transmit-load-balance adaptive-load-balance xor-hash -syntax:expression: $VAR(@) in \ - "802.3ad", "active-backup", "broadcast", "round-robin", \ - "transmit-load-balance", "adaptive-load-balance", "xor-hash" ; \ - "mode must be 802.3ad, active-backup, broadcast, round-robin, \ -transmit-load-balance, adaptive-load-balance, or xor" -help: Bonding mode -update: sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$VAR(../@) --mode=$VAR(@) - -val_help: 802.3ad; IEEE 802.3ad Dynamic link aggregation (Default) -val_help: active-backup; Fault tolerant: only one slave in the bond is active -val_help: broadcast; Fault tolerant: transmits everything on all slave interfaces -val_help: round-robin; Load balance: transmit packets in sequential order -val_help: transmit-load-balance; Load balance: adapts based on transmit load and speed -val_help: adaptive-load-balance; Load balance: adapts based on transmit and receive plus ARP -val_help: xor-hash; Load balance: distribute based on MAC address diff --git a/templates/interfaces/bonding/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/mtu/node.def deleted file mode 100644 index 71347c58..00000000 --- a/templates/interfaces/bonding/node.tag/mtu/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: u32 -priority: 381 -help: Maximum Transmission Unit (MTU) -syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000" -val_help: u32:68-9000; Maximum Transmission Unit -update: sudo ip link set $VAR(../@) mtu $VAR(@) -delete: sudo ip link set $VAR(../@) mtu 1500 diff --git a/templates/interfaces/bonding/node.tag/primary/node.def b/templates/interfaces/bonding/node.tag/primary/node.def deleted file mode 100644 index 98a18a48..00000000 --- a/templates/interfaces/bonding/node.tag/primary/node.def +++ /dev/null @@ -1,10 +0,0 @@ -type: txt -priority: 320 # must be after ethernet bond-group -commit:expression: exec \ - "grep -s $VAR(@) /sys/class/net/$VAR(../@)/bonding/slaves" \ - ; "Ethernet interface must be part of the bonding group" -commit:expression: exec \ - "grep -E '(^active-backup|^balance-tlb|^balance-alb)' /sys/class/net/$VAR(../@)/bonding/mode" \ - ; "Bonding must have mode active-backup, transmit-load-balance or adaptive-load-balance" -update: sudo sh -c "echo $VAR(@) >/sys/class/net/$VAR(../@)/bonding/primary" -help: Primary device interface diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.def deleted file mode 100644 index 2c483317..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.def +++ /dev/null @@ -1,26 +0,0 @@ -tag: -priority: 320 -type: u32 -help: QinQ TAG-S Virtual Local Area Network (VLAN) ID -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" -val_help: u32:0-4094; VLAN ID - -create: ETHERTYPE=`echo "$VAR(ethertype/@)"` - if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi - if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi - - if ! sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@) - then echo "Error creating VLAN device $VAR(../@).$VAR(@)" - exit 1 - fi - # if parent is up, then bring VLAN up - if [ $(( $(cat /sys/class/net/$VAR(../@)/flags) & 1 )) -eq 1 ] - then sudo ip link set "$VAR(../@).$VAR(@)" up - fi - /opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on - -delete: ETHERTYPE=`echo "$VAR(ethertype/@)"` - if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi - if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi - [ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0 - sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/address/node.def deleted file mode 100644 index f025dece..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/address/node.def +++ /dev/null @@ -1,17 +0,0 @@ -multi: -type: txt -help: IP address - -syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)" - -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../../@).$VAR(../@)" - -create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../../@).$VAR(../@) $VAR(@) - -delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../../@).$VAR(../@) $VAR(@) - -allowed: echo "dhcp <>" -val_help: ipv4net; IP address and prefix length -val_help: ipv6net; IPv6 address and prefix length -val_help: dhcp; Dynamic Host Configuration Protocol -val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/bridge/node.def deleted file mode 100644 index 0766f8af..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/bridge/node.def +++ /dev/null @@ -1,8 +0,0 @@ -type: txt - -help: Bridge group interface - -commit:expression: exec \ - "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" - -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/cost/node.def deleted file mode 100644 index 243747b9..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/cost/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Path cost for this port -syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" -val_help: u32:1-65535; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/node.def deleted file mode 100644 index b603bb8c..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/node.def +++ /dev/null @@ -1,4 +0,0 @@ -priority: 325 # after vif and bridge -help: Add this interface to a bridge group - -end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../@).$VAR(../@) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/priority/node.def deleted file mode 100644 index be0ff479..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Bridge port priority -syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63" -val_help: u32:0-63; Bridge port priority diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/description/node.def deleted file mode 100644 index a0b29f05..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/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(../../@).$VAR(../@)/ifalias" -delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias" diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/client-id/node.def deleted file mode 100644 index 85ebe6e3..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/client-id/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: DHCP client identifier diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/host-name/node.def deleted file mode 100644 index 80d28fbd..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/host-name/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: DHCP client host name (overrides the system host name) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/node.def deleted file mode 100644 index e90406df..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcp-options/node.def +++ /dev/null @@ -1 +0,0 @@ -help: DHCP options diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def deleted file mode 100644 index d6fea411..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def +++ /dev/null @@ -1,50 +0,0 @@ -# This node is run before the rest of the interface is configured. -# We first check to see if DHCPv6 is still configured on the interface by -# looking over at the interface address parameters. Then we check to see -# if the DHCPv6 client program is still running on this interface. If both -# of those are true, then any change to this tree means that the user -# has changed this tree ONLY, and that we are going to have to re-start -# the DHCPv6 client using the new parameters. - - -priority: 319 # Run before interface has been configured - -help: DHCPv6 options - -end: - ifname="$VAR(../../@).$VAR(../@)" - - dhcpv6_set=0 - for param in $VAR(../address/@@); do - if [ "$param" = "dhcpv6" ]; then - dhcpv6_set=1 - fi - done - - if [ $dhcpv6_set -eq 0 ]; then - echo "DHCPv6 is not configured on this interface" - exit 0 - fi - - conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf - if [ ! -e $conffile ]; then - echo "Conf file $conffile doesn't exist" - exit 0 - fi - - if [ -n "$VAR(./parameters-only)" ]; then - arg1="--parameters-only" - fi - - if [ -n "$VAR(./temporary)" ]; then - arg2="--temporary" - fi - - echo "Re-starting DHCPv6 client on ${ifname}..." - sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ - --ifname $ifname $arg1 $arg2 - if [ $? != 0 ]; then - exit 1 - fi - - exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/parameters-only/node.def deleted file mode 100644 index 0e407f81..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/parameters-only/node.def +++ /dev/null @@ -1,3 +0,0 @@ - -help: Acquire only config parameters, not address - diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/temporary/node.def deleted file mode 100644 index a850ef4b..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/temporary/node.def +++ /dev/null @@ -1,3 +0,0 @@ - -help: IPv6 "temporary" address - diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable-link-detect/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable-link-detect/node.def deleted file mode 100644 index 5f60e6ab..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/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(../../@).$VAR(../@) on -delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) off diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable/node.def deleted file mode 100644 index 12db6a98..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/disable/node.def +++ /dev/null @@ -1,11 +0,0 @@ -help: Disable interface -update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@) - if ! sudo ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then - echo "Error disabling dev $VAR(../../@).$VAR(../@)" - /etc/netplug/linkup.d/dhclient $VAR(../../@).$VAR(../@) - exit 1 - fi -delete: if ! sudo ip link set $VAR(../../@).$VAR(../@) up; then - echo "Error enabling dev $VAR(../../@).$VAR(../@)" - exit 1 - fi diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def deleted file mode 100644 index 24d08568..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def +++ /dev/null @@ -1,26 +0,0 @@ -type: txt -help: Set Ethertype -syntax:expression: $VAR(@) in "0x88A8", "0x8100";"Must be (0x88A8 0x8100)\n" -default: "0x88A8" - -comp_help: possible completions: - 0x88A8 802.1AD - 0x8100 802.1Q - -update: ACTIVEETHTYPE=`cli-shell-api returnActiveValue interfaces bonding $VAR(../../@) vif-s $VAR(../@) ethertype` - if [ ! -z $VAR(../vif-c/@@) ] && [ ! -z $ACTIVEETHTYPE ] - then echo "Can not change ethertype with vif-c configured" - exit 1 - fi - ETHERTYPE=`echo "$VAR(@)"` - if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi - if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi - read -a SLAVES </sys/class/net/$VAR(../../@)/bonding/slaves - if [ ${#SLAVES[*]} -eq 0 ]; then - echo "Must configure slave devices for bond interface $VAR(../@) before adding vif" - exit 1 - fi - sudo ip link delete dev "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) > /dev/null 2>&1 - sudo ip link add link $VAR(../../@) name "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) || exit 1 - sudo ip link set "$VAR(../../@).$VAR(../@)" up - /opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/mac/node.def deleted file mode 100644 index 750710ec..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/mac/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: macaddr -help: Media Access Control (MAC) address - -update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/mtu/node.def deleted file mode 100644 index b3f3e7c7..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/mtu/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: u32 -priority: 382 -help: Maximum Transmission Unit (MTU) -val_help: u32:68-9000; Maximum Transmission Unit (MTU) -syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000" - -update: sudo ip link set $VAR(../../@).$VAR(../@) mtu $VAR(@) -delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@) ] || exit 0 - sudo ip link set $VAR(../../@).$VAR(../@) mtu 1500 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.def deleted file mode 100644 index eb32ce61..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.def +++ /dev/null @@ -1,18 +0,0 @@ -tag: -priority: 321 -type: u32 -help: QinQ TAG-C Virtual Local Area Network (VLAN) ID -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" -val_help: u32:0-4094; VLAN ID - -create: read -a SLAVES </sys/class/net/$VAR(../../@)/bonding/slaves - if [ ${#SLAVES[*]} -eq 0 ]; then - echo "Must configure slave devices for bond interface $VAR(../../@) before adding vif" - exit 1 - fi - sudo ip link add link $VAR(../../@).$VAR(../@) name "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@) || exit 1 - sudo ip link set "$VAR(../../@).$VAR(../@).$VAR(@)" up - /opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@).$VAR(@)" on - -delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@).$VAR(@) ] || exit 0 - sudo ip link delete dev "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/address/node.def deleted file mode 100644 index 415ef4b3..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/address/node.def +++ /dev/null @@ -1,17 +0,0 @@ -multi: -type: txt -help: IP address - -syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)" - -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../../../@).$VAR(../../@).$VAR(../@)" - -create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../../../@).$VAR(../../@).$VAR(../@) $VAR(@) - -delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../../../@).$VAR(../../@).$VAR(../@) $VAR(@) - -allowed: echo "dhcp <>" -val_help: ipv4net; IP address and prefix length -val_help: ipv6net; IPv6 address and prefix length -val_help: dhcp; Dynamic Host Configuration Protocol -val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def deleted file mode 100644 index 0766f8af..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def +++ /dev/null @@ -1,8 +0,0 @@ -type: txt - -help: Bridge group interface - -commit:expression: exec \ - "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" - -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def deleted file mode 100644 index 243747b9..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Path cost for this port -syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" -val_help: u32:1-65535; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def deleted file mode 100644 index f1e45c42..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def +++ /dev/null @@ -1,4 +0,0 @@ -priority: 325 # after vif and bridge -help: Add this interface to a bridge group - -end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../../@).$VAR(../../@).$VAR(../@) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def deleted file mode 100644 index be0ff479..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Bridge port priority -syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63" -val_help: u32:0-63; Bridge port priority diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/description/node.def deleted file mode 100644 index 9324ce1b..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/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(../../../@).$VAR(../../@).$VAR(../@)/ifalias" -delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../../@).$VAR(../../@).$VAR(../@)/ifalias" diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/client-id/node.def deleted file mode 100644 index 85ebe6e3..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/client-id/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: DHCP client identifier diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/host-name/node.def deleted file mode 100644 index 80d28fbd..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/host-name/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: DHCP client host name (overrides the system host name) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/node.def deleted file mode 100644 index e90406df..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/node.def +++ /dev/null @@ -1 +0,0 @@ -help: DHCP options diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def deleted file mode 100644 index 0be14824..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def +++ /dev/null @@ -1,50 +0,0 @@ -# This node is run before the rest of the interface is configured. -# We first check to see if DHCPv6 is still configured on the interface by -# looking over at the interface address parameters. Then we check to see -# if the DHCPv6 client program is still running on this interface. If both -# of those are true, then any change to this tree means that the user -# has changed this tree ONLY, and that we are going to have to re-start -# the DHCPv6 client using the new parameters. - - -priority: 319 # Run before interface has been configured - -help: DHCPv6 options - -end: - ifname="$VAR(../../../@).$VAR(../../@).$VAR(../@)" - - dhcpv6_set=0 - for param in $VAR(../address/@@); do - if [ "$param" = "dhcpv6" ]; then - dhcpv6_set=1 - fi - done - - if [ $dhcpv6_set -eq 0 ]; then - echo "DHCPv6 is not configured on this interface" - exit 0 - fi - - conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf - if [ ! -e $conffile ]; then - echo "Conf file $conffile doesn't exist" - exit 0 - fi - - if [ -n "$VAR(./parameters-only)" ]; then - arg1="--parameters-only" - fi - - if [ -n "$VAR(./temporary)" ]; then - arg2="--temporary" - fi - - echo "Re-starting DHCPv6 client on ${ifname}..." - sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ - --ifname $ifname $arg1 $arg2 - if [ $? != 0 ]; then - exit 1 - fi - - exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/parameters-only/node.def deleted file mode 100644 index 0e407f81..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/parameters-only/node.def +++ /dev/null @@ -1,3 +0,0 @@ - -help: Acquire only config parameters, not address - diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/temporary/node.def deleted file mode 100644 index a850ef4b..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/temporary/node.def +++ /dev/null @@ -1,3 +0,0 @@ - -help: IPv6 "temporary" address - diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable-link-detect/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable-link-detect/node.def deleted file mode 100644 index ed593317..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/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(../../../@).$VAR(../../@).$VAR(../@) on -delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../../@).$VAR(../../@).$VAR(../@) off diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def deleted file mode 100644 index 7069e9c9..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def +++ /dev/null @@ -1,11 +0,0 @@ -help: Disable interface -update: /etc/netplug/linkdown.d/dhclient $VAR(../../../@).$VAR(../../@).$VAR(../@) - if ! sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) down 2>/dev/null; then - echo "Error disabling dev $VAR(../../../@).$VAR(../../@).$VAR(../@)" - /etc/netplug/linkup.d/dhclient $VAR(../../../@).$VAR(../../@).$VAR(../@) - exit 1 - fi -delete: if ! sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) up; then - echo "Error enabling dev $VAR(../../../@).$VAR(../../@).$VAR(../@)" - exit 1 - fi diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def deleted file mode 100644 index 24b4b4d7..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: macaddr -help: Media Access Control (MAC) address - -update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../../@).$VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def deleted file mode 100644 index 264c429b..00000000 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: u32 -priority: 382 -help: Maximum Transmission Unit (MTU) -val_help: u32:68-9000; Maximum Transmission Unit (MTU) -syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000" - -update: sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) mtu $VAR(@) -delete: [ -d /sys/class/net/$VAR(../../../@).$VAR(../../@).$VAR(../@) ] || exit 0 - sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) mtu 1500 diff --git a/templates/interfaces/bonding/node.tag/vif/node.def b/templates/interfaces/bonding/node.tag/vif/node.def deleted file mode 100644 index e7262d63..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.def +++ /dev/null @@ -1,18 +0,0 @@ -tag: -priority: 320 -type: u32 -help: Virtual Local Area Network (VLAN) ID -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094" -val_help: u32:0-4094; VLAN ID - -create: read -a SLAVES </sys/class/net/$VAR(../@)/bonding/slaves - if [ ${#SLAVES[*]} -eq 0 ]; then - echo "Must configure slave devices for bond interface $VAR(../@) before adding vif" - exit 1 - fi - sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1 - sudo ip link set "$VAR(../@).$VAR(@)" up - /opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on - -delete: [ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0 - sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def deleted file mode 100644 index f025dece..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def +++ /dev/null @@ -1,17 +0,0 @@ -multi: -type: txt -help: IP address - -syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)" - -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../../@).$VAR(../@)" - -create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../../@).$VAR(../@) $VAR(@) - -delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../../@).$VAR(../@) $VAR(@) - -allowed: echo "dhcp <>" -val_help: ipv4net; IP address and prefix length -val_help: ipv6net; IPv6 address and prefix length -val_help: dhcp; Dynamic Host Configuration Protocol -val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6 diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def deleted file mode 100644 index 0766f8af..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def +++ /dev/null @@ -1,8 +0,0 @@ -type: txt - -help: Bridge group interface - -commit:expression: exec \ - "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" - -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def deleted file mode 100644 index 243747b9..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Path cost for this port -syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" -val_help: u32:1-65535; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def deleted file mode 100644 index b603bb8c..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def +++ /dev/null @@ -1,4 +0,0 @@ -priority: 325 # after vif and bridge -help: Add this interface to a bridge group - -end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../@).$VAR(../@) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def deleted file mode 100644 index be0ff479..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Bridge port priority -syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63" -val_help: u32:0-63; Bridge port priority diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/description/node.def deleted file mode 100644 index a0b29f05..00000000 --- a/templates/interfaces/bonding/node.tag/vif/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(../../@).$VAR(../@)/ifalias" -delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias" diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/client-id/node.def deleted file mode 100644 index 85ebe6e3..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/client-id/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: DHCP client identifier diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/host-name/node.def deleted file mode 100644 index 80d28fbd..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/host-name/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: DHCP client host name (overrides the system host name) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/node.def deleted file mode 100644 index e90406df..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcp-options/node.def +++ /dev/null @@ -1 +0,0 @@ -help: DHCP options diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def deleted file mode 100644 index 41975dea..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def +++ /dev/null @@ -1,50 +0,0 @@ -# This node is run before the rest of the interface is configured. -# We first check to see if DHCPv6 is still configured on the interface by -# looking over at the interface address parameters. Then we check to see -# if the DHCPv6 client program is still running on this interface. If both -# of those are true, then any change to this tree means that the user -# has changed this tree ONLY, and that we are going to have to re-start -# the DHCPv6 client using the new parameters. - - -priority: 317 # Run before interface has been configured - -help: DHCPv6 options - -end: - ifname="$VAR(../../@).$VAR(../@)" - - dhcpv6_set=0 - for param in $VAR(../address/@@); do - if [ "$param" = "dhcpv6" ]; then - dhcpv6_set=1 - fi - done - - if [ $dhcpv6_set -eq 0 ]; then - echo "DHCPv6 is not configured on this interface" - exit 0 - fi - - conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf - if [ ! -e $conffile ]; then - echo "Conf file $conffile doesn't exist" - exit 0 - fi - - if [ -n "$VAR(./parameters-only)" ]; then - arg1="--parameters-only" - fi - - if [ -n "$VAR(./temporary)" ]; then - arg2="--temporary" - fi - - echo "Re-starting DHCPv6 client on ${ifname}..." - sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ - --ifname $ifname $arg1 $arg2 - if [ $? != 0 ]; then - exit 1 - fi - - exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/parameters-only/node.def deleted file mode 100644 index 0e407f81..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/parameters-only/node.def +++ /dev/null @@ -1,3 +0,0 @@ - -help: Acquire only config parameters, not address - diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/temporary/node.def deleted file mode 100644 index a850ef4b..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/temporary/node.def +++ /dev/null @@ -1,3 +0,0 @@ - -help: IPv6 "temporary" address - diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect/node.def deleted file mode 100644 index 5f60e6ab..00000000 --- a/templates/interfaces/bonding/node.tag/vif/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(../../@).$VAR(../@) on -delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../@).$VAR(../@) off diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def deleted file mode 100644 index 12db6a98..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/disable/node.def +++ /dev/null @@ -1,11 +0,0 @@ -help: Disable interface -update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@) - if ! sudo ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then - echo "Error disabling dev $VAR(../../@).$VAR(../@)" - /etc/netplug/linkup.d/dhclient $VAR(../../@).$VAR(../@) - exit 1 - fi -delete: if ! sudo ip link set $VAR(../../@).$VAR(../@) up; then - echo "Error enabling dev $VAR(../../@).$VAR(../@)" - exit 1 - fi diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/mac/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/mac/node.def deleted file mode 100644 index 750710ec..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/mac/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: macaddr -help: Media Access Control (MAC) address - -update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@) diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/mtu/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/mtu/node.def deleted file mode 100644 index b3f3e7c7..00000000 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/mtu/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: u32 -priority: 382 -help: Maximum Transmission Unit (MTU) -val_help: u32:68-9000; Maximum Transmission Unit (MTU) -syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000" - -update: sudo ip link set $VAR(../../@).$VAR(../@) mtu $VAR(@) -delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@) ] || exit 0 - sudo ip link set $VAR(../../@).$VAR(../@) mtu 1500 diff --git a/templates/interfaces/dummy/node.def b/templates/interfaces/dummy/node.def deleted file mode 100644 index 1908f9d8..00000000 --- a/templates/interfaces/dummy/node.def +++ /dev/null @@ -1,15 +0,0 @@ -tag: -priority: 300 -type: txt -help: Dummy interface name -syntax:expression: pattern $VAR(@) "^dum[0-9]+$" \ - ; "name must be (dum0-dum999)" -val_help: <dumN>; Dummy interface name - -begin: [ -d /sys/module/dummy ] || sudo modprobe dummy - -create: sudo ip link add name $VAR(@) type dummy - sudo ip link set $VAR(@) up - -delete: sudo ip link set dev $VAR(@) down - sudo ip link delete dev $VAR(@) diff --git a/templates/interfaces/dummy/node.tag/address/node.def b/templates/interfaces/dummy/node.tag/address/node.def deleted file mode 100644 index 04612379..00000000 --- a/templates/interfaces/dummy/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 -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/dummy/node.tag/description/node.def b/templates/interfaces/dummy/node.tag/description/node.def deleted file mode 100644 index c6d2789d..00000000 --- a/templates/interfaces/dummy/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/dummy/node.tag/disable/node.def b/templates/interfaces/dummy/node.tag/disable/node.def deleted file mode 100644 index 8c580c95..00000000 --- a/templates/interfaces/dummy/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/ethernet/node.tag/bond-group/node.def b/templates/interfaces/ethernet/node.tag/bond-group/node.def deleted file mode 100644 index dff97395..00000000 --- a/templates/interfaces/ethernet/node.tag/bond-group/node.def +++ /dev/null @@ -1,12 +0,0 @@ -priority: 319 -type: txt -help: Assign interface to bonding group -allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show=bonding -syntax:expression: pattern $VAR(@) "^bond[0-9]+$" \ - ; "$VAR(@): not a valid name for a bonding interface" - -commit:expression: exec "${vyatta_sbindir}/vyatta-bonding.pl --dev=$VAR(@) --check=$VAR(../@)" - -update: sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$VAR(@) --add=$VAR(../@) - -delete: sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$VAR(@) --remove=$VAR(../@) diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/bridge/node.def deleted file mode 100644 index 0d1f16e2..00000000 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/bridge/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: txt - -help: Bridge group interface - -commit:expression: exec \ - "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" - -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge - diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/cost/node.def deleted file mode 100644 index 243747b9..00000000 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/cost/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Path cost for this port -syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" -val_help: u32:1-65535; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/node.def deleted file mode 100644 index dfd046c2..00000000 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/node.def +++ /dev/null @@ -1,4 +0,0 @@ -priority: 320 -help: Add this interface to a bridge group - -end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../@).$VAR(../@) diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/priority/node.def deleted file mode 100644 index be0ff479..00000000 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Bridge port priority -syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63" -val_help: u32:0-63; Bridge port priority diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def deleted file mode 100644 index 0d1f16e2..00000000 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: txt - -help: Bridge group interface - -commit:expression: exec \ - "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" - -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge - diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def deleted file mode 100644 index 243747b9..00000000 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Path cost for this port -syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" -val_help: u32:1-65535; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def deleted file mode 100644 index a2f2ae42..00000000 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def +++ /dev/null @@ -1,4 +0,0 @@ -priority: 320 -help: Add this interface to a bridge group - -end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../../@).$VAR(../../@).$VAR(../@) diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def deleted file mode 100644 index be0ff479..00000000 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Bridge port priority -syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63" -val_help: u32:0-63; Bridge port priority diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def deleted file mode 100644 index 0d1f16e2..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: txt - -help: Bridge group interface - -commit:expression: exec \ - "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" - -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge - diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def deleted file mode 100644 index 243747b9..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Path cost for this port -syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" -val_help: u32:1-65535; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def deleted file mode 100644 index dfd046c2..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def +++ /dev/null @@ -1,4 +0,0 @@ -priority: 320 -help: Add this interface to a bridge group - -end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../@).$VAR(../@) diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def deleted file mode 100644 index be0ff479..00000000 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Bridge port priority -syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63" -val_help: u32:0-63; Bridge port priority diff --git a/templates/interfaces/loopback/node.def b/templates/interfaces/loopback/node.def deleted file mode 100644 index 69778aad..00000000 --- a/templates/interfaces/loopback/node.def +++ /dev/null @@ -1,11 +0,0 @@ -tag: -priority: 300 -type: txt -help: Loopback interface name -syntax:expression: pattern $VAR(@) "^lo$" ; "name must be lo" -val_help: lo: Loopback interface name - -syntax:expression: exec \ - "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=loopback" -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=loopback -create: sudo ip link set $VAR(@) up diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def deleted file mode 100644 index 98788814..00000000 --- a/templates/interfaces/loopback/node.tag/address/node.def +++ /dev/null @@ -1,11 +0,0 @@ -multi: -type: ipv4net,ipv6net -val_help: ipv4net; IPv4 address and prefix length -val_help: ipv6net; IPv6 address and prefix length -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/loopback/node.tag/description/node.def b/templates/interfaces/loopback/node.tag/description/node.def deleted file mode 100644 index c6d2789d..00000000 --- a/templates/interfaces/loopback/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.def b/templates/interfaces/tunnel/node.def index de5431a3..d42f6560 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -35,6 +35,9 @@ commit:expression: (!(pattern $VAR(./local-ip/@) ".*:.*") && $VAR(./encapsulatio 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; @@ -48,7 +51,7 @@ create: LIP=$(/opt/vyatta/sbin/vyatta-dhcp-helper.pl --interface=$VAR(./dhcp-interface/@) --want=local) fi case "$VAR(./encapsulation/@)" in - "gre" | "ipip" | "sit") + "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; @@ -68,6 +71,8 @@ create: 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/@)" @@ -77,7 +82,7 @@ create: 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(@)`" ]; then + 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 diff --git a/templates/interfaces/tunnel/node.tag/encapsulation/node.def b/templates/interfaces/tunnel/node.tag/encapsulation/node.def index c8d0c7c2..b8f38c0a 100644 --- a/templates/interfaces/tunnel/node.tag/encapsulation/node.def +++ b/templates/interfaces/tunnel/node.tag/encapsulation/node.def @@ -2,8 +2,8 @@ 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"; \ - "Must be (gre gre-bridge ipip sit ipip6 ip6ip6)\n")) + ($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" ; \ @@ -15,3 +15,4 @@ 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/parameters/ip/bridge-group/bridge/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def deleted file mode 100644 index 84d2c983..00000000 --- a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def +++ /dev/null @@ -1,20 +0,0 @@ -type: txt -help: Bridge group interface -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge -commit:expression: exec \ - "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" -commit:expression: $VAR(../../../../encapsulation/@) == "gre-bridge"; "tunnel encapsulation type must be gre-bridge" -create: - # TODO: need to add logic for update as we need to remove the interface first. - if [ "$(ip link show $VAR(../../../../@) | grep ether)" ]; then - sudo brctl addif $VAR(@) $VAR(../../../../@) || - echo interfaces tunnel $VAR(../../../../@) bridge-group bridge $VAR(@): error adding interface to bridge - else - echo interfaces tunnel $VAR(../../../../@) bridge-group bridge $VAR(@): tunnel encapsulation type must be gre-bridge - exit 1 - fi -delete: if [ -d /sys/class/net/$VAR(@) ]; then - sudo brctl delif $VAR(@) $VAR(../../../../@) - else - exit 0 - fi diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/cost/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/cost/node.def deleted file mode 100644 index 243747b9..00000000 --- a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/cost/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Path cost for this port -syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535" -val_help: u32:1-65535; Path cost value for Spanning Tree Protocol diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/node.def deleted file mode 100644 index 663979dd..00000000 --- a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Add this interface to a bridge group diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/priority/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/priority/node.def deleted file mode 100644 index be0ff479..00000000 --- a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/priority/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: u32 -help: Bridge port priority -syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63" -val_help: u32:0-63; Bridge port priority diff --git a/templates/interfaces/vxlan/node.def b/templates/interfaces/vxlan/node.def deleted file mode 100644 index bb9d1b89..00000000 --- a/templates/interfaces/vxlan/node.def +++ /dev/null @@ -1,68 +0,0 @@ -tag: -priority: 460 -type: txt -help: Virtual eXtensible LAN interface -val_help: <vxlanN>; VXLAN interface name -syntax:expression: pattern $VAR(@) "vxlan[0-9]+$" - -commit:expression: $VAR(./vni/) != ""; \ - "Must configure vxlan vni for $VAR(@)" - -begin: - [ -d /sys/module/vxlan ] || sudo modprobe vxlan - - -create: - if [ -e /sys/class/net/$VAR(@) ]; then - echo "VXLAN interface \"$VAR(@)\" already exists." - exit 1 - fi - - VXLAN_GROUP="" - VXLAN_VNI="id $VAR(./vni/@)" - VXLAN_TTL="ttl 16" - VXLAN_PORT="dstport 0" - - if [ ! $VAR(./link/) == "" ]; then - VXLAN_DEV="dev $VAR(./link/@)" - fi - - if [ ! $VAR(./group/) == "" ]; then - VXLAN_GROUP="group $VAR(./group/@)" - if [ -z "$VXLAN_DEV" ]; then - echo "For multicast VXLAN, link (network interface) must be configured" - exit 1 - fi - fi - - if [ ! $VAR(./remote/) == "" ]; then - VXLAN_GROUP="remote $VAR(./remote/@)" - fi - - if [ -z "$VXLAN_GROUP" ]; then - echo "group or remote must be configured." - exit 1 - fi - - if [ ! $VAR(./remote-port/) == "" ]; then - VXLAN_PORT="dstport $VAR(./remote-port/@)" - fi - - sudo ip link add name $VAR(@) type vxlan \ - $VXLAN_VNI $VXLAN_GROUP $VXLAN_TTL $VXLAN_DEV $VXLAN_PORT - sudo ip link set $VAR(@) up - - touch /tmp/vxlan-$VAR(@)-create - -delete: - if [ ! -e /sys/class/net/$VAR(@) ]; then - echo "VXLAN interface \"$VAR(@)\" does not exist." - else - sudo ip link del dev $VAR(@) - fi - - -end: - if [ -e /tmp/vxlan-$VAR(@)-create ]; then - rm /tmp/vxlan-$VAR(@)-create - fi diff --git a/templates/interfaces/vxlan/node.tag/address/node.def b/templates/interfaces/vxlan/node.tag/address/node.def deleted file mode 100644 index 3cf32ef7..00000000 --- a/templates/interfaces/vxlan/node.tag/address/node.def +++ /dev/null @@ -1,18 +0,0 @@ -multi: -type: txt -help: IP address - -syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)" - -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../@)" - -create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../@) $VAR(@) - -delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../@) $VAR(@) - -allowed: echo "dhcp dhcpv6 <>" - -val_help: ipv4net; IP address and prefix length -val_help: ipv6net; IPv6 address and prefix length -val_help: dhcp; Dynamic Host Configuration Protocol -val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6 diff --git a/templates/interfaces/vxlan/node.tag/description/node.def b/templates/interfaces/vxlan/node.tag/description/node.def deleted file mode 100644 index 7d88db80..00000000 --- a/templates/interfaces/vxlan/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/vxlan/node.tag/group/node.def b/templates/interfaces/vxlan/node.tag/group/node.def deleted file mode 100644 index a3bae7e3..00000000 --- a/templates/interfaces/vxlan/node.tag/group/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: ipv4 -help: Multicast group address for this VXLAN interface -val_help: ipv4; Multicast group address for this VXLAN - -update: - if [ ! -e /tmp/vxlan-$VAR(../@)-create ]; then - echo "Chainging group requires delete/create this vxlan interface" - exit 1 - fi diff --git a/templates/interfaces/vxlan/node.tag/ip/arp-cache-timeout/node.def b/templates/interfaces/vxlan/node.tag/ip/arp-cache-timeout/node.def deleted file mode 100644 index 4441914c..00000000 --- a/templates/interfaces/vxlan/node.tag/ip/arp-cache-timeout/node.def +++ /dev/null @@ -1,9 +0,0 @@ -help: ARP cache entry timeout in seconds - -type: u32 - -create:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" " - -update:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" " - -delete:expression: "sudo sh -c \"echo 30000 > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" " diff --git a/templates/interfaces/vxlan/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/vxlan/node.tag/ip/enable-proxy-arp/node.def deleted file mode 100644 index ae7ba09a..00000000 --- a/templates/interfaces/vxlan/node.tag/ip/enable-proxy-arp/node.def +++ /dev/null @@ -1,3 +0,0 @@ -help: Enable proxy-arp on this interface -create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" " -delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" " diff --git a/templates/interfaces/vxlan/node.tag/link/node.def b/templates/interfaces/vxlan/node.tag/link/node.def deleted file mode 100644 index d21c7d98..00000000 --- a/templates/interfaces/vxlan/node.tag/link/node.def +++ /dev/null @@ -1,10 +0,0 @@ -type: txt -help: Underlay device name of this VXLAN interface -allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default -val_help:<interface>; Interface to be used as underlay of VXLAN interface - -update: - if [ ! -e /tmp/vxlan-$VAR(../@)-create ]; then - echo "Chainging dev requires delete/create this vxlan interface" - exit 1 - fi diff --git a/templates/interfaces/vxlan/node.tag/mtu/node.def b/templates/interfaces/vxlan/node.tag/mtu/node.def deleted file mode 100644 index 9c213a91..00000000 --- a/templates/interfaces/vxlan/node.tag/mtu/node.def +++ /dev/null @@ -1,17 +0,0 @@ -type: u32 -priority: 461 -help: Maximum Transmission Unit (MTU) -syntax:expression: $VAR(@) >= 1450 && $VAR(@) <= 9000; "Must be between 1450-9000" -val_help: u32:1450-9000; Maximum Transmission Unit (MTU) - -update: - if [ -d /sys/class/net/$VAR(../@) ] ; then - if [ "$VAR(@)" -lt "1500" ]; then - echo "WARNING: RFC7348 recommends VXLAN tunnels preserve a 1500 byte MTU." - fi - sudo ip link set $VAR(../@) mtu $VAR(@) - fi -delete: - if [ -d /sys/class/net/$VAR(../@) ] ; then - sudo ip link set $VAR(../@) mtu 1500 - fi diff --git a/templates/interfaces/vxlan/node.tag/remote-port/node.def b/templates/interfaces/vxlan/node.tag/remote-port/node.def deleted file mode 100644 index c1b4f672..00000000 --- a/templates/interfaces/vxlan/node.tag/remote-port/node.def +++ /dev/null @@ -1,11 +0,0 @@ -type: u32 -help: Remote port for this VXLAN tunnel -val_help: u32:1-65535; Numeric IP port -syntax:expression: $VAR(@) > 0 && $VAR(@) < 65536; - "Port must be between 1 and 65535" - -update: - if [ ! -e /tmp/vxlan-$VAR(../@)-create ]; then - echo "Changing remote port requires delete/create this vxlan interface" - exit 1 - fi diff --git a/templates/interfaces/vxlan/node.tag/remote/node.def b/templates/interfaces/vxlan/node.tag/remote/node.def deleted file mode 100644 index 5e789c48..00000000 --- a/templates/interfaces/vxlan/node.tag/remote/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: ipv4 -help: Remote address of VXLAN tunnel -val_help: ipv4; Remote address of this VXLAN tunnel - -update: - if [ ! -e /tmp/vxlan-$VAR(../@)-create ]; then - echo "Changing remote requires delete/create this vxlan interface" - exit 1 - fi diff --git a/templates/interfaces/vxlan/node.tag/vni/node.def b/templates/interfaces/vxlan/node.tag/vni/node.def deleted file mode 100644 index cc54b4b8..00000000 --- a/templates/interfaces/vxlan/node.tag/vni/node.def +++ /dev/null @@ -1,10 +0,0 @@ -type: u32 -help: Virtual network identifier [REQUIRED] -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 16777216; "Must be between 0-16777216" -val_help: u32: 0-16777214; Virtual network identifier of this VXLAN interface [REQUIRED] - -update: - if [ ! -e /tmp/vxlan-$VAR(../@)-create ]; then - echo "Chainging vni requires delete/create this vxlan interface" - exit 1 - fi |