diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-12-04 18:38:53 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-12-04 18:38:53 +0100 |
| commit | 865f01ca6e264f259415a04aacc53d38b2d5c350 (patch) | |
| tree | 547e55c0f9795c6cce704eebf6b786a884721dcb | |
| parent | 0d5c67ead5f173b6b98bc9642156713e82c30a76 (diff) | |
| parent | 25babb28327ab6eae25a514046a595df90ae1053 (diff) | |
| download | vyatta-cfg-system-865f01ca6e264f259415a04aacc53d38b2d5c350.tar.gz vyatta-cfg-system-865f01ca6e264f259415a04aacc53d38b2d5c350.zip | |
Merge branch 'current' into crux
* current:
T1067: support setting VXLAN remote port
VXLAN: fix typo for remote
| -rw-r--r-- | templates/interfaces/vxlan/node.def | 10 | ||||
| -rw-r--r-- | templates/interfaces/vxlan/node.tag/remote-port/node.def | 11 | ||||
| -rw-r--r-- | templates/interfaces/vxlan/node.tag/remote/node.def | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/templates/interfaces/vxlan/node.def b/templates/interfaces/vxlan/node.def index 0a3db8cc..e8b625e1 100644 --- a/templates/interfaces/vxlan/node.def +++ b/templates/interfaces/vxlan/node.def @@ -21,6 +21,7 @@ create: VXLAN_GROUP="" VXLAN_VNI="id $VAR(./vni/@)" VXLAN_TTL="ttl 16" + VXLAN_PORT="" if [ ! $VAR(./link/) == "" ]; then VXLAN_DEV="dev $VAR(./link/@)" @@ -39,13 +40,16 @@ create: exit 1 fi - sudo ip link add name $VAR(@) type vxlan \ - $VXLAN_VNI $VXLAN_GROUP $VXLAN_TTL $VXLAN_DEV + 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." diff --git a/templates/interfaces/vxlan/node.tag/remote-port/node.def b/templates/interfaces/vxlan/node.tag/remote-port/node.def new file mode 100644 index 00000000..c1b4f672 --- /dev/null +++ b/templates/interfaces/vxlan/node.tag/remote-port/node.def @@ -0,0 +1,11 @@ +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 index 4048b5fc..5e789c48 100644 --- a/templates/interfaces/vxlan/node.tag/remote/node.def +++ b/templates/interfaces/vxlan/node.tag/remote/node.def @@ -4,6 +4,6 @@ val_help: ipv4; Remote address of this VXLAN tunnel update: if [ ! -e /tmp/vxlan-$VAR(../@)-create ]; then - echo "Chainging remote requires delete/create this vxlan interface" + echo "Changing remote requires delete/create this vxlan interface" exit 1 fi |