From de8a3de7f6f8faa27dc7f56ff09cab1d0b656c2d Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Thu, 25 Sep 2014 16:28:02 +0200 Subject: Rename "dev" to "link" under VXLAN for consistency with peth and whatever else we have. --- templates/interfaces/vxlan/link/node.def | 10 ++++++++++ templates/interfaces/vxlan/node.def | 4 ++-- templates/interfaces/vxlan/node.tag/dev/node.def | 10 ---------- 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 templates/interfaces/vxlan/link/node.def delete mode 100644 templates/interfaces/vxlan/node.tag/dev/node.def diff --git a/templates/interfaces/vxlan/link/node.def b/templates/interfaces/vxlan/link/node.def new file mode 100644 index 00000000..d21c7d98 --- /dev/null +++ b/templates/interfaces/vxlan/link/node.def @@ -0,0 +1,10 @@ +type: txt +help: Underlay device name of this VXLAN interface +allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show all && echo default +val_help:; 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.def b/templates/interfaces/vxlan/node.def index f7c9b7c7..780ef8d8 100644 --- a/templates/interfaces/vxlan/node.def +++ b/templates/interfaces/vxlan/node.def @@ -24,8 +24,8 @@ create: VXLAN_GROUP="group $VAR(./group/@)" VXLAN_TTL="ttl 16" - if [ ! $VAR(./dev/) == "" ]; then - VXLAN_DEV="dev $VAR(./dev/@)" + if [ ! $VAR(./link/) == "" ]; then + VXLAN_DEV="dev $VAR(./link/@)" fi ip link add name $VAR(@) type vxlan \ diff --git a/templates/interfaces/vxlan/node.tag/dev/node.def b/templates/interfaces/vxlan/node.tag/dev/node.def deleted file mode 100644 index d21c7d98..00000000 --- a/templates/interfaces/vxlan/node.tag/dev/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 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 -- cgit v1.2.3