OS-4513 setting properties on persistent vnics doesn't work

Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

4 files changed, 119 insertions, 3 deletions

diff --git a/usr/src/lib/libdladm/common/libdlvnic.c b/usr/src/lib/libdladm/common/libdlvnic.c
index 189b848f8e..47d007a1e2 100644
--- a/usr/src/lib/libdladm/common/libdlvnic.c
+++ b/usr/src/lib/libdladm/common/libdlvnic.c
@@ -550,8 +550,7 @@ done:
 	if (status == DLADM_STATUS_OK && proplist != NULL) {
 		uint32_t flg;
 
-		flg = (flags & DLADM_OPT_PERSIST) ?
-		    DLADM_OPT_PERSIST : DLADM_OPT_ACTIVE;
+		flg = flags & (DLADM_OPT_PERSIST | DLADM_OPT_ACTIVE);
 
 		for (i = 0; i < proplist->al_count; i++) {
 			dladm_arg_info_t	*aip = &proplist->al_info[i];
diff --git a/usr/src/test/util-tests/runfiles/default.run b/usr/src/test/util-tests/runfiles/default.run
index 54f95b7e90..dcdbf43f95 100644
--- a/usr/src/test/util-tests/runfiles/default.run
+++ b/usr/src/test/util-tests/runfiles/default.run
@@ -24,6 +24,7 @@ outputdir = /var/tmp/test_results
 
 [/opt/util-tests/tests/printf_test]
 [/opt/util-tests/tests/allowed-ips]
+[/opt/util-tests/tests/vnic-mtu]
 [/opt/util-tests/tests/bunyan]
 
 [/opt/util-tests/tests/xargs_test]
diff --git a/usr/src/test/util-tests/tests/dladm/Makefile b/usr/src/test/util-tests/tests/dladm/Makefile
index df3997656c..a71332b016 100644
--- a/usr/src/test/util-tests/tests/dladm/Makefile
+++ b/usr/src/test/util-tests/tests/dladm/Makefile
@@ -17,7 +17,7 @@ include $(SRC)/cmd/Makefile.cmd
 include $(SRC)/test/Makefile.com
 
 ROOTOPTPKG = $(ROOT)/opt/util-tests/tests
-PROG = allowed-ips
+PROG = allowed-ips vnic-mtu
 
 ROOTPROG = $(PROG:%=$(ROOTOPTPKG)/%)
 
diff --git a/usr/src/test/util-tests/tests/dladm/vnic-mtu.ksh b/usr/src/test/util-tests/tests/dladm/vnic-mtu.ksh
new file mode 100644
index 0000000000..49daa74f3b
--- /dev/null
+++ b/usr/src/test/util-tests/tests/dladm/vnic-mtu.ksh
@@ -0,0 +1,116 @@
+#!/bin/ksh
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2015 Joyent, Inc.
+#
+
+#
+# The purpose of this is to test the MTU property on VNICs, using both
+# temporary and persistent properties. To do this, we create an
+# Etherstub and then create various VNICs on top of it.
+#
+
+vm_arg0="$(basename $0)"
+vm_stub="teststub$$"
+vm_vnic="testvnic$$"
+
+VM_MTU_MIN=576
+VM_MTU_MAX=9000
+
+fatal()
+{
+	typeset msg="$*"
+	[[ -z "$msg" ]] && msg="failed"
+	echo "TEST_FAIL: $vm_arg0: $msg" >&2
+
+	# Try to clean up just in case
+	dladm delete-vnic $vm_vnic 2>/dev/null
+	dladm delete-etherstub $vm_stub 2>/dev/null
+	exit 1
+}
+
+#
+# Validate that the MTU of the datalink dev has the MTU that we expect
+#
+validate_mtu()
+{
+	typeset dev=$1
+	typeset mtu=$2
+	typeset val
+
+	[[ -z "$dev" ]] && fatal "missing required device"
+	[[ -z "$mtu" ]] && fatal "missing required mtu"
+	val=$(dladm show-linkprop -c -p mtu -o value $dev)
+	[[ $? -eq 0 ]] || fatal "failed to get MTU for $dev"
+	(( $val == $mtu )) || fatal \
+	    "mtu mismatch on $dev: expected $mtu, got $val"
+}
+
+delete_stub()
+{
+	dladm delete-etherstub $vm_stub || fatal \
+	    "failed to delete stub $vm_stub"
+}
+
+create_stub()
+{
+	dladm create-etherstub $vm_stub || fatal \
+	    "failed to create stub"
+	validate_mtu $vm_stub $VM_MTU_MAX
+}
+
+delete_vnic()
+{
+	dladm delete-vnic $vm_vnic || fatal "failed to delete vnic $vm_vnic"
+}
+
+test_vnic_pass()
+{
+	typeset mtu=$1
+	typeset flags=$2
+
+	[[ -z "$mtu" ]] && fatal "missing required mtu"
+	dladm create-vnic $flags -l $vm_stub -p mtu=$mtu $vm_vnic || fatal \
+	    "failed tocreate vnic: $vm_vnic"
+	validate_mtu "$vm_vnic" "$mtu"
+	delete_vnic
+}
+
+test_vnic_fail()
+{
+	typeset mtu=$1
+	typeset flags=$2
+
+	[[ -z "$mtu" ]] && fatal "missing required mtu"
+	dladm create-vnic $flags -l $vm_stub -p mtu=$mtu \
+	    $vm_vnic 2>/dev/null && fatal \
+	    "created vnic with mtu $mtu, but failure expected"
+}
+
+test_pass()
+{
+	typeset flags=$1
+
+	create_stub
+	test_vnic_pass 1500 $flags
+	test_vnic_pass 1400 $flags
+	test_vnic_pass $VM_MTU_MIN $flags
+	test_vnic_pass $VM_MTU_MAX $flags
+	test_vnic_fail $((($VM_MTU_MIN - 1))) $flags
+	test_vnic_fail $((($VM_MTU_MAX + 1))) $flags
+	delete_stub
+}
+
+test_pass "-t"
+test_pass
+echo "TEST PASS: $vm_arg0"